diff --git a/tests/ported_static/amsterdam_skip_list.txt b/tests/ported_static/amsterdam_skip_list.txt index 230134e5f18..2739721f60a 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: 897 +# Total entries: 554 # stAttackTest (1) stAttackTest/test_crashing_transaction.py::test_crashing_transaction[fork_Amsterdam] @@ -19,7 +19,16 @@ 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 (17) +# 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/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] @@ -35,32 +44,77 @@ 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 (11) +# stCallDelegateCodesCallCodeHomestead (10) +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] stCodeSizeLimit/test_create_code_size_limit.py::test_create_code_size_limit[fork_Amsterdam-valid] -# stCreate2 (23) -stCreate2/test_create2_first_byte_loop.py::test_create2_first_byte_loop[fork_Amsterdam-firstHalf] +# stCreate2 (40) stCreate2/test_create2_oo_gafter_init_code.py::test_create2_oo_gafter_init_code[fork_Amsterdam--g1] stCreate2/test_create2_oo_gafter_init_code_returndata2.py::test_create2_oo_gafter_init_code_returndata2[fork_Amsterdam--g1] stCreate2/test_create2_oo_gafter_init_code_revert2.py::test_create2_oo_gafter_init_code_revert2[fork_Amsterdam] -stCreate2/test_create_message_reverted.py::test_create_message_reverted[fork_Amsterdam--g1] +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] +stCreate2/test_create2no_cash.py::test_create2no_cash[fork_Amsterdam-d1] stCreate2/test_create_message_reverted_oog_in_init2.py::test_create_message_reverted_oog_in_init2[fork_Amsterdam--g0] stCreate2/test_create_message_reverted_oog_in_init2.py::test_create_message_reverted_oog_in_init2[fork_Amsterdam--g1] +stCreate2/test_revert_depth_create2_oog.py::test_revert_depth_create2_oog[fork_Amsterdam-d0-g1-v0] +stCreate2/test_revert_depth_create2_oog.py::test_revert_depth_create2_oog[fork_Amsterdam-d0-g1-v1] stCreate2/test_revert_depth_create2_oog.py::test_revert_depth_create2_oog[fork_Amsterdam-d1-g1-v0] stCreate2/test_revert_depth_create2_oog.py::test_revert_depth_create2_oog[fork_Amsterdam-d1-g1-v1] +stCreate2/test_revert_depth_create2_oog_berlin.py::test_revert_depth_create2_oog_berlin[fork_Amsterdam-d0-g1-v0] +stCreate2/test_revert_depth_create2_oog_berlin.py::test_revert_depth_create2_oog_berlin[fork_Amsterdam-d0-g1-v1] stCreate2/test_revert_depth_create2_oog_berlin.py::test_revert_depth_create2_oog_berlin[fork_Amsterdam-d1-g1-v0] stCreate2/test_revert_depth_create2_oog_berlin.py::test_revert_depth_create2_oog_berlin[fork_Amsterdam-d1-g1-v1] +stCreate2/test_revert_depth_create_address_collision.py::test_revert_depth_create_address_collision[fork_Amsterdam-d0-g0-v0] +stCreate2/test_revert_depth_create_address_collision.py::test_revert_depth_create_address_collision[fork_Amsterdam-d0-g0-v1] +stCreate2/test_revert_depth_create_address_collision.py::test_revert_depth_create_address_collision[fork_Amsterdam-d1-g0-v0] +stCreate2/test_revert_depth_create_address_collision.py::test_revert_depth_create_address_collision[fork_Amsterdam-d1-g0-v1] stCreate2/test_revert_depth_create_address_collision.py::test_revert_depth_create_address_collision[fork_Amsterdam-d1-g1-v0] stCreate2/test_revert_depth_create_address_collision.py::test_revert_depth_create_address_collision[fork_Amsterdam-d1-g1-v1] +stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_depth_create_address_collision_berlin[fork_Amsterdam-d0-g0-v0] +stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_depth_create_address_collision_berlin[fork_Amsterdam-d0-g0-v1] +stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_depth_create_address_collision_berlin[fork_Amsterdam-d1-g0-v0] +stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_depth_create_address_collision_berlin[fork_Amsterdam-d1-g0-v1] 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 (54) 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] @@ -81,6 +135,8 @@ 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-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] 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] @@ -97,6 +153,16 @@ stCreateTest/test_create_oo_gafter_init_code.py::test_create_oo_gafter_init_code stCreateTest/test_create_oo_gafter_init_code_returndata2.py::test_create_oo_gafter_init_code_returndata2[fork_Amsterdam--g1] 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] +stCreateTest/test_create_oog_from_call_refunds.py::test_create_oog_from_call_refunds[fork_Amsterdam-SStore_Refund_NoOoG3] +stCreateTest/test_create_results.py::test_create_results[fork_Amsterdam-d0] +stCreateTest/test_create_results.py::test_create_results[fork_Amsterdam-d1] +stCreateTest/test_create_results.py::test_create_results[fork_Amsterdam-d2] +stCreateTest/test_create_results.py::test_create_results[fork_Amsterdam-d4] +stCreateTest/test_create_results.py::test_create_results[fork_Amsterdam-d5] +stCreateTest/test_create_results.py::test_create_results[fork_Amsterdam-d6] stCreateTest/test_transaction_collision_to_empty2.py::test_transaction_collision_to_empty2[fork_Amsterdam--g1-v0] stCreateTest/test_transaction_collision_to_empty2.py::test_transaction_collision_to_empty2[fork_Amsterdam--g1-v1] stCreateTest/test_transaction_collision_to_empty_but_code.py::test_transaction_collision_to_empty_but_code[fork_Amsterdam--g1-v0] @@ -104,10 +170,14 @@ 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 (3) +# stDelegatecallTestHomestead (7) 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] @@ -154,11 +224,21 @@ stEIP1559/test_sender_balance.py::test_sender_balance[fork_Amsterdam] # stEIP158Specific (1) stEIP158Specific/test_exp_empty.py::test_exp_empty[fork_Amsterdam] -# stEIP2930 (41) +# 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 (2) -stEIP3855_push0/test_push0.py::test_push0[fork_Amsterdam-push0_upd_storage_sc] +# stEIP3855_push0 (4) +stEIP3855_push0/test_push0.py::test_push0[fork_Amsterdam-1025_push0] 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] @@ -168,36 +248,67 @@ stEIP3860_limitmeterinitcode/test_create_init_code_size_limit.py::test_create_in 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 (23) +# 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] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size1-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size1-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size31-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size31-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size32-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size32-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size33-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size33-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size44767-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size44767-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size44768-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size44768-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size44769-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size44769-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size0-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size0-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size1-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size1-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size31-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size31-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size32-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size32-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size33-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size33-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size44767-g0] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size44768-g0] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size44769-g0] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size0-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size0-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size1-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size1-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size31-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size31-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size32-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size32-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size33-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size33-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size44767-g0] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size44768-g0] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size44769-g0] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size0-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size0-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size1-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size1-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size31-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size31-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size32-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size32-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size33-g0] stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size33-g1] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size44767-g0] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size44768-g0] +stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size44769-g0] # stHomesteadSpecific (1) stHomesteadSpecific/test_contract_creation_oo_gdont_leave_empty_contract_via_transaction.py::test_contract_creation_oo_gdont_leave_empty_contract_via_transaction[fork_Amsterdam] -# stInitCodeTest (10) -stInitCodeTest/test_call_contract_to_create_contract_which_would_create_contract_if_called.py::test_call_contract_to_create_contract_which_would_create_contract_if_called[fork_Amsterdam] +# stInitCodeTest (7) stInitCodeTest/test_out_of_gas_contract_creation.py::test_out_of_gas_contract_creation[fork_Amsterdam-d0-g0] stInitCodeTest/test_out_of_gas_contract_creation.py::test_out_of_gas_contract_creation[fork_Amsterdam-d0-g1] stInitCodeTest/test_out_of_gas_contract_creation.py::test_out_of_gas_contract_creation[fork_Amsterdam-d1-g0] @@ -205,8 +316,6 @@ stInitCodeTest/test_out_of_gas_contract_creation.py::test_out_of_gas_contract_cr stInitCodeTest/test_out_of_gas_prefunded_contract_creation.py::test_out_of_gas_prefunded_contract_creation[fork_Amsterdam--g0] stInitCodeTest/test_out_of_gas_prefunded_contract_creation.py::test_out_of_gas_prefunded_contract_creation[fork_Amsterdam--g1] stInitCodeTest/test_out_of_gas_prefunded_contract_creation.py::test_out_of_gas_prefunded_contract_creation[fork_Amsterdam--g2] -stInitCodeTest/test_transaction_create_auto_suicide_contract.py::test_transaction_create_auto_suicide_contract[fork_Amsterdam] -stInitCodeTest/test_transaction_create_stop_in_initcode.py::test_transaction_create_stop_in_initcode[fork_Amsterdam] # stMemExpandingEIP150Calls (4) stMemExpandingEIP150Calls/test_call_ask_more_gas_on_depth2_then_transaction_has_with_mem_expanding_calls.py::test_call_ask_more_gas_on_depth2_then_transaction_has_with_mem_expanding_calls[fork_Amsterdam] @@ -217,7 +326,10 @@ 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 (2) +# stMemoryTest (5) +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] @@ -233,13 +345,9 @@ 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] -# stPreCompiledContracts (0) - -# stPreCompiledContracts2 (7) +# 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] -stPreCompiledContracts2/test_modexp_0_0_0_22000.py::test_modexp_0_0_0_22000[fork_Amsterdam--g0] -stPreCompiledContracts2/test_modexp_0_0_0_25000.py::test_modexp_0_0_0_25000[fork_Amsterdam--g0] -stPreCompiledContracts2/test_modexp_0_0_0_35000.py::test_modexp_0_0_0_35000[fork_Amsterdam--g0] # stRecursiveCreate (1) stRecursiveCreate/test_recursive_create.py::test_recursive_create[fork_Amsterdam] @@ -253,12 +361,41 @@ 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 (7) +# 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 (30) +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] stRevertTest/test_revert_depth_create_oog.py::test_revert_depth_create_oog[fork_Amsterdam-d1-g1-v1] +stRevertTest/test_revert_opcode_in_calls_on_non_empty_return_data.py::test_revert_opcode_in_calls_on_non_empty_return_data[fork_Amsterdam-d0-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-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] +stRevertTest/test_revert_sub_call_storage_oog.py::test_revert_sub_call_storage_oog[fork_Amsterdam--g1-v0] +stRevertTest/test_revert_sub_call_storage_oog2.py::test_revert_sub_call_storage_oog2[fork_Amsterdam--g1-v0] # stSStoreTest (76) stSStoreTest/test_sstore_0to0.py::test_sstore_0to0[fork_Amsterdam-d0-g1] @@ -338,536 +475,43 @@ stSStoreTest/test_sstore_xto_yto_z.py::test_sstore_xto_yto_z[fork_Amsterdam-d0-g stSStoreTest/test_sstore_xto_yto_z.py::test_sstore_xto_yto_z[fork_Amsterdam-d1-g1] stSStoreTest/test_sstore_xto_yto_z.py::test_sstore_xto_yto_z[fork_Amsterdam-d2-g1] -# stSolidityTest (1) -stSolidityTest/test_recursive_create_contracts.py::test_recursive_create_contracts[fork_Amsterdam] - -# stSpecialTest (1) -stSpecialTest/test_make_money.py::test_make_money[fork_Amsterdam] - -# stSystemOperationsTest (2) -stSystemOperationsTest/test_ab_acalls3.py::test_ab_acalls3[fork_Amsterdam] -stSystemOperationsTest/test_call_recursive_bomb3.py::test_call_recursive_bomb3[fork_Amsterdam] - -# stTransactionTest (3) -stTransactionTest/test_internal_call_hitting_gas_limit_success.py::test_internal_call_hitting_gas_limit_success[fork_Amsterdam] -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] - -# stWalletTest (4) -stWalletTest/test_day_limit_construction_partial.py::test_day_limit_construction_partial[fork_Amsterdam] -stWalletTest/test_multi_owned_construction_not_enough_gas_partial.py::test_multi_owned_construction_not_enough_gas_partial[fork_Amsterdam--g1] -stWalletTest/test_wallet_construction_oog.py::test_wallet_construction_oog[fork_Amsterdam--g1] -stWalletTest/test_wallet_construction_partial.py::test_wallet_construction_partial[fork_Amsterdam] - -# 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] - -# vmArithmeticTest (1) -vmArithmeticTest/test_two_ops.py::test_two_ops[fork_Amsterdam] - -# stCallCodes (8) -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/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_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 (14) -stCallCreateCallCodeTest/test_create_fail_balance_too_low.py::test_create_fail_balance_too_low[fork_Amsterdam--v1] -stCallCreateCallCodeTest/test_create_init_fail_undefined_instruction.py::test_create_init_fail_undefined_instruction[fork_Amsterdam] - -# stCallDelegateCodesCallCodeHomestead (10) -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] - -# stCreate2 (18) -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_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_balance.py::test_create2collision_balance[fork_Amsterdam-d1] -stCreate2/test_revert_depth_create2_oog.py::test_revert_depth_create2_oog[fork_Amsterdam-d0-g1-v0] -stCreate2/test_revert_depth_create2_oog.py::test_revert_depth_create2_oog[fork_Amsterdam-d0-g1-v1] -stCreate2/test_revert_depth_create2_oog_berlin.py::test_revert_depth_create2_oog_berlin[fork_Amsterdam-d0-g1-v0] -stCreate2/test_revert_depth_create2_oog_berlin.py::test_revert_depth_create2_oog_berlin[fork_Amsterdam-d0-g1-v1] -stCreate2/test_revert_depth_create_address_collision.py::test_revert_depth_create_address_collision[fork_Amsterdam-d0-g1-v0] -stCreate2/test_revert_depth_create_address_collision.py::test_revert_depth_create_address_collision[fork_Amsterdam-d0-g1-v1] -stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_depth_create_address_collision_berlin[fork_Amsterdam-d0-g1-v0] -stCreate2/test_revert_depth_create_address_collision_berlin.py::test_revert_depth_create_address_collision_berlin[fork_Amsterdam-d0-g1-v1] - -# stCreateTest (11) -stCreateTest/test_create_e_contract_create_e_contract_in_init_tr.py::test_create_e_contract_create_e_contract_in_init_tr[fork_Amsterdam] -stCreateTest/test_create_e_contract_create_ne_contract_in_init_tr.py::test_create_e_contract_create_ne_contract_in_init_tr[fork_Amsterdam] -stCreateTest/test_create_empty000_createin_init_code_transaction.py::test_create_empty000_createin_init_code_transaction[fork_Amsterdam] -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_results.py::test_create_results[fork_Amsterdam-d0] -stCreateTest/test_create_results.py::test_create_results[fork_Amsterdam-d1] -stCreateTest/test_create_results.py::test_create_results[fork_Amsterdam-d2] -stCreateTest/test_create_results.py::test_create_results[fork_Amsterdam-d4] -stCreateTest/test_create_results.py::test_create_results[fork_Amsterdam-d5] -stCreateTest/test_create_results.py::test_create_results[fork_Amsterdam-d6] - -# stDelegatecallTestHomestead (3) -stDelegatecallTestHomestead/test_deleagate_call_after_value_transfer.py::test_deleagate_call_after_value_transfer[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] - -# stEIP2930 (4) - -# stEIP3651_warmcoinbase (12) -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] -stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas_fail.py::test_coinbase_warm_account_call_gas_fail[fork_Amsterdam-d0] -stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas_fail.py::test_coinbase_warm_account_call_gas_fail[fork_Amsterdam-d1] -stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas_fail.py::test_coinbase_warm_account_call_gas_fail[fork_Amsterdam-d2] -stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas_fail.py::test_coinbase_warm_account_call_gas_fail[fork_Amsterdam-d3] - -# 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_size1-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size31-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size32-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size33-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size44767-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size44768-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src0_size44769-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size0-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size1-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size31-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size32-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size33-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size44767-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size44768-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src1_size44769-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size0-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size1-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size31-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size32-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size33-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size44767-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size44768-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src31_size44769-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size0-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size1-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size31-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size32-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size33-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size44767-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size44768-g0] -stEIP5656_MCOPY/test_mcopy_copy_cost.py::test_mcopy_copy_cost[fork_Amsterdam-src32_size44769-g0] - -# stMemoryTest (27) -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_mem0b_single_byte.py::test_mem0b_single_byte[fork_Amsterdam] -stMemoryTest/test_mem31b_single_byte.py::test_mem31b_single_byte[fork_Amsterdam] -stMemoryTest/test_mem32b_single_byte.py::test_mem32b_single_byte[fork_Amsterdam] -stMemoryTest/test_mem32kb_single_byte.py::test_mem32kb_single_byte[fork_Amsterdam] -stMemoryTest/test_mem32kb_single_byte_minus_1.py::test_mem32kb_single_byte_minus_1[fork_Amsterdam] -stMemoryTest/test_mem32kb_single_byte_minus_31.py::test_mem32kb_single_byte_minus_31[fork_Amsterdam] -stMemoryTest/test_mem32kb_single_byte_minus_32.py::test_mem32kb_single_byte_minus_32[fork_Amsterdam] -stMemoryTest/test_mem32kb_single_byte_minus_33.py::test_mem32kb_single_byte_minus_33[fork_Amsterdam] -stMemoryTest/test_mem32kb_single_byte_plus_1.py::test_mem32kb_single_byte_plus_1[fork_Amsterdam] -stMemoryTest/test_mem32kb_single_byte_plus_31.py::test_mem32kb_single_byte_plus_31[fork_Amsterdam] -stMemoryTest/test_mem32kb_single_byte_plus_32.py::test_mem32kb_single_byte_plus_32[fork_Amsterdam] -stMemoryTest/test_mem32kb_single_byte_plus_33.py::test_mem32kb_single_byte_plus_33[fork_Amsterdam] -stMemoryTest/test_mem33b_single_byte.py::test_mem33b_single_byte[fork_Amsterdam] -stMemoryTest/test_mem64kb_single_byte.py::test_mem64kb_single_byte[fork_Amsterdam] -stMemoryTest/test_mem64kb_single_byte_minus_1.py::test_mem64kb_single_byte_minus_1[fork_Amsterdam] -stMemoryTest/test_mem64kb_single_byte_minus_31.py::test_mem64kb_single_byte_minus_31[fork_Amsterdam] -stMemoryTest/test_mem64kb_single_byte_minus_32.py::test_mem64kb_single_byte_minus_32[fork_Amsterdam] -stMemoryTest/test_mem64kb_single_byte_minus_33.py::test_mem64kb_single_byte_minus_33[fork_Amsterdam] -stMemoryTest/test_mem64kb_single_byte_plus_1.py::test_mem64kb_single_byte_plus_1[fork_Amsterdam] -stMemoryTest/test_mem64kb_single_byte_plus_31.py::test_mem64kb_single_byte_plus_31[fork_Amsterdam] -stMemoryTest/test_mem64kb_single_byte_plus_32.py::test_mem64kb_single_byte_plus_32[fork_Amsterdam] -stMemoryTest/test_mem64kb_single_byte_plus_33.py::test_mem64kb_single_byte_plus_33[fork_Amsterdam] - -# stPreCompiledContracts2 (9) -stPreCompiledContracts2/test_modexp_0_0_0_20500.py::test_modexp_0_0_0_20500[fork_Amsterdam--g1] -stPreCompiledContracts2/test_modexp_0_0_0_22000.py::test_modexp_0_0_0_22000[fork_Amsterdam--g1] -stPreCompiledContracts2/test_modexp_0_0_0_25000.py::test_modexp_0_0_0_25000[fork_Amsterdam--g1] -stPreCompiledContracts2/test_modexp_0_0_0_35000.py::test_modexp_0_0_0_35000[fork_Amsterdam--g1] - -# stRandom (157) -stRandom/test_random_statetest102.py::test_random_statetest102[fork_Amsterdam] -stRandom/test_random_statetest104.py::test_random_statetest104[fork_Amsterdam] -stRandom/test_random_statetest105.py::test_random_statetest105[fork_Amsterdam] -stRandom/test_random_statetest106.py::test_random_statetest106[fork_Amsterdam] -stRandom/test_random_statetest107.py::test_random_statetest107[fork_Amsterdam] -stRandom/test_random_statetest11.py::test_random_statetest11[fork_Amsterdam] -stRandom/test_random_statetest110.py::test_random_statetest110[fork_Amsterdam] -stRandom/test_random_statetest112.py::test_random_statetest112[fork_Amsterdam] -stRandom/test_random_statetest114.py::test_random_statetest114[fork_Amsterdam] -stRandom/test_random_statetest116.py::test_random_statetest116[fork_Amsterdam] -stRandom/test_random_statetest117.py::test_random_statetest117[fork_Amsterdam] -stRandom/test_random_statetest118.py::test_random_statetest118[fork_Amsterdam] -stRandom/test_random_statetest119.py::test_random_statetest119[fork_Amsterdam] -stRandom/test_random_statetest12.py::test_random_statetest12[fork_Amsterdam] -stRandom/test_random_statetest120.py::test_random_statetest120[fork_Amsterdam] -stRandom/test_random_statetest121.py::test_random_statetest121[fork_Amsterdam] -stRandom/test_random_statetest122.py::test_random_statetest122[fork_Amsterdam] -stRandom/test_random_statetest124.py::test_random_statetest124[fork_Amsterdam] -stRandom/test_random_statetest129.py::test_random_statetest129[fork_Amsterdam] -stRandom/test_random_statetest130.py::test_random_statetest130[fork_Amsterdam] -stRandom/test_random_statetest131.py::test_random_statetest131[fork_Amsterdam] -stRandom/test_random_statetest137.py::test_random_statetest137[fork_Amsterdam] -stRandom/test_random_statetest139.py::test_random_statetest139[fork_Amsterdam] -stRandom/test_random_statetest142.py::test_random_statetest142[fork_Amsterdam] -stRandom/test_random_statetest145.py::test_random_statetest145[fork_Amsterdam] -stRandom/test_random_statetest148.py::test_random_statetest148[fork_Amsterdam] -stRandom/test_random_statetest15.py::test_random_statetest15[fork_Amsterdam] -stRandom/test_random_statetest155.py::test_random_statetest155[fork_Amsterdam] -stRandom/test_random_statetest156.py::test_random_statetest156[fork_Amsterdam] -stRandom/test_random_statetest158.py::test_random_statetest158[fork_Amsterdam] -stRandom/test_random_statetest161.py::test_random_statetest161[fork_Amsterdam] -stRandom/test_random_statetest162.py::test_random_statetest162[fork_Amsterdam] -stRandom/test_random_statetest166.py::test_random_statetest166[fork_Amsterdam] -stRandom/test_random_statetest167.py::test_random_statetest167[fork_Amsterdam] -stRandom/test_random_statetest169.py::test_random_statetest169[fork_Amsterdam] -stRandom/test_random_statetest175.py::test_random_statetest175[fork_Amsterdam] -stRandom/test_random_statetest179.py::test_random_statetest179[fork_Amsterdam] -stRandom/test_random_statetest180.py::test_random_statetest180[fork_Amsterdam] -stRandom/test_random_statetest183.py::test_random_statetest183[fork_Amsterdam] -stRandom/test_random_statetest184.py::test_random_statetest184[fork_Amsterdam] -stRandom/test_random_statetest187.py::test_random_statetest187[fork_Amsterdam] -stRandom/test_random_statetest188.py::test_random_statetest188[fork_Amsterdam] -stRandom/test_random_statetest19.py::test_random_statetest19[fork_Amsterdam] -stRandom/test_random_statetest191.py::test_random_statetest191[fork_Amsterdam] -stRandom/test_random_statetest192.py::test_random_statetest192[fork_Amsterdam] -stRandom/test_random_statetest194.py::test_random_statetest194[fork_Amsterdam] -stRandom/test_random_statetest195.py::test_random_statetest195[fork_Amsterdam] -stRandom/test_random_statetest196.py::test_random_statetest196[fork_Amsterdam] -stRandom/test_random_statetest2.py::test_random_statetest2[fork_Amsterdam] -stRandom/test_random_statetest200.py::test_random_statetest200[fork_Amsterdam] -stRandom/test_random_statetest202.py::test_random_statetest202[fork_Amsterdam] -stRandom/test_random_statetest204.py::test_random_statetest204[fork_Amsterdam] -stRandom/test_random_statetest206.py::test_random_statetest206[fork_Amsterdam] -stRandom/test_random_statetest208.py::test_random_statetest208[fork_Amsterdam] -stRandom/test_random_statetest210.py::test_random_statetest210[fork_Amsterdam] -stRandom/test_random_statetest214.py::test_random_statetest214[fork_Amsterdam] -stRandom/test_random_statetest215.py::test_random_statetest215[fork_Amsterdam] -stRandom/test_random_statetest216.py::test_random_statetest216[fork_Amsterdam] -stRandom/test_random_statetest217.py::test_random_statetest217[fork_Amsterdam] -stRandom/test_random_statetest219.py::test_random_statetest219[fork_Amsterdam] -stRandom/test_random_statetest220.py::test_random_statetest220[fork_Amsterdam] -stRandom/test_random_statetest221.py::test_random_statetest221[fork_Amsterdam] -stRandom/test_random_statetest222.py::test_random_statetest222[fork_Amsterdam] -stRandom/test_random_statetest225.py::test_random_statetest225[fork_Amsterdam] -stRandom/test_random_statetest227.py::test_random_statetest227[fork_Amsterdam] -stRandom/test_random_statetest23.py::test_random_statetest23[fork_Amsterdam] -stRandom/test_random_statetest231.py::test_random_statetest231[fork_Amsterdam] -stRandom/test_random_statetest238.py::test_random_statetest238[fork_Amsterdam] -stRandom/test_random_statetest242.py::test_random_statetest242[fork_Amsterdam] -stRandom/test_random_statetest243.py::test_random_statetest243[fork_Amsterdam] -stRandom/test_random_statetest247.py::test_random_statetest247[fork_Amsterdam] -stRandom/test_random_statetest248.py::test_random_statetest248[fork_Amsterdam] -stRandom/test_random_statetest249.py::test_random_statetest249[fork_Amsterdam] -stRandom/test_random_statetest254.py::test_random_statetest254[fork_Amsterdam] -stRandom/test_random_statetest259.py::test_random_statetest259[fork_Amsterdam] -stRandom/test_random_statetest264.py::test_random_statetest264[fork_Amsterdam] -stRandom/test_random_statetest267.py::test_random_statetest267[fork_Amsterdam] -stRandom/test_random_statetest268.py::test_random_statetest268[fork_Amsterdam] -stRandom/test_random_statetest269.py::test_random_statetest269[fork_Amsterdam] -stRandom/test_random_statetest27.py::test_random_statetest27[fork_Amsterdam] -stRandom/test_random_statetest276.py::test_random_statetest276[fork_Amsterdam] -stRandom/test_random_statetest278.py::test_random_statetest278[fork_Amsterdam] -stRandom/test_random_statetest279.py::test_random_statetest279[fork_Amsterdam] -stRandom/test_random_statetest28.py::test_random_statetest28[fork_Amsterdam] -stRandom/test_random_statetest280.py::test_random_statetest280[fork_Amsterdam] -stRandom/test_random_statetest281.py::test_random_statetest281[fork_Amsterdam] -stRandom/test_random_statetest283.py::test_random_statetest283[fork_Amsterdam] -stRandom/test_random_statetest29.py::test_random_statetest29[fork_Amsterdam] -stRandom/test_random_statetest290.py::test_random_statetest290[fork_Amsterdam] -stRandom/test_random_statetest297.py::test_random_statetest297[fork_Amsterdam] -stRandom/test_random_statetest298.py::test_random_statetest298[fork_Amsterdam] -stRandom/test_random_statetest299.py::test_random_statetest299[fork_Amsterdam] -stRandom/test_random_statetest3.py::test_random_statetest3[fork_Amsterdam] -stRandom/test_random_statetest301.py::test_random_statetest301[fork_Amsterdam] -stRandom/test_random_statetest305.py::test_random_statetest305[fork_Amsterdam] -stRandom/test_random_statetest310.py::test_random_statetest310[fork_Amsterdam] -stRandom/test_random_statetest311.py::test_random_statetest311[fork_Amsterdam] -stRandom/test_random_statetest315.py::test_random_statetest315[fork_Amsterdam] -stRandom/test_random_statetest316.py::test_random_statetest316[fork_Amsterdam] -stRandom/test_random_statetest318.py::test_random_statetest318[fork_Amsterdam] -stRandom/test_random_statetest322.py::test_random_statetest322[fork_Amsterdam] -stRandom/test_random_statetest325.py::test_random_statetest325[fork_Amsterdam] -stRandom/test_random_statetest329.py::test_random_statetest329[fork_Amsterdam] -stRandom/test_random_statetest332.py::test_random_statetest332[fork_Amsterdam] -stRandom/test_random_statetest333.py::test_random_statetest333[fork_Amsterdam] -stRandom/test_random_statetest334.py::test_random_statetest334[fork_Amsterdam] -stRandom/test_random_statetest339.py::test_random_statetest339[fork_Amsterdam] -stRandom/test_random_statetest342.py::test_random_statetest342[fork_Amsterdam] -stRandom/test_random_statetest348.py::test_random_statetest348[fork_Amsterdam] -stRandom/test_random_statetest351.py::test_random_statetest351[fork_Amsterdam] -stRandom/test_random_statetest354.py::test_random_statetest354[fork_Amsterdam] -stRandom/test_random_statetest356.py::test_random_statetest356[fork_Amsterdam] -stRandom/test_random_statetest358.py::test_random_statetest358[fork_Amsterdam] -stRandom/test_random_statetest360.py::test_random_statetest360[fork_Amsterdam] -stRandom/test_random_statetest361.py::test_random_statetest361[fork_Amsterdam] -stRandom/test_random_statetest362.py::test_random_statetest362[fork_Amsterdam] -stRandom/test_random_statetest363.py::test_random_statetest363[fork_Amsterdam] -stRandom/test_random_statetest364.py::test_random_statetest364[fork_Amsterdam] -stRandom/test_random_statetest365.py::test_random_statetest365[fork_Amsterdam] -stRandom/test_random_statetest366.py::test_random_statetest366[fork_Amsterdam] -stRandom/test_random_statetest367.py::test_random_statetest367[fork_Amsterdam] -stRandom/test_random_statetest369.py::test_random_statetest369[fork_Amsterdam] -stRandom/test_random_statetest37.py::test_random_statetest37[fork_Amsterdam] -stRandom/test_random_statetest372.py::test_random_statetest372[fork_Amsterdam] -stRandom/test_random_statetest380.py::test_random_statetest380[fork_Amsterdam] -stRandom/test_random_statetest381.py::test_random_statetest381[fork_Amsterdam] -stRandom/test_random_statetest382.py::test_random_statetest382[fork_Amsterdam] -stRandom/test_random_statetest383.py::test_random_statetest383[fork_Amsterdam] -stRandom/test_random_statetest41.py::test_random_statetest41[fork_Amsterdam] -stRandom/test_random_statetest47.py::test_random_statetest47[fork_Amsterdam] -stRandom/test_random_statetest49.py::test_random_statetest49[fork_Amsterdam] -stRandom/test_random_statetest52.py::test_random_statetest52[fork_Amsterdam] -stRandom/test_random_statetest58.py::test_random_statetest58[fork_Amsterdam] -stRandom/test_random_statetest59.py::test_random_statetest59[fork_Amsterdam] -stRandom/test_random_statetest6.py::test_random_statetest6[fork_Amsterdam] -stRandom/test_random_statetest60.py::test_random_statetest60[fork_Amsterdam] -stRandom/test_random_statetest62.py::test_random_statetest62[fork_Amsterdam] -stRandom/test_random_statetest63.py::test_random_statetest63[fork_Amsterdam] -stRandom/test_random_statetest66.py::test_random_statetest66[fork_Amsterdam] -stRandom/test_random_statetest67.py::test_random_statetest67[fork_Amsterdam] -stRandom/test_random_statetest69.py::test_random_statetest69[fork_Amsterdam] -stRandom/test_random_statetest73.py::test_random_statetest73[fork_Amsterdam] -stRandom/test_random_statetest74.py::test_random_statetest74[fork_Amsterdam] -stRandom/test_random_statetest75.py::test_random_statetest75[fork_Amsterdam] -stRandom/test_random_statetest77.py::test_random_statetest77[fork_Amsterdam] -stRandom/test_random_statetest80.py::test_random_statetest80[fork_Amsterdam] -stRandom/test_random_statetest81.py::test_random_statetest81[fork_Amsterdam] -stRandom/test_random_statetest83.py::test_random_statetest83[fork_Amsterdam] -stRandom/test_random_statetest85.py::test_random_statetest85[fork_Amsterdam] -stRandom/test_random_statetest87.py::test_random_statetest87[fork_Amsterdam] -stRandom/test_random_statetest88.py::test_random_statetest88[fork_Amsterdam] -stRandom/test_random_statetest89.py::test_random_statetest89[fork_Amsterdam] -stRandom/test_random_statetest9.py::test_random_statetest9[fork_Amsterdam] -stRandom/test_random_statetest90.py::test_random_statetest90[fork_Amsterdam] -stRandom/test_random_statetest92.py::test_random_statetest92[fork_Amsterdam] -stRandom/test_random_statetest95.py::test_random_statetest95[fork_Amsterdam] -stRandom/test_random_statetest96.py::test_random_statetest96[fork_Amsterdam] - -# stRandom2 (112) -stRandom2/test_random_statetest.py::test_random_statetest[fork_Amsterdam] -stRandom2/test_random_statetest384.py::test_random_statetest384[fork_Amsterdam] -stRandom2/test_random_statetest385.py::test_random_statetest385[fork_Amsterdam] -stRandom2/test_random_statetest386.py::test_random_statetest386[fork_Amsterdam] -stRandom2/test_random_statetest388.py::test_random_statetest388[fork_Amsterdam] -stRandom2/test_random_statetest389.py::test_random_statetest389[fork_Amsterdam] -stRandom2/test_random_statetest395.py::test_random_statetest395[fork_Amsterdam] -stRandom2/test_random_statetest398.py::test_random_statetest398[fork_Amsterdam] -stRandom2/test_random_statetest399.py::test_random_statetest399[fork_Amsterdam] -stRandom2/test_random_statetest402.py::test_random_statetest402[fork_Amsterdam] -stRandom2/test_random_statetest405.py::test_random_statetest405[fork_Amsterdam] -stRandom2/test_random_statetest407.py::test_random_statetest407[fork_Amsterdam] -stRandom2/test_random_statetest408.py::test_random_statetest408[fork_Amsterdam] -stRandom2/test_random_statetest411.py::test_random_statetest411[fork_Amsterdam] -stRandom2/test_random_statetest412.py::test_random_statetest412[fork_Amsterdam] -stRandom2/test_random_statetest413.py::test_random_statetest413[fork_Amsterdam] -stRandom2/test_random_statetest416.py::test_random_statetest416[fork_Amsterdam] -stRandom2/test_random_statetest419.py::test_random_statetest419[fork_Amsterdam] -stRandom2/test_random_statetest421.py::test_random_statetest421[fork_Amsterdam] -stRandom2/test_random_statetest424.py::test_random_statetest424[fork_Amsterdam] -stRandom2/test_random_statetest425.py::test_random_statetest425[fork_Amsterdam] -stRandom2/test_random_statetest426.py::test_random_statetest426[fork_Amsterdam] -stRandom2/test_random_statetest429.py::test_random_statetest429[fork_Amsterdam] -stRandom2/test_random_statetest430.py::test_random_statetest430[fork_Amsterdam] -stRandom2/test_random_statetest436.py::test_random_statetest436[fork_Amsterdam] -stRandom2/test_random_statetest438.py::test_random_statetest438[fork_Amsterdam] -stRandom2/test_random_statetest439.py::test_random_statetest439[fork_Amsterdam] -stRandom2/test_random_statetest440.py::test_random_statetest440[fork_Amsterdam] -stRandom2/test_random_statetest446.py::test_random_statetest446[fork_Amsterdam] -stRandom2/test_random_statetest447.py::test_random_statetest447[fork_Amsterdam] -stRandom2/test_random_statetest450.py::test_random_statetest450[fork_Amsterdam] -stRandom2/test_random_statetest451.py::test_random_statetest451[fork_Amsterdam] -stRandom2/test_random_statetest452.py::test_random_statetest452[fork_Amsterdam] -stRandom2/test_random_statetest455.py::test_random_statetest455[fork_Amsterdam] -stRandom2/test_random_statetest457.py::test_random_statetest457[fork_Amsterdam] -stRandom2/test_random_statetest460.py::test_random_statetest460[fork_Amsterdam] -stRandom2/test_random_statetest461.py::test_random_statetest461[fork_Amsterdam] -stRandom2/test_random_statetest462.py::test_random_statetest462[fork_Amsterdam] -stRandom2/test_random_statetest464.py::test_random_statetest464[fork_Amsterdam] -stRandom2/test_random_statetest465.py::test_random_statetest465[fork_Amsterdam] -stRandom2/test_random_statetest470.py::test_random_statetest470[fork_Amsterdam] -stRandom2/test_random_statetest471.py::test_random_statetest471[fork_Amsterdam] -stRandom2/test_random_statetest473.py::test_random_statetest473[fork_Amsterdam] -stRandom2/test_random_statetest474.py::test_random_statetest474[fork_Amsterdam] -stRandom2/test_random_statetest475.py::test_random_statetest475[fork_Amsterdam] -stRandom2/test_random_statetest477.py::test_random_statetest477[fork_Amsterdam] -stRandom2/test_random_statetest480.py::test_random_statetest480[fork_Amsterdam] -stRandom2/test_random_statetest482.py::test_random_statetest482[fork_Amsterdam] -stRandom2/test_random_statetest483.py::test_random_statetest483[fork_Amsterdam] -stRandom2/test_random_statetest488.py::test_random_statetest488[fork_Amsterdam] -stRandom2/test_random_statetest489.py::test_random_statetest489[fork_Amsterdam] -stRandom2/test_random_statetest491.py::test_random_statetest491[fork_Amsterdam] -stRandom2/test_random_statetest497.py::test_random_statetest497[fork_Amsterdam] -stRandom2/test_random_statetest500.py::test_random_statetest500[fork_Amsterdam] -stRandom2/test_random_statetest502.py::test_random_statetest502[fork_Amsterdam] -stRandom2/test_random_statetest503.py::test_random_statetest503[fork_Amsterdam] -stRandom2/test_random_statetest505.py::test_random_statetest505[fork_Amsterdam] -stRandom2/test_random_statetest506.py::test_random_statetest506[fork_Amsterdam] -stRandom2/test_random_statetest511.py::test_random_statetest511[fork_Amsterdam] -stRandom2/test_random_statetest512.py::test_random_statetest512[fork_Amsterdam] -stRandom2/test_random_statetest514.py::test_random_statetest514[fork_Amsterdam] -stRandom2/test_random_statetest516.py::test_random_statetest516[fork_Amsterdam] -stRandom2/test_random_statetest518.py::test_random_statetest518[fork_Amsterdam] -stRandom2/test_random_statetest519.py::test_random_statetest519[fork_Amsterdam] -stRandom2/test_random_statetest520.py::test_random_statetest520[fork_Amsterdam] -stRandom2/test_random_statetest526.py::test_random_statetest526[fork_Amsterdam] -stRandom2/test_random_statetest532.py::test_random_statetest532[fork_Amsterdam] -stRandom2/test_random_statetest533.py::test_random_statetest533[fork_Amsterdam] -stRandom2/test_random_statetest534.py::test_random_statetest534[fork_Amsterdam] -stRandom2/test_random_statetest535.py::test_random_statetest535[fork_Amsterdam] -stRandom2/test_random_statetest537.py::test_random_statetest537[fork_Amsterdam] -stRandom2/test_random_statetest539.py::test_random_statetest539[fork_Amsterdam] -stRandom2/test_random_statetest541.py::test_random_statetest541[fork_Amsterdam] -stRandom2/test_random_statetest544.py::test_random_statetest544[fork_Amsterdam] -stRandom2/test_random_statetest545.py::test_random_statetest545[fork_Amsterdam] -stRandom2/test_random_statetest546.py::test_random_statetest546[fork_Amsterdam] -stRandom2/test_random_statetest548.py::test_random_statetest548[fork_Amsterdam] -stRandom2/test_random_statetest550.py::test_random_statetest550[fork_Amsterdam] -stRandom2/test_random_statetest552.py::test_random_statetest552[fork_Amsterdam] -stRandom2/test_random_statetest553.py::test_random_statetest553[fork_Amsterdam] -stRandom2/test_random_statetest555.py::test_random_statetest555[fork_Amsterdam] -stRandom2/test_random_statetest556.py::test_random_statetest556[fork_Amsterdam] -stRandom2/test_random_statetest564.py::test_random_statetest564[fork_Amsterdam] -stRandom2/test_random_statetest565.py::test_random_statetest565[fork_Amsterdam] -stRandom2/test_random_statetest571.py::test_random_statetest571[fork_Amsterdam] -stRandom2/test_random_statetest574.py::test_random_statetest574[fork_Amsterdam] -stRandom2/test_random_statetest578.py::test_random_statetest578[fork_Amsterdam] -stRandom2/test_random_statetest580.py::test_random_statetest580[fork_Amsterdam] -stRandom2/test_random_statetest585.py::test_random_statetest585[fork_Amsterdam] -stRandom2/test_random_statetest586.py::test_random_statetest586[fork_Amsterdam] -stRandom2/test_random_statetest587.py::test_random_statetest587[fork_Amsterdam] -stRandom2/test_random_statetest588.py::test_random_statetest588[fork_Amsterdam] -stRandom2/test_random_statetest592.py::test_random_statetest592[fork_Amsterdam] -stRandom2/test_random_statetest596.py::test_random_statetest596[fork_Amsterdam] -stRandom2/test_random_statetest599.py::test_random_statetest599[fork_Amsterdam] -stRandom2/test_random_statetest600.py::test_random_statetest600[fork_Amsterdam] -stRandom2/test_random_statetest602.py::test_random_statetest602[fork_Amsterdam] -stRandom2/test_random_statetest603.py::test_random_statetest603[fork_Amsterdam] -stRandom2/test_random_statetest605.py::test_random_statetest605[fork_Amsterdam] -stRandom2/test_random_statetest607.py::test_random_statetest607[fork_Amsterdam] -stRandom2/test_random_statetest608.py::test_random_statetest608[fork_Amsterdam] -stRandom2/test_random_statetest610.py::test_random_statetest610[fork_Amsterdam] -stRandom2/test_random_statetest615.py::test_random_statetest615[fork_Amsterdam] -stRandom2/test_random_statetest616.py::test_random_statetest616[fork_Amsterdam] -stRandom2/test_random_statetest620.py::test_random_statetest620[fork_Amsterdam] -stRandom2/test_random_statetest621.py::test_random_statetest621[fork_Amsterdam] -stRandom2/test_random_statetest629.py::test_random_statetest629[fork_Amsterdam] -stRandom2/test_random_statetest630.py::test_random_statetest630[fork_Amsterdam] -stRandom2/test_random_statetest633.py::test_random_statetest633[fork_Amsterdam] -stRandom2/test_random_statetest637.py::test_random_statetest637[fork_Amsterdam] -stRandom2/test_random_statetest638.py::test_random_statetest638[fork_Amsterdam] -stRandom2/test_random_statetest641.py::test_random_statetest641[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 (27) -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] -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_opcode_calls.py::test_revert_opcode_calls[fork_Amsterdam-d3-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-d0-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-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] -stRevertTest/test_revert_opcode_return.py::test_revert_opcode_return[fork_Amsterdam-d0-g1] -stRevertTest/test_revert_sub_call_storage_oog.py::test_revert_sub_call_storage_oog[fork_Amsterdam--g1-v0] -stRevertTest/test_revert_sub_call_storage_oog2.py::test_revert_sub_call_storage_oog2[fork_Amsterdam--g1-v0] - # 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/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] -# stStaticCall (50) +# 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/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] @@ -881,6 +525,7 @@ stStaticCall/test_static_callcodecallcall_100_ooge.py::test_static_callcodecallc 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] @@ -889,6 +534,8 @@ stStaticCall/test_static_callcodecallcall_100_oogm_before2.py::test_static_callc 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] @@ -897,8 +544,12 @@ stStaticCall/test_static_callcodecallcodecall_110_ooge.py::test_static_callcodec 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] @@ -907,115 +558,6 @@ stStaticCall/test_static_calldelcode_01_ooge.py::test_static_calldelcode_01_ooge 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_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 (4) -stStaticFlagEnabled/test_callcode_to_precompile_from_contract_initialization.py::test_callcode_to_precompile_from_contract_initialization[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 (6) -stSystemOperationsTest/test_ab_acalls0.py::test_ab_acalls0[fork_Amsterdam] -stSystemOperationsTest/test_ab_acalls_suicide0.py::test_ab_acalls_suicide0[fork_Amsterdam] -stSystemOperationsTest/test_call10.py::test_call10[fork_Amsterdam] -stSystemOperationsTest/test_callcode_to_return1.py::test_callcode_to_return1[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 (1) -stTransactionTest/test_opcodes_transaction_init.py::test_opcodes_transaction_init[fork_Amsterdam-side_effects] - -# vmArithmeticTest (2) -vmArithmeticTest/test_exp_power256_of256.py::test_exp_power256_of256[fork_Amsterdam] - -# ----------------------------------------------------------------------------- -# Additional skips from EIP-8037 cpsb=1530 update (commit ea1f5a984d): -# legacy ported tests with hardcoded gas budgets calibrated for the prior -# pricing. These are pure gas-budget OOG / state-set divergences with no -# spec-level dependency; refactoring them per-test is out of scope for the -# CPSB recalibration work. -# ----------------------------------------------------------------------------- - -# stCallCodes (14) -stCallCodes/test_callcallcallcode_001_suicide_end.py::test_callcallcallcode_001_suicide_end[fork_Amsterdam] -stCallCodes/test_callcode_in_initcode_to_empty_contract.py::test_callcode_in_initcode_to_empty_contract[fork_Amsterdam-d0] -stCallCodes/test_callcode_in_initcode_to_empty_contract.py::test_callcode_in_initcode_to_empty_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_callcodecallcallcode_101_suicide_end.py::test_callcodecallcallcode_101_suicide_end[fork_Amsterdam] -stCallCodes/test_callcodecallcodecallcode_111_suicide_end.py::test_callcodecallcodecallcode_111_suicide_end[fork_Amsterdam] - -# stCreate2 (51) -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_DelegateCall_Refund_NoOoG] -stCreate2/test_create2_suicide.py::test_create2_suicide[fork_Amsterdam-d3] -stCreate2/test_create2collision_balance.py::test_create2collision_balance[fork_Amsterdam-d0] -stCreate2/test_create2collision_balance.py::test_create2collision_balance[fork_Amsterdam-d2] -stCreate2/test_create2collision_balance.py::test_create2collision_balance[fork_Amsterdam-d3] -stCreate2/test_create2collision_code.py::test_create2collision_code[fork_Amsterdam-d0] -stCreate2/test_create2collision_code.py::test_create2collision_code[fork_Amsterdam-d1] -stCreate2/test_create2collision_code.py::test_create2collision_code[fork_Amsterdam-d2] -stCreate2/test_create2collision_code2.py::test_create2collision_code2[fork_Amsterdam-d0] -stCreate2/test_create2collision_code2.py::test_create2collision_code2[fork_Amsterdam-d1] -stCreate2/test_create2collision_nonce.py::test_create2collision_nonce[fork_Amsterdam-d0] -stCreate2/test_create2collision_nonce.py::test_create2collision_nonce[fork_Amsterdam-d1] -stCreate2/test_create2collision_nonce.py::test_create2collision_nonce[fork_Amsterdam-d2] -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] -stCreate2/test_create2no_cash.py::test_create2no_cash[fork_Amsterdam-d1] - -# stCreateTest (57) -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_oog_from_call_refunds.py::test_create_oog_from_call_refunds[fork_Amsterdam-SStore_Refund_NoOoG2] -stCreateTest/test_create_oog_from_call_refunds.py::test_create_oog_from_call_refunds[fork_Amsterdam-SStore_Refund_NoOoG3] - -# stDelegatecallTestHomestead (7) -stDelegatecallTestHomestead/test_delegatecall_emptycontract.py::test_delegatecall_emptycontract[fork_Amsterdam] - -# stEIP2930 (0) - -# stEIP3855_push0 (7) -stEIP3855_push0/test_push0.py::test_push0[fork_Amsterdam-1024_push0] -stEIP3855_push0/test_push0.py::test_push0[fork_Amsterdam-jumpdest] -stEIP3855_push0/test_push0.py::test_push0[fork_Amsterdam-single_push0] -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] - -# stPreCompiledContracts2 (13) -stPreCompiledContracts2/test_call_sha256_1_nonzero_value.py::test_call_sha256_1_nonzero_value[fork_Amsterdam] -stPreCompiledContracts2/test_modexp_0_0_0_20500.py::test_modexp_0_0_0_20500[fork_Amsterdam--g2] -stPreCompiledContracts2/test_modexp_0_0_0_22000.py::test_modexp_0_0_0_22000[fork_Amsterdam--g2] -stPreCompiledContracts2/test_modexp_0_0_0_25000.py::test_modexp_0_0_0_25000[fork_Amsterdam--g2] -stPreCompiledContracts2/test_modexp_0_0_0_35000.py::test_modexp_0_0_0_35000[fork_Amsterdam--g2] - -# stRevertTest (33) -stRevertTest/test_revert_in_create_in_init_paris.py::test_revert_in_create_in_init_paris[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_sha256_1_nonzero_value.py::test_static_call_sha256_1_nonzero_value[fork_Amsterdam] -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_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_callcodecallcall_100_oogm_after_3.py::test_static_callcodecallcall_100_oogm_after_3[fork_Amsterdam--v0] -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_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_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_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] @@ -1027,18 +569,27 @@ stStaticCall/test_static_check_opcodes5.py::test_static_check_opcodes5[fork_Amst 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] +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 (14) -stSystemOperationsTest/test_call_to_name_registrator0.py::test_call_to_name_registrator0[fork_Amsterdam] +# stSystemOperationsTest (8) +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_create_name_registrator.py::test_create_name_registrator[fork_Amsterdam] -stSystemOperationsTest/test_create_name_registrator_zero_mem.py::test_create_name_registrator_zero_mem[fork_Amsterdam] -stSystemOperationsTest/test_create_name_registrator_zero_mem2.py::test_create_name_registrator_zero_mem2[fork_Amsterdam] -stSystemOperationsTest/test_create_name_registrator_zero_mem_expansion.py::test_create_name_registrator_zero_mem_expansion[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/test_no_src_account_create.py::test_no_src_account_create[fork_Amsterdam-d0-g1-v0] @@ -1058,3 +609,35 @@ stTransactionTest/test_no_src_account_create1559.py::test_no_src_account_create1 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/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] +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 (4) +stWalletTest/test_day_limit_construction_partial.py::test_day_limit_construction_partial[fork_Amsterdam] +stWalletTest/test_multi_owned_construction_not_enough_gas_partial.py::test_multi_owned_construction_not_enough_gas_partial[fork_Amsterdam--g1] +stWalletTest/test_wallet_construction_oog.py::test_wallet_construction_oog[fork_Amsterdam--g1] +stWalletTest/test_wallet_construction_partial.py::test_wallet_construction_partial[fork_Amsterdam] + +# stZeroKnowledge (20) +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] +vmArithmeticTest/test_two_ops.py::test_two_ops[fork_Amsterdam] diff --git a/tests/ported_static/stCallCodes/test_callcall_00_suicide_end.py b/tests/ported_static/stCallCodes/test_callcall_00_suicide_end.py index 86d19960801..ba8ab1441e5 100644 --- a/tests/ported_static/stCallCodes/test_callcall_00_suicide_end.py +++ b/tests/ported_static/stCallCodes/test_callcall_00_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallCodes/callcall_00_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +34,18 @@ def test_callcall_00_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Call -> (call -> code) suicide .""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -57,7 +72,7 @@ def test_callcall_00_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALL( - gas=0x249F0, + gas=outer_call_gas, address=0xF741CFEE7B7FB1025DCCEF3DB5A3CBC8FFB776F8, value=0x0, args_offset=0x0, @@ -77,7 +92,7 @@ def test_callcall_00_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALL( - gas=0xC350, + gas=inner_call_gas, address=0x703B936FD4D674F0FF5D6957F61097152F8781B8, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallCodes/test_callcallcall_000_suicide_end.py b/tests/ported_static/stCallCodes/test_callcallcall_000_suicide_end.py index 1ddf3839b34..d33e9e42b6a 100644 --- a/tests/ported_static/stCallCodes/test_callcallcall_000_suicide_end.py +++ b/tests/ported_static/stCallCodes/test_callcallcall_000_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallCodes/callcallcall_000_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +34,20 @@ def test_callcallcall_000_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Call -> call -> (call -> code) suicide.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -57,7 +74,7 @@ def test_callcallcall_000_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALL( - gas=0x249F0, + gas=outer_call_gas, address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879, value=0x0, args_offset=0x0, @@ -77,7 +94,7 @@ def test_callcallcall_000_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALL( - gas=0x186A0, + gas=middle_call_gas, address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680, value=0x0, args_offset=0x0, @@ -97,7 +114,7 @@ def test_callcallcall_000_suicide_end( code=Op.SSTORE( key=0x2, value=Op.CALL( - gas=0xC350, + gas=inner_call_gas, address=0xCB6497F0337B6CD0F7239A8819295EC7D1DAFD34, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallCodes/test_callcallcallcode_001_suicide_end.py b/tests/ported_static/stCallCodes/test_callcallcallcode_001_suicide_end.py index 10bf588c464..1bc24e83ea6 100644 --- a/tests/ported_static/stCallCodes/test_callcallcallcode_001_suicide_end.py +++ b/tests/ported_static/stCallCodes/test_callcallcallcode_001_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallCodes/callcallcallcode_001_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +34,20 @@ def test_callcallcallcode_001_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Call -> call -> ( callcode - > code ) suicide.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -57,7 +74,7 @@ def test_callcallcallcode_001_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALL( - gas=0x249F0, + gas=outer_call_gas, address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879, value=0x0, args_offset=0x0, @@ -77,7 +94,7 @@ def test_callcallcallcode_001_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALL( - gas=0x186A0, + gas=middle_call_gas, address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21, value=0x0, args_offset=0x0, @@ -97,7 +114,7 @@ def test_callcallcallcode_001_suicide_end( code=Op.SSTORE( key=0x2, value=Op.CALLCODE( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallCodes/test_callcallcodecall_010_suicide_end.py b/tests/ported_static/stCallCodes/test_callcallcodecall_010_suicide_end.py index f58f5b44ccc..f23b0ff9251 100644 --- a/tests/ported_static/stCallCodes/test_callcallcodecall_010_suicide_end.py +++ b/tests/ported_static/stCallCodes/test_callcallcodecall_010_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallCodes/callcallcodecall_010_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +34,20 @@ def test_callcallcodecall_010_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Call -> callcode -> (call -> code) (suicide).""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -57,7 +74,7 @@ def test_callcallcodecall_010_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALL( - gas=0x249F0, + gas=outer_call_gas, address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B, value=0x0, args_offset=0x0, @@ -77,7 +94,7 @@ def test_callcallcodecall_010_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALLCODE( - gas=0x186A0, + gas=middle_call_gas, address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680, value=0x0, args_offset=0x0, @@ -97,7 +114,7 @@ def test_callcallcodecall_010_suicide_end( code=Op.SSTORE( key=0x2, value=Op.CALL( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_empty_contract.py b/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_empty_contract.py index edd2ad15114..045972d37f5 100644 --- a/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_empty_contract.py +++ b/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_empty_contract.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallCodes/callcodeInInitcodeToEmptyContractFiller.json +@manually-enhanced: Do not overwrite. Gas bumped fork-conditionally +to cover EIP-8037 state-gas spill into regular gas; pre-EIP-8037 +behavior unchanged. + """ import pytest @@ -58,6 +62,13 @@ def test_callcode_in_initcode_to_empty_contract( v: int, ) -> None: """Callcode inside create contract init to non-existent contract.""" + # EIP-8037 gas bumps: original values for pre-EIP-8037 forks. + outer_tx_gas = 1453081 + inner_call_gas = 300000 + if fork.is_eip_enabled(8037): + outer_tx_gas = 7265405 + inner_call_gas = 1500000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) contract_0 = Address(0x1100000000000000000000000000000000000000) contract_1 = Address(0x1000000000000000000000000000000000000000) @@ -80,7 +91,7 @@ def test_callcode_in_initcode_to_empty_contract( # { (CALL 300000 (CALLDATALOAD 0) 0 0 0 0 0) } contract_0 = pre.deploy_contract( # noqa: F841 code=Op.CALL( - gas=0x493E0, + gas=inner_call_gas, address=Op.CALLDATALOAD(offset=0x0), value=0x0, args_offset=0x0, @@ -175,7 +186,7 @@ def test_callcode_in_initcode_to_empty_contract( Hash(contract_1, left_padding=True), Hash(contract_2, left_padding=True), ] - tx_gas = [1453081] + tx_gas = [outer_tx_gas] tx = Transaction( sender=sender, diff --git a/tests/ported_static/stCallCodes/test_callcodecall_10_suicide_end.py b/tests/ported_static/stCallCodes/test_callcodecall_10_suicide_end.py index 9c9e867ae0b..d62da3d1016 100644 --- a/tests/ported_static/stCallCodes/test_callcodecall_10_suicide_end.py +++ b/tests/ported_static/stCallCodes/test_callcodecall_10_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallCodes/callcodecall_10_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +34,18 @@ def test_callcodecall_10_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """CALLCODE -> (CALL -> code) (suicide).""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -57,7 +72,7 @@ def test_callcodecall_10_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALLCODE( - gas=0x249F0, + gas=outer_call_gas, address=0xF741CFEE7B7FB1025DCCEF3DB5A3CBC8FFB776F8, value=0x0, args_offset=0x0, @@ -77,7 +92,7 @@ def test_callcodecall_10_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALL( - gas=0xC350, + gas=inner_call_gas, address=0x703B936FD4D674F0FF5D6957F61097152F8781B8, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallCodes/test_callcodecallcall_100_suicide_end.py b/tests/ported_static/stCallCodes/test_callcodecallcall_100_suicide_end.py index a3d8aa6d8fc..4a8b875f9c0 100644 --- a/tests/ported_static/stCallCodes/test_callcodecallcall_100_suicide_end.py +++ b/tests/ported_static/stCallCodes/test_callcodecallcall_100_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallCodes/callcodecallcall_100_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +34,20 @@ def test_callcodecallcall_100_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """CALLCODE -> CALL -> (CALL-> code) (suicide).""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -57,7 +74,7 @@ def test_callcodecallcall_100_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALLCODE( - gas=0x249F0, + gas=outer_call_gas, address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879, value=0x0, args_offset=0x0, @@ -77,7 +94,7 @@ def test_callcodecallcall_100_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALL( - gas=0x186A0, + gas=middle_call_gas, address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680, value=0x0, args_offset=0x0, @@ -97,7 +114,7 @@ def test_callcodecallcall_100_suicide_end( code=Op.SSTORE( key=0x2, value=Op.CALL( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_suicide_end.py b/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_suicide_end.py index 7c20c53bf1a..3de342c0923 100644 --- a/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_suicide_end.py +++ b/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +34,20 @@ def test_callcodecallcallcode_101_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """CALLCODE -> CALL -> (CALLCODE -> code) (suicide).""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -57,7 +74,7 @@ def test_callcodecallcallcode_101_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALLCODE( - gas=0x249F0, + gas=outer_call_gas, address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879, value=0x0, args_offset=0x0, @@ -77,7 +94,7 @@ def test_callcodecallcallcode_101_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALL( - gas=0x186A0, + gas=middle_call_gas, address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21, value=0x0, args_offset=0x0, @@ -97,7 +114,7 @@ def test_callcodecallcallcode_101_suicide_end( code=Op.SSTORE( key=0x2, value=Op.CALLCODE( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_suicide_end.py b/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_suicide_end.py index b988b59cc26..fdeaf653e4d 100644 --- a/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_suicide_end.py +++ b/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +34,20 @@ def test_callcodecallcodecall_110_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """CALLCODE -> CALLCODE -> (CALL -> code) (suicide) .""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -57,7 +74,7 @@ def test_callcodecallcodecall_110_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALLCODE( - gas=0x249F0, + gas=outer_call_gas, address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B, value=0x0, args_offset=0x0, @@ -77,7 +94,7 @@ def test_callcodecallcodecall_110_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALLCODE( - gas=0x186A0, + gas=middle_call_gas, address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680, value=0x0, args_offset=0x0, @@ -97,7 +114,7 @@ def test_callcodecallcodecall_110_suicide_end( code=Op.SSTORE( key=0x2, value=Op.CALL( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_suicide_end.py b/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_suicide_end.py index d3b29c3988d..b07feeb4693 100644 --- a/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_suicide_end.py +++ b/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,20 @@ def test_callcodecallcodecallcode_111_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """CALLCODE -> CALLCODE -> (CALLCODE -> code) suicide.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +76,7 @@ def test_callcodecallcodecallcode_111_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALLCODE( - gas=0x249F0, + gas=outer_call_gas, address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B, value=0x0, args_offset=0x0, @@ -79,7 +96,7 @@ def test_callcodecallcodecallcode_111_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALLCODE( - gas=0x186A0, + gas=middle_call_gas, address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21, value=0x0, args_offset=0x0, @@ -99,7 +116,7 @@ def test_callcodecallcodecallcode_111_suicide_end( code=Op.SSTORE( key=0x2, value=Op.CALLCODE( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_fail_balance_too_low.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_fail_balance_too_low.py index a9036d4c58c..89438cb2af2 100644 --- a/tests/ported_static/stCallCreateCallCodeTest/test_create_fail_balance_too_low.py +++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_fail_balance_too_low.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json +@manually-enhanced: Do not overwrite. Gas bumped fork-conditionally +to cover EIP-8037 state-gas spill into regular gas; pre-EIP-8037 +behavior unchanged. + """ import pytest @@ -60,6 +64,11 @@ def test_create_fail_balance_too_low( v: int, ) -> None: """Create fails because we try to send more wei to it that we have.""" + # EIP-8037 gas bumps: original values for pre-EIP-8037 forks. + outer_tx_gas = 253021 + if fork.is_eip_enabled(8037): + outer_tx_gas = 1265105 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -121,7 +130,7 @@ def test_create_fail_balance_too_low( tx_data = [ Bytes(""), ] - tx_gas = [253021] + tx_gas = [outer_tx_gas] tx_value = [23, 24] tx = Transaction( diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_undefined_instruction.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_undefined_instruction.py index 5cbfeab42d7..b3d1812c13a 100644 --- a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_undefined_instruction.py +++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_undefined_instruction.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 SSTORE-set state-gas spill (target performs 3 fresh +SSTOREs); pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,14 @@ def test_create_init_fail_undefined_instruction( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Create fails because init code has undefined opcode, trying to...""" + # EIP-8037 state-gas spill (3x fresh SSTORE-set) exceeds 900k tx_gas. + tx_gas_limit = 900000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 1_500_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -101,7 +112,7 @@ def test_create_init_fail_undefined_instruction( sender=sender, to=target, data=Bytes(""), - gas_limit=900000, + gas_limit=tx_gas_limit, value=0x186A0, ) diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_end.py index 98081b8eff6..9d540998144 100644 --- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,20 @@ def test_callcallcallcode_001_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcallcallcode_001_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +76,7 @@ def test_callcallcallcode_001_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALLCODE( - gas=0x249F0, + gas=outer_call_gas, address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B, value=0x0, args_offset=0x0, @@ -79,7 +96,7 @@ def test_callcallcallcode_001_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALLCODE( - gas=0x186A0, + gas=middle_call_gas, address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE, value=0x0, args_offset=0x0, @@ -99,7 +116,7 @@ def test_callcallcallcode_001_suicide_end( code=Op.SSTORE( key=0x2, value=Op.DELEGATECALL( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, args_offset=0x0, args_size=0x40, diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_suicide_end.py index 8e30857302f..fd2c72ca7c1 100644 --- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,18 @@ def test_callcallcode_01_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcallcode_01_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +74,7 @@ def test_callcallcode_01_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALLCODE( - gas=0x249F0, + gas=outer_call_gas, address=0x1CCA6E93108EC94304AE5EB121D323E6C317FE7A, value=0x0, args_offset=0x0, @@ -79,7 +94,7 @@ def test_callcallcode_01_suicide_end( code=Op.SSTORE( key=0x1, value=Op.DELEGATECALL( - gas=0xC350, + gas=inner_call_gas, address=0x703B936FD4D674F0FF5D6957F61097152F8781B8, args_offset=0x0, args_size=0x40, diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_end.py index 02e73911b14..5ba88271301 100644 --- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,20 @@ def test_callcallcodecall_010_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcallcodecall_010_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +76,7 @@ def test_callcallcodecall_010_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALLCODE( - gas=0x249F0, + gas=outer_call_gas, address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455, value=0x0, args_offset=0x0, @@ -79,7 +96,7 @@ def test_callcallcodecall_010_suicide_end( code=Op.SSTORE( key=0x1, value=Op.DELEGATECALL( - gas=0x186A0, + gas=middle_call_gas, address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21, args_offset=0x0, args_size=0x40, @@ -98,7 +115,7 @@ def test_callcallcodecall_010_suicide_end( code=Op.SSTORE( key=0x2, value=Op.CALLCODE( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_end.py index 8ff0ce634da..842885bcc2a 100644 --- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,20 @@ def test_callcallcodecallcode_011_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcallcodecallcode_011_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +76,7 @@ def test_callcallcodecallcode_011_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALLCODE( - gas=0x249F0, + gas=outer_call_gas, address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455, value=0x0, args_offset=0x0, @@ -79,7 +96,7 @@ def test_callcallcodecallcode_011_suicide_end( code=Op.SSTORE( key=0x1, value=Op.DELEGATECALL( - gas=0x186A0, + gas=middle_call_gas, address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE, args_offset=0x0, args_size=0x40, @@ -98,7 +115,7 @@ def test_callcallcodecallcode_011_suicide_end( code=Op.SSTORE( key=0x2, value=Op.DELEGATECALL( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, args_offset=0x0, args_size=0x40, diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_suicide_end.py index ed560a050f0..66565fc3929 100644 --- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,18 @@ def test_callcodecall_10_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcodecall_10_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +74,7 @@ def test_callcodecall_10_suicide_end( code=Op.SSTORE( key=0x0, value=Op.DELEGATECALL( - gas=0x249F0, + gas=outer_call_gas, address=0x799DA5A3C983A22F9C430DE1BF99134EE561E856, args_offset=0x0, args_size=0x40, @@ -78,7 +93,7 @@ def test_callcodecall_10_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALLCODE( - gas=0xC350, + gas=inner_call_gas, address=0x703B936FD4D674F0FF5D6957F61097152F8781B8, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_end.py index 51991cb8e36..84802cd5c8c 100644 --- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,20 @@ def test_callcodecallcall_100_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcodecallcall_100_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +76,7 @@ def test_callcodecallcall_100_suicide_end( code=Op.SSTORE( key=0x0, value=Op.DELEGATECALL( - gas=0x249F0, + gas=outer_call_gas, address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B, args_offset=0x0, args_size=0x40, @@ -78,7 +95,7 @@ def test_callcodecallcall_100_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALLCODE( - gas=0x186A0, + gas=middle_call_gas, address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21, value=0x0, args_offset=0x0, @@ -98,7 +115,7 @@ def test_callcodecallcall_100_suicide_end( code=Op.SSTORE( key=0x2, value=Op.CALLCODE( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_end.py index c83fec414f8..4a20cbfa33f 100644 --- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,20 @@ def test_callcodecallcallcode_101_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcodecallcallcode_101_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +76,7 @@ def test_callcodecallcallcode_101_suicide_end( code=Op.SSTORE( key=0x0, value=Op.DELEGATECALL( - gas=0x249F0, + gas=outer_call_gas, address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B, args_offset=0x0, args_size=0x40, @@ -78,7 +95,7 @@ def test_callcodecallcallcode_101_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALLCODE( - gas=0x186A0, + gas=middle_call_gas, address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE, value=0x0, args_offset=0x0, @@ -98,7 +115,7 @@ def test_callcodecallcallcode_101_suicide_end( code=Op.SSTORE( key=0x2, value=Op.DELEGATECALL( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, args_offset=0x0, args_size=0x40, diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_suicide_end.py index 98290b68642..b1adb4e9e21 100644 --- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,18 @@ def test_callcodecallcode_11_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcodecallcode_11_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +74,7 @@ def test_callcodecallcode_11_suicide_end( code=Op.SSTORE( key=0x0, value=Op.DELEGATECALL( - gas=0x249F0, + gas=outer_call_gas, address=0x1CCA6E93108EC94304AE5EB121D323E6C317FE7A, args_offset=0x0, args_size=0x40, @@ -78,7 +93,7 @@ def test_callcodecallcode_11_suicide_end( code=Op.SSTORE( key=0x1, value=Op.DELEGATECALL( - gas=0xC350, + gas=inner_call_gas, address=0x703B936FD4D674F0FF5D6957F61097152F8781B8, args_offset=0x0, args_size=0x40, diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_end.py index 39e4bd7fee8..2323c57ec3a 100644 --- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,20 @@ def test_callcodecallcodecall_110_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcodecallcodecall_110_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +76,7 @@ def test_callcodecallcodecall_110_suicide_end( code=Op.SSTORE( key=0x0, value=Op.DELEGATECALL( - gas=0x249F0, + gas=outer_call_gas, address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455, args_offset=0x0, args_size=0x40, @@ -78,7 +95,7 @@ def test_callcodecallcodecall_110_suicide_end( code=Op.SSTORE( key=0x1, value=Op.DELEGATECALL( - gas=0x186A0, + gas=middle_call_gas, address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21, args_offset=0x0, args_size=0x40, @@ -97,7 +114,7 @@ def test_callcodecallcodecall_110_suicide_end( code=Op.SSTORE( key=0x2, value=Op.CALLCODE( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_end.py index 9d145663f00..bf50302cc14 100644 --- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,20 @@ def test_callcallcallcode_001_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcallcallcode_001_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +76,7 @@ def test_callcallcallcode_001_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALL( - gas=0x249F0, + gas=outer_call_gas, address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879, value=0x0, args_offset=0x0, @@ -79,7 +96,7 @@ def test_callcallcallcode_001_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALL( - gas=0x186A0, + gas=middle_call_gas, address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE, value=0x0, args_offset=0x0, @@ -99,7 +116,7 @@ def test_callcallcallcode_001_suicide_end( code=Op.SSTORE( key=0x2, value=Op.DELEGATECALL( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, args_offset=0x0, args_size=0x40, diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcode_01_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcode_01_suicide_end.py index 9ce57b4ea26..4afdbbe5775 100644 --- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcode_01_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcode_01_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,18 @@ def test_callcallcode_01_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcallcode_01_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +74,7 @@ def test_callcallcode_01_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALL( - gas=0x249F0, + gas=outer_call_gas, address=0x1CCA6E93108EC94304AE5EB121D323E6C317FE7A, value=0x0, args_offset=0x0, @@ -79,7 +94,7 @@ def test_callcallcode_01_suicide_end( code=Op.SSTORE( key=0x1, value=Op.DELEGATECALL( - gas=0xC350, + gas=inner_call_gas, address=0x703B936FD4D674F0FF5D6957F61097152F8781B8, args_offset=0x0, args_size=0x40, diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_end.py index 3e51d28ac20..32f1487a627 100644 --- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,20 @@ def test_callcallcodecall_010_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcallcodecall_010_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +76,7 @@ def test_callcallcodecall_010_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALL( - gas=0x249F0, + gas=outer_call_gas, address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455, value=0x0, args_offset=0x0, @@ -79,7 +96,7 @@ def test_callcallcodecall_010_suicide_end( code=Op.SSTORE( key=0x1, value=Op.DELEGATECALL( - gas=0x186A0, + gas=middle_call_gas, address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680, args_offset=0x0, args_size=0x40, @@ -98,7 +115,7 @@ def test_callcallcodecall_010_suicide_end( code=Op.SSTORE( key=0x2, value=Op.CALL( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_end.py index 2f8cd246a17..a0b5607e396 100644 --- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,20 @@ def test_callcallcodecallcode_011_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcallcodecallcode_011_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +76,7 @@ def test_callcallcodecallcode_011_suicide_end( code=Op.SSTORE( key=0x0, value=Op.CALL( - gas=0x249F0, + gas=outer_call_gas, address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455, value=0x0, args_offset=0x0, @@ -79,7 +96,7 @@ def test_callcallcodecallcode_011_suicide_end( code=Op.SSTORE( key=0x1, value=Op.DELEGATECALL( - gas=0x186A0, + gas=middle_call_gas, address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE, args_offset=0x0, args_size=0x40, @@ -98,7 +115,7 @@ def test_callcallcodecallcode_011_suicide_end( code=Op.SSTORE( key=0x2, value=Op.DELEGATECALL( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, args_offset=0x0, args_size=0x40, diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecall_10_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecall_10_suicide_end.py index 10a12ffbe2a..d6f6e7d5a6f 100644 --- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecall_10_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecall_10_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,18 @@ def test_callcodecall_10_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcodecall_10_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +74,7 @@ def test_callcodecall_10_suicide_end( code=Op.SSTORE( key=0x0, value=Op.DELEGATECALL( - gas=0x249F0, + gas=outer_call_gas, address=0xF741CFEE7B7FB1025DCCEF3DB5A3CBC8FFB776F8, args_offset=0x0, args_size=0x40, @@ -78,7 +93,7 @@ def test_callcodecall_10_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALL( - gas=0xC350, + gas=inner_call_gas, address=0x703B936FD4D674F0FF5D6957F61097152F8781B8, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_end.py index 37c468d6f04..49da4be2412 100644 --- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,20 @@ def test_callcodecallcall_100_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcodecallcall_100_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +76,7 @@ def test_callcodecallcall_100_suicide_end( code=Op.SSTORE( key=0x0, value=Op.DELEGATECALL( - gas=0x249F0, + gas=outer_call_gas, address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879, args_offset=0x0, args_size=0x40, @@ -78,7 +95,7 @@ def test_callcodecallcall_100_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALL( - gas=0x186A0, + gas=middle_call_gas, address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680, value=0x0, args_offset=0x0, @@ -98,7 +115,7 @@ def test_callcodecallcall_100_suicide_end( code=Op.SSTORE( key=0x2, value=Op.CALL( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_end.py index af4852ff563..96f3337c150 100644 --- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,20 @@ def test_callcodecallcallcode_101_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcodecallcallcode_101_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +76,7 @@ def test_callcodecallcallcode_101_suicide_end( code=Op.SSTORE( key=0x0, value=Op.DELEGATECALL( - gas=0x249F0, + gas=outer_call_gas, address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879, args_offset=0x0, args_size=0x40, @@ -78,7 +95,7 @@ def test_callcodecallcallcode_101_suicide_end( code=Op.SSTORE( key=0x1, value=Op.CALL( - gas=0x186A0, + gas=middle_call_gas, address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE, value=0x0, args_offset=0x0, @@ -98,7 +115,7 @@ def test_callcodecallcallcode_101_suicide_end( code=Op.SSTORE( key=0x2, value=Op.DELEGATECALL( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, args_offset=0x0, args_size=0x40, diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcode_11_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcode_11_suicide_end.py index 4675d8f476b..5a96e25ac11 100644 --- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcode_11_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcode_11_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,18 @@ def test_callcodecallcode_11_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcodecallcode_11_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +74,7 @@ def test_callcodecallcode_11_suicide_end( code=Op.SSTORE( key=0x0, value=Op.DELEGATECALL( - gas=0x249F0, + gas=outer_call_gas, address=0x1CCA6E93108EC94304AE5EB121D323E6C317FE7A, args_offset=0x0, args_size=0x40, @@ -78,7 +93,7 @@ def test_callcodecallcode_11_suicide_end( code=Op.SSTORE( key=0x1, value=Op.DELEGATECALL( - gas=0xC350, + gas=inner_call_gas, address=0x703B936FD4D674F0FF5D6957F61097152F8781B8, args_offset=0x0, args_size=0x40, diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_end.py index 1c41be7b462..c3fb455b3ef 100644 --- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,20 @@ def test_callcodecallcodecall_110_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcodecallcodecall_110_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +76,7 @@ def test_callcodecallcodecall_110_suicide_end( code=Op.SSTORE( key=0x0, value=Op.DELEGATECALL( - gas=0x249F0, + gas=outer_call_gas, address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455, args_offset=0x0, args_size=0x40, @@ -78,7 +95,7 @@ def test_callcodecallcodecall_110_suicide_end( code=Op.SSTORE( key=0x1, value=Op.DELEGATECALL( - gas=0x186A0, + gas=middle_call_gas, address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680, args_offset=0x0, args_size=0x40, @@ -97,7 +114,7 @@ def test_callcodecallcodecall_110_suicide_end( code=Op.SSTORE( key=0x2, value=Op.CALL( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_end.py index 881e54676f3..56fde94b9ab 100644 --- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_end.py +++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_end.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json + +@manually-enhanced: Do not overwrite. The hardcoded inner-CALL gas +values (50k / 100k / 150k) were tuned to the pre-EIP-8037 gas budget. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,20 @@ def test_callcodecallcodecallcode_111_suicide_end( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcodecallcodecallcode_111_suicide_end.""" + # EIP-8037 inner-CALL gas bumps: original values restored for + # pre-EIP-8037 forks; bumped values cover the per-storage state- + # gas spill into regular gas on Amsterdam. + outer_call_gas = 150000 + middle_call_gas = 100000 + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + outer_call_gas = 1000000 + middle_call_gas = 800000 + inner_call_gas = 100000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -59,7 +76,7 @@ def test_callcodecallcodecallcode_111_suicide_end( code=Op.SSTORE( key=0x0, value=Op.DELEGATECALL( - gas=0x249F0, + gas=outer_call_gas, address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455, args_offset=0x0, args_size=0x40, @@ -78,7 +95,7 @@ def test_callcodecallcodecallcode_111_suicide_end( code=Op.SSTORE( key=0x1, value=Op.DELEGATECALL( - gas=0x186A0, + gas=middle_call_gas, address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE, args_offset=0x0, args_size=0x40, @@ -97,7 +114,7 @@ def test_callcodecallcodecallcode_111_suicide_end( code=Op.SSTORE( key=0x2, value=Op.DELEGATECALL( - gas=0xC350, + gas=inner_call_gas, address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099, args_offset=0x0, args_size=0x40, diff --git a/tests/ported_static/stCreate2/test_create2_first_byte_loop.py b/tests/ported_static/stCreate2/test_create2_first_byte_loop.py index 65d516db2aa..cd9a424e273 100644 --- a/tests/ported_static/stCreate2/test_create2_first_byte_loop.py +++ b/tests/ported_static/stCreate2/test_create2_first_byte_loop.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCreate2/CREATE2_FirstByte_loopFiller.yml +@manually-enhanced: Do not overwrite. Gas bumped fork-conditionally +to cover EIP-8037 state-gas spill into regular gas; pre-EIP-8037 +behavior unchanged. + """ import pytest @@ -64,6 +68,11 @@ def test_create2_first_byte_loop( v: int, ) -> None: """Test_create2_first_byte_loop.""" + # EIP-8037 gas bumps: original values for pre-EIP-8037 forks. + outer_tx_gas = 16777216 + if fork.is_eip_enabled(8037): + outer_tx_gas = 83886080 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = EOA( key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF @@ -175,7 +184,7 @@ def test_create2_first_byte_loop( Bytes("1a8451e6") + Hash(0xEF) + Hash(0xF0), Bytes("1a8451e6") + Hash(0xF0) + Hash(0x100), ] - tx_gas = [16777216] + tx_gas = [outer_tx_gas] tx = Transaction( sender=sender, diff --git a/tests/ported_static/stCreate2/test_create2_suicide.py b/tests/ported_static/stCreate2/test_create2_suicide.py index 0fa854ae984..41d417f8456 100644 --- a/tests/ported_static/stCreate2/test_create2_suicide.py +++ b/tests/ported_static/stCreate2/test_create2_suicide.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCreate2/CREATE2_SuicideFiller.json +@manually-enhanced: Do not overwrite. Gas bumped fork-conditionally +to cover EIP-8037 state-gas spill into regular gas; pre-EIP-8037 +behavior unchanged. + """ import pytest @@ -117,6 +121,13 @@ def test_create2_suicide( v: int, ) -> None: """CREATE2 suicide with/without value, CREATE2 suicide to itself + ...""" + # EIP-8037 gas bumps: original values for pre-EIP-8037 forks. + outer_tx_gas = 600000 + inner_call_gas = 150000 + if fork.is_eip_enabled(8037): + outer_tx_gas = 3000000 + inner_call_gas = 1000000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = EOA( key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8 @@ -223,7 +234,7 @@ def test_create2_suicide( Op.MSTORE(offset=0x0, value=0x626001FF6000526003601DF3) + Op.POP(Op.CREATE2(value=0x0, offset=0x14, size=0xC, salt=0x0)) + Op.CALL( - gas=0x249F0, + gas=inner_call_gas, address=0x5649527A8464A86CAE579719D347065F6EB27279, value=0x0, args_offset=0x0, @@ -238,7 +249,7 @@ def test_create2_suicide( Op.MSTORE(offset=0x0, value=0x626001FF6000526003601DF3) + Op.POP(Op.CREATE2(value=0x1, offset=0x14, size=0xC, salt=0x0)) + Op.CALL( - gas=0x249F0, + gas=inner_call_gas, address=0x5649527A8464A86CAE579719D347065F6EB27279, value=0x0, args_offset=0x0, @@ -253,7 +264,7 @@ def test_create2_suicide( Op.MSTORE(offset=0x0, value=0x6130FF6000526002601EF3) + Op.POP(Op.CREATE2(value=0x0, offset=0x15, size=0xB, salt=0x0)) + Op.CALL( - gas=0x249F0, + gas=inner_call_gas, address=0x6CD0E5133771823DA00D4CB545EC8CDAB0E38203, value=0x0, args_offset=0x0, @@ -268,7 +279,7 @@ def test_create2_suicide( Op.MSTORE(offset=0x0, value=0x6130FF6000526002601EF3) + Op.POP(Op.CREATE2(value=0x1, offset=0x15, size=0xB, salt=0x0)) + Op.CALL( - gas=0x249F0, + gas=inner_call_gas, address=0x6CD0E5133771823DA00D4CB545EC8CDAB0E38203, value=0x0, args_offset=0x0, @@ -280,7 +291,7 @@ def test_create2_suicide( Op.MSTORE(offset=0x0, value=0x626001FF6000526003601DF3) + Op.POP(Op.CREATE2(value=0x0, offset=0x14, size=0xC, salt=0x0)) + Op.STATICCALL( - gas=0x249F0, + gas=inner_call_gas, address=0x5649527A8464A86CAE579719D347065F6EB27279, args_offset=0x0, args_size=0x0, @@ -291,7 +302,7 @@ def test_create2_suicide( Op.MSTORE(offset=0x0, value=0x626001FF6000526003601DF3) + Op.POP(Op.CREATE2(value=0x1, offset=0x14, size=0xC, salt=0x0)) + Op.STATICCALL( - gas=0x249F0, + gas=inner_call_gas, address=0x5649527A8464A86CAE579719D347065F6EB27279, args_offset=0x0, args_size=0x0, @@ -302,7 +313,7 @@ def test_create2_suicide( Op.MSTORE(offset=0x0, value=0x6130FF6000526002601EF3) + Op.POP(Op.CREATE2(value=0x0, offset=0x15, size=0xB, salt=0x0)) + Op.STATICCALL( - gas=0x249F0, + gas=inner_call_gas, address=0x6CD0E5133771823DA00D4CB545EC8CDAB0E38203, args_offset=0x0, args_size=0x0, @@ -313,7 +324,7 @@ def test_create2_suicide( Op.MSTORE(offset=0x0, value=0x6130FF6000526002601EF3) + Op.POP(Op.CREATE2(value=0x1, offset=0x15, size=0xB, salt=0x0)) + Op.STATICCALL( - gas=0x249F0, + gas=inner_call_gas, address=0x6CD0E5133771823DA00D4CB545EC8CDAB0E38203, args_offset=0x0, args_size=0x0, @@ -322,7 +333,7 @@ def test_create2_suicide( ) + Op.STOP, ] - tx_gas = [600000] + tx_gas = [outer_tx_gas] tx_value = [10] tx = Transaction( diff --git a/tests/ported_static/stCreate2/test_create2collision_balance.py b/tests/ported_static/stCreate2/test_create2collision_balance.py index 463ebb5f599..b5b06b533e8 100644 --- a/tests/ported_static/stCreate2/test_create2collision_balance.py +++ b/tests/ported_static/stCreate2/test_create2collision_balance.py @@ -3,6 +3,12 @@ Ported from: state_tests/stCreate2/create2collisionBalanceFiller.json + +@manually-enhanced: Do not overwrite. `tx_gas` raised on Amsterdam to +cover EIP-8037 NEW_ACCOUNT state-gas spill into regular gas. Pre- +EIP-8037 keeps the original 400 000 budget; post-state expectations +unchanged on all forks. + """ import pytest @@ -178,7 +184,12 @@ def test_create2collision_balance( + Op.STOP, Op.CREATE2(value=0x1, offset=0x0, size=0x0, salt=0x0) + Op.STOP, ] - tx_gas = [400000] + # EIP-8037 NEW_ACCOUNT state-gas spill on Amsterdam exceeds + # the original 400 000 budget. Pre-EIP-8037 keeps the original. + outer_tx_gas = 400000 + if fork.is_eip_enabled(8037): + outer_tx_gas = 1_000_000 + tx_gas = [outer_tx_gas] tx_value = [1] tx = Transaction( diff --git a/tests/ported_static/stCreate2/test_create2collision_code.py b/tests/ported_static/stCreate2/test_create2collision_code.py index e234fd58d91..4c011c79963 100644 --- a/tests/ported_static/stCreate2/test_create2collision_code.py +++ b/tests/ported_static/stCreate2/test_create2collision_code.py @@ -3,6 +3,12 @@ Ported from: state_tests/stCreate2/create2collisionCodeFiller.json + +@manually-enhanced: Do not overwrite. `tx_gas` raised on Amsterdam to +cover EIP-8037 NEW_ACCOUNT state-gas spill into regular gas. Pre- +EIP-8037 keeps the original 400 000 budget; post-state expectations +unchanged on all forks. + """ import pytest @@ -109,7 +115,12 @@ def test_create2collision_code( + Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0) + Op.STOP, ] - tx_gas = [400000] + # EIP-8037 NEW_ACCOUNT state-gas spill on Amsterdam exceeds + # the original 400 000 budget. Pre-EIP-8037 keeps the original. + outer_tx_gas = 400000 + if fork.is_eip_enabled(8037): + outer_tx_gas = 1_000_000 + tx_gas = [outer_tx_gas] tx_value = [1] tx = Transaction( diff --git a/tests/ported_static/stCreate2/test_create2collision_code2.py b/tests/ported_static/stCreate2/test_create2collision_code2.py index fce405e07c9..6d1bb84bfa3 100644 --- a/tests/ported_static/stCreate2/test_create2collision_code2.py +++ b/tests/ported_static/stCreate2/test_create2collision_code2.py @@ -3,6 +3,12 @@ Ported from: state_tests/stCreate2/create2collisionCode2Filler.json + +@manually-enhanced: Do not overwrite. `tx_gas` raised on Amsterdam to +cover EIP-8037 NEW_ACCOUNT state-gas spill into regular gas. Pre- +EIP-8037 keeps the original 400 000 budget; post-state expectations +unchanged on all forks. + """ import pytest @@ -120,7 +126,12 @@ def test_create2collision_code2( + Op.CREATE2(value=0x1, offset=0x14, size=0xC, salt=0x0) + Op.STOP, ] - tx_gas = [400000] + # EIP-8037 NEW_ACCOUNT state-gas spill on Amsterdam exceeds + # the original 400 000 budget. Pre-EIP-8037 keeps the original. + outer_tx_gas = 400000 + if fork.is_eip_enabled(8037): + outer_tx_gas = 1_000_000 + tx_gas = [outer_tx_gas] tx_value = [1] tx = Transaction( diff --git a/tests/ported_static/stCreate2/test_create2collision_nonce.py b/tests/ported_static/stCreate2/test_create2collision_nonce.py index 58135a80dd0..7a2f90f7644 100644 --- a/tests/ported_static/stCreate2/test_create2collision_nonce.py +++ b/tests/ported_static/stCreate2/test_create2collision_nonce.py @@ -3,6 +3,12 @@ Ported from: state_tests/stCreate2/create2collisionNonceFiller.json + +@manually-enhanced: Do not overwrite. `tx_gas` raised on Amsterdam to +cover EIP-8037 NEW_ACCOUNT state-gas spill into regular gas. Pre- +EIP-8037 keeps the original 400 000 budget; post-state expectations +unchanged on all forks. + """ import pytest @@ -109,7 +115,12 @@ def test_create2collision_nonce( + Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0) + Op.STOP, ] - tx_gas = [400000] + # EIP-8037 NEW_ACCOUNT state-gas spill on Amsterdam exceeds + # the original 400 000 budget. Pre-EIP-8037 keeps the original. + outer_tx_gas = 400000 + if fork.is_eip_enabled(8037): + outer_tx_gas = 1_000_000 + tx_gas = [outer_tx_gas] tx_value = [1] tx = Transaction( diff --git a/tests/ported_static/stCreate2/test_create_message_reverted.py b/tests/ported_static/stCreate2/test_create_message_reverted.py index 0d0a5bff1f3..0927af9f824 100644 --- a/tests/ported_static/stCreate2/test_create_message_reverted.py +++ b/tests/ported_static/stCreate2/test_create_message_reverted.py @@ -3,6 +3,11 @@ Ported from: state_tests/stCreate2/CreateMessageRevertedFiller.json +@manually-enhanced: Do not overwrite. tx_gas[1] bumped on Amsterdam to +cover EIP-8037 state-gas spill (CREATE2 new account + 2 fresh +SSTOREs in init code); pre-EIP-8037 unchanged. g0 (OoG case) is +intentionally left alone. + """ import pytest @@ -72,7 +77,10 @@ def test_create_message_reverted( gas_limit=1000000000000, ) - pre[sender] = Account(balance=0x2DC6C0) + sender_balance = 3000000 + if fork.is_eip_enabled(8037): + sender_balance = 10000000 + pre[sender] = Account(balance=sender_balance) # Source: lll # {(MSTORE 0 0x600c600055600d600155) (CREATE2 0 22 10 0)} contract_0 = pre.deploy_contract( # noqa: F841 @@ -112,6 +120,8 @@ def test_create_message_reverted( Bytes(""), ] tx_gas = [80000, 150000] + if fork.is_eip_enabled(8037): + tx_gas = [80000, 500_000] tx_value = [100] tx = Transaction( diff --git a/tests/ported_static/stCreate2/test_revert_depth_create_address_collision.py b/tests/ported_static/stCreate2/test_revert_depth_create_address_collision.py index 8b665283cd6..9ecb01ac432 100644 --- a/tests/ported_static/stCreate2/test_revert_depth_create_address_collision.py +++ b/tests/ported_static/stCreate2/test_revert_depth_create_address_collision.py @@ -3,6 +3,12 @@ Ported from: state_tests/stCreate2/RevertDepthCreateAddressCollisionFiller.json + +@manually-enhanced: Do not overwrite. `tx_gas` raised on Amsterdam to +cover EIP-8037 NEW_ACCOUNT state-gas spill on the CREATE2-via-revert +path. Pre-EIP-8037 keeps the original [110_000, 170_000] tuned budgets; +post-state expectations unchanged on all forks. + """ import pytest @@ -196,7 +202,11 @@ def test_revert_depth_create_address_collision( Hash(0xEA60), Hash(0x1EA60), ] + # EIP-8037 NEW_ACCOUNT state-gas spill on Amsterdam exceeds the + # original tuned tx_gas budgets; pre-EIP-8037 keeps the originals. tx_gas = [110000, 170000] + if fork.is_eip_enabled(8037): + tx_gas = [500_000, 700_000] tx_value = [1, 0] tx = Transaction( diff --git a/tests/ported_static/stCreate2/test_revert_depth_create_address_collision_berlin.py b/tests/ported_static/stCreate2/test_revert_depth_create_address_collision_berlin.py index 6022ae15eae..7e8a5f6ff4b 100644 --- a/tests/ported_static/stCreate2/test_revert_depth_create_address_collision_berlin.py +++ b/tests/ported_static/stCreate2/test_revert_depth_create_address_collision_berlin.py @@ -3,6 +3,12 @@ Ported from: state_tests/stCreate2/RevertDepthCreateAddressCollisionBerlinFiller.json + +@manually-enhanced: Do not overwrite. `tx_gas` raised on Amsterdam to +cover EIP-8037 NEW_ACCOUNT state-gas spill on the CREATE2-via-revert +path. Pre-EIP-8037 keeps the original [110_000, 170_000] tuned budgets; +post-state expectations unchanged on all forks. + """ import pytest @@ -198,7 +204,11 @@ def test_revert_depth_create_address_collision_berlin( Hash(0xEA60), Hash(0x1EA60), ] + # EIP-8037 NEW_ACCOUNT state-gas spill on Amsterdam exceeds the + # original tuned tx_gas budgets; pre-EIP-8037 keeps the originals. tx_gas = [110000, 170000] + if fork.is_eip_enabled(8037): + tx_gas = [500_000, 700_000] tx_value = [1, 0] tx = Transaction( diff --git a/tests/ported_static/stCreateTest/test_create_e_contract_create_e_contract_in_init_tr.py b/tests/ported_static/stCreateTest/test_create_e_contract_create_e_contract_in_init_tr.py index d3288602010..1941710660c 100644 --- a/tests/ported_static/stCreateTest/test_create_e_contract_create_e_contract_in_init_tr.py +++ b/tests/ported_static/stCreateTest/test_create_e_contract_create_e_contract_in_init_tr.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json +@manually-enhanced: Do not overwrite. Inner-CALL gas and tx `gas_limit` +bumped on Amsterdam to cover EIP-8037 state-gas spill; pre-EIP-8037 +unchanged. + """ import pytest @@ -15,6 +19,7 @@ Transaction, compute_create_address, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,16 @@ def test_create_e_contract_create_e_contract_in_init_tr( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_create_e_contract_create_e_contract_in_init_tr.""" + # EIP-8037 state-gas spill OoGs the 60k inner CALL. + inner_call_gas = 60000 + tx_gas_limit = 600000 + if fork.is_eip_enabled(8037): + inner_call_gas = 200000 + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) contract_0 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B) sender = pre.fund_eoa(amount=0xE8D4A51000) @@ -59,7 +72,7 @@ def test_create_e_contract_create_e_contract_in_init_tr( to=None, data=Op.POP( Op.CALL( - gas=0xEA60, + gas=inner_call_gas, address=contract_0, value=0x0, args_offset=0x0, @@ -69,7 +82,7 @@ def test_create_e_contract_create_e_contract_in_init_tr( ) ) + Op.CREATE(value=0x0, offset=0x0, size=0x20), - gas_limit=600000, + gas_limit=tx_gas_limit, ) post = { diff --git a/tests/ported_static/stCreateTest/test_create_e_contract_create_ne_contract_in_init_tr.py b/tests/ported_static/stCreateTest/test_create_e_contract_create_ne_contract_in_init_tr.py index 67efdc53a18..7f0e1a3c9d8 100644 --- a/tests/ported_static/stCreateTest/test_create_e_contract_create_ne_contract_in_init_tr.py +++ b/tests/ported_static/stCreateTest/test_create_e_contract_create_ne_contract_in_init_tr.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json +@manually-enhanced: Do not overwrite. Inner-CALL gas and tx `gas_limit` +bumped on Amsterdam to cover EIP-8037 state-gas spill; pre-EIP-8037 +unchanged. + """ import pytest @@ -15,6 +19,7 @@ Transaction, compute_create_address, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,16 @@ def test_create_e_contract_create_ne_contract_in_init_tr( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_create_e_contract_create_ne_contract_in_init_tr.""" + # EIP-8037 state-gas spill OoGs the 60k inner CALL. + inner_call_gas = 60000 + tx_gas_limit = 600000 + if fork.is_eip_enabled(8037): + inner_call_gas = 200000 + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) contract_0 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B) sender = pre.fund_eoa(amount=0xE8D4A51000) @@ -59,7 +72,7 @@ def test_create_e_contract_create_ne_contract_in_init_tr( to=None, data=Op.POP( Op.CALL( - gas=0xEA60, + gas=inner_call_gas, address=contract_0, value=0x0, args_offset=0x0, @@ -70,7 +83,7 @@ def test_create_e_contract_create_ne_contract_in_init_tr( ) + Op.MSTORE(offset=0x0, value=0x64600C6000556000526005601BF3) + Op.CREATE(value=0x0, offset=0x12, size=0xE), - gas_limit=600000, + gas_limit=tx_gas_limit, ) post = { diff --git a/tests/ported_static/stCreateTest/test_create_empty000_createin_init_code_transaction.py b/tests/ported_static/stCreateTest/test_create_empty000_createin_init_code_transaction.py index 6161631fc90..583a541a861 100644 --- a/tests/ported_static/stCreateTest/test_create_empty000_createin_init_code_transaction.py +++ b/tests/ported_static/stCreateTest/test_create_empty000_createin_init_code_transaction.py @@ -3,6 +3,10 @@ Ported from: state_tests/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json +@manually-enhanced: Do not overwrite. Inner-CALL gas and tx `gas_limit` +bumped on Amsterdam to cover EIP-8037 state-gas spill; pre-EIP-8037 +unchanged. + """ import pytest @@ -15,6 +19,7 @@ Transaction, compute_create_address, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,16 @@ def test_create_empty000_createin_init_code_transaction( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_create_empty000_createin_init_code_transaction.""" + # EIP-8037 state-gas spill OoGs the 60k inner CALL. + inner_call_gas = 60000 + tx_gas_limit = 600000 + if fork.is_eip_enabled(8037): + inner_call_gas = 200000 + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) contract_0 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B) sender = pre.fund_eoa(amount=0xE8D4A51000) @@ -59,7 +72,7 @@ def test_create_empty000_createin_init_code_transaction( to=None, data=Op.POP( Op.CALL( - gas=0xEA60, + gas=inner_call_gas, address=contract_0, value=0x0, args_offset=0x0, @@ -69,7 +82,7 @@ def test_create_empty000_createin_init_code_transaction( ) ) + Op.CREATE(value=0x0, offset=0x0, size=0x0), - gas_limit=600000, + gas_limit=tx_gas_limit, ) post = { diff --git a/tests/ported_static/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas_fail.py b/tests/ported_static/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas_fail.py index cc58c53e55a..4487e382ead 100644 --- a/tests/ported_static/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas_fail.py +++ b/tests/ported_static/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas_fail.py @@ -3,6 +3,9 @@ Ported from: state_tests/Shanghai/stEIP3651_warmcoinbase/coinbaseWarmAccountCallGasFailFiller.yml +@manually-enhanced: Do not overwrite. `tx_gas` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -251,7 +254,11 @@ def test_coinbase_warm_account_call_gas_fail( Bytes("693c6139") + Hash(addr_3, left_padding=True), Bytes("693c6139") + Hash(addr_4, left_padding=True), ] - tx_gas = [80000] + # EIP-8037 state-gas spill on Amsterdam exceeds the original 80k. + outer_tx_gas = 80000 + if fork.is_eip_enabled(8037): + outer_tx_gas = 500_000 + tx_gas = [outer_tx_gas] tx = Transaction( sender=sender, diff --git a/tests/ported_static/stEIP3855_push0/test_push0.py b/tests/ported_static/stEIP3855_push0/test_push0.py index 82a91325613..45fdb4aa609 100644 --- a/tests/ported_static/stEIP3855_push0/test_push0.py +++ b/tests/ported_static/stEIP3855_push0/test_push0.py @@ -3,6 +3,9 @@ Ported from: state_tests/Shanghai/stEIP3855_push0/push0Filler.yml +@manually-enhanced: Do not overwrite. Inner-CALL gas bumped on +Amsterdam to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -80,6 +83,12 @@ def test_push0( v: int, ) -> None: """Test_push0.""" + # EIP-8037 inner-CALL gas: 100k OoGs the SSTORE-containing callees + # on Amsterdam (per-storage state-gas spill). Pre-EIP-8037 keeps + # the original 100k. + inner_call_gas = 100000 + if fork.is_eip_enabled(8037): + inner_call_gas = 1000000 coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B) contract_1 = Address(0x0000000000000000000000000000000000001000) @@ -113,7 +122,7 @@ def test_push0( code=Op.SSTORE( key=0x0, value=Op.CALL( - gas=0x186A0, + gas=inner_call_gas, address=Op.SHR(0x60, Op.CALLDATALOAD(offset=Op.DUP1)), value=Op.DUP1, args_offset=Op.DUP1, @@ -191,7 +200,7 @@ def test_push0( code=Op.SSTORE( key=0x0, value=Op.STATICCALL( - gas=0x186A0, + gas=inner_call_gas, address=0x600, args_offset=Op.DUP1, args_size=Op.DUP1, diff --git a/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_which_would_create_contract_if_called.py b/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_which_would_create_contract_if_called.py index 16fb7d6b4df..f45a3679df6 100644 --- a/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_which_would_create_contract_if_called.py +++ b/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_which_would_create_contract_if_called.py @@ -3,6 +3,10 @@ Ported from: state_tests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json +@manually-enhanced: Do not overwrite. tx `gas_limit` and inner-CALL gas +bumped on Amsterdam to cover EIP-8037 state-gas spill; pre-EIP-8037 +unchanged. + """ import pytest @@ -16,6 +20,7 @@ Transaction, compute_create_address, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -32,8 +37,16 @@ def test_call_contract_to_create_contract_which_would_create_contract_if_called( # noqa: E501 state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_call_contract_to_create_contract_which_would_create_contract_i...""" # noqa: E501 + # EIP-8037 state-gas spill OoGs the inner CREATE/CALL chain. + inner_call_gas = 50000 + tx_gas_limit = 200000 + if fork.is_eip_enabled(8037): + inner_call_gas = 200000 + tx_gas_limit = 800_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = pre.fund_eoa(amount=0x3B9ACA00) @@ -55,7 +68,7 @@ def test_call_contract_to_create_contract_which_would_create_contract_if_called( ) + Op.SSTORE(key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15)) + Op.CALL( - gas=0xC350, + gas=inner_call_gas, address=Op.SLOAD(key=0x0), value=0x1, args_offset=0x0, @@ -73,7 +86,7 @@ def test_call_contract_to_create_contract_which_would_create_contract_if_called( sender=sender, to=contract_0, data=Bytes("00"), - gas_limit=200000, + gas_limit=tx_gas_limit, ) post = { diff --git a/tests/ported_static/stInitCodeTest/test_transaction_create_auto_suicide_contract.py b/tests/ported_static/stInitCodeTest/test_transaction_create_auto_suicide_contract.py index 271a5a75705..a92c63574f3 100644 --- a/tests/ported_static/stInitCodeTest/test_transaction_create_auto_suicide_contract.py +++ b/tests/ported_static/stInitCodeTest/test_transaction_create_auto_suicide_contract.py @@ -3,6 +3,10 @@ Ported from: state_tests/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json +@manually-enhanced: Do not overwrite. tx `gas_limit` and sender balance +bumped on Amsterdam to cover EIP-8037 TX_CREATE intrinsic (new-account +state-gas folded in); pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,16 @@ def test_transaction_create_auto_suicide_contract( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_transaction_create_auto_suicide_contract.""" + # EIP-8037 folds new-account state-gas into TX_CREATE intrinsic. + tx_gas_limit = 55000 + sender_balance = 1000000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 300_000 + sender_balance = 10000000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = EOA( key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8 @@ -47,7 +60,7 @@ def test_transaction_create_auto_suicide_contract( gas_limit=1000000, ) - pre[sender] = Account(balance=0xF4240) + pre[sender] = Account(balance=sender_balance) tx = Transaction( sender=sender, @@ -61,7 +74,7 @@ def test_transaction_create_auto_suicide_contract( + Op.PUSH1[0x0] + Op.BYTE(Op.DUP2, Op.CALLDATALOAD(offset=Op.DUP1)) + Op.DUP2, - gas_limit=55000, + gas_limit=tx_gas_limit, value=15, ) diff --git a/tests/ported_static/stInitCodeTest/test_transaction_create_stop_in_initcode.py b/tests/ported_static/stInitCodeTest/test_transaction_create_stop_in_initcode.py index 15156479273..e873a8e0211 100644 --- a/tests/ported_static/stInitCodeTest/test_transaction_create_stop_in_initcode.py +++ b/tests/ported_static/stInitCodeTest/test_transaction_create_stop_in_initcode.py @@ -3,6 +3,9 @@ Ported from: state_tests/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +above intrinsic+state-gas; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ Transaction, compute_create_address, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -28,10 +32,18 @@ def test_transaction_create_stop_in_initcode( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_transaction_create_stop_in_initcode.""" + # EIP-8037 folds new-account state-gas into TX_CREATE intrinsic. + tx_gas_limit = 55000 + sender_balance = 1000000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 300_000 + sender_balance = 10000000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) - sender = pre.fund_eoa(amount=0xF4240) + sender = pre.fund_eoa(amount=sender_balance) env = Environment( fee_recipient=coinbase, @@ -55,7 +67,7 @@ def test_transaction_create_stop_in_initcode( + Op.PUSH1[0x0] + Op.BYTE(Op.DUP2, Op.CALLDATALOAD(offset=Op.DUP1)) + Op.DUP2, - gas_limit=55000, + gas_limit=tx_gas_limit, value=1, ) diff --git a/tests/ported_static/stMemoryTest/test_mem0b_single_byte.py b/tests/ported_static/stMemoryTest/test_mem0b_single_byte.py index 326a45b55e2..6499f41dd67 100644 --- a/tests/ported_static/stMemoryTest/test_mem0b_single_byte.py +++ b/tests/ported_static/stMemoryTest/test_mem0b_single_byte.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem0b_singleByteFiller.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem0b_single_byte( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem0b_single_byte.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 200_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem0b_single_byte( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem31b_single_byte.py b/tests/ported_static/stMemoryTest/test_mem31b_single_byte.py index eeafcd5aaec..ab2ee24082e 100644 --- a/tests/ported_static/stMemoryTest/test_mem31b_single_byte.py +++ b/tests/ported_static/stMemoryTest/test_mem31b_single_byte.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem31b_singleByteFiller.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem31b_single_byte( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem31b_single_byte.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 200_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem31b_single_byte( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem32b_single_byte.py b/tests/ported_static/stMemoryTest/test_mem32b_single_byte.py index 7420359d104..b839594d38b 100644 --- a/tests/ported_static/stMemoryTest/test_mem32b_single_byte.py +++ b/tests/ported_static/stMemoryTest/test_mem32b_single_byte.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem32b_singleByteFiller.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem32b_single_byte( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem32b_single_byte.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 200_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem32b_single_byte( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte.py index 7a8d60f5465..fa5d24dae28 100644 --- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte.py +++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem32kb_singleByteFiller.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem32kb_single_byte( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem32kb_single_byte.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 300_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem32kb_single_byte( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_1.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_1.py index 0e1bcd522cc..49986e0279f 100644 --- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_1.py +++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_1.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem32kb_singleByte-1Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem32kb_single_byte_minus_1( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem32kb_single_byte_minus_1.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 300_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem32kb_single_byte_minus_1( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_31.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_31.py index c02834bdbe2..9931597621c 100644 --- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_31.py +++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_31.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem32kb_singleByte-31Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem32kb_single_byte_minus_31( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem32kb_single_byte_minus_31.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 300_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem32kb_single_byte_minus_31( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_32.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_32.py index 55dda0d4dfa..b25a8187a58 100644 --- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_32.py +++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_32.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem32kb_singleByte-32Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem32kb_single_byte_minus_32( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem32kb_single_byte_minus_32.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 300_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem32kb_single_byte_minus_32( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_33.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_33.py index de06ea1ee06..848a8a59319 100644 --- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_33.py +++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_33.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem32kb_singleByte-33Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem32kb_single_byte_minus_33( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem32kb_single_byte_minus_33.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 300_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem32kb_single_byte_minus_33( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_1.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_1.py index 3be75e3a918..2fb7c811573 100644 --- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_1.py +++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_1.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem32kb_singleByte+1Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem32kb_single_byte_plus_1( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem32kb_single_byte_plus_1.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 300_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem32kb_single_byte_plus_1( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_31.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_31.py index 8ca07c3660d..d03e663c1ba 100644 --- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_31.py +++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_31.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem32kb_singleByte+31Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem32kb_single_byte_plus_31( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem32kb_single_byte_plus_31.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 300_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem32kb_single_byte_plus_31( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_32.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_32.py index f03a52967e0..9cdbcc90c64 100644 --- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_32.py +++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_32.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem32kb_singleByte+32Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem32kb_single_byte_plus_32( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem32kb_single_byte_plus_32.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 300_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem32kb_single_byte_plus_32( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_33.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_33.py index e4fece86ac3..8c976ddc056 100644 --- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_33.py +++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_33.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem32kb_singleByte+33Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem32kb_single_byte_plus_33( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem32kb_single_byte_plus_33.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 300_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem32kb_single_byte_plus_33( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem33b_single_byte.py b/tests/ported_static/stMemoryTest/test_mem33b_single_byte.py index 02ca1b6bea9..dd2e815624f 100644 --- a/tests/ported_static/stMemoryTest/test_mem33b_single_byte.py +++ b/tests/ported_static/stMemoryTest/test_mem33b_single_byte.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem33b_singleByteFiller.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem33b_single_byte( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem33b_single_byte.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 200_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem33b_single_byte( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte.py index 63120717025..68ac145e74f 100644 --- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte.py +++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem64kb_singleByteFiller.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem64kb_single_byte( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem64kb_single_byte.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem64kb_single_byte( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_1.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_1.py index 3a30a65ef72..d89f096cb45 100644 --- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_1.py +++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_1.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem64kb_singleByte-1Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem64kb_single_byte_minus_1( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem64kb_single_byte_minus_1.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem64kb_single_byte_minus_1( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_31.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_31.py index 54b7c8b9d64..adbbfb14cd4 100644 --- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_31.py +++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_31.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem64kb_singleByte-31Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem64kb_single_byte_minus_31( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem64kb_single_byte_minus_31.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem64kb_single_byte_minus_31( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_32.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_32.py index cef23f286a5..c03bd98cb1a 100644 --- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_32.py +++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_32.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem64kb_singleByte-32Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem64kb_single_byte_minus_32( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem64kb_single_byte_minus_32.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem64kb_single_byte_minus_32( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_33.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_33.py index 4734f665a7a..e6697924f19 100644 --- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_33.py +++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_33.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem64kb_singleByte-33Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem64kb_single_byte_minus_33( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem64kb_single_byte_minus_33.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem64kb_single_byte_minus_33( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_1.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_1.py index e564bc53019..9717e71651b 100644 --- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_1.py +++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_1.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem64kb_singleByte+1Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem64kb_single_byte_plus_1( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem64kb_single_byte_plus_1.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem64kb_single_byte_plus_1( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_31.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_31.py index bf3d5bcd965..eff7dbdbbca 100644 --- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_31.py +++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_31.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem64kb_singleByte+31Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem64kb_single_byte_plus_31( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem64kb_single_byte_plus_31.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem64kb_single_byte_plus_31( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_32.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_32.py index dff8a7dc6cf..b8882820448 100644 --- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_32.py +++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_32.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem64kb_singleByte+32Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem64kb_single_byte_plus_32( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem64kb_single_byte_plus_32.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem64kb_single_byte_plus_32( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_33.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_33.py index 1fe5ead91ac..6e9b9c4d55b 100644 --- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_33.py +++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_33.py @@ -3,6 +3,9 @@ Ported from: state_tests/stMemoryTest/mem64kb_singleByte+33Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_mem64kb_single_byte_plus_33( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_mem64kb_single_byte_plus_33.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0x6400000000) @@ -56,7 +66,7 @@ def test_mem64kb_single_byte_plus_33( sender=sender, to=target, data=Bytes(""), - gas_limit=100000, + gas_limit=tx_gas_limit, value=10, ) diff --git a/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_20500.py b/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_20500.py index 59e3af2c647..9d30c32379d 100644 --- a/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_20500.py +++ b/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_20500.py @@ -3,6 +3,9 @@ Ported from: state_tests/stPreCompiledContracts2/modexp_0_0_0_20500Filler.json +@manually-enhanced: Do not overwrite. tx_gas values bumped on +Amsterdam to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -326,6 +329,9 @@ def test_modexp_0_0_0_20500( + Hash(0x0), ] tx_gas = [42540, 90000, 110000, 200000] + if fork.is_eip_enabled(8037): + # EIP-8037 state-gas spill OoGs the SSTORE; bump to fit. + tx_gas = [42540, 200000, 200000, 200000] tx = Transaction( sender=sender, diff --git a/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_22000.py b/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_22000.py index 9390b7eb00c..19c7672ffd3 100644 --- a/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_22000.py +++ b/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_22000.py @@ -3,6 +3,9 @@ Ported from: state_tests/stPreCompiledContracts2/modexp_0_0_0_22000Filler.json +@manually-enhanced: Do not overwrite. tx_gas values bumped on +Amsterdam to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -268,6 +271,9 @@ def test_modexp_0_0_0_22000( + Hash(0x0), ] tx_gas = [48136, 90000, 110000, 200000] + if fork.is_eip_enabled(8037): + # EIP-8037 state-gas spill OoGs the SSTORE; bump to fit. + tx_gas = [200000, 200000, 200000, 200000] tx = Transaction( sender=sender, diff --git a/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_25000.py b/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_25000.py index 9ae5ef9d781..a9847bc8f27 100644 --- a/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_25000.py +++ b/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_25000.py @@ -3,6 +3,9 @@ Ported from: state_tests/stPreCompiledContracts2/modexp_0_0_0_25000Filler.json +@manually-enhanced: Do not overwrite. tx_gas values bumped on +Amsterdam to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -268,6 +271,9 @@ def test_modexp_0_0_0_25000( + Hash(0x0), ] tx_gas = [47040, 90000, 110000, 200000] + if fork.is_eip_enabled(8037): + # EIP-8037 state-gas spill OoGs the SSTORE; bump to fit. + tx_gas = [200000, 200000, 200000, 200000] tx = Transaction( sender=sender, diff --git a/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_35000.py b/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_35000.py index 89b4b07c0e8..0ddf844021c 100644 --- a/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_35000.py +++ b/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_35000.py @@ -3,6 +3,9 @@ Ported from: state_tests/stPreCompiledContracts2/modexp_0_0_0_35000Filler.json +@manually-enhanced: Do not overwrite. tx_gas values bumped on +Amsterdam to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -268,6 +271,9 @@ def test_modexp_0_0_0_35000( + Hash(0x0), ] tx_gas = [57040, 90000, 110000, 200000] + if fork.is_eip_enabled(8037): + # EIP-8037 state-gas spill OoGs the SSTORE; bump to fit. + tx_gas = [200000, 200000, 200000, 200000] tx = Transaction( sender=sender, diff --git a/tests/ported_static/stRandom/test_random_statetest102.py b/tests/ported_static/stRandom/test_random_statetest102.py index 8ff1e7d54e3..4c6423fd4fa 100644 --- a/tests/ported_static/stRandom/test_random_statetest102.py +++ b/tests/ported_static/stRandom/test_random_statetest102.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest102Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest102( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest102.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest102( data=Bytes( "457f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7944447f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f157094ffff1a04893a9cf3858b8576" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x25D01AE2, ) diff --git a/tests/ported_static/stRandom/test_random_statetest104.py b/tests/ported_static/stRandom/test_random_statetest104.py index 1ed4c2d3947..114d7820a3a 100644 --- a/tests/ported_static/stRandom/test_random_statetest104.py +++ b/tests/ported_static/stRandom/test_random_statetest104.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest104Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest104( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest104.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -94,7 +104,7 @@ def test_random_statetest104( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f147d6b978c780a82619772417d5b6a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3A3FA7D5, ) diff --git a/tests/ported_static/stRandom/test_random_statetest105.py b/tests/ported_static/stRandom/test_random_statetest105.py index bac6b578af7..84f03f71bd7 100644 --- a/tests/ported_static/stRandom/test_random_statetest105.py +++ b/tests/ported_static/stRandom/test_random_statetest105.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest105Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest105( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest105.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest105( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f9914639111156d1759ff65039a02926c" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x566920F7, ) diff --git a/tests/ported_static/stRandom/test_random_statetest106.py b/tests/ported_static/stRandom/test_random_statetest106.py index a708c2b28f3..0b31c2aa12f 100644 --- a/tests/ported_static/stRandom/test_random_statetest106.py +++ b/tests/ported_static/stRandom/test_random_statetest106.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest106Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest106( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest106.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -91,7 +101,7 @@ def test_random_statetest106( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f327043726481f25094828e21155779" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x41FF266C, ) diff --git a/tests/ported_static/stRandom/test_random_statetest107.py b/tests/ported_static/stRandom/test_random_statetest107.py index 3d5d91b1f43..3ed7e239af2 100644 --- a/tests/ported_static/stRandom/test_random_statetest107.py +++ b/tests/ported_static/stRandom/test_random_statetest107.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest107Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest107( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest107.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -92,7 +102,7 @@ def test_random_statetest107( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b509" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x4F9C450B, ) diff --git a/tests/ported_static/stRandom/test_random_statetest11.py b/tests/ported_static/stRandom/test_random_statetest11.py index cdeb3b65d2d..0fa94e89cfc 100644 --- a/tests/ported_static/stRandom/test_random_statetest11.py +++ b/tests/ported_static/stRandom/test_random_statetest11.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest11Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest11( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest11.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest11( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3506fa093f3408a6e531735960a7617127a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6909D3EC, ) diff --git a/tests/ported_static/stRandom/test_random_statetest110.py b/tests/ported_static/stRandom/test_random_statetest110.py index 24b6a17c72c..92c3316ccd0 100644 --- a/tests/ported_static/stRandom/test_random_statetest110.py +++ b/tests/ported_static/stRandom/test_random_statetest110.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest110Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest110( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest110.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest110( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000016f97543c343476cb7c8c84066217f102" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2BEB343B, ) diff --git a/tests/ported_static/stRandom/test_random_statetest112.py b/tests/ported_static/stRandom/test_random_statetest112.py index fb105dce989..f8e4ef355a9 100644 --- a/tests/ported_static/stRandom/test_random_statetest112.py +++ b/tests/ported_static/stRandom/test_random_statetest112.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest112Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest112( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest112.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -92,7 +102,7 @@ def test_random_statetest112( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff45447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f549c5779398a848c35307514650541" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x779DB8A6, ) diff --git a/tests/ported_static/stRandom/test_random_statetest114.py b/tests/ported_static/stRandom/test_random_statetest114.py index 94e0313edf1..d6d636c9e8d 100644 --- a/tests/ported_static/stRandom/test_random_statetest114.py +++ b/tests/ported_static/stRandom/test_random_statetest114.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest114Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest114( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest114.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -93,7 +103,7 @@ def test_random_statetest114( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3584357ea388725483637d4471727f" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3FA85EB3, ) diff --git a/tests/ported_static/stRandom/test_random_statetest116.py b/tests/ported_static/stRandom/test_random_statetest116.py index c55790a8aeb..388421585ea 100644 --- a/tests/ported_static/stRandom/test_random_statetest116.py +++ b/tests/ported_static/stRandom/test_random_statetest116.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest116Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest116( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest116.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -93,7 +103,7 @@ def test_random_statetest116( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7907539337" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x162D4E87, ) diff --git a/tests/ported_static/stRandom/test_random_statetest117.py b/tests/ported_static/stRandom/test_random_statetest117.py index 15002f87282..5874efbb26b 100644 --- a/tests/ported_static/stRandom/test_random_statetest117.py +++ b/tests/ported_static/stRandom/test_random_statetest117.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest117Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest117( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest117.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -84,7 +94,7 @@ def test_random_statetest117( data=Bytes( "447f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f8aa4a4980274f18c6158368d415714" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x691AC7A4, ) diff --git a/tests/ported_static/stRandom/test_random_statetest118.py b/tests/ported_static/stRandom/test_random_statetest118.py index 12369bd4544..e6cbb0601d6 100644 --- a/tests/ported_static/stRandom/test_random_statetest118.py +++ b/tests/ported_static/stRandom/test_random_statetest118.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest118Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest118( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest118.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -91,7 +101,7 @@ def test_random_statetest118( data=Bytes( "457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000006f55817c037fa45bf3850320309a8f02" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x46F13668, ) diff --git a/tests/ported_static/stRandom/test_random_statetest119.py b/tests/ported_static/stRandom/test_random_statetest119.py index 565fa52244b..724114ace31 100644 --- a/tests/ported_static/stRandom/test_random_statetest119.py +++ b/tests/ported_static/stRandom/test_random_statetest119.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest119Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest119( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest119.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -85,7 +95,7 @@ def test_random_statetest119( data=Bytes( "4559437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006f52503b127c115a9673a43137909566" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x189731CA, ) diff --git a/tests/ported_static/stRandom/test_random_statetest12.py b/tests/ported_static/stRandom/test_random_statetest12.py index 9330b6beafe..f1c61def0c7 100644 --- a/tests/ported_static/stRandom/test_random_statetest12.py +++ b/tests/ported_static/stRandom/test_random_statetest12.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest12Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest12( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest12.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest12( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79027f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f165490a41215369ef2760379411633" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x4576EB63, ) diff --git a/tests/ported_static/stRandom/test_random_statetest120.py b/tests/ported_static/stRandom/test_random_statetest120.py index 77900a78681..e37628a38ef 100644 --- a/tests/ported_static/stRandom/test_random_statetest120.py +++ b/tests/ported_static/stRandom/test_random_statetest120.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest120Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest120( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest120.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -91,7 +101,7 @@ def test_random_statetest120( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8208" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x707BF5EA, ) diff --git a/tests/ported_static/stRandom/test_random_statetest121.py b/tests/ported_static/stRandom/test_random_statetest121.py index 41774c86476..3db32458324 100644 --- a/tests/ported_static/stRandom/test_random_statetest121.py +++ b/tests/ported_static/stRandom/test_random_statetest121.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest121Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest121( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest121.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest121( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350456f305842321509108c689f7ca3195a9d" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x492A84CF, ) diff --git a/tests/ported_static/stRandom/test_random_statetest122.py b/tests/ported_static/stRandom/test_random_statetest122.py index 2d132303ea3..9eff336d8f6 100644 --- a/tests/ported_static/stRandom/test_random_statetest122.py +++ b/tests/ported_static/stRandom/test_random_statetest122.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest122Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest122( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest122.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest122( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6fa2825b6c338f8d717156560af045136b" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x201771A5, ) diff --git a/tests/ported_static/stRandom/test_random_statetest124.py b/tests/ported_static/stRandom/test_random_statetest124.py index 05c65de47b5..33c25c1e79d 100644 --- a/tests/ported_static/stRandom/test_random_statetest124.py +++ b/tests/ported_static/stRandom/test_random_statetest124.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest124Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest124( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest124.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -78,7 +88,7 @@ def test_random_statetest124( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08125580355b17457f7463587b9a7a43" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6863F683, ) diff --git a/tests/ported_static/stRandom/test_random_statetest129.py b/tests/ported_static/stRandom/test_random_statetest129.py index 1f2b194d0cd..be9ff65c5d1 100644 --- a/tests/ported_static/stRandom/test_random_statetest129.py +++ b/tests/ported_static/stRandom/test_random_statetest129.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest129Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest129( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest129.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest129( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f166e733343093a31a33b8e025a0270" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x422CD1CC, ) diff --git a/tests/ported_static/stRandom/test_random_statetest130.py b/tests/ported_static/stRandom/test_random_statetest130.py index 44ec7ad64ce..6895e8b5670 100644 --- a/tests/ported_static/stRandom/test_random_statetest130.py +++ b/tests/ported_static/stRandom/test_random_statetest130.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest130Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest130( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest130.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest130( data=Bytes( "417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016f368a668b76306d181a393611988317" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x720306C0, ) diff --git a/tests/ported_static/stRandom/test_random_statetest131.py b/tests/ported_static/stRandom/test_random_statetest131.py index 2db53b3ca42..fee5ddcf1c4 100644 --- a/tests/ported_static/stRandom/test_random_statetest131.py +++ b/tests/ported_static/stRandom/test_random_statetest131.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest131Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest131( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest131.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest131( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000014416f36ff85758270710168547a9777886096" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x1C479F90, ) diff --git a/tests/ported_static/stRandom/test_random_statetest137.py b/tests/ported_static/stRandom/test_random_statetest137.py index 32f8f7a561a..9d68283af2a 100644 --- a/tests/ported_static/stRandom/test_random_statetest137.py +++ b/tests/ported_static/stRandom/test_random_statetest137.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest137Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest137( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest137.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -87,7 +97,7 @@ def test_random_statetest137( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000087f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5a130e86ca17390989355f092a2" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x33AC85E7, ) diff --git a/tests/ported_static/stRandom/test_random_statetest139.py b/tests/ported_static/stRandom/test_random_statetest139.py index d3b01a6d2a2..561422cc2e2 100644 --- a/tests/ported_static/stRandom/test_random_statetest139.py +++ b/tests/ported_static/stRandom/test_random_statetest139.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest139Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest139( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest139.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -83,7 +93,7 @@ def test_random_statetest139( data=Bytes( "33447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff43446133451545" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x409CEFF3, ) diff --git a/tests/ported_static/stRandom/test_random_statetest142.py b/tests/ported_static/stRandom/test_random_statetest142.py index 67d62469905..19cae9d2e03 100644 --- a/tests/ported_static/stRandom/test_random_statetest142.py +++ b/tests/ported_static/stRandom/test_random_statetest142.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest142Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest142( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest142.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -95,7 +105,7 @@ def test_random_statetest142( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff959137630364087e1a640431107c8801" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6DD219A0, ) diff --git a/tests/ported_static/stRandom/test_random_statetest145.py b/tests/ported_static/stRandom/test_random_statetest145.py index 69220b3cf9b..ba633f6f5a4 100644 --- a/tests/ported_static/stRandom/test_random_statetest145.py +++ b/tests/ported_static/stRandom/test_random_statetest145.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest145Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest145( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest145.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -84,7 +94,7 @@ def test_random_statetest145( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001391333" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7E1F26DA, ) diff --git a/tests/ported_static/stRandom/test_random_statetest148.py b/tests/ported_static/stRandom/test_random_statetest148.py index aa3fa5f4ef5..9909560b035 100644 --- a/tests/ported_static/stRandom/test_random_statetest148.py +++ b/tests/ported_static/stRandom/test_random_statetest148.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest148Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest148( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest148.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -82,7 +92,7 @@ def test_random_statetest148( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001537f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f34847e390773919b16559077164472" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x30607FB3, ) diff --git a/tests/ported_static/stRandom/test_random_statetest15.py b/tests/ported_static/stRandom/test_random_statetest15.py index 360feb53c96..50abb7919ce 100644 --- a/tests/ported_static/stRandom/test_random_statetest15.py +++ b/tests/ported_static/stRandom/test_random_statetest15.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest15Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest15( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest15.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest15( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f436af043189b6197733280a2f1f038" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x598426AC, ) diff --git a/tests/ported_static/stRandom/test_random_statetest155.py b/tests/ported_static/stRandom/test_random_statetest155.py index f2465749e00..4a3ba8c177b 100644 --- a/tests/ported_static/stRandom/test_random_statetest155.py +++ b/tests/ported_static/stRandom/test_random_statetest155.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest155Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest155( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest155.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest155( data=Bytes( "457f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000006f3494f39b6ca29473a1995803089101" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x228B052C, ) diff --git a/tests/ported_static/stRandom/test_random_statetest156.py b/tests/ported_static/stRandom/test_random_statetest156.py index 04c58e756fa..dd4b11a6002 100644 --- a/tests/ported_static/stRandom/test_random_statetest156.py +++ b/tests/ported_static/stRandom/test_random_statetest156.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest156Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest156( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest156.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -83,7 +93,7 @@ def test_random_statetest156( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f813982583141966b389c159aa48b3a88" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7FFE6411, ) diff --git a/tests/ported_static/stRandom/test_random_statetest158.py b/tests/ported_static/stRandom/test_random_statetest158.py index 0cfd17719dc..39fa2b5981b 100644 --- a/tests/ported_static/stRandom/test_random_statetest158.py +++ b/tests/ported_static/stRandom/test_random_statetest158.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest158Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest158( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest158.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest158( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe4350" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x383BFC76, ) diff --git a/tests/ported_static/stRandom/test_random_statetest161.py b/tests/ported_static/stRandom/test_random_statetest161.py index 545898dc19a..7dc41e77504 100644 --- a/tests/ported_static/stRandom/test_random_statetest161.py +++ b/tests/ported_static/stRandom/test_random_statetest161.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest161Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest161( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest161.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -84,7 +94,7 @@ def test_random_statetest161( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001416f458a458076526052650a418c9b40863c" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2D2470B1, ) diff --git a/tests/ported_static/stRandom/test_random_statetest162.py b/tests/ported_static/stRandom/test_random_statetest162.py index c9595b04046..ecc14ec7fc5 100644 --- a/tests/ported_static/stRandom/test_random_statetest162.py +++ b/tests/ported_static/stRandom/test_random_statetest162.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest162Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest162( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest162.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest162( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f355a7f614497339e3b63878b369804" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2B36B8AD, ) diff --git a/tests/ported_static/stRandom/test_random_statetest166.py b/tests/ported_static/stRandom/test_random_statetest166.py index 34643d0106d..b472e7ddf9e 100644 --- a/tests/ported_static/stRandom/test_random_statetest166.py +++ b/tests/ported_static/stRandom/test_random_statetest166.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest166Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest166( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest166.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest166( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff817f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350456f8eb7099d9f160532785143c5937e18" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x603D8563, ) diff --git a/tests/ported_static/stRandom/test_random_statetest167.py b/tests/ported_static/stRandom/test_random_statetest167.py index 9ed99f91176..c1a689820af 100644 --- a/tests/ported_static/stRandom/test_random_statetest167.py +++ b/tests/ported_static/stRandom/test_random_statetest167.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest167Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest167( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest167.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest167( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001437f0000000000000000000000000000000000000000000000000000000000000001027f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6fa00b875630178a439384941395369e" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x198F60AB, ) diff --git a/tests/ported_static/stRandom/test_random_statetest169.py b/tests/ported_static/stRandom/test_random_statetest169.py index abc08396861..3d2d075902f 100644 --- a/tests/ported_static/stRandom/test_random_statetest169.py +++ b/tests/ported_static/stRandom/test_random_statetest169.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest169Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest169( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest169.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest169( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x33C6014B, ) diff --git a/tests/ported_static/stRandom/test_random_statetest175.py b/tests/ported_static/stRandom/test_random_statetest175.py index 24aed403dca..63c7e71548a 100644 --- a/tests/ported_static/stRandom/test_random_statetest175.py +++ b/tests/ported_static/stRandom/test_random_statetest175.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest175Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest175( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest175.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest175( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f6985f2837e09689844171a0235833c" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7F8A09B6, ) diff --git a/tests/ported_static/stRandom/test_random_statetest179.py b/tests/ported_static/stRandom/test_random_statetest179.py index 24e0580fe3a..7fcc568ea78 100644 --- a/tests/ported_static/stRandom/test_random_statetest179.py +++ b/tests/ported_static/stRandom/test_random_statetest179.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest179Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest179( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest179.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -92,7 +102,7 @@ def test_random_statetest179( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f515480126a50a173506e0667621292" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x5E6CF4EC, ) diff --git a/tests/ported_static/stRandom/test_random_statetest180.py b/tests/ported_static/stRandom/test_random_statetest180.py index 1cb98c1f903..fb9e36a7218 100644 --- a/tests/ported_static/stRandom/test_random_statetest180.py +++ b/tests/ported_static/stRandom/test_random_statetest180.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest180Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest180( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest180.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -85,7 +95,7 @@ def test_random_statetest180( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001447f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f11576b693c128a9e0820609c050a219d" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x21C3963D, ) diff --git a/tests/ported_static/stRandom/test_random_statetest183.py b/tests/ported_static/stRandom/test_random_statetest183.py index 64f5c768b3c..045b6188782 100644 --- a/tests/ported_static/stRandom/test_random_statetest183.py +++ b/tests/ported_static/stRandom/test_random_statetest183.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest183Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest183( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest183.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -84,7 +94,7 @@ def test_random_statetest183( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79436f4134547075687854849d7b64658630" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x451629C1, ) diff --git a/tests/ported_static/stRandom/test_random_statetest184.py b/tests/ported_static/stRandom/test_random_statetest184.py index 87bef783f33..33600950e0f 100644 --- a/tests/ported_static/stRandom/test_random_statetest184.py +++ b/tests/ported_static/stRandom/test_random_statetest184.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest184Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest184( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest184.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x6D6E40885310545835A5B582DBC23EF026404BDA) addr = Address(0xF377657E450772B703A269E12BB487FF421A5C6D) sender = EOA( @@ -75,7 +85,7 @@ def test_random_statetest184( sender=sender, to=target, data=Bytes("64dd3e4e84676723342c1dfaf9af4ef3"), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6D1DD024, gas_price=28, ) diff --git a/tests/ported_static/stRandom/test_random_statetest187.py b/tests/ported_static/stRandom/test_random_statetest187.py index bf53697ffc7..b1e665c5de0 100644 --- a/tests/ported_static/stRandom/test_random_statetest187.py +++ b/tests/ported_static/stRandom/test_random_statetest187.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest187Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest187( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest187.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -84,7 +94,7 @@ def test_random_statetest187( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f75988036a0562096036b04518877199d" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x372E4882, ) diff --git a/tests/ported_static/stRandom/test_random_statetest188.py b/tests/ported_static/stRandom/test_random_statetest188.py index 3620adb6ed4..9eb3c7129d5 100644 --- a/tests/ported_static/stRandom/test_random_statetest188.py +++ b/tests/ported_static/stRandom/test_random_statetest188.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest188Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest188( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest188.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest188( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff817f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4286687859f38379718794" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x49195164, ) diff --git a/tests/ported_static/stRandom/test_random_statetest19.py b/tests/ported_static/stRandom/test_random_statetest19.py index ac44bc52f61..afff390d5c9 100644 --- a/tests/ported_static/stRandom/test_random_statetest19.py +++ b/tests/ported_static/stRandom/test_random_statetest19.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest19Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest19( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest19.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest19( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe3a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f0000000000000000000000000000000000000000000000000000000000000001587f000000000000000000000000000000000000000000000000000000000000c3506fff59876660063b7c8df1ff088a8414" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x1DCD74DE, ) diff --git a/tests/ported_static/stRandom/test_random_statetest191.py b/tests/ported_static/stRandom/test_random_statetest191.py index caa21571a16..1b71f2b90ed 100644 --- a/tests/ported_static/stRandom/test_random_statetest191.py +++ b/tests/ported_static/stRandom/test_random_statetest191.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest191Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest191( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest191.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -92,7 +102,7 @@ def test_random_statetest191( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f678f0443457084700b645760018a10" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x17008747, ) diff --git a/tests/ported_static/stRandom/test_random_statetest192.py b/tests/ported_static/stRandom/test_random_statetest192.py index a4452845b23..8f08b1019cc 100644 --- a/tests/ported_static/stRandom/test_random_statetest192.py +++ b/tests/ported_static/stRandom/test_random_statetest192.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest192Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest192( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest192.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -91,7 +101,7 @@ def test_random_statetest192( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff347f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe04" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x45A5235D, ) diff --git a/tests/ported_static/stRandom/test_random_statetest194.py b/tests/ported_static/stRandom/test_random_statetest194.py index bd461146d7b..bfe9ecf28d6 100644 --- a/tests/ported_static/stRandom/test_random_statetest194.py +++ b/tests/ported_static/stRandom/test_random_statetest194.py @@ -3,6 +3,11 @@ Ported from: state_tests/stRandom/randomStatetest194Filler.json + +@manually-enhanced: Do not overwrite. `gas_limit` raised on Amsterdam +to cover EIP-8037 state-gas spill. Pre-EIP-8037 keeps the original +100 000. + """ import pytest @@ -15,6 +20,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +35,14 @@ def test_random_statetest194( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest194.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -83,7 +95,7 @@ def test_random_statetest194( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x31582CFB, ) diff --git a/tests/ported_static/stRandom/test_random_statetest195.py b/tests/ported_static/stRandom/test_random_statetest195.py index ebaa6693c36..823838d4c9c 100644 --- a/tests/ported_static/stRandom/test_random_statetest195.py +++ b/tests/ported_static/stRandom/test_random_statetest195.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest195Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest195( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest195.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -85,7 +95,7 @@ def test_random_statetest195( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000010000000000000000000000000000000000000000" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x1252A41F, ) diff --git a/tests/ported_static/stRandom/test_random_statetest196.py b/tests/ported_static/stRandom/test_random_statetest196.py index 50ebc4d7fe2..9b8e822d671 100644 --- a/tests/ported_static/stRandom/test_random_statetest196.py +++ b/tests/ported_static/stRandom/test_random_statetest196.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest196Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest196( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest196.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -87,7 +97,7 @@ def test_random_statetest196( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000003703659c5b3a6d7b9a935436" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2819E4BE, ) diff --git a/tests/ported_static/stRandom/test_random_statetest2.py b/tests/ported_static/stRandom/test_random_statetest2.py index 493676ac0c8..8120e34f029 100644 --- a/tests/ported_static/stRandom/test_random_statetest2.py +++ b/tests/ported_static/stRandom/test_random_statetest2.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest2Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest2( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest2.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest2( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7958437f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f3412a47c889e8da06a04049f049888" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7C34BB45, ) diff --git a/tests/ported_static/stRandom/test_random_statetest200.py b/tests/ported_static/stRandom/test_random_statetest200.py index b3ba2ec16fd..ea5bfad15e3 100644 --- a/tests/ported_static/stRandom/test_random_statetest200.py +++ b/tests/ported_static/stRandom/test_random_statetest200.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest200Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest200( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest200.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -82,7 +92,7 @@ def test_random_statetest200( data=Bytes( "437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79346f42051af2a24050039e9d3a678b028a0a80" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3F51031D, ) diff --git a/tests/ported_static/stRandom/test_random_statetest202.py b/tests/ported_static/stRandom/test_random_statetest202.py index f07e44907e4..e7dc23c0fd8 100644 --- a/tests/ported_static/stRandom/test_random_statetest202.py +++ b/tests/ported_static/stRandom/test_random_statetest202.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest202Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest202( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest202.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -73,7 +83,7 @@ def test_random_statetest202( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000557f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6750a3190486f0" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3158E7CD, ) diff --git a/tests/ported_static/stRandom/test_random_statetest204.py b/tests/ported_static/stRandom/test_random_statetest204.py index 5662b8ebb86..80779e64297 100644 --- a/tests/ported_static/stRandom/test_random_statetest204.py +++ b/tests/ported_static/stRandom/test_random_statetest204.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest204Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest204( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest204.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest204( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0982" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x763F0C95, ) diff --git a/tests/ported_static/stRandom/test_random_statetest206.py b/tests/ported_static/stRandom/test_random_statetest206.py index 3463ff02b14..39a87632dd4 100644 --- a/tests/ported_static/stRandom/test_random_statetest206.py +++ b/tests/ported_static/stRandom/test_random_statetest206.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest206Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest206( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest206.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest206( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79427f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f45736d8e806138378d62087320313c" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7CA24D6F, ) diff --git a/tests/ported_static/stRandom/test_random_statetest208.py b/tests/ported_static/stRandom/test_random_statetest208.py index 12a6f165081..2ebdf20f398 100644 --- a/tests/ported_static/stRandom/test_random_statetest208.py +++ b/tests/ported_static/stRandom/test_random_statetest208.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest208Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest208( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest208.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest208( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7FD561B3, ) diff --git a/tests/ported_static/stRandom/test_random_statetest210.py b/tests/ported_static/stRandom/test_random_statetest210.py index a4c9c3dde8f..5ec0f49f96e 100644 --- a/tests/ported_static/stRandom/test_random_statetest210.py +++ b/tests/ported_static/stRandom/test_random_statetest210.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest210Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest210( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest210.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest210( data=Bytes( "457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6A1B0D6A, ) diff --git a/tests/ported_static/stRandom/test_random_statetest214.py b/tests/ported_static/stRandom/test_random_statetest214.py index ab96720b156..f9f806f4ee1 100644 --- a/tests/ported_static/stRandom/test_random_statetest214.py +++ b/tests/ported_static/stRandom/test_random_statetest214.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest214Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest214( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest214.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest214( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff150a6f7b056b335a15a48d7b8841163a503963" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7D4430A5, ) diff --git a/tests/ported_static/stRandom/test_random_statetest215.py b/tests/ported_static/stRandom/test_random_statetest215.py index 9db89bca2fb..270221359f5 100644 --- a/tests/ported_static/stRandom/test_random_statetest215.py +++ b/tests/ported_static/stRandom/test_random_statetest215.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest215Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest215( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest215.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -83,7 +93,7 @@ def test_random_statetest215( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff446f728f4f1065583139780a981510173b9c" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x306B9921, ) diff --git a/tests/ported_static/stRandom/test_random_statetest216.py b/tests/ported_static/stRandom/test_random_statetest216.py index 3aab5f04029..ae66319835f 100644 --- a/tests/ported_static/stRandom/test_random_statetest216.py +++ b/tests/ported_static/stRandom/test_random_statetest216.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest216Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest216( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest216.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest216( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350447f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506d766d67fe078532089913064494" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x288181DD, ) diff --git a/tests/ported_static/stRandom/test_random_statetest217.py b/tests/ported_static/stRandom/test_random_statetest217.py index 55360093ed0..e451e45b057 100644 --- a/tests/ported_static/stRandom/test_random_statetest217.py +++ b/tests/ported_static/stRandom/test_random_statetest217.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest217Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest217( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest217.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -79,7 +89,7 @@ def test_random_statetest217( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001377f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x1C326D78, ) diff --git a/tests/ported_static/stRandom/test_random_statetest219.py b/tests/ported_static/stRandom/test_random_statetest219.py index 03f784a0a47..c1566abbec1 100644 --- a/tests/ported_static/stRandom/test_random_statetest219.py +++ b/tests/ported_static/stRandom/test_random_statetest219.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest219Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest219( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest219.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -85,7 +95,7 @@ def test_random_statetest219( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3506f6253443a4104027144577f33998320" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x46404EA, ) diff --git a/tests/ported_static/stRandom/test_random_statetest220.py b/tests/ported_static/stRandom/test_random_statetest220.py index 74c3e24a750..c80332b5130 100644 --- a/tests/ported_static/stRandom/test_random_statetest220.py +++ b/tests/ported_static/stRandom/test_random_statetest220.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest220Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest220( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest220.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -84,7 +94,7 @@ def test_random_statetest220( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f420380a03c4282a3540a1a333a843a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0xC5BFC9F, ) diff --git a/tests/ported_static/stRandom/test_random_statetest221.py b/tests/ported_static/stRandom/test_random_statetest221.py index cc878bda5b1..41805cb2db0 100644 --- a/tests/ported_static/stRandom/test_random_statetest221.py +++ b/tests/ported_static/stRandom/test_random_statetest221.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest221Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest221( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest221.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest221( data=Bytes( "457f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f977789947e197f828151867a73771a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6F0651EF, ) diff --git a/tests/ported_static/stRandom/test_random_statetest222.py b/tests/ported_static/stRandom/test_random_statetest222.py index f876c7ddd23..d967defdcf6 100644 --- a/tests/ported_static/stRandom/test_random_statetest222.py +++ b/tests/ported_static/stRandom/test_random_statetest222.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest222Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest222( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest222.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -85,7 +95,7 @@ def test_random_statetest222( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000001000000000000000000000000000000000000000043397f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35081" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x66F96B9F, ) diff --git a/tests/ported_static/stRandom/test_random_statetest225.py b/tests/ported_static/stRandom/test_random_statetest225.py index f1da9b1b434..a29e2414eae 100644 --- a/tests/ported_static/stRandom/test_random_statetest225.py +++ b/tests/ported_static/stRandom/test_random_statetest225.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest225Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest225( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest225.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -94,7 +104,7 @@ def test_random_statetest225( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff506f69786c858e0703566f95f89931119019" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x9859445, ) diff --git a/tests/ported_static/stRandom/test_random_statetest227.py b/tests/ported_static/stRandom/test_random_statetest227.py index 3dd0849f4e7..152f35cb0e6 100644 --- a/tests/ported_static/stRandom/test_random_statetest227.py +++ b/tests/ported_static/stRandom/test_random_statetest227.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest227Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest227( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest227.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -84,7 +94,7 @@ def test_random_statetest227( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f108fa27475689e44993a528752a1523359" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x462204C5, ) diff --git a/tests/ported_static/stRandom/test_random_statetest23.py b/tests/ported_static/stRandom/test_random_statetest23.py index 529607de16c..dbeea4e8b60 100644 --- a/tests/ported_static/stRandom/test_random_statetest23.py +++ b/tests/ported_static/stRandom/test_random_statetest23.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest23Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest23( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest23.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -85,7 +95,7 @@ def test_random_statetest23( data=Bytes( "7f0000000000000000000000000000000000000000000000000000000000000001427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f89418c1076f1544315601489386c91" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x27CD2E4B, ) diff --git a/tests/ported_static/stRandom/test_random_statetest231.py b/tests/ported_static/stRandom/test_random_statetest231.py index 4b8cbf4cb2c..0888a359ceb 100644 --- a/tests/ported_static/stRandom/test_random_statetest231.py +++ b/tests/ported_static/stRandom/test_random_statetest231.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest231Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest231( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest231.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest231( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f7b98a491727a089df3365353329e80" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x4BCA4C7E, ) diff --git a/tests/ported_static/stRandom/test_random_statetest238.py b/tests/ported_static/stRandom/test_random_statetest238.py index 921cc9cdb04..9329c88c2ab 100644 --- a/tests/ported_static/stRandom/test_random_statetest238.py +++ b/tests/ported_static/stRandom/test_random_statetest238.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest238Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest238( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest238.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest238( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff307fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f7c748813587e990566719934f342316c" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0xFF8455C, ) diff --git a/tests/ported_static/stRandom/test_random_statetest242.py b/tests/ported_static/stRandom/test_random_statetest242.py index 95fb42d22b1..401917748c4 100644 --- a/tests/ported_static/stRandom/test_random_statetest242.py +++ b/tests/ported_static/stRandom/test_random_statetest242.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest242Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest242( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest242.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest242( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7DCB2C64, ) diff --git a/tests/ported_static/stRandom/test_random_statetest243.py b/tests/ported_static/stRandom/test_random_statetest243.py index 52c4e4867b9..468c36864ba 100644 --- a/tests/ported_static/stRandom/test_random_statetest243.py +++ b/tests/ported_static/stRandom/test_random_statetest243.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest243Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest243( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest243.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -80,7 +90,7 @@ def test_random_statetest243( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f424544664076406862554558668490" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x49903AC, ) diff --git a/tests/ported_static/stRandom/test_random_statetest247.py b/tests/ported_static/stRandom/test_random_statetest247.py index 98837b685bf..474148b54f8 100644 --- a/tests/ported_static/stRandom/test_random_statetest247.py +++ b/tests/ported_static/stRandom/test_random_statetest247.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest247Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest247( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest247.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest247( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe04" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x43B4ED79, ) diff --git a/tests/ported_static/stRandom/test_random_statetest248.py b/tests/ported_static/stRandom/test_random_statetest248.py index 23b623ac04b..36e4656fdca 100644 --- a/tests/ported_static/stRandom/test_random_statetest248.py +++ b/tests/ported_static/stRandom/test_random_statetest248.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest248Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest248( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest248.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -89,7 +99,7 @@ def test_random_statetest248( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8636f25990" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x20C4D1A6, ) diff --git a/tests/ported_static/stRandom/test_random_statetest249.py b/tests/ported_static/stRandom/test_random_statetest249.py index 9afe90fa87e..c4eb673ae28 100644 --- a/tests/ported_static/stRandom/test_random_statetest249.py +++ b/tests/ported_static/stRandom/test_random_statetest249.py @@ -3,6 +3,11 @@ Ported from: state_tests/stRandom/randomStatetest249Filler.json + +@manually-enhanced: Do not overwrite. `gas_limit` raised on Amsterdam +to cover EIP-8037 state-gas spill. Pre-EIP-8037 keeps the original +100 000. + """ import pytest @@ -15,6 +20,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +35,14 @@ def test_random_statetest249( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest249.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -83,7 +95,7 @@ def test_random_statetest249( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000012807f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000039" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6F8F420B, ) diff --git a/tests/ported_static/stRandom/test_random_statetest254.py b/tests/ported_static/stRandom/test_random_statetest254.py index 90c7dec3340..972ba4c86b7 100644 --- a/tests/ported_static/stRandom/test_random_statetest254.py +++ b/tests/ported_static/stRandom/test_random_statetest254.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest254Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest254( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest254.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest254( data=Bytes( "7f000000000000000000000001000000000000000000000000000000000000000041417f0000000000000000000000000000000000000000000000000000000000000001447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506f059b6b83f294740688598c52195a92" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x5C13C2FF, ) diff --git a/tests/ported_static/stRandom/test_random_statetest259.py b/tests/ported_static/stRandom/test_random_statetest259.py index 014773bc66a..b291a673bfb 100644 --- a/tests/ported_static/stRandom/test_random_statetest259.py +++ b/tests/ported_static/stRandom/test_random_statetest259.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest259Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest259( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest259.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest259( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001587fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f04831adc0812f09544927407900709" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0xEF4B167, ) diff --git a/tests/ported_static/stRandom/test_random_statetest264.py b/tests/ported_static/stRandom/test_random_statetest264.py index eb3cb03af2a..1ed859df59d 100644 --- a/tests/ported_static/stRandom/test_random_statetest264.py +++ b/tests/ported_static/stRandom/test_random_statetest264.py @@ -3,6 +3,11 @@ Ported from: state_tests/stRandom/randomStatetest264Filler.json + +@manually-enhanced: Do not overwrite. `gas_limit` raised on Amsterdam +to cover EIP-8037 state-gas spill. Pre-EIP-8037 keeps the original +100 000. + """ import pytest @@ -15,6 +20,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +35,14 @@ def test_random_statetest264( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest264.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -84,7 +96,7 @@ def test_random_statetest264( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x457C78F7, ) diff --git a/tests/ported_static/stRandom/test_random_statetest267.py b/tests/ported_static/stRandom/test_random_statetest267.py index 33dd1c13b50..0179d9e62c9 100644 --- a/tests/ported_static/stRandom/test_random_statetest267.py +++ b/tests/ported_static/stRandom/test_random_statetest267.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest267Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest267( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest267.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -88,7 +98,7 @@ def test_random_statetest267( data=Bytes( "447f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5a132776d398e3b7c14686a07346f" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0xF5106AE, ) diff --git a/tests/ported_static/stRandom/test_random_statetest268.py b/tests/ported_static/stRandom/test_random_statetest268.py index 2b85d716ac0..eb8aa8ad175 100644 --- a/tests/ported_static/stRandom/test_random_statetest268.py +++ b/tests/ported_static/stRandom/test_random_statetest268.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest268Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest268( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest268.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest268( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016f7466f0a0733d863263934063409442" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2360D94A, ) diff --git a/tests/ported_static/stRandom/test_random_statetest269.py b/tests/ported_static/stRandom/test_random_statetest269.py index f93374a3109..1bd356a4c89 100644 --- a/tests/ported_static/stRandom/test_random_statetest269.py +++ b/tests/ported_static/stRandom/test_random_statetest269.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest269Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest269( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest269.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest269( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6676029968ffa27d04" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x49E002C2, ) diff --git a/tests/ported_static/stRandom/test_random_statetest27.py b/tests/ported_static/stRandom/test_random_statetest27.py index 2949eb8b640..e8a29a8e786 100644 --- a/tests/ported_static/stRandom/test_random_statetest27.py +++ b/tests/ported_static/stRandom/test_random_statetest27.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest27Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest27( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest27.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest27( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000009" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x204D3E8E, ) diff --git a/tests/ported_static/stRandom/test_random_statetest276.py b/tests/ported_static/stRandom/test_random_statetest276.py index 74f6a118e89..40c9a6e56c9 100644 --- a/tests/ported_static/stRandom/test_random_statetest276.py +++ b/tests/ported_static/stRandom/test_random_statetest276.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest276Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest276( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest276.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest276( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f4382349f7b370589141a31f39741a4f2" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3D3366FA, ) diff --git a/tests/ported_static/stRandom/test_random_statetest278.py b/tests/ported_static/stRandom/test_random_statetest278.py index 9df57c3c896..d66b5664484 100644 --- a/tests/ported_static/stRandom/test_random_statetest278.py +++ b/tests/ported_static/stRandom/test_random_statetest278.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest278Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest278( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest278.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest278( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001377f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x5E02EC7F, ) diff --git a/tests/ported_static/stRandom/test_random_statetest279.py b/tests/ported_static/stRandom/test_random_statetest279.py index 656d9f824ec..9ebcff5c884 100644 --- a/tests/ported_static/stRandom/test_random_statetest279.py +++ b/tests/ported_static/stRandom/test_random_statetest279.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest279Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest279( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest279.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -85,7 +95,7 @@ def test_random_statetest279( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000947f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x4E91B038, ) diff --git a/tests/ported_static/stRandom/test_random_statetest28.py b/tests/ported_static/stRandom/test_random_statetest28.py index 88cf916ba2e..0454b3f339a 100644 --- a/tests/ported_static/stRandom/test_random_statetest28.py +++ b/tests/ported_static/stRandom/test_random_statetest28.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest28Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest28( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest28.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest28( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f38129d68939a19a2697172926f6a673630" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x51AF41E7, ) diff --git a/tests/ported_static/stRandom/test_random_statetest280.py b/tests/ported_static/stRandom/test_random_statetest280.py index ecc071fdebc..b0d276d3d1d 100644 --- a/tests/ported_static/stRandom/test_random_statetest280.py +++ b/tests/ported_static/stRandom/test_random_statetest280.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest280Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest280( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest280.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -83,7 +93,7 @@ def test_random_statetest280( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000000143507f000000000000000000000000000000000000000000000000000000000000c350417f00000000000000000000000000000000000000000000000000000000000000006f423b3c407e7c6f16718668738d193cf2" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x303CDC5A, ) diff --git a/tests/ported_static/stRandom/test_random_statetest281.py b/tests/ported_static/stRandom/test_random_statetest281.py index 4d90ef56f9f..acb3ffcc38f 100644 --- a/tests/ported_static/stRandom/test_random_statetest281.py +++ b/tests/ported_static/stRandom/test_random_statetest281.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest281Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest281( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest281.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -83,7 +93,7 @@ def test_random_statetest281( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79457f000000000000000000000000000000000000000000000000000000000000c350417f00000000000000000000000000000000000000000000000000000000000000016f649a7a3457645670a27fa170639718a2" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x662E647C, ) diff --git a/tests/ported_static/stRandom/test_random_statetest283.py b/tests/ported_static/stRandom/test_random_statetest283.py index 71c83d9d84b..aee36b2148e 100644 --- a/tests/ported_static/stRandom/test_random_statetest283.py +++ b/tests/ported_static/stRandom/test_random_statetest283.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest283Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest283( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest283.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -91,7 +101,7 @@ def test_random_statetest283( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000139" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x5F83295F, ) diff --git a/tests/ported_static/stRandom/test_random_statetest29.py b/tests/ported_static/stRandom/test_random_statetest29.py index cf68d271a15..cdc40338649 100644 --- a/tests/ported_static/stRandom/test_random_statetest29.py +++ b/tests/ported_static/stRandom/test_random_statetest29.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest29Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest29( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest29.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest29( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff087fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x214AB1F3, ) diff --git a/tests/ported_static/stRandom/test_random_statetest290.py b/tests/ported_static/stRandom/test_random_statetest290.py index 48a23cf70a9..5c2372d1a16 100644 --- a/tests/ported_static/stRandom/test_random_statetest290.py +++ b/tests/ported_static/stRandom/test_random_statetest290.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest290Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest290( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest290.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest290( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8309" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6D5253D6, ) diff --git a/tests/ported_static/stRandom/test_random_statetest297.py b/tests/ported_static/stRandom/test_random_statetest297.py index 837dae97234..47b9b555a73 100644 --- a/tests/ported_static/stRandom/test_random_statetest297.py +++ b/tests/ported_static/stRandom/test_random_statetest297.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest297Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest297( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest297.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest297( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe426f91085661509214157d9c8a77758518" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7C61878A, ) diff --git a/tests/ported_static/stRandom/test_random_statetest298.py b/tests/ported_static/stRandom/test_random_statetest298.py index c6cd90760f7..a6e343ab2f5 100644 --- a/tests/ported_static/stRandom/test_random_statetest298.py +++ b/tests/ported_static/stRandom/test_random_statetest298.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest298Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest298( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest298.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -84,7 +94,7 @@ def test_random_statetest298( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3500a6f7c542006528b69ff3a7a3a0401613c" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7E0F660B, ) diff --git a/tests/ported_static/stRandom/test_random_statetest299.py b/tests/ported_static/stRandom/test_random_statetest299.py index 446b1807cea..1583f1bf72c 100644 --- a/tests/ported_static/stRandom/test_random_statetest299.py +++ b/tests/ported_static/stRandom/test_random_statetest299.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest299Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest299( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest299.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -94,7 +104,7 @@ def test_random_statetest299( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f540813697adf70f20906389d128bf0" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x1A47B134, ) diff --git a/tests/ported_static/stRandom/test_random_statetest3.py b/tests/ported_static/stRandom/test_random_statetest3.py index 47f8530ff87..53632e80c19 100644 --- a/tests/ported_static/stRandom/test_random_statetest3.py +++ b/tests/ported_static/stRandom/test_random_statetest3.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest3Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest3( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest3.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -79,7 +89,7 @@ def test_random_statetest3( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000000000000000000000000000000000000000c35041" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x5EAA223F, ) diff --git a/tests/ported_static/stRandom/test_random_statetest301.py b/tests/ported_static/stRandom/test_random_statetest301.py index a91f4824814..179ae4337a2 100644 --- a/tests/ported_static/stRandom/test_random_statetest301.py +++ b/tests/ported_static/stRandom/test_random_statetest301.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest301Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest301( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest301.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -92,7 +102,7 @@ def test_random_statetest301( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000003784946a737aa092f1975664518a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x1340F9CE, ) diff --git a/tests/ported_static/stRandom/test_random_statetest305.py b/tests/ported_static/stRandom/test_random_statetest305.py index c9b7854e4a0..cae2823329a 100644 --- a/tests/ported_static/stRandom/test_random_statetest305.py +++ b/tests/ported_static/stRandom/test_random_statetest305.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest305Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest305( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest305.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest305( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000006f606e048240069c409313318736200b" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0xD00D79E, ) diff --git a/tests/ported_static/stRandom/test_random_statetest310.py b/tests/ported_static/stRandom/test_random_statetest310.py index 160d7edc394..f1bf7c47488 100644 --- a/tests/ported_static/stRandom/test_random_statetest310.py +++ b/tests/ported_static/stRandom/test_random_statetest310.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest310Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest310( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest310.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -92,7 +102,7 @@ def test_random_statetest310( data=Bytes( "44587fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff59907fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1a37160b6a650645597c796e9c9795" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x1B76ED9D, ) diff --git a/tests/ported_static/stRandom/test_random_statetest311.py b/tests/ported_static/stRandom/test_random_statetest311.py index dd6b7d008f0..4b8c5b450b3 100644 --- a/tests/ported_static/stRandom/test_random_statetest311.py +++ b/tests/ported_static/stRandom/test_random_statetest311.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest311Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest311( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest311.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest311( data=Bytes( "447f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f13971264a1197d72ff18971902387b" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x5CD0515, ) diff --git a/tests/ported_static/stRandom/test_random_statetest315.py b/tests/ported_static/stRandom/test_random_statetest315.py index 27546fb1d71..aec15d52e45 100644 --- a/tests/ported_static/stRandom/test_random_statetest315.py +++ b/tests/ported_static/stRandom/test_random_statetest315.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest315Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest315( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest315.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -93,7 +103,7 @@ def test_random_statetest315( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f98516a388683755669892b8b371957" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x13D8A45E, ) diff --git a/tests/ported_static/stRandom/test_random_statetest316.py b/tests/ported_static/stRandom/test_random_statetest316.py index f12c5e05c0b..c2d8d69d8d7 100644 --- a/tests/ported_static/stRandom/test_random_statetest316.py +++ b/tests/ported_static/stRandom/test_random_statetest316.py @@ -3,6 +3,11 @@ Ported from: state_tests/stRandom/randomStatetest316Filler.json + +@manually-enhanced: Do not overwrite. `gas_limit` raised on Amsterdam +to cover EIP-8037 state-gas spill. Pre-EIP-8037 keeps the original +100 000. + """ import pytest @@ -15,6 +20,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +35,14 @@ def test_random_statetest316( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest316.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -86,7 +98,7 @@ def test_random_statetest316( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3A0D0C77, ) diff --git a/tests/ported_static/stRandom/test_random_statetest318.py b/tests/ported_static/stRandom/test_random_statetest318.py index 86e242d939a..6a493725f4d 100644 --- a/tests/ported_static/stRandom/test_random_statetest318.py +++ b/tests/ported_static/stRandom/test_random_statetest318.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest318Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest318( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest318.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest318( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350457f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506f8206a30a83887e5a3164667796308d" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x23F9C6F7, ) diff --git a/tests/ported_static/stRandom/test_random_statetest322.py b/tests/ported_static/stRandom/test_random_statetest322.py index 8c72fec0c9d..f72ad9afd42 100644 --- a/tests/ported_static/stRandom/test_random_statetest322.py +++ b/tests/ported_static/stRandom/test_random_statetest322.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest322Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest322( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest322.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest322( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000000000000000000000000000000000000000c3506f1206060508840294304101a3128f34" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x312238E4, ) diff --git a/tests/ported_static/stRandom/test_random_statetest325.py b/tests/ported_static/stRandom/test_random_statetest325.py index 694e05d7445..862b46b526c 100644 --- a/tests/ported_static/stRandom/test_random_statetest325.py +++ b/tests/ported_static/stRandom/test_random_statetest325.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest325Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest325( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest325.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -93,7 +103,7 @@ def test_random_statetest325( data=Bytes( "437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810903" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x1B449945, ) diff --git a/tests/ported_static/stRandom/test_random_statetest329.py b/tests/ported_static/stRandom/test_random_statetest329.py index 9540e24199f..c2bbd0aa10a 100644 --- a/tests/ported_static/stRandom/test_random_statetest329.py +++ b/tests/ported_static/stRandom/test_random_statetest329.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest329Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest329( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest329.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest329( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff426fa48d775458574133769c8b750207ff" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x5B5A0B6C, ) diff --git a/tests/ported_static/stRandom/test_random_statetest332.py b/tests/ported_static/stRandom/test_random_statetest332.py index 01674cf987b..93435882f34 100644 --- a/tests/ported_static/stRandom/test_random_statetest332.py +++ b/tests/ported_static/stRandom/test_random_statetest332.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest332Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest332( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest332.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest332( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f7c098e7d625a64319d9e514bf35075" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x53D5155E, ) diff --git a/tests/ported_static/stRandom/test_random_statetest333.py b/tests/ported_static/stRandom/test_random_statetest333.py index 366066bddbe..eba776ceb9e 100644 --- a/tests/ported_static/stRandom/test_random_statetest333.py +++ b/tests/ported_static/stRandom/test_random_statetest333.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest333Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest333( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest333.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest333( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f410263f305963310856c15ff5037a0" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3024B0A3, ) diff --git a/tests/ported_static/stRandom/test_random_statetest334.py b/tests/ported_static/stRandom/test_random_statetest334.py index 28fb5ace141..a92922d48b9 100644 --- a/tests/ported_static/stRandom/test_random_statetest334.py +++ b/tests/ported_static/stRandom/test_random_statetest334.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest334Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest334( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest334.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest334( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000013a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f424468208e181851308b7c7a776863a1" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x36993F17, ) diff --git a/tests/ported_static/stRandom/test_random_statetest339.py b/tests/ported_static/stRandom/test_random_statetest339.py index 3e5d4ce7e2f..f3d6c565d4a 100644 --- a/tests/ported_static/stRandom/test_random_statetest339.py +++ b/tests/ported_static/stRandom/test_random_statetest339.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest339Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest339( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest339.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest339( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f89029e850708a293905668f1a367a2" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3F78C8AA, ) diff --git a/tests/ported_static/stRandom/test_random_statetest342.py b/tests/ported_static/stRandom/test_random_statetest342.py index fe363236e3b..da98d14951f 100644 --- a/tests/ported_static/stRandom/test_random_statetest342.py +++ b/tests/ported_static/stRandom/test_random_statetest342.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest342Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest342( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest342.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest342( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000041147fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f36314297399455797b42569e8f0556" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6312A8C4, ) diff --git a/tests/ported_static/stRandom/test_random_statetest348.py b/tests/ported_static/stRandom/test_random_statetest348.py index 1d3550630cf..bfe57ee9531 100644 --- a/tests/ported_static/stRandom/test_random_statetest348.py +++ b/tests/ported_static/stRandom/test_random_statetest348.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest348Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest348( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest348.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -92,7 +102,7 @@ def test_random_statetest348( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000142186f18208119191509036365739735608a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x4F3B26DA, ) diff --git a/tests/ported_static/stRandom/test_random_statetest351.py b/tests/ported_static/stRandom/test_random_statetest351.py index c053ee32c99..7880da18abb 100644 --- a/tests/ported_static/stRandom/test_random_statetest351.py +++ b/tests/ported_static/stRandom/test_random_statetest351.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest351Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest351( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest351.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -78,7 +88,7 @@ def test_random_statetest351( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0509355534707785320175fca414" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x486E44AE, ) diff --git a/tests/ported_static/stRandom/test_random_statetest354.py b/tests/ported_static/stRandom/test_random_statetest354.py index 090023f5e95..15b13f2b299 100644 --- a/tests/ported_static/stRandom/test_random_statetest354.py +++ b/tests/ported_static/stRandom/test_random_statetest354.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest354Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest354( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest354.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -99,7 +109,7 @@ def test_random_statetest354( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350603b35641a8e739f86980a4337" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x24AAAAF6, ) diff --git a/tests/ported_static/stRandom/test_random_statetest356.py b/tests/ported_static/stRandom/test_random_statetest356.py index 67cd424d5e4..693aef48fd3 100644 --- a/tests/ported_static/stRandom/test_random_statetest356.py +++ b/tests/ported_static/stRandom/test_random_statetest356.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest356Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest356( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest356.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest356( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79827f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe04" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x4F386503, ) diff --git a/tests/ported_static/stRandom/test_random_statetest358.py b/tests/ported_static/stRandom/test_random_statetest358.py index 81a9223d227..daf1478c698 100644 --- a/tests/ported_static/stRandom/test_random_statetest358.py +++ b/tests/ported_static/stRandom/test_random_statetest358.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest358Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest358( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest358.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest358( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000c3506f679b82a092078f136b5541888c057a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x252F4B99, ) diff --git a/tests/ported_static/stRandom/test_random_statetest360.py b/tests/ported_static/stRandom/test_random_statetest360.py index f95bba5ce2d..4b13e9e687a 100644 --- a/tests/ported_static/stRandom/test_random_statetest360.py +++ b/tests/ported_static/stRandom/test_random_statetest360.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest360Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest360( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest360.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest360( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016f0441548af30803135562840563829c" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3B167C0B, ) diff --git a/tests/ported_static/stRandom/test_random_statetest361.py b/tests/ported_static/stRandom/test_random_statetest361.py index 6ec92a42cb6..23c0c82de85 100644 --- a/tests/ported_static/stRandom/test_random_statetest361.py +++ b/tests/ported_static/stRandom/test_random_statetest361.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest361Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest361( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest361.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest361( data=Bytes( "41417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff066f9e9092673a8f430b6ba11520901816" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x74BA18BD, ) diff --git a/tests/ported_static/stRandom/test_random_statetest362.py b/tests/ported_static/stRandom/test_random_statetest362.py index 55e3670038e..07b7cb05555 100644 --- a/tests/ported_static/stRandom/test_random_statetest362.py +++ b/tests/ported_static/stRandom/test_random_statetest362.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest362Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest362( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest362.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -90,7 +100,7 @@ def test_random_statetest362( data=Bytes( "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b509" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x31025CBA, ) diff --git a/tests/ported_static/stRandom/test_random_statetest363.py b/tests/ported_static/stRandom/test_random_statetest363.py index dd60d1831b1..64e32ba7846 100644 --- a/tests/ported_static/stRandom/test_random_statetest363.py +++ b/tests/ported_static/stRandom/test_random_statetest363.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest363Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest363( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest363.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -93,7 +103,7 @@ def test_random_statetest363( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350117ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f7b20937d953695f369719f9a447905" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x4C18B65E, ) diff --git a/tests/ported_static/stRandom/test_random_statetest364.py b/tests/ported_static/stRandom/test_random_statetest364.py index 9b37513e3b3..5eb7a370885 100644 --- a/tests/ported_static/stRandom/test_random_statetest364.py +++ b/tests/ported_static/stRandom/test_random_statetest364.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest364Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest364( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest364.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest364( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c350076f7332988d746694918859185920446d" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x25908FA1, ) diff --git a/tests/ported_static/stRandom/test_random_statetest365.py b/tests/ported_static/stRandom/test_random_statetest365.py index 332cd3e1ed7..eaeb4040bcf 100644 --- a/tests/ported_static/stRandom/test_random_statetest365.py +++ b/tests/ported_static/stRandom/test_random_statetest365.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest365Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest365( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest365.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -93,7 +103,7 @@ def test_random_statetest365( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff42417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000143b42078537" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x48ACB162, ) diff --git a/tests/ported_static/stRandom/test_random_statetest366.py b/tests/ported_static/stRandom/test_random_statetest366.py index 23ecb52e8e7..6846a0c5772 100644 --- a/tests/ported_static/stRandom/test_random_statetest366.py +++ b/tests/ported_static/stRandom/test_random_statetest366.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest366Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest366( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest366.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -92,7 +102,7 @@ def test_random_statetest366( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff446f516f0395f57433725580758f32f194" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7D527F3C, ) diff --git a/tests/ported_static/stRandom/test_random_statetest367.py b/tests/ported_static/stRandom/test_random_statetest367.py index c53bb65b268..d5c56cd839f 100644 --- a/tests/ported_static/stRandom/test_random_statetest367.py +++ b/tests/ported_static/stRandom/test_random_statetest367.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest367Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest367( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest367.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -94,7 +104,7 @@ def test_random_statetest367( data=Bytes( "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5447f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b51905810a6c7a5959339f3342838b" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2BC3D730, ) diff --git a/tests/ported_static/stRandom/test_random_statetest369.py b/tests/ported_static/stRandom/test_random_statetest369.py index 2959f2323de..112d60404dc 100644 --- a/tests/ported_static/stRandom/test_random_statetest369.py +++ b/tests/ported_static/stRandom/test_random_statetest369.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest369Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest369( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest369.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest369( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f0000000000000000000000010000000000000000000000000000000000000000" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x1C20856A, ) diff --git a/tests/ported_static/stRandom/test_random_statetest37.py b/tests/ported_static/stRandom/test_random_statetest37.py index f68273d3986..0762ac0083f 100644 --- a/tests/ported_static/stRandom/test_random_statetest37.py +++ b/tests/ported_static/stRandom/test_random_statetest37.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest37Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest37( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest37.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest37( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000016fa49835863514f0f29b930b97f11693" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x76C6A52D, ) diff --git a/tests/ported_static/stRandom/test_random_statetest372.py b/tests/ported_static/stRandom/test_random_statetest372.py index c837954176c..6d5dda1765b 100644 --- a/tests/ported_static/stRandom/test_random_statetest372.py +++ b/tests/ported_static/stRandom/test_random_statetest372.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest372Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest372( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest372.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -92,7 +102,7 @@ def test_random_statetest372( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000011808" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6D4BEA09, ) diff --git a/tests/ported_static/stRandom/test_random_statetest380.py b/tests/ported_static/stRandom/test_random_statetest380.py index ebd634b1dde..7d6630e53a3 100644 --- a/tests/ported_static/stRandom/test_random_statetest380.py +++ b/tests/ported_static/stRandom/test_random_statetest380.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest380Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest380( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest380.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest380( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f967737653485593c63408b39943975" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x25771D96, ) diff --git a/tests/ported_static/stRandom/test_random_statetest381.py b/tests/ported_static/stRandom/test_random_statetest381.py index 4353001ba68..a2cfc8f33af 100644 --- a/tests/ported_static/stRandom/test_random_statetest381.py +++ b/tests/ported_static/stRandom/test_random_statetest381.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest381Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest381( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest381.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest381( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff417f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f098ba088881a64904570927a861835" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2D1A0F83, ) diff --git a/tests/ported_static/stRandom/test_random_statetest382.py b/tests/ported_static/stRandom/test_random_statetest382.py index 8d0da329f94..2b564b3e7f7 100644 --- a/tests/ported_static/stRandom/test_random_statetest382.py +++ b/tests/ported_static/stRandom/test_random_statetest382.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest382Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest382( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest382.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest382( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x34AE0BF4, ) diff --git a/tests/ported_static/stRandom/test_random_statetest383.py b/tests/ported_static/stRandom/test_random_statetest383.py index d72819e4cfe..1b1dfe3d6a5 100644 --- a/tests/ported_static/stRandom/test_random_statetest383.py +++ b/tests/ported_static/stRandom/test_random_statetest383.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest383Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest383( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest383.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -78,7 +88,7 @@ def test_random_statetest383( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09150255436c75107e" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6379C077, ) diff --git a/tests/ported_static/stRandom/test_random_statetest41.py b/tests/ported_static/stRandom/test_random_statetest41.py index c7680efea44..7546db6b4f4 100644 --- a/tests/ported_static/stRandom/test_random_statetest41.py +++ b/tests/ported_static/stRandom/test_random_statetest41.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest41Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest41( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest41.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -88,7 +98,7 @@ def test_random_statetest41( data=Bytes( "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350517f0000000000000000000000010000000000000000000000000000000000000000417f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56a84a10719a1786a6510349b0282" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x4ADE804, ) diff --git a/tests/ported_static/stRandom/test_random_statetest47.py b/tests/ported_static/stRandom/test_random_statetest47.py index 1ac3bff19e9..75436ccf17b 100644 --- a/tests/ported_static/stRandom/test_random_statetest47.py +++ b/tests/ported_static/stRandom/test_random_statetest47.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest47Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest47( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest47.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest47( data=Bytes( "437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350437f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f1544898b167c6a6f6d5b953714457e" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x77A1A475, ) diff --git a/tests/ported_static/stRandom/test_random_statetest49.py b/tests/ported_static/stRandom/test_random_statetest49.py index 7a5abc4fc07..80ee0fecba0 100644 --- a/tests/ported_static/stRandom/test_random_statetest49.py +++ b/tests/ported_static/stRandom/test_random_statetest49.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest49Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest49( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest49.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -83,7 +93,7 @@ def test_random_statetest49( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000807f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7961859c" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x69D65F4B, ) diff --git a/tests/ported_static/stRandom/test_random_statetest52.py b/tests/ported_static/stRandom/test_random_statetest52.py index 72cc5f44f39..92da6f37c3a 100644 --- a/tests/ported_static/stRandom/test_random_statetest52.py +++ b/tests/ported_static/stRandom/test_random_statetest52.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest52Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest52( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest52.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest52( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe410a81437f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f59a130a10a189fc653057a185b886c" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x27CBF98C, ) diff --git a/tests/ported_static/stRandom/test_random_statetest58.py b/tests/ported_static/stRandom/test_random_statetest58.py index 3b2aa4dcf4f..7f6faa8aedf 100644 --- a/tests/ported_static/stRandom/test_random_statetest58.py +++ b/tests/ported_static/stRandom/test_random_statetest58.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest58Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest58( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest58.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -95,7 +105,7 @@ def test_random_statetest58( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe096902947d567838719e97f301" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x1F00EC9E, ) diff --git a/tests/ported_static/stRandom/test_random_statetest59.py b/tests/ported_static/stRandom/test_random_statetest59.py index f32eb8fa466..b5d3df091a1 100644 --- a/tests/ported_static/stRandom/test_random_statetest59.py +++ b/tests/ported_static/stRandom/test_random_statetest59.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest59Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest59( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest59.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -94,7 +104,7 @@ def test_random_statetest59( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0208673a06756406548b99" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2591EEF6, ) diff --git a/tests/ported_static/stRandom/test_random_statetest6.py b/tests/ported_static/stRandom/test_random_statetest6.py index 4ba51d15620..7a203fab94e 100644 --- a/tests/ported_static/stRandom/test_random_statetest6.py +++ b/tests/ported_static/stRandom/test_random_statetest6.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest6Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest6( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest6.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest6( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e794143416f1732797105f237768fe506871ac853" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3227D64E, ) diff --git a/tests/ported_static/stRandom/test_random_statetest60.py b/tests/ported_static/stRandom/test_random_statetest60.py index 0ed10d9c3fb..55d243e4ef6 100644 --- a/tests/ported_static/stRandom/test_random_statetest60.py +++ b/tests/ported_static/stRandom/test_random_statetest60.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest60Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest60( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest60.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest60( data=Bytes( "427f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f969001091aa15b8b9b75459d015a04" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x54DE1EAF, ) diff --git a/tests/ported_static/stRandom/test_random_statetest62.py b/tests/ported_static/stRandom/test_random_statetest62.py index 47a9318ddbb..46dae90ae4a 100644 --- a/tests/ported_static/stRandom/test_random_statetest62.py +++ b/tests/ported_static/stRandom/test_random_statetest62.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest62Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest62( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest62.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest62( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000016f7268713013964a96ac575804332501" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x493FBF98, ) diff --git a/tests/ported_static/stRandom/test_random_statetest63.py b/tests/ported_static/stRandom/test_random_statetest63.py index 9e47443f292..b8752371d61 100644 --- a/tests/ported_static/stRandom/test_random_statetest63.py +++ b/tests/ported_static/stRandom/test_random_statetest63.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest63Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest63( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest63.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest63( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f977f157e088003767a86928e825296" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x31B19D43, ) diff --git a/tests/ported_static/stRandom/test_random_statetest66.py b/tests/ported_static/stRandom/test_random_statetest66.py index 3199ecf2932..b1ac9c6c177 100644 --- a/tests/ported_static/stRandom/test_random_statetest66.py +++ b/tests/ported_static/stRandom/test_random_statetest66.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest66Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest66( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest66.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -89,7 +99,7 @@ def test_random_statetest66( data=Bytes( "457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f0000000000000000000000010000000000000000000000000000000000000000" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2F5660CE, ) diff --git a/tests/ported_static/stRandom/test_random_statetest67.py b/tests/ported_static/stRandom/test_random_statetest67.py index 5417fba773b..0ea82c5570b 100644 --- a/tests/ported_static/stRandom/test_random_statetest67.py +++ b/tests/ported_static/stRandom/test_random_statetest67.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest67Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest67( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest67.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest67( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f699776659a06a27607a2166d537331" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7DF32855, ) diff --git a/tests/ported_static/stRandom/test_random_statetest69.py b/tests/ported_static/stRandom/test_random_statetest69.py index 0cc903405cf..58b0b1b4d2f 100644 --- a/tests/ported_static/stRandom/test_random_statetest69.py +++ b/tests/ported_static/stRandom/test_random_statetest69.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest69Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest69( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest69.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest69( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe43596f15a0770a7676611a6595057b768b64" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2F6C315B, ) diff --git a/tests/ported_static/stRandom/test_random_statetest73.py b/tests/ported_static/stRandom/test_random_statetest73.py index 60058b46e65..cbe0f4f7fdd 100644 --- a/tests/ported_static/stRandom/test_random_statetest73.py +++ b/tests/ported_static/stRandom/test_random_statetest73.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest73Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest73( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest73.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -87,7 +97,7 @@ def test_random_statetest73( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5b573198d729b711671056e0a0555346138" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x505D427, ) diff --git a/tests/ported_static/stRandom/test_random_statetest74.py b/tests/ported_static/stRandom/test_random_statetest74.py index 2dac6d92ace..9444931dbdc 100644 --- a/tests/ported_static/stRandom/test_random_statetest74.py +++ b/tests/ported_static/stRandom/test_random_statetest74.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest74Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest74( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest74.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest74( data=Bytes( "427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3a7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000006f141097788a7b5a72139c07076f1842" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x48E72790, ) diff --git a/tests/ported_static/stRandom/test_random_statetest75.py b/tests/ported_static/stRandom/test_random_statetest75.py index e93b93536fa..8001c8457a5 100644 --- a/tests/ported_static/stRandom/test_random_statetest75.py +++ b/tests/ported_static/stRandom/test_random_statetest75.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest75Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest75( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest75.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -92,7 +102,7 @@ def test_random_statetest75( data=Bytes( "457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000006f5893504553386c7d15400177928776" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0xABD0738, ) diff --git a/tests/ported_static/stRandom/test_random_statetest77.py b/tests/ported_static/stRandom/test_random_statetest77.py index 665a478a7c7..0b8eb36b733 100644 --- a/tests/ported_static/stRandom/test_random_statetest77.py +++ b/tests/ported_static/stRandom/test_random_statetest77.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest77Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest77( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest77.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -85,7 +95,7 @@ def test_random_statetest77( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000141937f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f79a06df1a08d05373216d372190341" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x4A760CDB, ) diff --git a/tests/ported_static/stRandom/test_random_statetest80.py b/tests/ported_static/stRandom/test_random_statetest80.py index 545333ae4f9..1a4602a5d18 100644 --- a/tests/ported_static/stRandom/test_random_statetest80.py +++ b/tests/ported_static/stRandom/test_random_statetest80.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest80Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest80( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest80.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -89,7 +99,7 @@ def test_random_statetest80( data=Bytes( "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000010000000000000000000000000000000000000000117fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5681069127b3b9c877d6f6169ff36" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x1ED9A5B6, ) diff --git a/tests/ported_static/stRandom/test_random_statetest81.py b/tests/ported_static/stRandom/test_random_statetest81.py index 44fa1db4687..7f18d30496c 100644 --- a/tests/ported_static/stRandom/test_random_statetest81.py +++ b/tests/ported_static/stRandom/test_random_statetest81.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest81Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest81( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest81.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest81( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff436f616c327e0435743c515b078453a03c" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x358AB2E1, ) diff --git a/tests/ported_static/stRandom/test_random_statetest83.py b/tests/ported_static/stRandom/test_random_statetest83.py index e6c84c8d352..045fc17a702 100644 --- a/tests/ported_static/stRandom/test_random_statetest83.py +++ b/tests/ported_static/stRandom/test_random_statetest83.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest83Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest83( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest83.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest83( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000307ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6fa1109af20740728e72150a7a9c0959" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3C81798C, ) diff --git a/tests/ported_static/stRandom/test_random_statetest85.py b/tests/ported_static/stRandom/test_random_statetest85.py index 662841c6234..d92db0d8f99 100644 --- a/tests/ported_static/stRandom/test_random_statetest85.py +++ b/tests/ported_static/stRandom/test_random_statetest85.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest85Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest85( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest85.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -73,7 +83,7 @@ def test_random_statetest85( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350f25b557e348ff374819d123109539b" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3B46EEB1, ) diff --git a/tests/ported_static/stRandom/test_random_statetest87.py b/tests/ported_static/stRandom/test_random_statetest87.py index 2322f6f2429..18c8d7e6a0b 100644 --- a/tests/ported_static/stRandom/test_random_statetest87.py +++ b/tests/ported_static/stRandom/test_random_statetest87.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest87Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest87( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest87.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest87( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000005b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f446e638e7e16736c030393727d748174" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7B1E5DC9, ) diff --git a/tests/ported_static/stRandom/test_random_statetest88.py b/tests/ported_static/stRandom/test_random_statetest88.py index 8ef6e69cd0b..d9bb7b3c472 100644 --- a/tests/ported_static/stRandom/test_random_statetest88.py +++ b/tests/ported_static/stRandom/test_random_statetest88.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest88Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest88( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest88.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest88( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e794343537f000000000000000000000000000000000000000000000000000000000000c350117fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000016f34f06a7014541167033909103620f3" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3E996CB5, ) diff --git a/tests/ported_static/stRandom/test_random_statetest89.py b/tests/ported_static/stRandom/test_random_statetest89.py index 37fd4dcec7f..84c8b823240 100644 --- a/tests/ported_static/stRandom/test_random_statetest89.py +++ b/tests/ported_static/stRandom/test_random_statetest89.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest89Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest89( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest89.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -83,7 +93,7 @@ def test_random_statetest89( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f05648ce0ad106b7a6f3483379e62876b" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x41032F3B, ) diff --git a/tests/ported_static/stRandom/test_random_statetest9.py b/tests/ported_static/stRandom/test_random_statetest9.py index ce60f752005..fc4d799e62e 100644 --- a/tests/ported_static/stRandom/test_random_statetest9.py +++ b/tests/ported_static/stRandom/test_random_statetest9.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest9Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest9( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest9.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest9( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f757fb845405bf1ff959ba03a9c336b" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0xCEFB419, ) diff --git a/tests/ported_static/stRandom/test_random_statetest90.py b/tests/ported_static/stRandom/test_random_statetest90.py index 6b6bbcc761d..d13636db170 100644 --- a/tests/ported_static/stRandom/test_random_statetest90.py +++ b/tests/ported_static/stRandom/test_random_statetest90.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest90Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest90( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest90.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -85,7 +95,7 @@ def test_random_statetest90( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff45157f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000016f116b4177f25178d7048212877e9568" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0xA10954E, ) diff --git a/tests/ported_static/stRandom/test_random_statetest92.py b/tests/ported_static/stRandom/test_random_statetest92.py index e5e61e649e7..2307d7542f7 100644 --- a/tests/ported_static/stRandom/test_random_statetest92.py +++ b/tests/ported_static/stRandom/test_random_statetest92.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest92Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest92( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest92.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest92( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f59640c655956799087168f0658a11a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x1C23D3BC, ) diff --git a/tests/ported_static/stRandom/test_random_statetest95.py b/tests/ported_static/stRandom/test_random_statetest95.py index 27f057047a7..0ad602c99f9 100644 --- a/tests/ported_static/stRandom/test_random_statetest95.py +++ b/tests/ported_static/stRandom/test_random_statetest95.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest95Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest95( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest95.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest95( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff14447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7E83FA74, ) diff --git a/tests/ported_static/stRandom/test_random_statetest96.py b/tests/ported_static/stRandom/test_random_statetest96.py index 743ce8582f7..779a04aad03 100644 --- a/tests/ported_static/stRandom/test_random_statetest96.py +++ b/tests/ported_static/stRandom/test_random_statetest96.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom/randomStatetest96Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest96( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest96.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest96( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006f183b68a09b08953085a854a39d9212" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x4A4D8FC4, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest.py b/tests/ported_static/stRandom2/test_random_statetest.py index fc15002ef36..27df3124391 100644 --- a/tests/ported_static/stRandom2/test_random_statetest.py +++ b/tests/ported_static/stRandom2/test_random_statetest.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetestFiller.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f29199c9aa4054170f1a15a55056f96" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0xF08F864, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest384.py b/tests/ported_static/stRandom2/test_random_statetest384.py index 7cb1265c151..b7ff2acd9a5 100644 --- a/tests/ported_static/stRandom2/test_random_statetest384.py +++ b/tests/ported_static/stRandom2/test_random_statetest384.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest384Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest384( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest384.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest384( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f16133502727c0a7f679b456df0935763" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7B2BD74C, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest385.py b/tests/ported_static/stRandom2/test_random_statetest385.py index 8a7fb5cc5f8..fbf8c5b914c 100644 --- a/tests/ported_static/stRandom2/test_random_statetest385.py +++ b/tests/ported_static/stRandom2/test_random_statetest385.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest385Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest385( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest385.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -84,7 +94,7 @@ def test_random_statetest385( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79547f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f785188182063156955631a7a85093a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2DCC90D2, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest386.py b/tests/ported_static/stRandom2/test_random_statetest386.py index 2606d2d324c..96cfc99e246 100644 --- a/tests/ported_static/stRandom2/test_random_statetest386.py +++ b/tests/ported_static/stRandom2/test_random_statetest386.py @@ -3,6 +3,11 @@ Ported from: state_tests/stRandom2/randomStatetest386Filler.json + +@manually-enhanced: Do not overwrite. `gas_limit` raised on Amsterdam +to cover EIP-8037 state-gas spill. Pre-EIP-8037 keeps the original +100 000. + """ import pytest @@ -15,6 +20,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +35,14 @@ def test_random_statetest386( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest386.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -91,7 +103,7 @@ def test_random_statetest386( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff047f000000000000000000000000000000000000000000000000000000000000000105133641010b8111" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x19D7AC44, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest388.py b/tests/ported_static/stRandom2/test_random_statetest388.py index 593cdd471a8..e799d490153 100644 --- a/tests/ported_static/stRandom2/test_random_statetest388.py +++ b/tests/ported_static/stRandom2/test_random_statetest388.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest388Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest388( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest388.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -88,7 +98,7 @@ def test_random_statetest388( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5765b8f743b9979a0905b6a189165" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x460B9F39, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest389.py b/tests/ported_static/stRandom2/test_random_statetest389.py index 4caf54e250c..8cfacc2758c 100644 --- a/tests/ported_static/stRandom2/test_random_statetest389.py +++ b/tests/ported_static/stRandom2/test_random_statetest389.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest389Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest389( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest389.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -89,7 +99,7 @@ def test_random_statetest389( data=Bytes( "457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3503a863854581237" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x5BF15D9B, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest395.py b/tests/ported_static/stRandom2/test_random_statetest395.py index 2674e241753..d3d5c53b250 100644 --- a/tests/ported_static/stRandom2/test_random_statetest395.py +++ b/tests/ported_static/stRandom2/test_random_statetest395.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest395Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest395( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest395.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest395( data=Bytes( "447f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f823140710bf13990e4500136726d8b" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x5A9C61EF, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest398.py b/tests/ported_static/stRandom2/test_random_statetest398.py index ba5da56b4af..fbe759a2324 100644 --- a/tests/ported_static/stRandom2/test_random_statetest398.py +++ b/tests/ported_static/stRandom2/test_random_statetest398.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest398Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest398( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest398.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -85,7 +95,7 @@ def test_random_statetest398( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f3781413b695a69079d7f5105829207" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x69A26DE, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest399.py b/tests/ported_static/stRandom2/test_random_statetest399.py index aa85cc89776..e8ba5a4ee29 100644 --- a/tests/ported_static/stRandom2/test_random_statetest399.py +++ b/tests/ported_static/stRandom2/test_random_statetest399.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest399Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest399( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest399.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -92,7 +102,7 @@ def test_random_statetest399( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe4544437f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f98324016076d428a9898129b16849a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2099AF7A, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest402.py b/tests/ported_static/stRandom2/test_random_statetest402.py index c5cbcdec4b8..528f4373389 100644 --- a/tests/ported_static/stRandom2/test_random_statetest402.py +++ b/tests/ported_static/stRandom2/test_random_statetest402.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest402Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest402( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest402.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest402( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f62138c87028162ea32a2db7e301004" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x37EBC742, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest405.py b/tests/ported_static/stRandom2/test_random_statetest405.py index da2083b37eb..f3592725b1a 100644 --- a/tests/ported_static/stRandom2/test_random_statetest405.py +++ b/tests/ported_static/stRandom2/test_random_statetest405.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest405Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest405( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest405.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -92,7 +102,7 @@ def test_random_statetest405( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff44457f0000000000000000000000010000000000000000000000000000000000000000037ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f318d0707977199361171756f6d458e" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x10596FAF, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest407.py b/tests/ported_static/stRandom2/test_random_statetest407.py index e4f30ea7e05..b113779f4af 100644 --- a/tests/ported_static/stRandom2/test_random_statetest407.py +++ b/tests/ported_static/stRandom2/test_random_statetest407.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest407Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest407( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest407.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest407( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f6d71656f054471181163037902615b" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x313547F8, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest408.py b/tests/ported_static/stRandom2/test_random_statetest408.py index 46b8e9aec36..7551ed6d5d4 100644 --- a/tests/ported_static/stRandom2/test_random_statetest408.py +++ b/tests/ported_static/stRandom2/test_random_statetest408.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest408Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest408( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest408.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -92,7 +102,7 @@ def test_random_statetest408( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f80656e8e6478946a323482135a8bf7" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x63AD417F, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest411.py b/tests/ported_static/stRandom2/test_random_statetest411.py index f164e70b57e..179bb190c71 100644 --- a/tests/ported_static/stRandom2/test_random_statetest411.py +++ b/tests/ported_static/stRandom2/test_random_statetest411.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest411Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest411( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest411.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest411( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f44a17892738b6895619d7a93507d649d" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7E5B1276, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest412.py b/tests/ported_static/stRandom2/test_random_statetest412.py index 4460e65b342..7460990cfe2 100644 --- a/tests/ported_static/stRandom2/test_random_statetest412.py +++ b/tests/ported_static/stRandom2/test_random_statetest412.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest412Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest412( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest412.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest412( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6fa46ef06a5a858b9742198a37e1153c" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x75CF6AD, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest413.py b/tests/ported_static/stRandom2/test_random_statetest413.py index 24739692924..ddf970571ae 100644 --- a/tests/ported_static/stRandom2/test_random_statetest413.py +++ b/tests/ported_static/stRandom2/test_random_statetest413.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest413Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest413( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest413.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest413( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe037f00000000000000000000000000000000000000000000000000000000000000016f086e2055149345ad1a018b06370814" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x47E29C11, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest416.py b/tests/ported_static/stRandom2/test_random_statetest416.py index 7e3cda3a583..f9b9ba9332b 100644 --- a/tests/ported_static/stRandom2/test_random_statetest416.py +++ b/tests/ported_static/stRandom2/test_random_statetest416.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest416Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest416( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest416.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -80,7 +90,7 @@ def test_random_statetest416( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7943" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x4F622410, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest419.py b/tests/ported_static/stRandom2/test_random_statetest419.py index 865f8309dc6..8af9b0c54fc 100644 --- a/tests/ported_static/stRandom2/test_random_statetest419.py +++ b/tests/ported_static/stRandom2/test_random_statetest419.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest419Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest419( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest419.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -94,7 +104,7 @@ def test_random_statetest419( data=Bytes( "437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f73095b7ee211595a6b80a311900a78" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6A4CEBB4, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest421.py b/tests/ported_static/stRandom2/test_random_statetest421.py index 80e44c023a5..f784c829ac2 100644 --- a/tests/ported_static/stRandom2/test_random_statetest421.py +++ b/tests/ported_static/stRandom2/test_random_statetest421.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest421Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest421( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest421.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest421( data=Bytes( "437f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f38454051968ff184a47d500912319717" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x52D1555F, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest424.py b/tests/ported_static/stRandom2/test_random_statetest424.py index 8533ae0ab88..5a4b1706b07 100644 --- a/tests/ported_static/stRandom2/test_random_statetest424.py +++ b/tests/ported_static/stRandom2/test_random_statetest424.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest424Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest424( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest424.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest424( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000436f18116552626186825096665471140a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x4BCD2F4F, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest425.py b/tests/ported_static/stRandom2/test_random_statetest425.py index 6ae68d0e094..8f26fba2f5d 100644 --- a/tests/ported_static/stRandom2/test_random_statetest425.py +++ b/tests/ported_static/stRandom2/test_random_statetest425.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest425Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest425( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest425.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -83,7 +93,7 @@ def test_random_statetest425( data=Bytes( "7f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f885707818b889a89975552f0128442" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x22371A75, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest426.py b/tests/ported_static/stRandom2/test_random_statetest426.py index 60fc1812f7c..7977467a6a5 100644 --- a/tests/ported_static/stRandom2/test_random_statetest426.py +++ b/tests/ported_static/stRandom2/test_random_statetest426.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest426Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest426( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest426.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest426( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f456d1687795a95938b0139976099f0" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x613B33CA, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest429.py b/tests/ported_static/stRandom2/test_random_statetest429.py index 003fa2adae4..60a9e50233b 100644 --- a/tests/ported_static/stRandom2/test_random_statetest429.py +++ b/tests/ported_static/stRandom2/test_random_statetest429.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest429Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest429( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest429.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest429( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f98121f388786729087773476331366" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x5430ADAF, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest430.py b/tests/ported_static/stRandom2/test_random_statetest430.py index d6bf1d54bf5..f99d9695f69 100644 --- a/tests/ported_static/stRandom2/test_random_statetest430.py +++ b/tests/ported_static/stRandom2/test_random_statetest430.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest430Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest430( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest430.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest430( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000006f7d41a29934035b748e96a3135b6964" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6BF5E61F, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest436.py b/tests/ported_static/stRandom2/test_random_statetest436.py index 45aa11ecc76..586314ec15a 100644 --- a/tests/ported_static/stRandom2/test_random_statetest436.py +++ b/tests/ported_static/stRandom2/test_random_statetest436.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest436Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest436( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest436.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest436( data=Bytes( "367f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79456f8108067a345b7a76a20a835a0a0b6c10" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x57454F1E, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest438.py b/tests/ported_static/stRandom2/test_random_statetest438.py index 3bf33a854c6..0ce4a0ac366 100644 --- a/tests/ported_static/stRandom2/test_random_statetest438.py +++ b/tests/ported_static/stRandom2/test_random_statetest438.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest438Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest438( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest438.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -85,7 +95,7 @@ def test_random_statetest438( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3FDE3BBC, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest439.py b/tests/ported_static/stRandom2/test_random_statetest439.py index 7e908421f6a..69e9b00d114 100644 --- a/tests/ported_static/stRandom2/test_random_statetest439.py +++ b/tests/ported_static/stRandom2/test_random_statetest439.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest439Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest439( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest439.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest439( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f5b1609653438813340097c53a49316" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x17BA0353, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest440.py b/tests/ported_static/stRandom2/test_random_statetest440.py index 4d0fe4865d3..ba3114d0f37 100644 --- a/tests/ported_static/stRandom2/test_random_statetest440.py +++ b/tests/ported_static/stRandom2/test_random_statetest440.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest440Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest440( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest440.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -84,7 +94,7 @@ def test_random_statetest440( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7945457f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff416f01513a9b8216816f74f3676e9ea261" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x4A3FD736, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest446.py b/tests/ported_static/stRandom2/test_random_statetest446.py index fc03c22cd59..fdcddb6bd89 100644 --- a/tests/ported_static/stRandom2/test_random_statetest446.py +++ b/tests/ported_static/stRandom2/test_random_statetest446.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest446Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest446( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest446.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest446( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x872ECB9, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest447.py b/tests/ported_static/stRandom2/test_random_statetest447.py index abd116f7624..5d05d1aeecb 100644 --- a/tests/ported_static/stRandom2/test_random_statetest447.py +++ b/tests/ported_static/stRandom2/test_random_statetest447.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest447Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest447( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest447.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -93,7 +103,7 @@ def test_random_statetest447( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff08" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x1569EBA8, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest450.py b/tests/ported_static/stRandom2/test_random_statetest450.py index 0648fed9ea5..50d97a3609d 100644 --- a/tests/ported_static/stRandom2/test_random_statetest450.py +++ b/tests/ported_static/stRandom2/test_random_statetest450.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest450Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest450( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest450.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A764000000) @@ -87,7 +97,7 @@ def test_random_statetest450( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000033a80" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x50F09196, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest451.py b/tests/ported_static/stRandom2/test_random_statetest451.py index 45c4615db56..4b29183b8e3 100644 --- a/tests/ported_static/stRandom2/test_random_statetest451.py +++ b/tests/ported_static/stRandom2/test_random_statetest451.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest451Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest451( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest451.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest451( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000006fed05989a0659453076573a87041174" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x306CA21A, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest452.py b/tests/ported_static/stRandom2/test_random_statetest452.py index 4076728cbe8..bab4ce182c0 100644 --- a/tests/ported_static/stRandom2/test_random_statetest452.py +++ b/tests/ported_static/stRandom2/test_random_statetest452.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest452Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest452( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest452.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest452( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f0a3289746806163630047dff983105" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x58F77982, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest455.py b/tests/ported_static/stRandom2/test_random_statetest455.py index 6e095d56e5c..e6cf5829f17 100644 --- a/tests/ported_static/stRandom2/test_random_statetest455.py +++ b/tests/ported_static/stRandom2/test_random_statetest455.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest455Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest455( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest455.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest455( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f858b1411f218693ca2245b918274f3" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2BF8F04F, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest457.py b/tests/ported_static/stRandom2/test_random_statetest457.py index 949bc524bcc..ca20ff7a1c8 100644 --- a/tests/ported_static/stRandom2/test_random_statetest457.py +++ b/tests/ported_static/stRandom2/test_random_statetest457.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest457Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest457( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest457.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest457( data=Bytes( "44417f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f949fa28af308a37a136c626218927d" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x12DE4990, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest460.py b/tests/ported_static/stRandom2/test_random_statetest460.py index 93752b303c2..6c2c1f0b13a 100644 --- a/tests/ported_static/stRandom2/test_random_statetest460.py +++ b/tests/ported_static/stRandom2/test_random_statetest460.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest460Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest460( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest460.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -91,7 +101,7 @@ def test_random_statetest460( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000003a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350046f16a23c6c90739ba201697b4315778a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x5A8388BF, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest461.py b/tests/ported_static/stRandom2/test_random_statetest461.py index 583ec8a4039..08dce9529e4 100644 --- a/tests/ported_static/stRandom2/test_random_statetest461.py +++ b/tests/ported_static/stRandom2/test_random_statetest461.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest461Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest461( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest461.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -82,7 +92,7 @@ def test_random_statetest461( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c350517f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff42515259" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x20B19906, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest462.py b/tests/ported_static/stRandom2/test_random_statetest462.py index 57654d3cec9..7160533bddd 100644 --- a/tests/ported_static/stRandom2/test_random_statetest462.py +++ b/tests/ported_static/stRandom2/test_random_statetest462.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest462Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest462( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest462.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -83,7 +93,7 @@ def test_random_statetest462( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000006f8e0186019d029d1354681482826f37" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x564E62DA, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest464.py b/tests/ported_static/stRandom2/test_random_statetest464.py index be263c61ed4..5ef019e574a 100644 --- a/tests/ported_static/stRandom2/test_random_statetest464.py +++ b/tests/ported_static/stRandom2/test_random_statetest464.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest464Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest464( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest464.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest464( data=Bytes( "447f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8209" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2491B9, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest465.py b/tests/ported_static/stRandom2/test_random_statetest465.py index f9750d90ed1..616396458de 100644 --- a/tests/ported_static/stRandom2/test_random_statetest465.py +++ b/tests/ported_static/stRandom2/test_random_statetest465.py @@ -3,6 +3,11 @@ Ported from: state_tests/stRandom2/randomStatetest465Filler.json + +@manually-enhanced: Do not overwrite. `gas_limit` raised on Amsterdam +to cover EIP-8037 state-gas spill. Pre-EIP-8037 keeps the original +100 000. + """ import pytest @@ -15,6 +20,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +35,14 @@ def test_random_statetest465( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest465.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -82,7 +94,7 @@ def test_random_statetest465( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x5DE12C27, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest470.py b/tests/ported_static/stRandom2/test_random_statetest470.py index 8cdff7a55fa..f0dfe17c0c7 100644 --- a/tests/ported_static/stRandom2/test_random_statetest470.py +++ b/tests/ported_static/stRandom2/test_random_statetest470.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest470Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest470( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest470.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -85,7 +95,7 @@ def test_random_statetest470( data=Bytes( "457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001357f00000000000000000000000000000000000000000000000000000000000000000b" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x67C37947, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest471.py b/tests/ported_static/stRandom2/test_random_statetest471.py index 99555b77e68..abd2d844583 100644 --- a/tests/ported_static/stRandom2/test_random_statetest471.py +++ b/tests/ported_static/stRandom2/test_random_statetest471.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest471Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest471( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest471.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -78,7 +88,7 @@ def test_random_statetest471( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09650618701355040655183a51377d82" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x63180FB7, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest473.py b/tests/ported_static/stRandom2/test_random_statetest473.py index 87179b72e4d..a6192bdd920 100644 --- a/tests/ported_static/stRandom2/test_random_statetest473.py +++ b/tests/ported_static/stRandom2/test_random_statetest473.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest473Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest473( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest473.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -90,7 +100,7 @@ def test_random_statetest473( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff317f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5910209" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x4467CA41, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest474.py b/tests/ported_static/stRandom2/test_random_statetest474.py index 1adc62e955b..fbbeb0f9f06 100644 --- a/tests/ported_static/stRandom2/test_random_statetest474.py +++ b/tests/ported_static/stRandom2/test_random_statetest474.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest474Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest474( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest474.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest474( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe027f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f7d6f6b1051778ea1670387810b5805" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7B1ABEED, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest475.py b/tests/ported_static/stRandom2/test_random_statetest475.py index 797538b3d68..65aa0f5f8d2 100644 --- a/tests/ported_static/stRandom2/test_random_statetest475.py +++ b/tests/ported_static/stRandom2/test_random_statetest475.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest475Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest475( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest475.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -84,7 +94,7 @@ def test_random_statetest475( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x19883C24, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest477.py b/tests/ported_static/stRandom2/test_random_statetest477.py index 4fcd0bec47a..868fa22f1de 100644 --- a/tests/ported_static/stRandom2/test_random_statetest477.py +++ b/tests/ported_static/stRandom2/test_random_statetest477.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest477Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest477( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest477.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest477( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f9084a3758d3456763aa4f09c8b735b" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0xA9AAD5, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest480.py b/tests/ported_static/stRandom2/test_random_statetest480.py index f859c61e880..63098954ae9 100644 --- a/tests/ported_static/stRandom2/test_random_statetest480.py +++ b/tests/ported_static/stRandom2/test_random_statetest480.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest480Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest480( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest480.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest480( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff037f0000000000000000000000000000000000000000000000000000000000000000427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f5af3a474ff64f3a37d51f36a6a607f" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2C6942FB, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest482.py b/tests/ported_static/stRandom2/test_random_statetest482.py index 15ecc4effa2..2c6553c50be 100644 --- a/tests/ported_static/stRandom2/test_random_statetest482.py +++ b/tests/ported_static/stRandom2/test_random_statetest482.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest482Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest482( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest482.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -92,7 +102,7 @@ def test_random_statetest482( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f027c9d313d9b09376505927c8e7156" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x636F84BF, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest483.py b/tests/ported_static/stRandom2/test_random_statetest483.py index f9ad81059ae..2a810280520 100644 --- a/tests/ported_static/stRandom2/test_random_statetest483.py +++ b/tests/ported_static/stRandom2/test_random_statetest483.py @@ -3,6 +3,11 @@ Ported from: state_tests/stRandom2/randomStatetest483Filler.json + +@manually-enhanced: Do not overwrite. `gas_limit` raised on Amsterdam +to cover EIP-8037 state-gas spill. Pre-EIP-8037 keeps the original +100 000. + """ import pytest @@ -15,6 +20,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +35,14 @@ def test_random_statetest483( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest483.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -81,7 +93,7 @@ def test_random_statetest483( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8409" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7EEDCE16, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest488.py b/tests/ported_static/stRandom2/test_random_statetest488.py index 545bbf0c9d3..4037e572732 100644 --- a/tests/ported_static/stRandom2/test_random_statetest488.py +++ b/tests/ported_static/stRandom2/test_random_statetest488.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest488Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest488( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest488.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest488( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79427f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f3250648093577f6364a218f0907e7d" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x53844097, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest489.py b/tests/ported_static/stRandom2/test_random_statetest489.py index ae0a7ccdecd..998c3c5301e 100644 --- a/tests/ported_static/stRandom2/test_random_statetest489.py +++ b/tests/ported_static/stRandom2/test_random_statetest489.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest489Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest489( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest489.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -85,7 +95,7 @@ def test_random_statetest489( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000456f2b8e846b91987417705a126e770764" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6EA1DC52, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest491.py b/tests/ported_static/stRandom2/test_random_statetest491.py index ddba5662245..5bdc6ad3a55 100644 --- a/tests/ported_static/stRandom2/test_random_statetest491.py +++ b/tests/ported_static/stRandom2/test_random_statetest491.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest491Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest491( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest491.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -91,7 +101,7 @@ def test_random_statetest491( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000006fa0f670645a778c71127d3b5598308b17" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6BA27C22, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest497.py b/tests/ported_static/stRandom2/test_random_statetest497.py index 33a8f095408..550bf2442fa 100644 --- a/tests/ported_static/stRandom2/test_random_statetest497.py +++ b/tests/ported_static/stRandom2/test_random_statetest497.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest497Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest497( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest497.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -83,7 +93,7 @@ def test_random_statetest497( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0904" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x44240571, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest500.py b/tests/ported_static/stRandom2/test_random_statetest500.py index 845a8be8734..f39cc52497e 100644 --- a/tests/ported_static/stRandom2/test_random_statetest500.py +++ b/tests/ported_static/stRandom2/test_random_statetest500.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest500Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest500( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest500.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest500( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f87196584968a97046c679199311482" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x20D454F, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest502.py b/tests/ported_static/stRandom2/test_random_statetest502.py index a2a818243e6..e22b5a3ee78 100644 --- a/tests/ported_static/stRandom2/test_random_statetest502.py +++ b/tests/ported_static/stRandom2/test_random_statetest502.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest502Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest502( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest502.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -88,7 +98,7 @@ def test_random_statetest502( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c350807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b59c66369a85a46da1821861586378" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x14960C58, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest503.py b/tests/ported_static/stRandom2/test_random_statetest503.py index 6699cb78fa0..3925ac7107b 100644 --- a/tests/ported_static/stRandom2/test_random_statetest503.py +++ b/tests/ported_static/stRandom2/test_random_statetest503.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest503Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest503( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest503.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest503( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f0886a83c66553c9889528d8f1294ff" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7B7801AA, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest505.py b/tests/ported_static/stRandom2/test_random_statetest505.py index f5aad753ced..8d1dc12357e 100644 --- a/tests/ported_static/stRandom2/test_random_statetest505.py +++ b/tests/ported_static/stRandom2/test_random_statetest505.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest505Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest505( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest505.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest505( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f44a06f550371317376738c53998437" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x4013B563, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest506.py b/tests/ported_static/stRandom2/test_random_statetest506.py index a8253ac72f3..a574ead20f1 100644 --- a/tests/ported_static/stRandom2/test_random_statetest506.py +++ b/tests/ported_static/stRandom2/test_random_statetest506.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest506Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest506( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest506.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest506( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000000042377f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006ba218f370862059149e3cff20" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3879DAC6, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest511.py b/tests/ported_static/stRandom2/test_random_statetest511.py index 71fca7598a5..6bee58df4be 100644 --- a/tests/ported_static/stRandom2/test_random_statetest511.py +++ b/tests/ported_static/stRandom2/test_random_statetest511.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest511Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest511( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest511.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest511( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff416f6a52027f41f267453843630a66444145" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x1B89A723, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest512.py b/tests/ported_static/stRandom2/test_random_statetest512.py index efdae8e5143..f161e8e69c1 100644 --- a/tests/ported_static/stRandom2/test_random_statetest512.py +++ b/tests/ported_static/stRandom2/test_random_statetest512.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest512Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest512( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest512.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest512( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b5bff405670977499515002634492" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x33F0AE08, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest514.py b/tests/ported_static/stRandom2/test_random_statetest514.py index f5ba39edb13..6caf5d66571 100644 --- a/tests/ported_static/stRandom2/test_random_statetest514.py +++ b/tests/ported_static/stRandom2/test_random_statetest514.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest514Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest514( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest514.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest514( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44447f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506c8ea356796d65546d3883768f" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x105D80AD, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest516.py b/tests/ported_static/stRandom2/test_random_statetest516.py index 296ea22225f..243141c25dd 100644 --- a/tests/ported_static/stRandom2/test_random_statetest516.py +++ b/tests/ported_static/stRandom2/test_random_statetest516.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest516Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest516( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest516.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -95,7 +105,7 @@ def test_random_statetest516( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6a32787358019b391868619409" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2C787EA, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest518.py b/tests/ported_static/stRandom2/test_random_statetest518.py index 7894e33d03e..0ff6bc1bcef 100644 --- a/tests/ported_static/stRandom2/test_random_statetest518.py +++ b/tests/ported_static/stRandom2/test_random_statetest518.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest518Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest518( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest518.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest518( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f3c589f416d947a5134f268515b6c92" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x415CB1C9, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest519.py b/tests/ported_static/stRandom2/test_random_statetest519.py index 5fd14f37be9..dd414e2d50d 100644 --- a/tests/ported_static/stRandom2/test_random_statetest519.py +++ b/tests/ported_static/stRandom2/test_random_statetest519.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest519Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest519( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest519.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -78,7 +88,7 @@ def test_random_statetest519( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000001000000000000000000000000000000000000000009457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3501a02556b85a45311" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0xEA81BBF, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest520.py b/tests/ported_static/stRandom2/test_random_statetest520.py index 8723ff304f7..ca90ac86420 100644 --- a/tests/ported_static/stRandom2/test_random_statetest520.py +++ b/tests/ported_static/stRandom2/test_random_statetest520.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest520Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest520( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest520.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -96,7 +106,7 @@ def test_random_statetest520( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff190308" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x13D9C7A3, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest526.py b/tests/ported_static/stRandom2/test_random_statetest526.py index 1a7fad525c8..33bf58469b1 100644 --- a/tests/ported_static/stRandom2/test_random_statetest526.py +++ b/tests/ported_static/stRandom2/test_random_statetest526.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest526Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest526( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest526.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -84,7 +94,7 @@ def test_random_statetest526( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5417e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5419e01950777810975058c746f" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3AA8C462, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest532.py b/tests/ported_static/stRandom2/test_random_statetest532.py index c4e603280de..acfe4835fc5 100644 --- a/tests/ported_static/stRandom2/test_random_statetest532.py +++ b/tests/ported_static/stRandom2/test_random_statetest532.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest532Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest532( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest532.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -91,7 +101,7 @@ def test_random_statetest532( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe54447f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f78297ba08ba478507f413b3597109c" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x43E5A248, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest533.py b/tests/ported_static/stRandom2/test_random_statetest533.py index 67787e8fb5d..bd66b30f0b1 100644 --- a/tests/ported_static/stRandom2/test_random_statetest533.py +++ b/tests/ported_static/stRandom2/test_random_statetest533.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest533Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest533( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest533.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -82,7 +92,7 @@ def test_random_statetest533( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001847f00000000000000000000000100000000000000000000000000000000000000003a076152" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x70D690F4, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest534.py b/tests/ported_static/stRandom2/test_random_statetest534.py index a39d3225fc0..57e891e623b 100644 --- a/tests/ported_static/stRandom2/test_random_statetest534.py +++ b/tests/ported_static/stRandom2/test_random_statetest534.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest534Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest534( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest534.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest534( data=Bytes( "7f000000000000000000000001000000000000000000000000000000000000000045437f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff457f0000000000000000000000000000000000000000000000000000000000000000436ff3075243846d88747b6a9e7ff28c61" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x55DB76C1, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest535.py b/tests/ported_static/stRandom2/test_random_statetest535.py index 6937748e414..8f31eef37bf 100644 --- a/tests/ported_static/stRandom2/test_random_statetest535.py +++ b/tests/ported_static/stRandom2/test_random_statetest535.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest535Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest535( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest535.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest535( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x4CD4DC30, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest537.py b/tests/ported_static/stRandom2/test_random_statetest537.py index 0bd11f228ae..5d544116d7f 100644 --- a/tests/ported_static/stRandom2/test_random_statetest537.py +++ b/tests/ported_static/stRandom2/test_random_statetest537.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest537Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest537( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest537.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -87,7 +97,7 @@ def test_random_statetest537( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5688068515a6a996a540a03686d6d" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x71E432D1, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest539.py b/tests/ported_static/stRandom2/test_random_statetest539.py index 8b957964061..3dc5e4915a2 100644 --- a/tests/ported_static/stRandom2/test_random_statetest539.py +++ b/tests/ported_static/stRandom2/test_random_statetest539.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest539Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest539( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest539.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest539( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff096794200bf18b0b316e41" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x55285B09, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest541.py b/tests/ported_static/stRandom2/test_random_statetest541.py index f1ad29263be..bc1abe1aaa3 100644 --- a/tests/ported_static/stRandom2/test_random_statetest541.py +++ b/tests/ported_static/stRandom2/test_random_statetest541.py @@ -3,6 +3,11 @@ Ported from: state_tests/stRandom2/randomStatetest541Filler.json + +@manually-enhanced: Do not overwrite. `gas_limit` raised on Amsterdam +to cover EIP-8037 state-gas spill. Pre-EIP-8037 keeps the original +100 000. + """ import pytest @@ -15,6 +20,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +35,14 @@ def test_random_statetest541( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest541.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -86,7 +98,7 @@ def test_random_statetest541( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000004335696e089257368d07897d57350b10" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x1F529315, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest544.py b/tests/ported_static/stRandom2/test_random_statetest544.py index 1908c18fb7a..77632478d50 100644 --- a/tests/ported_static/stRandom2/test_random_statetest544.py +++ b/tests/ported_static/stRandom2/test_random_statetest544.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest544Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest544( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest544.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -84,7 +94,7 @@ def test_random_statetest544( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c3503b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000000" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x505C017E, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest545.py b/tests/ported_static/stRandom2/test_random_statetest545.py index d15d4b6086d..7b95acefeb8 100644 --- a/tests/ported_static/stRandom2/test_random_statetest545.py +++ b/tests/ported_static/stRandom2/test_random_statetest545.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest545Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest545( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest545.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -90,7 +100,7 @@ def test_random_statetest545( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350637c9c82133005" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x13226624, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest546.py b/tests/ported_static/stRandom2/test_random_statetest546.py index 7a0f03f5742..8f975634bdf 100644 --- a/tests/ported_static/stRandom2/test_random_statetest546.py +++ b/tests/ported_static/stRandom2/test_random_statetest546.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest546Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest546( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest546.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest546( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000010000000000000000000000000000000000000000956f895258826c35576592208671731501" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6B15392F, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest548.py b/tests/ported_static/stRandom2/test_random_statetest548.py index 834b7806a18..8523f0f0278 100644 --- a/tests/ported_static/stRandom2/test_random_statetest548.py +++ b/tests/ported_static/stRandom2/test_random_statetest548.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest548Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest548( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest548.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest548( data=Bytes( "7f0000000000000000000000010000000000000000000000000000000000000000417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000019417f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f777a349a646633977da01a315a3c03" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2AA46F82, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest550.py b/tests/ported_static/stRandom2/test_random_statetest550.py index ce84a7583f3..d4fd817ef9b 100644 --- a/tests/ported_static/stRandom2/test_random_statetest550.py +++ b/tests/ported_static/stRandom2/test_random_statetest550.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest550Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest550( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest550.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -91,7 +101,7 @@ def test_random_statetest550( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f4472a17829659c94a29041419564313a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x52EBEDC8, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest552.py b/tests/ported_static/stRandom2/test_random_statetest552.py index 0d70a5e73b5..bcf8c8f4b85 100644 --- a/tests/ported_static/stRandom2/test_random_statetest552.py +++ b/tests/ported_static/stRandom2/test_random_statetest552.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest552Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest552( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest552.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest552( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff42147ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe547f00000000000000000000000000000000000000000000000000000000000000006f6a72a37b5219f089416d4336a08e82" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6BD9B58C, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest553.py b/tests/ported_static/stRandom2/test_random_statetest553.py index 8268ddb8062..b3942959256 100644 --- a/tests/ported_static/stRandom2/test_random_statetest553.py +++ b/tests/ported_static/stRandom2/test_random_statetest553.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest553Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest553( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest553.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest553( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000016f94819c780585376da073368c45828ca0" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x22FB6, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest555.py b/tests/ported_static/stRandom2/test_random_statetest555.py index 7177b3521a6..e3a668857b2 100644 --- a/tests/ported_static/stRandom2/test_random_statetest555.py +++ b/tests/ported_static/stRandom2/test_random_statetest555.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest555Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest555( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest555.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest555( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000c3506f3b8f936e6f3874603c59120707e3588c" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x719DE78, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest556.py b/tests/ported_static/stRandom2/test_random_statetest556.py index 45d06e2b711..a2778f086f9 100644 --- a/tests/ported_static/stRandom2/test_random_statetest556.py +++ b/tests/ported_static/stRandom2/test_random_statetest556.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest556Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest556( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest556.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest556( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f726e757692a2ad96526b9e8b77a33a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x44F0B58C, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest564.py b/tests/ported_static/stRandom2/test_random_statetest564.py index 2def96226a9..22f3acce632 100644 --- a/tests/ported_static/stRandom2/test_random_statetest564.py +++ b/tests/ported_static/stRandom2/test_random_statetest564.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest564Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest564( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest564.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = EOA( @@ -89,7 +99,7 @@ def test_random_statetest564( data=Bytes( "5b7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe45500816" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x11182998, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest565.py b/tests/ported_static/stRandom2/test_random_statetest565.py index ec6a0579725..33a1df3daea 100644 --- a/tests/ported_static/stRandom2/test_random_statetest565.py +++ b/tests/ported_static/stRandom2/test_random_statetest565.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest565Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest565( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest565.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest565( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350137f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000009237" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x28CD0966, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest571.py b/tests/ported_static/stRandom2/test_random_statetest571.py index 1f4f47da0d8..38072ed934a 100644 --- a/tests/ported_static/stRandom2/test_random_statetest571.py +++ b/tests/ported_static/stRandom2/test_random_statetest571.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest571Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest571( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest571.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -83,7 +93,7 @@ def test_random_statetest571( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000015b7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e793c6508766c8b6b403a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x53934784, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest574.py b/tests/ported_static/stRandom2/test_random_statetest574.py index 77cd58fd34b..a8f165453a5 100644 --- a/tests/ported_static/stRandom2/test_random_statetest574.py +++ b/tests/ported_static/stRandom2/test_random_statetest574.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest574Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest574( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest574.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest574( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001047f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff046d369354827d7433a335af" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x5F16646E, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest578.py b/tests/ported_static/stRandom2/test_random_statetest578.py index ca8412c4efd..01a23742ccc 100644 --- a/tests/ported_static/stRandom2/test_random_statetest578.py +++ b/tests/ported_static/stRandom2/test_random_statetest578.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest578Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest578( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest578.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest578( data=Bytes( "7f000000000000000000000000000000000000000000000000000000000000c350457f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff42" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x17C973D5, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest580.py b/tests/ported_static/stRandom2/test_random_statetest580.py index f6459d63228..159a1cd03f1 100644 --- a/tests/ported_static/stRandom2/test_random_statetest580.py +++ b/tests/ported_static/stRandom2/test_random_statetest580.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest580Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest580( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest580.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest580( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000457f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f4640879d18777b953a209836379a30" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2C360421, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest585.py b/tests/ported_static/stRandom2/test_random_statetest585.py index 62fe7532a02..b6b61656f32 100644 --- a/tests/ported_static/stRandom2/test_random_statetest585.py +++ b/tests/ported_static/stRandom2/test_random_statetest585.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest585Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest585( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest585.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest585( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x16B2537A, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest586.py b/tests/ported_static/stRandom2/test_random_statetest586.py index 17aa9ca8afe..c2c81827ba2 100644 --- a/tests/ported_static/stRandom2/test_random_statetest586.py +++ b/tests/ported_static/stRandom2/test_random_statetest586.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest586Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +18,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +33,14 @@ def test_random_statetest586( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest586.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -82,7 +92,7 @@ def test_random_statetest586( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000137" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x65DC324C, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest587.py b/tests/ported_static/stRandom2/test_random_statetest587.py index df7a8ae8c1b..6f9aa5a84cd 100644 --- a/tests/ported_static/stRandom2/test_random_statetest587.py +++ b/tests/ported_static/stRandom2/test_random_statetest587.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest587Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest587( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest587.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -86,7 +96,7 @@ def test_random_statetest587( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350117f0000000000000000000000000000000000000000000000000000000000000001457f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f8b7152a3958a923c1665b27557089a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x11604410, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest588.py b/tests/ported_static/stRandom2/test_random_statetest588.py index f4cc180318f..467e1489dfe 100644 --- a/tests/ported_static/stRandom2/test_random_statetest588.py +++ b/tests/ported_static/stRandom2/test_random_statetest588.py @@ -3,6 +3,11 @@ Ported from: state_tests/stRandom2/randomStatetest588Filler.json + +@manually-enhanced: Do not overwrite. `gas_limit` raised on Amsterdam +to cover EIP-8037 state-gas spill. Pre-EIP-8037 keeps the original +100 000. + """ import pytest @@ -15,6 +20,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +35,14 @@ def test_random_statetest588( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest588.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -86,7 +98,7 @@ def test_random_statetest588( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff41437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff430637" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x66D6BC77, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest592.py b/tests/ported_static/stRandom2/test_random_statetest592.py index 3d39c406314..ef4e670fcdd 100644 --- a/tests/ported_static/stRandom2/test_random_statetest592.py +++ b/tests/ported_static/stRandom2/test_random_statetest592.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest592Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest592( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest592.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest592( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x6339E0E5, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest596.py b/tests/ported_static/stRandom2/test_random_statetest596.py index ab63381f6b9..9772ffda560 100644 --- a/tests/ported_static/stRandom2/test_random_statetest596.py +++ b/tests/ported_static/stRandom2/test_random_statetest596.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest596Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest596( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest596.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -84,7 +94,7 @@ def test_random_statetest596( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001317f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f7066a3507f6e090653945638306520" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x2D99F481, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest599.py b/tests/ported_static/stRandom2/test_random_statetest599.py index a79a591497c..9e8f8f0973c 100644 --- a/tests/ported_static/stRandom2/test_random_statetest599.py +++ b/tests/ported_static/stRandom2/test_random_statetest599.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest599Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest599( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest599.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -92,7 +102,7 @@ def test_random_statetest599( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f8d6c60440a44449372068a976a8382" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x421144B6, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest600.py b/tests/ported_static/stRandom2/test_random_statetest600.py index b15a88ad275..1386a39da07 100644 --- a/tests/ported_static/stRandom2/test_random_statetest600.py +++ b/tests/ported_static/stRandom2/test_random_statetest600.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest600Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest600( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest600.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest600( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35043457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f0b6f37208e76a402927039198c969907" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0xAD3F19C, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest602.py b/tests/ported_static/stRandom2/test_random_statetest602.py index dbc906582c2..9d569c1d26b 100644 --- a/tests/ported_static/stRandom2/test_random_statetest602.py +++ b/tests/ported_static/stRandom2/test_random_statetest602.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest602Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest602( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest602.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -85,7 +95,7 @@ def test_random_statetest602( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x25D01724, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest603.py b/tests/ported_static/stRandom2/test_random_statetest603.py index e14be7e097a..6f5517dc6a3 100644 --- a/tests/ported_static/stRandom2/test_random_statetest603.py +++ b/tests/ported_static/stRandom2/test_random_statetest603.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest603Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest603( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest603.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest603( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79086f655860560745326476a03cdc360634" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x23FCF7F2, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest605.py b/tests/ported_static/stRandom2/test_random_statetest605.py index c696876d66a..6dc04cf8552 100644 --- a/tests/ported_static/stRandom2/test_random_statetest605.py +++ b/tests/ported_static/stRandom2/test_random_statetest605.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest605Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest605( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest605.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest605( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9058038508" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x650044FA, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest607.py b/tests/ported_static/stRandom2/test_random_statetest607.py index 309f65c114a..6f6e4f94516 100644 --- a/tests/ported_static/stRandom2/test_random_statetest607.py +++ b/tests/ported_static/stRandom2/test_random_statetest607.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest607Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest607( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest607.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -85,7 +95,7 @@ def test_random_statetest607( data=Bytes( "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x106DF7F8, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest608.py b/tests/ported_static/stRandom2/test_random_statetest608.py index 508a62f6d71..2a9daf5e2cb 100644 --- a/tests/ported_static/stRandom2/test_random_statetest608.py +++ b/tests/ported_static/stRandom2/test_random_statetest608.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest608Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest608( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest608.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -85,7 +95,7 @@ def test_random_statetest608( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350537fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x1EB2352A, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest610.py b/tests/ported_static/stRandom2/test_random_statetest610.py index 32c933c8eee..449efdeb9c9 100644 --- a/tests/ported_static/stRandom2/test_random_statetest610.py +++ b/tests/ported_static/stRandom2/test_random_statetest610.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest610Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest610( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest610.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -88,7 +98,7 @@ def test_random_statetest610( data=Bytes( "417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f01f353a2437e4384726497587b8556" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7FDD9C9C, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest615.py b/tests/ported_static/stRandom2/test_random_statetest615.py index 931346a4b4f..b3330682e09 100644 --- a/tests/ported_static/stRandom2/test_random_statetest615.py +++ b/tests/ported_static/stRandom2/test_random_statetest615.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest615Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest615( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest615.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -93,7 +103,7 @@ def test_random_statetest615( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe837f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000009556c6f390a3054d7368a9a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7BCC296A, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest616.py b/tests/ported_static/stRandom2/test_random_statetest616.py index f90f2155393..a5a984ee14d 100644 --- a/tests/ported_static/stRandom2/test_random_statetest616.py +++ b/tests/ported_static/stRandom2/test_random_statetest616.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest616Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest616( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest616.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest616( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f86a2409b991539f0423c0342363c3b" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x45949A6F, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest620.py b/tests/ported_static/stRandom2/test_random_statetest620.py index a2bb48e0aaa..d1120537994 100644 --- a/tests/ported_static/stRandom2/test_random_statetest620.py +++ b/tests/ported_static/stRandom2/test_random_statetest620.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest620Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest620( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest620.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest620( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6c54a420327d73727d9d1a667bf389" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x61F75E26, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest621.py b/tests/ported_static/stRandom2/test_random_statetest621.py index 202b60cf7a8..53a4825c2f0 100644 --- a/tests/ported_static/stRandom2/test_random_statetest621.py +++ b/tests/ported_static/stRandom2/test_random_statetest621.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest621Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest621( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest621.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -82,7 +92,7 @@ def test_random_statetest621( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000000000000000000000000000000000441a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f3ba187a19366899e595220741232905b" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x7FC94217, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest629.py b/tests/ported_static/stRandom2/test_random_statetest629.py index e9fbe36799b..e5fb21ac908 100644 --- a/tests/ported_static/stRandom2/test_random_statetest629.py +++ b/tests/ported_static/stRandom2/test_random_statetest629.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest629Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest629( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest629.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest629( data=Bytes( "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79347f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79116f427277147c617f4354a35a1a47977a" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x3BCDBA80, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest630.py b/tests/ported_static/stRandom2/test_random_statetest630.py index 531374330d6..232e5045340 100644 --- a/tests/ported_static/stRandom2/test_random_statetest630.py +++ b/tests/ported_static/stRandom2/test_random_statetest630.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest630Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest630( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest630.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest630( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001427f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9461a46e61507a1206917b17137e7e" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x188B5E42, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest633.py b/tests/ported_static/stRandom2/test_random_statetest633.py index e02fd33d83f..200694e5db0 100644 --- a/tests/ported_static/stRandom2/test_random_statetest633.py +++ b/tests/ported_static/stRandom2/test_random_statetest633.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest633Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest633( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest633.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -92,7 +102,7 @@ def test_random_statetest633( data=Bytes( "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f82941340756317567250f1573a8976" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x50F61B39, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest637.py b/tests/ported_static/stRandom2/test_random_statetest637.py index a676c8478ab..d896ccab731 100644 --- a/tests/ported_static/stRandom2/test_random_statetest637.py +++ b/tests/ported_static/stRandom2/test_random_statetest637.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest637Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest637( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest637.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -87,7 +97,7 @@ def test_random_statetest637( data=Bytes( "7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f44931064138e9df1768334028c201471" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x58337064, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest638.py b/tests/ported_static/stRandom2/test_random_statetest638.py index 6dd0020326e..35ce2c4613a 100644 --- a/tests/ported_static/stRandom2/test_random_statetest638.py +++ b/tests/ported_static/stRandom2/test_random_statetest638.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest638Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest638( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest638.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -89,7 +99,7 @@ def test_random_statetest638( data=Bytes( "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0x791E3396, ) diff --git a/tests/ported_static/stRandom2/test_random_statetest641.py b/tests/ported_static/stRandom2/test_random_statetest641.py index 2d903d2f5fa..f81dffeabc8 100644 --- a/tests/ported_static/stRandom2/test_random_statetest641.py +++ b/tests/ported_static/stRandom2/test_random_statetest641.py @@ -3,6 +3,9 @@ Ported from: state_tests/stRandom2/randomStatetest641Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_random_statetest641( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_random_statetest641.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 100k tx_gas. + tx_gas_limit = 100000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 500_000 + coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79) sender = EOA( key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005 @@ -90,7 +100,7 @@ def test_random_statetest641( data=Bytes( "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f29199c9aa4054170f1a15a55056f96" # noqa: E501 ), - gas_limit=100000, + gas_limit=tx_gas_limit, value=0xF08F864, ) diff --git a/tests/ported_static/stRevertTest/test_revert_in_create_in_init_paris.py b/tests/ported_static/stRevertTest/test_revert_in_create_in_init_paris.py index 1304fde2479..89789d898b9 100644 --- a/tests/ported_static/stRevertTest/test_revert_in_create_in_init_paris.py +++ b/tests/ported_static/stRevertTest/test_revert_in_create_in_init_paris.py @@ -3,6 +3,10 @@ Ported from: state_tests/stRevertTest/RevertInCreateInInit_ParisFiller.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 NEW_ACCOUNT state-gas spill in nested CREATE; +pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +34,14 @@ def test_revert_in_create_in_init_paris( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_revert_in_create_in_init_paris.""" + # EIP-8037 NEW_ACCOUNT state-gas spill OoGs the nested CREATE. + tx_gas_limit = 200000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F) sender = EOA( @@ -64,7 +75,7 @@ def test_revert_in_create_in_init_paris( + Op.MSTORE(offset=0x0, value=0x112233) + Op.REVERT(offset=0x0, size=0x20) + Op.STOP, - gas_limit=200000, + gas_limit=tx_gas_limit, ) post = {addr: Account(storage={0: 1}, balance=10)} diff --git a/tests/ported_static/stRevertTest/test_revert_opcode_calls.py b/tests/ported_static/stRevertTest/test_revert_opcode_calls.py index 9c1db89d700..1089825aeca 100644 --- a/tests/ported_static/stRevertTest/test_revert_opcode_calls.py +++ b/tests/ported_static/stRevertTest/test_revert_opcode_calls.py @@ -3,6 +3,10 @@ Ported from: state_tests/stRevertTest/RevertOpcodeCallsFiller.json +@manually-enhanced: Do not overwrite. Gas bumped fork-conditionally +to cover EIP-8037 state-gas spill into regular gas; pre-EIP-8037 +behavior unchanged. + """ import pytest @@ -92,6 +96,15 @@ def test_revert_opcode_calls( v: int, ) -> None: """Test_revert_opcode_calls.""" + # EIP-8037 gas bumps: original values for pre-EIP-8037 forks. + inner_call_gas = 50000 + inner_call_gas_2 = 100000 + inner_call_gas_3 = 260000 + if fork.is_eip_enabled(8037): + inner_call_gas = 1000000 + inner_call_gas_2 = 1000000 + inner_call_gas_3 = 1300000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xE8D4A51000) @@ -109,7 +122,7 @@ def test_revert_opcode_calls( code=Op.SSTORE( key=0xA, value=Op.CALL( - gas=0x3F7A0, + gas=inner_call_gas_3, address=Op.CALLDATALOAD(offset=0x0), value=0x0, args_offset=0x0, @@ -140,7 +153,7 @@ def test_revert_opcode_calls( code=Op.SSTORE( key=0x4, value=Op.CALL( - gas=0xC350, + gas=inner_call_gas, address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B, value=0x0, args_offset=0x0, @@ -161,7 +174,7 @@ def test_revert_opcode_calls( code=Op.SSTORE( key=0x0, value=Op.CALL( - gas=0xC350, + gas=inner_call_gas, address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B, value=0x0, args_offset=0x0, @@ -182,7 +195,7 @@ def test_revert_opcode_calls( code=Op.SSTORE( key=0x0, value=Op.DELEGATECALL( - gas=0xC350, + gas=inner_call_gas, address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B, args_offset=0x0, args_size=0x0, @@ -202,7 +215,7 @@ def test_revert_opcode_calls( code=Op.SSTORE( key=0x0, value=Op.CALLCODE( - gas=0xC350, + gas=inner_call_gas, address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B, value=0x0, args_offset=0x0, @@ -223,7 +236,7 @@ def test_revert_opcode_calls( code=Op.SSTORE( key=0x0, value=Op.CALL( - gas=0x186A0, + gas=inner_call_gas_2, address=0x652761B88018EA027F6F27E456FE55C2DC5D6A91, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stRevertTest/test_revert_opcode_in_calls_on_non_empty_return_data.py b/tests/ported_static/stRevertTest/test_revert_opcode_in_calls_on_non_empty_return_data.py index 83e34b96b21..6079b5cf452 100644 --- a/tests/ported_static/stRevertTest/test_revert_opcode_in_calls_on_non_empty_return_data.py +++ b/tests/ported_static/stRevertTest/test_revert_opcode_in_calls_on_non_empty_return_data.py @@ -3,6 +3,10 @@ Ported from: state_tests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnDataFiller.json +@manually-enhanced: Do not overwrite. Inner-CALL/DELEGATECALL gas +bumped on Amsterdam to cover EIP-8037 state-gas spill into regular gas; +pre-EIP-8037 unchanged. + """ import pytest @@ -110,6 +114,16 @@ def test_revert_opcode_in_calls_on_non_empty_return_data( ) pre[sender] = Account(balance=0xE8D4A51000) + # EIP-8037 inner-CALL/DELEGATECALL gas bumps: original values + # restored for pre-EIP-8037 forks; bumped for state-gas spill on + # Amsterdam. + inner_call_gas = 50000 + deeper_call_gas = 100000 + deepest_call_gas = 260000 + if fork.is_eip_enabled(8037): + inner_call_gas = 100000 + deeper_call_gas = 1000000 + deepest_call_gas = 1000000 # Source: lll # { [[1]] 12 (REVERT 0 1) [[3]] 13 } addr_6 = pre.deploy_contract( # noqa: F841 @@ -148,7 +162,7 @@ def test_revert_opcode_in_calls_on_non_empty_return_data( + Op.SSTORE( key=0x0, value=Op.DELEGATECALL( - gas=0xC350, + gas=inner_call_gas, address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B, args_offset=0x0, args_size=0x0, @@ -179,7 +193,7 @@ def test_revert_opcode_in_calls_on_non_empty_return_data( + Op.SSTORE( key=0x0, value=Op.CALLCODE( - gas=0xC350, + gas=inner_call_gas, address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B, value=0x0, args_offset=0x0, @@ -211,7 +225,7 @@ def test_revert_opcode_in_calls_on_non_empty_return_data( + Op.SSTORE( key=0x4, value=Op.CALL( - gas=0xC350, + gas=inner_call_gas, address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B, value=0x0, args_offset=0x0, @@ -243,7 +257,7 @@ def test_revert_opcode_in_calls_on_non_empty_return_data( + Op.SSTORE( key=0x0, value=Op.CALL( - gas=0xC350, + gas=inner_call_gas, address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B, value=0x0, args_offset=0x0, @@ -275,7 +289,7 @@ def test_revert_opcode_in_calls_on_non_empty_return_data( + Op.SSTORE( key=0xA, value=Op.CALL( - gas=0x3F7A0, + gas=deepest_call_gas, address=Op.CALLDATALOAD(offset=0x0), value=0x0, args_offset=0x0, @@ -307,7 +321,7 @@ def test_revert_opcode_in_calls_on_non_empty_return_data( + Op.SSTORE( key=0x0, value=Op.CALL( - gas=0x186A0, + gas=deeper_call_gas, address=0xEA519C47889074E6378B0D83747F2C3EA0B9CBC9, value=0x0, args_offset=0x0, diff --git a/tests/ported_static/stRevertTest/test_revert_opcode_return.py b/tests/ported_static/stRevertTest/test_revert_opcode_return.py index 4cd809a728e..325f7568164 100644 --- a/tests/ported_static/stRevertTest/test_revert_opcode_return.py +++ b/tests/ported_static/stRevertTest/test_revert_opcode_return.py @@ -3,6 +3,10 @@ Ported from: state_tests/stRevertTest/RevertOpcodeReturnFiller.json +@manually-enhanced: Do not overwrite. tx_gas[1] bumped on Amsterdam to +cover EIP-8037 state-gas spill from target's two SSTORE-sets; +pre-EIP-8037 unchanged. + """ import pytest @@ -247,6 +251,8 @@ def test_revert_opcode_return( Hash(addr_6, left_padding=True), ] tx_gas = [800000, 80000] + if fork.is_eip_enabled(8037): + tx_gas = [800000, 250_000] tx = Transaction( sender=sender, diff --git a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator0.py b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator0.py index 891c3e8626a..0d739ebcddb 100644 --- a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator0.py +++ b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator0.py @@ -3,6 +3,10 @@ Ported from: state_tests/stSystemOperationsTest/CallToNameRegistrator0Filler.json +@manually-enhanced: Do not overwrite. Gas bumped fork-conditionally +to cover EIP-8037 state-gas spill into regular gas; pre-EIP-8037 +behavior unchanged. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +34,14 @@ def test_call_to_name_registrator0( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_call_to_name_registrator0.""" + # EIP-8037 gas bumps: original values for pre-EIP-8037 forks. + inner_call_gas = 100000 + if fork.is_eip_enabled(8037): + inner_call_gas = 1000000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -72,7 +83,7 @@ def test_call_to_name_registrator0( + Op.SSTORE( key=0x0, value=Op.CALL( - gas=0x186A0, + gas=inner_call_gas, address=addr, value=0x17, args_offset=0x0, diff --git a/tests/ported_static/stSystemOperationsTest/test_callcode_to_return1.py b/tests/ported_static/stSystemOperationsTest/test_callcode_to_return1.py index 0b59d077378..6043500f367 100644 --- a/tests/ported_static/stSystemOperationsTest/test_callcode_to_return1.py +++ b/tests/ported_static/stSystemOperationsTest/test_callcode_to_return1.py @@ -3,6 +3,10 @@ Ported from: state_tests/stSystemOperationsTest/callcodeToReturn1Filler.json +@manually-enhanced: Do not overwrite. Gas bumped fork-conditionally +to cover EIP-8037 state-gas spill into regular gas; pre-EIP-8037 +behavior unchanged. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -29,8 +34,14 @@ def test_callcode_to_return1( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_callcode_to_return1.""" + # EIP-8037 gas bumps: original values for pre-EIP-8037 forks. + inner_call_gas = 50000 + if fork.is_eip_enabled(8037): + inner_call_gas = 1000000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -66,7 +77,7 @@ def test_callcode_to_return1( + Op.SSTORE( key=0x0, value=Op.CALLCODE( - gas=0xC350, + gas=inner_call_gas, address=addr, value=0x17, args_offset=0x0, diff --git a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator.py b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator.py index 8aceb541019..25f3523cd44 100644 --- a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator.py +++ b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator.py @@ -3,6 +3,9 @@ Ported from: state_tests/stSystemOperationsTest/createNameRegistratorFiller.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ Transaction, compute_create_address, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -30,8 +34,14 @@ def test_create_name_registrator( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_create_name_registrator.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 300k tx_gas. + tx_gas_limit = 300000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -64,7 +74,7 @@ def test_create_name_registrator( sender=sender, to=contract_0, data=Bytes(""), - gas_limit=300000, + gas_limit=tx_gas_limit, value=0x186A0, ) diff --git a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem.py b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem.py index fc00fef4328..5ac78d42aa9 100644 --- a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem.py +++ b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem.py @@ -3,6 +3,9 @@ Ported from: state_tests/stSystemOperationsTest/createNameRegistratorZeroMemFiller.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ Transaction, compute_create_address, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -32,8 +36,14 @@ def test_create_name_registrator_zero_mem( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_create_name_registrator_zero_mem.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 300k tx_gas. + tx_gas_limit = 300000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -64,7 +74,7 @@ def test_create_name_registrator_zero_mem( sender=sender, to=contract_0, data=Bytes(""), - gas_limit=300000, + gas_limit=tx_gas_limit, value=0x186A0, ) diff --git a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem2.py b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem2.py index 874b1f517c4..2fada8818e4 100644 --- a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem2.py +++ b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem2.py @@ -3,6 +3,9 @@ Ported from: state_tests/stSystemOperationsTest/createNameRegistratorZeroMem2Filler.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ Transaction, compute_create_address, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -32,8 +36,14 @@ def test_create_name_registrator_zero_mem2( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_create_name_registrator_zero_mem2.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 300k tx_gas. + tx_gas_limit = 300000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -71,7 +81,7 @@ def test_create_name_registrator_zero_mem2( sender=sender, to=contract_0, data=Bytes(""), - gas_limit=300000, + gas_limit=tx_gas_limit, value=0x186A0, ) diff --git a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem_expansion.py b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem_expansion.py index fa489f7aa9e..f7981ea400b 100644 --- a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem_expansion.py +++ b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem_expansion.py @@ -3,6 +3,9 @@ Ported from: state_tests/stSystemOperationsTest/createNameRegistratorZeroMemExpansionFiller.json +@manually-enhanced: Do not overwrite. tx `gas_limit` bumped on Amsterdam +to cover EIP-8037 state-gas spill; pre-EIP-8037 unchanged. + """ import pytest @@ -16,6 +19,7 @@ Transaction, compute_create_address, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -32,8 +36,14 @@ def test_create_name_registrator_zero_mem_expansion( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_create_name_registrator_zero_mem_expansion.""" + # EIP-8037 state-gas spill on Amsterdam exceeds 300k tx_gas. + tx_gas_limit = 300000 + if fork.is_eip_enabled(8037): + tx_gas_limit = 1_000_000 + coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA) contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87) sender = pre.fund_eoa(amount=0xDE0B6B3A7640000) @@ -64,7 +74,7 @@ def test_create_name_registrator_zero_mem_expansion( sender=sender, to=contract_0, data=Bytes(""), - gas_limit=300000, + gas_limit=tx_gas_limit, value=0x186A0, ) diff --git a/tests/ported_static/stTransactionTest/test_internal_call_hitting_gas_limit_success.py b/tests/ported_static/stTransactionTest/test_internal_call_hitting_gas_limit_success.py index 89723d06162..7bdd73eb60c 100644 --- a/tests/ported_static/stTransactionTest/test_internal_call_hitting_gas_limit_success.py +++ b/tests/ported_static/stTransactionTest/test_internal_call_hitting_gas_limit_success.py @@ -3,6 +3,10 @@ Ported from: state_tests/stTransactionTest/InternalCallHittingGasLimitSuccessFiller.json +@manually-enhanced: Do not overwrite. Inner-CALL gas and outer tx gas +bumped on Amsterdam to cover EIP-8037 SSTORE-set state-gas spill; +pre-EIP-8037 unchanged. + """ import pytest @@ -15,6 +19,7 @@ StateTestFiller, Transaction, ) +from execution_testing.forks import Fork from execution_testing.vm import Op REFERENCE_SPEC_GIT_PATH = "N/A" @@ -31,8 +36,18 @@ def test_internal_call_hitting_gas_limit_success( state_test: StateTestFiller, pre: Alloc, + fork: Fork, ) -> None: """Test_internal_call_hitting_gas_limit_success.""" + # EIP-8037 SSTORE-set state-gas spill OoGs the 25k inner CALL. + inner_call_gas = 25000 + tx_gas_limit = 150000 + env_gas_limit = 220000 + if fork.is_eip_enabled(8037): + inner_call_gas = 200000 + tx_gas_limit = 500000 + env_gas_limit = 1_000_000 + coinbase = Address(0x2ADF5374FCE5EDBC8E2A8697C15331677E6EBF0B) sender = pre.fund_eoa(amount=0x3B9ACA00) @@ -42,7 +57,7 @@ def test_internal_call_hitting_gas_limit_success( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=220000, + gas_limit=env_gas_limit, ) # Source: lll @@ -55,7 +70,7 @@ def test_internal_call_hitting_gas_limit_success( # { (CALL 25000 1 0 0 0 0) } # noqa: E501 target = pre.deploy_contract( # noqa: F841 code=Op.CALL( - gas=0x61A8, + gas=inner_call_gas, address=addr, value=0x1, args_offset=0x0, @@ -71,7 +86,7 @@ def test_internal_call_hitting_gas_limit_success( sender=sender, to=target, data=Bytes(""), - gas_limit=150000, + gas_limit=tx_gas_limit, value=10, )