Skip to content

chore(tests): remove EIP-7610 create collision tests - #3417

Merged
danceratopz merged 3 commits into
ethereum:forks/amsterdamfrom
spencer-tb:remove-eip7610-tests
Aug 25, 2026
Merged

chore(tests): remove EIP-7610 create collision tests#3417
danceratopz merged 3 commits into
ethereum:forks/amsterdamfrom
spencer-tb:remove-eip7610-tests

Conversation

@spencer-tb

@spencer-tb spencer-tb commented Aug 22, 2026

Copy link
Copy Markdown
Contributor

Description

Remove the EIP-7610 storage collision tests so their fixtures drop out of the next release. EIP-7610 is declined for inclusion in Glamsterdam (EIP-7773): no mainnet account has non-empty storage with empty code and nonce, and clients are dropping the storage collision check.

Also removes the two ported static tests that depend on the check, test_revert_in_create_in_init_paris.py and test_failed_create_reverts_deletion_paris.py. These are the CREATE variants of the same scenario and only exist as their Paris (EIP-7610) versions.

Coverage that does not depend on EIP-7610 is kept. The EIP-684 code and nonce collision cases move to tests/frontier/create/test_create_collision.py, and test_collision_selfdestruct.py moves to the EIP-6780 directory since its collision target has code and nonce. Also rewords two stale EIP-7610 mentions in the EIP-7708 and EIP-8038 tests, which cover EIP-684 collisions.

Related Issues or PRs

Related to #2819 and #2957.

Checklist

  • Ran fast static checks to avoid CI fails, see Code Standards & Verifying Changes: just static
  • PR title has the form <type>(<area>): <title>, where <type> and <area> come from an appropriate C-<type>, respectively A-<area>, label. The title should match the target squash commit message.

@codecov

codecov Bot commented Aug 22, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 93.77%. Comparing base (ac0bf4f) to head (d7baf6b).
⚠️ Report is 6 commits behind head on forks/amsterdam.

Additional details and impacted files
@@                 Coverage Diff                 @@
##           forks/amsterdam    #3417      +/-   ##
===================================================
+ Coverage            93.53%   93.77%   +0.23%     
===================================================
  Files                  624      624              
  Lines                37074    36905     -169     
  Branches              3394     3326      -68     
===================================================
- Hits                 34679    34606      -73     
+ Misses                1645     1597      -48     
+ Partials               750      702      -48     
Flag Coverage Δ
unittests 93.77% <ø> (+0.23%) ⬆️

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

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@spencer-tb
spencer-tb force-pushed the remove-eip7610-tests branch from e86375d to 9944afe Compare August 22, 2026 10:55
@spencer-tb spencer-tb changed the title chore(tests): skip EIP-7610 collision tests pending protocol removal chore(tests): remove EIP-7610 create collision tests Aug 22, 2026
@spencer-tb
spencer-tb force-pushed the remove-eip7610-tests branch from 9944afe to 13bd1f4 Compare August 22, 2026 10:59
@spencer-tb spencer-tb added C-chore Category: chore A-tests Area: Consensus tests. labels Aug 22, 2026
@spencer-tb
spencer-tb marked this pull request as ready for review August 22, 2026 11:06

@LouisTsai-Csie LouisTsai-Csie left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is there anything we need to remove from the spec side?

@jochem-brouwer jochem-brouwer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Some small comments regarding a test where I think we should directly expand coverage.

Comment thread tests/frontier/create/test_create_collision.py
Comment thread tests/frontier/create/test_create_collision.py
danceratopz added a commit to danceratopz/execution-specs that referenced this pull request Aug 24, 2026
Address review feedback from jochem-brouwer on
ethereum#3417. Parametrize the collision account over
the full product of nonce, code, storage and balance where EIP-684
defines an abort, so a client that incorrectly aborts on storage is
caught. Cells with zero nonce and empty code are excluded: with
storage the behavior is undefined in protocol since EIP-7610 was
declined, without storage the account is deployable. Add balance-only
success tests for the deployable case, for creation transactions and
for the CREATE and CREATE2 opcodes.

@danceratopz danceratopz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks @spencer-tb, LGTM, I'd just suggest updating the BAL test_cases.md in the scope of this PR. Claude suggested two other state-reference corrections. I added them up front here:

I was reviewing when @jochem-brouwer's comment came in. I think this could be follow-up to get this in quickly, although it would make sense to get them in the next release:

Comment thread tests/frontier/create/test_create_collision.py
@spencer-tb

Copy link
Copy Markdown
Contributor Author

@jochem-brouwer can you revert the requested changes, so we merge this and then switch to @danceratopz's follow up in #3425?

@spencer-tb

Copy link
Copy Markdown
Contributor Author

Is there anything we need to remove from the spec side?

The answer is yes! @gurukamath could you review d7baf6b?

@jochem-brouwer
jochem-brouwer dismissed their stale review August 25, 2026 03:22

My comments are followed-up in #3425

@danceratopz
danceratopz merged commit 2ce2191 into ethereum:forks/amsterdam Aug 25, 2026
25 checks passed
danceratopz added a commit to danceratopz/execution-specs that referenced this pull request Aug 25, 2026
Address review feedback from jochem-brouwer on
ethereum#3417. Parametrize the collision account over
the full product of nonce, code, storage and balance where EIP-684
defines an abort, so a client that incorrectly aborts on storage is
caught. Cells with zero nonce and empty code are excluded: with
storage the behavior is undefined in protocol since EIP-7610 was
declined, without storage the account is deployable. Add balance-only
success tests for the deployable case, for creation transactions and
for the CREATE and CREATE2 opcodes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-tests Area: Consensus tests. C-chore Category: chore

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants