feat(spec-specs, tests): alt to merge 8037 to forks/amsterdam by spencer-tb · Pull Request #2901 · ethereum/execution-specs

spencer-tb · 2026-05-22T14:54:10Z

🗒️ Description

This PR merges EIP-8037 into forks/amsterdam including framework, specs and all test changes.

Please assign yourself below for reviewing!

Review Plan

Specs - src/ethereum/forks/amsterdam/ @SamWilsn
Tests batch 1 - Targeted 8037 cases, tests/amsterdam/, 54 files @marioevz
Tests batch 2 - Cross fork non-static, tests/osaka to tests/frontier, 78 files
- tests/berlin - @kclowes
- tests/byzantium - @kclowes
- tests/cancun - @marioevz
- tests/common - @marioevz
- tests/constantinople - @marioevz
- tests/frontier - @marioevz
- tests/homestead - @marioevz
- tests/istanbul - @marioevz
- tests/osaka - @kclowes
- tests/paris - @marioevz
- tests/prague @marioevz
- tests/shanghai @marioevz
Tests batch 3 - Cross fork static-ported, tests/ported_static audit @leolara
Testing Framework - packages/testing @marioevz

The test batch 2/3 reviewers should aim to check that the changes don't break what the tests are intending to do in the first place.

🔗 Related Issues or PRs

N/A.

✅ Checklist

All: Ran fast static checks to avoid unnecessary CI fails, see also Code Standards and Enabling Pre-commit Checks:
```
just static
```
All: PR title adheres to the repo standard - it will be used as the squash commit message and should start type(scope):.
All: Considered updating the online docs in the ./docs/ directory.
All: Set appropriate labels for the changes (only maintainers can apply labels).

…se (ethereum#2363) * feat(spec-specs): update EIP-8037 to match latest spec revision * feat(tests): add EIP-8037 state creation gas cost increase tests

…/halt (ethereum#2378)

Co-authored-by: Ben Adams <thundercat@illyriad.co.uk>

Add sstore_state_gas(), code_deposit_state_gas(), and create_state_gas() calculator methods to Fork. Replace Spec constants and manual gas arithmetic across all EIP-8037 tests with dynamic fork method calls. Remove redundant Op.STOP, hardcoded numbers from docstrings, and add fork: Fork parameter to all test functions that use fork methods.

… test

Test CREATE with max initcode size using proper regular/state gas split via the reservoir. Verifies gas boundary behavior with EIP-8037 two-dimensional metering.

Align EIP-8037 gas constant references with upstream renames: - GAS_STORAGE_UPDATE → GAS_COLD_STORAGE_WRITE - GAS_COLD_SLOAD → GAS_COLD_STORAGE_ACCESS - GAS_WARM_ACCOUNT_ACCESS → GAS_WARM_ACCESS Bump gas_limit on tests added to upstream after EIP-8037 branched, which now need extra gas for EIP-8037 state gas costs.

… format runs in withdrawal request contract tests (ethereum#2532) * fix(tests): prevent tx_gas_limit double-accumulation across fixture format runs in withdrawal request contract tests * fix: mypy * fix: ruff * fix: ruff * chore(tests): refactor fix to fork-aware transactions to prevent mutation * chore(test): add a warning to all tests that could mutate vars; address in later PR Add a lightweight repr-based snapshot hook to the filler plugin that warns whenever any ``pytest.param`` value is mutated during a test run. A subsequent PR could address this by returning values instead of mutating, then flipping the hook to a hard failure. --------- Co-authored-by: fselmo <fselmo2@gmail.com>

…hereum#2526) Co-authored-by: fselmo <fselmo2@gmail.com>

… gas validity test (ethereum#2583) Co-authored-by: Stefan <22667037+qu0b@users.noreply.github.com>

Conditionally increase tx gas_limit (and env gas_limit where needed) when fork >= Amsterdam to account for EIP-8037 state creation gas costs. 137 files, 9 with env gas_limit bumps. Headroom: 2,000,000.

Move MAX_CODE_SIZE check before gas charges, charge keccak hash cost (regular gas) before code deposit state gas, and add tests for over-max code size and reservoir preservation after OOG.

On CREATE/CREATE2 address collision the 63/64 gas allocation is burned but was not added to regular_gas_used, leaving it invisible to 2D block gas accounting. Per EIP-684 collision behaves as an immediate exceptional halt, so the burned gas belongs in the regular dimension.

…and subcall pattern Co-authored-by: Mario Vega <marioevz@gmail.com>

The static test skip list and conftest were a temporary workaround for EIP-8037 gas failures. The ported static tests in tests/ported_static/ replace this approach; failures are tracked in ethereum#2601.

…thereum#2603) * fix(execute): use --sender-fund-refund-gas-limit for all funding txs On EIP-8037 networks, simple value transfers to new accounts require more than 21000 gas due to GAS_NEW_ACCOUNT state gas (112 * cpsb). The default Transaction gas_limit of 21000 causes 'intrinsic gas too low' errors during test setup. Changes: - contracts.py: Use 200000 gas for deterministic factory deployer funding - pre_alloc.py: Pass sender_fund_refund_gas_limit to Alloc and use it for simple EOA funding transactions Usage: --sender-fund-refund-gas-limit 200000 * chore: additional fixes for execute remote funds w/ higher gas limits * fix: bump all gas limits to 200k for EIP-8037 state creation costs - sender.py: bump --sender-fund-refund-gas-limit default 21000 → 200000 - pre_alloc.py: bump funding_gas_limit default 21000 → 200000 - pre_alloc.py: use configurable gas limit for per-test refund txs - execute_recover.py: bump recovery refund gas limit 21000 → 200000 EIP-8037 charges GAS_NEW_ACCOUNT (112 × cost_per_state_byte = 131488) for transfers to new accounts, making 21000 gas insufficient for all funding, refund, and recovery transactions. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Felipe Selmo <fselmo2@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…checks (ethereum#2612)

… gas (ethereum#2595) Co-authored-by: spencer-tb <spencer.tb@ethereum.org>

…um#2610) Co-authored-by: spencer-tb <spencer.tb@ethereum.org>

…ode size validation (ethereum#2608) * fix(spec): charge CREATE state gas after initcode size validation Move charge_state_gas(STATE_BYTES_PER_NEW_ACCOUNT) from create()/create2() into generic_create(), after the MAX_INIT_CODE_SIZE check. Previously, state gas was charged before the initcode size check, so a CREATE with oversized initcode would persist state_gas_used equal to the account creation state gas cost (STATE_BYTES_PER_NEW_ACCOUNT * cost_per_state_byte) even though no account was ever created and no state was touched. Reported by @AskDragan (reth): ethereum#2578 (comment) * fix(spec): check static context before gas in CREATE/CREATE2 Move the is_static check from generic_create() into create() and create2(), before stack pops and charge_gas(). This is consistent with SSTORE, CALL, and SELFDESTRUCT which all check static context before any gas charging.

… the correct token formula

…evel failure (ethereum#2689) Co-authored-by: spencer-tb <spencer.tb@ethereum.org>

codecov · 2026-05-25T14:09:34Z

Codecov Report

❌ Patch coverage is 21.95122% with 32 lines in your changes missing coverage. Please review.
✅ Project coverage is 88.91%. Comparing base (1de389b) to head (2a765ab).
⚠️ Report is 4 commits behind head on forks/amsterdam.

Files with missing lines	Patch %	Lines
src/ethereum/forks/amsterdam/transactions.py	15.38%	22 Missing ⚠️
src/ethereum/forks/amsterdam/vm/__init__.py	41.66%	7 Missing ⚠️
src/ethereum/trace.py	0.00%	3 Missing ⚠️

Additional details and impacted files

@@                 Coverage Diff                 @@
##           forks/amsterdam    #2901      +/-   ##
===================================================
- Coverage            90.44%   88.91%   -1.53%     
===================================================
  Files                  535      496      -39     
  Lines                32439    29758    -2681     
  Branches              3012     2723     -289     
===================================================
- Hits                 29338    26459    -2879     
- Misses                2573     2814     +241     
+ Partials               528      485      -43

Flag	Coverage Δ
unittests	`88.91% <21.95%> (-1.53%)`	⬇️

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

☔ View full report in Codecov by Sentry.
📢 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 · 2026-05-27T14:27:49Z

@marioevz - removed the sstore_state_gas function here: 0bfb5f2

SamWilsn · 2026-05-27T21:37:34Z

+@dataclass
+class IntrinsicGasCost:
+    """
+    Intrinsic gas costs for a transaction, split by gas type.
+
+    `regular`: `ethereum.base_types.Uint`
+        Regular execution gas (calldata, base cost, access list, etc.)
+    `state`: `ethereum.base_types.Uint`
+        State growth gas (account creation, storage set, authorization).
+    `calldata_floor`: `ethereum.base_types.Uint`
+        Minimum gas cost based on calldata size per [EIP-7623].
+    """
+
+    regular: Uint
+    state: Uint
+    calldata_floor: Uint


This will need to be backported.

Agreed, will add to back meta item in EIP tracker, as a follow up: #2040 (comment)

marioevz

I've reviewed packages/testing and tests/amsterdam in this review round, and left a couple of comments, thanks!

leolara · 2026-05-28T09:54:29Z

I would like to say that many of my fixes for ported_static in amsterdam should be in snobal-6 and bal-7 branches.

#2783
#2790
#2796
#2839

Not merged yet: #2843

leolara · 2026-05-28T10:17:09Z

ported_static 👍🏼

kclowes

Got through Osaka, Berlin, and Byzantium today. I saw a few things that need to be updated, but nothing major!

kclowes · 2026-05-28T19:59:21Z

@@ -642,6 +648,13 @@ def intrinsic_cost_for_num_accounts(account_count: int) -> int:
    ],
 )
 @pytest.mark.valid_from("Osaka")
+# TODO[EIP-8037]: cap math here uses the combined intrinsic (regular + state)


Added an issue for this case here

kclowes · 2026-05-28T20:45:05Z

-    # Ensures that the precompile call is not starved by the 63/64 rule.
-    precompile_gas_with_margin = precompile_gas * 64 // 63
+    gas_costs = fork.gas_costs()
+    sstore_gas = gas_costs.STORAGE_SET * (len(modexp_expected) // 32)


I'm curious about this change. It looks like len(modexp_expected) // 32 = 38 // 32 = 1, so it only budgets for 1 SSTORE, when the contract actually does
2-4. I believe the test passes because extra_gas covers the shortfall, but may be missing something, or maybe that's ok, just wanted to flag :)

kclowes · 2026-05-28T23:04:11Z

    Alloc,
    Bytes,
    Environment,
+    Fork,


Looks like this can be removed. Not used anywhere.

marioevz

A couple more comments.

marioevz · 2026-05-29T00:40:27Z

+SYSTEM_MAX_SSTORES_PER_CALL = 16
+
+
+class EIP8037(BaseFork):


Shouldn't this class also update transaction_gas_limit_cap to return None again? It feels to me that the cap is effectively removed by this EIP. Not entirely sure about the repercussions though.

The cap still exists it just relocates to regular gas only!

Co-authored-by: Sam Wilson <57262657+SamWilsn@users.noreply.github.com>

…e pattern Co-authored-by: marioevz <11726710+marioevz@users.noreply.github.com>

Co-authored-by: marioevz <11726710+marioevz@users.noreply.github.com>

…r 8037 Co-authored-by: marioevz <11726710+marioevz@users.noreply.github.com>

… 8037 Co-authored-by: marioevz <11726710+marioevz@users.noreply.github.com>

Co-authored-by: marioevz <11726710+marioevz@users.noreply.github.com>

spencer-tb and others added 30 commits May 21, 2026 12:59

feat(specs, tests): implement EIP-8037 state creation gas cost increa…

48e3ac0

…se (ethereum#2363) * feat(spec-specs): update EIP-8037 to match latest spec revision * feat(tests): add EIP-8037 state creation gas cost increase tests

chore(specs, tests): restore spilled state gas to reservoir on revert…

cb3b9a4

…/halt (ethereum#2378)

feat(tests): add EIP-8037 multi-block and exact coinbase fee tests

0438c1e

feat(tests): add EIP-8037 gas validation edge cases from ethereum#2426

cff72ba

Co-authored-by: Ben Adams <thundercat@illyriad.co.uk>

chore(tests): fix tests and make bulletproof

4acadc9

feat(tests): add new_account variant to insufficient balance CALL test

af2f086

chore(tests): add valid_until marker to initcode over-limit exception…

35b4945

… test

feat(tests): add max initcode 2D gas metering test

4d2d73d

Test CREATE with max initcode size using proper regular/state gas split via the reservoir. Verifies gas boundary behavior with EIP-8037 two-dimensional metering.

feat(specs,tests): EIP-8037 state gas ordering and clarifications (et…

02b09fd

…hereum#2526) Co-authored-by: fselmo <fselmo2@gmail.com>

fix(specs, tests): remove per-tx state gas pre-check and add 2D block…

5fc80ab

… gas validity test (ethereum#2583) Co-authored-by: Stefan <22667037+qu0b@users.noreply.github.com>

fix(ported-tests): bump gas limits for Amsterdam (EIP-8037 state gas)

16664e6

Conditionally increase tx gas_limit (and env gas_limit where needed) when fork >= Amsterdam to account for EIP-8037 state creation gas costs. 137 files, 9 with env gas_limit bumps. Headroom: 2,000,000.

fix(spec,tests): code deposit ordering and regression tests

a2b8fd9

Move MAX_CODE_SIZE check before gas charges, charge keccak hash cost (regular gas) before code deposit state gas, and add tests for over-max code size and reservoir preservation after OOG.

feat(tests): update state gas creation tests with max_code_size case …

814272d

…and subcall pattern Co-authored-by: Mario Vega <marioevz@gmail.com>

chore(tests): remove obsolete static test skip list

03be91b

The static test skip list and conftest were a temporary workaround for EIP-8037 gas failures. The ported static tests in tests/ported_static/ replace this approach; failures are tracked in ethereum#2601.

chore(lint): fix import sorting and stale type annotation for static …

87c053c

…checks (ethereum#2612)

feat(tests): EIP-8037 - code deposit halt must discard initcode state…

f85eb5d

… gas (ethereum#2595) Co-authored-by: spencer-tb <spencer.tb@ethereum.org>

feat(tests): EIP-8037 blockchain header gas_used tests (ethereum#2611)

3454a00

feat(tests): block-level 2D gas accounting tests for EIP-8037 (ethere…

c913fe2

…um#2610) Co-authored-by: spencer-tb <spencer.tb@ethereum.org>

refactor(tests-eip8037): Condition tests to EIP inclusion

d2c21b2

fix(tests): Use pytest.mark.valid_before for EIP-8037

c59409a

fix(specs-amsterdam): Lint fails

8f362a8

fix(fill): use fork_at(), use is_eip_enabled(eip_number=7976) to pick…

c1ef9d4

… the correct token formula

fix: mypy

91ada91

feat(spec-specs, tests): EIP-8037 - zero execution state gas on top-l…

08c7ac5

…evel failure (ethereum#2689) Co-authored-by: spencer-tb <spencer.tb@ethereum.org>

This was referenced May 26, 2026

Test Release Tracker: bal-devnet@v7.3.0 #2912

Open

Test Release Tracker: benchmark@v0.0.10 #2913

Open

EIP-8037 Implementation Tracker: State Creation Gas Cost Increase #2040

Open

spencer-tb added 4 commits May 27, 2026 13:13

chore(spec-specs): remove escrow and use inline

fed95d7

chore(tests): trim eip7976 refund test to required 8037 changes

710b073

chore(tests): revert leftover fork/sender param swap in selfdestruct

e9f6bed

chore(tests,fw): replace sstore_state_gas with Op.SSTORE().state_cost()

0bfb5f2

spencer-tb marked this pull request as ready for review May 27, 2026 16:01

marioevz requested a review from SamWilsn May 27, 2026 16:12

SamWilsn reviewed May 27, 2026

View reviewed changes

marioevz reviewed May 27, 2026

View reviewed changes

leolara self-requested a review May 28, 2026 10:16

leolara previously approved these changes May 28, 2026

View reviewed changes

kclowes reviewed May 28, 2026

View reviewed changes

marioevz reviewed May 28, 2026

View reviewed changes

Comment thread tests/shanghai/eip3860_initcode/test_initcode.py

Comment thread tests/frontier/opcodes/test_dup.py

marioevz reviewed May 29, 2026

View reviewed changes

marioevz mentioned this pull request May 29, 2026

feat(test-specs): Allow automatic transaction gas-limit spencer-tb/execution-specs#9

Open

7 tasks

chore(spec-specs): address spec review comments

ac39618

Co-authored-by: Sam Wilson <57262657+SamWilsn@users.noreply.github.com>

spencer-tb dismissed leolara’s stale review via ac39618 June 1, 2026 12:36

spencer-tb and others added 5 commits June 1, 2026 16:40

chore(tests): restore bal opcode tests to canonical args_size/ret_siz…

b1e1f92

…e pattern Co-authored-by: marioevz <11726710+marioevz@users.noreply.github.com>

chore(tests): restore burn_logs SSTORE pattern and Conditional runtime

f345548

Co-authored-by: marioevz <11726710+marioevz@users.noreply.github.com>

chore(tests): restore nested_calls SSTORE pattern, forward all gas fo…

273b917

…r 8037 Co-authored-by: marioevz <11726710+marioevz@users.noreply.github.com>

chore(tests): restore fork-aware initcode fixture, gate gas_usage for…

e901736

… 8037 Co-authored-by: marioevz <11726710+marioevz@users.noreply.github.com>

chore(tests): restore EIP-7778 wording in gas_accounting comment

b95369f

Co-authored-by: marioevz <11726710+marioevz@users.noreply.github.com>

spencer-tb force-pushed the eips/amsterdam/eip-8037 branch from 9a978a8 to b95369f Compare June 1, 2026 15:41

chore(tests): gate fork-transition NEW_ACCOUNT bump on EIP-8037

1322b58

Co-authored-by: marioevz <11726710+marioevz@users.noreply.github.com>

Conversation

spencer-tb commented May 22, 2026 • edited by marioevz Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🗒️ Description

🔗 Related Issues or PRs

✅ Checklist

Uh oh!

codecov Bot commented May 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

spencer-tb commented May 27, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

SamWilsn May 27, 2026

Choose a reason for hiding this comment

Uh oh!

spencer-tb Jun 1, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

marioevz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

leolara commented May 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

leolara commented May 28, 2026

Uh oh!

kclowes left a comment

Choose a reason for hiding this comment

Uh oh!

kclowes May 28, 2026

Choose a reason for hiding this comment

Uh oh!

kclowes May 28, 2026

Choose a reason for hiding this comment

Uh oh!

kclowes May 28, 2026

Choose a reason for hiding this comment

Uh oh!

marioevz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

marioevz May 29, 2026

Choose a reason for hiding this comment

Uh oh!

spencer-tb Jun 1, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

spencer-tb commented May 22, 2026 •

edited by marioevz

Loading

codecov Bot commented May 25, 2026 •

edited

Loading

leolara commented May 28, 2026 •

edited

Loading