From b9d626c809e2479277fe03f8199787582ab5ba3c Mon Sep 17 00:00:00 2001 From: spencer-tb Date: Fri, 31 Jul 2026 12:28:03 +0200 Subject: [PATCH] chore(tests): drop non-load-bearing hardcoded gas limits from ported static tests --- .../byzantium/stPreCompiledContracts/test_modexp.py | 3 --- .../stPreCompiledContracts/test_modexp_tests.py | 3 --- .../test_modexp_modsize0_returndatasize.py | 2 -- .../test_too_long_return_data_copy.py | 2 -- .../byzantium/stRevertTest/test_revert_opcode.py | 3 --- .../stRevertTest/test_revert_opcode_return.py | 6 ------ .../test_revert_precompiled_touch_exact_oog_paris.py | 1 - .../byzantium/stStaticCall/test_static_ab_acalls0.py | 3 --- .../stStaticCall/test_static_ab_acalls_suicide0.py | 3 --- .../byzantium/stStaticCall/test_static_call10.py | 1 - .../test_static_call1024_balance_too_low.py | 3 --- .../test_static_call1024_balance_too_low2.py | 3 --- .../stStaticCall/test_static_call1024_pre_calls.py | 3 --- .../stStaticCall/test_static_call1024_pre_calls3.py | 3 --- .../stStaticCall/test_static_call50000_ecrec.py | 3 --- .../stStaticCall/test_static_call50000_identity2.py | 3 --- .../test_static_call50000bytes_contract50_1.py | 3 --- .../test_static_call50000bytes_contract50_2.py | 3 --- .../test_static_call50000bytes_contract50_3.py | 3 --- .../byzantium/stStaticCall/test_static_call_basic.py | 3 --- ...est_static_call_contract_to_create_contract_oog.py | 1 - .../byzantium/stStaticCall/test_static_call_create.py | 3 --- .../stStaticCall/test_static_call_create2.py | 3 --- .../test_static_call_ecrecover0_0input.py | 3 --- .../test_static_call_with_high_value_and_gas_oog.py | 3 --- .../stStaticCall/test_static_callcall_00_ooge.py | 3 --- .../stStaticCall/test_static_callcall_00_ooge_1.py | 1 - .../stStaticCall/test_static_callcallcall_000_ooge.py | 3 --- .../test_static_callcallcallcode_001_2.py | 3 --- .../stStaticCall/test_static_callcallcode_01_2.py | 3 --- .../test_static_callcallcodecall_010_2.py | 3 --- .../test_static_callcallcodecallcode_011_2.py | 3 --- .../test_static_callcallcodecallcode_011_ooge_2.py | 1 - ...st_static_callcallcodecallcode_011_oogm_before2.py | 1 - .../test_static_callcodecallcall_100_oogm_after_3.py | 1 - ..._static_callcodecallcodecall_110_suicide_middle.py | 2 -- .../stStaticCall/test_static_check_opcodes2.py | 3 --- .../stStaticCall/test_static_check_opcodes3.py | 3 --- .../test_static_refund_call_to_suicide_twice.py | 3 --- .../stCreate2/test_create2_init_codes.py | 3 --- .../stCreate2/test_create2_smart_init_code.py | 11 ----------- .../constantinople/stCreate2/test_create2_suicide.py | 6 ------ .../stCreate2/test_create2collision_balance.py | 8 -------- .../stCreate2/test_create2collision_code2.py | 8 -------- .../stCreate2/test_create2collision_selfdestructed.py | 5 ----- .../test_create2collision_selfdestructed2.py | 5 ----- .../stCreate2/test_returndatacopy_following_create.py | 3 --- .../stArgsZeroOneBalance/test_addmod_non_const.py | 3 --- .../stArgsZeroOneBalance/test_and_non_const.py | 3 --- .../stArgsZeroOneBalance/test_balance_non_const.py | 3 --- .../stArgsZeroOneBalance/test_byte_non_const.py | 3 --- .../stArgsZeroOneBalance/test_call_non_const.py | 3 --- .../stArgsZeroOneBalance/test_callcode_non_const.py | 3 --- .../test_calldatacopy_non_const.py | 3 --- .../test_calldataload_non_const.py | 3 --- .../stArgsZeroOneBalance/test_codecopy_non_const.py | 3 --- .../stArgsZeroOneBalance/test_create_non_const.py | 3 --- .../test_delegatecall_non_const.py | 3 --- .../stArgsZeroOneBalance/test_div_non_const.py | 3 --- .../stArgsZeroOneBalance/test_eq_non_const.py | 3 --- .../stArgsZeroOneBalance/test_exp_non_const.py | 3 --- .../test_extcodecopy_non_const.py | 3 --- .../test_extcodesize_non_const.py | 3 --- .../stArgsZeroOneBalance/test_gt_non_const.py | 3 --- .../stArgsZeroOneBalance/test_iszero_non_const.py | 3 --- .../stArgsZeroOneBalance/test_jump_non_const.py | 3 --- .../stArgsZeroOneBalance/test_jumpi_non_const.py | 3 --- .../stArgsZeroOneBalance/test_log0_non_const.py | 3 --- .../stArgsZeroOneBalance/test_log1_non_const.py | 3 --- .../stArgsZeroOneBalance/test_log2_non_const.py | 3 --- .../stArgsZeroOneBalance/test_log3_non_const.py | 3 --- .../stArgsZeroOneBalance/test_lt_non_const.py | 3 --- .../stArgsZeroOneBalance/test_mload_non_const.py | 3 --- .../stArgsZeroOneBalance/test_mod_non_const.py | 3 --- .../stArgsZeroOneBalance/test_mstore8_non_const.py | 3 --- .../stArgsZeroOneBalance/test_mstore_non_const.py | 3 --- .../stArgsZeroOneBalance/test_mul_non_const.py | 3 --- .../stArgsZeroOneBalance/test_mulmod_non_const.py | 3 --- .../stArgsZeroOneBalance/test_not_non_const.py | 3 --- .../stArgsZeroOneBalance/test_or_non_const.py | 3 --- .../stArgsZeroOneBalance/test_return_non_const.py | 3 --- .../stArgsZeroOneBalance/test_sdiv_non_const.py | 3 --- .../stArgsZeroOneBalance/test_sgt_non_const.py | 3 --- .../stArgsZeroOneBalance/test_sha3_non_const.py | 3 --- .../stArgsZeroOneBalance/test_signext_non_const.py | 3 --- .../stArgsZeroOneBalance/test_sload_non_const.py | 3 --- .../stArgsZeroOneBalance/test_slt_non_const.py | 3 --- .../stArgsZeroOneBalance/test_smod_non_const.py | 3 --- .../stArgsZeroOneBalance/test_sstore_non_const.py | 3 --- .../stArgsZeroOneBalance/test_sub_non_const.py | 3 --- .../stArgsZeroOneBalance/test_suicide_non_const.py | 3 --- .../stArgsZeroOneBalance/test_xor_non_const.py | 3 --- .../stCallCodes/test_callcode_dynamic_code.py | 10 ---------- .../test_callcode_dynamic_code2_self_call.py | 3 --- .../test_callcode_in_initcode_to_empty_contract.py | 6 ------ ...tcode_to_exis_contract_with_v_transfer_ne_money.py | 3 --- ...est_callcodecallcodecallcode_111_suicide_middle.py | 2 -- .../test_call_with_high_value_and_gas_oog.py | 3 --- .../test_call_with_high_value_and_oo_gat_tx_level.py | 3 --- .../test_create_fail_balance_too_low.py | 8 -------- .../frontier/stCreateTest/test_code_in_constructor.py | 2 -- .../test_create_transaction_high_nonce.py | 11 ----------- .../frontier/stExample/test_labels_example.py | 2 -- .../frontier/stExample/test_ranges_example.py | 2 -- .../frontier/stMemoryStressTest/test_fill_stack.py | 3 --- .../stMemoryStressTest/test_mload32bit_bound.py | 3 --- .../stMemoryStressTest/test_mload32bit_bound2.py | 3 --- .../stMemoryStressTest/test_mload32bit_bound_msize.py | 3 --- .../frontier/stMemoryTest/test_buffer.py | 3 --- .../frontier/stMemoryTest/test_buffer_src_offset.py | 3 --- .../test_call_ecrecover_overflow.py | 10 ---------- .../stPreCompiledContracts2/test_ecrecover_weird_v.py | 3 --- .../stQuadraticComplexityTest/test_call50000.py | 3 --- .../stQuadraticComplexityTest/test_call50000_ecrec.py | 3 --- .../test_call50000_identity.py | 3 --- .../test_call50000_identity2.py | 3 --- .../test_call50000_rip160.py | 3 --- .../test_call50000_sha256.py | 3 --- .../stQuadraticComplexityTest/test_callcode50000.py | 3 --- .../stQuadraticComplexityTest/test_create1000.py | 3 --- .../test_refund_call_to_suicide_no_storage.py | 3 --- .../test_refund_call_to_suicide_storage.py | 3 --- .../stRefundTest/test_refund_call_to_suicide_twice.py | 3 --- .../frontier/stStackTests/test_underflow_test.py | 3 --- .../test_double_selfdestruct_test.py | 2 -- .../stSystemOperationsTest/test_multi_selfdestruct.py | 2 -- .../stSystemOperationsTest/test_suicide_address.py | 2 -- .../stSystemOperationsTest/test_suicide_caller.py | 2 -- .../test_suicide_caller_addres_too_big_left.py | 2 -- .../stSystemOperationsTest/test_suicide_origin.py | 2 -- .../test_suicide_send_ether_to_me.py | 2 -- .../test_opcodes_transaction_init.py | 3 --- .../stTransactionTest/test_overflow_gas_require2.py | 2 -- .../frontier/vmArithmeticTest/test_add.py | 3 --- .../frontier/vmArithmeticTest/test_addmod.py | 3 --- .../frontier/vmArithmeticTest/test_div.py | 3 --- .../frontier/vmArithmeticTest/test_exp.py | 3 --- .../frontier/vmArithmeticTest/test_mod.py | 3 --- .../frontier/vmArithmeticTest/test_mul.py | 3 --- .../frontier/vmArithmeticTest/test_mulmod.py | 3 --- .../frontier/vmArithmeticTest/test_sdiv.py | 3 --- .../frontier/vmArithmeticTest/test_signextend.py | 3 --- .../frontier/vmArithmeticTest/test_smod.py | 3 --- .../frontier/vmArithmeticTest/test_sub.py | 3 --- .../frontier/vmBitwiseLogicOperation/test_and.py | 3 --- .../frontier/vmBitwiseLogicOperation/test_byte.py | 3 --- .../frontier/vmBitwiseLogicOperation/test_eq.py | 3 --- .../frontier/vmBitwiseLogicOperation/test_gt.py | 3 --- .../frontier/vmBitwiseLogicOperation/test_iszero.py | 3 --- .../frontier/vmBitwiseLogicOperation/test_lt.py | 3 --- .../frontier/vmBitwiseLogicOperation/test_not.py | 3 --- .../frontier/vmBitwiseLogicOperation/test_or.py | 3 --- .../frontier/vmBitwiseLogicOperation/test_sgt.py | 3 --- .../frontier/vmBitwiseLogicOperation/test_slt.py | 3 --- .../frontier/vmBitwiseLogicOperation/test_xor.py | 3 --- .../frontier/vmIOandFlowOperations/test_codecopy.py | 3 --- .../vmIOandFlowOperations/test_loops_conditionals.py | 3 --- .../frontier/vmIOandFlowOperations/test_mstore.py | 3 --- .../frontier/vmIOandFlowOperations/test_mstore8.py | 3 --- .../frontier/vmIOandFlowOperations/test_pc.py | 3 --- .../frontier/vmIOandFlowOperations/test_pop.py | 3 --- .../frontier/vmIOandFlowOperations/test_return.py | 3 --- .../vmIOandFlowOperations/test_sstore_sload.py | 3 --- tests/ported_static/frontier/vmLogTest/test_log0.py | 3 --- tests/ported_static/frontier/vmLogTest/test_log1.py | 3 --- tests/ported_static/frontier/vmLogTest/test_log2.py | 3 --- tests/ported_static/frontier/vmLogTest/test_log3.py | 3 --- tests/ported_static/frontier/vmLogTest/test_log4.py | 3 --- tests/ported_static/frontier/vmTests/test_random.py | 3 --- tests/ported_static/frontier/vmTests/test_sha3.py | 3 --- tests/ported_static/frontier/vmTests/test_suicide.py | 3 --- .../test_callcallcallcode_001_suicide_end.py | 2 -- .../test_callcallcallcode_001_suicide_middle.py | 2 -- .../test_callcallcode_01_suicide_end.py | 1 - .../test_callcallcodecall_010_suicide_end.py | 1 - .../test_callcallcodecall_010_suicide_middle.py | 2 -- .../test_callcallcodecallcode_011_suicide_end.py | 1 - .../test_callcallcodecallcode_011_suicide_middle.py | 2 -- .../test_callcodecall_10_suicide_end.py | 1 - .../test_callcodecallcall_100_suicide_end.py | 1 - .../test_callcodecallcall_100_suicide_middle.py | 2 -- .../test_callcodecallcallcode_101_suicide_end.py | 1 - .../test_callcodecallcallcode_101_suicide_middle.py | 2 -- .../test_callcodecallcode_11_suicide_end.py | 1 - .../test_callcodecallcodecall_110_suicide_end.py | 1 - .../test_callcodecallcodecall_110_suicide_middle.py | 2 -- .../test_callcodecallcodecallcode_111_suicide_end.py | 1 - ...est_callcodecallcodecallcode_111_suicide_middle.py | 2 -- .../test_callcallcallcode_001_suicide_end.py | 1 - .../test_callcallcallcode_001_suicide_middle.py | 2 -- .../test_callcallcode_01_suicide_end.py | 1 - .../test_callcallcodecall_010_suicide_end.py | 1 - .../test_callcallcodecall_010_suicide_middle.py | 2 -- .../test_callcallcodecallcode_011_suicide_end.py | 1 - .../test_callcallcodecallcode_011_suicide_middle.py | 2 -- .../test_callcodecall_10_suicide_end.py | 1 - .../test_callcodecallcall_100_suicide_end.py | 1 - .../test_callcodecallcall_100_suicide_middle.py | 2 -- .../test_callcodecallcallcode_101_suicide_end.py | 1 - .../test_callcodecallcallcode_101_suicide_middle.py | 2 -- .../test_callcodecallcode_11_suicide_end.py | 1 - .../test_callcodecallcodecall_110_suicide_end.py | 1 - .../test_callcodecallcodecall_110_suicide_middle.py | 2 -- .../test_callcodecallcodecallcode_111_suicide_end.py | 1 - ...est_callcodecallcodecallcode_111_suicide_middle.py | 2 -- .../homestead/stWalletTest/test_wallet_kill.py | 2 -- .../stWalletTest/test_wallet_kill_to_wallet.py | 2 -- .../london/stEIP1559/test_low_gas_price_old_types.py | 3 --- ...ion_colliding_with_non_empty_account_init_paris.py | 2 -- .../shanghai/stEIP3855_push0/test_push0.py | 1 - .../stNonZeroCallsTest/test_non_zero_value_suicide.py | 2 -- .../test_non_zero_value_suicide_to_empty_paris.py | 2 -- ..._non_zero_value_suicide_to_non_non_zero_balance.py | 2 -- ...non_zero_value_suicide_to_one_storage_key_paris.py | 2 -- .../stZeroCallsTest/test_zero_value_suicide.py | 2 -- .../test_zero_value_suicide_to_empty_paris.py | 2 -- .../test_zero_value_suicide_to_non_zero_balance.py | 2 -- ...est_zero_value_suicide_to_one_storage_key_paris.py | 2 -- .../stMemExpandingEIP150Calls/test_oo_gin_return.py | 3 --- 219 files changed, 620 deletions(-) diff --git a/tests/ported_static/byzantium/stPreCompiledContracts/test_modexp.py b/tests/ported_static/byzantium/stPreCompiledContracts/test_modexp.py index 982a98231e2..9ccd522a312 100644 --- a/tests/ported_static/byzantium/stPreCompiledContracts/test_modexp.py +++ b/tests/ported_static/byzantium/stPreCompiledContracts/test_modexp.py @@ -970,7 +970,6 @@ def test_modexp( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000000, ) pre[sender] = Account(balance=0x3635C9ADC5DEA00000) @@ -1291,13 +1290,11 @@ def test_modexp( "0000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010001" # noqa: E501 ), ] - tx_gas = [100000000, 90000, 110000, 200000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/byzantium/stPreCompiledContracts/test_modexp_tests.py b/tests/ported_static/byzantium/stPreCompiledContracts/test_modexp_tests.py index 487eb639575..65b5f20c4e0 100644 --- a/tests/ported_static/byzantium/stPreCompiledContracts/test_modexp_tests.py +++ b/tests/ported_static/byzantium/stPreCompiledContracts/test_modexp_tests.py @@ -817,7 +817,6 @@ def test_modexp_tests( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: yul @@ -1219,13 +1218,11 @@ def test_modexp_tests( Bytes("048071d3") + Hash(0x9C00) + Hash(0x1) + Hash(0xD7A1), Bytes("048071d3") + Hash(0xD796) + Hash(0xD796) + Hash(0xA7D5), ] - tx_gas = [16777216] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], nonce=1, error=_exc, ) diff --git a/tests/ported_static/byzantium/stReturnDataTest/test_modexp_modsize0_returndatasize.py b/tests/ported_static/byzantium/stReturnDataTest/test_modexp_modsize0_returndatasize.py index 28bc4574fc5..6be7d87ccb7 100644 --- a/tests/ported_static/byzantium/stReturnDataTest/test_modexp_modsize0_returndatasize.py +++ b/tests/ported_static/byzantium/stReturnDataTest/test_modexp_modsize0_returndatasize.py @@ -192,13 +192,11 @@ def test_modexp_modsize0_returndatasize( "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000f3f14010101" # noqa: E501 ), ] - tx_gas = [10000000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/byzantium/stReturnDataTest/test_too_long_return_data_copy.py b/tests/ported_static/byzantium/stReturnDataTest/test_too_long_return_data_copy.py index 2d9ba21d3a9..c2e6e0668fc 100644 --- a/tests/ported_static/byzantium/stReturnDataTest/test_too_long_return_data_copy.py +++ b/tests/ported_static/byzantium/stReturnDataTest/test_too_long_return_data_copy.py @@ -464,13 +464,11 @@ def test_too_long_return_data_copy( + Hash(0x10) + Hash(addr_2, left_padding=True), ] - tx_gas = [16777216] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], nonce=1, gas_price=100, error=_exc, diff --git a/tests/ported_static/byzantium/stRevertTest/test_revert_opcode.py b/tests/ported_static/byzantium/stRevertTest/test_revert_opcode.py index e76a7ee25f2..f57406ce9d4 100644 --- a/tests/ported_static/byzantium/stRevertTest/test_revert_opcode.py +++ b/tests/ported_static/byzantium/stRevertTest/test_revert_opcode.py @@ -77,7 +77,6 @@ def test_revert_opcode( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) # Source: raw @@ -113,14 +112,12 @@ def test_revert_opcode( tx_data = [ Bytes(""), ] - tx_gas = [800000, 30000] tx_value = [0, 10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stRevertTest/test_revert_opcode_return.py b/tests/ported_static/byzantium/stRevertTest/test_revert_opcode_return.py index 325f7568164..cc015216a2b 100644 --- a/tests/ported_static/byzantium/stRevertTest/test_revert_opcode_return.py +++ b/tests/ported_static/byzantium/stRevertTest/test_revert_opcode_return.py @@ -132,7 +132,6 @@ def test_revert_opcode_return( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0xE8D4A51000) @@ -250,15 +249,10 @@ def test_revert_opcode_return( Hash(addr_5, left_padding=True), 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, to=target, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/byzantium/stRevertTest/test_revert_precompiled_touch_exact_oog_paris.py b/tests/ported_static/byzantium/stRevertTest/test_revert_precompiled_touch_exact_oog_paris.py index 936a3505eb0..de9ed26ddbc 100644 --- a/tests/ported_static/byzantium/stRevertTest/test_revert_precompiled_touch_exact_oog_paris.py +++ b/tests/ported_static/byzantium/stRevertTest/test_revert_precompiled_touch_exact_oog_paris.py @@ -639,7 +639,6 @@ def test_revert_precompiled_touch_exact_oog_paris( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=4012015, ) pre[addr_5] = Account(balance=1) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_ab_acalls0.py b/tests/ported_static/byzantium/stStaticCall/test_static_ab_acalls0.py index ca1b6965436..8d6612f6de2 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_ab_acalls0.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_ab_acalls0.py @@ -66,7 +66,6 @@ def test_static_ab_acalls0( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) # Source: lll @@ -193,14 +192,12 @@ def test_static_ab_acalls0( Hash(addr, left_padding=True), Hash(addr_3, left_padding=True), ] - tx_gas = [1000000] tx_value = [100000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_ab_acalls_suicide0.py b/tests/ported_static/byzantium/stStaticCall/test_static_ab_acalls_suicide0.py index 94fcf44f866..802a6784cea 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_ab_acalls_suicide0.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_ab_acalls_suicide0.py @@ -66,7 +66,6 @@ def test_static_ab_acalls_suicide0( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -199,14 +198,12 @@ def test_static_ab_acalls_suicide0( Hash(addr, left_padding=True), Hash(addr_3, left_padding=True), ] - tx_gas = [10000000] tx_value = [100000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_call10.py b/tests/ported_static/byzantium/stStaticCall/test_static_call10.py index 6329bb04db1..7139987a88b 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_call10.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_call10.py @@ -178,7 +178,6 @@ def test_static_call10( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_call1024_balance_too_low.py b/tests/ported_static/byzantium/stStaticCall/test_static_call1024_balance_too_low.py index c35d515be61..a2de3838bc9 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_call1024_balance_too_low.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_call1024_balance_too_low.py @@ -67,7 +67,6 @@ def test_static_call1024_balance_too_low( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=9223372036854775807, ) addr = pre.fund_eoa(amount=7000) # noqa: F841 @@ -157,14 +156,12 @@ def test_static_call1024_balance_too_low( Hash(addr_2, left_padding=True), Hash(addr_3, left_padding=True), ] - tx_gas = [17592186099592] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_call1024_balance_too_low2.py b/tests/ported_static/byzantium/stStaticCall/test_static_call1024_balance_too_low2.py index 6b2a4856aee..b2d37f48b7c 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_call1024_balance_too_low2.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_call1024_balance_too_low2.py @@ -67,7 +67,6 @@ def test_static_call1024_balance_too_low2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=9223372036854775807, ) addr = pre.fund_eoa(amount=7000) # noqa: F841 @@ -157,14 +156,12 @@ def test_static_call1024_balance_too_low2( Hash(addr_2, left_padding=True), Hash(addr_3, left_padding=True), ] - tx_gas = [17592186099592] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_call1024_pre_calls.py b/tests/ported_static/byzantium/stStaticCall/test_static_call1024_pre_calls.py index e0d260f263f..3c0ac522a10 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_call1024_pre_calls.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_call1024_pre_calls.py @@ -67,7 +67,6 @@ def test_static_call1024_pre_calls( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=9223372036854775807, ) addr = pre.fund_eoa(amount=7000) # noqa: F841 @@ -187,14 +186,12 @@ def test_static_call1024_pre_calls( Hash(addr_2, left_padding=True), Hash(addr_3, left_padding=True), ] - tx_gas = [9214364837600034817] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_call1024_pre_calls3.py b/tests/ported_static/byzantium/stStaticCall/test_static_call1024_pre_calls3.py index 6448a69f8f0..73c324c10a1 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_call1024_pre_calls3.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_call1024_pre_calls3.py @@ -67,7 +67,6 @@ def test_static_call1024_pre_calls3( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=9223372036854775807, ) addr = pre.fund_eoa(amount=7000) # noqa: F841 @@ -187,14 +186,12 @@ def test_static_call1024_pre_calls3( Hash(addr_2, left_padding=True), Hash(addr_3, left_padding=True), ] - tx_gas = [9214364837600034817] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_call50000_ecrec.py b/tests/ported_static/byzantium/stStaticCall/test_static_call50000_ecrec.py index 00a665359f4..67cc0025c27 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_call50000_ecrec.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_call50000_ecrec.py @@ -67,7 +67,6 @@ def test_static_call50000_ecrec( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=95000000, ) # Source: lll @@ -172,14 +171,12 @@ def test_static_call50000_ecrec( Hash(addr, left_padding=True), Hash(addr_2, left_padding=True), ] - tx_gas = [94500000] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_call50000_identity2.py b/tests/ported_static/byzantium/stStaticCall/test_static_call50000_identity2.py index cbbe552fd44..9f4151076bb 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_call50000_identity2.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_call50000_identity2.py @@ -67,7 +67,6 @@ def test_static_call50000_identity2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=8925000000, ) # Source: lll @@ -176,14 +175,12 @@ def test_static_call50000_identity2( Hash(addr, left_padding=True), Hash(addr_2, left_padding=True), ] - tx_gas = [882500000] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_call50000bytes_contract50_1.py b/tests/ported_static/byzantium/stStaticCall/test_static_call50000bytes_contract50_1.py index c1571a59264..889a924fde1 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_call50000bytes_contract50_1.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_call50000bytes_contract50_1.py @@ -67,7 +67,6 @@ def test_static_call50000bytes_contract50_1( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=892500000000, ) # Source: lll @@ -198,14 +197,12 @@ def test_static_call50000bytes_contract50_1( Hash(addr_2, left_padding=True), Hash(addr_4, left_padding=True), ] - tx_gas = [882500000000] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_call50000bytes_contract50_2.py b/tests/ported_static/byzantium/stStaticCall/test_static_call50000bytes_contract50_2.py index ad164e9725c..240995e79d9 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_call50000bytes_contract50_2.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_call50000bytes_contract50_2.py @@ -67,7 +67,6 @@ def test_static_call50000bytes_contract50_2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=892500000000, ) # Source: lll @@ -198,14 +197,12 @@ def test_static_call50000bytes_contract50_2( Hash(addr_2, left_padding=True), Hash(addr_4, left_padding=True), ] - tx_gas = [882500000000] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_call50000bytes_contract50_3.py b/tests/ported_static/byzantium/stStaticCall/test_static_call50000bytes_contract50_3.py index 1041834efd5..9fbb386f99a 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_call50000bytes_contract50_3.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_call50000bytes_contract50_3.py @@ -67,7 +67,6 @@ def test_static_call50000bytes_contract50_3( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=892500000000, ) # Source: lll @@ -198,14 +197,12 @@ def test_static_call50000bytes_contract50_3( Hash(addr_2, left_padding=True), Hash(addr_4, left_padding=True), ] - tx_gas = [882500000000] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_call_basic.py b/tests/ported_static/byzantium/stStaticCall/test_static_call_basic.py index a3cf98b6409..113358e1cf7 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_call_basic.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_call_basic.py @@ -78,7 +78,6 @@ def test_static_call_basic( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) # Source: lll @@ -207,14 +206,12 @@ def test_static_call_basic( Hash(addr_3, left_padding=True), Hash(addr_5, left_padding=True), ] - tx_gas = [1000000] tx_value = [100000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_call_contract_to_create_contract_oog.py b/tests/ported_static/byzantium/stStaticCall/test_static_call_contract_to_create_contract_oog.py index a331700c24f..df4b1d63004 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_call_contract_to_create_contract_oog.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_call_contract_to_create_contract_oog.py @@ -70,7 +70,6 @@ def test_static_call_contract_to_create_contract_oog( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_call_create.py b/tests/ported_static/byzantium/stStaticCall/test_static_call_create.py index b72fd28baf7..b227c9ba0b8 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_call_create.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_call_create.py @@ -78,7 +78,6 @@ def test_static_call_create( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) # Source: lll @@ -179,14 +178,12 @@ def test_static_call_create( Hash(addr_2, left_padding=True), Hash(addr_3, left_padding=True), ] - tx_gas = [1000000] tx_value = [100000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_call_create2.py b/tests/ported_static/byzantium/stStaticCall/test_static_call_create2.py index 98394b0847c..e3e6042acec 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_call_create2.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_call_create2.py @@ -77,7 +77,6 @@ def test_static_call_create2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) # Source: lll @@ -212,14 +211,12 @@ def test_static_call_create2( Hash(contract_2, left_padding=True), Hash(contract_3, left_padding=True), ] - tx_gas = [1000000] tx_value = [100000] tx = Transaction( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_call_ecrecover0_0input.py b/tests/ported_static/byzantium/stStaticCall/test_static_call_ecrecover0_0input.py index 3e8f4614d9f..ab48e049f48 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_call_ecrecover0_0input.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_call_ecrecover0_0input.py @@ -111,7 +111,6 @@ def test_static_call_ecrecover0_0input( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0xDE0B6B3A7640000) @@ -188,14 +187,12 @@ def test_static_call_ecrecover0_0input( Hash(0x7), Hash(0x8), ] - tx_gas = [3652240] tx_value = [100000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_call_with_high_value_and_gas_oog.py b/tests/ported_static/byzantium/stStaticCall/test_static_call_with_high_value_and_gas_oog.py index ddf1233324b..b9b063a0369 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_call_with_high_value_and_gas_oog.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_call_with_high_value_and_gas_oog.py @@ -69,7 +69,6 @@ def test_static_call_with_high_value_and_gas_oog( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) pre[sender] = Account(balance=0xDE0B6B3A7640000) @@ -191,14 +190,12 @@ def test_static_call_with_high_value_and_gas_oog( Hash(addr, left_padding=True), Hash(addr_2, left_padding=True), ] - tx_gas = [3000000] tx_value = [100000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_callcall_00_ooge.py b/tests/ported_static/byzantium/stStaticCall/test_static_callcall_00_ooge.py index 8ba69156208..56ca3d21b16 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_callcall_00_ooge.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_callcall_00_ooge.py @@ -66,7 +66,6 @@ def test_static_callcall_00_ooge( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -219,13 +218,11 @@ def test_static_callcall_00_ooge( Hash(addr, left_padding=True), Hash(addr_4, left_padding=True), ] - tx_gas = [1720000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_callcall_00_ooge_1.py b/tests/ported_static/byzantium/stStaticCall/test_static_callcall_00_ooge_1.py index 6a9d35e6368..9e7c78a719e 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_callcall_00_ooge_1.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_callcall_00_ooge_1.py @@ -66,7 +66,6 @@ def test_static_callcall_00_ooge_1( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_callcallcall_000_ooge.py b/tests/ported_static/byzantium/stStaticCall/test_static_callcallcall_000_ooge.py index 83d2fc21188..0213395e7e0 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_callcallcall_000_ooge.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_callcallcall_000_ooge.py @@ -66,7 +66,6 @@ def test_static_callcallcall_000_ooge( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -253,13 +252,11 @@ def test_static_callcallcall_000_ooge( Hash(addr, left_padding=True), Hash(addr_5, left_padding=True), ] - tx_gas = [1720000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_callcallcallcode_001_2.py b/tests/ported_static/byzantium/stStaticCall/test_static_callcallcallcode_001_2.py index f76a30dbfa5..f0c3f75f8bd 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_callcallcallcode_001_2.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_callcallcallcode_001_2.py @@ -66,7 +66,6 @@ def test_static_callcallcallcode_001_2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -270,13 +269,11 @@ def test_static_callcallcallcode_001_2( Hash(addr, left_padding=True), Hash(addr_5, left_padding=True), ] - tx_gas = [3000000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_callcallcode_01_2.py b/tests/ported_static/byzantium/stStaticCall/test_static_callcallcode_01_2.py index 66ab50c76f3..db5ae730a74 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_callcallcode_01_2.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_callcallcode_01_2.py @@ -66,7 +66,6 @@ def test_static_callcallcode_01_2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -191,13 +190,11 @@ def test_static_callcallcode_01_2( Hash(addr, left_padding=True), Hash(addr_4, left_padding=True), ] - tx_gas = [3000000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_callcallcodecall_010_2.py b/tests/ported_static/byzantium/stStaticCall/test_static_callcallcodecall_010_2.py index fbd6b903580..6ad489b5da7 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_callcallcodecall_010_2.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_callcallcodecall_010_2.py @@ -66,7 +66,6 @@ def test_static_callcallcodecall_010_2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -166,13 +165,11 @@ def test_static_callcallcodecall_010_2( Hash(addr, left_padding=True), Hash(addr_2, left_padding=True), ] - tx_gas = [3000000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_callcallcodecallcode_011_2.py b/tests/ported_static/byzantium/stStaticCall/test_static_callcallcodecallcode_011_2.py index a9751f80768..1bc4a71fbb4 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_callcallcodecallcode_011_2.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_callcallcodecallcode_011_2.py @@ -66,7 +66,6 @@ def test_static_callcallcodecallcode_011_2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -168,13 +167,11 @@ def test_static_callcallcodecallcode_011_2( Hash(addr_2, left_padding=True), Hash(addr_3, left_padding=True), ] - tx_gas = [3000000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_callcallcodecallcode_011_ooge_2.py b/tests/ported_static/byzantium/stStaticCall/test_static_callcallcodecallcode_011_ooge_2.py index 26f1bd02f04..bd05b1af8e8 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_callcallcodecallcode_011_ooge_2.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_callcallcodecallcode_011_ooge_2.py @@ -68,7 +68,6 @@ def test_static_callcallcodecallcode_011_ooge_2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_callcallcodecallcode_011_oogm_before2.py b/tests/ported_static/byzantium/stStaticCall/test_static_callcallcodecallcode_011_oogm_before2.py index 8d3516646cf..38e11a0e654 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_callcallcodecallcode_011_oogm_before2.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_callcallcodecallcode_011_oogm_before2.py @@ -74,7 +74,6 @@ def test_static_callcallcodecallcode_011_oogm_before2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_callcodecallcall_100_oogm_after_3.py b/tests/ported_static/byzantium/stStaticCall/test_static_callcodecallcall_100_oogm_after_3.py index 23f939bb74d..e8d2bff44d2 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_callcodecallcall_100_oogm_after_3.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_callcodecallcall_100_oogm_after_3.py @@ -68,7 +68,6 @@ def test_static_callcodecallcall_100_oogm_after_3( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) # Source: lll diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_callcodecallcodecall_110_suicide_middle.py b/tests/ported_static/byzantium/stStaticCall/test_static_callcodecallcodecall_110_suicide_middle.py index e2407d81b04..be6cedc0828 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_callcodecallcodecall_110_suicide_middle.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_callcodecallcodecall_110_suicide_middle.py @@ -45,7 +45,6 @@ def test_static_callcodecallcodecall_110_suicide_middle( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -116,7 +115,6 @@ def test_static_callcodecallcodecall_110_suicide_middle( sender=sender, to=target, data=Bytes(""), - gas_limit=3000000, ) post = {target: Account(balance=0xDE0B6B3A7640000)} diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_check_opcodes2.py b/tests/ported_static/byzantium/stStaticCall/test_static_check_opcodes2.py index 39abab90f7d..046b4b2db9f 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_check_opcodes2.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_check_opcodes2.py @@ -117,7 +117,6 @@ def test_static_check_opcodes2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0xE8D4A51000) @@ -524,14 +523,12 @@ def test_static_check_opcodes2( Hash(addr_4, left_padding=True), Hash(addr_5, left_padding=True), ] - tx_gas = [335000] tx_value = [0, 100] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_check_opcodes3.py b/tests/ported_static/byzantium/stStaticCall/test_static_check_opcodes3.py index 67c36145697..eba2670d697 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_check_opcodes3.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_check_opcodes3.py @@ -117,7 +117,6 @@ def test_static_check_opcodes3( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0xE8D4A51000) @@ -562,14 +561,12 @@ def test_static_check_opcodes3( Hash(addr_4, left_padding=True), Hash(addr_5, left_padding=True), ] - tx_gas = [335000] tx_value = [0, 100] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/byzantium/stStaticCall/test_static_refund_call_to_suicide_twice.py b/tests/ported_static/byzantium/stStaticCall/test_static_refund_call_to_suicide_twice.py index 6860878412f..983f7024fa2 100644 --- a/tests/ported_static/byzantium/stStaticCall/test_static_refund_call_to_suicide_twice.py +++ b/tests/ported_static/byzantium/stStaticCall/test_static_refund_call_to_suicide_twice.py @@ -66,7 +66,6 @@ def test_static_refund_call_to_suicide_twice( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -147,14 +146,12 @@ def test_static_refund_call_to_suicide_twice( Hash(0x1F4), Hash(0x10000), ] - tx_gas = [10000000] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/constantinople/stCreate2/test_create2_init_codes.py b/tests/ported_static/constantinople/stCreate2/test_create2_init_codes.py index e1ad5fa965b..4b296e90b77 100644 --- a/tests/ported_static/constantinople/stCreate2/test_create2_init_codes.py +++ b/tests/ported_static/constantinople/stCreate2/test_create2_init_codes.py @@ -110,7 +110,6 @@ def test_create2_init_codes( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) pre[sender] = Account(balance=0xDE0B6B3A7640000) @@ -263,14 +262,12 @@ def test_create2_init_codes( ) + Op.STOP, ] - tx_gas = [800000] tx_value = [1] tx = Transaction( sender=sender, to=None, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/constantinople/stCreate2/test_create2_smart_init_code.py b/tests/ported_static/constantinople/stCreate2/test_create2_smart_init_code.py index f63fd21214e..63effd6a139 100644 --- a/tests/ported_static/constantinople/stCreate2/test_create2_smart_init_code.py +++ b/tests/ported_static/constantinople/stCreate2/test_create2_smart_init_code.py @@ -82,7 +82,6 @@ def test_create2_smart_init_code( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=47244640256, ) pre[sender] = Account(balance=0x6400000000) @@ -180,21 +179,11 @@ def test_create2_smart_init_code( Hash(contract_0, left_padding=True), Hash(contract_1, left_padding=True), ] - # The d0 chain spills three `create_state_gas()` charges (two - # CREATE2 dispatches and the SELFDESTRUCT to a non-alive - # beneficiary) and two fresh SSTORE-set state costs into regular - # gas when the reservoir is empty. Lift the original budget by - # exactly that spilled state gas; 0 pre-EIP-8037. - outer_tx_gas = 400_000 + fork.oog_budget_lift( - creates_before_oog=3, sstores_before_oog=2 - ) - tx_gas = [outer_tx_gas] tx = Transaction( sender=sender, to=contract_2, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/constantinople/stCreate2/test_create2_suicide.py b/tests/ported_static/constantinople/stCreate2/test_create2_suicide.py index c2f522daf2a..b38017b4c22 100644 --- a/tests/ported_static/constantinople/stCreate2/test_create2_suicide.py +++ b/tests/ported_static/constantinople/stCreate2/test_create2_suicide.py @@ -121,11 +121,8 @@ 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) @@ -139,7 +136,6 @@ def test_create2_suicide( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0xE8D4A51000) @@ -358,14 +354,12 @@ def test_create2_suicide( ) + Op.STOP, ] - tx_gas = [outer_tx_gas] tx_value = [10] tx = Transaction( sender=sender, to=None, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/constantinople/stCreate2/test_create2collision_balance.py b/tests/ported_static/constantinople/stCreate2/test_create2collision_balance.py index b5b06b533e8..0f5c4d49f83 100644 --- a/tests/ported_static/constantinople/stCreate2/test_create2collision_balance.py +++ b/tests/ported_static/constantinople/stCreate2/test_create2collision_balance.py @@ -89,7 +89,6 @@ def test_create2collision_balance( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) pre[sender] = Account(balance=0xDE0B6B3A7640000) @@ -184,19 +183,12 @@ def test_create2collision_balance( + Op.STOP, Op.CREATE2(value=0x1, offset=0x0, size=0x0, salt=0x0) + Op.STOP, ] - # 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( sender=sender, to=None, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/constantinople/stCreate2/test_create2collision_code2.py b/tests/ported_static/constantinople/stCreate2/test_create2collision_code2.py index 6d1bb84bfa3..b06f4772307 100644 --- a/tests/ported_static/constantinople/stCreate2/test_create2collision_code2.py +++ b/tests/ported_static/constantinople/stCreate2/test_create2collision_code2.py @@ -75,7 +75,6 @@ def test_create2collision_code2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) pre[sender] = Account(balance=0xDE0B6B3A7640000) @@ -126,19 +125,12 @@ def test_create2collision_code2( + Op.CREATE2(value=0x1, offset=0x14, size=0xC, salt=0x0) + Op.STOP, ] - # 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( sender=sender, to=None, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/constantinople/stCreate2/test_create2collision_selfdestructed.py b/tests/ported_static/constantinople/stCreate2/test_create2collision_selfdestructed.py index 16263ba244b..6fee0a68f0c 100644 --- a/tests/ported_static/constantinople/stCreate2/test_create2collision_selfdestructed.py +++ b/tests/ported_static/constantinople/stCreate2/test_create2collision_selfdestructed.py @@ -84,7 +84,6 @@ def test_create2collision_selfdestructed( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) pre[sender] = Account(balance=0xDE0B6B3A7640000) @@ -164,10 +163,8 @@ def test_create2collision_selfdestructed( # inner CALL over their original budgets on Amsterdam. Pre-EIP-8037 # forks keep the original tuned values. inner_call_gas = 0xC350 - outer_tx_gas = 400_000 if fork.is_eip_enabled(8037): inner_call_gas = 0x40000 - outer_tx_gas = 1_000_000 tx_data = [ Op.POP( @@ -212,14 +209,12 @@ def test_create2collision_selfdestructed( + Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0) + Op.STOP, ] - tx_gas = [outer_tx_gas] tx_value = [1] tx = Transaction( sender=sender, to=None, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/constantinople/stCreate2/test_create2collision_selfdestructed2.py b/tests/ported_static/constantinople/stCreate2/test_create2collision_selfdestructed2.py index cc5a26cde9a..bbc17c4ec37 100644 --- a/tests/ported_static/constantinople/stCreate2/test_create2collision_selfdestructed2.py +++ b/tests/ported_static/constantinople/stCreate2/test_create2collision_selfdestructed2.py @@ -76,7 +76,6 @@ def test_create2collision_selfdestructed2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) pre[sender] = Account(balance=0xDE0B6B3A7640000) @@ -133,10 +132,8 @@ def test_create2collision_selfdestructed2( # inner CALL over their original budgets on Amsterdam. Pre-EIP-8037 # forks keep the original tuned values. inner_call_gas = 0xC350 - outer_tx_gas = 400_000 if fork.is_eip_enabled(8037): inner_call_gas = 0x40000 - outer_tx_gas = 1_000_000 tx_data = [ Op.POP( @@ -168,13 +165,11 @@ def test_create2collision_selfdestructed2( + Op.CREATE2(value=0x0, offset=0x14, size=0xC, salt=0x0) + Op.STOP, ] - tx_gas = [outer_tx_gas] tx = Transaction( sender=sender, to=None, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/constantinople/stCreate2/test_returndatacopy_following_create.py b/tests/ported_static/constantinople/stCreate2/test_returndatacopy_following_create.py index 323a9dda6c8..17df53f1b8f 100644 --- a/tests/ported_static/constantinople/stCreate2/test_returndatacopy_following_create.py +++ b/tests/ported_static/constantinople/stCreate2/test_returndatacopy_following_create.py @@ -71,7 +71,6 @@ def test_returndatacopy_following_create( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=47244640256, ) pre[sender] = Account(balance=0x6400000000) @@ -150,13 +149,11 @@ def test_returndatacopy_following_create( Hash(contract_1, left_padding=True), Hash(contract_2, left_padding=True), ] - tx_gas = [100000] tx = Transaction( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_addmod_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_addmod_non_const.py index fae816dfd1e..437ede0809f 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_addmod_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_addmod_non_const.py @@ -65,7 +65,6 @@ def test_addmod_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -102,14 +101,12 @@ def test_addmod_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_and_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_and_non_const.py index 8eb6f763863..80a3262e0bd 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_and_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_and_non_const.py @@ -65,7 +65,6 @@ def test_and_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_and_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_balance_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_balance_non_const.py index ae940bbaa03..6f1c47fd27e 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_balance_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_balance_non_const.py @@ -65,7 +65,6 @@ def test_balance_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -102,14 +101,12 @@ def test_balance_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_byte_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_byte_non_const.py index 544001d697d..52b40ffaebc 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_byte_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_byte_non_const.py @@ -65,7 +65,6 @@ def test_byte_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_byte_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_call_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_call_non_const.py index a8e915e499a..dd7c8b601b9 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_call_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_call_non_const.py @@ -65,7 +65,6 @@ def test_call_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -120,14 +119,12 @@ def test_call_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_callcode_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_callcode_non_const.py index e24b3d5f963..c08aa9b6505 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_callcode_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_callcode_non_const.py @@ -65,7 +65,6 @@ def test_callcode_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -120,14 +119,12 @@ def test_callcode_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_calldatacopy_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_calldatacopy_non_const.py index 9a0b8f9f9c2..c7a7d37affa 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_calldatacopy_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_calldatacopy_non_const.py @@ -77,7 +77,6 @@ def test_calldatacopy_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -118,14 +117,12 @@ def test_calldatacopy_non_const( Bytes(""), Bytes("11223344"), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_calldataload_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_calldataload_non_const.py index dc0f8b82b2e..2eecae900d5 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_calldataload_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_calldataload_non_const.py @@ -80,7 +80,6 @@ def test_calldataload_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) pre[sender] = Account(balance=0xDE0B6B3A7640000) @@ -141,14 +140,12 @@ def test_calldataload_non_const( Bytes(""), Bytes("11223344"), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_codecopy_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_codecopy_non_const.py index c097c5f467e..3586854d040 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_codecopy_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_codecopy_non_const.py @@ -65,7 +65,6 @@ def test_codecopy_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -105,14 +104,12 @@ def test_codecopy_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_create_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_create_non_const.py index 5106ec78a51..555548a4d7d 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_create_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_create_non_const.py @@ -67,7 +67,6 @@ def test_create_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -122,14 +121,12 @@ def test_create_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_delegatecall_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_delegatecall_non_const.py index 2fc22d2747d..14e42fb0f55 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_delegatecall_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_delegatecall_non_const.py @@ -65,7 +65,6 @@ def test_delegatecall_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -117,14 +116,12 @@ def test_delegatecall_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_div_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_div_non_const.py index 754da2814ab..30f28645e64 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_div_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_div_non_const.py @@ -65,7 +65,6 @@ def test_div_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_div_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_eq_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_eq_non_const.py index 09c30fc9052..b7805956038 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_eq_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_eq_non_const.py @@ -65,7 +65,6 @@ def test_eq_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_eq_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_exp_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_exp_non_const.py index 72f6aace5a0..fbf61c23f29 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_exp_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_exp_non_const.py @@ -65,7 +65,6 @@ def test_exp_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_exp_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_extcodecopy_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_extcodecopy_non_const.py index 1b0cd7e9c8c..6daa9176235 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_extcodecopy_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_extcodecopy_non_const.py @@ -65,7 +65,6 @@ def test_extcodecopy_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -108,14 +107,12 @@ def test_extcodecopy_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_extcodesize_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_extcodesize_non_const.py index e67e53ea57c..5092c01a211 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_extcodesize_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_extcodesize_non_const.py @@ -65,7 +65,6 @@ def test_extcodesize_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -102,14 +101,12 @@ def test_extcodesize_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_gt_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_gt_non_const.py index d8db68a6f82..ce7d3caa32e 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_gt_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_gt_non_const.py @@ -65,7 +65,6 @@ def test_gt_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_gt_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_iszero_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_iszero_non_const.py index dc4585cd190..9325a7bdd80 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_iszero_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_iszero_non_const.py @@ -65,7 +65,6 @@ def test_iszero_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -100,14 +99,12 @@ def test_iszero_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_jump_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_jump_non_const.py index a7a6d0ed8b7..c5f03da52ad 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_jump_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_jump_non_const.py @@ -65,7 +65,6 @@ def test_jump_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -97,14 +96,12 @@ def test_jump_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_jumpi_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_jumpi_non_const.py index 8ad626d763f..72c8a6812e9 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_jumpi_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_jumpi_non_const.py @@ -65,7 +65,6 @@ def test_jumpi_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -100,14 +99,12 @@ def test_jumpi_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_log0_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_log0_non_const.py index 365c39eaccf..8d37d3ca531 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_log0_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_log0_non_const.py @@ -65,7 +65,6 @@ def test_log0_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -102,14 +101,12 @@ def test_log0_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_log1_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_log1_non_const.py index 83826d6f6b3..45c5f46cecb 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_log1_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_log1_non_const.py @@ -65,7 +65,6 @@ def test_log1_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -105,14 +104,12 @@ def test_log1_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_log2_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_log2_non_const.py index 418cb6e8be0..edd9d7d91c7 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_log2_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_log2_non_const.py @@ -65,7 +65,6 @@ def test_log2_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -106,14 +105,12 @@ def test_log2_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_log3_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_log3_non_const.py index 4a34ed3a76c..d4de37cd628 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_log3_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_log3_non_const.py @@ -65,7 +65,6 @@ def test_log3_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -109,14 +108,12 @@ def test_log3_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_lt_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_lt_non_const.py index 34354330ff4..7913a4844cb 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_lt_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_lt_non_const.py @@ -65,7 +65,6 @@ def test_lt_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_lt_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_mload_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_mload_non_const.py index 244fefd710b..39a75e3176d 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_mload_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_mload_non_const.py @@ -65,7 +65,6 @@ def test_mload_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -102,14 +101,12 @@ def test_mload_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_mod_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_mod_non_const.py index bda76416253..50acb179a99 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_mod_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_mod_non_const.py @@ -65,7 +65,6 @@ def test_mod_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_mod_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_mstore8_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_mstore8_non_const.py index 0447a50df4c..459af48c7de 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_mstore8_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_mstore8_non_const.py @@ -65,7 +65,6 @@ def test_mstore8_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -102,14 +101,12 @@ def test_mstore8_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_mstore_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_mstore_non_const.py index 8b021a9b2cd..52b074cedec 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_mstore_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_mstore_non_const.py @@ -65,7 +65,6 @@ def test_mstore_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -102,14 +101,12 @@ def test_mstore_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_mul_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_mul_non_const.py index 76886038831..eb9bec06825 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_mul_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_mul_non_const.py @@ -65,7 +65,6 @@ def test_mul_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_mul_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_mulmod_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_mulmod_non_const.py index cd61591b4c6..7c4e02af107 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_mulmod_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_mulmod_non_const.py @@ -65,7 +65,6 @@ def test_mulmod_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -102,14 +101,12 @@ def test_mulmod_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_not_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_not_non_const.py index 5ff4ec0e605..a0b78e4d054 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_not_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_not_non_const.py @@ -68,7 +68,6 @@ def test_not_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) pre[sender] = Account(balance=0xDE0B6B3A7640000) @@ -116,14 +115,12 @@ def test_not_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_or_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_or_non_const.py index 343f19c2fec..fd2b55dca59 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_or_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_or_non_const.py @@ -65,7 +65,6 @@ def test_or_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_or_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_return_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_return_non_const.py index 4e790b391e0..a6f3ddb53f5 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_return_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_return_non_const.py @@ -65,7 +65,6 @@ def test_return_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -102,14 +101,12 @@ def test_return_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_sdiv_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_sdiv_non_const.py index fe11f8c49a8..80eaca3c2c0 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_sdiv_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_sdiv_non_const.py @@ -65,7 +65,6 @@ def test_sdiv_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_sdiv_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_sgt_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_sgt_non_const.py index 8e955bebd63..9b044e6fb75 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_sgt_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_sgt_non_const.py @@ -65,7 +65,6 @@ def test_sgt_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_sgt_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_sha3_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_sha3_non_const.py index 6efbe2105b6..909ffd232eb 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_sha3_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_sha3_non_const.py @@ -68,7 +68,6 @@ def test_sha3_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) pre[sender] = Account(balance=0xDE0B6B3A7640000) @@ -121,14 +120,12 @@ def test_sha3_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_signext_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_signext_non_const.py index ca26efca5c8..18a9e761c7d 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_signext_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_signext_non_const.py @@ -65,7 +65,6 @@ def test_signext_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_signext_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_sload_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_sload_non_const.py index 253acce3f33..f90c460acd3 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_sload_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_sload_non_const.py @@ -65,7 +65,6 @@ def test_sload_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -102,14 +101,12 @@ def test_sload_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_slt_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_slt_non_const.py index 4785add59ca..c49edf8db20 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_slt_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_slt_non_const.py @@ -65,7 +65,6 @@ def test_slt_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_slt_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_smod_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_smod_non_const.py index 1408d1dbfb2..47e7ce331c4 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_smod_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_smod_non_const.py @@ -65,7 +65,6 @@ def test_smod_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_smod_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_sstore_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_sstore_non_const.py index 8f1e6ba7914..a29824e9e0f 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_sstore_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_sstore_non_const.py @@ -65,7 +65,6 @@ def test_sstore_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -100,14 +99,12 @@ def test_sstore_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_sub_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_sub_non_const.py index 311cc71bfa2..92d05ef2b5d 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_sub_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_sub_non_const.py @@ -65,7 +65,6 @@ def test_sub_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_sub_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_suicide_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_suicide_non_const.py index 3455d3a644b..95f8b1ab5c5 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_suicide_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_suicide_non_const.py @@ -63,7 +63,6 @@ def test_suicide_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -82,7 +81,6 @@ def test_suicide_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( @@ -90,7 +88,6 @@ def test_suicide_non_const( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], ) diff --git a/tests/ported_static/frontier/stArgsZeroOneBalance/test_xor_non_const.py b/tests/ported_static/frontier/stArgsZeroOneBalance/test_xor_non_const.py index 1ca082aca84..3bcffc85928 100644 --- a/tests/ported_static/frontier/stArgsZeroOneBalance/test_xor_non_const.py +++ b/tests/ported_static/frontier/stArgsZeroOneBalance/test_xor_non_const.py @@ -65,7 +65,6 @@ def test_xor_non_const( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) # Source: lll @@ -101,14 +100,12 @@ def test_xor_non_const( tx_data = [ Bytes(""), ] - tx_gas = [400000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stCallCodes/test_callcode_dynamic_code.py b/tests/ported_static/frontier/stCallCodes/test_callcode_dynamic_code.py index 516596f0896..386be54b3ec 100644 --- a/tests/ported_static/frontier/stCallCodes/test_callcode_dynamic_code.py +++ b/tests/ported_static/frontier/stCallCodes/test_callcode_dynamic_code.py @@ -105,7 +105,6 @@ def test_callcode_dynamic_code( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0x2386F26FC10000) @@ -375,19 +374,10 @@ def test_callcode_dynamic_code( Hash(contract_3, left_padding=True), Hash(contract_4, left_padding=True), ] - # d2/d3 parametrizations do double-nested CREATE chains; EIP-8037 - # NEW_ACCOUNT state-gas spill on Amsterdam exceeds the original - # 1 000 000 budget. - outer_tx_gas = 1_000_000 - if fork.is_eip_enabled(8037): - outer_tx_gas = 6_000_000 - tx_gas = [outer_tx_gas] - tx = Transaction( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/frontier/stCallCodes/test_callcode_dynamic_code2_self_call.py b/tests/ported_static/frontier/stCallCodes/test_callcode_dynamic_code2_self_call.py index 0f5363e7c6f..29e9eda2369 100644 --- a/tests/ported_static/frontier/stCallCodes/test_callcode_dynamic_code2_self_call.py +++ b/tests/ported_static/frontier/stCallCodes/test_callcode_dynamic_code2_self_call.py @@ -91,7 +91,6 @@ def test_callcode_dynamic_code2_self_call( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0x2386F26FC10000) @@ -217,13 +216,11 @@ def test_callcode_dynamic_code2_self_call( Hash(contract_1, left_padding=True), Hash(contract_2, left_padding=True), ] - tx_gas = [1453081] tx = Transaction( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/frontier/stCallCodes/test_callcode_in_initcode_to_empty_contract.py b/tests/ported_static/frontier/stCallCodes/test_callcode_in_initcode_to_empty_contract.py index 045972d37f5..2e477d84863 100644 --- a/tests/ported_static/frontier/stCallCodes/test_callcode_in_initcode_to_empty_contract.py +++ b/tests/ported_static/frontier/stCallCodes/test_callcode_in_initcode_to_empty_contract.py @@ -62,11 +62,8 @@ 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) @@ -83,7 +80,6 @@ def test_callcode_in_initcode_to_empty_contract( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0x2386F26FC10000) @@ -186,13 +182,11 @@ def test_callcode_in_initcode_to_empty_contract( Hash(contract_1, left_padding=True), Hash(contract_2, left_padding=True), ] - tx_gas = [outer_tx_gas] tx = Transaction( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/frontier/stCallCodes/test_callcode_in_initcode_to_exis_contract_with_v_transfer_ne_money.py b/tests/ported_static/frontier/stCallCodes/test_callcode_in_initcode_to_exis_contract_with_v_transfer_ne_money.py index 12715a68d24..8743d2abca4 100644 --- a/tests/ported_static/frontier/stCallCodes/test_callcode_in_initcode_to_exis_contract_with_v_transfer_ne_money.py +++ b/tests/ported_static/frontier/stCallCodes/test_callcode_in_initcode_to_exis_contract_with_v_transfer_ne_money.py @@ -75,7 +75,6 @@ def test_callcode_in_initcode_to_exis_contract_with_v_transfer_ne_money( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) pre[sender] = Account(balance=0x2386F26FC10000) @@ -183,13 +182,11 @@ def test_callcode_in_initcode_to_exis_contract_with_v_transfer_ne_money( Hash(contract_1, left_padding=True), Hash(contract_2, left_padding=True), ] - tx_gas = [1000000] tx = Transaction( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/frontier/stCallCodes/test_callcodecallcodecallcode_111_suicide_middle.py b/tests/ported_static/frontier/stCallCodes/test_callcodecallcodecallcode_111_suicide_middle.py index 8292970f741..c9ce29f4c67 100644 --- a/tests/ported_static/frontier/stCallCodes/test_callcodecallcodecallcode_111_suicide_middle.py +++ b/tests/ported_static/frontier/stCallCodes/test_callcodecallcodecallcode_111_suicide_middle.py @@ -44,7 +44,6 @@ def test_callcodecallcodecallcode_111_suicide_middle( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -124,7 +123,6 @@ def test_callcodecallcodecallcode_111_suicide_middle( sender=sender, to=target, data=Bytes(""), - gas_limit=3000000, ) post = { diff --git a/tests/ported_static/frontier/stCallCreateCallCodeTest/test_call_with_high_value_and_gas_oog.py b/tests/ported_static/frontier/stCallCreateCallCodeTest/test_call_with_high_value_and_gas_oog.py index 5240cae80cd..2349cd4f924 100644 --- a/tests/ported_static/frontier/stCallCreateCallCodeTest/test_call_with_high_value_and_gas_oog.py +++ b/tests/ported_static/frontier/stCallCreateCallCodeTest/test_call_with_high_value_and_gas_oog.py @@ -70,7 +70,6 @@ def test_call_with_high_value_and_gas_oog( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) pre[sender] = Account(balance=0x3635C9ADC5DEA00000) @@ -146,14 +145,12 @@ def test_call_with_high_value_and_gas_oog( tx_data = [ Bytes(""), ] - tx_gas = [6000000] tx_value = [100000, 100000000000000000000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stCallCreateCallCodeTest/test_call_with_high_value_and_oo_gat_tx_level.py b/tests/ported_static/frontier/stCallCreateCallCodeTest/test_call_with_high_value_and_oo_gat_tx_level.py index d105d652d73..11fe86932bf 100644 --- a/tests/ported_static/frontier/stCallCreateCallCodeTest/test_call_with_high_value_and_oo_gat_tx_level.py +++ b/tests/ported_static/frontier/stCallCreateCallCodeTest/test_call_with_high_value_and_oo_gat_tx_level.py @@ -67,7 +67,6 @@ def test_call_with_high_value_and_oo_gat_tx_level( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: raw @@ -121,14 +120,12 @@ def test_call_with_high_value_and_oo_gat_tx_level( tx_data = [ Bytes(""), ] - tx_gas = [3000000] tx_value = [0, 1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stCallCreateCallCodeTest/test_create_fail_balance_too_low.py b/tests/ported_static/frontier/stCallCreateCallCodeTest/test_create_fail_balance_too_low.py index 89438cb2af2..23b2b0fb2b3 100644 --- a/tests/ported_static/frontier/stCallCreateCallCodeTest/test_create_fail_balance_too_low.py +++ b/tests/ported_static/frontier/stCallCreateCallCodeTest/test_create_fail_balance_too_low.py @@ -64,11 +64,6 @@ 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( @@ -81,7 +76,6 @@ def test_create_fail_balance_too_low( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xDE0B6B3A7640000) @@ -130,14 +124,12 @@ def test_create_fail_balance_too_low( tx_data = [ Bytes(""), ] - tx_gas = [outer_tx_gas] tx_value = [23, 24] tx = Transaction( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stCreateTest/test_code_in_constructor.py b/tests/ported_static/frontier/stCreateTest/test_code_in_constructor.py index 9227244b39b..c48b17202fb 100644 --- a/tests/ported_static/frontier/stCreateTest/test_code_in_constructor.py +++ b/tests/ported_static/frontier/stCreateTest/test_code_in_constructor.py @@ -294,13 +294,11 @@ def test_code_in_constructor( Bytes("83c7d758") + Hash(0x1), Bytes("83c7d758") + Hash(0x2), ] - tx_gas = [9437184] tx = Transaction( sender=sender, to=contract_1, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/frontier/stCreateTest/test_create_transaction_high_nonce.py b/tests/ported_static/frontier/stCreateTest/test_create_transaction_high_nonce.py index da3ad39d2b8..40cf7e8e52c 100644 --- a/tests/ported_static/frontier/stCreateTest/test_create_transaction_high_nonce.py +++ b/tests/ported_static/frontier/stCreateTest/test_create_transaction_high_nonce.py @@ -72,7 +72,6 @@ def test_create_transaction_high_nonce( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) expect_entries_: list[dict] = [ @@ -91,22 +90,12 @@ def test_create_transaction_high_nonce( tx_data = [ Op.RETURN(offset=0x0, size=0x1), ] - # Original budget (90 000) is below the EIP-8037 intrinsic-gas - # floor for a create tx on Amsterdam, so the tx is rejected for - # `INTRINSIC_GAS_TOO_LOW` before the NONCE_IS_MAX check this test - # asserts ever runs. Bump on Amsterdam to clear the floor; pre- - # EIP-8037 forks keep the original. - nonce_check_tx_gas = 90000 - if fork.is_eip_enabled(8037): - nonce_check_tx_gas = 500000 - tx_gas = [nonce_check_tx_gas] tx_value = [0, 1] tx = Transaction( sender=sender, to=None, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], nonce=18446744073709551615, error=TransactionException.NONCE_IS_MAX, diff --git a/tests/ported_static/frontier/stExample/test_labels_example.py b/tests/ported_static/frontier/stExample/test_labels_example.py index f78d807ae82..214820a52c8 100644 --- a/tests/ported_static/frontier/stExample/test_labels_example.py +++ b/tests/ported_static/frontier/stExample/test_labels_example.py @@ -138,14 +138,12 @@ def test_labels_example( Bytes("03"), Bytes("03"), ] - tx_gas = [400000] tx_value = [100000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stExample/test_ranges_example.py b/tests/ported_static/frontier/stExample/test_ranges_example.py index 25cf6aa2ded..1bf3bc175f1 100644 --- a/tests/ported_static/frontier/stExample/test_ranges_example.py +++ b/tests/ported_static/frontier/stExample/test_ranges_example.py @@ -258,14 +258,12 @@ def test_ranges_example( Bytes("01"), Bytes("04"), ] - tx_gas = [400000, 1400000, 2400000] tx_value = [100000, 200000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stMemoryStressTest/test_fill_stack.py b/tests/ported_static/frontier/stMemoryStressTest/test_fill_stack.py index ecb5ba40c04..26bf603f984 100644 --- a/tests/ported_static/frontier/stMemoryStressTest/test_fill_stack.py +++ b/tests/ported_static/frontier/stMemoryStressTest/test_fill_stack.py @@ -65,7 +65,6 @@ def test_fill_stack( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=9223372036854775807, ) # Source: raw @@ -160,14 +159,12 @@ def test_fill_stack( "5b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3504357155320803a97" # noqa: E501 ), ] - tx_gas = [3141592, 16777216] tx_value = [264050067] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stMemoryStressTest/test_mload32bit_bound.py b/tests/ported_static/frontier/stMemoryStressTest/test_mload32bit_bound.py index 5763dad5154..e1c0c2d08ce 100644 --- a/tests/ported_static/frontier/stMemoryStressTest/test_mload32bit_bound.py +++ b/tests/ported_static/frontier/stMemoryStressTest/test_mload32bit_bound.py @@ -65,7 +65,6 @@ def test_mload32bit_bound( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=17592320524892, ) # Source: lll @@ -108,14 +107,12 @@ def test_mload32bit_bound( tx_data = [ Bytes(""), ] - tx_gas = [150000, 16777216] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stMemoryStressTest/test_mload32bit_bound2.py b/tests/ported_static/frontier/stMemoryStressTest/test_mload32bit_bound2.py index 322e11428e8..47294dfc18a 100644 --- a/tests/ported_static/frontier/stMemoryStressTest/test_mload32bit_bound2.py +++ b/tests/ported_static/frontier/stMemoryStressTest/test_mload32bit_bound2.py @@ -65,7 +65,6 @@ def test_mload32bit_bound2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=37791080412587, ) # Source: lll @@ -108,14 +107,12 @@ def test_mload32bit_bound2( tx_data = [ Bytes(""), ] - tx_gas = [150000, 16777216] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stMemoryStressTest/test_mload32bit_bound_msize.py b/tests/ported_static/frontier/stMemoryStressTest/test_mload32bit_bound_msize.py index ccff8e7bdf2..9fd4b06a233 100644 --- a/tests/ported_static/frontier/stMemoryStressTest/test_mload32bit_bound_msize.py +++ b/tests/ported_static/frontier/stMemoryStressTest/test_mload32bit_bound_msize.py @@ -65,7 +65,6 @@ def test_mload32bit_bound_msize( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=175923205248920000, ) # Source: lll @@ -110,13 +109,11 @@ def test_mload32bit_bound_msize( tx_data = [ Bytes(""), ] - tx_gas = [150000, 16777216] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/frontier/stMemoryTest/test_buffer.py b/tests/ported_static/frontier/stMemoryTest/test_buffer.py index e8eb1086eaf..615779bda00 100644 --- a/tests/ported_static/frontier/stMemoryTest/test_buffer.py +++ b/tests/ported_static/frontier/stMemoryTest/test_buffer.py @@ -2146,7 +2146,6 @@ def test_buffer( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -3484,14 +3483,12 @@ def test_buffer( Bytes("1a8451e6") + Hash(0xFF) + Hash(0x1B), Bytes("1a8451e6") + Hash(0xFF) + Hash(0x1C), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_3, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stMemoryTest/test_buffer_src_offset.py b/tests/ported_static/frontier/stMemoryTest/test_buffer_src_offset.py index 1a644f966f1..bf437e84a29 100644 --- a/tests/ported_static/frontier/stMemoryTest/test_buffer_src_offset.py +++ b/tests/ported_static/frontier/stMemoryTest/test_buffer_src_offset.py @@ -776,7 +776,6 @@ def test_buffer_src_offset( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -1316,14 +1315,12 @@ def test_buffer_src_offset( Bytes("048071d3") + Hash(0x13E) + Hash(0xA) + Hash(0x1), Bytes("048071d3") + Hash(0x13E) + Hash(0xB) + Hash(0x1), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_1, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stPreCompiledContracts2/test_call_ecrecover_overflow.py b/tests/ported_static/frontier/stPreCompiledContracts2/test_call_ecrecover_overflow.py index f88c2d7b053..ff5fbc274dd 100644 --- a/tests/ported_static/frontier/stPreCompiledContracts2/test_call_ecrecover_overflow.py +++ b/tests/ported_static/frontier/stPreCompiledContracts2/test_call_ecrecover_overflow.py @@ -281,22 +281,12 @@ def test_call_ecrecover_overflow( 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD036413F ), ] - # On Amsterdam the two outer SSTOREs that wrap the inner ecrecover - # CALL each accumulate EIP-8037 per-storage state-gas (37 568) that - # spills back into regular gas once the empty reservoir is drained, - # pushing the tx over the original 100 000 budget. Bump on EIP-8037 - # only; pre-EIP-8037 forks keep the original. - outer_tx_gas = 100000 - if fork.is_eip_enabled(8037): - outer_tx_gas = 500000 - tx_gas = [outer_tx_gas] tx_value = [100000] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stPreCompiledContracts2/test_ecrecover_weird_v.py b/tests/ported_static/frontier/stPreCompiledContracts2/test_ecrecover_weird_v.py index 3a607960508..a73206a8e74 100644 --- a/tests/ported_static/frontier/stPreCompiledContracts2/test_ecrecover_weird_v.py +++ b/tests/ported_static/frontier/stPreCompiledContracts2/test_ecrecover_weird_v.py @@ -273,7 +273,6 @@ def test_ecrecover_weird_v( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=71794957647893862, ) pre[coinbase] = Account(balance=0, nonce=1) @@ -704,13 +703,11 @@ def test_ecrecover_weird_v( 0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5 ), ] - tx_gas = [16777216] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], nonce=1, error=_exc, ) diff --git a/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000.py b/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000.py index b250e191052..414b1e06b77 100644 --- a/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000.py +++ b/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000.py @@ -70,7 +70,6 @@ def test_call50000( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=860000000, ) addr = pre.fund_eoa(amount=7000) @@ -139,14 +138,12 @@ def test_call50000( tx_data = [ Bytes(""), ] - tx_gas = [150000, 250000000] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_ecrec.py b/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_ecrec.py index 5ef0eba7901..5eeb7e77332 100644 --- a/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_ecrec.py +++ b/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_ecrec.py @@ -67,7 +67,6 @@ def test_call50000_ecrec( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=3000000000, ) # Source: lll @@ -134,14 +133,12 @@ def test_call50000_ecrec( tx_data = [ Bytes(""), ] - tx_gas = [150000, 250000000] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_identity.py b/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_identity.py index 6d52d835c00..639c7d2bf52 100644 --- a/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_identity.py +++ b/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_identity.py @@ -67,7 +67,6 @@ def test_call50000_identity( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=882500000, ) # Source: lll @@ -134,14 +133,12 @@ def test_call50000_identity( tx_data = [ Bytes(""), ] - tx_gas = [150000, 250000000] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_identity2.py b/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_identity2.py index f2d27a68845..80bc7726ca4 100644 --- a/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_identity2.py +++ b/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_identity2.py @@ -67,7 +67,6 @@ def test_call50000_identity2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=882500000, ) # Source: lll @@ -136,14 +135,12 @@ def test_call50000_identity2( tx_data = [ Bytes(""), ] - tx_gas = [150000, 250000000] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_rip160.py b/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_rip160.py index 143a678a724..5465ffd70dd 100644 --- a/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_rip160.py +++ b/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_rip160.py @@ -67,7 +67,6 @@ def test_call50000_rip160( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=3925000000, ) # Source: lll @@ -134,14 +133,12 @@ def test_call50000_rip160( tx_data = [ Bytes(""), ] - tx_gas = [150000, 250000000] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_sha256.py b/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_sha256.py index 21b44470ceb..b60c8eef4f1 100644 --- a/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_sha256.py +++ b/tests/ported_static/frontier/stQuadraticComplexityTest/test_call50000_sha256.py @@ -71,7 +71,6 @@ def test_call50000_sha256( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=3925000000, ) pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF) @@ -146,14 +145,12 @@ def test_call50000_sha256( tx_data = [ Bytes(""), ] - tx_gas = [150000, 250000000] tx_value = [10] tx = Transaction( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stQuadraticComplexityTest/test_callcode50000.py b/tests/ported_static/frontier/stQuadraticComplexityTest/test_callcode50000.py index ad6b43a3b19..65d0fd960c6 100644 --- a/tests/ported_static/frontier/stQuadraticComplexityTest/test_callcode50000.py +++ b/tests/ported_static/frontier/stQuadraticComplexityTest/test_callcode50000.py @@ -70,7 +70,6 @@ def test_callcode50000( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=8600000000, ) addr = pre.fund_eoa(amount=7000) @@ -139,14 +138,12 @@ def test_callcode50000( tx_data = [ Bytes(""), ] - tx_gas = [150000, 250000000] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stQuadraticComplexityTest/test_create1000.py b/tests/ported_static/frontier/stQuadraticComplexityTest/test_create1000.py index 74c1e0f1112..adab4865645 100644 --- a/tests/ported_static/frontier/stQuadraticComplexityTest/test_create1000.py +++ b/tests/ported_static/frontier/stQuadraticComplexityTest/test_create1000.py @@ -69,7 +69,6 @@ def test_create1000( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=8600000000, ) # Source: lll @@ -161,14 +160,12 @@ def test_create1000( tx_data = [ Bytes(""), ] - tx_gas = [150000, 250000000] tx_value = [10] tx = Transaction( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stRefundTest/test_refund_call_to_suicide_no_storage.py b/tests/ported_static/frontier/stRefundTest/test_refund_call_to_suicide_no_storage.py index a374d190c0b..b2c34820c0c 100644 --- a/tests/ported_static/frontier/stRefundTest/test_refund_call_to_suicide_no_storage.py +++ b/tests/ported_static/frontier/stRefundTest/test_refund_call_to_suicide_no_storage.py @@ -65,7 +65,6 @@ def test_refund_call_to_suicide_no_storage( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -130,14 +129,12 @@ def test_refund_call_to_suicide_no_storage( Hash(0x1F4), Hash(0x10000), ] - tx_gas = [10000000] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stRefundTest/test_refund_call_to_suicide_storage.py b/tests/ported_static/frontier/stRefundTest/test_refund_call_to_suicide_storage.py index ebc41bce622..ac56c0815e1 100644 --- a/tests/ported_static/frontier/stRefundTest/test_refund_call_to_suicide_storage.py +++ b/tests/ported_static/frontier/stRefundTest/test_refund_call_to_suicide_storage.py @@ -65,7 +65,6 @@ def test_refund_call_to_suicide_storage( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -133,14 +132,12 @@ def test_refund_call_to_suicide_storage( Hash(0x1F4), Hash(0x10000), ] - tx_gas = [10000000] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stRefundTest/test_refund_call_to_suicide_twice.py b/tests/ported_static/frontier/stRefundTest/test_refund_call_to_suicide_twice.py index bbcce3a6ed0..9cc8854a3dd 100644 --- a/tests/ported_static/frontier/stRefundTest/test_refund_call_to_suicide_twice.py +++ b/tests/ported_static/frontier/stRefundTest/test_refund_call_to_suicide_twice.py @@ -65,7 +65,6 @@ def test_refund_call_to_suicide_twice( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -142,14 +141,12 @@ def test_refund_call_to_suicide_twice( Hash(0x1F4), Hash(0x10000), ] - tx_gas = [10000000] tx_value = [10] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stStackTests/test_underflow_test.py b/tests/ported_static/frontier/stStackTests/test_underflow_test.py index 92b79de5edb..b7dea155813 100644 --- a/tests/ported_static/frontier/stStackTests/test_underflow_test.py +++ b/tests/ported_static/frontier/stStackTests/test_underflow_test.py @@ -1053,7 +1053,6 @@ def test_underflow_test( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -4265,14 +4264,12 @@ def test_underflow_test( Bytes("693c6139") + Hash(addr_165, left_padding=True), Bytes("693c6139") + Hash(addr_166, left_padding=True), ] - tx_gas = [8000000] tx_value = [1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stSystemOperationsTest/test_double_selfdestruct_test.py b/tests/ported_static/frontier/stSystemOperationsTest/test_double_selfdestruct_test.py index 39db66c2be4..070d85854c6 100644 --- a/tests/ported_static/frontier/stSystemOperationsTest/test_double_selfdestruct_test.py +++ b/tests/ported_static/frontier/stSystemOperationsTest/test_double_selfdestruct_test.py @@ -277,14 +277,12 @@ def test_double_selfdestruct_test( Bytes("f41001c0de"), Bytes("fa1001c0de"), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_0, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], nonce=1, error=_exc, diff --git a/tests/ported_static/frontier/stSystemOperationsTest/test_multi_selfdestruct.py b/tests/ported_static/frontier/stSystemOperationsTest/test_multi_selfdestruct.py index 004c4a8b668..e42ec46fc5f 100644 --- a/tests/ported_static/frontier/stSystemOperationsTest/test_multi_selfdestruct.py +++ b/tests/ported_static/frontier/stSystemOperationsTest/test_multi_selfdestruct.py @@ -337,13 +337,11 @@ def test_multi_selfdestruct( Bytes("04"), Bytes("05"), ] - tx_gas = [10000000] tx = Transaction( sender=sender, to=contract_1, data=tx_data[d], - gas_limit=tx_gas[g], nonce=1, gas_price=1000, error=_exc, diff --git a/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_address.py b/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_address.py index 796435db593..a6e3a4125e6 100644 --- a/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_address.py +++ b/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_address.py @@ -42,7 +42,6 @@ def test_suicide_address( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) # Source: lll @@ -60,7 +59,6 @@ def test_suicide_address( sender=sender, to=target, data=Bytes(""), - gas_limit=1000000, value=0x186A0, ) diff --git a/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_caller.py b/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_caller.py index 9880f4a0ff3..93a3b07cf10 100644 --- a/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_caller.py +++ b/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_caller.py @@ -42,7 +42,6 @@ def test_suicide_caller( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) # Source: lll @@ -60,7 +59,6 @@ def test_suicide_caller( sender=sender, to=target, data=Bytes(""), - gas_limit=1000000, value=0x186A0, ) diff --git a/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_caller_addres_too_big_left.py b/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_caller_addres_too_big_left.py index 7e1323eede8..79dcf8263ec 100644 --- a/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_caller_addres_too_big_left.py +++ b/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_caller_addres_too_big_left.py @@ -48,7 +48,6 @@ def test_suicide_caller_addres_too_big_left( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0xDE0B6B3A7640000) @@ -68,7 +67,6 @@ def test_suicide_caller_addres_too_big_left( sender=sender, to=contract_0, data=Bytes(""), - gas_limit=1000000, value=0x186A0, ) diff --git a/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_origin.py b/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_origin.py index 37b981fe860..c9947047403 100644 --- a/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_origin.py +++ b/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_origin.py @@ -42,7 +42,6 @@ def test_suicide_origin( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) # Source: lll @@ -60,7 +59,6 @@ def test_suicide_origin( sender=sender, to=target, data=Bytes(""), - gas_limit=1000000, value=0x186A0, ) diff --git a/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_send_ether_to_me.py b/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_send_ether_to_me.py index 286f5b0a38b..35e939cc832 100644 --- a/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_send_ether_to_me.py +++ b/tests/ported_static/frontier/stSystemOperationsTest/test_suicide_send_ether_to_me.py @@ -42,7 +42,6 @@ def test_suicide_send_ether_to_me( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) # Source: lll @@ -58,7 +57,6 @@ def test_suicide_send_ether_to_me( sender=sender, to=target, data=Bytes(""), - gas_limit=1000000, value=0x186A0, ) diff --git a/tests/ported_static/frontier/stTransactionTest/test_opcodes_transaction_init.py b/tests/ported_static/frontier/stTransactionTest/test_opcodes_transaction_init.py index 13e8cae466a..f3f97f6ba23 100644 --- a/tests/ported_static/frontier/stTransactionTest/test_opcodes_transaction_init.py +++ b/tests/ported_static/frontier/stTransactionTest/test_opcodes_transaction_init.py @@ -852,7 +852,6 @@ def test_opcodes_transaction_init( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=1000000, ) pre[sender] = Account(balance=0xDE0B6B3A7640000, storage={0: 0}) @@ -1514,14 +1513,12 @@ def test_opcodes_transaction_init( ] # The d120 arm's nested CREATE adds a new-account state charge under # EIP-8037 (0 before); every other arm keeps the ported budget. - tx_gas = [400000 + (fork.create_state_gas() if d == 120 else 0)] tx_value = [100000] tx = Transaction( sender=sender, to=None, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/stTransactionTest/test_overflow_gas_require2.py b/tests/ported_static/frontier/stTransactionTest/test_overflow_gas_require2.py index 6b78f079f48..f1b6998d385 100644 --- a/tests/ported_static/frontier/stTransactionTest/test_overflow_gas_require2.py +++ b/tests/ported_static/frontier/stTransactionTest/test_overflow_gas_require2.py @@ -46,7 +46,6 @@ def test_overflow_gas_require2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=9223372036854775807, ) expect_entries_: list[dict] = [ @@ -76,7 +75,6 @@ def test_overflow_gas_require2( sender=sender, to=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B), data=Bytes("3240349548983454"), - gas_limit=1152921504606846976, gas_price=80, error=_exc, ) diff --git a/tests/ported_static/frontier/vmArithmeticTest/test_add.py b/tests/ported_static/frontier/vmArithmeticTest/test_add.py index 38a910bcf77..b0e1b0c051f 100644 --- a/tests/ported_static/frontier/vmArithmeticTest/test_add.py +++ b/tests/ported_static/frontier/vmArithmeticTest/test_add.py @@ -93,7 +93,6 @@ def test_add( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -240,14 +239,12 @@ def test_add( Bytes("693c6139") + Hash(0x3), Bytes("693c6139") + Hash(0x4), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_5, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmArithmeticTest/test_addmod.py b/tests/ported_static/frontier/vmArithmeticTest/test_addmod.py index 122864ca167..222161df72c 100644 --- a/tests/ported_static/frontier/vmArithmeticTest/test_addmod.py +++ b/tests/ported_static/frontier/vmArithmeticTest/test_addmod.py @@ -170,7 +170,6 @@ def test_addmod( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -501,14 +500,12 @@ def test_addmod( Bytes("693c6139") + Hash(0xE), Bytes("693c6139") + Hash(0xF), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_16, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmArithmeticTest/test_div.py b/tests/ported_static/frontier/vmArithmeticTest/test_div.py index 5a13e87254f..de790373f2f 100644 --- a/tests/ported_static/frontier/vmArithmeticTest/test_div.py +++ b/tests/ported_static/frontier/vmArithmeticTest/test_div.py @@ -111,7 +111,6 @@ def test_div( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -279,14 +278,12 @@ def test_div( Bytes("693c6139") + Hash(0x6), Bytes("693c6139") + Hash(0x7), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_8, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmArithmeticTest/test_exp.py b/tests/ported_static/frontier/vmArithmeticTest/test_exp.py index 5514c6d2f91..e40c6ea8374 100644 --- a/tests/ported_static/frontier/vmArithmeticTest/test_exp.py +++ b/tests/ported_static/frontier/vmArithmeticTest/test_exp.py @@ -135,7 +135,6 @@ def test_exp( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -355,14 +354,12 @@ def test_exp( Bytes("693c6139") + Hash(0x9), Bytes("693c6139") + Hash(0xA), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_11, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmArithmeticTest/test_mod.py b/tests/ported_static/frontier/vmArithmeticTest/test_mod.py index 44970acfe0f..f195f8dc904 100644 --- a/tests/ported_static/frontier/vmArithmeticTest/test_mod.py +++ b/tests/ported_static/frontier/vmArithmeticTest/test_mod.py @@ -100,7 +100,6 @@ def test_mod( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -256,14 +255,12 @@ def test_mod( Bytes("693c6139") + Hash(0x4), Bytes("693c6139") + Hash(0x5), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_6, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmArithmeticTest/test_mul.py b/tests/ported_static/frontier/vmArithmeticTest/test_mul.py index dd176fbf7cd..cee265f876a 100644 --- a/tests/ported_static/frontier/vmArithmeticTest/test_mul.py +++ b/tests/ported_static/frontier/vmArithmeticTest/test_mul.py @@ -121,7 +121,6 @@ def test_mul( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -365,14 +364,12 @@ def test_mul( Bytes("693c6139") + Hash(0x7), Bytes("693c6139") + Hash(0x8), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_9, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmArithmeticTest/test_mulmod.py b/tests/ported_static/frontier/vmArithmeticTest/test_mulmod.py index 173ad89d1cc..084a3efcf1e 100644 --- a/tests/ported_static/frontier/vmArithmeticTest/test_mulmod.py +++ b/tests/ported_static/frontier/vmArithmeticTest/test_mulmod.py @@ -167,7 +167,6 @@ def test_mulmod( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -520,14 +519,12 @@ def test_mulmod( Bytes("693c6139") + Hash(0xE), Bytes("693c6139") + Hash(0xD), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_16, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmArithmeticTest/test_sdiv.py b/tests/ported_static/frontier/vmArithmeticTest/test_sdiv.py index 7c360e52047..cc42a957af4 100644 --- a/tests/ported_static/frontier/vmArithmeticTest/test_sdiv.py +++ b/tests/ported_static/frontier/vmArithmeticTest/test_sdiv.py @@ -177,7 +177,6 @@ def test_sdiv( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -667,14 +666,12 @@ def test_sdiv( Bytes("693c6139") + Hash(0xE), Bytes("693c6139") + Hash(0x10), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_17, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmArithmeticTest/test_signextend.py b/tests/ported_static/frontier/vmArithmeticTest/test_signextend.py index d05e6c2c264..3feb01f0829 100644 --- a/tests/ported_static/frontier/vmArithmeticTest/test_signextend.py +++ b/tests/ported_static/frontier/vmArithmeticTest/test_signextend.py @@ -163,7 +163,6 @@ def test_signextend( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -519,14 +518,12 @@ def test_signextend( Bytes("693c6139") + Hash(0xD), Bytes("693c6139") + Hash(0xE), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_15, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmArithmeticTest/test_smod.py b/tests/ported_static/frontier/vmArithmeticTest/test_smod.py index 728f89a210b..5bc087d437d 100644 --- a/tests/ported_static/frontier/vmArithmeticTest/test_smod.py +++ b/tests/ported_static/frontier/vmArithmeticTest/test_smod.py @@ -100,7 +100,6 @@ def test_smod( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -264,14 +263,12 @@ def test_smod( Bytes("693c6139") + Hash(0x4), Bytes("693c6139") + Hash(0x5), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_6, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmArithmeticTest/test_sub.py b/tests/ported_static/frontier/vmArithmeticTest/test_sub.py index 2d8d2654766..b53cd17b2e4 100644 --- a/tests/ported_static/frontier/vmArithmeticTest/test_sub.py +++ b/tests/ported_static/frontier/vmArithmeticTest/test_sub.py @@ -93,7 +93,6 @@ def test_sub( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -242,14 +241,12 @@ def test_sub( Bytes("693c6139") + Hash(0x3), Bytes("693c6139") + Hash(0x4), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_5, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_and.py b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_and.py index 919c2763837..56b41de9342 100644 --- a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_and.py +++ b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_and.py @@ -93,7 +93,6 @@ def test_and( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -238,14 +237,12 @@ def test_and( Bytes("693c6139") + Hash(0x3), Bytes("693c6139") + Hash(0x4), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_5, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_byte.py b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_byte.py index 56887a82b99..b1fbd324789 100644 --- a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_byte.py +++ b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_byte.py @@ -142,7 +142,6 @@ def test_byte( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -457,14 +456,12 @@ def test_byte( Bytes("693c6139") + Hash(contract_10, left_padding=True), Bytes("693c6139") + Hash(contract_11, left_padding=True), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_12, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_eq.py b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_eq.py index 3c20ccd8773..072c87d0a1c 100644 --- a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_eq.py +++ b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_eq.py @@ -76,7 +76,6 @@ def test_eq( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -166,14 +165,12 @@ def test_eq( Bytes("693c6139") + Hash(0x1), Bytes("693c6139") + Hash(0x2), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_3, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_gt.py b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_gt.py index 06e1b39c681..3ace416f728 100644 --- a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_gt.py +++ b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_gt.py @@ -83,7 +83,6 @@ def test_gt( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -197,14 +196,12 @@ def test_gt( Bytes("693c6139") + Hash(0x2), Bytes("693c6139") + Hash(0x3), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_4, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_iszero.py b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_iszero.py index e83fe80b0d8..e7f6541a140 100644 --- a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_iszero.py +++ b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_iszero.py @@ -76,7 +76,6 @@ def test_iszero( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -162,14 +161,12 @@ def test_iszero( Bytes("693c6139") + Hash(0x1), Bytes("693c6139") + Hash(0x2), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_3, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_lt.py b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_lt.py index d2be95c3d03..6debbbfdc17 100644 --- a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_lt.py +++ b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_lt.py @@ -83,7 +83,6 @@ def test_lt( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -197,14 +196,12 @@ def test_lt( Bytes("693c6139") + Hash(0x2), Bytes("693c6139") + Hash(0x3), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_4, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_not.py b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_not.py index 4b4e07d8dd0..6996dd9fc66 100644 --- a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_not.py +++ b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_not.py @@ -100,7 +100,6 @@ def test_not( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -277,14 +276,12 @@ def test_not( Bytes("693c6139") + Hash(0x4), Bytes("693c6139") + Hash(0x5), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_6, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_or.py b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_or.py index 7fc19e60d81..f2a3c8d2a6b 100644 --- a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_or.py +++ b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_or.py @@ -100,7 +100,6 @@ def test_or( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -278,14 +277,12 @@ def test_or( Bytes("693c6139") + Hash(0x4), Bytes("693c6139") + Hash(0x5), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_6, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_sgt.py b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_sgt.py index 5164480e359..a224ee38e48 100644 --- a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_sgt.py +++ b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_sgt.py @@ -83,7 +83,6 @@ def test_sgt( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -197,14 +196,12 @@ def test_sgt( Bytes("693c6139") + Hash(0x2), Bytes("693c6139") + Hash(0x3), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_4, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_slt.py b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_slt.py index fc950a2787d..bfd5832f47f 100644 --- a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_slt.py +++ b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_slt.py @@ -83,7 +83,6 @@ def test_slt( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -197,14 +196,12 @@ def test_slt( Bytes("693c6139") + Hash(0x2), Bytes("693c6139") + Hash(0x3), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_4, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_xor.py b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_xor.py index b5bdb7b26bf..d69b6a3e9e9 100644 --- a/tests/ported_static/frontier/vmBitwiseLogicOperation/test_xor.py +++ b/tests/ported_static/frontier/vmBitwiseLogicOperation/test_xor.py @@ -100,7 +100,6 @@ def test_xor( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -278,14 +277,12 @@ def test_xor( Bytes("693c6139") + Hash(0x4), Bytes("693c6139") + Hash(0x5), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_6, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmIOandFlowOperations/test_codecopy.py b/tests/ported_static/frontier/vmIOandFlowOperations/test_codecopy.py index bfc509a4799..afdb263bb31 100644 --- a/tests/ported_static/frontier/vmIOandFlowOperations/test_codecopy.py +++ b/tests/ported_static/frontier/vmIOandFlowOperations/test_codecopy.py @@ -93,7 +93,6 @@ def test_codecopy( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -359,14 +358,12 @@ def test_codecopy( Bytes("693c6139") + Hash(0x3), Bytes("693c6139") + Hash(0x4), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_5, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmIOandFlowOperations/test_loops_conditionals.py b/tests/ported_static/frontier/vmIOandFlowOperations/test_loops_conditionals.py index ec091a54e3d..98389cb3785 100644 --- a/tests/ported_static/frontier/vmIOandFlowOperations/test_loops_conditionals.py +++ b/tests/ported_static/frontier/vmIOandFlowOperations/test_loops_conditionals.py @@ -132,7 +132,6 @@ def test_loops_conditionals( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -422,14 +421,12 @@ def test_loops_conditionals( Bytes("693c6139") + Hash(0x9), Bytes("693c6139") + Hash(0xA), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_11, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmIOandFlowOperations/test_mstore.py b/tests/ported_static/frontier/vmIOandFlowOperations/test_mstore.py index 8ab043b473a..fcbf186d3c9 100644 --- a/tests/ported_static/frontier/vmIOandFlowOperations/test_mstore.py +++ b/tests/ported_static/frontier/vmIOandFlowOperations/test_mstore.py @@ -93,7 +93,6 @@ def test_mstore( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0x100000000000) @@ -229,14 +228,12 @@ def test_mstore( Bytes("693c6139") + Hash(0x3), Bytes("693c6139") + Hash(0x4), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_5, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmIOandFlowOperations/test_mstore8.py b/tests/ported_static/frontier/vmIOandFlowOperations/test_mstore8.py index 23cc67ce2c1..3f19ab4daed 100644 --- a/tests/ported_static/frontier/vmIOandFlowOperations/test_mstore8.py +++ b/tests/ported_static/frontier/vmIOandFlowOperations/test_mstore8.py @@ -79,7 +79,6 @@ def test_mstore8( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0x100000000000) @@ -178,14 +177,12 @@ def test_mstore8( Bytes("693c6139") + Hash(0x1), Bytes("693c6139") + Hash(0x2), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_3, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmIOandFlowOperations/test_pc.py b/tests/ported_static/frontier/vmIOandFlowOperations/test_pc.py index fc3df94d285..45fde36f838 100644 --- a/tests/ported_static/frontier/vmIOandFlowOperations/test_pc.py +++ b/tests/ported_static/frontier/vmIOandFlowOperations/test_pc.py @@ -69,7 +69,6 @@ def test_pc( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -134,14 +133,12 @@ def test_pc( Bytes("693c6139") + Hash(0x0), Bytes("693c6139") + Hash(0x1), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_2, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmIOandFlowOperations/test_pop.py b/tests/ported_static/frontier/vmIOandFlowOperations/test_pop.py index 9e49f6e31bc..8fd7e2485da 100644 --- a/tests/ported_static/frontier/vmIOandFlowOperations/test_pop.py +++ b/tests/ported_static/frontier/vmIOandFlowOperations/test_pop.py @@ -69,7 +69,6 @@ def test_pop( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: raw @@ -126,14 +125,12 @@ def test_pop( Bytes("693c6139") + Hash(0x0), Bytes("693c6139") + Hash(0x1), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_2, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmIOandFlowOperations/test_return.py b/tests/ported_static/frontier/vmIOandFlowOperations/test_return.py index 17e39f195f8..591916c57f1 100644 --- a/tests/ported_static/frontier/vmIOandFlowOperations/test_return.py +++ b/tests/ported_static/frontier/vmIOandFlowOperations/test_return.py @@ -93,7 +93,6 @@ def test_return( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE) @@ -263,14 +262,12 @@ def test_return( Bytes("693c6139") + Hash(0x3), Bytes("693c6139") + Hash(0x4), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_5, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmIOandFlowOperations/test_sstore_sload.py b/tests/ported_static/frontier/vmIOandFlowOperations/test_sstore_sload.py index 21b82a91fe5..5a67f6c9aa5 100644 --- a/tests/ported_static/frontier/vmIOandFlowOperations/test_sstore_sload.py +++ b/tests/ported_static/frontier/vmIOandFlowOperations/test_sstore_sload.py @@ -76,7 +76,6 @@ def test_sstore_sload( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -179,14 +178,12 @@ def test_sstore_sload( Bytes("693c6139") + Hash(0x1), Bytes("693c6139") + Hash(0x2), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_3, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmLogTest/test_log0.py b/tests/ported_static/frontier/vmLogTest/test_log0.py index d743762ab28..0597c2d5438 100644 --- a/tests/ported_static/frontier/vmLogTest/test_log0.py +++ b/tests/ported_static/frontier/vmLogTest/test_log0.py @@ -111,7 +111,6 @@ def test_log0( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -307,14 +306,12 @@ def test_log0( Bytes("693c6139") + Hash(0x6), Bytes("693c6139") + Hash(0xA), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_8, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmLogTest/test_log1.py b/tests/ported_static/frontier/vmLogTest/test_log1.py index b4309d454e6..4661f77d661 100644 --- a/tests/ported_static/frontier/vmLogTest/test_log1.py +++ b/tests/ported_static/frontier/vmLogTest/test_log1.py @@ -118,7 +118,6 @@ def test_log1( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -332,14 +331,12 @@ def test_log1( Bytes("693c6139") + Hash(0x7), Bytes("693c6139") + Hash(0x8), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_9, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmLogTest/test_log2.py b/tests/ported_static/frontier/vmLogTest/test_log2.py index 95fa656fe44..dc786bdac18 100644 --- a/tests/ported_static/frontier/vmLogTest/test_log2.py +++ b/tests/ported_static/frontier/vmLogTest/test_log2.py @@ -118,7 +118,6 @@ def test_log2( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -333,14 +332,12 @@ def test_log2( Bytes("693c6139") + Hash(0x7), Bytes("693c6139") + Hash(0x8), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_9, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmLogTest/test_log3.py b/tests/ported_static/frontier/vmLogTest/test_log3.py index a763ee5fd27..a26a69cf249 100644 --- a/tests/ported_static/frontier/vmLogTest/test_log3.py +++ b/tests/ported_static/frontier/vmLogTest/test_log3.py @@ -125,7 +125,6 @@ def test_log3( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -382,14 +381,12 @@ def test_log3( Bytes("693c6139") + Hash(0x8), Bytes("693c6139") + Hash(0x9), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_10, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmLogTest/test_log4.py b/tests/ported_static/frontier/vmLogTest/test_log4.py index 3266265017a..7c7da81e62c 100644 --- a/tests/ported_static/frontier/vmLogTest/test_log4.py +++ b/tests/ported_static/frontier/vmLogTest/test_log4.py @@ -125,7 +125,6 @@ def test_log4( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: lll @@ -428,14 +427,12 @@ def test_log4( Bytes("693c6139") + Hash(0x8), Bytes("693c6139") + Hash(0x9), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_10, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmTests/test_random.py b/tests/ported_static/frontier/vmTests/test_random.py index 5a64236ce99..58ef0fbc884 100644 --- a/tests/ported_static/frontier/vmTests/test_random.py +++ b/tests/ported_static/frontier/vmTests/test_random.py @@ -90,7 +90,6 @@ def test_random( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) # Source: hex @@ -220,14 +219,12 @@ def test_random( Bytes("693c6139") + Hash(0x4), Bytes("693c6139") + Hash(0x5), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmTests/test_sha3.py b/tests/ported_static/frontier/vmTests/test_sha3.py index a3805b31105..2899050bcd0 100644 --- a/tests/ported_static/frontier/vmTests/test_sha3.py +++ b/tests/ported_static/frontier/vmTests/test_sha3.py @@ -177,7 +177,6 @@ def test_sha3( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0x100000000000) @@ -584,14 +583,12 @@ def test_sha3( Bytes("693c6139") + Hash(0xE), Bytes("693c6139") + Hash(0xF), ] - tx_gas = [16777216] tx_value = [1] tx = Transaction( sender=sender, to=contract_17, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=_exc, ) diff --git a/tests/ported_static/frontier/vmTests/test_suicide.py b/tests/ported_static/frontier/vmTests/test_suicide.py index c562b182d0d..77804c9356d 100644 --- a/tests/ported_static/frontier/vmTests/test_suicide.py +++ b/tests/ported_static/frontier/vmTests/test_suicide.py @@ -91,7 +91,6 @@ def test_suicide( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0x5AF3107A4000) @@ -189,13 +188,11 @@ def test_suicide( Bytes("693c6139") + Hash(contract_1, left_padding=True), Bytes("693c6139") + Hash(contract_2, left_padding=True), ] - tx_gas = [16777216] tx = Transaction( sender=sender, to=contract_3, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, ) diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_end.py index 877bec2ddd8..17293699c30 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_end.py @@ -61,7 +61,6 @@ def test_callcallcallcode_001_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -141,7 +140,6 @@ def test_callcallcallcode_001_suicide_end( sender=sender, to=target, data=Bytes(""), - gas_limit=3000000, ) post = { diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_middle.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_middle.py index eca3852531b..8c0549656c6 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_middle.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_middle.py @@ -44,7 +44,6 @@ def test_callcallcallcode_001_suicide_middle( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -123,7 +122,6 @@ def test_callcallcallcode_001_suicide_middle( sender=sender, to=target, data=Bytes(""), - gas_limit=3000000, ) post = { diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_suicide_end.py index 5df67aa7d7a..0cfdbd2b8e1 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_suicide_end.py @@ -44,7 +44,6 @@ def test_callcallcode_01_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_end.py index 4406ecf6aaf..6251a32f051 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_end.py @@ -44,7 +44,6 @@ def test_callcallcodecall_010_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_middle.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_middle.py index e577515aec0..3299f2de814 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_middle.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_middle.py @@ -44,7 +44,6 @@ def test_callcallcodecall_010_suicide_middle( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -123,7 +122,6 @@ def test_callcallcodecall_010_suicide_middle( sender=sender, to=target, data=Bytes(""), - gas_limit=3000000, ) post = { diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_end.py index bb07f396807..c5a6273b687 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_end.py @@ -44,7 +44,6 @@ def test_callcallcodecallcode_011_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_middle.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_middle.py index b94b51177aa..6b917c40c24 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_middle.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_middle.py @@ -44,7 +44,6 @@ def test_callcallcodecallcode_011_suicide_middle( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -122,7 +121,6 @@ def test_callcallcodecallcode_011_suicide_middle( sender=sender, to=target, data=Bytes(""), - gas_limit=3000000, ) post = { diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_suicide_end.py index f3664b9da7e..3c6930149cf 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_suicide_end.py @@ -44,7 +44,6 @@ def test_callcodecall_10_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_end.py index e68f4bb1f1d..c8a856f76fa 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_end.py @@ -44,7 +44,6 @@ def test_callcodecallcall_100_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_middle.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_middle.py index 76d7e024a25..8d2e2bf398c 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_middle.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_middle.py @@ -44,7 +44,6 @@ def test_callcodecallcall_100_suicide_middle( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -123,7 +122,6 @@ def test_callcodecallcall_100_suicide_middle( sender=sender, to=target, data=Bytes(""), - gas_limit=3000000, ) post = { diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_end.py index f5f4d5d957b..8d9519fda1a 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_end.py @@ -44,7 +44,6 @@ def test_callcodecallcallcode_101_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_middle.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_middle.py index f4ca62bd97e..64ef427a427 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_middle.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_middle.py @@ -48,7 +48,6 @@ def test_callcodecallcallcode_101_suicide_middle( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -126,7 +125,6 @@ def test_callcodecallcallcode_101_suicide_middle( sender=sender, to=contract_0, data=Bytes(""), - gas_limit=3000000, ) post = { diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_suicide_end.py index 5b18d769850..861f72d06d5 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_suicide_end.py @@ -44,7 +44,6 @@ def test_callcodecallcode_11_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_end.py index 9a97900067d..e5e39fd29d9 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_end.py @@ -44,7 +44,6 @@ def test_callcodecallcodecall_110_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_middle.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_middle.py index 4ae3fa17491..e76fd56c93b 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_middle.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_middle.py @@ -44,7 +44,6 @@ def test_callcodecallcodecall_110_suicide_middle( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -122,7 +121,6 @@ def test_callcodecallcodecall_110_suicide_middle( sender=sender, to=target, data=Bytes(""), - gas_limit=3000000, ) post = { diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_suicide_end.py index c9afc938d33..16846ade382 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_suicide_end.py @@ -44,7 +44,6 @@ def test_callcodecallcodecallcode_111_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_suicide_middle.py b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_suicide_middle.py index 955999b8de9..c3243b49085 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_suicide_middle.py +++ b/tests/ported_static/homestead/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_suicide_middle.py @@ -44,7 +44,6 @@ def test_callcodecallcodecallcode_111_suicide_middle( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -121,7 +120,6 @@ def test_callcodecallcodecallcode_111_suicide_middle( sender=sender, to=target, data=Bytes(""), - gas_limit=3000000, ) post = { diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_end.py index 9f4aa38224e..2060165d993 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_end.py @@ -44,7 +44,6 @@ def test_callcallcallcode_001_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_middle.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_middle.py index 99023b4e75c..4f5f8432df4 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_middle.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_middle.py @@ -44,7 +44,6 @@ def test_callcallcallcode_001_suicide_middle( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -123,7 +122,6 @@ def test_callcallcallcode_001_suicide_middle( sender=sender, to=target, data=Bytes(""), - gas_limit=3000000, ) post = { diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcode_01_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcode_01_suicide_end.py index 3090bd24b68..765e6dadda0 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcode_01_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcode_01_suicide_end.py @@ -44,7 +44,6 @@ def test_callcallcode_01_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_end.py index 5c4b1b42e0d..5e2544843c5 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_end.py @@ -44,7 +44,6 @@ def test_callcallcodecall_010_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_middle.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_middle.py index 4fe19eb07e9..4fe38930dc4 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_middle.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_middle.py @@ -44,7 +44,6 @@ def test_callcallcodecall_010_suicide_middle( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -123,7 +122,6 @@ def test_callcallcodecall_010_suicide_middle( sender=sender, to=target, data=Bytes(""), - gas_limit=3000000, ) post = { diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_end.py index 67dfb5017ee..a5693b51d8a 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_end.py @@ -44,7 +44,6 @@ def test_callcallcodecallcode_011_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_middle.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_middle.py index 81829bc3a14..4c0db933c8f 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_middle.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_middle.py @@ -44,7 +44,6 @@ def test_callcallcodecallcode_011_suicide_middle( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -122,7 +121,6 @@ def test_callcallcodecallcode_011_suicide_middle( sender=sender, to=target, data=Bytes(""), - gas_limit=3000000, ) post = { diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecall_10_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecall_10_suicide_end.py index 8e3c9005976..b5945db73ce 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecall_10_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecall_10_suicide_end.py @@ -44,7 +44,6 @@ def test_callcodecall_10_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_end.py index 36c3ed77b48..8b9ebeeae39 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_end.py @@ -44,7 +44,6 @@ def test_callcodecallcall_100_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_middle.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_middle.py index a7e2c674c60..0bcd72c4a0b 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_middle.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_middle.py @@ -44,7 +44,6 @@ def test_callcodecallcall_100_suicide_middle( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -123,7 +122,6 @@ def test_callcodecallcall_100_suicide_middle( sender=sender, to=target, data=Bytes(""), - gas_limit=3000000, ) post = { diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_end.py index 4496997a3b9..47436ff73d2 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_end.py @@ -44,7 +44,6 @@ def test_callcodecallcallcode_101_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_middle.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_middle.py index 85305829705..3fa538d68af 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_middle.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_middle.py @@ -48,7 +48,6 @@ def test_callcodecallcallcode_101_suicide_middle( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -126,7 +125,6 @@ def test_callcodecallcallcode_101_suicide_middle( sender=sender, to=contract_0, data=Bytes(""), - gas_limit=3000000, ) post = { diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcode_11_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcode_11_suicide_end.py index 3435376fe0e..eef829ef329 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcode_11_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcode_11_suicide_end.py @@ -44,7 +44,6 @@ def test_callcodecallcode_11_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_end.py index cf1efe6aacf..23e38d25a03 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_end.py @@ -44,7 +44,6 @@ def test_callcodecallcodecall_110_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_middle.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_middle.py index c36f2d6f868..a883db7a831 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_middle.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_middle.py @@ -44,7 +44,6 @@ def test_callcodecallcodecall_110_suicide_middle( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -122,7 +121,6 @@ def test_callcodecallcodecall_110_suicide_middle( sender=sender, to=target, data=Bytes(""), - gas_limit=3000000, ) post = { diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_end.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_end.py index 8077f1f29d9..9fc0aef4675 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_end.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_end.py @@ -44,7 +44,6 @@ def test_callcodecallcodecallcode_111_suicide_end( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll diff --git a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_middle.py b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_middle.py index f8bf8482487..588e766bdd3 100644 --- a/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_middle.py +++ b/tests/ported_static/homestead/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_middle.py @@ -44,7 +44,6 @@ def test_callcodecallcodecallcode_111_suicide_middle( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=30000000, ) # Source: lll @@ -121,7 +120,6 @@ def test_callcodecallcodecallcode_111_suicide_middle( sender=sender, to=target, data=Bytes(""), - gas_limit=3000000, ) post = { diff --git a/tests/ported_static/homestead/stWalletTest/test_wallet_kill.py b/tests/ported_static/homestead/stWalletTest/test_wallet_kill.py index 9a5fe73b7f4..752bc2ae551 100644 --- a/tests/ported_static/homestead/stWalletTest/test_wallet_kill.py +++ b/tests/ported_static/homestead/stWalletTest/test_wallet_kill.py @@ -46,7 +46,6 @@ def test_wallet_kill( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1) @@ -73,7 +72,6 @@ def test_wallet_kill( sender=sender, to=contract_0, data=Bytes("cbf0b0c0") + Hash(sender, left_padding=True), - gas_limit=10000000, value=1, nonce=1, ) diff --git a/tests/ported_static/homestead/stWalletTest/test_wallet_kill_to_wallet.py b/tests/ported_static/homestead/stWalletTest/test_wallet_kill_to_wallet.py index a7e2740be09..4f585a24cfb 100644 --- a/tests/ported_static/homestead/stWalletTest/test_wallet_kill_to_wallet.py +++ b/tests/ported_static/homestead/stWalletTest/test_wallet_kill_to_wallet.py @@ -46,7 +46,6 @@ def test_wallet_kill_to_wallet( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=100000000, ) pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1) @@ -73,7 +72,6 @@ def test_wallet_kill_to_wallet( sender=sender, to=contract_0, data=Bytes("cbf0b0c0") + Hash(contract_0, left_padding=True), - gas_limit=10000000, value=100, nonce=1, ) diff --git a/tests/ported_static/london/stEIP1559/test_low_gas_price_old_types.py b/tests/ported_static/london/stEIP1559/test_low_gas_price_old_types.py index 48974cd0123..519182cdeda 100644 --- a/tests/ported_static/london/stEIP1559/test_low_gas_price_old_types.py +++ b/tests/ported_static/london/stEIP1559/test_low_gas_price_old_types.py @@ -67,7 +67,6 @@ def test_low_gas_price_old_types( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=1000, - gas_limit=71794957647893862, ) # Source: yul @@ -97,7 +96,6 @@ def test_low_gas_price_old_types( Bytes("00"), Bytes("01"), ] - tx_gas = [400000] tx_value = [100000] tx_access_lists: dict[int, list] = { 1: [], @@ -107,7 +105,6 @@ def test_low_gas_price_old_types( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], nonce=1, gas_price=999, diff --git a/tests/ported_static/london/stEIP3607/test_transaction_colliding_with_non_empty_account_init_paris.py b/tests/ported_static/london/stEIP3607/test_transaction_colliding_with_non_empty_account_init_paris.py index 3682a79177a..3175809b7e4 100644 --- a/tests/ported_static/london/stEIP3607/test_transaction_colliding_with_non_empty_account_init_paris.py +++ b/tests/ported_static/london/stEIP3607/test_transaction_colliding_with_non_empty_account_init_paris.py @@ -137,14 +137,12 @@ def test_transaction_colliding_with_non_empty_account_init_paris( ) + Op.STOP, ] - tx_gas = [400000] tx_value = [100000] tx = Transaction( sender=sender, to=None, data=tx_data[d], - gas_limit=tx_gas[g], value=tx_value[v], error=TransactionException.SENDER_NOT_EOA, ) diff --git a/tests/ported_static/shanghai/stEIP3855_push0/test_push0.py b/tests/ported_static/shanghai/stEIP3855_push0/test_push0.py index 9bc2c28c7de..3488e3dcaf5 100644 --- a/tests/ported_static/shanghai/stEIP3855_push0/test_push0.py +++ b/tests/ported_static/shanghai/stEIP3855_push0/test_push0.py @@ -108,7 +108,6 @@ def test_push0( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=89128960, ) pre[sender] = Account(balance=0x100000000000) diff --git a/tests/ported_static/spurious_dragon/stNonZeroCallsTest/test_non_zero_value_suicide.py b/tests/ported_static/spurious_dragon/stNonZeroCallsTest/test_non_zero_value_suicide.py index 77bf8a88ea5..e76e34c2425 100644 --- a/tests/ported_static/spurious_dragon/stNonZeroCallsTest/test_non_zero_value_suicide.py +++ b/tests/ported_static/spurious_dragon/stNonZeroCallsTest/test_non_zero_value_suicide.py @@ -46,7 +46,6 @@ def test_non_zero_value_suicide( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0xE8D4A51000) @@ -67,7 +66,6 @@ def test_non_zero_value_suicide( sender=sender, to=contract_0, data=Bytes(""), - gas_limit=600000, ) post = { diff --git a/tests/ported_static/spurious_dragon/stNonZeroCallsTest/test_non_zero_value_suicide_to_empty_paris.py b/tests/ported_static/spurious_dragon/stNonZeroCallsTest/test_non_zero_value_suicide_to_empty_paris.py index 326ac55194c..dbea2e84fc7 100644 --- a/tests/ported_static/spurious_dragon/stNonZeroCallsTest/test_non_zero_value_suicide_to_empty_paris.py +++ b/tests/ported_static/spurious_dragon/stNonZeroCallsTest/test_non_zero_value_suicide_to_empty_paris.py @@ -48,7 +48,6 @@ def test_non_zero_value_suicide_to_empty_paris( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0xE8D4A51000) @@ -70,7 +69,6 @@ def test_non_zero_value_suicide_to_empty_paris( sender=sender, to=target, data=Bytes(""), - gas_limit=600000, ) post = { diff --git a/tests/ported_static/spurious_dragon/stNonZeroCallsTest/test_non_zero_value_suicide_to_non_non_zero_balance.py b/tests/ported_static/spurious_dragon/stNonZeroCallsTest/test_non_zero_value_suicide_to_non_non_zero_balance.py index 6d1666bc894..33bdec9e7cf 100644 --- a/tests/ported_static/spurious_dragon/stNonZeroCallsTest/test_non_zero_value_suicide_to_non_non_zero_balance.py +++ b/tests/ported_static/spurious_dragon/stNonZeroCallsTest/test_non_zero_value_suicide_to_non_non_zero_balance.py @@ -48,7 +48,6 @@ def test_non_zero_value_suicide_to_non_non_zero_balance( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0xE8D4A51000) @@ -70,7 +69,6 @@ def test_non_zero_value_suicide_to_non_non_zero_balance( sender=sender, to=target, data=Bytes(""), - gas_limit=600000, ) post = { diff --git a/tests/ported_static/spurious_dragon/stNonZeroCallsTest/test_non_zero_value_suicide_to_one_storage_key_paris.py b/tests/ported_static/spurious_dragon/stNonZeroCallsTest/test_non_zero_value_suicide_to_one_storage_key_paris.py index c3abf14ad57..66fb9256d5b 100644 --- a/tests/ported_static/spurious_dragon/stNonZeroCallsTest/test_non_zero_value_suicide_to_one_storage_key_paris.py +++ b/tests/ported_static/spurious_dragon/stNonZeroCallsTest/test_non_zero_value_suicide_to_one_storage_key_paris.py @@ -48,7 +48,6 @@ def test_non_zero_value_suicide_to_one_storage_key_paris( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0xE8D4A51000) @@ -71,7 +70,6 @@ def test_non_zero_value_suicide_to_one_storage_key_paris( sender=sender, to=target, data=Bytes(""), - gas_limit=600000, ) post = { diff --git a/tests/ported_static/spurious_dragon/stZeroCallsTest/test_zero_value_suicide.py b/tests/ported_static/spurious_dragon/stZeroCallsTest/test_zero_value_suicide.py index 2f049c6f0cb..b39bd37d6f3 100644 --- a/tests/ported_static/spurious_dragon/stZeroCallsTest/test_zero_value_suicide.py +++ b/tests/ported_static/spurious_dragon/stZeroCallsTest/test_zero_value_suicide.py @@ -46,7 +46,6 @@ def test_zero_value_suicide( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0xE8D4A51000) @@ -66,7 +65,6 @@ def test_zero_value_suicide( sender=sender, to=contract_0, data=Bytes(""), - gas_limit=600000, ) post = { diff --git a/tests/ported_static/spurious_dragon/stZeroCallsTest/test_zero_value_suicide_to_empty_paris.py b/tests/ported_static/spurious_dragon/stZeroCallsTest/test_zero_value_suicide_to_empty_paris.py index ae6eccf88d0..1d22322a675 100644 --- a/tests/ported_static/spurious_dragon/stZeroCallsTest/test_zero_value_suicide_to_empty_paris.py +++ b/tests/ported_static/spurious_dragon/stZeroCallsTest/test_zero_value_suicide_to_empty_paris.py @@ -46,7 +46,6 @@ def test_zero_value_suicide_to_empty_paris( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0xE8D4A51000) @@ -67,7 +66,6 @@ def test_zero_value_suicide_to_empty_paris( sender=sender, to=target, data=Bytes(""), - gas_limit=600000, ) post = { diff --git a/tests/ported_static/spurious_dragon/stZeroCallsTest/test_zero_value_suicide_to_non_zero_balance.py b/tests/ported_static/spurious_dragon/stZeroCallsTest/test_zero_value_suicide_to_non_zero_balance.py index f1a5e7841b6..b0dd0cde780 100644 --- a/tests/ported_static/spurious_dragon/stZeroCallsTest/test_zero_value_suicide_to_non_zero_balance.py +++ b/tests/ported_static/spurious_dragon/stZeroCallsTest/test_zero_value_suicide_to_non_zero_balance.py @@ -48,7 +48,6 @@ def test_zero_value_suicide_to_non_zero_balance( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0xE8D4A51000) @@ -69,7 +68,6 @@ def test_zero_value_suicide_to_non_zero_balance( sender=sender, to=target, data=Bytes(""), - gas_limit=600000, ) post = { diff --git a/tests/ported_static/spurious_dragon/stZeroCallsTest/test_zero_value_suicide_to_one_storage_key_paris.py b/tests/ported_static/spurious_dragon/stZeroCallsTest/test_zero_value_suicide_to_one_storage_key_paris.py index db34d2d9f95..22d05ee64dc 100644 --- a/tests/ported_static/spurious_dragon/stZeroCallsTest/test_zero_value_suicide_to_one_storage_key_paris.py +++ b/tests/ported_static/spurious_dragon/stZeroCallsTest/test_zero_value_suicide_to_one_storage_key_paris.py @@ -48,7 +48,6 @@ def test_zero_value_suicide_to_one_storage_key_paris( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=10000000, ) pre[sender] = Account(balance=0xE8D4A51000) @@ -70,7 +69,6 @@ def test_zero_value_suicide_to_one_storage_key_paris( sender=sender, to=target, data=Bytes(""), - gas_limit=600000, ) post = { diff --git a/tests/ported_static/tangerine_whistle/stMemExpandingEIP150Calls/test_oo_gin_return.py b/tests/ported_static/tangerine_whistle/stMemExpandingEIP150Calls/test_oo_gin_return.py index 145e2b341e1..32554250758 100644 --- a/tests/ported_static/tangerine_whistle/stMemExpandingEIP150Calls/test_oo_gin_return.py +++ b/tests/ported_static/tangerine_whistle/stMemExpandingEIP150Calls/test_oo_gin_return.py @@ -90,7 +90,6 @@ def test_oo_gin_return( timestamp=1000, prev_randao=0x20000, base_fee_per_gas=10, - gas_limit=4294967296, ) # Source: lll @@ -198,13 +197,11 @@ def test_oo_gin_return( Bytes("1a8451e6") + Hash(return_, left_padding=True) + Hash(0x10), Bytes("1a8451e6") + Hash(revert, left_padding=True) + Hash(0x10), ] - tx_gas = [9437184] tx = Transaction( sender=sender, to=target, data=tx_data[d], - gas_limit=tx_gas[g], error=_exc, )