chore: re-skip tests that are not for devnet6

Author: fselmo

tests/osaka/eip7825_transaction_gas_limit_cap/test_tx_gas_limit.py

@@ -90,6 +90,7 @@ def tx_gas_limit_cap_tests(fork: Fork) -> List[ParameterSet]:
 @pytest.mark.parametrize_by_fork("tx_gas_limit,error", tx_gas_limit_cap_tests)
 @pytest.mark.with_all_tx_types
 @pytest.mark.valid_from("Prague")
+@pytest.mark.valid_before("EIP8037")
 def test_transaction_gas_limit_cap(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -344,6 +345,7 @@ def total_cost_floor_per_token(fork: Fork) -> int:
 )
 @pytest.mark.parametrize("zero_byte", [True, False])
 @pytest.mark.valid_from("Osaka")
+@pytest.mark.valid_before("EIP8037")
 @pytest.mark.eels_base_coverage
 def test_tx_gas_limit_cap_full_calldata(
     state_test: StateTestFiller,
@@ -478,6 +480,7 @@ def test_tx_gas_limit_cap_contract_creation(
     ],
 )
 @pytest.mark.valid_from("Osaka")
+@pytest.mark.valid_before("EIP8037")
 def test_tx_gas_limit_cap_access_list_with_diff_keys(
     state_test: StateTestFiller,
     exceed_tx_gas_limit: bool,
@@ -564,6 +567,7 @@ def intrinsic_cost_for_num_storage_keys(storage_key_count: int) -> int:
     ],
 )
 @pytest.mark.valid_from("Osaka")
+@pytest.mark.valid_before("EIP8037")
 def test_tx_gas_limit_cap_access_list_with_diff_addr(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -644,6 +648,7 @@ def intrinsic_cost_for_num_accounts(account_count: int) -> int:
     ],
 )
 @pytest.mark.valid_from("Osaka")
+@pytest.mark.valid_before("EIP8037")
 def test_tx_gas_limit_cap_authorized_tx(
     state_test: StateTestFiller,
     pre: Alloc,

tests/prague/eip6110_deposits/test_deposits.py

@@ -716,6 +716,7 @@
                 ),
             ],
             id="single_deposit_from_contract_call_depth_high",
+            marks=pytest.mark.valid_before("EIP8037"),
         ),
         pytest.param(
             [

tests/prague/eip7623_increase_calldata_cost/test_execution_gas.py

@@ -72,6 +72,7 @@ def to(
                 True,
                 [Address(1)],
                 id="type_4",
+                marks=pytest.mark.valid_before("EIP8037"),
             ),
         ],
         indirect=["authorization_list"],

tests/prague/eip7623_increase_calldata_cost/test_refunds.py

@@ -339,6 +339,9 @@ def tx_gas_limit(
         RefundType.AUTHORIZATION_EXISTING_AUTHORITY,
     ],
 )
+# TODO[EIP-8037]: Authorization state gas split affects
+# refund calculations for Amsterdam.
+@pytest.mark.valid_before("EIP8037")
 def test_gas_refunds_from_data_floor(
     state_test: StateTestFiller,
     pre: Alloc,

tests/prague/eip7623_increase_calldata_cost/test_transaction_validity.py

@@ -156,6 +156,10 @@ def test_transaction_validity_type_0(
     "ty",
     [pytest.param(1, id="type_1"), pytest.param(2, id="type_2")],
 )
+# TODO[EIP-8037]: Contract creation state gas
+# (G_TRANSACTION_CREATE) split affects intrinsic gas
+# calculation for Amsterdam.
+@pytest.mark.valid_before("EIP8037")
 def test_transaction_validity_type_1_type_2(
     state_test: StateTestFiller,
     pre: Alloc,

tests/prague/eip7702_set_code_tx/test_gas.py

@@ -841,6 +841,7 @@ def gas_test_parameter_args(
     )
 )
 @pytest.mark.slow()
+@pytest.mark.valid_before("EIP8037")
 def test_gas_cost(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -1116,6 +1117,10 @@ def test_account_warming(
     "valid",
     [True, pytest.param(False, marks=pytest.mark.exception_test)],
 )
+# TODO[EIP-8037]: EELS uses PER_EMPTY_ACCOUNT_COST=25,000
+# per auth for intrinsic gas check, but Amsterdam
+# G_AUTHORIZATION=165,990 includes state gas. EELS bug?
+@pytest.mark.valid_before("EIP8037")
 def test_intrinsic_gas_cost(
     state_test: StateTestFiller,
     pre: Alloc,

tests/prague/eip7702_set_code_tx/test_set_code_txs.py

@@ -2947,6 +2947,7 @@ def test_set_code_to_precompile(
 
 
 @pytest.mark.with_all_precompiles
+@pytest.mark.valid_before("EIP8037")
 def test_set_code_to_precompile_not_enough_gas_for_precompile_execution(
     state_test: StateTestFiller,
     pre: Alloc,

tests/prague/eip7702_set_code_tx/test_set_code_txs_2.py

@@ -36,6 +36,9 @@
 
 
 @pytest.mark.valid_from("Prague")
+# TODO[EIP-8037]: Amsterdam expected_loop_count needs
+# recalculating due to state gas.
+@pytest.mark.valid_before("EIP8037")
 # TODO[EIP-8037]: Fix Storage.KeyValueMismatchError for
 # contract_loop expected values.
 @pytest.mark.skip(
@@ -689,6 +692,7 @@ class AccessListTo(Enum):
     [AccessListTo.POINTER_ADDRESS, AccessListTo.CONTRACT_ADDRESS],
 )
 @pytest.mark.valid_from("Prague")
+@pytest.mark.valid_before("EIP8037")
 def test_gas_diff_pointer_vs_direct_call(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
@@ -903,6 +907,7 @@ def test_gas_diff_pointer_vs_direct_call(
 
 
 @pytest.mark.valid_from("Prague")
+@pytest.mark.valid_before("EIP8037")
 def test_pointer_call_followed_by_direct_call(
     state_test: StateTestFiller,
     pre: Alloc,

tests/shanghai/eip3860_initcode/test_initcode.py

@@ -401,6 +401,10 @@ def post(
             )
         return Alloc({create_contract_address: Account.NONEXISTENT})
 
+    # TODO[EIP-8037]: Code deposit and G_CREATE become
+    # state gas under Amsterdam.
+    # Gas calculations need updating for two-dimensional gas.
+    @pytest.mark.valid_before("EIP8037")
     @pytest.mark.slow()
     def test_gas_usage(
         self,
@@ -603,6 +607,10 @@ def code_deposit_gas(self, fork: Fork, initcode: Initcode) -> int:
         dep = initcode.deployment_gas
         return dep(fork) if callable(dep) else dep
 
+    # TODO[EIP-8037]: Code deposit and G_CREATE become
+    # state gas under Amsterdam.
+    # Gas calculations need updating for two-dimensional gas.
+    @pytest.mark.valid_before("EIP8037")
     @pytest.mark.xdist_group(name="bigmem")
     @pytest.mark.slow()
     def test_create_opcode_initcode(

tests/tangerine_whistle/eip150_operation_gas_costs/test_eip150_selfdestruct.py

@@ -329,6 +329,7 @@ def build_post_state(
     [0, 1],
     ids=["dead_beneficiary", "alive_beneficiary"],
 )
+@pytest.mark.valid_before("EIP8037")  # TODO[EIP-8037]: Fix for Amsterdam
 def test_selfdestruct_to_account(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
@@ -582,6 +583,7 @@ def test_selfdestruct_state_access_boundary(
     ],
 )
 @pytest.mark.valid_from("TangerineWhistle")
+@pytest.mark.valid_before("EIP8037")  # TODO[EIP-8037]: Fix for Amsterdam
 def test_selfdestruct_to_precompile(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,