cancun/tests: Merge 4788 proof changes to all cancun tests & 4788 fixes.

Author: spencer-tb

src/ethereum_test_tools/__init__.py

@@ -15,6 +15,7 @@
     Fixture,
     FixtureEngineNewPayload,
     Header,
+    HistoryStorageAddress,
     JSONEncoder,
     Storage,
     TestAddress,
@@ -63,6 +64,7 @@
     "Fixture",
     "FixtureEngineNewPayload",
     "Header",
+    "HistoryStorageAddress",
     "Initcode",
     "JSONEncoder",
     "Opcode",

src/ethereum_test_tools/common/__init__.py

@@ -7,6 +7,7 @@
     BeaconRoot,
     EmptyTrieRoot,
     EngineAPIError,
+    HistoryStorageAddress,
     TestAddress,
     TestAddress2,
     TestPrivateKey,
@@ -75,6 +76,7 @@
     "Hash",
     "Header",
     "HeaderNonce",
+    "HistoryStorageAddress",
     "JSONEncoder",
     "Number",
     "Storage",

src/ethereum_test_tools/common/constants.py

@@ -20,6 +20,7 @@
 EmptyNonce = bytes([0] * 8)
 ZeroAddress = bytes([0] * 20)
 
+HistoryStorageAddress = "0x000000000000000000000000000000000000000b"
 BeaconRoot = bytes.fromhex("3e97e493f9123f7455a3be1b388db32876beea7d165a3b63528d8f9a38b7249f")
 
 

src/ethereum_test_tools/spec/blockchain_test.py

@@ -94,6 +94,7 @@ def make_genesis(
                 if env.withdrawals is not None
                 else None
             ),
+            beacon_root=Hash.or_none(env.beacon_root),
         )
 
         genesis_rlp, genesis.hash = genesis.build(

src/ethereum_test_tools/spec/state_test.py

@@ -1,6 +1,7 @@
 """
 State test filler.
 """
+from copy import copy
 from dataclasses import dataclass
 from typing import Any, Callable, Dict, Generator, List, Mapping, Optional, Tuple, Type
 
@@ -57,7 +58,13 @@ def make_genesis(
         """
         Create a genesis block from the state test definition.
         """
-        env = self.env.set_fork_requirements(fork)
+        env = copy(self.env)
+
+        # Remove fields that should not be present in the genesis block.
+        env.withdrawals = None
+        env.beacon_root = None
+
+        env = env.set_fork_requirements(fork)
 
         genesis = FixtureHeader(
             parent_hash=Hash(0),
@@ -93,6 +100,7 @@ def make_genesis(
                 if env.withdrawals is not None
                 else None
             ),
+            beacon_root=Hash.or_none(env.beacon_root),
         )
 
         genesis_rlp, genesis.hash = genesis.build(

tests/cancun/eip4788_beacon_root/conftest.py

@@ -8,6 +8,7 @@
 from ethereum_test_tools import (
     Account,
     Environment,
+    HistoryStorageAddress,
     TestAddress,
     Transaction,
     to_address,
@@ -127,6 +128,7 @@ def pre(
     source account of all test transactions, and the precompile caller account.
     """
     return {
+        HistoryStorageAddress: Account(balance=1),
         TestAddress: Account(
             nonce=0,
             balance=0x10**10,

tests/cancun/eip4788_beacon_root/test_beacon_root_precompile.py

@@ -184,8 +184,6 @@ def test_beacon_root_equal_to_timestamp(
     [
         12,  # twelve
         2**32,  # arbitrary
-        2**64 - 2,  # near-max
-        2**64 - 1,  # max
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -226,11 +224,12 @@ def test_beacon_root_timestamp_collisions(
                 txs=[
                     tx.with_fields(
                         nonce=i,
-                        to=to_address(0x100),
+                        to=to_address(0x100 + i),
                         data=to_hash_bytes(timestamp),
                     )
                 ],
                 beacon_root=DEFAULT_BEACON_ROOT_HASH,
+                timestamp=timestamp,
             )
         )
         post[to_address(0x100 + i)] = Account(
@@ -243,7 +242,6 @@ def test_beacon_root_timestamp_collisions(
         )
 
     blockchain_test(
-        genesis_environment=env,
         pre=pre,
         blocks=blocks,
         post=post,

tests/cancun/eip4844_blobs/test_blob_txs.py

@@ -21,7 +21,14 @@
 
 import pytest
 
-from ethereum_test_tools import Account, Block, BlockchainTestFiller, Environment, Header
+from ethereum_test_tools import (
+    Account,
+    Block,
+    BlockchainTestFiller,
+    Environment,
+    Header,
+    HistoryStorageAddress,
+)
 from ethereum_test_tools import Opcodes as Op
 from ethereum_test_tools import (
     Storage,
@@ -295,6 +302,7 @@ def pre(  # noqa: D103
     blocks.
     """
     return {
+        HistoryStorageAddress: Account(balance=1),
         TestAddress: Account(balance=total_account_minimum_balance + account_balance_modifier),
     }
 

tests/cancun/eip4844_blobs/test_blob_txs_full.py

@@ -14,6 +14,7 @@
     BlockchainTestFiller,
     Environment,
     Header,
+    HistoryStorageAddress,
     TestAddress,
     Transaction,
     to_address,
@@ -226,6 +227,7 @@ def pre() -> Dict:
     source account of all test transactions.
     """
     return {
+        HistoryStorageAddress: Account(balance=1),
         TestAddress: Account(balance=10**40),
     }
 

tests/cancun/eip4844_blobs/test_blobhash_opcode.py

@@ -26,6 +26,7 @@
     Block,
     BlockchainTestFiller,
     CodeGasMeasure,
+    HistoryStorageAddress,
     TestAddress,
     Transaction,
     to_address,
@@ -44,7 +45,10 @@
 
 @pytest.fixture
 def pre():  # noqa: D103
-    return {TestAddress: Account(balance=10000000000000000000000)}
+    return {
+        HistoryStorageAddress: Account(balance=1),
+        TestAddress: Account(balance=10000000000000000000000),
+    }
 
 
 @pytest.fixture