From 1427f876ff229a00cab9e5efd96112dec9335752 Mon Sep 17 00:00:00 2001 From: Leo Lara Date: Wed, 17 Jun 2026 17:33:25 +0700 Subject: [PATCH 1/6] chore(tests): unskip ported_static cases now passing on Amsterdam PR #2969 made the transaction gas limit automatic. On EIP-8037 forks the implicit limit now carries a state-gas reservoir, so tests that leave the transaction gas limit unset receive enough headroom and stop running out of gas under the two-dimensional gas model. Filling tests/ported_static/ for Amsterdam without the skip list shows 33 of these entries pass across all fixture variants. Remove them from amsterdam_skip_list.txt and recompute the per-section counts and the total, from 480 down to 447. Two sections become empty and are dropped, stCallDelegateCodesHomestead and stRecursiveCreate. Most of the cleared cases are the _suicide_end family. They set only the environment gas limit and rely on the implicit transaction gas limit, so the reservoir restores their pre-Amsterdam behaviour. --- tests/ported_static/amsterdam_skip_list.txt | 47 +++------------------ 1 file changed, 5 insertions(+), 42 deletions(-) diff --git a/tests/ported_static/amsterdam_skip_list.txt b/tests/ported_static/amsterdam_skip_list.txt index 0a07bbec654..32786874493 100644 --- a/tests/ported_static/amsterdam_skip_list.txt +++ b/tests/ported_static/amsterdam_skip_list.txt @@ -8,7 +8,7 @@ # Entries are substring-matched against each pytest nodeid (after # stripping the fixture-format suffix in conftest.py). # -# Total entries: 480 +# Total entries: 447 # stAttackTest (1) stAttackTest/test_crashing_transaction.py::test_crashing_transaction[fork_Amsterdam] @@ -19,16 +19,10 @@ stBadOpcode/test_measure_gas.py::test_measure_gas[fork_Amsterdam-CREATE] stBadOpcode/test_operation_diff_gas.py::test_operation_diff_gas[fork_Amsterdam-CREATE2] stBadOpcode/test_operation_diff_gas.py::test_operation_diff_gas[fork_Amsterdam-CREATE] -# stCallCodes (9) -stCallCodes/test_callcall_00_suicide_end.py::test_callcall_00_suicide_end[fork_Amsterdam] -stCallCodes/test_callcallcall_000_suicide_end.py::test_callcallcall_000_suicide_end[fork_Amsterdam] -stCallCodes/test_callcallcodecall_010_suicide_end.py::test_callcallcodecall_010_suicide_end[fork_Amsterdam] +# stCallCodes (3) stCallCodes/test_callcode_in_initcode_to_existing_contract.py::test_callcode_in_initcode_to_existing_contract[fork_Amsterdam-d0] stCallCodes/test_callcode_in_initcode_to_existing_contract.py::test_callcode_in_initcode_to_existing_contract[fork_Amsterdam-d1] stCallCodes/test_callcode_in_initcode_to_existing_contract_with_value_transfer.py::test_callcode_in_initcode_to_existing_contract_with_value_transfer[fork_Amsterdam] -stCallCodes/test_callcodecall_10_suicide_end.py::test_callcodecall_10_suicide_end[fork_Amsterdam] -stCallCodes/test_callcodecallcall_100_suicide_end.py::test_callcodecallcall_100_suicide_end[fork_Amsterdam] -stCallCodes/test_callcodecallcodecall_110_suicide_end.py::test_callcodecallcodecall_110_suicide_end[fork_Amsterdam] # stCallCreateCallCodeTest (12) stCallCreateCallCodeTest/test_call1024_oog.py::test_call1024_oog[fork_Amsterdam--g0] @@ -44,29 +38,9 @@ stCallCreateCallCodeTest/test_create_name_registrator_per_txs_not_enough_gas.py: stCallCreateCallCodeTest/test_create_name_registrator_per_txs_not_enough_gas.py::test_create_name_registrator_per_txs_not_enough_gas[fork_Amsterdam--g1] stCallCreateCallCodeTest/test_create_name_registrator_pre_store1_not_enough_gas.py::test_create_name_registrator_pre_store1_not_enough_gas[fork_Amsterdam] -# stCallDelegateCodesCallCodeHomestead (10) +# stCallDelegateCodesCallCodeHomestead (2) stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_end.py::test_callcallcallcode_001_suicide_end[fork_Amsterdam] -stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_suicide_end.py::test_callcallcode_01_suicide_end[fork_Amsterdam] -stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_end.py::test_callcallcodecall_010_suicide_end[fork_Amsterdam] stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_oogm_before.py::test_callcallcodecallcode_011_oogm_before[fork_Amsterdam] -stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_end.py::test_callcallcodecallcode_011_suicide_end[fork_Amsterdam] -stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_suicide_end.py::test_callcodecall_10_suicide_end[fork_Amsterdam] -stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_end.py::test_callcodecallcall_100_suicide_end[fork_Amsterdam] -stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_end.py::test_callcodecallcallcode_101_suicide_end[fork_Amsterdam] -stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_suicide_end.py::test_callcodecallcode_11_suicide_end[fork_Amsterdam] -stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_end.py::test_callcodecallcodecall_110_suicide_end[fork_Amsterdam] - -# stCallDelegateCodesHomestead (10) -stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_end.py::test_callcallcallcode_001_suicide_end[fork_Amsterdam] -stCallDelegateCodesHomestead/test_callcallcode_01_suicide_end.py::test_callcallcode_01_suicide_end[fork_Amsterdam] -stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_end.py::test_callcallcodecall_010_suicide_end[fork_Amsterdam] -stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_end.py::test_callcallcodecallcode_011_suicide_end[fork_Amsterdam] -stCallDelegateCodesHomestead/test_callcodecall_10_suicide_end.py::test_callcodecall_10_suicide_end[fork_Amsterdam] -stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_end.py::test_callcodecallcall_100_suicide_end[fork_Amsterdam] -stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_end.py::test_callcodecallcallcode_101_suicide_end[fork_Amsterdam] -stCallDelegateCodesHomestead/test_callcodecallcode_11_suicide_end.py::test_callcodecallcode_11_suicide_end[fork_Amsterdam] -stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_end.py::test_callcodecallcodecall_110_suicide_end[fork_Amsterdam] -stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_end.py::test_callcodecallcodecallcode_111_suicide_end[fork_Amsterdam] # stCodeSizeLimit (2) stCodeSizeLimit/test_create2_code_size_limit.py::test_create2_code_size_limit[fork_Amsterdam-valid] @@ -112,26 +86,21 @@ stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_dept stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_depth_create_address_collision_berlin[fork_Amsterdam-d1-g1-v0] stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_depth_create_address_collision_berlin[fork_Amsterdam-d1-g1-v1] -# stCreateTest (52) +# stCreateTest (47) stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-0xef-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-code-too-big-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-contructor-revert-v1] -stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-high-nonce-v0] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-high-nonce-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-invalid-opcode-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-ok-v1] -stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-oog-constructor-v0] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-oog-constructor-v1] -stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-oog-post-constr-v0] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-oog-post-constr-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-0xef-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-code-too-big-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-contructor-revert-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-invalid-opcode-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-ok-v1] -stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-oog-constructor-v0] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-oog-constructor-v1] -stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-oog-post-constr-v0] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-oog-post-constr-v1] stCreateTest/test_create_collision_results.py::test_create_collision_results[fork_Amsterdam-d0] stCreateTest/test_create_collision_results.py::test_create_collision_results[fork_Amsterdam-d1] @@ -345,9 +314,6 @@ stNonZeroCallsTest/test_non_zero_value_delegatecall_to_one_storage_key_paris.py: stPreCompiledContracts2/test_call_sha256_1_nonzero_value.py::test_call_sha256_1_nonzero_value[fork_Amsterdam] stPreCompiledContracts2/test_ecrecover_short_buff.py::test_ecrecover_short_buff[fork_Amsterdam] -# stRecursiveCreate (1) -stRecursiveCreate/test_recursive_create.py::test_recursive_create[fork_Amsterdam] - # stRefundTest (7) stRefundTest/test_refund50_2.py::test_refund50_2[fork_Amsterdam] stRefundTest/test_refund50percent_cap.py::test_refund50percent_cap[fork_Amsterdam] @@ -361,15 +327,12 @@ stRefundTest/test_refund_tx_to_suicide.py::test_refund_tx_to_suicide[fork_Amster stReturnDataTest/test_returndatasize_after_successful_callcode.py::test_returndatasize_after_successful_callcode[fork_Amsterdam] stReturnDataTest/test_subcall_return_more_then_expected.py::test_subcall_return_more_then_expected[fork_Amsterdam] -# stRevertTest (28) +# stRevertTest (25) stRevertTest/test_loop_calls_depth_then_revert.py::test_loop_calls_depth_then_revert[fork_Amsterdam] stRevertTest/test_loop_calls_then_revert.py::test_loop_calls_then_revert[fork_Amsterdam] stRevertTest/test_loop_delegate_calls_depth_then_revert.py::test_loop_delegate_calls_depth_then_revert[fork_Amsterdam] -stRevertTest/test_revert_depth2.py::test_revert_depth2[fork_Amsterdam--g1] stRevertTest/test_revert_depth_create_address_collision.py::test_revert_depth_create_address_collision[fork_Amsterdam-d0-g1-v0] stRevertTest/test_revert_depth_create_address_collision.py::test_revert_depth_create_address_collision[fork_Amsterdam-d0-g1-v1] -stRevertTest/test_revert_depth_create_address_collision.py::test_revert_depth_create_address_collision[fork_Amsterdam-d1-g1-v0] -stRevertTest/test_revert_depth_create_address_collision.py::test_revert_depth_create_address_collision[fork_Amsterdam-d1-g1-v1] stRevertTest/test_revert_depth_create_oog.py::test_revert_depth_create_oog[fork_Amsterdam-d0-g1-v0] stRevertTest/test_revert_depth_create_oog.py::test_revert_depth_create_oog[fork_Amsterdam-d0-g1-v1] stRevertTest/test_revert_depth_create_oog.py::test_revert_depth_create_oog[fork_Amsterdam-d1-g1-v0] From a02bd3f425f6de8a25d6562c593ee5113c3d904f Mon Sep 17 00:00:00 2001 From: Leo Lara Date: Wed, 17 Jun 2026 17:39:36 +0700 Subject: [PATCH 2/6] chore(tests): drop obsolete ported_static skip entries on Amsterdam These 10 entries match no test collected on Amsterdam, so the conftest never skips anything for them. They are dead weight in the list. Eight are size-limit tests under stCodeSizeLimit and stEIP3860_limitmeterinitcode. They carry valid_before("EIP7954"), and Amsterdam includes EIP-7954, so pytest deselects them and they never reach the skip step. Both sections empty out and are dropped. Two are stCreateTest/test_create_address_warm_after_fail cases pinned to a create-code-too-big-v1 parametrization that no longer exists after the test was reparametrized. Recompute the section counts and the total, from 447 down to 437. --- tests/ported_static/amsterdam_skip_list.txt | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/tests/ported_static/amsterdam_skip_list.txt b/tests/ported_static/amsterdam_skip_list.txt index 32786874493..be82e93c263 100644 --- a/tests/ported_static/amsterdam_skip_list.txt +++ b/tests/ported_static/amsterdam_skip_list.txt @@ -8,7 +8,7 @@ # Entries are substring-matched against each pytest nodeid (after # stripping the fixture-format suffix in conftest.py). # -# Total entries: 447 +# Total entries: 437 # stAttackTest (1) stAttackTest/test_crashing_transaction.py::test_crashing_transaction[fork_Amsterdam] @@ -42,10 +42,6 @@ stCallCreateCallCodeTest/test_create_name_registrator_pre_store1_not_enough_gas. stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_end.py::test_callcallcallcode_001_suicide_end[fork_Amsterdam] stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_oogm_before.py::test_callcallcodecallcode_011_oogm_before[fork_Amsterdam] -# stCodeSizeLimit (2) -stCodeSizeLimit/test_create2_code_size_limit.py::test_create2_code_size_limit[fork_Amsterdam-valid] -stCodeSizeLimit/test_create_code_size_limit.py::test_create_code_size_limit[fork_Amsterdam-valid] - # stCreate2 (38) stCreate2/test_create2_oo_gafter_init_code_revert2.py::test_create2_oo_gafter_init_code_revert2[fork_Amsterdam] stCreate2/test_create2_oog_from_call_refunds.py::test_create2_oog_from_call_refunds[fork_Amsterdam-SStore_CallCode_Refund_NoOoG] @@ -86,9 +82,8 @@ stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_dept stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_depth_create_address_collision_berlin[fork_Amsterdam-d1-g1-v0] stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_depth_create_address_collision_berlin[fork_Amsterdam-d1-g1-v1] -# stCreateTest (47) +# stCreateTest (45) stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-0xef-v1] -stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-code-too-big-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-contructor-revert-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-high-nonce-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-invalid-opcode-v1] @@ -96,7 +91,6 @@ stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_af stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-oog-constructor-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-oog-post-constr-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-0xef-v1] -stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-code-too-big-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-contructor-revert-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-invalid-opcode-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-ok-v1] @@ -205,14 +199,6 @@ stEIP3855_push0/test_push0_gas.py::test_push0_gas[fork_Amsterdam] stEIP3855_push0/test_push0_gas2.py::test_push0_gas2[fork_Amsterdam-use_push0] stEIP3855_push0/test_push0_gas2.py::test_push0_gas2[fork_Amsterdam-use_push1_00] -# stEIP3860_limitmeterinitcode (6) -stEIP3860_limitmeterinitcode/test_create2_init_code_size_limit.py::test_create2_init_code_size_limit[fork_Amsterdam-invalid] -stEIP3860_limitmeterinitcode/test_create2_init_code_size_limit.py::test_create2_init_code_size_limit[fork_Amsterdam-valid] -stEIP3860_limitmeterinitcode/test_create_init_code_size_limit.py::test_create_init_code_size_limit[fork_Amsterdam-invalid] -stEIP3860_limitmeterinitcode/test_create_init_code_size_limit.py::test_create_init_code_size_limit[fork_Amsterdam-valid] -stEIP3860_limitmeterinitcode/test_creation_tx_init_code_size_limit.py::test_creation_tx_init_code_size_limit[fork_Amsterdam-invalid] -stEIP3860_limitmeterinitcode/test_creation_tx_init_code_size_limit.py::test_creation_tx_init_code_size_limit[fork_Amsterdam-valid] - # stEIP5656_MCOPY (55) stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size0-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size0-g1] From 27c1b0263d4d4cc941d795fb15eaaa938f54824e Mon Sep 17 00:00:00 2001 From: Leo Lara Date: Wed, 17 Jun 2026 19:16:18 +0700 Subject: [PATCH 3/6] chore(tests): unset incidental tx gas_limit on 69 ported_static files PR #2969 computes the transaction gas limit automatically and adds a state-gas reservoir on EIP-8037 forks. These 69 files set an explicit transaction gas_limit that was incidental: it sufficed on older forks, but on Amsterdam the state-gas component pushed the transaction over its budget and broke the test. Leaving the gas limit unset gives each transaction the implicit limit plus reservoir, which restores the recorded full-execution behaviour. Drop the transaction gas_limit from these files, together with the helpers it orphaned (tx_gas lists, an intrinsic-gas computation) and three now-unused fork-conditional bumps that the unset limit supersedes. Filling them across every valid fork passes all variants with no residual failures, so remove their 116 entries from amsterdam_skip_list.txt. Total 437 down to 321. --- tests/ported_static/amsterdam_skip_list.txt | 156 ++---------------- ...st_callcallcodecallcode_011_oogm_before.py | 1 - .../stCreate2/test_create2call_precompiles.py | 2 - .../test_create2check_fields_in_initcode.py | 2 - .../test_create_collision_results.py | 2 - ...test_create_oo_gafter_init_code_revert2.py | 2 - .../test_delegatecode_dynamic_code.py | 1 - .../test_coinbase_warm_account_call_gas.py | 2 - .../stEIP3855_push0/test_push0.py | 2 - .../stMemoryTest/test_calldatacopy_dejavu2.py | 1 - .../test_call_sha256_1_nonzero_value.py | 1 - .../test_ecrecover_short_buff.py | 1 - ...eturndatasize_after_successful_callcode.py | 1 - .../test_subcall_return_more_then_expected.py | 1 - .../test_loop_calls_then_revert.py | 1 - ..._change_from_external_call_in_init_code.py | 10 -- .../stSelfBalance/test_self_balance.py | 1 - .../test_self_balance_equals_balance.py | 1 - .../test_self_balance_gas_cost.py | 1 - .../stSolidityTest/test_test_overflow.py | 1 - .../test_test_structures_and_variabless.py | 1 - ...more_gas_on_depth2_then_transaction_has.py | 2 - ...ic_call_contract_to_create_contract_oog.py | 1 - .../test_static_call_recursive_bomb3.py | 1 - ...test_static_call_sha256_1_nonzero_value.py | 1 - .../test_static_callcall_00_ooge_1.py | 2 - .../test_static_callcallcode_01_ooge_2.py | 2 - ...st_static_callcallcodecallcode_011_ooge.py | 2 - ..._static_callcallcodecallcode_011_ooge_2.py | 2 - ...tic_callcallcodecallcode_011_oogm_after.py | 2 - ...ic_callcallcodecallcode_011_oogm_after2.py | 2 - ...c_callcallcodecallcode_011_oogm_after_1.py | 2 - ...c_callcallcodecallcode_011_oogm_after_2.py | 2 - ...ic_callcallcodecallcode_011_oogm_before.py | 2 - ...c_callcallcodecallcode_011_oogm_before2.py | 2 - .../test_static_callcodecall_10_ooge.py | 2 - .../test_static_callcodecall_10_ooge_2.py | 2 - .../test_static_callcodecallcall_100_ooge.py | 2 - .../test_static_callcodecallcall_100_ooge2.py | 2 - ...tatic_callcodecallcall_100_oogm_after_3.py | 2 - ...static_callcodecallcall_100_oogm_before.py | 2 - ...tatic_callcodecallcall_100_oogm_before2.py | 2 - ..._static_callcodecallcallcode_101_ooge_2.py | 1 - ...tic_callcodecallcallcode_101_oogm_after.py | 1 - ...ic_callcodecallcallcode_101_oogm_after2.py | 2 - ...ic_callcodecallcallcode_101_oogm_before.py | 1 - ...c_callcodecallcallcode_101_oogm_before2.py | 2 - ...st_static_callcodecallcodecall_110_ooge.py | 1 - ...t_static_callcodecallcodecall_110_ooge2.py | 2 - ...tic_callcodecallcodecall_110_oogm_after.py | 1 - ...ic_callcodecallcodecall_110_oogm_after2.py | 2 - ...c_callcodecallcodecall_110_oogm_after_2.py | 1 - ...c_callcodecallcodecall_110_oogm_after_3.py | 1 - ...ic_callcodecallcodecall_110_oogm_before.py | 1 - ...c_callcodecallcodecall_110_oogm_before2.py | 2 - .../test_static_calldelcode_01_ooge.py | 2 - .../test_static_revert_opcode_calls.py | 2 - ...code_to_precompile_from_called_contract.py | 2 - ...precompile_from_contract_initialization.py | 2 - ...callcode_to_precompile_from_transaction.py | 2 - ...call_to_precompile_from_called_contract.py | 1 - ...precompile_from_contract_initialization.py | 1 - ...gatecall_to_precompile_from_transaction.py | 1 - .../test_ab_acalls_suicide0.py | 1 - .../stSystemOperationsTest/test_call10.py | 1 - ..._name_registrator_address_too_big_right.py | 1 - .../test_day_limit_construction_partial.py | 1 - .../test_wallet_construction_partial.py | 1 - .../test_exp_power256_of256.py | 1 - .../vmArithmeticTest/test_two_ops.py | 1 - 70 files changed, 14 insertions(+), 254 deletions(-) diff --git a/tests/ported_static/amsterdam_skip_list.txt b/tests/ported_static/amsterdam_skip_list.txt index be82e93c263..89e5636719a 100644 --- a/tests/ported_static/amsterdam_skip_list.txt +++ b/tests/ported_static/amsterdam_skip_list.txt @@ -8,7 +8,7 @@ # Entries are substring-matched against each pytest nodeid (after # stripping the fixture-format suffix in conftest.py). # -# Total entries: 437 +# Total entries: 321 # stAttackTest (1) stAttackTest/test_crashing_transaction.py::test_crashing_transaction[fork_Amsterdam] @@ -38,23 +38,15 @@ stCallCreateCallCodeTest/test_create_name_registrator_per_txs_not_enough_gas.py: stCallCreateCallCodeTest/test_create_name_registrator_per_txs_not_enough_gas.py::test_create_name_registrator_per_txs_not_enough_gas[fork_Amsterdam--g1] stCallCreateCallCodeTest/test_create_name_registrator_pre_store1_not_enough_gas.py::test_create_name_registrator_pre_store1_not_enough_gas[fork_Amsterdam] -# stCallDelegateCodesCallCodeHomestead (2) +# stCallDelegateCodesCallCodeHomestead (1) stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_end.py::test_callcallcallcode_001_suicide_end[fork_Amsterdam] -stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_oogm_before.py::test_callcallcodecallcode_011_oogm_before[fork_Amsterdam] -# stCreate2 (38) +# stCreate2 (31) stCreate2/test_create2_oo_gafter_init_code_revert2.py::test_create2_oo_gafter_init_code_revert2[fork_Amsterdam] stCreate2/test_create2_oog_from_call_refunds.py::test_create2_oog_from_call_refunds[fork_Amsterdam-SStore_CallCode_Refund_NoOoG] stCreate2/test_create2_oog_from_call_refunds.py::test_create2_oog_from_call_refunds[fork_Amsterdam-SStore_Create2_Refund_NoOoG] stCreate2/test_create2_oog_from_call_refunds.py::test_create2_oog_from_call_refunds[fork_Amsterdam-SStore_Create_Refund_NoOoG] stCreate2/test_create2_oog_from_call_refunds.py::test_create2_oog_from_call_refunds[fork_Amsterdam-SStore_DelegateCall_Refund_NoOoG] -stCreate2/test_create2call_precompiles.py::test_create2call_precompiles[fork_Amsterdam-d7] -stCreate2/test_create2check_fields_in_initcode.py::test_create2check_fields_in_initcode[fork_Amsterdam-d0] -stCreate2/test_create2check_fields_in_initcode.py::test_create2check_fields_in_initcode[fork_Amsterdam-d1] -stCreate2/test_create2check_fields_in_initcode.py::test_create2check_fields_in_initcode[fork_Amsterdam-d2] -stCreate2/test_create2check_fields_in_initcode.py::test_create2check_fields_in_initcode[fork_Amsterdam-d4] -stCreate2/test_create2check_fields_in_initcode.py::test_create2check_fields_in_initcode[fork_Amsterdam-d5] -stCreate2/test_create2check_fields_in_initcode.py::test_create2check_fields_in_initcode[fork_Amsterdam-d6] stCreate2/test_create2collision_selfdestructed_oog.py::test_create2collision_selfdestructed_oog[fork_Amsterdam-d0] stCreate2/test_create2collision_selfdestructed_oog.py::test_create2collision_selfdestructed_oog[fork_Amsterdam-d1] stCreate2/test_create2collision_selfdestructed_oog.py::test_create2collision_selfdestructed_oog[fork_Amsterdam-d2] @@ -82,7 +74,7 @@ stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_dept stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_depth_create_address_collision_berlin[fork_Amsterdam-d1-g1-v0] stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_depth_create_address_collision_berlin[fork_Amsterdam-d1-g1-v1] -# stCreateTest (45) +# stCreateTest (42) stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-0xef-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-contructor-revert-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-high-nonce-v1] @@ -96,8 +88,6 @@ stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_af stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-ok-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-oog-constructor-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-oog-post-constr-v1] -stCreateTest/test_create_collision_results.py::test_create_collision_results[fork_Amsterdam-d0] -stCreateTest/test_create_collision_results.py::test_create_collision_results[fork_Amsterdam-d1] stCreateTest/test_create_collision_to_empty2.py::test_create_collision_to_empty2[fork_Amsterdam-d0-g0-v0] stCreateTest/test_create_collision_to_empty2.py::test_create_collision_to_empty2[fork_Amsterdam-d0-g0-v1] stCreateTest/test_create_e_contract_create_ne_contract_in_init_oog_tr.py::test_create_e_contract_create_ne_contract_in_init_oog_tr[fork_Amsterdam--g0] @@ -111,7 +101,6 @@ stCreateTest/test_create_empty_contract_with_storage.py::test_create_empty_contr stCreateTest/test_create_empty_contract_with_storage_and_call_it_0wei.py::test_create_empty_contract_with_storage_and_call_it_0wei[fork_Amsterdam] stCreateTest/test_create_empty_contract_with_storage_and_call_it_1wei.py::test_create_empty_contract_with_storage_and_call_it_1wei[fork_Amsterdam] stCreateTest/test_create_oo_gafter_init_code_returndata_size.py::test_create_oo_gafter_init_code_returndata_size[fork_Amsterdam] -stCreateTest/test_create_oo_gafter_init_code_revert2.py::test_create_oo_gafter_init_code_revert2[fork_Amsterdam-d0] stCreateTest/test_create_oog_from_call_refunds.py::test_create_oog_from_call_refunds[fork_Amsterdam-SStore_Create2_Refund_NoOoG] stCreateTest/test_create_oog_from_call_refunds.py::test_create_oog_from_call_refunds[fork_Amsterdam-SStore_Create_Refund_NoOoG] stCreateTest/test_create_oog_from_call_refunds.py::test_create_oog_from_call_refunds[fork_Amsterdam-SStore_Refund_NoOoG2] @@ -129,14 +118,13 @@ stCreateTest/test_transaction_collision_to_empty_but_code.py::test_transaction_c stCreateTest/test_transaction_collision_to_empty_but_nonce.py::test_transaction_collision_to_empty_but_nonce[fork_Amsterdam--g1-v0] stCreateTest/test_transaction_collision_to_empty_but_nonce.py::test_transaction_collision_to_empty_but_nonce[fork_Amsterdam--g1-v1] -# stDelegatecallTestHomestead (7) +# stDelegatecallTestHomestead (6) stDelegatecallTestHomestead/test_call1024_oog.py::test_call1024_oog[fork_Amsterdam--g0] stDelegatecallTestHomestead/test_call1024_oog.py::test_call1024_oog[fork_Amsterdam--g1] stDelegatecallTestHomestead/test_deleagate_call_after_value_transfer.py::test_deleagate_call_after_value_transfer[fork_Amsterdam] stDelegatecallTestHomestead/test_delegatecall1024_oog.py::test_delegatecall1024_oog[fork_Amsterdam] stDelegatecallTestHomestead/test_delegatecall_emptycontract.py::test_delegatecall_emptycontract[fork_Amsterdam] stDelegatecallTestHomestead/test_delegatecall_in_initcode_to_existing_contract.py::test_delegatecall_in_initcode_to_existing_contract[fork_Amsterdam] -stDelegatecallTestHomestead/test_delegatecode_dynamic_code.py::test_delegatecode_dynamic_code[fork_Amsterdam] # stEIP150Specific (7) stEIP150Specific/test_call_ask_more_gas_on_depth2_then_transaction_has.py::test_call_ask_more_gas_on_depth2_then_transaction_has[fork_Amsterdam] @@ -183,18 +171,7 @@ stEIP1559/test_sender_balance.py::test_sender_balance[fork_Amsterdam] # stEIP158Specific (1) stEIP158Specific/test_exp_empty.py::test_exp_empty[fork_Amsterdam] -# stEIP3651_warmcoinbase (8) -stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py::test_coinbase_warm_account_call_gas[fork_Amsterdam-d0] -stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py::test_coinbase_warm_account_call_gas[fork_Amsterdam-d1] -stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py::test_coinbase_warm_account_call_gas[fork_Amsterdam-d2] -stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py::test_coinbase_warm_account_call_gas[fork_Amsterdam-d3] -stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py::test_coinbase_warm_account_call_gas[fork_Amsterdam-d4] -stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py::test_coinbase_warm_account_call_gas[fork_Amsterdam-d5] -stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py::test_coinbase_warm_account_call_gas[fork_Amsterdam-d6] -stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py::test_coinbase_warm_account_call_gas[fork_Amsterdam-d7] - -# stEIP3855_push0 (4) -stEIP3855_push0/test_push0.py::test_push0[fork_Amsterdam-1025_push0] +# stEIP3855_push0 (3) stEIP3855_push0/test_push0_gas.py::test_push0_gas[fork_Amsterdam] stEIP3855_push0/test_push0_gas2.py::test_push0_gas2[fork_Amsterdam-use_push0] stEIP3855_push0/test_push0_gas2.py::test_push0_gas2[fork_Amsterdam-use_push1_00] @@ -277,9 +254,8 @@ stMemExpandingEIP150Calls/test_new_gas_price_for_codes_with_mem_expanding_calls. # stMemoryStressTest (1) stMemoryStressTest/test_return_bounds.py::test_return_bounds[fork_Amsterdam--g1] -# stMemoryTest (5) +# stMemoryTest (4) stMemoryTest/test_call_data_copy_offset.py::test_call_data_copy_offset[fork_Amsterdam] -stMemoryTest/test_calldatacopy_dejavu2.py::test_calldatacopy_dejavu2[fork_Amsterdam] stMemoryTest/test_code_copy_offset.py::test_code_copy_offset[fork_Amsterdam] stMemoryTest/test_oog.py::test_oog[fork_Amsterdam-success14] stMemoryTest/test_oog.py::test_oog[fork_Amsterdam-success15] @@ -296,10 +272,6 @@ stNonZeroCallsTest/test_non_zero_value_delegatecall_to_empty_paris.py::test_non_ stNonZeroCallsTest/test_non_zero_value_delegatecall_to_non_non_zero_balance.py::test_non_zero_value_delegatecall_to_non_non_zero_balance[fork_Amsterdam] stNonZeroCallsTest/test_non_zero_value_delegatecall_to_one_storage_key_paris.py::test_non_zero_value_delegatecall_to_one_storage_key_paris[fork_Amsterdam] -# stPreCompiledContracts2 (2) -stPreCompiledContracts2/test_call_sha256_1_nonzero_value.py::test_call_sha256_1_nonzero_value[fork_Amsterdam] -stPreCompiledContracts2/test_ecrecover_short_buff.py::test_ecrecover_short_buff[fork_Amsterdam] - # stRefundTest (7) stRefundTest/test_refund50_2.py::test_refund50_2[fork_Amsterdam] stRefundTest/test_refund50percent_cap.py::test_refund50percent_cap[fork_Amsterdam] @@ -309,13 +281,8 @@ stRefundTest/test_refund_suicide50procent_cap.py::test_refund_suicide50procent_c stRefundTest/test_refund_suicide50procent_cap.py::test_refund_suicide50procent_cap[fork_Amsterdam-d1] stRefundTest/test_refund_tx_to_suicide.py::test_refund_tx_to_suicide[fork_Amsterdam] -# stReturnDataTest (2) -stReturnDataTest/test_returndatasize_after_successful_callcode.py::test_returndatasize_after_successful_callcode[fork_Amsterdam] -stReturnDataTest/test_subcall_return_more_then_expected.py::test_subcall_return_more_then_expected[fork_Amsterdam] - -# stRevertTest (25) +# stRevertTest (24) stRevertTest/test_loop_calls_depth_then_revert.py::test_loop_calls_depth_then_revert[fork_Amsterdam] -stRevertTest/test_loop_calls_then_revert.py::test_loop_calls_then_revert[fork_Amsterdam] stRevertTest/test_loop_delegate_calls_depth_then_revert.py::test_loop_delegate_calls_depth_then_revert[fork_Amsterdam] stRevertTest/test_revert_depth_create_address_collision.py::test_revert_depth_create_address_collision[fork_Amsterdam-d0-g1-v0] stRevertTest/test_revert_depth_create_address_collision.py::test_revert_depth_create_address_collision[fork_Amsterdam-d0-g1-v1] @@ -340,99 +307,22 @@ stRevertTest/test_revert_opcode_multiple_sub_calls.py::test_revert_opcode_multip stRevertTest/test_revert_opcode_multiple_sub_calls.py::test_revert_opcode_multiple_sub_calls[fork_Amsterdam-d3-g2-v0] stRevertTest/test_revert_opcode_multiple_sub_calls.py::test_revert_opcode_multiple_sub_calls[fork_Amsterdam-d3-g2-v1] -# stSStoreTest (10) -stSStoreTest/test_sstore_change_from_external_call_in_init_code.py::test_sstore_change_from_external_call_in_init_code[fork_Amsterdam-d0] -stSStoreTest/test_sstore_change_from_external_call_in_init_code.py::test_sstore_change_from_external_call_in_init_code[fork_Amsterdam-d1] -stSStoreTest/test_sstore_change_from_external_call_in_init_code.py::test_sstore_change_from_external_call_in_init_code[fork_Amsterdam-d3] -stSStoreTest/test_sstore_change_from_external_call_in_init_code.py::test_sstore_change_from_external_call_in_init_code[fork_Amsterdam-d4] -stSStoreTest/test_sstore_change_from_external_call_in_init_code.py::test_sstore_change_from_external_call_in_init_code[fork_Amsterdam-d5] -stSStoreTest/test_sstore_change_from_external_call_in_init_code.py::test_sstore_change_from_external_call_in_init_code[fork_Amsterdam-d7] +# stSStoreTest (4) stSStoreTest/test_sstore_gas.py::test_sstore_gas[fork_Amsterdam] stSStoreTest/test_sstore_gas_left.py::test_sstore_gas_left[fork_Amsterdam-d2] stSStoreTest/test_sstore_gas_left.py::test_sstore_gas_left[fork_Amsterdam-d5] stSStoreTest/test_sstore_gas_left.py::test_sstore_gas_left[fork_Amsterdam-d8] -# stSelfBalance (3) -stSelfBalance/test_self_balance.py::test_self_balance[fork_Amsterdam] -stSelfBalance/test_self_balance_equals_balance.py::test_self_balance_equals_balance[fork_Amsterdam] -stSelfBalance/test_self_balance_gas_cost.py::test_self_balance_gas_cost[fork_Amsterdam] - -# stSolidityTest (5) +# stSolidityTest (3) stSolidityTest/test_recursive_create_contracts.py::test_recursive_create_contracts[fork_Amsterdam] stSolidityTest/test_test_contract_interaction.py::test_test_contract_interaction[fork_Amsterdam] stSolidityTest/test_test_contract_suicide.py::test_test_contract_suicide[fork_Amsterdam] -stSolidityTest/test_test_overflow.py::test_test_overflow[fork_Amsterdam] -stSolidityTest/test_test_structures_and_variabless.py::test_test_structures_and_variabless[fork_Amsterdam] # stSpecialTest (1) stSpecialTest/test_make_money.py::test_make_money[fork_Amsterdam] -# stStaticCall (81) -stStaticCall/test_static_call_ask_more_gas_on_depth2_then_transaction_has.py::test_static_call_ask_more_gas_on_depth2_then_transaction_has[fork_Amsterdam-d0] -stStaticCall/test_static_call_contract_to_create_contract_oog.py::test_static_call_contract_to_create_contract_oog[fork_Amsterdam--v1] -stStaticCall/test_static_call_recursive_bomb3.py::test_static_call_recursive_bomb3[fork_Amsterdam] -stStaticCall/test_static_call_sha256_1_nonzero_value.py::test_static_call_sha256_1_nonzero_value[fork_Amsterdam] +# stStaticCall (16) stStaticCall/test_static_call_value_inherit_from_call.py::test_static_call_value_inherit_from_call[fork_Amsterdam] -stStaticCall/test_static_callcall_00_ooge_1.py::test_static_callcall_00_ooge_1[fork_Amsterdam-d0] -stStaticCall/test_static_callcall_00_ooge_1.py::test_static_callcall_00_ooge_1[fork_Amsterdam-d1] -stStaticCall/test_static_callcallcode_01_ooge_2.py::test_static_callcallcode_01_ooge_2[fork_Amsterdam-d0] -stStaticCall/test_static_callcallcode_01_ooge_2.py::test_static_callcallcode_01_ooge_2[fork_Amsterdam-d1] -stStaticCall/test_static_callcallcodecallcode_011_ooge.py::test_static_callcallcodecallcode_011_ooge[fork_Amsterdam-d0] -stStaticCall/test_static_callcallcodecallcode_011_ooge.py::test_static_callcallcodecallcode_011_ooge[fork_Amsterdam-d1] -stStaticCall/test_static_callcallcodecallcode_011_ooge_2.py::test_static_callcallcodecallcode_011_ooge_2[fork_Amsterdam-d0] -stStaticCall/test_static_callcallcodecallcode_011_ooge_2.py::test_static_callcallcodecallcode_011_ooge_2[fork_Amsterdam-d1] -stStaticCall/test_static_callcallcodecallcode_011_oogm_after.py::test_static_callcallcodecallcode_011_oogm_after[fork_Amsterdam-d0] -stStaticCall/test_static_callcallcodecallcode_011_oogm_after.py::test_static_callcallcodecallcode_011_oogm_after[fork_Amsterdam-d1] -stStaticCall/test_static_callcallcodecallcode_011_oogm_after2.py::test_static_callcallcodecallcode_011_oogm_after2[fork_Amsterdam-d0] -stStaticCall/test_static_callcallcodecallcode_011_oogm_after2.py::test_static_callcallcodecallcode_011_oogm_after2[fork_Amsterdam-d1] -stStaticCall/test_static_callcallcodecallcode_011_oogm_after_1.py::test_static_callcallcodecallcode_011_oogm_after_1[fork_Amsterdam-d0] -stStaticCall/test_static_callcallcodecallcode_011_oogm_after_1.py::test_static_callcallcodecallcode_011_oogm_after_1[fork_Amsterdam-d1] -stStaticCall/test_static_callcallcodecallcode_011_oogm_after_2.py::test_static_callcallcodecallcode_011_oogm_after_2[fork_Amsterdam-d0] -stStaticCall/test_static_callcallcodecallcode_011_oogm_after_2.py::test_static_callcallcodecallcode_011_oogm_after_2[fork_Amsterdam-d1] -stStaticCall/test_static_callcallcodecallcode_011_oogm_before.py::test_static_callcallcodecallcode_011_oogm_before[fork_Amsterdam-d0] -stStaticCall/test_static_callcallcodecallcode_011_oogm_before.py::test_static_callcallcodecallcode_011_oogm_before[fork_Amsterdam-d1] -stStaticCall/test_static_callcallcodecallcode_011_oogm_before2.py::test_static_callcallcodecallcode_011_oogm_before2[fork_Amsterdam-d0] -stStaticCall/test_static_callcallcodecallcode_011_oogm_before2.py::test_static_callcallcodecallcode_011_oogm_before2[fork_Amsterdam-d1] -stStaticCall/test_static_callcallcodecallcode_011_oogm_before2.py::test_static_callcallcodecallcode_011_oogm_before2[fork_Amsterdam-d2] -stStaticCall/test_static_callcodecall_10_ooge.py::test_static_callcodecall_10_ooge[fork_Amsterdam-d0] -stStaticCall/test_static_callcodecall_10_ooge.py::test_static_callcodecall_10_ooge[fork_Amsterdam-d1] -stStaticCall/test_static_callcodecall_10_ooge_2.py::test_static_callcodecall_10_ooge_2[fork_Amsterdam-d0] -stStaticCall/test_static_callcodecall_10_ooge_2.py::test_static_callcodecall_10_ooge_2[fork_Amsterdam-d1] -stStaticCall/test_static_callcodecallcall_100_ooge.py::test_static_callcodecallcall_100_ooge[fork_Amsterdam-d0] -stStaticCall/test_static_callcodecallcall_100_ooge.py::test_static_callcodecallcall_100_ooge[fork_Amsterdam-d1] -stStaticCall/test_static_callcodecallcall_100_ooge2.py::test_static_callcodecallcall_100_ooge2[fork_Amsterdam-d0] -stStaticCall/test_static_callcodecallcall_100_ooge2.py::test_static_callcodecallcall_100_ooge2[fork_Amsterdam-d1] -stStaticCall/test_static_callcodecallcall_100_oogm_after_3.py::test_static_callcodecallcall_100_oogm_after_3[fork_Amsterdam--v0] -stStaticCall/test_static_callcodecallcall_100_oogm_after_3.py::test_static_callcodecallcall_100_oogm_after_3[fork_Amsterdam--v1] -stStaticCall/test_static_callcodecallcall_100_oogm_before.py::test_static_callcodecallcall_100_oogm_before[fork_Amsterdam-d0] -stStaticCall/test_static_callcodecallcall_100_oogm_before.py::test_static_callcodecallcall_100_oogm_before[fork_Amsterdam-d1] -stStaticCall/test_static_callcodecallcall_100_oogm_before2.py::test_static_callcodecallcall_100_oogm_before2[fork_Amsterdam-d0-v0] -stStaticCall/test_static_callcodecallcall_100_oogm_before2.py::test_static_callcodecallcall_100_oogm_before2[fork_Amsterdam-d0-v1] -stStaticCall/test_static_callcodecallcall_100_oogm_before2.py::test_static_callcodecallcall_100_oogm_before2[fork_Amsterdam-d1-v0] -stStaticCall/test_static_callcodecallcall_100_oogm_before2.py::test_static_callcodecallcall_100_oogm_before2[fork_Amsterdam-d1-v1] -stStaticCall/test_static_callcodecallcallcode_101_ooge_2.py::test_static_callcodecallcallcode_101_ooge_2[fork_Amsterdam] -stStaticCall/test_static_callcodecallcallcode_101_oogm_after.py::test_static_callcodecallcallcode_101_oogm_after[fork_Amsterdam] -stStaticCall/test_static_callcodecallcallcode_101_oogm_after2.py::test_static_callcodecallcallcode_101_oogm_after2[fork_Amsterdam--v0] -stStaticCall/test_static_callcodecallcallcode_101_oogm_after2.py::test_static_callcodecallcallcode_101_oogm_after2[fork_Amsterdam--v1] -stStaticCall/test_static_callcodecallcallcode_101_oogm_before.py::test_static_callcodecallcallcode_101_oogm_before[fork_Amsterdam] -stStaticCall/test_static_callcodecallcallcode_101_oogm_before2.py::test_static_callcodecallcallcode_101_oogm_before2[fork_Amsterdam--v0] -stStaticCall/test_static_callcodecallcallcode_101_oogm_before2.py::test_static_callcodecallcallcode_101_oogm_before2[fork_Amsterdam--v1] -stStaticCall/test_static_callcodecallcodecall_110_ooge.py::test_static_callcodecallcodecall_110_ooge[fork_Amsterdam] -stStaticCall/test_static_callcodecallcodecall_110_ooge2.py::test_static_callcodecallcodecall_110_ooge2[fork_Amsterdam--v0] -stStaticCall/test_static_callcodecallcodecall_110_ooge2.py::test_static_callcodecallcodecall_110_ooge2[fork_Amsterdam--v1] -stStaticCall/test_static_callcodecallcodecall_110_ooge2.py::test_static_callcodecallcodecall_110_ooge2[fork_Amsterdam--v2] -stStaticCall/test_static_callcodecallcodecall_110_oogm_after.py::test_static_callcodecallcodecall_110_oogm_after[fork_Amsterdam] -stStaticCall/test_static_callcodecallcodecall_110_oogm_after2.py::test_static_callcodecallcodecall_110_oogm_after2[fork_Amsterdam--v0] -stStaticCall/test_static_callcodecallcodecall_110_oogm_after2.py::test_static_callcodecallcodecall_110_oogm_after2[fork_Amsterdam--v1] -stStaticCall/test_static_callcodecallcodecall_110_oogm_after2.py::test_static_callcodecallcodecall_110_oogm_after2[fork_Amsterdam--v2] -stStaticCall/test_static_callcodecallcodecall_110_oogm_after_2.py::test_static_callcodecallcodecall_110_oogm_after_2[fork_Amsterdam] -stStaticCall/test_static_callcodecallcodecall_110_oogm_after_3.py::test_static_callcodecallcodecall_110_oogm_after_3[fork_Amsterdam] -stStaticCall/test_static_callcodecallcodecall_110_oogm_before.py::test_static_callcodecallcodecall_110_oogm_before[fork_Amsterdam] -stStaticCall/test_static_callcodecallcodecall_110_oogm_before2.py::test_static_callcodecallcodecall_110_oogm_before2[fork_Amsterdam--v0] -stStaticCall/test_static_callcodecallcodecall_110_oogm_before2.py::test_static_callcodecallcodecall_110_oogm_before2[fork_Amsterdam--v1] -stStaticCall/test_static_callcodecallcodecall_110_oogm_before2.py::test_static_callcodecallcodecall_110_oogm_before2[fork_Amsterdam--v2] -stStaticCall/test_static_calldelcode_01_ooge.py::test_static_calldelcode_01_ooge[fork_Amsterdam-d0] -stStaticCall/test_static_calldelcode_01_ooge.py::test_static_calldelcode_01_ooge[fork_Amsterdam-d1] stStaticCall/test_static_check_opcodes4.py::test_static_check_opcodes4[fork_Amsterdam--g1-v0] stStaticCall/test_static_check_opcodes4.py::test_static_check_opcodes4[fork_Amsterdam--g1-v1] stStaticCall/test_static_check_opcodes5.py::test_static_check_opcodes5[fork_Amsterdam-d0-g1-v0] @@ -448,27 +338,15 @@ stStaticCall/test_static_check_opcodes5.py::test_static_check_opcodes5[fork_Amst stStaticCall/test_static_create_empty_contract_and_call_it_0wei.py::test_static_create_empty_contract_and_call_it_0wei[fork_Amsterdam] stStaticCall/test_static_create_empty_contract_with_storage_and_call_it_0wei.py::test_static_create_empty_contract_with_storage_and_call_it_0wei[fork_Amsterdam] stStaticCall/test_static_execute_call_that_ask_fore_gas_then_trabsaction_has.py::test_static_execute_call_that_ask_fore_gas_then_trabsaction_has[fork_Amsterdam-d0] -stStaticCall/test_static_revert_opcode_calls.py::test_static_revert_opcode_calls[fork_Amsterdam--g1] - -# stStaticFlagEnabled (6) -stStaticFlagEnabled/test_callcode_to_precompile_from_called_contract.py::test_callcode_to_precompile_from_called_contract[fork_Amsterdam] -stStaticFlagEnabled/test_callcode_to_precompile_from_contract_initialization.py::test_callcode_to_precompile_from_contract_initialization[fork_Amsterdam] -stStaticFlagEnabled/test_callcode_to_precompile_from_transaction.py::test_callcode_to_precompile_from_transaction[fork_Amsterdam] -stStaticFlagEnabled/test_delegatecall_to_precompile_from_called_contract.py::test_delegatecall_to_precompile_from_called_contract[fork_Amsterdam] -stStaticFlagEnabled/test_delegatecall_to_precompile_from_contract_initialization.py::test_delegatecall_to_precompile_from_contract_initialization[fork_Amsterdam] -stStaticFlagEnabled/test_delegatecall_to_precompile_from_transaction.py::test_delegatecall_to_precompile_from_transaction[fork_Amsterdam] -# stSystemOperationsTest (8) +# stSystemOperationsTest (5) stSystemOperationsTest/test_ab_acalls0.py::test_ab_acalls0[fork_Amsterdam] stSystemOperationsTest/test_ab_acalls3.py::test_ab_acalls3[fork_Amsterdam] -stSystemOperationsTest/test_ab_acalls_suicide0.py::test_ab_acalls_suicide0[fork_Amsterdam] -stSystemOperationsTest/test_call10.py::test_call10[fork_Amsterdam] stSystemOperationsTest/test_call_recursive_bomb3.py::test_call_recursive_bomb3[fork_Amsterdam] -stSystemOperationsTest/test_call_to_name_registrator_address_too_big_right.py::test_call_to_name_registrator_address_too_big_right[fork_Amsterdam] stSystemOperationsTest/test_double_selfdestruct_touch_paris.py::test_double_selfdestruct_touch_paris[fork_Amsterdam--v1] stSystemOperationsTest/test_double_selfdestruct_touch_paris.py::test_double_selfdestruct_touch_paris[fork_Amsterdam--v2] -# stTransactionTest (21) +# stTransactionTest (20) stTransactionTest/test_no_src_account_create.py::test_no_src_account_create[fork_Amsterdam-d0-g1-v0] stTransactionTest/test_no_src_account_create.py::test_no_src_account_create[fork_Amsterdam-d0-g1-v1] stTransactionTest/test_no_src_account_create.py::test_no_src_account_create[fork_Amsterdam-d1-g1-v0] @@ -489,13 +367,8 @@ stTransactionTest/test_opcodes_transaction_init.py::test_opcodes_transaction_ini stTransactionTest/test_opcodes_transaction_init.py::test_opcodes_transaction_init[fork_Amsterdam-side_effects] stTransactionTest/test_store_gas_on_create.py::test_store_gas_on_create[fork_Amsterdam] stTransactionTest/test_suicides_and_internal_call_suicides_success.py::test_suicides_and_internal_call_suicides_success[fork_Amsterdam-d1] -vmArithmeticTest/test_exp_power256_of256.py::test_exp_power256_of256[fork_Amsterdam] - -# stWalletTest (2) -stWalletTest/test_day_limit_construction_partial.py::test_day_limit_construction_partial[fork_Amsterdam] -stWalletTest/test_wallet_construction_partial.py::test_wallet_construction_partial[fork_Amsterdam] -# stZeroKnowledge (20) +# stZeroKnowledge (19) stZeroKnowledge/test_point_mul_add.py::test_point_mul_add[fork_Amsterdam-d2-g3] stZeroKnowledge/test_point_mul_add.py::test_point_mul_add[fork_Amsterdam-d7-g3] stZeroKnowledge/test_point_mul_add.py::test_point_mul_add[fork_Amsterdam-d8-g3] @@ -515,4 +388,3 @@ stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d6-g3 stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d7-g3] stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d8-g3] stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d9-g3] -vmArithmeticTest/test_two_ops.py::test_two_ops[fork_Amsterdam] diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_oogm_before.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_oogm_before.py index f720fd6f4c2..0cca6713282 100644 --- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_oogm_before.py +++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_oogm_before.py @@ -111,7 +111,6 @@ def test_callcallcodecallcode_011_oogm_before( sender=sender, to=target, data=Bytes(""), - gas_limit=172000, ) post = { diff --git a/tests/ported_static/stCreate2/test_create2call_precompiles.py b/tests/ported_static/stCreate2/test_create2call_precompiles.py index 4fe7a1ba9e5..c187bf94f9e 100644 --- a/tests/ported_static/stCreate2/test_create2call_precompiles.py +++ b/tests/ported_static/stCreate2/test_create2call_precompiles.py @@ -524,14 +524,12 @@ def test_create2call_precompiles( ) + Op.STOP * 2, ] - tx_gas = [15000000] tx_value = [1] tx = Transaction( sender=sender, to=None, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/stCreate2/test_create2check_fields_in_initcode.py b/tests/ported_static/stCreate2/test_create2check_fields_in_initcode.py index 4f883160226..da4c2cabd35 100644 --- a/tests/ported_static/stCreate2/test_create2check_fields_in_initcode.py +++ b/tests/ported_static/stCreate2/test_create2check_fields_in_initcode.py @@ -472,13 +472,11 @@ def test_create2check_fields_in_initcode( Hash(contract_6, left_padding=True), Hash(contract_8, left_padding=True), ] - tx_gas = [600000] tx = Transaction( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/stCreateTest/test_create_collision_results.py b/tests/ported_static/stCreateTest/test_create_collision_results.py index 148c283bfb7..bb10874ad2c 100644 --- a/tests/ported_static/stCreateTest/test_create_collision_results.py +++ b/tests/ported_static/stCreateTest/test_create_collision_results.py @@ -240,13 +240,11 @@ def test_create_collision_results( Bytes("01"), Bytes("02"), ] - tx_gas = [16777216] tx = Transaction( sender=sender, to=contract_2, data=tx_data[d], - gas_limit=tx_gas[g], ) post = { diff --git a/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_revert2.py b/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_revert2.py index b6178a31982..b0099e00d23 100644 --- a/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_revert2.py +++ b/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_revert2.py @@ -186,13 +186,11 @@ def test_create_oo_gafter_init_code_revert2( Hash(contract_1, left_padding=True), Hash(contract_2, left_padding=True), ] - tx_gas = [175000] tx = Transaction( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecode_dynamic_code.py b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecode_dynamic_code.py index 13cf2e5404a..c4bc870fc4b 100644 --- a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecode_dynamic_code.py +++ b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecode_dynamic_code.py @@ -77,7 +77,6 @@ def test_delegatecode_dynamic_code( sender=sender, to=contract_0, data=Bytes(""), - gas_limit=453081, ) post = { diff --git a/tests/ported_static/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py b/tests/ported_static/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py index 6bdb6c49c1a..7e8250c3ad0 100644 --- a/tests/ported_static/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py +++ b/tests/ported_static/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py @@ -270,13 +270,11 @@ def test_coinbase_warm_account_call_gas( Bytes("693c6139") + Hash(0x6), Bytes("693c6139") + Hash(0x7), ] - tx_gas = [80000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], nonce=1, ) diff --git a/tests/ported_static/stEIP3855_push0/test_push0.py b/tests/ported_static/stEIP3855_push0/test_push0.py index 45fdb4aa609..9bc2c28c7de 100644 --- a/tests/ported_static/stEIP3855_push0/test_push0.py +++ b/tests/ported_static/stEIP3855_push0/test_push0.py @@ -275,13 +275,11 @@ def test_push0( contract_5, contract_7, ] - tx_gas = [700000] tx = Transaction( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/stMemoryTest/test_calldatacopy_dejavu2.py b/tests/ported_static/stMemoryTest/test_calldatacopy_dejavu2.py index 3bddb40d23d..11b98c19a46 100644 --- a/tests/ported_static/stMemoryTest/test_calldatacopy_dejavu2.py +++ b/tests/ported_static/stMemoryTest/test_calldatacopy_dejavu2.py @@ -64,7 +64,6 @@ def test_calldatacopy_dejavu2( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, value=10, ) diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_1_nonzero_value.py b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_1_nonzero_value.py index 9acde20fa83..465999d54a6 100644 --- a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_1_nonzero_value.py +++ b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_1_nonzero_value.py @@ -75,7 +75,6 @@ def test_call_sha256_1_nonzero_value( sender=sender, to=target, data=Bytes(""), - gas_limit=365224, value=0x186A0, ) diff --git a/tests/ported_static/stPreCompiledContracts2/test_ecrecover_short_buff.py b/tests/ported_static/stPreCompiledContracts2/test_ecrecover_short_buff.py index cffcc678170..0d6b1fcae22 100644 --- a/tests/ported_static/stPreCompiledContracts2/test_ecrecover_short_buff.py +++ b/tests/ported_static/stPreCompiledContracts2/test_ecrecover_short_buff.py @@ -155,7 +155,6 @@ def test_ecrecover_short_buff( sender=sender, to=contract_0, data=Bytes("00"), - gas_limit=7400000, value=0x186A0, nonce=1, ) diff --git a/tests/ported_static/stReturnDataTest/test_returndatasize_after_successful_callcode.py b/tests/ported_static/stReturnDataTest/test_returndatasize_after_successful_callcode.py index 3aed1ab7ffa..71ed00ddf6c 100644 --- a/tests/ported_static/stReturnDataTest/test_returndatasize_after_successful_callcode.py +++ b/tests/ported_static/stReturnDataTest/test_returndatasize_after_successful_callcode.py @@ -80,7 +80,6 @@ def test_returndatasize_after_successful_callcode( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, ) post = {target: Account(storage={0: 6})} diff --git a/tests/ported_static/stReturnDataTest/test_subcall_return_more_then_expected.py b/tests/ported_static/stReturnDataTest/test_subcall_return_more_then_expected.py index 1f2141adffe..50a5e19297b 100644 --- a/tests/ported_static/stReturnDataTest/test_subcall_return_more_then_expected.py +++ b/tests/ported_static/stReturnDataTest/test_subcall_return_more_then_expected.py @@ -228,7 +228,6 @@ def test_subcall_return_more_then_expected( sender=sender, to=target, data=Bytes(""), - gas_limit=400000, value=1, ) diff --git a/tests/ported_static/stRevertTest/test_loop_calls_then_revert.py b/tests/ported_static/stRevertTest/test_loop_calls_then_revert.py index c64f15352a7..416336db74d 100644 --- a/tests/ported_static/stRevertTest/test_loop_calls_then_revert.py +++ b/tests/ported_static/stRevertTest/test_loop_calls_then_revert.py @@ -75,7 +75,6 @@ def test_loop_calls_then_revert( sender=sender, to=target, data=Bytes(""), - gas_limit=10000000, ) post = { diff --git a/tests/ported_static/stSStoreTest/test_sstore_change_from_external_call_in_init_code.py b/tests/ported_static/stSStoreTest/test_sstore_change_from_external_call_in_init_code.py index 71d0e703e00..b73e6cd6c83 100644 --- a/tests/ported_static/stSStoreTest/test_sstore_change_from_external_call_in_init_code.py +++ b/tests/ported_static/stSStoreTest/test_sstore_change_from_external_call_in_init_code.py @@ -561,21 +561,11 @@ def test_sstore_change_from_external_call_in_init_code( ) + Op.STOP, ] - # Fork-aware gas budget: contract-creation intrinsic from the - # fork's calculator, plus the bytecode's own gas cost (which - # already includes the gas forwarded to inner CALLs via opcode - # metadata). - intrinsic = fork.transaction_intrinsic_cost_calculator()( - calldata=tx_data[d], - contract_creation=True, - ) - tx_gas = [intrinsic + tx_data[d].gas_cost(fork)] tx = Transaction( sender=sender, to=None, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/stSelfBalance/test_self_balance.py b/tests/ported_static/stSelfBalance/test_self_balance.py index cbaba3c11c2..65d17a6164c 100644 --- a/tests/ported_static/stSelfBalance/test_self_balance.py +++ b/tests/ported_static/stSelfBalance/test_self_balance.py @@ -54,7 +54,6 @@ def test_self_balance( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, ) post = {target: Account(storage={1: 500})} diff --git a/tests/ported_static/stSelfBalance/test_self_balance_equals_balance.py b/tests/ported_static/stSelfBalance/test_self_balance_equals_balance.py index 0bd75d31ebc..d43b1979d21 100644 --- a/tests/ported_static/stSelfBalance/test_self_balance_equals_balance.py +++ b/tests/ported_static/stSelfBalance/test_self_balance_equals_balance.py @@ -58,7 +58,6 @@ def test_self_balance_equals_balance( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, ) post = {target: Account(storage={1: 1})} diff --git a/tests/ported_static/stSelfBalance/test_self_balance_gas_cost.py b/tests/ported_static/stSelfBalance/test_self_balance_gas_cost.py index 99909d00883..d6d09dbefbe 100644 --- a/tests/ported_static/stSelfBalance/test_self_balance_gas_cost.py +++ b/tests/ported_static/stSelfBalance/test_self_balance_gas_cost.py @@ -63,7 +63,6 @@ def test_self_balance_gas_cost( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, ) post = {target: Account(storage={1: 5})} diff --git a/tests/ported_static/stSolidityTest/test_test_overflow.py b/tests/ported_static/stSolidityTest/test_test_overflow.py index 2343732d411..a51db794ecd 100644 --- a/tests/ported_static/stSolidityTest/test_test_overflow.py +++ b/tests/ported_static/stSolidityTest/test_test_overflow.py @@ -158,7 +158,6 @@ def test_test_overflow( sender=sender, to=target, data=Bytes("c0406226"), - gas_limit=100000, ) post = {target: Account(storage={0: 1})} diff --git a/tests/ported_static/stSolidityTest/test_test_structures_and_variabless.py b/tests/ported_static/stSolidityTest/test_test_structures_and_variabless.py index 594bbf9fd21..b8d96e19a12 100644 --- a/tests/ported_static/stSolidityTest/test_test_structures_and_variabless.py +++ b/tests/ported_static/stSolidityTest/test_test_structures_and_variabless.py @@ -230,7 +230,6 @@ def test_test_structures_and_variabless( sender=sender, to=target, data=Bytes("c0406226"), - gas_limit=350000, value=100, ) diff --git a/tests/ported_static/stStaticCall/test_static_call_ask_more_gas_on_depth2_then_transaction_has.py b/tests/ported_static/stStaticCall/test_static_call_ask_more_gas_on_depth2_then_transaction_has.py index 1ff95945afb..d47a87e4f8f 100644 --- a/tests/ported_static/stStaticCall/test_static_call_ask_more_gas_on_depth2_then_transaction_has.py +++ b/tests/ported_static/stStaticCall/test_static_call_ask_more_gas_on_depth2_then_transaction_has.py @@ -211,13 +211,11 @@ def test_static_call_ask_more_gas_on_depth2_then_transaction_has( Hash(addr, left_padding=True), Hash(addr_4, left_padding=True), ] - tx_gas = [600000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_oog.py b/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_oog.py index 0c32de25970..a331700c24f 100644 --- a/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_oog.py +++ b/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_oog.py @@ -133,7 +133,6 @@ def test_static_call_contract_to_create_contract_oog( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb3.py b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb3.py index 352dacad6d4..86ae8c506de 100644 --- a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb3.py +++ b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb3.py @@ -85,7 +85,6 @@ def test_static_call_recursive_bomb3( sender=sender, to=target, data=Bytes(""), - gas_limit=1000000, value=0x186A0, ) diff --git a/tests/ported_static/stStaticCall/test_static_call_sha256_1_nonzero_value.py b/tests/ported_static/stStaticCall/test_static_call_sha256_1_nonzero_value.py index 6bd0f39acaa..86648626d51 100644 --- a/tests/ported_static/stStaticCall/test_static_call_sha256_1_nonzero_value.py +++ b/tests/ported_static/stStaticCall/test_static_call_sha256_1_nonzero_value.py @@ -93,7 +93,6 @@ def test_static_call_sha256_1_nonzero_value( sender=sender, to=target, data=Bytes(""), - gas_limit=365224, value=0x186A0, ) diff --git a/tests/ported_static/stStaticCall/test_static_callcall_00_ooge_1.py b/tests/ported_static/stStaticCall/test_static_callcall_00_ooge_1.py index b1f3f3deb06..6a9d35e6368 100644 --- a/tests/ported_static/stStaticCall/test_static_callcall_00_ooge_1.py +++ b/tests/ported_static/stStaticCall/test_static_callcall_00_ooge_1.py @@ -219,13 +219,11 @@ def test_static_callcall_00_ooge_1( Hash(addr, left_padding=True), Hash(addr_4, left_padding=True), ] - tx_gas = [380066] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/stStaticCall/test_static_callcallcode_01_ooge_2.py b/tests/ported_static/stStaticCall/test_static_callcallcode_01_ooge_2.py index 118b967f0dd..4387a2bd1b3 100644 --- a/tests/ported_static/stStaticCall/test_static_callcallcode_01_ooge_2.py +++ b/tests/ported_static/stStaticCall/test_static_callcallcode_01_ooge_2.py @@ -132,13 +132,11 @@ def test_static_callcallcode_01_ooge_2( Hash(addr_2, left_padding=True), Hash(addr_3, left_padding=True), ] - tx_gas = [172000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], ) post = {target: Account(storage={0: 1, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_ooge.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_ooge.py index 255691213b7..33693d1c5eb 100644 --- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_ooge.py +++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_ooge.py @@ -147,13 +147,11 @@ def test_static_callcallcodecallcode_011_ooge( Hash(addr_3, left_padding=True), Hash(addr_4, left_padding=True), ] - tx_gas = [172000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], ) post = {target: Account(storage={0: 1, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_ooge_2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_ooge_2.py index 9b73ceaab58..26f1bd02f04 100644 --- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_ooge_2.py +++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_ooge_2.py @@ -179,13 +179,11 @@ def test_static_callcallcodecallcode_011_ooge_2( Hash(addr_2, left_padding=True), Hash(addr_3, left_padding=True), ] - tx_gas = [172000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after.py index f2dd613dedf..f35c3612ed7 100644 --- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after.py +++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after.py @@ -164,13 +164,11 @@ def test_static_callcallcodecallcode_011_oogm_after( Hash(addr, left_padding=True), Hash(addr_2, left_padding=True), ] - tx_gas = [172000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], ) post = {target: Account(storage={0: 0, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after2.py index 91e9a676fb2..4d8657cb848 100644 --- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after2.py +++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after2.py @@ -161,13 +161,11 @@ def test_static_callcallcodecallcode_011_oogm_after2( Hash(addr, left_padding=True), Hash(addr_2, left_padding=True), ] - tx_gas = [172000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], ) post = {target: Account(storage={0: 0, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after_1.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after_1.py index bfbc6735e35..1cfff633430 100644 --- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after_1.py +++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after_1.py @@ -164,13 +164,11 @@ def test_static_callcallcodecallcode_011_oogm_after_1( Hash(addr, left_padding=True), Hash(addr_2, left_padding=True), ] - tx_gas = [172000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], ) post = {target: Account(storage={0: 0, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after_2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after_2.py index a8854ec54cc..4c6559ee3cd 100644 --- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after_2.py +++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after_2.py @@ -167,13 +167,11 @@ def test_static_callcallcodecallcode_011_oogm_after_2( Hash(addr, left_padding=True), Hash(addr_2, left_padding=True), ] - tx_gas = [172000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], ) post = {target: Account(storage={0: 0, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_before.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_before.py index 9c95f6777cf..56359c1b095 100644 --- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_before.py +++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_before.py @@ -165,13 +165,11 @@ def test_static_callcallcodecallcode_011_oogm_before( Hash(addr_2, left_padding=True), Hash(addr_3, left_padding=True), ] - tx_gas = [172000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], ) post = {target: Account(storage={0: 1, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_before2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_before2.py index b0ff081f608..8d3516646cf 100644 --- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_before2.py +++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_before2.py @@ -213,13 +213,11 @@ def test_static_callcallcodecallcode_011_oogm_before2( Hash(addr_3, left_padding=True), Hash(addr_4, left_padding=True), ] - tx_gas = [172000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/stStaticCall/test_static_callcodecall_10_ooge.py b/tests/ported_static/stStaticCall/test_static_callcodecall_10_ooge.py index 52635e65517..1cac6ce2c65 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecall_10_ooge.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecall_10_ooge.py @@ -129,13 +129,11 @@ def test_static_callcodecall_10_ooge( Hash(addr_2, left_padding=True), Hash(addr_3, left_padding=True), ] - tx_gas = [172000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], ) post = {target: Account(storage={0: 1, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcodecall_10_ooge_2.py b/tests/ported_static/stStaticCall/test_static_callcodecall_10_ooge_2.py index a81f4ac172c..a8672c78552 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecall_10_ooge_2.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecall_10_ooge_2.py @@ -134,13 +134,11 @@ def test_static_callcodecall_10_ooge_2( Hash(addr_2, left_padding=True), Hash(addr_3, left_padding=True), ] - tx_gas = [172000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], ) post = { diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_ooge.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_ooge.py index 2a349847b34..072c438d4b1 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_ooge.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_ooge.py @@ -151,13 +151,11 @@ def test_static_callcodecallcall_100_ooge( Hash(addr_3, left_padding=True), Hash(addr_4, left_padding=True), ] - tx_gas = [172000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], ) post = {target: Account(storage={0: 1, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_ooge2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_ooge2.py index ddc828b6da4..d16e1cb0838 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_ooge2.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_ooge2.py @@ -146,13 +146,11 @@ def test_static_callcodecallcall_100_ooge2( Hash(addr_3, left_padding=True), Hash(addr_4, left_padding=True), ] - tx_gas = [172000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], ) post = {target: Account(storage={0: 1, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after_3.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after_3.py index c4003605e60..23f939bb74d 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after_3.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after_3.py @@ -159,14 +159,12 @@ def test_static_callcodecallcall_100_oogm_after_3( tx_data = [ Bytes(""), ] - tx_gas = [172000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_before.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_before.py index 894c008a900..80aa5dffc1a 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_before.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_before.py @@ -161,13 +161,11 @@ def test_static_callcodecallcall_100_oogm_before( Hash(addr_2, left_padding=True), Hash(addr_3, left_padding=True), ] - tx_gas = [172000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], ) post = {target: Account(storage={0: 1, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_before2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_before2.py index 791b780df05..64a7e3dd3b2 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_before2.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_before2.py @@ -169,14 +169,12 @@ def test_static_callcodecallcall_100_oogm_before2( Hash(addr_2, left_padding=True), Hash(addr_3, left_padding=True), ] - tx_gas = [172000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], ) diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_ooge_2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_ooge_2.py index bd879aec938..33445534448 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_ooge_2.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_ooge_2.py @@ -114,7 +114,6 @@ def test_static_callcodecallcallcode_101_ooge_2( sender=sender, to=target, data=Bytes(""), - gas_limit=172000, ) post = {target: Account(storage={0: 1, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after.py index 80bbe4d391a..eb4ef9fb520 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after.py @@ -119,7 +119,6 @@ def test_static_callcodecallcallcode_101_oogm_after( sender=sender, to=target, data=Bytes(""), - gas_limit=172000, ) post = {target: Account(storage={0: 0, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after2.py index 22aa6944777..d74d78f27ca 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after2.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after2.py @@ -143,14 +143,12 @@ def test_static_callcodecallcallcode_101_oogm_after2( tx_data = [ Bytes(""), ] - tx_gas = [172000] tx_value = [0, 1] tx = Transaction( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], ) diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_before.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_before.py index 5360979ac9c..433a1c911ee 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_before.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_before.py @@ -116,7 +116,6 @@ def test_static_callcodecallcallcode_101_oogm_before( sender=sender, to=target, data=Bytes(""), - gas_limit=172000, ) post = {target: Account(storage={0: 1, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_before2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_before2.py index ec321a4558a..b0140877121 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_before2.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_before2.py @@ -139,14 +139,12 @@ def test_static_callcodecallcallcode_101_oogm_before2( tx_data = [ Bytes(""), ] - tx_gas = [172000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], ) diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_ooge.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_ooge.py index fb9b691d681..83602d3f93a 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_ooge.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_ooge.py @@ -112,7 +112,6 @@ def test_static_callcodecallcodecall_110_ooge( sender=sender, to=target, data=Bytes(""), - gas_limit=172000, ) post = {target: Account(storage={0: 1, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_ooge2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_ooge2.py index 7c371ac945e..3f568e1b407 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_ooge2.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_ooge2.py @@ -141,14 +141,12 @@ def test_static_callcodecallcodecall_110_ooge2( tx_data = [ Bytes(""), ] - tx_gas = [172000] tx_value = [0, 1, 2] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], ) diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after.py index b121cac4afb..5ebc302095a 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after.py @@ -114,7 +114,6 @@ def test_static_callcodecallcodecall_110_oogm_after( sender=sender, to=target, data=Bytes(""), - gas_limit=172000, ) post = {target: Account(storage={0: 0, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after2.py index 6bfd84549df..06c28b78bc4 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after2.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after2.py @@ -143,14 +143,12 @@ def test_static_callcodecallcodecall_110_oogm_after2( tx_data = [ Bytes(""), ] - tx_gas = [172000] tx_value = [0, 1, 2] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], ) diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after_2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after_2.py index 90496314497..15539b15784 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after_2.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after_2.py @@ -114,7 +114,6 @@ def test_static_callcodecallcodecall_110_oogm_after_2( sender=sender, to=target, data=Bytes(""), - gas_limit=172000, ) post = {target: Account(storage={0: 0, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after_3.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after_3.py index cbc5beb1ba3..3d562c72148 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after_3.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after_3.py @@ -116,7 +116,6 @@ def test_static_callcodecallcodecall_110_oogm_after_3( sender=sender, to=target, data=Bytes(""), - gas_limit=172000, ) post = {target: Account(storage={0: 0, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_before.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_before.py index 139114b474a..0d55896f985 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_before.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_before.py @@ -112,7 +112,6 @@ def test_static_callcodecallcodecall_110_oogm_before( sender=sender, to=target, data=Bytes(""), - gas_limit=172000, ) post = {target: Account(storage={0: 1, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_before2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_before2.py index 972eaf216e2..69377cd05b2 100644 --- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_before2.py +++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_before2.py @@ -141,14 +141,12 @@ def test_static_callcodecallcodecall_110_oogm_before2( tx_data = [ Bytes(""), ] - tx_gas = [172000] tx_value = [0, 1, 2] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], ) diff --git a/tests/ported_static/stStaticCall/test_static_calldelcode_01_ooge.py b/tests/ported_static/stStaticCall/test_static_calldelcode_01_ooge.py index 5e85db2b185..bf4aa29155e 100644 --- a/tests/ported_static/stStaticCall/test_static_calldelcode_01_ooge.py +++ b/tests/ported_static/stStaticCall/test_static_calldelcode_01_ooge.py @@ -131,13 +131,11 @@ def test_static_calldelcode_01_ooge( Hash(addr_2, left_padding=True), Hash(addr_3, left_padding=True), ] - tx_gas = [172000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], ) post = {target: Account(storage={0: 1, 1: 1})} diff --git a/tests/ported_static/stStaticCall/test_static_revert_opcode_calls.py b/tests/ported_static/stStaticCall/test_static_revert_opcode_calls.py index 80b13c69048..7de006e80b7 100644 --- a/tests/ported_static/stStaticCall/test_static_revert_opcode_calls.py +++ b/tests/ported_static/stStaticCall/test_static_revert_opcode_calls.py @@ -96,13 +96,11 @@ def test_static_revert_opcode_calls( tx_data = [ Bytes(""), ] - tx_gas = [460000, 88000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], ) post = {target: Account(storage={1: 1})} diff --git a/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_called_contract.py b/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_called_contract.py index 75dcfd80640..d7083f62a5f 100644 --- a/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_called_contract.py +++ b/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_called_contract.py @@ -22,7 +22,6 @@ StateTestFiller, Transaction, ) -from execution_testing.forks import Amsterdam from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -618,7 +617,6 @@ def test_callcode_to_precompile_from_called_contract( sender=sender, to=contract_0, data=Bytes(""), - gas_limit=6000000 if fork >= Amsterdam else 4000000, value=100, ) diff --git a/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_contract_initialization.py b/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_contract_initialization.py index 8385f94ee28..fe7c501f17d 100644 --- a/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_contract_initialization.py +++ b/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_contract_initialization.py @@ -22,7 +22,6 @@ StateTestFiller, Transaction, ) -from execution_testing.forks import Amsterdam from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -518,7 +517,6 @@ def test_callcode_to_precompile_from_contract_initialization( data=Bytes( "7ffeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed60005562012020620a00006000600073a0000000000000000000000000000000000000005afa507ffeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed600155620a000051610a0055620b000051610b0055620a010051610a0155620b010051610b0155620a020051610a0255620b020051610b0255620a030051610a0355620b030051610b0355620a040051610a0455620b040051610b0455620a050051610a0555620b050051610b0555620a060051610a0655620b060051610b0655620a070051610a0755620b070051610b0755620a080051610a0855620b080051610b0855620a090051610a0955620b090051610b0955620a100051610a1055620b100051610b1055620a110051610a1155620b110051610b1155620a120051610a1255620b120051610b1255620a130051610a1355620b130051610b1355620a140051610a1455620b140051610b1455620a150051610a1555620b150051610b1555620a160051610a1655620b160051610b1655620a170051610a1755620b170051610b1755620a180051610a1855620b180051610b1855620a190051610a1955620b190051610b1955620a200051610a2055620b200051610b205500" # noqa: E501 ), - gas_limit=6000000 if fork >= Amsterdam else 4000000, value=100, ) diff --git a/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_transaction.py b/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_transaction.py index 21124fa254f..0af77fb08e3 100644 --- a/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_transaction.py +++ b/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_transaction.py @@ -21,7 +21,6 @@ StateTestFiller, Transaction, ) -from execution_testing.forks import Amsterdam from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -581,7 +580,6 @@ def test_callcode_to_precompile_from_transaction( sender=sender, to=contract_0, data=Bytes(""), - gas_limit=6000000 if fork >= Amsterdam else 4000000, value=100, ) diff --git a/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_called_contract.py b/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_called_contract.py index 8dcdce66aaf..39e1a5b852e 100644 --- a/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_called_contract.py +++ b/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_called_contract.py @@ -452,7 +452,6 @@ def test_delegatecall_to_precompile_from_called_contract( sender=sender, to=contract_0, data=Bytes(""), - gas_limit=4000000, value=100, ) diff --git a/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_contract_initialization.py b/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_contract_initialization.py index df7fecef5c6..95295711d41 100644 --- a/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_contract_initialization.py +++ b/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_contract_initialization.py @@ -385,7 +385,6 @@ def test_delegatecall_to_precompile_from_contract_initialization( data=Bytes( "7ffeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed60005562012020620a00006000600073a0000000000000000000000000000000000000005afa507ffeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed600155620a000051610a0055620a110051610a1155620a010051610a0155620a120051610a1255620a020051610a0255620a130051610a1355620a030051610a0355620a140051610a1455620a040051610a0455620a150051610a1555620a050051610a0555620a160051610a1655620a060051610a0655620a170051610a1755620a070051610a0755620a180051610a1855620a080051610a0855620a190051610a1955620a090051610a0955620a200051610a2055620a100051610a105500" # noqa: E501 ), - gas_limit=4000000, value=100, ) diff --git a/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_transaction.py b/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_transaction.py index 427cc8978b5..4c4d0565624 100644 --- a/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_transaction.py +++ b/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_transaction.py @@ -415,7 +415,6 @@ def test_delegatecall_to_precompile_from_transaction( sender=sender, to=contract_0, data=Bytes(""), - gas_limit=4000000, value=100, ) diff --git a/tests/ported_static/stSystemOperationsTest/test_ab_acalls_suicide0.py b/tests/ported_static/stSystemOperationsTest/test_ab_acalls_suicide0.py index a8876a5fd6a..ccf258d6303 100644 --- a/tests/ported_static/stSystemOperationsTest/test_ab_acalls_suicide0.py +++ b/tests/ported_static/stSystemOperationsTest/test_ab_acalls_suicide0.py @@ -92,7 +92,6 @@ def test_ab_acalls_suicide0( sender=sender, to=target, data=Bytes(""), - gas_limit=10000000, value=0x186A0, ) diff --git a/tests/ported_static/stSystemOperationsTest/test_call10.py b/tests/ported_static/stSystemOperationsTest/test_call10.py index 9ae1eb3184d..6e125fec2c7 100644 --- a/tests/ported_static/stSystemOperationsTest/test_call10.py +++ b/tests/ported_static/stSystemOperationsTest/test_call10.py @@ -75,7 +75,6 @@ def test_call10( sender=sender, to=target, data=Bytes(""), - gas_limit=200000, value=10, ) diff --git a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_address_too_big_right.py b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_address_too_big_right.py index 2d9970a1547..57b2d4249c9 100644 --- a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_address_too_big_right.py +++ b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_address_too_big_right.py @@ -92,7 +92,6 @@ def test_call_to_name_registrator_address_too_big_right( sender=sender, to=target, data=Bytes(""), - gas_limit=300000, value=0x186A0, ) diff --git a/tests/ported_static/stWalletTest/test_day_limit_construction_partial.py b/tests/ported_static/stWalletTest/test_day_limit_construction_partial.py index 0cd3bb580e1..3b761567555 100644 --- a/tests/ported_static/stWalletTest/test_day_limit_construction_partial.py +++ b/tests/ported_static/stWalletTest/test_day_limit_construction_partial.py @@ -54,7 +54,6 @@ def test_day_limit_construction_partial( data=Bytes( "606060409081526001600081815581805533600160a060020a0316600381905581526101026020529190912055620151804204610107556109b4806100456000396000f300606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe" # noqa: E501 ), - gas_limit=817082, value=100, nonce=1, ) diff --git a/tests/ported_static/stWalletTest/test_wallet_construction_partial.py b/tests/ported_static/stWalletTest/test_wallet_construction_partial.py index 90aaebc9d2f..0974f1f81d2 100644 --- a/tests/ported_static/stWalletTest/test_wallet_construction_partial.py +++ b/tests/ported_static/stWalletTest/test_wallet_construction_partial.py @@ -54,7 +54,6 @@ def test_wallet_construction_partial( data=Bytes( "6060604052604051602080611014833960806040818152925160016000818155818055600160a060020a03331660038190558152610102909452938320939093556201518042046101075582917f102d25c49d33fcdb8976a3f2744e0785c98d9e43b88364859e6aec4ae82eff5c91a250610f958061007f6000396000f300606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe" # noqa: E501 ), - gas_limit=2225022, value=100, nonce=1, ) diff --git a/tests/ported_static/vmArithmeticTest/test_exp_power256_of256.py b/tests/ported_static/vmArithmeticTest/test_exp_power256_of256.py index 3a4d820a4be..accbc8a2290 100644 --- a/tests/ported_static/vmArithmeticTest/test_exp_power256_of256.py +++ b/tests/ported_static/vmArithmeticTest/test_exp_power256_of256.py @@ -1281,7 +1281,6 @@ def test_exp_power256_of256( sender=sender, to=target, data=Bytes("693c6139") + Hash(0x0), - gas_limit=16777216, value=1, ) diff --git a/tests/ported_static/vmArithmeticTest/test_two_ops.py b/tests/ported_static/vmArithmeticTest/test_two_ops.py index db7aeac6d17..41e08c2067e 100644 --- a/tests/ported_static/vmArithmeticTest/test_two_ops.py +++ b/tests/ported_static/vmArithmeticTest/test_two_ops.py @@ -1655,7 +1655,6 @@ def test_two_ops( sender=sender, to=target, data=Bytes("00"), - gas_limit=16777216, value=1, ) From c384655a1c1c46d4734e67382d2c540d997f0333 Mon Sep 17 00:00:00 2001 From: Leo Lara Date: Wed, 17 Jun 2026 19:20:13 +0700 Subject: [PATCH 4/6] chore(tests): unset g1 gas_limit on Amsterdam for no_src_account_create test_no_src_account_create and its 1559 variant assert an INSUFFICIENT_ACCOUNT_FUNDS rejection at gas index g1 (210000). On Amsterdam EIP-8037 raises the creation intrinsic gas above that budget, so the transaction is rejected for gas before the funds check and the assertion fails. Make the g1 budget fork-conditional: leave the gas limit unset on EIP-8037 forks, where the implicit limit plus reservoir clears the intrinsic and the intended funds rejection fires again. Earlier forks keep the original 210000. Filling across every valid fork passes all variants, so remove the 16 g1 entries from amsterdam_skip_list.txt. Total 321 down to 305. --- tests/ported_static/amsterdam_skip_list.txt | 20 ++----------------- .../test_no_src_account_create.py | 5 ++++- .../test_no_src_account_create1559.py | 5 ++++- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/tests/ported_static/amsterdam_skip_list.txt b/tests/ported_static/amsterdam_skip_list.txt index 89e5636719a..10d2f5998b3 100644 --- a/tests/ported_static/amsterdam_skip_list.txt +++ b/tests/ported_static/amsterdam_skip_list.txt @@ -8,7 +8,7 @@ # Entries are substring-matched against each pytest nodeid (after # stripping the fixture-format suffix in conftest.py). # -# Total entries: 321 +# Total entries: 305 # stAttackTest (1) stAttackTest/test_crashing_transaction.py::test_crashing_transaction[fork_Amsterdam] @@ -346,23 +346,7 @@ stSystemOperationsTest/test_call_recursive_bomb3.py::test_call_recursive_bomb3[f stSystemOperationsTest/test_double_selfdestruct_touch_paris.py::test_double_selfdestruct_touch_paris[fork_Amsterdam--v1] stSystemOperationsTest/test_double_selfdestruct_touch_paris.py::test_double_selfdestruct_touch_paris[fork_Amsterdam--v2] -# stTransactionTest (20) -stTransactionTest/test_no_src_account_create.py::test_no_src_account_create[fork_Amsterdam-d0-g1-v0] -stTransactionTest/test_no_src_account_create.py::test_no_src_account_create[fork_Amsterdam-d0-g1-v1] -stTransactionTest/test_no_src_account_create.py::test_no_src_account_create[fork_Amsterdam-d1-g1-v0] -stTransactionTest/test_no_src_account_create.py::test_no_src_account_create[fork_Amsterdam-d1-g1-v1] -stTransactionTest/test_no_src_account_create.py::test_no_src_account_create[fork_Amsterdam-d2-g1-v0] -stTransactionTest/test_no_src_account_create.py::test_no_src_account_create[fork_Amsterdam-d2-g1-v1] -stTransactionTest/test_no_src_account_create.py::test_no_src_account_create[fork_Amsterdam-d3-g1-v0] -stTransactionTest/test_no_src_account_create.py::test_no_src_account_create[fork_Amsterdam-d3-g1-v1] -stTransactionTest/test_no_src_account_create.py::test_no_src_account_create[fork_Amsterdam-d4-g1-v0] -stTransactionTest/test_no_src_account_create.py::test_no_src_account_create[fork_Amsterdam-d4-g1-v1] -stTransactionTest/test_no_src_account_create1559.py::test_no_src_account_create1559[fork_Amsterdam-d0-g1-v0] -stTransactionTest/test_no_src_account_create1559.py::test_no_src_account_create1559[fork_Amsterdam-d0-g1-v1] -stTransactionTest/test_no_src_account_create1559.py::test_no_src_account_create1559[fork_Amsterdam-d1-g1-v0] -stTransactionTest/test_no_src_account_create1559.py::test_no_src_account_create1559[fork_Amsterdam-d1-g1-v1] -stTransactionTest/test_no_src_account_create1559.py::test_no_src_account_create1559[fork_Amsterdam-d2-g1-v0] -stTransactionTest/test_no_src_account_create1559.py::test_no_src_account_create1559[fork_Amsterdam-d2-g1-v1] +# stTransactionTest (4) stTransactionTest/test_opcodes_transaction_init.py::test_opcodes_transaction_init[fork_Amsterdam-d120] stTransactionTest/test_opcodes_transaction_init.py::test_opcodes_transaction_init[fork_Amsterdam-side_effects] stTransactionTest/test_store_gas_on_create.py::test_store_gas_on_create[fork_Amsterdam] diff --git a/tests/ported_static/stTransactionTest/test_no_src_account_create.py b/tests/ported_static/stTransactionTest/test_no_src_account_create.py index eb70f1d3636..fd82a83d143 100644 --- a/tests/ported_static/stTransactionTest/test_no_src_account_create.py +++ b/tests/ported_static/stTransactionTest/test_no_src_account_create.py @@ -379,7 +379,10 @@ def test_no_src_account_create( Op.STOP, Op.STOP, ] - tx_gas = [21000, 210000, 0] + # EIP-8037 raises the creation intrinsic gas above 210000, which + # rejects the transaction for gas before the intended insufficient + # funds check. Leave the gas limit unset on Amsterdam. + tx_gas = [21000, None if fork.is_eip_enabled(8037) else 210000, 0] tx_value = [0, 1] tx_access_lists: dict[int, list] = { 2: [], diff --git a/tests/ported_static/stTransactionTest/test_no_src_account_create1559.py b/tests/ported_static/stTransactionTest/test_no_src_account_create1559.py index 8438ccb8900..46f293d3b49 100644 --- a/tests/ported_static/stTransactionTest/test_no_src_account_create1559.py +++ b/tests/ported_static/stTransactionTest/test_no_src_account_create1559.py @@ -236,7 +236,10 @@ def test_no_src_account_create1559( Op.STOP, Op.STOP, ] - tx_gas = [21000, 210000, 0] + # EIP-8037 raises the creation intrinsic gas above 210000, which + # rejects the transaction for gas before the intended insufficient + # funds check. Leave the gas limit unset on Amsterdam. + tx_gas = [21000, None if fork.is_eip_enabled(8037) else 210000, 0] tx_value = [0, 1] tx_access_lists: dict[int, list] = { 0: [], From 5927cdb0eb3474126f1a727e058f6fec3ddf81e9 Mon Sep 17 00:00:00 2001 From: Leo Lara Date: Wed, 17 Jun 2026 21:20:28 +0700 Subject: [PATCH 5/6] chore(tests): fork-conditional gas unset for 8 more ported_static files Extend the per-parametrization fix from no_src_account_create to eight more mixed files. Each sets the skip-listed gas slot to None on EIP-8037, so that parametrization gets the implicit limit plus reservoir, while the other slots and earlier forks keep their explicit gas. These slots recorded a full-execution result that broke on Amsterdam when the state-gas component pushed the transaction over its budget. The stZeroKnowledge point_mul tests run out of gas because they SSTORE the precompile result, which EIP-8037 makes more expensive; the precompile call itself is unchanged, so unsetting restores the recorded success state. Filling across every valid fork passes all variants with no failures, so remove the 47 entries from amsterdam_skip_list.txt. Total 305 down to 258. --- tests/ported_static/amsterdam_skip_list.txt | 61 ++----------------- .../test_callcode_lose_gas_oog.py | 2 +- .../test_create_collision_to_empty2.py | 5 +- .../stMemoryStressTest/test_return_bounds.py | 2 +- .../test_revert_opcode_multiple_sub_calls.py | 7 ++- .../test_static_check_opcodes4.py | 2 +- .../test_static_check_opcodes5.py | 2 +- .../stZeroKnowledge/test_point_mul_add.py | 7 ++- .../stZeroKnowledge/test_point_mul_add2.py | 7 ++- 9 files changed, 31 insertions(+), 64 deletions(-) diff --git a/tests/ported_static/amsterdam_skip_list.txt b/tests/ported_static/amsterdam_skip_list.txt index 10d2f5998b3..4423a666f35 100644 --- a/tests/ported_static/amsterdam_skip_list.txt +++ b/tests/ported_static/amsterdam_skip_list.txt @@ -8,7 +8,7 @@ # Entries are substring-matched against each pytest nodeid (after # stripping the fixture-format suffix in conftest.py). # -# Total entries: 305 +# Total entries: 258 # stAttackTest (1) stAttackTest/test_crashing_transaction.py::test_crashing_transaction[fork_Amsterdam] @@ -24,14 +24,13 @@ stCallCodes/test_callcode_in_initcode_to_existing_contract.py::test_callcode_in_ stCallCodes/test_callcode_in_initcode_to_existing_contract.py::test_callcode_in_initcode_to_existing_contract[fork_Amsterdam-d1] stCallCodes/test_callcode_in_initcode_to_existing_contract_with_value_transfer.py::test_callcode_in_initcode_to_existing_contract_with_value_transfer[fork_Amsterdam] -# stCallCreateCallCodeTest (12) +# stCallCreateCallCodeTest (11) stCallCreateCallCodeTest/test_call1024_oog.py::test_call1024_oog[fork_Amsterdam--g0] stCallCreateCallCodeTest/test_call1024_oog.py::test_call1024_oog[fork_Amsterdam--g1] stCallCreateCallCodeTest/test_call1024_oog.py::test_call1024_oog[fork_Amsterdam--g2] stCallCreateCallCodeTest/test_call1024_oog.py::test_call1024_oog[fork_Amsterdam--g3] stCallCreateCallCodeTest/test_callcode1024_oog.py::test_callcode1024_oog[fork_Amsterdam--g0] stCallCreateCallCodeTest/test_callcode1024_oog.py::test_callcode1024_oog[fork_Amsterdam--g1] -stCallCreateCallCodeTest/test_callcode_lose_gas_oog.py::test_callcode_lose_gas_oog[fork_Amsterdam--g2] stCallCreateCallCodeTest/test_contract_creation_make_call_that_ask_more_gas_then_transaction_provided.py::test_contract_creation_make_call_that_ask_more_gas_then_transaction_provided[fork_Amsterdam--g0] stCallCreateCallCodeTest/test_contract_creation_make_call_that_ask_more_gas_then_transaction_provided.py::test_contract_creation_make_call_that_ask_more_gas_then_transaction_provided[fork_Amsterdam--g1] stCallCreateCallCodeTest/test_create_name_registrator_per_txs_not_enough_gas.py::test_create_name_registrator_per_txs_not_enough_gas[fork_Amsterdam--g0] @@ -74,7 +73,7 @@ stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_dept stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_depth_create_address_collision_berlin[fork_Amsterdam-d1-g1-v0] stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_depth_create_address_collision_berlin[fork_Amsterdam-d1-g1-v1] -# stCreateTest (42) +# stCreateTest (40) stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-0xef-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-contructor-revert-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create-high-nonce-v1] @@ -88,8 +87,6 @@ stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_af stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-ok-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-oog-constructor-v1] stCreateTest/test_create_address_warm_after_fail.py::test_create_address_warm_after_fail[fork_Amsterdam-create2-oog-post-constr-v1] -stCreateTest/test_create_collision_to_empty2.py::test_create_collision_to_empty2[fork_Amsterdam-d0-g0-v0] -stCreateTest/test_create_collision_to_empty2.py::test_create_collision_to_empty2[fork_Amsterdam-d0-g0-v1] stCreateTest/test_create_e_contract_create_ne_contract_in_init_oog_tr.py::test_create_e_contract_create_ne_contract_in_init_oog_tr[fork_Amsterdam--g0] stCreateTest/test_create_e_contract_create_ne_contract_in_init_oog_tr.py::test_create_e_contract_create_ne_contract_in_init_oog_tr[fork_Amsterdam--g1] stCreateTest/test_create_e_contract_then_call_to_non_existent_acc.py::test_create_e_contract_then_call_to_non_existent_acc[fork_Amsterdam] @@ -251,9 +248,6 @@ stMemExpandingEIP150Calls/test_call_goes_oog_on_second_level_with_mem_expanding_ stMemExpandingEIP150Calls/test_create_and_gas_inside_create_with_mem_expanding_calls.py::test_create_and_gas_inside_create_with_mem_expanding_calls[fork_Amsterdam] stMemExpandingEIP150Calls/test_new_gas_price_for_codes_with_mem_expanding_calls.py::test_new_gas_price_for_codes_with_mem_expanding_calls[fork_Amsterdam] -# stMemoryStressTest (1) -stMemoryStressTest/test_return_bounds.py::test_return_bounds[fork_Amsterdam--g1] - # stMemoryTest (4) stMemoryTest/test_call_data_copy_offset.py::test_call_data_copy_offset[fork_Amsterdam] stMemoryTest/test_code_copy_offset.py::test_code_copy_offset[fork_Amsterdam] @@ -281,7 +275,7 @@ stRefundTest/test_refund_suicide50procent_cap.py::test_refund_suicide50procent_c stRefundTest/test_refund_suicide50procent_cap.py::test_refund_suicide50procent_cap[fork_Amsterdam-d1] stRefundTest/test_refund_tx_to_suicide.py::test_refund_tx_to_suicide[fork_Amsterdam] -# stRevertTest (24) +# stRevertTest (12) stRevertTest/test_loop_calls_depth_then_revert.py::test_loop_calls_depth_then_revert[fork_Amsterdam] stRevertTest/test_loop_delegate_calls_depth_then_revert.py::test_loop_delegate_calls_depth_then_revert[fork_Amsterdam] stRevertTest/test_revert_depth_create_address_collision.py::test_revert_depth_create_address_collision[fork_Amsterdam-d0-g1-v0] @@ -294,18 +288,6 @@ stRevertTest/test_revert_opcode_in_calls_on_non_empty_return_data.py::test_rever stRevertTest/test_revert_opcode_in_calls_on_non_empty_return_data.py::test_revert_opcode_in_calls_on_non_empty_return_data[fork_Amsterdam-d1-g0] stRevertTest/test_revert_opcode_in_calls_on_non_empty_return_data.py::test_revert_opcode_in_calls_on_non_empty_return_data[fork_Amsterdam-d2-g0] stRevertTest/test_revert_opcode_in_calls_on_non_empty_return_data.py::test_revert_opcode_in_calls_on_non_empty_return_data[fork_Amsterdam-d3-g0] -stRevertTest/test_revert_opcode_multiple_sub_calls.py::test_revert_opcode_multiple_sub_calls[fork_Amsterdam-d0-g0-v0] -stRevertTest/test_revert_opcode_multiple_sub_calls.py::test_revert_opcode_multiple_sub_calls[fork_Amsterdam-d0-g0-v1] -stRevertTest/test_revert_opcode_multiple_sub_calls.py::test_revert_opcode_multiple_sub_calls[fork_Amsterdam-d0-g2-v0] -stRevertTest/test_revert_opcode_multiple_sub_calls.py::test_revert_opcode_multiple_sub_calls[fork_Amsterdam-d0-g2-v1] -stRevertTest/test_revert_opcode_multiple_sub_calls.py::test_revert_opcode_multiple_sub_calls[fork_Amsterdam-d1-g0-v0] -stRevertTest/test_revert_opcode_multiple_sub_calls.py::test_revert_opcode_multiple_sub_calls[fork_Amsterdam-d1-g0-v1] -stRevertTest/test_revert_opcode_multiple_sub_calls.py::test_revert_opcode_multiple_sub_calls[fork_Amsterdam-d2-g0-v0] -stRevertTest/test_revert_opcode_multiple_sub_calls.py::test_revert_opcode_multiple_sub_calls[fork_Amsterdam-d2-g0-v1] -stRevertTest/test_revert_opcode_multiple_sub_calls.py::test_revert_opcode_multiple_sub_calls[fork_Amsterdam-d3-g0-v0] -stRevertTest/test_revert_opcode_multiple_sub_calls.py::test_revert_opcode_multiple_sub_calls[fork_Amsterdam-d3-g0-v1] -stRevertTest/test_revert_opcode_multiple_sub_calls.py::test_revert_opcode_multiple_sub_calls[fork_Amsterdam-d3-g2-v0] -stRevertTest/test_revert_opcode_multiple_sub_calls.py::test_revert_opcode_multiple_sub_calls[fork_Amsterdam-d3-g2-v1] # stSStoreTest (4) stSStoreTest/test_sstore_gas.py::test_sstore_gas[fork_Amsterdam] @@ -321,20 +303,8 @@ stSolidityTest/test_test_contract_suicide.py::test_test_contract_suicide[fork_Am # stSpecialTest (1) stSpecialTest/test_make_money.py::test_make_money[fork_Amsterdam] -# stStaticCall (16) +# stStaticCall (4) stStaticCall/test_static_call_value_inherit_from_call.py::test_static_call_value_inherit_from_call[fork_Amsterdam] -stStaticCall/test_static_check_opcodes4.py::test_static_check_opcodes4[fork_Amsterdam--g1-v0] -stStaticCall/test_static_check_opcodes4.py::test_static_check_opcodes4[fork_Amsterdam--g1-v1] -stStaticCall/test_static_check_opcodes5.py::test_static_check_opcodes5[fork_Amsterdam-d0-g1-v0] -stStaticCall/test_static_check_opcodes5.py::test_static_check_opcodes5[fork_Amsterdam-d0-g1-v1] -stStaticCall/test_static_check_opcodes5.py::test_static_check_opcodes5[fork_Amsterdam-d1-g1-v0] -stStaticCall/test_static_check_opcodes5.py::test_static_check_opcodes5[fork_Amsterdam-d1-g1-v1] -stStaticCall/test_static_check_opcodes5.py::test_static_check_opcodes5[fork_Amsterdam-d2-g1-v0] -stStaticCall/test_static_check_opcodes5.py::test_static_check_opcodes5[fork_Amsterdam-d2-g1-v1] -stStaticCall/test_static_check_opcodes5.py::test_static_check_opcodes5[fork_Amsterdam-d3-g1-v0] -stStaticCall/test_static_check_opcodes5.py::test_static_check_opcodes5[fork_Amsterdam-d3-g1-v1] -stStaticCall/test_static_check_opcodes5.py::test_static_check_opcodes5[fork_Amsterdam-d4-g1-v0] -stStaticCall/test_static_check_opcodes5.py::test_static_check_opcodes5[fork_Amsterdam-d4-g1-v1] stStaticCall/test_static_create_empty_contract_and_call_it_0wei.py::test_static_create_empty_contract_and_call_it_0wei[fork_Amsterdam] stStaticCall/test_static_create_empty_contract_with_storage_and_call_it_0wei.py::test_static_create_empty_contract_with_storage_and_call_it_0wei[fork_Amsterdam] stStaticCall/test_static_execute_call_that_ask_fore_gas_then_trabsaction_has.py::test_static_execute_call_that_ask_fore_gas_then_trabsaction_has[fork_Amsterdam-d0] @@ -351,24 +321,3 @@ stTransactionTest/test_opcodes_transaction_init.py::test_opcodes_transaction_ini stTransactionTest/test_opcodes_transaction_init.py::test_opcodes_transaction_init[fork_Amsterdam-side_effects] stTransactionTest/test_store_gas_on_create.py::test_store_gas_on_create[fork_Amsterdam] stTransactionTest/test_suicides_and_internal_call_suicides_success.py::test_suicides_and_internal_call_suicides_success[fork_Amsterdam-d1] - -# stZeroKnowledge (19) -stZeroKnowledge/test_point_mul_add.py::test_point_mul_add[fork_Amsterdam-d2-g3] -stZeroKnowledge/test_point_mul_add.py::test_point_mul_add[fork_Amsterdam-d7-g3] -stZeroKnowledge/test_point_mul_add.py::test_point_mul_add[fork_Amsterdam-d8-g3] -stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d0-g3] -stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d1-g3] -stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d12-g3] -stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d17-g3] -stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d2-g3] -stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d21-g3] -stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d26-g3] -stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d3-g3] -stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d30-g3] -stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d34-g3] -stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d4-g3] -stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d5-g3] -stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d6-g3] -stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d7-g3] -stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d8-g3] -stZeroKnowledge/test_point_mul_add2.py::test_point_mul_add2[fork_Amsterdam-d9-g3] diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_lose_gas_oog.py b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_lose_gas_oog.py index 8ed143eb578..a75fb2e2479 100644 --- a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_lose_gas_oog.py +++ b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_lose_gas_oog.py @@ -123,7 +123,7 @@ def test_callcode_lose_gas_oog( tx_data = [ Bytes(""), ] - tx_gas = [166262, 156262, 170000] + tx_gas = [166262, 156262, None if fork.is_eip_enabled(8037) else 170000] tx_value = [10] tx = Transaction( diff --git a/tests/ported_static/stCreateTest/test_create_collision_to_empty2.py b/tests/ported_static/stCreateTest/test_create_collision_to_empty2.py index 811c004c64b..06f61cbd121 100644 --- a/tests/ported_static/stCreateTest/test_create_collision_to_empty2.py +++ b/tests/ported_static/stCreateTest/test_create_collision_to_empty2.py @@ -258,7 +258,10 @@ def test_create_collision_to_empty2( # `OPCODE_CREATE_BASE` from 32_000 to 9_000, so reduce the # original 54_000 budget by the same delta to track the cliff. create_base_delta = 32000 - fork.gas_costs().OPCODE_CREATE_BASE - tx_gas = [600000, 54000 - create_base_delta] + tx_gas = [ + None if fork.is_eip_enabled(8037) else 600000, + 54000 - create_base_delta, + ] tx_value = [0, 1] tx = Transaction( diff --git a/tests/ported_static/stMemoryStressTest/test_return_bounds.py b/tests/ported_static/stMemoryStressTest/test_return_bounds.py index ae8816c1e31..8918cd9d9d0 100644 --- a/tests/ported_static/stMemoryStressTest/test_return_bounds.py +++ b/tests/ported_static/stMemoryStressTest/test_return_bounds.py @@ -429,7 +429,7 @@ def test_return_bounds( tx_data = [ Bytes(""), ] - tx_gas = [150000, 500000, 15000000] + tx_gas = [150000, None if fork.is_eip_enabled(8037) else 500000, 15000000] tx_value = [1] tx = Transaction( diff --git a/tests/ported_static/stRevertTest/test_revert_opcode_multiple_sub_calls.py b/tests/ported_static/stRevertTest/test_revert_opcode_multiple_sub_calls.py index 416bab3330a..b91a3a76eb5 100644 --- a/tests/ported_static/stRevertTest/test_revert_opcode_multiple_sub_calls.py +++ b/tests/ported_static/stRevertTest/test_revert_opcode_multiple_sub_calls.py @@ -584,7 +584,12 @@ def test_revert_opcode_multiple_sub_calls( Hash(addr_3, left_padding=True), Hash(addr_4, left_padding=True), ] - tx_gas = [800000, 126200, 160000, 50000] + tx_gas = [ + None if fork.is_eip_enabled(8037) else 800000, + 126200, + None if fork.is_eip_enabled(8037) else 160000, + 50000, + ] tx_value = [0, 10] tx = Transaction( diff --git a/tests/ported_static/stStaticCall/test_static_check_opcodes4.py b/tests/ported_static/stStaticCall/test_static_check_opcodes4.py index d212aec2a60..8c4a09aef3a 100644 --- a/tests/ported_static/stStaticCall/test_static_check_opcodes4.py +++ b/tests/ported_static/stStaticCall/test_static_check_opcodes4.py @@ -254,7 +254,7 @@ def test_static_check_opcodes4( tx_data = [ Bytes(""), ] - tx_gas = [50000, 335000] + tx_gas = [50000, None if fork.is_eip_enabled(8037) else 335000] tx_value = [0, 100] tx = Transaction( diff --git a/tests/ported_static/stStaticCall/test_static_check_opcodes5.py b/tests/ported_static/stStaticCall/test_static_check_opcodes5.py index 74c6fd24a52..ff557a77c24 100644 --- a/tests/ported_static/stStaticCall/test_static_check_opcodes5.py +++ b/tests/ported_static/stStaticCall/test_static_check_opcodes5.py @@ -552,7 +552,7 @@ def test_static_check_opcodes5( Hash(addr_4, left_padding=True), Hash(addr_5, left_padding=True), ] - tx_gas = [50000, 335000] + tx_gas = [50000, None if fork.is_eip_enabled(8037) else 335000] tx_value = [0, 100] tx = Transaction( diff --git a/tests/ported_static/stZeroKnowledge/test_point_mul_add.py b/tests/ported_static/stZeroKnowledge/test_point_mul_add.py index 4a32c3ba08c..6b1be531b1b 100644 --- a/tests/ported_static/stZeroKnowledge/test_point_mul_add.py +++ b/tests/ported_static/stZeroKnowledge/test_point_mul_add.py @@ -626,7 +626,12 @@ def test_point_mul_add( + Hash(0x2) + Hash(0x0), ] - tx_gas = [2000000, 90000, 110000, 192000] + tx_gas = [ + 2000000, + 90000, + 110000, + None if fork.is_eip_enabled(8037) else 192000, + ] tx = Transaction( sender=sender, diff --git a/tests/ported_static/stZeroKnowledge/test_point_mul_add2.py b/tests/ported_static/stZeroKnowledge/test_point_mul_add2.py index d97f92d87f5..1c1e277c76a 100644 --- a/tests/ported_static/stZeroKnowledge/test_point_mul_add2.py +++ b/tests/ported_static/stZeroKnowledge/test_point_mul_add2.py @@ -1971,7 +1971,12 @@ def test_point_mul_add2( 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE ), ] - tx_gas = [2000000, 90000, 110000, 150000] + tx_gas = [ + 2000000, + 90000, + 110000, + None if fork.is_eip_enabled(8037) else 150000, + ] tx = Transaction( sender=sender, From 29fc787649e9ec6e70d59d58b2bafd2db29bab6e Mon Sep 17 00:00:00 2001 From: marioevz Date: Wed, 24 Jun 2026 14:28:41 -0600 Subject: [PATCH 6/6] chore(tests): Port and remove failing stZeroKnowledge tests --- tests/byzantium/eip196_ec_add_mul/spec.py | 6 + .../byzantium/eip196_ec_add_mul/test_ecadd.py | 179 +- .../byzantium/eip196_ec_add_mul/test_ecmul.py | 194 ++ .../stZeroKnowledge/test_point_mul_add.py | 645 ------ .../stZeroKnowledge/test_point_mul_add2.py | 1990 ----------------- 5 files changed, 361 insertions(+), 2653 deletions(-) delete mode 100644 tests/ported_static/stZeroKnowledge/test_point_mul_add.py delete mode 100644 tests/ported_static/stZeroKnowledge/test_point_mul_add2.py diff --git a/tests/byzantium/eip196_ec_add_mul/spec.py b/tests/byzantium/eip196_ec_add_mul/spec.py index fc6b3d39720..ee241b2d0ad 100644 --- a/tests/byzantium/eip196_ec_add_mul/spec.py +++ b/tests/byzantium/eip196_ec_add_mul/spec.py @@ -156,6 +156,12 @@ class Spec: 0x269D2516BF8C4F5798CC1267162E59ADD561E5537A328FE0F28A252FA287A72A, ) + # Sample point used by the legacy pointMulAdd2 tests + SAMPLE_G1 = PointG1( + 0x0CCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628, + 0x069EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD, + ) + # Invalid point: S1 with a different x coordinate (not on curve) S1_INVALID = PointG1( 0x0F25919BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2, diff --git a/tests/byzantium/eip196_ec_add_mul/test_ecadd.py b/tests/byzantium/eip196_ec_add_mul/test_ecadd.py index 6655695f21f..e2834736294 100644 --- a/tests/byzantium/eip196_ec_add_mul/test_ecadd.py +++ b/tests/byzantium/eip196_ec_add_mul/test_ecadd.py @@ -1,12 +1,7 @@ """Tests the ecadd precompiled contract.""" import pytest -from execution_testing import ( - Alloc, - Environment, - StateTestFiller, - Transaction, -) +from execution_testing import Alloc, StateTestFiller, Transaction from .spec import PointG1, Spec, ref_spec_196 @@ -137,6 +132,162 @@ Spec.S1, id="single_s1", ), + # Ported from pointMulAdd / pointMulAdd2 (ECADD vs ECMUL) + pytest.param( + Spec.S1x2 + Spec.S1, + Spec.S1x3, + id="s1x2_plus_s1", + ), + pytest.param( + PointG1(Spec.S1x3.x, Spec.P - Spec.S1x3.y) + Spec.S1x3, + Spec.INF_G1, + id="neg_s1x3_plus_s1x3", + ), + pytest.param( + PointG1(Spec.S1x3.x, Spec.P - Spec.S1x3.y) + + PointG1(Spec.S1x3.x, Spec.P - Spec.S1x3.y), + PointG1( + 0x255E468453D7636CC1563E43F7521755F95E6C56043C7321B4AE04E772945FB0, + 0x225C5F1623620FD84BFBAB2D861A9D1E570F7727C540F403085998EBAF407C4, + ), + id="neg_s1x3_doubled", + ), + pytest.param( + PointG1(Spec.S1x3.x, Spec.P - Spec.S1x3.y) + Spec.INF_G1, + PointG1(Spec.S1x3.x, Spec.P - Spec.S1x3.y), + id="neg_s1x3_plus_inf", + ), + pytest.param( + Spec.S1x2 + Spec.INF_G1, + Spec.S1x2, + id="s1x2_plus_inf", + ), + pytest.param( + Spec.G1 + PointG1(Spec.G1.x, Spec.P - Spec.G1.y), + Spec.INF_G1, + id="generator_plus_neg_generator", + ), + pytest.param( + PointG1(Spec.G1.x, Spec.P - Spec.G1.y) + + PointG1(Spec.G1.x, Spec.P - Spec.G1.y), + PointG1(Spec.G1x2.x, Spec.P - Spec.G1x2.y), + id="neg_generator_doubled", + ), + pytest.param( + PointG1(Spec.G1x2.x, Spec.P - Spec.G1x2.y) + + PointG1(Spec.G1.x, Spec.P - Spec.G1.y), + PointG1( + 0x769BF9AC56BEA3FF40232BCB1B6BD159315D84715B8E679F2D355961915ABF0, + 0x5ACB4B400E90C0063006A39F478F3E865E306DD5CD56F356E2E8CD8FE7EDAE6, + ), + id="neg_g1x2_plus_neg_generator", + ), + pytest.param( + PointG1(Spec.G1.x, Spec.P - Spec.G1.y) + Spec.INF_G1, + PointG1(Spec.G1.x, Spec.P - Spec.G1.y), + id="neg_generator_plus_inf", + ), + pytest.param( + Spec.SAMPLE_G1 + PointG1(Spec.G1.x, Spec.P - Spec.G1.y), + PointG1( + 0x113AECCECDAF57CD8C0AACE591774949DCDAF892555FA86726FA7E679B89C067, + 0xBFFBA84127A19ABDE488A8251A9A3FCE33B34A76F96AAFB11AB4A6CEF3E9979, + ), + id="sample_plus_neg_generator", + ), + pytest.param( + Spec.SAMPLE_G1 + Spec.SAMPLE_G1, + PointG1( + 0x1FD3B816D9951DCB9AA9797D25E51A865987703AE83CD69C4658679F0350AE2B, + 0x29CE3D80A74DDC13784BEB25CA9FBFD048A3265A32C6F38B92060C5093A0E7A7, + ), + id="sample_doubled", + ), + pytest.param( + Spec.SAMPLE_G1 + Spec.INF_G1, + Spec.SAMPLE_G1, + id="sample_plus_inf", + ), + pytest.param( + PointG1(Spec.G1x2_256_1.x, Spec.P - Spec.G1x2_256_1.y) + + PointG1(Spec.G1.x, Spec.P - Spec.G1.y), + PointG1( + 0x1D78954C630B3895FBBFAFAC1294F2C0158879FDC70BFE18222890E7BFB66FBA, + 0x101C3346E98B136A7078AEBD427DCED763722D77E3D7985342E0BFFCC6EA4D56, + ), + id="neg_g1x2_256_1_plus_neg_generator", + ), + pytest.param( + PointG1(Spec.G1x2_256_1.x, Spec.P - Spec.G1x2_256_1.y) + + PointG1(Spec.G1x2_256_1.x, Spec.P - Spec.G1x2_256_1.y), + PointG1( + 0x2FA739D4CDE056D8FD75427345CBB34159856E06A4FFAD64159C4773F23FBF4B, + 0x1EED5D5325C31FC89DD541A13D7F63B981FAE8D4BF78A6B08A38A601FCFEA97B, + ), + id="neg_g1x2_256_1_doubled", + ), + pytest.param( + PointG1(Spec.G1x2_256_1.x, Spec.P - Spec.G1x2_256_1.y) + + Spec.INF_G1, + PointG1(Spec.G1x2_256_1.x, Spec.P - Spec.G1x2_256_1.y), + id="neg_g1x2_256_1_plus_inf", + ), + pytest.param( + Spec.G1x2 + Spec.G1, + PointG1( + 0x769BF9AC56BEA3FF40232BCB1B6BD159315D84715B8E679F2D355961915ABF0, + 0x2AB799BEE0489429554FDB7C8D086475319E63B40B9C5B57CDF1FF3DD9FE2261, + ), + id="g1x2_plus_generator", + ), + pytest.param( + PointG1(Spec.G1.x, Spec.P - Spec.G1.y) + Spec.G1, + Spec.INF_G1, + id="neg_generator_plus_generator", + ), + pytest.param( + PointG1(Spec.SAMPLE_G1.x, Spec.P - Spec.SAMPLE_G1.y) + Spec.G1, + PointG1( + 0x113AECCECDAF57CD8C0AACE591774949DCDAF892555FA86726FA7E679B89C067, + 0x246493EECEB7867DDA07BB342FD7B460B44635E9F8DB1F922A7541A9E93E63CE, + ), + id="neg_sample_plus_generator", + ), + pytest.param( + PointG1(Spec.SAMPLE_G1.x, Spec.P - Spec.SAMPLE_G1.y) + + PointG1(Spec.SAMPLE_G1.x, Spec.P - Spec.SAMPLE_G1.y), + PointG1( + 0x1FD3B816D9951DCB9AA9797D25E51A865987703AE83CD69C4658679F0350AE2B, + 0x69610F239E3C41640045A90B6E1988D4EDE443735AAD701AA1A7FC644DC15A0, + ), + id="neg_sample_doubled", + ), + pytest.param( + PointG1(Spec.SAMPLE_G1.x, Spec.P - Spec.SAMPLE_G1.y) + Spec.INF_G1, + PointG1(Spec.SAMPLE_G1.x, Spec.P - Spec.SAMPLE_G1.y), + id="neg_sample_plus_inf", + ), + pytest.param( + Spec.G1x2_256_1 + Spec.G1, + PointG1( + 0x1D78954C630B3895FBBFAFAC1294F2C0158879FDC70BFE18222890E7BFB66FBA, + 0x20481B2BF7A68CBF47D796F93F038986340F3D19849A3239F93FCC1A1192AFF1, + ), + id="g1x2_256_1_plus_generator", + ), + pytest.param( + Spec.G1x2_256_1 + Spec.G1x2_256_1, + PointG1( + 0x2FA739D4CDE056D8FD75427345CBB34159856E06A4FFAD64159C4773F23FBF4B, + 0x1176F11FBB6E80611A7B04154401F4A4158681BCA8F923DCB1E7E614DB7E53CC, + ), + id="g1x2_256_1_doubled", + ), + pytest.param( + Spec.G1x2_256_1 + Spec.INF_G1, + Spec.G1x2_256_1, + id="g1x2_256_1_plus_inf", + ), ], ) @pytest.mark.ported_from( @@ -171,6 +322,8 @@ "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_1145-4651_25000_192Filler.json", "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_2969-1336_21000_128Filler.json", "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_2969-1336_25000_128Filler.json", + "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAddFiller.json", + "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAdd2Filler.json", ], pr=[ "https://github.com/ethereum/execution-specs/pull/1935", @@ -184,12 +337,7 @@ def test_valid( tx: Transaction, ) -> None: """Test the valid inputs to the ECADD precompile.""" - state_test( - env=Environment(), - pre=pre, - tx=tx, - post=post, - ) + state_test(pre=pre, tx=tx, post=post) @pytest.mark.parametrize( @@ -313,9 +461,4 @@ def test_invalid( tx: Transaction, ) -> None: """Test the invalid inputs to the ECADD precompile.""" - state_test( - env=Environment(), - pre=pre, - tx=tx, - post=post, - ) + state_test(pre=pre, tx=tx, post=post) diff --git a/tests/byzantium/eip196_ec_add_mul/test_ecmul.py b/tests/byzantium/eip196_ec_add_mul/test_ecmul.py index b8fbb1b938e..be68f384508 100644 --- a/tests/byzantium/eip196_ec_add_mul/test_ecmul.py +++ b/tests/byzantium/eip196_ec_add_mul/test_ecmul.py @@ -239,6 +239,198 @@ Spec.INF_G1, id="generator_no_scalar", ), + # Ported from pointMulAdd / pointMulAdd2 (ECADD vs ECMUL) + pytest.param( + Spec.S1 + Scalar(2), + Spec.S1x2, + id="s1_times_two", + ), + pytest.param( + Spec.S1 + Scalar(3), + Spec.S1x3, + id="s1_times_three", + ), + pytest.param( + Spec.S1x3 + Scalar(0), + Spec.INF_G1, + id="s1x3_times_zero", + ), + pytest.param( + PointG1(Spec.S1x3.x, Spec.P - Spec.S1x3.y) + Scalar(2), + PointG1( + 0x255E468453D7636CC1563E43F7521755F95E6C56043C7321B4AE04E772945FB0, + 0x225C5F1623620FD84BFBAB2D861A9D1E570F7727C540F403085998EBAF407C4, + ), + id="neg_s1x3_times_two", + ), + pytest.param( + Spec.S1x3 + Scalar(Spec.N - 1), + PointG1(Spec.S1x3.x, Spec.P - Spec.S1x3.y), + id="s1x3_times_group_order_minus_one", + ), + pytest.param( + Spec.S1x3 + Scalar(Spec.N - 2), + PointG1( + 0x255E468453D7636CC1563E43F7521755F95E6C56043C7321B4AE04E772945FB0, + 0x225C5F1623620FD84BFBAB2D861A9D1E570F7727C540F403085998EBAF407C4, + ), + id="s1x3_times_group_order_minus_two", + ), + pytest.param( + Spec.S1x2 + Scalar(1), + Spec.S1x2, + id="s1x2_times_one", + ), + pytest.param( + Spec.INF_G1 + Scalar(3), + Spec.INF_G1, + id="inf_times_three", + ), + pytest.param( + Spec.INF_G1 + Scalar(Spec.N - 2), + Spec.INF_G1, + id="inf_times_group_order_minus_two", + ), + pytest.param( + Spec.INF_G1 + Scalar(Spec.P - 1), + Spec.INF_G1, + id="inf_times_field_modulus_minus_one", + ), + pytest.param( + Spec.INF_G1 + Scalar(Spec.P - 2), + Spec.INF_G1, + id="inf_times_field_modulus_minus_two", + ), + pytest.param( + Spec.INF_G1 + Scalar(2**256 - 2), + Spec.INF_G1, + id="inf_times_2_pow_256_minus_2", + ), + pytest.param( + PointG1(Spec.G1.x, Spec.P - Spec.G1.y) + Scalar(2), + PointG1(Spec.G1x2.x, Spec.P - Spec.G1x2.y), + id="neg_generator_times_two", + ), + pytest.param( + PointG1(Spec.G1.x, Spec.P - Spec.G1.y) + Scalar(3), + PointG1( + 0x769BF9AC56BEA3FF40232BCB1B6BD159315D84715B8E679F2D355961915ABF0, + 0x5ACB4B400E90C0063006A39F478F3E865E306DD5CD56F356E2E8CD8FE7EDAE6, + ), + id="neg_generator_times_three", + ), + pytest.param( + PointG1(Spec.G1.x, Spec.P - Spec.G1.y) + Scalar(0), + Spec.INF_G1, + id="neg_generator_times_zero", + ), + pytest.param( + PointG1(Spec.G1.x, Spec.P - Spec.G1.y) + Scalar(Spec.N - 1), + Spec.G1, + id="neg_generator_times_group_order_minus_one", + ), + pytest.param( + PointG1(Spec.G1.x, Spec.P - Spec.G1.y) + Scalar(Spec.N - 2), + Spec.G1x2, + id="neg_generator_times_group_order_minus_two", + ), + pytest.param( + PointG1(Spec.G1.x, Spec.P - Spec.G1.y) + Scalar(1), + PointG1(Spec.G1.x, Spec.P - Spec.G1.y), + id="neg_generator_times_one", + ), + pytest.param( + Spec.SAMPLE_G1 + Scalar(2), + PointG1( + 0x1FD3B816D9951DCB9AA9797D25E51A865987703AE83CD69C4658679F0350AE2B, + 0x29CE3D80A74DDC13784BEB25CA9FBFD048A3265A32C6F38B92060C5093A0E7A7, + ), + id="sample_times_two", + ), + pytest.param( + PointG1(Spec.G1.x, Spec.P - Spec.G1.y) + Scalar(Spec.P - 1), + Spec.SAMPLE_G1, + id="neg_generator_times_field_modulus_minus_one", + ), + pytest.param( + PointG1(Spec.G1.x, Spec.P - Spec.G1.y) + Scalar(Spec.P - 2), + PointG1( + 0x2C15ED1902E189486AB6B625AA982510AEF6246B21A1E1BCEA382DA4D735E8BA, + 0x2103E58CBD2FA8081763442AB46C26A9B8051E9B049C3948C8D7D0E139C5E3F, + ), + id="neg_generator_times_field_modulus_minus_two", + ), + pytest.param( + PointG1(Spec.G1x2_256_1.x, Spec.P - Spec.G1x2_256_1.y) + Scalar(2), + PointG1( + 0x2FA739D4CDE056D8FD75427345CBB34159856E06A4FFAD64159C4773F23FBF4B, + 0x1EED5D5325C31FC89DD541A13D7F63B981FAE8D4BF78A6B08A38A601FCFEA97B, + ), + id="neg_g1x2_256_1_times_two", + ), + pytest.param( + PointG1(Spec.G1.x, Spec.P - Spec.G1.y) + Scalar(2**256 - 1), + PointG1(Spec.G1x2_256_1.x, Spec.P - Spec.G1x2_256_1.y), + id="neg_generator_times_2_pow_256_minus_1", + ), + pytest.param( + PointG1(Spec.G1.x, Spec.P - Spec.G1.y) + Scalar(2**256 - 2), + PointG1( + 0x8E2142845DB159BD105879A109FE7A6F254ED3DDAE0E9CD8A2AEAE05E5F647B, + 0x221108EE615499D2E0A1113CA1A858A34E055F9DA2D30E6E6AB392B049944A92, + ), + id="neg_generator_times_2_pow_256_minus_2", + ), + pytest.param( + Spec.G1 + Scalar(3), + PointG1( + 0x769BF9AC56BEA3FF40232BCB1B6BD159315D84715B8E679F2D355961915ABF0, + 0x2AB799BEE0489429554FDB7C8D086475319E63B40B9C5B57CDF1FF3DD9FE2261, + ), + id="generator_times_three", + ), + pytest.param( + Spec.G1 + Scalar(Spec.N - 2), + PointG1(Spec.G1x2.x, Spec.P - Spec.G1x2.y), + id="generator_times_group_order_minus_two", + ), + pytest.param( + PointG1(Spec.SAMPLE_G1.x, Spec.P - Spec.SAMPLE_G1.y) + Scalar(2), + PointG1( + 0x1FD3B816D9951DCB9AA9797D25E51A865987703AE83CD69C4658679F0350AE2B, + 0x69610F239E3C41640045A90B6E1988D4EDE443735AAD701AA1A7FC644DC15A0, + ), + id="neg_sample_times_two", + ), + pytest.param( + Spec.G1 + Scalar(Spec.P - 1), + PointG1(Spec.SAMPLE_G1.x, Spec.P - Spec.SAMPLE_G1.y), + id="generator_times_field_modulus_minus_one", + ), + pytest.param( + Spec.G1 + Scalar(Spec.P - 2), + PointG1( + 0x2C15ED1902E189486AB6B625AA982510AEF6246B21A1E1BCEA382DA4D735E8BA, + 0x2E54101A155EA5A936DA1173D63A95F2FC0118A7B82806F8AF930F08C4E09F08, + ), + id="generator_times_field_modulus_minus_two", + ), + pytest.param( + Spec.G1x2_256_1 + Scalar(2), + PointG1( + 0x2FA739D4CDE056D8FD75427345CBB34159856E06A4FFAD64159C4773F23FBF4B, + 0x1176F11FBB6E80611A7B04154401F4A4158681BCA8F923DCB1E7E614DB7E53CC, + ), + id="g1x2_256_1_times_two", + ), + pytest.param( + Spec.G1 + Scalar(2**256 - 2), + PointG1( + 0x8E2142845DB159BD105879A109FE7A6F254ED3DDAE0E9CD8A2AEAE05E5F647B, + 0xE5345847FDD0656D7AF3479DFD8FFBA497C0AF3C59EBC1ED16CF9668EE8B2B5, + ), + id="generator_times_2_pow_256_minus_2", + ), ], ) @pytest.mark.ported_from( @@ -280,6 +472,8 @@ "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_96Filler.json", "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_128Filler.json", "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_96Filler.json", + "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAddFiller.json", + "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAdd2Filler.json", ], pr=["https://github.com/ethereum/execution-specs/pull/2403"], ) diff --git a/tests/ported_static/stZeroKnowledge/test_point_mul_add.py b/tests/ported_static/stZeroKnowledge/test_point_mul_add.py deleted file mode 100644 index 6b1be531b1b..00000000000 --- a/tests/ported_static/stZeroKnowledge/test_point_mul_add.py +++ /dev/null @@ -1,645 +0,0 @@ -""" -Test_point_mul_add. - -Ported from: -state_tests/stZeroKnowledge/pointMulAddFiller.json -""" - -import pytest -from execution_testing import ( - EOA, - Account, - Address, - Alloc, - Environment, - Hash, - StateTestFiller, - Transaction, -) -from execution_testing.forks import Fork -from execution_testing.specs.static_state.expect_section import ( - resolve_expect_post, -) -from execution_testing.vm import Op - -REFERENCE_SPEC_GIT_PATH = "N/A" -REFERENCE_SPEC_VERSION = "N/A" - - -@pytest.mark.ported_from( - ["state_tests/stZeroKnowledge/pointMulAddFiller.json"], -) -@pytest.mark.valid_from("Cancun") -@pytest.mark.parametrize( - "d, g, v", - [ - pytest.param( - 0, - 0, - 0, - id="d0-g0", - ), - pytest.param( - 0, - 1, - 0, - id="d0-g1", - ), - pytest.param( - 0, - 2, - 0, - id="d0-g2", - ), - pytest.param( - 0, - 3, - 0, - id="d0-g3", - ), - pytest.param( - 1, - 0, - 0, - id="d1-g0", - ), - pytest.param( - 1, - 1, - 0, - id="d1-g1", - ), - pytest.param( - 1, - 2, - 0, - id="d1-g2", - ), - pytest.param( - 1, - 3, - 0, - id="d1-g3", - ), - pytest.param( - 2, - 0, - 0, - id="d2-g0", - ), - pytest.param( - 2, - 1, - 0, - id="d2-g1", - ), - pytest.param( - 2, - 2, - 0, - id="d2-g2", - ), - pytest.param( - 2, - 3, - 0, - id="d2-g3", - ), - pytest.param( - 3, - 0, - 0, - id="d3-g0", - ), - pytest.param( - 3, - 1, - 0, - id="d3-g1", - ), - pytest.param( - 3, - 2, - 0, - id="d3-g2", - ), - pytest.param( - 3, - 3, - 0, - id="d3-g3", - ), - pytest.param( - 4, - 0, - 0, - id="d4-g0", - ), - pytest.param( - 4, - 1, - 0, - id="d4-g1", - ), - pytest.param( - 4, - 2, - 0, - id="d4-g2", - ), - pytest.param( - 4, - 3, - 0, - id="d4-g3", - ), - pytest.param( - 5, - 0, - 0, - id="d5-g0", - ), - pytest.param( - 5, - 1, - 0, - id="d5-g1", - ), - pytest.param( - 5, - 2, - 0, - id="d5-g2", - ), - pytest.param( - 5, - 3, - 0, - id="d5-g3", - ), - pytest.param( - 6, - 0, - 0, - id="d6-g0", - ), - pytest.param( - 6, - 1, - 0, - id="d6-g1", - ), - pytest.param( - 6, - 2, - 0, - id="d6-g2", - ), - pytest.param( - 6, - 3, - 0, - id="d6-g3", - ), - pytest.param( - 7, - 0, - 0, - id="d7-g0", - ), - pytest.param( - 7, - 1, - 0, - id="d7-g1", - ), - pytest.param( - 7, - 2, - 0, - id="d7-g2", - ), - pytest.param( - 7, - 3, - 0, - id="d7-g3", - ), - pytest.param( - 8, - 0, - 0, - id="d8-g0", - ), - pytest.param( - 8, - 1, - 0, - id="d8-g1", - ), - pytest.param( - 8, - 2, - 0, - id="d8-g2", - ), - pytest.param( - 8, - 3, - 0, - id="d8-g3", - ), - ], -) -@pytest.mark.pre_alloc_mutable -def test_point_mul_add( - state_test: StateTestFiller, - pre: Alloc, - fork: Fork, - d: int, - g: int, - v: int, -) -> None: - """Test_point_mul_add.""" - coinbase = Address(0x68795C4AA09D6F4ED3E5DEDDF8C2AD3049A601DA) - contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B) - sender = EOA( - key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8 - ) - - env = Environment( - fee_recipient=coinbase, - number=1, - timestamp=1000, - prev_randao=0x20000, - base_fee_per_gas=10, - ) - - pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1) - # Source: lll - # {(MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) [[0]](CALLCODE 500000 6 0 0 128 300 64) [[1]](CALLCODE 500000 7 0 128 96 400 64) [[10]] (MLOAD 300) [[11]] (MLOAD 332) [[20]] (MLOAD 400) [[21]] (MLOAD 432) [[2]] (EQ (SLOAD 10) (SLOAD 20)) [[3]] (EQ (SLOAD 11) (SLOAD 21))} # noqa: E501 - contract_0 = pre.deploy_contract( # noqa: F841 - code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0)) - + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20)) - + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40)) - + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60)) - + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x80)) - + Op.MSTORE(offset=0xA0, value=Op.CALLDATALOAD(offset=0xA0)) - + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0xC0)) - + Op.SSTORE( - key=0x0, - value=Op.CALLCODE( - gas=0x7A120, - address=0x6, - value=0x0, - args_offset=0x0, - args_size=0x80, - ret_offset=0x12C, - ret_size=0x40, - ), - ) - + Op.SSTORE( - key=0x1, - value=Op.CALLCODE( - gas=0x7A120, - address=0x7, - value=0x0, - args_offset=0x80, - args_size=0x60, - ret_offset=0x190, - ret_size=0x40, - ), - ) - + Op.SSTORE(key=0xA, value=Op.MLOAD(offset=0x12C)) - + Op.SSTORE(key=0xB, value=Op.MLOAD(offset=0x14C)) - + Op.SSTORE(key=0x14, value=Op.MLOAD(offset=0x190)) - + Op.SSTORE(key=0x15, value=Op.MLOAD(offset=0x1B0)) - + Op.SSTORE( - key=0x2, value=Op.EQ(Op.SLOAD(key=0xA), Op.SLOAD(key=0x14)) - ) - + Op.SSTORE( - key=0x3, value=Op.EQ(Op.SLOAD(key=0xB), Op.SLOAD(key=0x15)) - ) - + Op.STOP, - nonce=0, - address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B), # noqa: E501 - ) - - expect_entries_: list[dict] = [ - { - "indexes": {"data": [0], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286, # noqa: E501 - 11: 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4, # noqa: E501 - 20: 0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286, # noqa: E501 - 21: 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [1], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49, # noqa: E501 - 11: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F, # noqa: E501 - 20: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49, # noqa: E501 - 21: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [2], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": {contract_0: Account(storage={0: 1, 1: 1, 2: 1, 3: 1})}, - }, - { - "indexes": {"data": [3], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x255E468453D7636CC1563E43F7521755F95E6C56043C7321B4AE04E772945FB0, # noqa: E501 - 11: 0x225C5F1623620FD84BFBAB2D861A9D1E570F7727C540F403085998EBAF407C4, # noqa: E501 - 20: 0x255E468453D7636CC1563E43F7521755F95E6C56043C7321B4AE04E772945FB0, # noqa: E501 - 21: 0x225C5F1623620FD84BFBAB2D861A9D1E570F7727C540F403085998EBAF407C4, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [4], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49, # noqa: E501 - 11: 0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8, # noqa: E501 - 20: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49, # noqa: E501 - 21: 0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [5], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x255E468453D7636CC1563E43F7521755F95E6C56043C7321B4AE04E772945FB0, # noqa: E501 - 11: 0x225C5F1623620FD84BFBAB2D861A9D1E570F7727C540F403085998EBAF407C4, # noqa: E501 - 20: 0x255E468453D7636CC1563E43F7521755F95E6C56043C7321B4AE04E772945FB0, # noqa: E501 - 21: 0x225C5F1623620FD84BFBAB2D861A9D1E570F7727C540F403085998EBAF407C4, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [6], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286, # noqa: E501 - 11: 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4, # noqa: E501 - 20: 0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286, # noqa: E501 - 21: 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [7], "gas": [0, 3], "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 10: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3, # noqa: E501 - 11: 0x15ED738C0E0A7C92E7845F96B2AE9C0A68A6A449E3538FC7FF3EBF7A5A18A2C4, # noqa: E501 - 20: 1, - 21: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [8], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": {contract_0: Account(storage={0: 1, 1: 1, 2: 1, 3: 1})}, - }, - { - "indexes": {"data": -1, "gas": [1, 2], "value": -1}, - "network": [">=Cancun"], - "result": {contract_0: Account(storage={})}, - }, - { - "indexes": {"data": [0, 1, 3, 4, 5, 6], "gas": [3], "value": -1}, - "network": [">=Cancun"], - "result": {contract_0: Account(storage={})}, - }, - { - "indexes": {"data": [8, 2], "gas": [3], "value": -1}, - "network": [">=Cancun"], - "result": {contract_0: Account(storage={0: 1, 1: 1, 2: 1, 3: 1})}, - }, - ] - - post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork) - - tx_data = [ - Hash(0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2) - + Hash( - 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA - ) - + Hash( - 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2 - ) - + Hash( - 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA - ) - + Hash( - 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2 - ) - + Hash( - 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA - ) - + Hash(0x2), - Hash( - 0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286 - ) - + Hash( - 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4 - ) - + Hash( - 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2 - ) - + Hash( - 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA - ) - + Hash( - 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2 - ) - + Hash( - 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA - ) - + Hash(0x3), - Hash( - 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49 - ) - + Hash( - 0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8 - ) - + Hash( - 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49 - ) - + Hash( - 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F - ) - + Hash( - 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49 - ) - + Hash( - 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F - ) - + Hash(0x0), - Hash( - 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49 - ) - + Hash( - 0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8 - ) - + Hash( - 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49 - ) - + Hash( - 0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8 - ) - + Hash( - 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49 - ) - + Hash( - 0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8 - ) - + Hash(0x2), - Hash( - 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49 - ) - + Hash( - 0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8 - ) - + Hash(0x0) - + Hash(0x0) - + Hash( - 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49 - ) - + Hash( - 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F - ) - + Hash( - 0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593F0000000 - ), - Hash( - 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49 - ) - + Hash( - 0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8 - ) - + Hash( - 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49 - ) - + Hash( - 0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8 - ) - + Hash( - 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49 - ) - + Hash( - 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F - ) - + Hash( - 0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593EFFFFFFF - ), - Hash( - 0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286 - ) - + Hash( - 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4 - ) - + Hash(0x0) - + Hash(0x0) - + Hash( - 0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286 - ) - + Hash( - 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4 - ) - + Hash(0x1), - Hash(0x1) - + Hash(0x2) - + Hash(0x1) - + Hash(0x2) - + Hash(0x1) - + Hash(0x2) - + Hash( - 0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593F0000000 - ), - Hash(0x1) - + Hash(0x2) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x1) - + Hash(0x2) - + Hash(0x0), - ] - tx_gas = [ - 2000000, - 90000, - 110000, - None if fork.is_eip_enabled(8037) else 192000, - ] - - tx = Transaction( - sender=sender, - to=contract_0, - data=tx_data[d], - gas_limit=tx_gas[g], - nonce=1, - error=_exc, - ) - - state_test(env=env, pre=pre, post=post, tx=tx) diff --git a/tests/ported_static/stZeroKnowledge/test_point_mul_add2.py b/tests/ported_static/stZeroKnowledge/test_point_mul_add2.py deleted file mode 100644 index 1c1e277c76a..00000000000 --- a/tests/ported_static/stZeroKnowledge/test_point_mul_add2.py +++ /dev/null @@ -1,1990 +0,0 @@ -""" -Test_point_mul_add2. - -Ported from: -state_tests/stZeroKnowledge/pointMulAdd2Filler.json -""" - -import pytest -from execution_testing import ( - EOA, - Account, - Address, - Alloc, - Environment, - Hash, - StateTestFiller, - Transaction, -) -from execution_testing.forks import Fork -from execution_testing.specs.static_state.expect_section import ( - resolve_expect_post, -) -from execution_testing.vm import Op - -REFERENCE_SPEC_GIT_PATH = "N/A" -REFERENCE_SPEC_VERSION = "N/A" - - -@pytest.mark.ported_from( - ["state_tests/stZeroKnowledge/pointMulAdd2Filler.json"], -) -@pytest.mark.valid_from("Cancun") -@pytest.mark.parametrize( - "d, g, v", - [ - pytest.param( - 0, - 0, - 0, - id="d0-g0", - ), - pytest.param( - 0, - 1, - 0, - id="d0-g1", - ), - pytest.param( - 0, - 2, - 0, - id="d0-g2", - ), - pytest.param( - 0, - 3, - 0, - id="d0-g3", - ), - pytest.param( - 1, - 0, - 0, - id="d1-g0", - ), - pytest.param( - 1, - 1, - 0, - id="d1-g1", - ), - pytest.param( - 1, - 2, - 0, - id="d1-g2", - ), - pytest.param( - 1, - 3, - 0, - id="d1-g3", - ), - pytest.param( - 2, - 0, - 0, - id="d2-g0", - ), - pytest.param( - 2, - 1, - 0, - id="d2-g1", - ), - pytest.param( - 2, - 2, - 0, - id="d2-g2", - ), - pytest.param( - 2, - 3, - 0, - id="d2-g3", - ), - pytest.param( - 3, - 0, - 0, - id="d3-g0", - ), - pytest.param( - 3, - 1, - 0, - id="d3-g1", - ), - pytest.param( - 3, - 2, - 0, - id="d3-g2", - ), - pytest.param( - 3, - 3, - 0, - id="d3-g3", - ), - pytest.param( - 4, - 0, - 0, - id="d4-g0", - ), - pytest.param( - 4, - 1, - 0, - id="d4-g1", - ), - pytest.param( - 4, - 2, - 0, - id="d4-g2", - ), - pytest.param( - 4, - 3, - 0, - id="d4-g3", - ), - pytest.param( - 5, - 0, - 0, - id="d5-g0", - ), - pytest.param( - 5, - 1, - 0, - id="d5-g1", - ), - pytest.param( - 5, - 2, - 0, - id="d5-g2", - ), - pytest.param( - 5, - 3, - 0, - id="d5-g3", - ), - pytest.param( - 6, - 0, - 0, - id="d6-g0", - ), - pytest.param( - 6, - 1, - 0, - id="d6-g1", - ), - pytest.param( - 6, - 2, - 0, - id="d6-g2", - ), - pytest.param( - 6, - 3, - 0, - id="d6-g3", - ), - pytest.param( - 7, - 0, - 0, - id="d7-g0", - ), - pytest.param( - 7, - 1, - 0, - id="d7-g1", - ), - pytest.param( - 7, - 2, - 0, - id="d7-g2", - ), - pytest.param( - 7, - 3, - 0, - id="d7-g3", - ), - pytest.param( - 8, - 0, - 0, - id="d8-g0", - ), - pytest.param( - 8, - 1, - 0, - id="d8-g1", - ), - pytest.param( - 8, - 2, - 0, - id="d8-g2", - ), - pytest.param( - 8, - 3, - 0, - id="d8-g3", - ), - pytest.param( - 9, - 0, - 0, - id="d9-g0", - ), - pytest.param( - 9, - 1, - 0, - id="d9-g1", - ), - pytest.param( - 9, - 2, - 0, - id="d9-g2", - ), - pytest.param( - 9, - 3, - 0, - id="d9-g3", - ), - pytest.param( - 10, - 0, - 0, - id="d10-g0", - ), - pytest.param( - 10, - 1, - 0, - id="d10-g1", - ), - pytest.param( - 10, - 2, - 0, - id="d10-g2", - ), - pytest.param( - 10, - 3, - 0, - id="d10-g3", - ), - pytest.param( - 11, - 0, - 0, - id="d11-g0", - ), - pytest.param( - 11, - 1, - 0, - id="d11-g1", - ), - pytest.param( - 11, - 2, - 0, - id="d11-g2", - ), - pytest.param( - 11, - 3, - 0, - id="d11-g3", - ), - pytest.param( - 12, - 0, - 0, - id="d12-g0", - ), - pytest.param( - 12, - 1, - 0, - id="d12-g1", - ), - pytest.param( - 12, - 2, - 0, - id="d12-g2", - ), - pytest.param( - 12, - 3, - 0, - id="d12-g3", - ), - pytest.param( - 13, - 0, - 0, - id="d13-g0", - ), - pytest.param( - 13, - 1, - 0, - id="d13-g1", - ), - pytest.param( - 13, - 2, - 0, - id="d13-g2", - ), - pytest.param( - 13, - 3, - 0, - id="d13-g3", - ), - pytest.param( - 14, - 0, - 0, - id="d14-g0", - ), - pytest.param( - 14, - 1, - 0, - id="d14-g1", - ), - pytest.param( - 14, - 2, - 0, - id="d14-g2", - ), - pytest.param( - 14, - 3, - 0, - id="d14-g3", - ), - pytest.param( - 15, - 0, - 0, - id="d15-g0", - ), - pytest.param( - 15, - 1, - 0, - id="d15-g1", - ), - pytest.param( - 15, - 2, - 0, - id="d15-g2", - ), - pytest.param( - 15, - 3, - 0, - id="d15-g3", - ), - pytest.param( - 16, - 0, - 0, - id="d16-g0", - ), - pytest.param( - 16, - 1, - 0, - id="d16-g1", - ), - pytest.param( - 16, - 2, - 0, - id="d16-g2", - ), - pytest.param( - 16, - 3, - 0, - id="d16-g3", - ), - pytest.param( - 17, - 0, - 0, - id="d17-g0", - ), - pytest.param( - 17, - 1, - 0, - id="d17-g1", - ), - pytest.param( - 17, - 2, - 0, - id="d17-g2", - ), - pytest.param( - 17, - 3, - 0, - id="d17-g3", - ), - pytest.param( - 18, - 0, - 0, - id="d18-g0", - ), - pytest.param( - 18, - 1, - 0, - id="d18-g1", - ), - pytest.param( - 18, - 2, - 0, - id="d18-g2", - ), - pytest.param( - 18, - 3, - 0, - id="d18-g3", - ), - pytest.param( - 19, - 0, - 0, - id="d19-g0", - ), - pytest.param( - 19, - 1, - 0, - id="d19-g1", - ), - pytest.param( - 19, - 2, - 0, - id="d19-g2", - ), - pytest.param( - 19, - 3, - 0, - id="d19-g3", - ), - pytest.param( - 20, - 0, - 0, - id="d20-g0", - ), - pytest.param( - 20, - 1, - 0, - id="d20-g1", - ), - pytest.param( - 20, - 2, - 0, - id="d20-g2", - ), - pytest.param( - 20, - 3, - 0, - id="d20-g3", - ), - pytest.param( - 21, - 0, - 0, - id="d21-g0", - ), - pytest.param( - 21, - 1, - 0, - id="d21-g1", - ), - pytest.param( - 21, - 2, - 0, - id="d21-g2", - ), - pytest.param( - 21, - 3, - 0, - id="d21-g3", - ), - pytest.param( - 22, - 0, - 0, - id="d22-g0", - ), - pytest.param( - 22, - 1, - 0, - id="d22-g1", - ), - pytest.param( - 22, - 2, - 0, - id="d22-g2", - ), - pytest.param( - 22, - 3, - 0, - id="d22-g3", - ), - pytest.param( - 23, - 0, - 0, - id="d23-g0", - ), - pytest.param( - 23, - 1, - 0, - id="d23-g1", - ), - pytest.param( - 23, - 2, - 0, - id="d23-g2", - ), - pytest.param( - 23, - 3, - 0, - id="d23-g3", - ), - pytest.param( - 24, - 0, - 0, - id="d24-g0", - ), - pytest.param( - 24, - 1, - 0, - id="d24-g1", - ), - pytest.param( - 24, - 2, - 0, - id="d24-g2", - ), - pytest.param( - 24, - 3, - 0, - id="d24-g3", - ), - pytest.param( - 25, - 0, - 0, - id="d25-g0", - ), - pytest.param( - 25, - 1, - 0, - id="d25-g1", - ), - pytest.param( - 25, - 2, - 0, - id="d25-g2", - ), - pytest.param( - 25, - 3, - 0, - id="d25-g3", - ), - pytest.param( - 26, - 0, - 0, - id="d26-g0", - ), - pytest.param( - 26, - 1, - 0, - id="d26-g1", - ), - pytest.param( - 26, - 2, - 0, - id="d26-g2", - ), - pytest.param( - 26, - 3, - 0, - id="d26-g3", - ), - pytest.param( - 27, - 0, - 0, - id="d27-g0", - ), - pytest.param( - 27, - 1, - 0, - id="d27-g1", - ), - pytest.param( - 27, - 2, - 0, - id="d27-g2", - ), - pytest.param( - 27, - 3, - 0, - id="d27-g3", - ), - pytest.param( - 28, - 0, - 0, - id="d28-g0", - ), - pytest.param( - 28, - 1, - 0, - id="d28-g1", - ), - pytest.param( - 28, - 2, - 0, - id="d28-g2", - ), - pytest.param( - 28, - 3, - 0, - id="d28-g3", - ), - pytest.param( - 29, - 0, - 0, - id="d29-g0", - ), - pytest.param( - 29, - 1, - 0, - id="d29-g1", - ), - pytest.param( - 29, - 2, - 0, - id="d29-g2", - ), - pytest.param( - 29, - 3, - 0, - id="d29-g3", - ), - pytest.param( - 30, - 0, - 0, - id="d30-g0", - ), - pytest.param( - 30, - 1, - 0, - id="d30-g1", - ), - pytest.param( - 30, - 2, - 0, - id="d30-g2", - ), - pytest.param( - 30, - 3, - 0, - id="d30-g3", - ), - pytest.param( - 31, - 0, - 0, - id="d31-g0", - ), - pytest.param( - 31, - 1, - 0, - id="d31-g1", - ), - pytest.param( - 31, - 2, - 0, - id="d31-g2", - ), - pytest.param( - 31, - 3, - 0, - id="d31-g3", - ), - pytest.param( - 32, - 0, - 0, - id="d32-g0", - ), - pytest.param( - 32, - 1, - 0, - id="d32-g1", - ), - pytest.param( - 32, - 2, - 0, - id="d32-g2", - ), - pytest.param( - 32, - 3, - 0, - id="d32-g3", - ), - pytest.param( - 33, - 0, - 0, - id="d33-g0", - ), - pytest.param( - 33, - 1, - 0, - id="d33-g1", - ), - pytest.param( - 33, - 2, - 0, - id="d33-g2", - ), - pytest.param( - 33, - 3, - 0, - id="d33-g3", - ), - pytest.param( - 34, - 0, - 0, - id="d34-g0", - ), - pytest.param( - 34, - 1, - 0, - id="d34-g1", - ), - pytest.param( - 34, - 2, - 0, - id="d34-g2", - ), - pytest.param( - 34, - 3, - 0, - id="d34-g3", - ), - pytest.param( - 35, - 0, - 0, - id="d35-g0", - ), - pytest.param( - 35, - 1, - 0, - id="d35-g1", - ), - pytest.param( - 35, - 2, - 0, - id="d35-g2", - ), - pytest.param( - 35, - 3, - 0, - id="d35-g3", - ), - pytest.param( - 36, - 0, - 0, - id="d36-g0", - ), - pytest.param( - 36, - 1, - 0, - id="d36-g1", - ), - pytest.param( - 36, - 2, - 0, - id="d36-g2", - ), - pytest.param( - 36, - 3, - 0, - id="d36-g3", - ), - pytest.param( - 37, - 0, - 0, - id="d37-g0", - ), - pytest.param( - 37, - 1, - 0, - id="d37-g1", - ), - pytest.param( - 37, - 2, - 0, - id="d37-g2", - ), - pytest.param( - 37, - 3, - 0, - id="d37-g3", - ), - ], -) -@pytest.mark.pre_alloc_mutable -def test_point_mul_add2( - state_test: StateTestFiller, - pre: Alloc, - fork: Fork, - d: int, - g: int, - v: int, -) -> None: - """Test_point_mul_add2.""" - coinbase = Address(0x68795C4AA09D6F4ED3E5DEDDF8C2AD3049A601DA) - contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B) - sender = EOA( - key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8 - ) - - env = Environment( - fee_recipient=coinbase, - number=1, - timestamp=1000, - prev_randao=0x20000, - base_fee_per_gas=10, - ) - - pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1) - # Source: lll - # {(MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) [[0]](CALLCODE 500000 6 0 0 128 300 64) [[1]](CALLCODE 500000 7 0 128 96 400 64) [[10]] (MLOAD 300) [[11]] (MLOAD 332) [[20]] (MLOAD 400) [[21]] (MLOAD 432) [[2]] (EQ (SLOAD 10) (SLOAD 20)) [[3]] (EQ (SLOAD 11) (SLOAD 21))} # noqa: E501 - contract_0 = pre.deploy_contract( # noqa: F841 - code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0)) - + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20)) - + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40)) - + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60)) - + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x80)) - + Op.MSTORE(offset=0xA0, value=Op.CALLDATALOAD(offset=0xA0)) - + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0xC0)) - + Op.SSTORE( - key=0x0, - value=Op.CALLCODE( - gas=0x7A120, - address=0x6, - value=0x0, - args_offset=0x0, - args_size=0x80, - ret_offset=0x12C, - ret_size=0x40, - ), - ) - + Op.SSTORE( - key=0x1, - value=Op.CALLCODE( - gas=0x7A120, - address=0x7, - value=0x0, - args_offset=0x80, - args_size=0x60, - ret_offset=0x190, - ret_size=0x40, - ), - ) - + Op.SSTORE(key=0xA, value=Op.MLOAD(offset=0x12C)) - + Op.SSTORE(key=0xB, value=Op.MLOAD(offset=0x14C)) - + Op.SSTORE(key=0x14, value=Op.MLOAD(offset=0x190)) - + Op.SSTORE(key=0x15, value=Op.MLOAD(offset=0x1B0)) - + Op.SSTORE( - key=0x2, value=Op.EQ(Op.SLOAD(key=0xA), Op.SLOAD(key=0x14)) - ) - + Op.SSTORE( - key=0x3, value=Op.EQ(Op.SLOAD(key=0xB), Op.SLOAD(key=0x15)) - ) - + Op.STOP, - nonce=0, - address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B), # noqa: E501 - ) - - expect_entries_: list[dict] = [ - { - "indexes": { - "data": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 12, 26], - "gas": [0], - "value": -1, - }, - "network": [">=Cancun"], - "result": {contract_0: Account(storage={0: 1, 1: 1, 2: 1, 3: 1})}, - }, - { - "indexes": {"data": [10], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3, # noqa: E501 - 11: 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, # noqa: E501 - 20: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3, # noqa: E501 - 21: 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [11], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x769BF9AC56BEA3FF40232BCB1B6BD159315D84715B8E679F2D355961915ABF0, # noqa: E501 - 11: 0x5ACB4B400E90C0063006A39F478F3E865E306DD5CD56F356E2E8CD8FE7EDAE6, # noqa: E501 - 20: 0x769BF9AC56BEA3FF40232BCB1B6BD159315D84715B8E679F2D355961915ABF0, # noqa: E501 - 21: 0x5ACB4B400E90C0063006A39F478F3E865E306DD5CD56F356E2E8CD8FE7EDAE6, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [13, 15], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3, # noqa: E501 - 11: 0x15ED738C0E0A7C92E7845F96B2AE9C0A68A6A449E3538FC7FF3EBF7A5A18A2C4, # noqa: E501 - 20: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3, # noqa: E501 - 21: 0x15ED738C0E0A7C92E7845F96B2AE9C0A68A6A449E3538FC7FF3EBF7A5A18A2C4, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [14], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 1, - 11: 2, - 20: 1, - 21: 2, - }, - ), - }, - }, - { - "indexes": {"data": [16], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 1, - 11: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45, # noqa: E501 - 20: 1, - 21: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [17], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 10: 0x113AECCECDAF57CD8C0AACE591774949DCDAF892555FA86726FA7E679B89C067, # noqa: E501 - 11: 0xBFFBA84127A19ABDE488A8251A9A3FCE33B34A76F96AAFB11AB4A6CEF3E9979, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [18], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x1FD3B816D9951DCB9AA9797D25E51A865987703AE83CD69C4658679F0350AE2B, # noqa: E501 - 11: 0x29CE3D80A74DDC13784BEB25CA9FBFD048A3265A32C6F38B92060C5093A0E7A7, # noqa: E501 - 20: 0x1FD3B816D9951DCB9AA9797D25E51A865987703AE83CD69C4658679F0350AE2B, # noqa: E501 - 21: 0x29CE3D80A74DDC13784BEB25CA9FBFD048A3265A32C6F38B92060C5093A0E7A7, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [19], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628, # noqa: E501 - 11: 0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD, # noqa: E501 - 20: 0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628, # noqa: E501 - 21: 0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [20], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 10: 0x1FD3B816D9951DCB9AA9797D25E51A865987703AE83CD69C4658679F0350AE2B, # noqa: E501 - 11: 0x29CE3D80A74DDC13784BEB25CA9FBFD048A3265A32C6F38B92060C5093A0E7A7, # noqa: E501 - 20: 0x2C15ED1902E189486AB6B625AA982510AEF6246B21A1E1BCEA382DA4D735E8BA, # noqa: E501 - 21: 0x2103E58CBD2FA8081763442AB46C26A9B8051E9B049C3948C8D7D0E139C5E3F, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [21], "gas": [0, 3], "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 10: 0x1D78954C630B3895FBBFAFAC1294F2C0158879FDC70BFE18222890E7BFB66FBA, # noqa: E501 - 11: 0x101C3346E98B136A7078AEBD427DCED763722D77E3D7985342E0BFFCC6EA4D56, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [22], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x2FA739D4CDE056D8FD75427345CBB34159856E06A4FFAD64159C4773F23FBF4B, # noqa: E501 - 11: 0x1EED5D5325C31FC89DD541A13D7F63B981FAE8D4BF78A6B08A38A601FCFEA97B, # noqa: E501 - 20: 0x2FA739D4CDE056D8FD75427345CBB34159856E06A4FFAD64159C4773F23FBF4B, # noqa: E501 - 21: 0x1EED5D5325C31FC89DD541A13D7F63B981FAE8D4BF78A6B08A38A601FCFEA97B, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [23], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352, # noqa: E501 - 11: 0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0, # noqa: E501 - 20: 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352, # noqa: E501 - 21: 0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [24], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 10: 0x2FA739D4CDE056D8FD75427345CBB34159856E06A4FFAD64159C4773F23FBF4B, # noqa: E501 - 11: 0x1EED5D5325C31FC89DD541A13D7F63B981FAE8D4BF78A6B08A38A601FCFEA97B, # noqa: E501 - 20: 0x8E2142845DB159BD105879A109FE7A6F254ED3DDAE0E9CD8A2AEAE05E5F647B, # noqa: E501 - 21: 0x221108EE615499D2E0A1113CA1A858A34E055F9DA2D30E6E6AB392B049944A92, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [25], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x769BF9AC56BEA3FF40232BCB1B6BD159315D84715B8E679F2D355961915ABF0, # noqa: E501 - 11: 0x2AB799BEE0489429554FDB7C8D086475319E63B40B9C5B57CDF1FF3DD9FE2261, # noqa: E501 - 20: 0x769BF9AC56BEA3FF40232BCB1B6BD159315D84715B8E679F2D355961915ABF0, # noqa: E501 - 21: 0x2AB799BEE0489429554FDB7C8D086475319E63B40B9C5B57CDF1FF3DD9FE2261, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [27], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 1, - 11: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45, # noqa: E501 - 20: 1, - 21: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [28], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3, # noqa: E501 - 11: 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, # noqa: E501 - 20: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3, # noqa: E501 - 21: 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [29], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 1, - 11: 2, - 20: 1, - 21: 2, - }, - ), - }, - }, - { - "indexes": {"data": [30], "gas": [0, 3], "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 10: 0x113AECCECDAF57CD8C0AACE591774949DCDAF892555FA86726FA7E679B89C067, # noqa: E501 - 11: 0x246493EECEB7867DDA07BB342FD7B460B44635E9F8DB1F922A7541A9E93E63CE, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [31], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x1FD3B816D9951DCB9AA9797D25E51A865987703AE83CD69C4658679F0350AE2B, # noqa: E501 - 11: 0x69610F239E3C41640045A90B6E1988D4EDE443735AAD701AA1A7FC644DC15A0, # noqa: E501 - 20: 0x1FD3B816D9951DCB9AA9797D25E51A865987703AE83CD69C4658679F0350AE2B, # noqa: E501 - 21: 0x69610F239E3C41640045A90B6E1988D4EDE443735AAD701AA1A7FC644DC15A0, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [32], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628, # noqa: E501 - 11: 0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A, # noqa: E501 - 20: 0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628, # noqa: E501 - 21: 0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [33], "gas": [0], "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 10: 0x1FD3B816D9951DCB9AA9797D25E51A865987703AE83CD69C4658679F0350AE2B, # noqa: E501 - 11: 0x69610F239E3C41640045A90B6E1988D4EDE443735AAD701AA1A7FC644DC15A0, # noqa: E501 - 20: 0x2C15ED1902E189486AB6B625AA982510AEF6246B21A1E1BCEA382DA4D735E8BA, # noqa: E501 - 21: 0x2E54101A155EA5A936DA1173D63A95F2FC0118A7B82806F8AF930F08C4E09F08, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [34], "gas": [0, 3], "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 10: 0x1D78954C630B3895FBBFAFAC1294F2C0158879FDC70BFE18222890E7BFB66FBA, # noqa: E501 - 11: 0x20481B2BF7A68CBF47D796F93F038986340F3D19849A3239F93FCC1A1192AFF1, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [35], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x2FA739D4CDE056D8FD75427345CBB34159856E06A4FFAD64159C4773F23FBF4B, # noqa: E501 - 11: 0x1176F11FBB6E80611A7B04154401F4A4158681BCA8F923DCB1E7E614DB7E53CC, # noqa: E501 - 20: 0x2FA739D4CDE056D8FD75427345CBB34159856E06A4FFAD64159C4773F23FBF4B, # noqa: E501 - 21: 0x1176F11FBB6E80611A7B04154401F4A4158681BCA8F923DCB1E7E614DB7E53CC, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [36], "gas": 0, "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 2: 1, - 3: 1, - 10: 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352, # noqa: E501 - 11: 0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97, # noqa: E501 - 20: 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352, # noqa: E501 - 21: 0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [37], "gas": [0], "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 10: 0x2FA739D4CDE056D8FD75427345CBB34159856E06A4FFAD64159C4773F23FBF4B, # noqa: E501 - 11: 0x1176F11FBB6E80611A7B04154401F4A4158681BCA8F923DCB1E7E614DB7E53CC, # noqa: E501 - 20: 0x8E2142845DB159BD105879A109FE7A6F254ED3DDAE0E9CD8A2AEAE05E5F647B, # noqa: E501 - 21: 0xE5345847FDD0656D7AF3479DFD8FFBA497C0AF3C59EBC1ED16CF9668EE8B2B5, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": -1, "gas": [1, 2], "value": -1}, - "network": [">=Cancun"], - "result": {contract_0: Account(storage={})}, - }, - { - "indexes": { - "data": [ - 32, - 35, - 36, - 10, - 11, - 13, - 14, - 15, - 16, - 18, - 19, - 22, - 23, - 25, - 27, - 28, - 29, - ], - "gas": [3], - "value": -1, - }, - "network": [">=Cancun"], - "result": {contract_0: Account(storage={})}, - }, - { - "indexes": { - "data": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 12, 26], - "gas": [3], - "value": -1, - }, - "network": [">=Cancun"], - "result": {contract_0: Account(storage={0: 1, 1: 1, 2: 1, 3: 1})}, - }, - { - "indexes": {"data": [17], "gas": [3], "value": -1}, - "network": [">=Cancun"], - "result": { - contract_0: Account( - storage={ - 0: 1, - 1: 1, - 10: 0x113AECCECDAF57CD8C0AACE591774949DCDAF892555FA86726FA7E679B89C067, # noqa: E501 - 11: 0xBFFBA84127A19ABDE488A8251A9A3FCE33B34A76F96AAFB11AB4A6CEF3E9979, # noqa: E501 - }, - ), - }, - }, - { - "indexes": {"data": [33, 37, 20, 24, 31], "gas": [3], "value": -1}, - "network": [">=Cancun"], - "result": {contract_0: Account(storage={0: 0})}, - }, - ] - - post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork) - - tx_data = [ - Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x2), - Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x3), - Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0), - Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash( - 0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593F0000000 - ), - Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash( - 0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593EFFFFFFF - ), - Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x1), - Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD46 - ), - Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ), - Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash( - 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - ), - Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash(0x0) - + Hash( - 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE - ), - Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x2), - Hash(0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3) - + Hash( - 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83 - ) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x3), - Hash(0x1) - + Hash(0x2) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x0), - Hash(0x1) - + Hash(0x2) - + Hash(0x1) - + Hash(0x2) - + Hash(0x1) - + Hash(0x2) - + Hash(0x2), - Hash(0x1) - + Hash(0x2) - + Hash(0x0) - + Hash(0x0) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash( - 0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593F0000000 - ), - Hash(0x1) - + Hash(0x2) - + Hash(0x1) - + Hash(0x2) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash( - 0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593EFFFFFFF - ), - Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x0) - + Hash(0x0) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x1), - Hash(0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628) - + Hash( - 0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD - ) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x0), - Hash(0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628) - + Hash( - 0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD - ) - + Hash( - 0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628 - ) - + Hash( - 0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD - ) - + Hash( - 0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628 - ) - + Hash( - 0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD - ) - + Hash(0x2), - Hash(0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628) - + Hash( - 0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD - ) - + Hash(0x0) - + Hash(0x0) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD46 - ), - Hash(0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628) - + Hash( - 0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD - ) - + Hash( - 0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628 - ) - + Hash( - 0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD - ) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ), - Hash( - 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352 - ) - + Hash( - 0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0 - ) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x0), - Hash( - 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352 - ) - + Hash( - 0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0 - ) - + Hash( - 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352 - ) - + Hash( - 0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0 - ) - + Hash( - 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352 - ) - + Hash( - 0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0 - ) - + Hash(0x2), - Hash( - 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352 - ) - + Hash( - 0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0 - ) - + Hash(0x0) - + Hash(0x0) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash( - 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - ), - Hash( - 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352 - ) - + Hash( - 0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0 - ) - + Hash( - 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352 - ) - + Hash( - 0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0 - ) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash( - 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE - ), - Hash(0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3) - + Hash( - 0x15ED738C0E0A7C92E7845F96B2AE9C0A68A6A449E3538FC7FF3EBF7A5A18A2C4 - ) - + Hash(0x1) - + Hash(0x2) - + Hash(0x1) - + Hash(0x2) - + Hash(0x3), - Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x1) - + Hash(0x2) - + Hash(0x1) - + Hash(0x2) - + Hash(0x0), - Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x0) - + Hash(0x0) - + Hash(0x1) - + Hash(0x2) - + Hash( - 0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593F0000000 - ), - Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x1) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ) - + Hash(0x1) - + Hash(0x2) - + Hash( - 0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593EFFFFFFF - ), - Hash(0x1) - + Hash(0x2) - + Hash(0x0) - + Hash(0x0) - + Hash(0x1) - + Hash(0x2) - + Hash(0x1), - Hash(0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628) - + Hash( - 0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A - ) - + Hash(0x1) - + Hash(0x2) - + Hash(0x1) - + Hash(0x2) - + Hash(0x0), - Hash(0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628) - + Hash( - 0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A - ) - + Hash( - 0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628 - ) - + Hash( - 0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A - ) - + Hash( - 0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628 - ) - + Hash( - 0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A - ) - + Hash(0x2), - Hash(0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628) - + Hash( - 0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A - ) - + Hash(0x0) - + Hash(0x0) - + Hash(0x1) - + Hash(0x2) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD46 - ), - Hash(0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628) - + Hash( - 0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A - ) - + Hash( - 0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628 - ) - + Hash( - 0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A - ) - + Hash(0x1) - + Hash(0x2) - + Hash( - 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45 - ), - Hash( - 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352 - ) - + Hash( - 0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97 - ) - + Hash(0x1) - + Hash(0x2) - + Hash(0x1) - + Hash(0x2) - + Hash(0x0), - Hash( - 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352 - ) - + Hash( - 0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97 - ) - + Hash( - 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352 - ) - + Hash( - 0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97 - ) - + Hash( - 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352 - ) - + Hash( - 0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97 - ) - + Hash(0x2), - Hash( - 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352 - ) - + Hash( - 0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97 - ) - + Hash(0x0) - + Hash(0x0) - + Hash(0x1) - + Hash(0x2) - + Hash( - 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - ), - Hash( - 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352 - ) - + Hash( - 0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97 - ) - + Hash( - 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352 - ) - + Hash( - 0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97 - ) - + Hash(0x1) - + Hash(0x2) - + Hash( - 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE - ), - ] - tx_gas = [ - 2000000, - 90000, - 110000, - None if fork.is_eip_enabled(8037) else 150000, - ] - - tx = Transaction( - sender=sender, - to=contract_0, - data=tx_data[d], - gas_limit=tx_gas[g], - nonce=1, - error=_exc, - ) - - state_test(env=env, pre=pre, post=post, tx=tx)