fix(ported_static): fork-specific Amsterdam balance for OoG refund tests #2790
+195
−40
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,10 @@ | |
|
|
||
| Ported from: | ||
| state_tests/stCreateTest/CreateOOGFromCallRefundsFiller.yml | ||
|
|
||
| @manually-enhanced: Do not overwrite. Post-state expectations include | ||
| fork-specific overrides for Amsterdam (EIP-8037 changes the OoG refund | ||
| arithmetic; sender keeps a non-zero residue). | ||
| """ | ||
|
|
||
| import pytest | ||
|
|
@@ -946,6 +950,24 @@ def test_create_oog_from_call_refunds( | |
| ), | ||
| }, | ||
| }, | ||
| { | ||
| # EIP-8037 (Amsterdam) two-dimensional gas model changes the | ||
| # OoG refund — sender keeps a non-zero residue. Listed before | ||
| # the >=Cancun entry so resolve_expect_post matches Amsterdam | ||
| # specifically (first-match wins). | ||
| "indexes": { | ||
| "data": [1, 2, 4, 5, 7, 8, 10, 11], | ||
| "gas": -1, | ||
| "value": -1, | ||
| }, | ||
| "network": [">=Amsterdam"], | ||
| "result": { | ||
| sender: Account(balance=0x19CBC0, nonce=2), | ||
| compute_create_address( | ||
| address=contract_0, nonce=1 | ||
| ): Account.NONEXISTENT, | ||
| }, | ||
| }, | ||
| { | ||
| "indexes": { | ||
| "data": [1, 2, 4, 5, 7, 8, 10, 11], | ||
|
|
@@ -971,6 +993,20 @@ def test_create_oog_from_call_refunds( | |
| contract_26: Account(balance=0, nonce=1), | ||
| }, | ||
| }, | ||
| { | ||
| # Amsterdam refund residue (see SStore_Refund_OoG comment). | ||
| "indexes": {"data": [13, 14], "gas": -1, "value": -1}, | ||
| "network": [">=Amsterdam"], | ||
| "result": { | ||
| sender: Account(balance=0x19CBC0, nonce=2), | ||
| compute_create_address( | ||
| address=contract_0, nonce=1 | ||
| ): Account.NONEXISTENT, | ||
| contract_26: Account( | ||
| storage={1: 1}, code=bytes.fromhex("32ff"), nonce=1 | ||
| ), | ||
| }, | ||
| }, | ||
| { | ||
| "indexes": {"data": [13, 14], "gas": -1, "value": -1}, | ||
| "network": [">=Cancun"], | ||
|
|
@@ -994,6 +1030,17 @@ def test_create_oog_from_call_refunds( | |
| ), | ||
| }, | ||
| }, | ||
| { | ||
| # Amsterdam refund residue (see SStore_Refund_OoG comment). | ||
| "indexes": {"data": [16, 17], "gas": -1, "value": -1}, | ||
| "network": [">=Amsterdam"], | ||
| "result": { | ||
| sender: Account(balance=0x19CBC0, nonce=2), | ||
| compute_create_address( | ||
| address=contract_0, nonce=1 | ||
| ): Account.NONEXISTENT, | ||
| }, | ||
| }, | ||
| { | ||
| "indexes": {"data": [16, 17], "gas": -1, "value": -1}, | ||
| "network": [">=Cancun"], | ||
|
|
@@ -1017,6 +1064,21 @@ def test_create_oog_from_call_refunds( | |
| ), | ||
| }, | ||
| }, | ||
| { | ||
| # Amsterdam refund residue is larger for the SStore+Create | ||
| # paths (see SStore_Refund_OoG comment). | ||
| "indexes": {"data": [19, 20], "gas": -1, "value": -1}, | ||
| "network": [">=Amsterdam"], | ||
| "result": { | ||
| sender: Account(balance=0x284E5C, nonce=2), | ||
| compute_create_address( | ||
| address=contract_0, nonce=1 | ||
| ): Account.NONEXISTENT, | ||
| Address( | ||
| 0x522C2E1C5DA65010908EF9929E327FE8B6CC86DA | ||
| ): Account.NONEXISTENT, | ||
| }, | ||
| }, | ||
| { | ||
| "indexes": {"data": [19, 20], "gas": -1, "value": -1}, | ||
| "network": [">=Cancun"], | ||
|
|
@@ -1043,6 +1105,20 @@ def test_create_oog_from_call_refunds( | |
| ), | ||
| }, | ||
| }, | ||
| { | ||
| # Amsterdam refund residue (see SStore_Create_Refund_OoG). | ||
| "indexes": {"data": [22, 23], "gas": -1, "value": -1}, | ||
| "network": [">=Amsterdam"], | ||
| "result": { | ||
| sender: Account(balance=0x284E5C, nonce=2), | ||
| compute_create_address( | ||
| address=contract_0, nonce=1 | ||
| ): Account.NONEXISTENT, | ||
| Address( | ||
| 0x06019547B6E360ABDAFEADE158A9667CC6106C17 | ||
| ): Account.NONEXISTENT, | ||
| }, | ||
| }, | ||
| { | ||
| "indexes": {"data": [22, 23], "gas": -1, "value": -1}, | ||
| "network": [">=Cancun"], | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
cpsbinevitably changes, this test (and the create test below) will automatically pick it up. I think we also won't need this>=Amsterdambranch because these helpers will return 0 before Amsterdam. Maybe something like:Then this line becomes something like: