feat(spec,test): Update CPSB as per EIP updates for bal-devnet-7

Author: fselmo

packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/transaction_fixtures.py

@@ -91,7 +91,9 @@ def type_3_default_transaction(sender: EOA) -> Transaction:
 
 
 @pytest.fixture
-def type_4_default_transaction(sender: EOA, pre: Alloc) -> Transaction:
+def type_4_default_transaction(
+    sender: EOA, pre: Alloc, fork: Fork
+) -> Transaction:
     """Type 4 (set code) default transaction introduced in Prague fork."""
     # Create authorized accounts with funds
     auth_signer1 = pre.fund_eoa(amount=10**18)
@@ -101,12 +103,16 @@ def type_4_default_transaction(sender: EOA, pre: Alloc) -> Transaction:
     target1 = pre.deploy_contract(Op.SSTORE(0, 1))
     target2 = pre.deploy_contract(Op.SSTORE(0, 1))
 
+    # Recipient may be a nonexistent account (e.g., EIP-7708 transfer
+    # log tests), so cover one NEW_ACCOUNT state charge. NEW_ACCOUNT
+    # is the legacy 25_000 pre-EIP-8037 and scales with cpsb on
+    # Amsterdam, keeping this budget CPSB-agnostic.
     return Transaction(
         ty=4,
         sender=sender,
         max_fee_per_gas=10**10,
         max_priority_fee_per_gas=10**9,
-        gas_limit=500_000,
+        gas_limit=500_000 + fork.gas_costs().NEW_ACCOUNT,
         data=b"\x00" * 200,
         access_list=[
             AccessList(address=0x4567, storage_keys=[1000, 2000, 3000]),

packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_8037.py

@@ -28,7 +28,7 @@ def cost_per_state_byte(cls) -> int:
         """
         Return the fixed cost per state byte for EIP-8037.
         """
-        return 1174
+        return 1530
 
     @classmethod
     def sstore_state_gas(cls) -> int:

src/ethereum/forks/amsterdam/vm/gas.py

@@ -26,7 +26,7 @@
 from .exceptions import OutOfGasError
 
 # EIP-8037 state gas accounting constants
-COST_PER_STATE_BYTE = Uint(1174)
+COST_PER_STATE_BYTE = Uint(1530)
 
 STATE_BYTES_PER_NEW_ACCOUNT = Uint(120)
 STATE_BYTES_PER_STORAGE_SET = Uint(64)

tests/amsterdam/eip7708_eth_transfer_logs/test_burn_logs.py

@@ -125,7 +125,7 @@ def test_selfdestruct_to_self_same_tx(
         sender=sender,
         to=factory,
         value=contract_balance,
-        gas_limit=200_000,
+        gas_limit=300_000,
         expected_receipt=TransactionReceipt(logs=expected_logs),
     )
 
@@ -189,7 +189,7 @@ def test_selfdestruct_to_different_address_same_tx(
         sender=sender,
         to=factory,
         value=contract_balance,
-        gas_limit=200_000,
+        gas_limit=300_000,
         expected_receipt=TransactionReceipt(logs=expected_logs),
     )
 
@@ -507,7 +507,7 @@ def test_finalization_burn_logs(
         to=None,
         value=0,
         data=factory_code,
-        gas_limit=1_000_000,
+        gas_limit=2_000_000,
         expected_receipt=TransactionReceipt(
             logs=execution_logs + finalization_logs
         ),

tests/amsterdam/eip7708_eth_transfer_logs/test_fork_transition.py

@@ -11,6 +11,7 @@
     Alloc,
     Block,
     BlockchainTestFiller,
+    Fork,
     Op,
     Transaction,
     TransactionReceipt,
@@ -35,6 +36,7 @@
 def test_burn_log_at_fork_transition(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
+    fork: Fork,
     same_tx: bool,
     to_self: bool,
 ) -> None:
@@ -117,14 +119,21 @@ def test_burn_log_at_fork_transition(
             beneficiary: Account(balance=contract_balance * 3),
         }
 
+    # Same-tx CREATE+SELFDESTRUCT requires NEW_ACCOUNT state gas, which
+    # scales with cpsb on Amsterdam. NEW_ACCOUNT is the legacy 25_000
+    # pre-EIP-8037, so the bump is harmless on the pre-transition block.
+    # `fork` is a TransitionFork here; resolve to the post-transition
+    # fork (timestamp 15_001) where the larger NEW_ACCOUNT applies.
+    post_fork = fork.fork_at(timestamp=15_001)
+    gas_limit = 200_000 + post_fork.gas_costs().NEW_ACCOUNT
     blocks = [
         Block(
             timestamp=ts,
             txs=[
                 Transaction(
                     to=targets[i],
                     sender=sender,
-                    gas_limit=200_000,
+                    gas_limit=gas_limit,
                     expected_receipt=TransactionReceipt(logs=expected_logs[i]),
                 )
             ],

tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip7002.py

@@ -197,9 +197,10 @@ def test_bal_7002_clean_sweep(
         fee=Spec7002.get_fee(0),
     )
 
-    gas_limit = 200_000
-    if fork.is_eip_enabled(8037):
-        gas_limit = 500_000
+    # Predeploy sweep performs first-time SSTOREs for queue, count, and
+    # tail slots. `sstore_state_gas()` is 0 pre-EIP-8037 and scales with
+    # cpsb on Amsterdam, keeping this budget CPSB-agnostic.
+    gas_limit = 200_000 + 5 * fork.sstore_state_gas()
 
     # Transaction to system contract
     tx = Transaction(
@@ -300,9 +301,10 @@ def test_bal_7002_partial_sweep(
     fee = Spec7002.get_fee(0)
     senders = [pre.fund_eoa() for _ in range(num_requests)]
 
-    gas_limit = 200_000
-    if fork.is_eip_enabled(8037):
-        gas_limit = 500_000
+    # Predeploy sweep performs first-time SSTOREs for queue, count, and
+    # tail slots. `sstore_state_gas()` is 0 pre-EIP-8037 and scales with
+    # cpsb on Amsterdam, keeping this budget CPSB-agnostic.
+    gas_limit = 200_000 + 5 * fork.sstore_state_gas()
 
     # Block 1: 20 withdrawal requests
     withdrawal_requests = [
@@ -481,9 +483,10 @@ def test_bal_7002_no_withdrawal_requests(
 
     value = 10
 
-    gas_limit = 200_000
-    if fork.is_eip_enabled(8037):
-        gas_limit = 500_000
+    # Predeploy sweep performs first-time SSTOREs for queue, count, and
+    # tail slots. `sstore_state_gas()` is 0 pre-EIP-8037 and scales with
+    # cpsb on Amsterdam, keeping this budget CPSB-agnostic.
+    gas_limit = 200_000 + 5 * fork.sstore_state_gas()
 
     tx = Transaction(
         sender=alice,

tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_opcodes.py

@@ -1989,10 +1989,14 @@ def test_bal_create_oog_code_deposit(
         access_list=[],
     )
 
+    # CREATE charges NEW_ACCOUNT (scales with cpsb under EIP-8037) plus
+    # base; the 500_000 buffer is enough for init code + a single SSTORE
+    # but well short of the 10_000-byte deposit. Including NEW_ACCOUNT
+    # keeps the budget CPSB-agnostic.
     tx = Transaction(
         sender=alice,
         to=factory,
-        gas_limit=intrinsic_gas + 500_000,  # insufficient for deposit
+        gas_limit=(intrinsic_gas + 500_000 + fork.gas_costs().NEW_ACCOUNT),
     )
 
     # BAL expectations:
@@ -2571,6 +2575,7 @@ def test_bal_call_revert_insufficient_funds(
 def test_bal_create_selfdestruct_to_self_with_call(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
+    fork: Fork,
 ) -> None:
     """
     Test BAL with init code that CALLs Oracle, writes storage, then
@@ -2598,9 +2603,12 @@ def test_bal_create_selfdestruct_to_self_with_call(
     # 1. Calls Oracle (which writes to its slot 0x01)
     # 2. Writes 0x42 to own slot 0x01
     # 3. Selfdestructs to self
+    #
+    # Forward enough gas for Oracle's first-time SSTORE
+    # (regular base + state gas, CPSB-agnostic).
+    oracle_call_gas = 100_000 + fork.sstore_state_gas()
     initcode_runtime = (
-        # CALL(gas, Oracle, value=0, ...)
-        Op.CALL(100_000, oracle, 0, 0, 0, 0, 0)
+        Op.CALL(oracle_call_gas, oracle, 0, 0, 0, 0, 0)
         + Op.POP
         # Write to own storage slot 0x01
         + Op.SSTORE(0x01, 0x42)
@@ -2661,10 +2669,18 @@ def test_bal_create_selfdestruct_to_self_with_call(
         opcode=Op.CREATE2,
     )
 
+    # CREATE2 + 3 first-time SSTOREs (factory slot 0, oracle slot 1,
+    # ephemeral slot 1 in the created contract). NEW_ACCOUNT and
+    # `sstore_state_gas()` are 0 pre-EIP-8037 and scale with cpsb on
+    # Amsterdam, keeping this budget CPSB-agnostic.
+    gas_limit = (
+        1_000_000 + fork.gas_costs().NEW_ACCOUNT + 3 * fork.sstore_state_gas()
+    )
+
     tx = Transaction(
         sender=alice,
         to=factory,
-        gas_limit=1_000_000,
+        gas_limit=gas_limit,
     )
 
     block = Block(

tests/amsterdam/eip8037_state_creation_gas_cost_increase/spec.py

@@ -41,7 +41,7 @@ class Spec:
 
     # TODO: replace with dynamic cost_per_state_byte(gas_limit) once
     # non-default block gas limits are supported in the test framework.
-    COST_PER_STATE_BYTE = 1174  # at 100M–120M gas limit
+    COST_PER_STATE_BYTE = 1530  # at 150M reference block gas limit
 
     # State bytes per operation
     STATE_BYTES_PER_NEW_ACCOUNT = 120

tests/amsterdam/eip8037_state_creation_gas_cost_increase/test_state_gas_call.py

@@ -1606,14 +1606,17 @@ def test_child_failure_refunds_state_gas_to_reservoir_not_gas_left(
         ),
     )
 
-    # Empirical per-tx cumulative. Pinning this catches a mutation
-    # that correctly restores the reservoir but also double-refunds
-    # to regular gas (or otherwise leaks extra gas to the sender),
-    # which the storage probe alone cannot discriminate.
-    expected_cumulative = {
-        Op.CALL: 111_399,
-        Op.DELEGATECALL: 111_393,
+    # Empirical per-tx cumulative, decomposed into a CPSB-independent
+    # regular base plus the grandchild's surviving SSTORE state gas.
+    # Pinning this catches a mutation that correctly restores the
+    # reservoir but also double-refunds to regular gas (or otherwise
+    # leaks extra gas to the sender), which the storage probe alone
+    # cannot discriminate.
+    regular_base = {
+        Op.CALL: 36_263,
+        Op.DELEGATECALL: 36_257,
     }[call_opcode]
+    expected_cumulative = regular_base + sstore_state_gas
 
     tx = Transaction(
         to=parent,

tests/amsterdam/eip8037_state_creation_gas_cost_increase/test_state_gas_create.py

@@ -183,7 +183,7 @@ def test_create2_child_spill_not_double_charged(
 
     tx = Transaction(
         to=factory,
-        gas_limit=700_000,
+        gas_limit=1_000_000,
         sender=pre.fund_eoa(),
     )
 
@@ -2425,6 +2425,7 @@ def test_inner_create_fail_refunds_in_creation_tx(
 def test_create_collision_burned_gas_counted_in_block_regular(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
+    fork: Fork,
     create_opcode: Op,
 ) -> None:
     """
@@ -2453,7 +2454,7 @@ def test_create_collision_burned_gas_counted_in_block_regular(
     pre.deploy_contract(code=Op.STOP, address=collision_target)
 
     # Fixed-size budget so the forwarded create_message_gas is
-    # deterministic and the empirical baseline below is reproducible.
+    # deterministic and the baseline below is reproducible.
     gas_limit = 250_000
 
     tx = Transaction(
@@ -2462,11 +2463,14 @@ def test_create_collision_burned_gas_counted_in_block_regular(
         sender=pre.fund_eoa(),
     )
 
-    # Empirical baseline: block_state_gas is zero for this tx, so
-    # header.gas_used equals the regular-gas total. A mutation that
-    # drops the burned create_message_gas from regular accounting
-    # would reduce this value.
-    baseline_gas_used = 107887
+    # CPSB-agnostic baseline: block_state_gas is zero for this tx, so
+    # header.gas_used equals the regular-gas total. The forwarded
+    # create_message_gas is `(gas_limit - NEW_ACCOUNT) * 63 // 64`,
+    # plus a CPSB-independent constant covering intrinsic + factory
+    # opcodes. A mutation that drops the burned create_message_gas
+    # from regular accounting would reduce this value.
+    new_account = fork.gas_costs().NEW_ACCOUNT
+    baseline_gas_used = (gas_limit - new_account) * 63 // 64 + 472
 
     blockchain_test(
         pre=pre,