feat(spec-specs, tests): EIP-8037 - per-dimension block gas limit check at tx inclusion (#2703)

* feat(tests): 8037 Check 2d gas before tx inclusion

* feat(spec-specs): More tests for 2d tx inclusion spec change

* fix(tests): consolidate state gas boundary tests and clean docstrings

Cleanups to the per-dimension block gas inclusion tests:

- Combine `test_block_state_gas_limit_exact_fit` and
  `test_block_state_gas_limit_exceeded` into
  `test_block_state_gas_limit_boundary` parametrized
  `delta=[0, 1]` (ids `exact_fit`, `exceeded`) and inline the
  `_block_state_gas_limit_setup` helper. Removes ~45 lines with
  no coverage loss.
- Fix docstring references in both boundary cases: state
  contribution is `tx.gas - intrinsic_regular`, not
  `tx.gas - TX_MAX_GAS_LIMIT`.
- Tighten wording in `test_creation_tx_regular_check_subtracts_intrinsic_state`
  and add assertion messages that spell out the old-vs-new
  formula discrimination.
- Apply ruff format (drop an unneeded line wrap on
  `create_intrinsic_regular` in `test_creation_tx_state_check_exceeded`).

Co-authored-by: kclowes <kclowes@users.noreply.github.com>

---------

Co-authored-by: spencer-tb <spencer.tb@ethereum.org>

Author: kclowes

src/ethereum/forks/amsterdam/fork.py

@@ -80,6 +80,7 @@
     TX_MAX_GAS_LIMIT,
     BlobTransaction,
     FeeMarketTransaction,
+    IntrinsicGasCost,
     LegacyTransaction,
     SetCodeTransaction,
     Transaction,
@@ -488,6 +489,7 @@ def check_transaction(
     block_output: vm.BlockOutput,
     tx: Transaction,
     tx_state: TransactionState,
+    intrinsic: IntrinsicGasCost,
 ) -> Tuple[Address, Uint, Tuple[VersionedHash, ...], U64]:
     """
     Check if the transaction is includable in the block.
@@ -502,6 +504,9 @@ def check_transaction(
         The transaction.
     tx_state :
         The transaction state tracker.
+    intrinsic :
+        The transaction's intrinsic gas cost, split into regular and
+        state components.
 
     Returns
     -------
@@ -549,16 +554,29 @@ def check_transaction(
         is empty.
 
     """
-    # Regular gas is capped at TX_MAX_GAS_LIMIT per EIP-7825.
-    # State gas is not checked per-tx; block-end validation enforces
+    # Per-tx 2D gas inclusion check: for each dimension the worst-case
+    # contribution must fit in the remaining budget.  Block-end
+    # validation still enforces
     # max(block_regular_gas_used, block_state_gas_used) <= gas_limit.
     regular_gas_available = (
         block_env.block_gas_limit - block_output.block_gas_used
     )
+    state_gas_available = (
+        block_env.block_gas_limit - block_output.block_state_gas_used
+    )
     blob_gas_available = MAX_BLOB_GAS_PER_BLOCK - block_output.blob_gas_used
 
-    if min(TX_MAX_GAS_LIMIT, tx.gas) > regular_gas_available:
-        raise GasUsedExceedsLimitError("regular gas used exceeds limit")
+    # Worst-case regular contribution: tx.gas minus the portion that
+    # must go to intrinsic state gas, capped at TX_MAX_GAS_LIMIT.
+    if min(TX_MAX_GAS_LIMIT, tx.gas - intrinsic.state) > (
+        regular_gas_available
+    ):
+        raise GasUsedExceedsLimitError("gas used exceeds limit")
+
+    # Worst-case state contribution: tx.gas minus the portion that
+    # must go to intrinsic regular gas.
+    if tx.gas - intrinsic.regular > state_gas_available:
+        raise GasUsedExceedsLimitError("gas used exceeds limit")
 
     tx_blob_gas_used = calculate_total_blob_gas(tx)
     if tx_blob_gas_used > blob_gas_available:
@@ -991,6 +1009,7 @@ def process_transaction(
         block_output=block_output,
         tx=tx,
         tx_state=tx_state,
+        intrinsic=intrinsic,
     )
 
     sender_account = get_account(tx_state, sender)

tests/amsterdam/eip8037_state_creation_gas_cost_increase/test_block_2d_gas_accounting.py

@@ -288,21 +288,28 @@ def test_block_2d_gas_boundary_exact_fit(
     num_sstores: int,
 ) -> None:
     """
-    Verify a block is valid when max(regular, state) == gas_limit.
+    Verify a block is valid when state gas dominates regular gas.
 
-    Set block_gas_limit = block_state_gas (the dominant dimension).
     Clients that sum regular + state will reject this valid block.
     """
     tx_regular, tx_state = sstore_tx_gas(fork, num_sstores)
-    block_state = num_txs * tx_state
-    block_gas_limit = block_state
+    intrinsic_regular = fork.transaction_intrinsic_cost_calculator()()
 
-    # tx_limit must exceed tx_regular + tx_state so the tx is valid,
-    # but the per-tx regular reservation against block gas must still
-    # leave room for all txs.
     tx_limit = tx_regular + tx_state + tx_regular // 10
-    worst = block_gas_limit - (num_txs - 1) * tx_regular
-    assert worst >= tx_limit, "per-tx regular gas check fails"
+
+    # Per-tx worst-case state contribution: tx.gas - intrinsic_regular.
+    # The block_gas_limit must leave enough state budget for every tx.
+    worst_state_per_tx = tx_limit - intrinsic_regular
+    block_gas_limit = max(
+        # Regular dimension: last tx must fit.
+        (num_txs - 1) * tx_regular + tx_limit,
+        # State dimension: cumulative worst-case must fit.
+        num_txs * worst_state_per_tx,
+    )
+
+    block_regular = num_txs * tx_regular
+    block_state = num_txs * tx_state
+    expected_gas_used = max(block_regular, block_state)
 
     txs, post = sstore_txs(
         pre,
@@ -320,7 +327,7 @@ def test_block_2d_gas_boundary_exact_fit(
             Block(
                 txs=txs,
                 gas_limit=block_gas_limit,
-                header_verify=Header(gas_used=block_gas_limit),
+                header_verify=Header(gas_used=expected_gas_used),
             )
         ],
         post=post,