fix(tests): fix withdrawals test setup while filling

Author: fselmo

tests/prague/eip7002_el_triggerable_withdrawals/conftest.py

@@ -14,7 +14,6 @@
 
 from .helpers import (
     WithdrawalRequest,
-    WithdrawalRequestContract,
     WithdrawalRequestInteractionBase,
 )
 from .spec import Spec
@@ -107,15 +106,6 @@ def blocks(
             block_number=len(blocks) + 1,
             timestamp=timestamp,
         )
-        if block_fork.is_eip_enabled(8037):
-            gas_costs = block_fork.gas_costs()
-            for r in block_requests:
-                if isinstance(r, WithdrawalRequestContract):
-                    # Each withdrawal request writes 3 new storage slots
-                    # in the system contract queue (source, pubkey, amount).
-                    r.tx_gas_limit += (
-                        len(r.requests) * 3 * gas_costs.STORAGE_SET
-                    )
         header_verify: Header | None = None
         if block_fork.header_requests_required():
             header_verify = Header(

tests/prague/eip7002_el_triggerable_withdrawals/helpers.py

@@ -146,8 +146,12 @@ def valid_requests(
 class WithdrawalRequestContract(WithdrawalRequestInteractionBase):
     """Class used to describe a withdrawal originated from a contract."""
 
-    tx_gas_limit: int = 1_000_000
-    """Gas limit for the transaction."""
+    tx_gas_limit: int = 3_000_000
+    """
+    Gas limit for the transaction. Sized to comfortably cover
+    `MAX_WITHDRAWAL_REQUESTS_PER_BLOCK` zero-to-nonzero state-set
+    charges per tx under EIP-8037 plus regular dispatch overhead.
+    """
 
     contract_balance: int = 1_000_000_000_000_000_000
     """
@@ -166,6 +170,13 @@ class WithdrawalRequestContract(WithdrawalRequestInteractionBase):
     """Frame depth of the pre-deploy contract when it executes the call."""
     extra_code: Bytecode = field(default_factory=Bytecode)
     """Extra code to be added to the contract code."""
+    fund_state_reservoir: bool = False
+    """
+    When True (and EIP-8037 is active), pad `tx_gas_limit` by exactly the
+    per-request state-set work so the excess funds the EIP-8037 reservoir.
+    Use only when `tx_gas_limit` is held at the cap (reservoir would
+    otherwise be empty) and state work must not drain the regular pool.
+    """
 
     @property
     def contract_code(self) -> Bytecode:
@@ -196,11 +207,14 @@ def transactions(self, fork: Fork | None = None) -> List[Transaction]:
         """Return a transaction for the withdrawal request."""
         assert self.entry_address is not None, "Entry address not initialized"
         gas_limit = self.tx_gas_limit
-        if fork is not None and fork.is_eip_enabled(8037):
+        if (
+            self.fund_state_reservoir
+            and fork is not None
+            and fork.is_eip_enabled(8037)
+        ):
             # Each withdrawal request writes 3 new storage slots
             # in the system contract queue (source, pubkey, amount).
-            gas_costs = fork.gas_costs()
-            gas_limit += len(self.requests) * 3 * gas_costs.STORAGE_SET
+            gas_limit += len(self.requests) * 3 * fork.sstore_state_gas()
         return [
             Transaction(
                 gas_limit=gas_limit,

tests/prague/eip7002_el_triggerable_withdrawals/test_withdrawal_requests.py

@@ -328,6 +328,12 @@
                         ],
                         call_depth=264,
                         tx_gas_limit=16_777_216,
+                        # tx_gas_limit is held at the cap to test the
+                        # 63/64 drain over the deep call chain. EIP-8037
+                        # state-set work is funded via the reservoir
+                        # rather than the regular pool, which would
+                        # corrupt the boundary the test pins.
+                        fund_state_reservoir=True,
                     ),
                 ],
             ],