fix(fw): fix verkle transition tests (naive).

Author: spencer-tb

src/ethereum_test_forks/base_fork.py

@@ -292,6 +292,14 @@ def fork_at(cls, block_number: int = 0, timestamp: int = 0) -> Type["BaseFork"]:
         """
         return cls
 
+    @classmethod
+    def transition_at(cls) -> int:
+        """
+        Return the timestamp at which the fork will start transitioning to the next fork.
+        Useful only for transition forks.
+        """
+        return 0
+
     @classmethod
     @abstractmethod
     def transition_tool_name(cls, block_number: int = 0, timestamp: int = 0) -> str:

src/ethereum_test_forks/forks/forks.py

@@ -674,7 +674,12 @@ class EIP6800Transition(
     Shanghai to Verkle transition at Timestamp 32.
     """
 
-    pass
+    @classmethod
+    def transition_at(cls) -> int:
+        """
+        The timestamp at which the fork transition occurs.
+        """
+        return 32
 
 
 class CancunEIP7692(

src/ethereum_test_tools/common/conversions.py

@@ -1,6 +1,7 @@
 """
 Common conversion methods.
 """
+
 from re import sub
 from typing import Any, List, Optional, SupportsBytes, TypeAlias
 

src/ethereum_test_tools/common/types.py

@@ -222,9 +222,9 @@ def __setitem__(
         value: StorageKeyValueTypeConvertible | StorageKeyValueType,
     ):  # noqa: SC200
         """Sets an item in the storage"""
-        self.root[
-            StorageKeyValueTypeAdapter.validate_python(key)
-        ] = StorageKeyValueTypeAdapter.validate_python(value)
+        self.root[StorageKeyValueTypeAdapter.validate_python(key)] = (
+            StorageKeyValueTypeAdapter.validate_python(value)
+        )
 
     def __delitem__(self, key: StorageKeyValueTypeConvertible | StorageKeyValueType):
         """Deletes an item from the storage"""
@@ -1711,12 +1711,12 @@ class Result(CamelModel):
     )
 
 
-class VerkleTree(RootModel[Dict[StorageKeyValueType, StorageKeyValueType]]):
+class VerkleTree(RootModel[Dict[str, str]]):
     """
     Definition of a verkle tree return from the geth t8n.
     """
 
-    root: Dict[StorageKeyValueType, StorageKeyValueType] = Field(default_factory=dict)
+    root: Dict[str, str] = Field(default_factory=dict)
 
 
 class TransitionToolOutput(CamelModel):

src/ethereum_test_tools/spec/blockchain/blockchain_test.py

@@ -369,10 +369,15 @@ def make_fixture(
 
         # Hack for filling naive verkle transition tests
         if fork is EIP6800Transition:
-            # Add a dummy Shanghai block before the test blocks
-            self.blocks.insert(0, Block(timestamp=HexNumber(12)))
+            # Add a dummy block before the fork transition
+            self.blocks.insert(0, Block(timestamp=HexNumber(fork.transition_at() - 1)))
             # Set timestamp for the next block to verkle transition time
-            self.blocks[1].timestamp = HexNumber(32)
+            self.blocks[1].timestamp = HexNumber(fork.transition_at())
+            # Increment all other block numbers
+            for i, block in enumerate(self.blocks[1:]):
+                block.number = HexNumber(i + 2)
+            # Add a dummy block at the end of the test blocks
+            self.blocks.append(Block())
 
         for block in self.blocks:
             if block.rlp is None:
@@ -453,7 +458,7 @@ def make_fixture(
             blocks=fixture_blocks,
             last_block_hash=head,
             pre=pre,
-            post_state=alloc if vkt is None else vkt,
+            # TODO: post_state=alloc
         )
 
     def make_hive_fixture(
@@ -475,10 +480,15 @@ def make_hive_fixture(
 
         # Hack for filling naive verkle transition tests
         if fork is EIP6800Transition:
-            # Add a dummy Shanghai block before the test blocks
-            self.blocks.insert(0, Block(timestamp=HexNumber(12)))
+            # Add a dummy block before the fork transition
+            self.blocks.insert(0, Block(timestamp=HexNumber(fork.transition_at() - 1)))
             # Set timestamp for the next block to verkle transition time
-            self.blocks[1].timestamp = HexNumber(32)
+            self.blocks[1].timestamp = HexNumber(fork.transition_at())
+            # Increment all other block numbers
+            for i, block in enumerate(self.blocks[1:]):
+                block.number = HexNumber(i + 2)
+            # Add a dummy block at the end of the test blocks
+            self.blocks.append(Block())
 
         for block in self.blocks:
             new_env, header, txs, new_alloc, requests, new_vkt = self.generate_block_data(
@@ -550,7 +560,7 @@ def make_hive_fixture(
             payloads=fixture_payloads,
             fcu_version=fcu_version,
             pre=pre,
-            post_state=alloc if vkt is None else vkt,
+            # TODO: post_state=alloc
             sync_payload=sync_payload,
         )
 

src/ethereum_test_tools/spec/blockchain/types.py

@@ -52,7 +52,6 @@
     Transaction,
     TransactionFixtureConverter,
     TransactionGeneric,
-    VerkleTree,
     Withdrawal,
     WithdrawalGeneric,
     WithdrawalRequest,
@@ -203,9 +202,9 @@ class FixtureHeader(CamelModel):
     extra_data: Bytes
     prev_randao: Hash = Field(Hash(0), alias="mixHash")
     nonce: HeaderNonce = Field(HeaderNonce(0), validate_default=True)
-    base_fee_per_gas: (
-        Annotated[ZeroPaddedHexNumber, HeaderForkRequirement("base_fee")] | None
-    ) = Field(None)
+    base_fee_per_gas: Annotated[ZeroPaddedHexNumber, HeaderForkRequirement("base_fee")] | None = (
+        Field(None)
+    )
     withdrawals_root: Annotated[Hash, HeaderForkRequirement("withdrawals")] | None = Field(None)
     blob_gas_used: (
         Annotated[ZeroPaddedHexNumber, HeaderForkRequirement("blob_gas_used")] | None
@@ -647,7 +646,7 @@ class FixtureCommon(BaseFixture):
     fork: str = Field(..., alias="network")
     genesis: FixtureHeader = Field(..., alias="genesisBlockHeader")
     pre: Alloc
-    post_state: Optional[Alloc | VerkleTree] = Field(None)
+    post_state: Optional[Alloc] = Field(None)
 
     def get_fork(self) -> str:
         """

src/pytest_plugins/consume/hive_ruleset.py

@@ -306,7 +306,7 @@
         "HIVE_SHANGHAI_TIMESTAMP": 0,
         "HIVE_CANCUN_TIMESTAMP": 15000,
     },
-    "ShanghaiToPragueAt32": {  # TODO: Make this verkle specific
+    "ShanghaiToPragueAtTime32": {  # TODO: Make this verkle specific
         "HIVE_FORK_HOMESTEAD": 0,
         "HIVE_FORK_TANGERINE": 0,
         "HIVE_FORK_SPURIOUS": 0,