fix(ported_static): fork-specific Amsterdam balance for OoG refund tests#2790
fix(ported_static): fork-specific Amsterdam balance for OoG refund tests#2790leolara wants to merge 1 commit intoethereum:devnets/snøbal/4from
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## devnets/snøbal/4 #2790 +/- ##
===================================================
Coverage ? 86.68%
===================================================
Files ? 599
Lines ? 37848
Branches ? 3821
===================================================
Hits ? 32807
Misses ? 4503
Partials ? 538
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
EIP-8037's two-dimensional gas model changes the refund arithmetic on OoG paths in test_create_oog_from_call_refunds and test_create2_oog_from_call_refunds. The sender ends up with a non-zero residue where Cancun/Prague/Osaka leave 0 — 0x19CBC0 wei for SStore/SelfDestruct/LogOp OoG paths and 0x284E5C wei for the SStore + CREATE/CREATE2 paths. Add per-fork overrides for the five OoG `expect_entries_` blocks (data indexes [1,2,4,5,7,8,10,11], [13,14], [16,17], [19,20], [22,23]) so Amsterdam matches the new balance via resolve_expect_post's first-match rule. Other forks keep the original `balance=0` post-state. Drop the 36 corresponding entries from amsterdam_skip_list.txt and mark both test files `@manually-enhanced` to keep these overrides immune to future regeneration. Note: the residue values are observed empirically from the failing fill output on snøbal/4, not derived from the EIP-8037 specification text. A reviewer who knows EIP-8037 should confirm these are the right targets. Verified: --fork Amsterdam on the two test files -> 144 passed (24 parametrizations x 3 fixture variants x 2 files), 0 failed.
leolara
force-pushed
the
wt-snobal-4-amsterdam-oog-balances
branch
from
53a1301 to
2f57424
Compare
kclowes
left a comment
kclowes
left a comment
There was a problem hiding this comment.
LGTM! The 0x19CBC0 and 0x284E5C values seem right to me. I left a comment about deriving the value instead of hard-coding, but feel free to get ignore if it doesn't make sense!
| }, | ||
| "network": [">=Amsterdam"], | ||
| "result": { | ||
| sender: Account(balance=0x19CBC0, nonce=2), |
There was a problem hiding this comment.
Since this is manually-enhanced anyway, I wonder if it's worth making a couple helpers to do this calculation instead of hard coding so that when cpsb inevitably changes, this test (and the create test below) will automatically pick it up. I think we also won't need this >=Amsterdam branch because these helpers will return 0 before Amsterdam. Maybe something like:
residue_sstore = (
fork.create_state_gas(code_size=0)
+ fork.sstore_state_gas()
) * gas_priceThen this line becomes something like:
| sender: Account(balance=0x19CBC0, nonce=2), | |
| sender: Account(balance=residue_sstore, nonce=2), |
| "indexes": {"data": [19, 20], "gas": -1, "value": -1}, | ||
| "network": [">=Amsterdam"], | ||
| "result": { | ||
| sender: Account(balance=0x284E5C, nonce=2), |
There was a problem hiding this comment.
Similarly, you could have another helper like:
residue_sstore_create = (
fork.create_state_gas(code_size=0)
+ fork.create_state_gas(code_size=1)
) * gas_priceand then this line becomes:
| sender: Account(balance=0x284E5C, nonce=2), | |
| sender: Account(balance=residue_sstore_create, nonce=2), |
2 participants
🗒️ Description
Add Amsterdam-specific post-state balance overrides for the OoG-refund parametrizations of
test_create_oog_from_call_refunds.pyandtest_create2_oog_from_call_refunds.py, then drop the 36 corresponding entries fromamsterdam_skip_list.txt.EIP-8037's two-dimensional gas model changes the refund arithmetic on OoG paths in these tests. The sender ends up with a non-zero residue where Cancun/Prague/Osaka leave
0:data ∈ {1,2,4,5,7,8,10,11,13,14,16,17})0x19CBC0(1 690 560 wei)data ∈ {19,20,22,23})0x284E5C(2 641 500 wei)For each of the five OoG
expect_entries_blocks per file, a clone withnetwork: [">=Amsterdam"]and the residue value above is inserted before the existingnetwork: [">=Cancun"]entry, soresolve_expect_post's first-match rule picks the Amsterdam-specific entry on Amsterdam and falls through to the original on earlier forks.Both files now carry an
@manually-enhancedmarker so the change survives futurescripts/filler_to_pythonregeneration.Caveat — values are empirical, not derived
The constants
0x19CBC0and0x284E5Care the observedgotbalances from the failing fill output on snøbal/4 — clustered by parametrization. They have not been derived from EIP-8037's specification text. A reviewer who knows EIP-8037's refund accounting should confirm these are the right targets (and ideally that they should be exactly these values on Amsterdam).Verification
--fork Amsterdamon the two files: 144 passed, 0 failed (24 parametrizations × 3 fixture variants × 2 files).--fork Cancunon the two files: 144 passed, 0 failed (sanity check that the>=Cancunfall-through still works).🔗 Related Issues or PRs
tests/ported_static/) — the two files this PR edits weren't touched by the sync (they were among the 606 snøbal/4-modified files preserved). Skip-list pruning here removes 36 OoG-related entries from snøbal/4's full 5 469-entry list.✅ Checklist
just statictype(scope):.mkdocs servelocally and verified the auto-generated docs for new tests in the Test Case Reference are correctly formatted.@ported_frommarker.