EOF validation of subcontainer kinds #876
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #876 +/- ##
==========================================
- Coverage 95.15% 95.11% -0.04%
==========================================
Files 140 140
Lines 15805 15881 +76
==========================================
+ Hits 15039 15106 +67
- Misses 766 775 +9
Flags with carried forward coverage won't be shown. Click here to find out more.
|
gumb0
commented
May 3, 2024
e51ba64 to
7c4ee1e
Compare
9f3f46e to
e26fdad
Compare
e26fdad to
face250
Compare
face250 to
b6abd3e
Compare
0e48680 to
e406e19
Compare
ba1ced0 to
1380198
Compare
e406e19 to
dc1d74c
Compare
gumb0
added a commit
that referenced
this pull request
May 14, 2024
Refactoring pulled out of #876 Main idea: 1. Instruction validation returns the list of references to subcontainers (instruction, subcontainer_idx) 1.1. (Not directly related, but I moved returning accessed section list into returned `InstructionValidationResult` struct instead of non-const reference argument) 3. The check for `EOFCREATE` with truncated data is moved out of instruction validation into being done once for a referenced container, after it is already validated. 4. This way we don't need to split subcontainer header validation and instructions validation and the loop over containers gets simpler. Then it gets handy for additional container kind validation in #876.
1380198 to
9e8b3e1
Compare
gumb0
commented
May 14, 2024
| if (referenced_by_eofcreate) | ||
| return EOFValidationError::incompatible_container_kind; | ||
| } | ||
|
|
Member
Author
There was a problem hiding this comment.
Validation whether subcontainer is referenced by anything can be added here, or below in "enqueue subcontainers" loop, better in a separate PR.
92e80be to
0a3b1e0
Compare
gumb0
commented
Jun 4, 2024
| return ContainerKind::runtime; | ||
| else if (s == "initcode") | ||
| return ContainerKind::initcode; | ||
| else if (s == "initcode_runtime") |
Member
Author
There was a problem hiding this comment.
Not sure it makes much sense to support this mode in the tests. If we don't then probably validate_eof() also shouldn't support it as input (should fail with special error?)
Member
Author
There was a problem hiding this comment.
It is proposed to remove this from the spec and #916 has a commit that implements the removal.
e5f5c92 to
783757c
Compare
Member
Author
|
Required ethereum/tests update:
cc @hugo-dc I'm also fine merging this PR with my "temporary" manual fix of thereum/tests. |
a601529 to
71afb81
Compare
Member
Author
I plan to do this. |
chfast
reviewed
Jun 23, 2024
| throw std::invalid_argument{"code is invalid hex string"}; | ||
| o.code = *op_code; | ||
|
|
||
| if (const auto it_kind = j.find("kind"); it_kind != j.end()) |
Member
Author
There was a problem hiding this comment.
No, this is not supported anywhere, but I plan to try to add this to EEST.
|
|
||
| expect.post[*tx.to].nonce = pre.get(*tx.to).nonce + 1; | ||
| expect.post[*tx.to].nonce = pre.get(*tx.to).nonce; | ||
| expect.post[*tx.to].storage[0x00_bytes32] = 0x00_bytes32; |
Member
There was a problem hiding this comment.
It is not exactly void, the check is only done if a value is assigned to "expect". There are std::optionals.
| sstore(0, txcreate().initcode(keccak256(init_container)).salt(Salt)) + | ||
| sstore(1, txcreate().initcode(keccak256(init_container)).salt(Salt)) + // address collision | ||
| sstore(2, returndatasize()) + sstore(3, 1) + OP_STOP; | ||
| const auto factory_container = eof_bytecode(factory_code, 5).container(init_container); |
Member
Author
There was a problem hiding this comment.
It was a bug in original test, so it was failing for the wrong reason I guess.
chfast
reviewed
Jun 23, 2024
lib/evmone/eof.cpp
Outdated
| else if (opcode == OP_RETURNCONTRACT) | ||
| subcontainer_referenced_by_returncontract[index] = true; | ||
| else | ||
| assert(false); |
Refactor validation API to include a parameter for required container kind of the top-level container.
Make container kind configurable in validation tests.
71afb81 to
d91990a
Compare
chfast
approved these changes
Jun 24, 2024
d91990a to
37ed902
Compare
pdobacz
approved these changes
Jun 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implementing ipsilon/eof#86
Depends on #888
TODO:
Check that container is initcontainer in creation transaction/TXCREATEContainerKind::runtime_initcodemode - after outside-in refactoring this requires* Disallow unreferenced subcontainers and subcontainers referenced by both EOFCREATE and RETURNCONTRACT #916 so will be done there.*if subcontainer is unreferenced, you cannot call its validation requiring neither runtime nor initcode mode.