fix(tests): EIP-7702: use penultimate block number instead of fixing block 0

src/ethereum_test_rpc/rpc.py

@@ -114,6 +114,10 @@ def __init__(
         super().__init__(url, extra_headers)
         self.transaction_wait_timeout = transaction_wait_timeout
 
+    def get_block_number(self) -> int:
+        """`eth_blockNumber`: Returns the number of the most recent block."""
+        return int(self.post_request("blockNumber"), 16)
+
     def get_block_by_number(self, block_number: BlockNumberType = "latest", full_txs: bool = True):
         """`eth_getBlockByNumber`: Returns information about a block by block number."""
         block = hex(block_number) if isinstance(block_number, int) else block_number

src/ethereum_test_types/types.py

@@ -298,6 +298,10 @@ def fund_address(self, address: Address, amount: NumberConvertible):
         """
         raise NotImplementedError("fund_address is not implemented in the base class")
 
+    def get_block_number(self):
+        """Return the last block number."""
+        raise NotImplementedError("get_block_number is not implemented in the base class")
+
 
 class WithdrawalGeneric(CamelModel, Generic[NumberBoundTypeVar]):
     """Withdrawal generic type, used as a parent class for `Withdrawal` and `FixtureWithdrawal`."""

src/pytest_plugins/execute/pre_alloc.py

@@ -343,6 +343,10 @@ def fund_address(self, address: Address, amount: NumberConvertible):
 
         super().__setitem__(address, Account(balance=amount))
 
+    def get_block_number(self):
+        """Return the last block number."""
+        return self._eth_rpc.get_block_number()
+
     def wait_for_transactions(self) -> List[TransactionByHashResponse]:
         """Wait for all transactions to be included in blocks."""
         return self._eth_rpc.wait_for_transactions(self._txs)

src/pytest_plugins/filler/pre_alloc.py

@@ -250,6 +250,10 @@ def fund_address(self, address: Address, amount: NumberConvertible):
                 return
         super().__setitem__(address, Account(balance=amount))
 
+    def get_block_number(self):
+        """Return the last block number."""
+        return 0
+
 
 @pytest.fixture(scope="session")
 def alloc_mode(request: pytest.FixtureRequest) -> AllocMode:

tests/prague/eip7702_set_code_tx/test_set_code_txs.py

@@ -2656,7 +2656,8 @@ def test_set_code_to_system_contract(
             caller_payload = consolidation_request.calldata
             call_value = consolidation_request.value
         case Address(0x0000F90827F1C53A10CB7A02335B175320002935):  # EIP-2935
-            caller_payload = Hash(0)
+            # Use the penultimate block to ensure it is saved in the history contract
+            caller_payload = Hash(max(pre.get_block_number() - 1, 0))
             caller_code_storage[call_return_data_size_slot] = 32
         case _:
             raise ValueError(f"Not implemented system contract: {system_contract}")