feat(spec-specs, tests): merge EIP-8037 to `forks/amsterdam` - #2901

Merged

spencer-tb merged 140 commits into

ethereum:forks/amsterdamfrom

spencer-tb:eips/amsterdam/eip-8037

Jun 9, 2026

Commits on May 21, 2026

feat(specs, tests): implement EIP-8037 state creation gas cost increase (#2363)
spencer-tb
committed
48e3ac0
chore(specs, tests): restore spilled state gas to reservoir on revert/halt (#2378)
spencer-tb
committed
cb3b9a4
feat(tests): add EIP-8037 multi-block and exact coinbase fee tests
spencer-tb
committed
0438c1e
feat(tests): add EIP-8037 gas validation edge cases from #2426

spencer-tb
and
benaadams
committed
cff72ba
chore(tests): fix tests and make bulletproof
spencer-tb
committed
4acadc9
refactor(tests,forks): add state gas calculators and use fork methods
spencer-tb
committed
61390b2
feat(tests): add new_account variant to insufficient balance CALL test
spencer-tb
committed
af2f086
chore(tests): add valid_until marker to initcode over-limit exception test
spencer-tb
committed
35b4945
feat(tests): add max initcode 2D gas metering test
spencer-tb
committed
4d2d73d
fix(tests): resolve gas constant renames and gas limits after rebase
spencer-tb
committed
e5be13b
fix(tests): prevent `tx_gas_limit` double-accumulation across fixture format runs in withdrawal request contract tests (#2532)

authored and
spencer-tb
committed
7a0616c
feat(specs,tests): EIP-8037 state gas ordering and clarifications (#2526)

spencer-tb
and
fselmo
committed
02b09fd
fix(specs, tests): remove per-tx state gas pre-check and add 2D block gas validity test (#2583)

spencer-tb
and
qu0b
committed
5fc80ab
fix(ported-tests): bump gas limits for Amsterdam (EIP-8037 state gas)
spencer-tb
committed
16664e6
fix(spec,tests): code deposit ordering and regression tests
spencer-tb
committed
a2b8fd9
fix(spec): track collision-burned gas in regular_gas_used
spencer-tb
committed
db28420
feat(tests): update state gas creation tests with max_code_size case and subcall pattern

spencer-tb
and
marioevz
committed
814272d
chore(tests): remove obsolete static test skip list
spencer-tb
committed
03be91b
fix(execute): use configurable gas limit for funding txs (EIP-8037) (#2603)

authored and
spencer-tb
committed
cd997a0
chore(lint): fix import sorting and stale type annotation for static checks (#2612)
spencer-tb
committed
87c053c
feat(tests): EIP-8037 - code deposit halt must discard initcode state gas (#2595)

qu0b
and
spencer-tb
committed
f85eb5d
feat(tests): EIP-8037 blockchain header gas_used tests (#2611)
spencer-tb
committed
3454a00
feat(tests): block-level 2D gas accounting tests for EIP-8037 (#2610)

qu0b
and
spencer-tb
committed
c913fe2
feat(spec-specs): EIP-8037 - move CREATE state gas charge after initcode size validation (#2608)
spencer-tb
committed
16880c9
refactor(tests-eip8037): Condition tests to EIP inclusion

marioevz
authored and
spencer-tb
committed
d2c21b2
fix(tests): Use `pytest.mark.valid_before` for EIP-8037

marioevz
authored and
spencer-tb
committed
c59409a
fix(specs-amsterdam): Lint fails

marioevz
authored and
spencer-tb
committed
8f362a8
fix(fill): use fork_at(), use is_eip_enabled(eip_number=7976) to pick the correct token formula

felix314159
authored and
spencer-tb
committed
c1ef9d4
fix: mypy

felix314159
authored and
spencer-tb
committed
91ada91
feat(spec-specs, tests): EIP-8037 - zero execution state gas on top-level failure (#2689)

kclowes
and
spencer-tb
committed
08c7ac5
feat(spec-specs, tests): EIP-8037 - CREATE failure refunds state gas to reservoir (#2704)
spencer-tb
committed
06cb624
feat(spec-specs, tests): EIP-8037 - 0 to x to 0 SSTORE refunds to state gas (#2698)
spencer-tb
committed
006726e
feat(tests): EIP-8037 - CALL with value to selfdestructed account (#2646)

kclowes
and
spencer-tb
committed
2c1b123
feat(spec-specs, tests): EIP-8037 - SELFDESTRUCT same-tx refunds state gas at end of tx (#2707)
spencer-tb
committed
c203bba
feat(spec-specs, tests): EIP-8037 - immutable intrinsic state gas for EIP-7702 (#2711)
spencer-tb
committed
25ae29b
feat(spec-specs, tests): EIP-8037 - per-dimension block gas limit check at tx inclusion (#2703)

kclowes
and
spencer-tb
committed
bc2cf74
feat(tests): EIP-8073 - remove stale header verify on CALL to selfdestructed tests (#2725)
spencer-tb
committed
45f6ade
chore(tests): restore and extend Amsterdam ported static skip list (#2732)
spencer-tb
committed
32b0c70
feat(spec-specs, tests): EIP-8037 SSTORE refund clamp and initcode fixture guard (#2729)
spencer-tb
committed
0a5a294
feat(spec-specs, tests): EIP-8037 - apply calldata floor to sender refund (#2728)
spencer-tb
committed
e3d1a4f
feat(spec-specs,tests): EIP-8037 nested child frame refunds (#2733)

fselmo
authored and
spencer-tb
committed
f658bee
feat(tests): EIP-8037 additional state gas coverage (#2718)
spencer-tb
committed
177433d
feat(tests, spec-specs): add full cost per state byte pricing function for EIP-8037 (#2687)

spencer-tb
and
marioevz
committed
fee5bab
fix(rebase): align EIP-8037 with forks/amsterdam GasCosts refactor
spencer-tb
committed
6b35372
fix(tests): harmonize cross-EIP tests with EIP-8037 state-gas model
spencer-tb
committed
c2fca06
fix(tests): harmonize cross-EIP tests with EIP-8037 state-gas model
spencer-tb
committed
517df3c
fix(tests): EIP-8037 workaround

marioevz
authored and
spencer-tb
committed
66e0743
feat(test-forks): EIP-8037 add SELFDESTRUCT refund

marioevz
authored and
spencer-tb
committed
efbd482
fix(tests): EIP-7708 + 8037 cross-EIP fixes

marioevz
authored and
spencer-tb
committed
53b4293
feat(specs): EIP-8037: Make CPSB fixed

marioevz
authored and
spencer-tb
committed
5e3e0a0
feat(test-forks): EIP-8037: Make CPSB fixed

marioevz
authored and
spencer-tb
committed
bda317f
refactor(test-execute): include EIP-8037 state-gas in contract deployment (#2760)

qu0b
authored and
spencer-tb
committed
fb44563
fix: calculate and return regular gas and deploy gas limit

fselmo
authored and
spencer-tb
committed
a779809
fix(test-forks): EIP-8037: Regular cost/state cost

marioevz
authored and
spencer-tb
committed
d333a07
fix(tests): EIP-8037: All test changes

marioevz
authored and
spencer-tb
committed
dd7104b
fix(tests): EIP-8037: Revert frame-level test changes
spencer-tb
committed
82f094d
fix(tests): EIP-8037: Revert frame-level mcopy test changes
spencer-tb
committed
d161af7
fix(test): fix bal test by reverting back to forks/amsterdam state

fselmo
authored and
spencer-tb
committed
3b7dc34
fix(test): re-calculate the gas forwarded and burned for create collision test

fselmo
authored and
spencer-tb
committed
a3bdea4
fix(test): fix test with proper gas accounting with metadata

fselmo
authored and
spencer-tb
committed
27c26c6
chore: just fix + just static linting

fselmo
authored and
spencer-tb
committed
6d76cfc
fix(test): Fix some remaining failing tests; remove some related to old frame spec

fselmo
authored and
spencer-tb
committed
f8900ca
feat(tests, spec-specs): correct/new halt/reservior behavior
spencer-tb
committed
a03be88
feat(tests): fix ported static stCreate2
spencer-tb
committed
c128793
feat(tests): fix ported static stRevertTest
spencer-tb
committed
b5615e7
feat(tests): fix ported static stCreate2
spencer-tb
committed
9b13729
test(tests): Add a nested CALL frame test for reservoir check on halt / revert

fselmo
authored and
spencer-tb
committed
416b795
feat(tests): state -> blockchain test to check header gas used for nested call 8037 revert / halt tests

fselmo
authored and
spencer-tb
committed
2b6b2b8
fix(tests): fix withdrawals test setup while filling

fselmo
authored and
spencer-tb
committed
629e4a5
fix: turn on skipped EIP-7702 tests

fselmo
authored and
spencer-tb
committed
1c48de0
feat(test): calculate gas and header verify for create collision test

fselmo
authored and
spencer-tb
committed
832427b
fix(spec-specs): correct gas accounting for blocks under create collision

fselmo
authored and
spencer-tb
committed
57eb4ef
feat(test): configure block gas used with header_verify

fselmo
authored and
spencer-tb
committed
7de44fd
Snobal tests for bad 7702 state gas accounting

Carsons-Eels
authored and
spencer-tb
committed
7565158
chore(ported_static): sync from forks/amsterdam onto snøbal/6 (#2783)

authored and
spencer-tb
committed
f1f1a1f
fix(ported_static): fork-specific Amsterdam balance for OoG refund tests (#2790)

leolara
authored and
spencer-tb
committed
c0226db
feat(spec-specs, tests): EIP-8037 halt refunds spilled state gas (#2815)
spencer-tb
committed
95f9136
fix(spec,test): 7702 refund block-level gas accounting for EIP-8037 (#2816)

fselmo
and
spencer-tb
committed
adaefad
feat(tests): 8037-Add tests for 7702 interactions (#2722)

kclowes
authored and
spencer-tb
committed
4fc1b2b
feat(spec-specs, tests): EIP-8037 more refund fixes (#2823)

spencer-tb
and
fselmo
committed
9a03237
feat(spec-specs, tests): 8037 more 2d edge cases (#2735)

authored and
spencer-tb
committed
879accf
feat(spec,test): update bal-devnet-7 EIP-8037 bytes values; CPSB 1174 -> 1530 (#2827)

fselmo
authored and
spencer-tb
committed
ca01266
feat(spec-specs, tests): EIP-8037 tx created contracts destroyed in same tx (#2828)
spencer-tb
committed
2ee1402
feat(spec-specs, tests): eip-8037 system transaction gas state reservoir
spencer-tb
committed
43de09f
feat(tests): eip-8037 cover CALL+value+new_account state-gas refund
spencer-tb
committed
8a9c2a9
fix(ported_static): bump gas budgets for EIP-8037 state-gas headroom on Amsterdam (#2796)

leolara
authored and
spencer-tb
committed
ebb43e4
fix(spec,test): align with latest EIP-8037 auth refund changes (#2836)

fselmo
authored and
spencer-tb
committed
493c894
feat(spec-specs, tests): remove SD state gas refunds from EIP-8037 (#2845)

spencer-tb
and
fselmo
committed
3186cdd
fix(ported_static): fork-conditional gas bumps for ~340 EIP-8037 Amsterdam tests (#2839)

committed
b3c88c9
feat(tests): EIP-8037 create OOG state gas boundary coverage (#2847)
spencer-tb
committed
2e04750
fix(tests): post-merge artifacts and SD state-gas bump
spencer-tb
committed
322d26b
fix(tests): post-merge static lint and typecheck
spencer-tb
committed
66846fe
fix(tests): drop unused gas_sstore in legacy gas harness generator
spencer-tb
committed
ce0dd5b
feat(tests, spec-specs): refill auth state gas on delegation clear for EIP-8037 (#2848)
spencer-tb
committed
94be6a3
fix(tests): harmonize EIP-7928 cross-tx BAL tests with EIP-8037 gas model
spencer-tb
committed
1a8ef6b
feat(tests, spec-specs): eip8037 sstore/collision clear dynamics (#2863)

fselmo
and
spencer-tb
committed
11a0ae4
feat(tests): EIP-8037 isolate intrinsic-regular > cap with floor < cap (#2870)

chfast
authored and
spencer-tb
committed
dd30c7c

Commits on May 22, 2026

fix(merge): repair conflict-resolution artifacts post EIP-8037 cherry-pick
spencer-tb
committed
4835044

Commits on May 25, 2026

chore: address review round one comments
spencer-tb
committed
2a765ab

Commits on Jun 1, 2026

chore(spec-specs): address spec review comments

spencer-tb
and
SamWilsn
committed
ac39618
chore(tests): restore bal opcode tests to canonical args_size/ret_size pattern

spencer-tb
and
marioevz
committed
b1e1f92
chore(tests): restore burn_logs SSTORE pattern and Conditional runtime

spencer-tb
and
marioevz
committed
f345548
chore(tests): restore nested_calls SSTORE pattern, forward all gas for 8037

spencer-tb
and
marioevz
committed
273b917
chore(tests): restore fork-aware initcode fixture, gate gas_usage for 8037

spencer-tb
and
marioevz
committed
e901736
chore(tests): restore EIP-7778 wording in gas_accounting comment

spencer-tb
and
marioevz
committed
b95369f
chore(tests): gate fork-transition NEW_ACCOUNT bump on EIP-8037

spencer-tb
and
marioevz
committed
1322b58

Commits on Jun 2, 2026

chore(tests): make authorized-tx gas-cap test fork-aware for 8037

spencer-tb
and
kclowes
committed
1732df1
chore(tests): restore modexp sstore budget and precompile margin

spencer-tb
and
kclowes
committed
2c7fe05
chore(tests): drop unused fork param in modexp test

spencer-tb
and
kclowes
committed
88055cf
fix(ported_static): Approach-1 + stale-skip cleanup for Amsterdam OoG-by-design tests (#2843)

leolara
authored and
spencer-tb
committed
8dd608b
Merge commit '14eca5d3c1' into eips/amsterdam/eip-8037
marioevz
committed
044613a
fix(test-forks): Fix typo
marioevz
committed
e1907cd
fix(specs): Fix static checks
marioevz
committed
b481c9b

Commits on Jun 3, 2026

chore(tests): restore BAL opcode coverage reverted in rebase

spencer-tb
and
marioevz
committed
60af274
chore(tests): raise gas for the cross tx BAL withdrawal test

spencer-tb
and
marioevz
committed
aa822c7
fix(spec-specs, tests): defer get_code into generic_call for the call family

spencer-tb
and
marioevz
committed
c77d964
chore(tests): remove unnecessary pre_alloc_mutable marker

spencer-tb
and
marioevz
committed
2cdfb38
refactor(test-execute): simplify deploy gas limit computation
spencer-tb
committed
fed265d
chore(test-forks): ascii multiply, drop map entry bullets and 8038 TODO
spencer-tb
committed
c00c508
chore(test-forks): drop redundant comments, fix state gas docstrings
spencer-tb
committed
5ca26d7
chore(test-forks): prefer del over noqa, trim oog_budget_lift docstring
spencer-tb
committed
e0eb1e8
fix(spec-specs, tests): eager get_code, gate delegation BAL on 8037

spencer-tb
and
marioevz
committed
4bc0f25
chore(spec-specs): move state fields to end of message call output

spencer-tb
and
SamWilsn
committed
22d5607
chore(spec-specs): backport intrinsic gas cost dataclass

spencer-tb
and
SamWilsn
committed
a2d18ca
chore(spec-specs): backport calculate message call gas keyword arguments

spencer-tb
and
SamWilsn
committed
88a7834
chore(spec-specs): add generic call params dataclass for generic call

spencer-tb
and
SamWilsn
committed
cf3fb8c
chore(spec-specs): inline the sstore state gas constant

spencer-tb
and
SamWilsn
committed
95f2b47
chore(spec-specs): split sstore regular and state gas

spencer-tb
and
SamWilsn
committed
8ddcf68
chore(spec-specs): trim state gas costs docstring

spencer-tb
and
SamWilsn
committed
6b217d3
chore(spec-specs): rename generic call dataclass and simplify is_static

spencer-tb
authored and
SamWilsn
committed
854c61b
chore(tests): revert stray docstrings, trim verbose gas comments
spencer-tb
committed
c7ae616

Commits on Jun 4, 2026

Apply suggestions from code review
marioevz
authored
3fa93d3

Commits on Jun 9, 2026