Skip to content

Commit 78977c2

Browse files
committed
fix: turn on skipped EIP-7702 tests
1 parent 18f96b8 commit 78977c2

10 files changed

Lines changed: 0 additions & 35 deletions

File tree

tests/osaka/eip7825_transaction_gas_limit_cap/test_tx_gas_limit.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ def tx_gas_limit_cap_tests(fork: Fork) -> List[ParameterSet]:
9090
@pytest.mark.parametrize_by_fork("tx_gas_limit,error", tx_gas_limit_cap_tests)
9191
@pytest.mark.with_all_tx_types
9292
@pytest.mark.valid_from("Prague")
93-
@pytest.mark.valid_before("EIP8037")
9493
def test_transaction_gas_limit_cap(
9594
state_test: StateTestFiller,
9695
pre: Alloc,
@@ -345,7 +344,6 @@ def total_cost_floor_per_token(fork: Fork) -> int:
345344
)
346345
@pytest.mark.parametrize("zero_byte", [True, False])
347346
@pytest.mark.valid_from("Osaka")
348-
@pytest.mark.valid_before("EIP8037")
349347
@pytest.mark.eels_base_coverage
350348
def test_tx_gas_limit_cap_full_calldata(
351349
state_test: StateTestFiller,
@@ -480,7 +478,6 @@ def test_tx_gas_limit_cap_contract_creation(
480478
],
481479
)
482480
@pytest.mark.valid_from("Osaka")
483-
@pytest.mark.valid_before("EIP8037")
484481
def test_tx_gas_limit_cap_access_list_with_diff_keys(
485482
state_test: StateTestFiller,
486483
exceed_tx_gas_limit: bool,
@@ -567,7 +564,6 @@ def intrinsic_cost_for_num_storage_keys(storage_key_count: int) -> int:
567564
],
568565
)
569566
@pytest.mark.valid_from("Osaka")
570-
@pytest.mark.valid_before("EIP8037")
571567
def test_tx_gas_limit_cap_access_list_with_diff_addr(
572568
state_test: StateTestFiller,
573569
pre: Alloc,
@@ -648,7 +644,6 @@ def intrinsic_cost_for_num_accounts(account_count: int) -> int:
648644
],
649645
)
650646
@pytest.mark.valid_from("Osaka")
651-
@pytest.mark.valid_before("EIP8037")
652647
def test_tx_gas_limit_cap_authorized_tx(
653648
state_test: StateTestFiller,
654649
pre: Alloc,

tests/prague/eip6110_deposits/test_deposits.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,6 @@
716716
),
717717
],
718718
id="single_deposit_from_contract_call_depth_high",
719-
marks=pytest.mark.valid_before("EIP8037"),
720719
),
721720
pytest.param(
722721
[

tests/prague/eip7623_increase_calldata_cost/test_execution_gas.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ def to(
7272
True,
7373
[Address(1)],
7474
id="type_4",
75-
marks=pytest.mark.valid_before("EIP8037"),
7675
),
7776
],
7877
indirect=["authorization_list"],

tests/prague/eip7623_increase_calldata_cost/test_refunds.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,6 @@ def tx_gas_limit(
339339
RefundType.AUTHORIZATION_EXISTING_AUTHORITY,
340340
],
341341
)
342-
# TODO[EIP-8037]: Authorization state gas split affects
343-
# refund calculations for Amsterdam.
344-
@pytest.mark.valid_before("EIP8037")
345342
def test_gas_refunds_from_data_floor(
346343
state_test: StateTestFiller,
347344
pre: Alloc,

tests/prague/eip7623_increase_calldata_cost/test_transaction_validity.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,6 @@ def test_transaction_validity_type_0(
156156
"ty",
157157
[pytest.param(1, id="type_1"), pytest.param(2, id="type_2")],
158158
)
159-
# TODO[EIP-8037]: Contract creation state gas
160-
# (G_TRANSACTION_CREATE) split affects intrinsic gas
161-
# calculation for Amsterdam.
162-
@pytest.mark.valid_before("EIP8037")
163159
def test_transaction_validity_type_1_type_2(
164160
state_test: StateTestFiller,
165161
pre: Alloc,

tests/prague/eip7702_set_code_tx/test_gas.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,6 @@ def gas_test_parameter_args(
841841
)
842842
)
843843
@pytest.mark.slow()
844-
@pytest.mark.valid_before("EIP8037")
845844
def test_gas_cost(
846845
state_test: StateTestFiller,
847846
pre: Alloc,
@@ -1117,10 +1116,6 @@ def test_account_warming(
11171116
"valid",
11181117
[True, pytest.param(False, marks=pytest.mark.exception_test)],
11191118
)
1120-
# TODO[EIP-8037]: EELS uses PER_EMPTY_ACCOUNT_COST=25,000
1121-
# per auth for intrinsic gas check, but Amsterdam
1122-
# G_AUTHORIZATION=165,990 includes state gas. EELS bug?
1123-
@pytest.mark.valid_before("EIP8037")
11241119
def test_intrinsic_gas_cost(
11251120
state_test: StateTestFiller,
11261121
pre: Alloc,

tests/prague/eip7702_set_code_tx/test_set_code_txs.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2947,7 +2947,6 @@ def test_set_code_to_precompile(
29472947

29482948

29492949
@pytest.mark.with_all_precompiles
2950-
@pytest.mark.valid_before("EIP8037")
29512950
def test_set_code_to_precompile_not_enough_gas_for_precompile_execution(
29522951
state_test: StateTestFiller,
29532952
pre: Alloc,

tests/prague/eip7702_set_code_tx/test_set_code_txs_2.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@
3636

3737

3838
@pytest.mark.valid_from("Prague")
39-
# TODO[EIP-8037]: Amsterdam expected_loop_count needs
40-
# recalculating due to state gas.
41-
@pytest.mark.valid_before("EIP8037")
4239
# TODO[EIP-8037]: Fix Storage.KeyValueMismatchError for
4340
# contract_loop expected values.
4441
@pytest.mark.skip(
@@ -692,7 +689,6 @@ class AccessListTo(Enum):
692689
[AccessListTo.POINTER_ADDRESS, AccessListTo.CONTRACT_ADDRESS],
693690
)
694691
@pytest.mark.valid_from("Prague")
695-
@pytest.mark.valid_before("EIP8037")
696692
def test_gas_diff_pointer_vs_direct_call(
697693
blockchain_test: BlockchainTestFiller,
698694
pre: Alloc,
@@ -907,7 +903,6 @@ def test_gas_diff_pointer_vs_direct_call(
907903

908904

909905
@pytest.mark.valid_from("Prague")
910-
@pytest.mark.valid_before("EIP8037")
911906
def test_pointer_call_followed_by_direct_call(
912907
state_test: StateTestFiller,
913908
pre: Alloc,

tests/shanghai/eip3860_initcode/test_initcode.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -401,10 +401,6 @@ def post(
401401
)
402402
return Alloc({create_contract_address: Account.NONEXISTENT})
403403

404-
# TODO[EIP-8037]: Code deposit and G_CREATE become
405-
# state gas under Amsterdam.
406-
# Gas calculations need updating for two-dimensional gas.
407-
@pytest.mark.valid_before("EIP8037")
408404
@pytest.mark.slow()
409405
def test_gas_usage(
410406
self,
@@ -607,10 +603,6 @@ def code_deposit_gas(self, fork: Fork, initcode: Initcode) -> int:
607603
dep = initcode.deployment_gas
608604
return dep(fork) if callable(dep) else dep
609605

610-
# TODO[EIP-8037]: Code deposit and G_CREATE become
611-
# state gas under Amsterdam.
612-
# Gas calculations need updating for two-dimensional gas.
613-
@pytest.mark.valid_before("EIP8037")
614606
@pytest.mark.xdist_group(name="bigmem")
615607
@pytest.mark.slow()
616608
def test_create_opcode_initcode(

tests/tangerine_whistle/eip150_operation_gas_costs/test_eip150_selfdestruct.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,6 @@ def build_post_state(
329329
[0, 1],
330330
ids=["dead_beneficiary", "alive_beneficiary"],
331331
)
332-
@pytest.mark.valid_before("EIP8037") # TODO[EIP-8037]: Fix for Amsterdam
333332
def test_selfdestruct_to_account(
334333
pre: Alloc,
335334
blockchain_test: BlockchainTestFiller,
@@ -583,7 +582,6 @@ def test_selfdestruct_state_access_boundary(
583582
],
584583
)
585584
@pytest.mark.valid_from("TangerineWhistle")
586-
@pytest.mark.valid_before("EIP8037") # TODO[EIP-8037]: Fix for Amsterdam
587585
def test_selfdestruct_to_precompile(
588586
pre: Alloc,
589587
blockchain_test: BlockchainTestFiller,

0 commit comments

Comments
 (0)