feat(spec): update EIP-8037 state byte sizes (NEW_ACCOUNT 112->120, STORAGE_SET 32->64)

Author: fselmo

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

@@ -33,7 +33,7 @@ def cost_per_state_byte(cls) -> int:
     @classmethod
     def sstore_state_gas(cls) -> int:
         """Return state gas for a zero-to-nonzero SSTORE (EIP-8037)."""
-        STATE_BYTES_PER_STORAGE_SET = 32  # noqa: N806
+        STATE_BYTES_PER_STORAGE_SET = 64  # noqa: N806
         return STATE_BYTES_PER_STORAGE_SET * cls.cost_per_state_byte()
 
     @classmethod
@@ -58,8 +58,8 @@ def gas_costs(cls) -> GasCosts:
         cpsb = cls.cost_per_state_byte()
         parent = super(EIP8037, cls).gas_costs()
         # EIP-8037 state byte sizes (EELS amsterdam/vm/gas.py)
-        STATE_BYTES_PER_STORAGE_SET = 32  # noqa: N806
-        STATE_BYTES_PER_NEW_ACCOUNT = 112  # noqa: N806
+        STATE_BYTES_PER_STORAGE_SET = 64  # noqa: N806
+        STATE_BYTES_PER_NEW_ACCOUNT = 120  # noqa: N806
         STATE_BYTES_PER_AUTH_BASE = 23  # noqa: N806
         # EIP-8037 regular gas base costs
         PER_AUTH_BASE_COST = 7_500  # noqa: N806
@@ -258,7 +258,7 @@ def transaction_intrinsic_state_gas(
         - Auth: (NEW_ACCOUNT + AUTH_BASE) * cpsb
         """
         cpsb = cls.cost_per_state_byte()
-        STATE_BYTES_PER_NEW_ACCOUNT = 112  # noqa: N806
+        STATE_BYTES_PER_NEW_ACCOUNT = 120  # noqa: N806
         STATE_BYTES_PER_AUTH_BASE = 23  # noqa: N806
         state_gas = 0
         if contract_creation:
@@ -278,7 +278,7 @@ def _calculate_sstore_gas(
         Calculate updated SSTORE gas cost.
 
         For 0->nonzero: regular (UPDATE - COLD_SLOAD) + state
-        (32 * cpsb).
+        (STATE_BYTES_PER_STORAGE_SET * cpsb).
         For nonzero->different nonzero: regular
         (UPDATE - COLD_SLOAD).
         Otherwise: WARM_SLOAD.
@@ -324,7 +324,7 @@ def _calculate_sstore_state_gas(
             and current_value != new_value
             and original_value == 0
         ):
-            return 32 * cpsb
+            return 64 * cpsb
         return 0
 
     @classmethod
@@ -368,9 +368,9 @@ def _calculate_sstore_state_refund(
         """
         Calculate SSTORE state gas refund.
 
-        Return the state-gas portion (`32 * cpsb`) when a slot that
-        was originally empty is restored back to zero within the
-        transaction; otherwise return 0.
+        Return the state-gas portion (`STATE_BYTES_PER_STORAGE_SET *
+        cpsb`) when a slot that was originally empty is restored back
+        to zero within the transaction; otherwise return 0.
         """
         del gas_costs
         metadata = opcode.metadata
@@ -384,7 +384,7 @@ def _calculate_sstore_state_refund(
         if current_value != new_value:
             if original_value == new_value:
                 if original_value == 0:
-                    return 32 * cpsb
+                    return 64 * cpsb
         return 0
 
     @classmethod
@@ -394,8 +394,9 @@ def _calculate_selfdestruct_state_refund(
         """
         Calculate SELFDESTRUCT state gas refund.
 
-        Account creation: 112 × cost_per_state_byte
-        Created storage slots: 32 × cost_per_state_byte per non-zero slot
+        Account creation: STATE_BYTES_PER_NEW_ACCOUNT × cost_per_state_byte
+        Created storage slots: STATE_BYTES_PER_STORAGE_SET ×
+        cost_per_state_byte per non-zero slot
         Code deposit: len(code) × cost_per_state_byte
         """
         del gas_costs
@@ -411,9 +412,9 @@ def _calculate_selfdestruct_state_refund(
         ]
         state_refund = 0
         if self_destructed_account:
-            state_refund = 112 * cpsb
+            state_refund = 120 * cpsb
             state_refund += (
-                32 * cpsb * self_destructed_account_storage_slot_count
+                64 * cpsb * self_destructed_account_storage_slot_count
             )
             state_refund += cpsb * self_destructed_account_code_deposit
         return state_refund

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

@@ -28,8 +28,8 @@
 # EIP-8037 state gas accounting constants
 COST_PER_STATE_BYTE = Uint(1174)
 
-STATE_BYTES_PER_NEW_ACCOUNT = Uint(112)
-STATE_BYTES_PER_STORAGE_SET = Uint(32)
+STATE_BYTES_PER_NEW_ACCOUNT = Uint(120)
+STATE_BYTES_PER_STORAGE_SET = Uint(64)
 STATE_BYTES_PER_AUTH_BASE = Uint(23)
 
 PER_AUTH_BASE_COST = Uint(7500)

tests/amsterdam/eip8037_state_creation_gas_cost_increase/spec.py

@@ -44,8 +44,8 @@ class Spec:
     COST_PER_STATE_BYTE = 1174  # at 100M–120M gas limit
 
     # State bytes per operation
-    STATE_BYTES_PER_NEW_ACCOUNT = 112
-    STATE_BYTES_PER_STORAGE_SET = 32
+    STATE_BYTES_PER_NEW_ACCOUNT = 120
+    STATE_BYTES_PER_STORAGE_SET = 64
     STATE_BYTES_PER_AUTH_BASE = 23
 
     # Regular gas constants (EIP-8037 replaces old combined costs)

tests/amsterdam/eip8037_state_creation_gas_cost_increase/test_state_gas_call.py

@@ -121,7 +121,7 @@ def test_delegatecall_child_spill_not_double_charged(
 
     tx = Transaction(
         to=caller,
-        gas_limit=500_000,
+        gas_limit=700_000,
         sender=pre.fund_eoa(),
     )
 
@@ -1611,8 +1611,8 @@ def test_child_failure_refunds_state_gas_to_reservoir_not_gas_left(
     # to regular gas (or otherwise leaks extra gas to the sender),
     # which the storage probe alone cannot discriminate.
     expected_cumulative = {
-        Op.CALL: 73_831,
-        Op.DELEGATECALL: 73_825,
+        Op.CALL: 111_399,
+        Op.DELEGATECALL: 111_393,
     }[call_opcode]
 
     tx = Transaction(

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=500_000,
+        gas_limit=700_000,
         sender=pre.fund_eoa(),
     )
 
@@ -2466,7 +2466,7 @@ def test_create_collision_burned_gas_counted_in_block_regular(
     # 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 = 117132
+    baseline_gas_used = 107887
 
     blockchain_test(
         pre=pre,

tests/common/precompile_fixtures.py

@@ -183,9 +183,12 @@ def tx_gas_limit(fork: Fork, input_data: bytes, precompile_gas: int) -> int:
         fork.transaction_intrinsic_cost_calculator()
     )
     memory_expansion_gas_calculator = fork.memory_expansion_gas_calculator()
-    extra_gas = 100_000
-    if fork.is_eip_enabled(8037):
-        extra_gas = 200_000
+    # `call_contract_code` performs up to 3 SSTOREs (succeeds-flag,
+    # output-length, output-hash) per call. Pre-EIP-8037 each SSTORE
+    # fits comfortably in the 100_000 budget; under EIP-8037 each
+    # SSTORE additionally consumes `fork.sstore_state_gas()` of state
+    # gas, so size the budget against the actual per-fork cost.
+    extra_gas = 100_000 + 3 * fork.sstore_state_gas()
     return (
         extra_gas
         + intrinsic_gas_cost_calculator(calldata=input_data)