fix(tests): post-merge artifacts and SD state-gas bump

Author: spencer-tb

tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_opcodes.py

@@ -3361,6 +3361,7 @@ def test_bal_create_storage_op_then_selfdestruct_same_tx(
 def test_bal_create2_selfdestruct_then_recreate_same_block(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
+    fork: Fork,
     pre_balance: int,
 ) -> None:
     """
@@ -3410,17 +3411,19 @@ def test_bal_create2_selfdestruct_then_recreate_same_block(
     if pre_balance > 0:
         pre.fund_address(target_a, pre_balance)
 
+    # Headroom for the self-destruct to fund a fresh beneficiary.
+    gas_limit = (fork.transaction_gas_limit_cap() or 0) + 2_000_000
     tx1 = Transaction(
         sender=alice,
         to=factory,
         data=initcode_bytes,
-        gas_limit=500_000,
+        gas_limit=gas_limit,
     )
     tx2 = Transaction(
         sender=alice,
         to=factory,
         data=initcode_bytes,
-        gas_limit=500_000,
+        gas_limit=gas_limit,
     )
 
     target_a_balance_changes = []

tests/cancun/eip1153_tstore/test_tstorage_create_contexts.py

@@ -19,7 +19,6 @@
     compute_create_address,
 )
 from execution_testing import Macros as Om
-from execution_testing.forks.helpers import Fork
 
 from . import CreateOpcodeParams, PytestParameterEnum
 from .spec import ref_spec_1153
@@ -274,7 +273,6 @@ def test_tstore_rollback_on_failed_create(
     pre: Alloc,
     fork: Fork,
     create_opcode: Op,
-    fork: Fork,
 ) -> None:
     """
     Test TSTORE is rolled back after failed CREATE/CREATE2 initcode.

tests/prague/eip2537_bls_12_381_precompiles/test_bls12_variable_length_input_contracts.py

@@ -21,8 +21,6 @@
     Storage,
     Transaction,
 )
-from execution_testing.test_types import EnvironmentDefaults
-
 from .spec import (
     GAS_CALCULATION_FUNCTION_MAP,
     PointG1,
@@ -218,12 +216,6 @@ def get_split_discount_table_by_fork(
     """
 
     def parametrize_by_fork(fork: Fork) -> List[ParameterSet]:
-        # TODO(EIP-8037): pin cpsb to the default env gas limit
-        # because collection time doesn't see per-test env overrides.
-        # Tests here use the default Environment, so sizing the
-        # splits against it matches runtime. Remove if the framework
-        # plumbs the per-test env gas limit into covariant markers.
-        fork = fork.with_env_gas_limit(EnvironmentDefaults.gas_limit)
         tx_gas_limit_cap = fork.transaction_gas_limit_cap()
         if tx_gas_limit_cap is None:
             return [

tests/prague/eip7702_set_code_tx/test_set_code_txs.py

@@ -2584,7 +2584,6 @@ def test_signature_s_out_of_range(
     pre: Alloc,
     fork: Fork,
     chain_config: ChainConfig,
-    fork: Fork,
 ) -> None:
     """
     Test sending a transaction with an authorization tuple where the signature
@@ -2794,7 +2793,6 @@ def test_nonce_validity(
     fork: Fork,
     account_nonce: int,
     authorization_nonce: int,
-    fork: Fork,
 ) -> None:
     """
     Test sending a transaction where the nonce field of an authorization almost