Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disallow unreferenced subcontainers and subcontainers referenced by both EOFCREATE and RETURNCONTRACT #916

Merged
merged 3 commits into from
Jun 28, 2024

Conversation

gumb0
Copy link
Member

@gumb0 gumb0 commented Jun 4, 2024

@gumb0 gumb0 added the EOF label Jun 4, 2024
@gumb0 gumb0 self-assigned this Jun 4, 2024
Copy link

codecov bot commented Jun 4, 2024

Codecov Report

Attention: Patch coverage is 94.93671% with 4 lines in your changes missing coverage. Please review.

Project coverage is 94.22%. Comparing base (449a1dc) to head (1a90105).

Current head 1a90105 differs from pull request most recent head c69e5ca

Please upload reports for the commit c69e5ca to get more accurate results.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #916      +/-   ##
==========================================
- Coverage   94.28%   94.22%   -0.06%     
==========================================
  Files         142      142              
  Lines       16123    16132       +9     
==========================================
  Hits        15201    15201              
- Misses        922      931       +9     
Flag Coverage Δ
eof_execution_spec_tests 16.50% <10.12%> (-0.02%) ⬇️
ethereum_tests ?
ethereum_tests_silkpre 18.84% <0.00%> (-0.01%) ⬇️
execution_spec_tests 17.96% <0.00%> (-0.02%) ⬇️
unittests 89.66% <94.93%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
lib/evmone/eof.hpp 100.00% <ø> (ø)
test/eoftest/eoftest_runner.cpp 86.84% <ø> (-0.66%) ⬇️
test/unittests/eof_validation.cpp 92.50% <100.00%> (+1.66%) ⬆️
...est/unittests/state_transition_eof_create_test.cpp 100.00% <100.00%> (ø)
test/unittests/eof_test.cpp 93.75% <87.50%> (+0.72%) ⬆️
test/unittests/eof_validation_test.cpp 99.33% <98.18%> (+<0.01%) ⬆️
lib/evmone/eof.cpp 85.68% <83.33%> (-0.28%) ⬇️

... and 3 files with indirect coverage changes

@gumb0 gumb0 force-pushed the unreferenced-subcontainers branch 2 times, most recently from 3d9a3bf to 39b8c59 Compare June 5, 2024 13:54
@gumb0 gumb0 force-pushed the validate-subcontainer-kinds branch from de13ba6 to e5f5c92 Compare June 6, 2024 15:35
@gumb0 gumb0 mentioned this pull request Jun 6, 2024
2 tasks
@gumb0 gumb0 force-pushed the unreferenced-subcontainers branch from 39b8c59 to 41fa312 Compare June 6, 2024 16:06
@gumb0 gumb0 force-pushed the validate-subcontainer-kinds branch from e5f5c92 to 783757c Compare June 6, 2024 16:07
@gumb0 gumb0 force-pushed the validate-subcontainer-kinds branch from 783757c to dae626c Compare June 18, 2024 15:18
@gumb0 gumb0 force-pushed the unreferenced-subcontainers branch 6 times, most recently from bb1aa17 to c23c2fb Compare June 20, 2024 12:44
@gumb0 gumb0 force-pushed the validate-subcontainer-kinds branch 2 times, most recently from a601529 to 71afb81 Compare June 21, 2024 14:31
@gumb0 gumb0 force-pushed the unreferenced-subcontainers branch from c23c2fb to da6dd49 Compare June 21, 2024 14:40
@gumb0 gumb0 force-pushed the validate-subcontainer-kinds branch from 71afb81 to d91990a Compare June 24, 2024 10:39
@gumb0 gumb0 force-pushed the unreferenced-subcontainers branch from da6dd49 to 93a8c7f Compare June 24, 2024 10:51
@gumb0 gumb0 force-pushed the validate-subcontainer-kinds branch from d91990a to 37ed902 Compare June 24, 2024 11:07
Base automatically changed from validate-subcontainer-kinds to master June 24, 2024 12:08
@gumb0 gumb0 force-pushed the unreferenced-subcontainers branch 2 times, most recently from 6e9241f to 999ef63 Compare June 26, 2024 13:30
@gumb0 gumb0 marked this pull request as ready for review June 26, 2024 14:07
@gumb0 gumb0 requested review from pdobacz and chfast June 26, 2024 14:09
@gumb0 gumb0 force-pushed the unreferenced-subcontainers branch from 999ef63 to 3e6cf42 Compare June 26, 2024 14:42
Copy link
Collaborator

@pdobacz pdobacz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but this also implements ipsilon/eof#135 ?

@gumb0
Copy link
Member Author

gumb0 commented Jun 26, 2024

LGTM, but this also implements ipsilon/eof#135 ?

It does, I was not sure if it makes sense to split them.

@pdobacz
Copy link
Collaborator

pdobacz commented Jun 26, 2024

LGTM, but this also implements ipsilon/eof#135 ?

It does, I was not sure if it makes sense to split them.

It's fine, just maybe include this in the title or merge message. We just merged the eof PR so having this go in here sounds good.

@gumb0 gumb0 changed the title Disallow unreferenced subcontainers Disallow unreferenced subcontainers and subcontainers referenced by both EOFCREATE and RETURNCONTRACT Jun 26, 2024
@chfast chfast force-pushed the unreferenced-subcontainers branch from 3e6cf42 to df592fe Compare June 28, 2024 09:45
The disabled tests are failing by having
invalid EOF with unreferenced subcontainers.
@chfast chfast force-pushed the unreferenced-subcontainers branch from 1a90105 to c69e5ca Compare June 28, 2024 11:41
@chfast chfast enabled auto-merge June 28, 2024 11:46
@chfast chfast merged commit f3222be into master Jun 28, 2024
24 checks passed
@chfast chfast deleted the unreferenced-subcontainers branch June 28, 2024 12:04
chfast added a commit that referenced this pull request Jun 28, 2024
This is the fixture format agreed on EOF implementers call and produced
by EEST in ethereum/execution-spec-tests#651

Based on #916 because it removes the tests for `initcode_runtime`
container kind, and those were failing the run of exported validation
tests.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants