verkle: verkle genesis test-vectors

configs/evm.yaml

@@ -12,4 +12,9 @@ eip7692:
   impl: evmone
   repo: ethereum/evmone
   ref: master
-  evm-bin: evmone-t8n
+  evm-bin: evmone-t8n
+verkle:
+  impl: geth
+  repo: gballet/go-ethereum
+  ref: jsign-t8n-verkle-genesis-rebased
+  evm-bin: evm

configs/feature.yaml

@@ -9,4 +9,12 @@ develop:
 eip7692:
   evm-type: eip7692
   fill-params: --fork=CancunEIP7692 ./tests/prague
-  solc: 0.8.21
+  solc: 0.8.21
+verkle-genesis:
+  evm-type: verkle
+  fill-params: --fork=Verkle -m blockchain_test
+  solc: 0.8.24
+verkle-conversion-stride-0:
+  evm-type: verkle
+  fill-params: --fork=EIP6800Transition -m blockchain_test
+  solc: 0.8.24

src/ethereum_test_base_types/__init__.py

@@ -15,6 +15,7 @@
     HexNumber,
     Number,
     NumberBoundTypeVar,
+    PaddedFixedSizeBytes,
     ZeroPaddedHexNumber,
 )
 from .composite_types import Account, Alloc, Storage, StorageRootType
@@ -53,6 +54,7 @@
     "HexNumber",
     "Number",
     "NumberBoundTypeVar",
+    "PaddedFixedSizeBytes",
     "ReferenceSpec",
     "Storage",
     "StorageRootType",

src/ethereum_test_base_types/base_types.py

@@ -276,6 +276,21 @@ def __ne__(self, other: object) -> bool:
         return not self.__eq__(other)
 
 
+class PaddedFixedSizeBytes(FixedSizeBytes):
+    """
+    Class that represents fixed-size bytes with padded hex output.
+    """
+
+    def hex(self, *args, **kwargs) -> str:
+        """
+        Returns the hexadecimal representation of the bytes with padding.
+        """
+        hex_str = super().hex(*args, **kwargs)[2:]
+        if len(hex_str) % 2 != 0:
+            hex_str = "0" + hex_str
+        return "0x" + hex_str.zfill(self.byte_length * 2)
+
+
 class Address(FixedSizeBytes[20]):  # type: ignore
     """
     Class that helps represent Ethereum addresses in tests.

src/ethereum_test_base_types/pydantic.py

@@ -1,6 +1,7 @@
 """
 Base pydantic classes used to define the models for Ethereum tests.
 """
+
 from typing import TypeVar
 
 from pydantic import BaseModel, ConfigDict

src/ethereum_test_fixtures/blockchain.py

@@ -40,6 +40,7 @@
     WithdrawalRequest,
     WithdrawalRequestGeneric,
 )
+from ethereum_test_types.verkle import Witness
 
 from .base import BaseFixture
 from .formats import FixtureFormats
@@ -412,6 +413,19 @@ def from_consolidation_request(
         return cls(**d.model_dump())
 
 
+class FixtureWitness(Witness):
+    """
+    Structure to represent a single verkle block witness.
+    """
+
+    @classmethod
+    def from_witness(cls, w: Witness) -> "FixtureWitness":
+        """
+        Returns a FixtureWitness from a Witness.
+        """
+        return cls(**w.model_dump())
+
+
 class FixtureBlockBase(CamelModel):
     """Representation of an Ethereum block within a test Fixture without RLP bytes."""
 
@@ -423,6 +437,8 @@ class FixtureBlockBase(CamelModel):
     withdrawal_requests: List[FixtureWithdrawalRequest] | None = None
     consolidation_requests: List[FixtureConsolidationRequest] | None = None
 
+    witness: FixtureWitness | None = None
+
     @computed_field(alias="blocknumber")  # type: ignore[misc]
     @cached_property
     def block_number(self) -> Number:

src/ethereum_test_specs/base.py

@@ -14,7 +14,8 @@
 from ethereum_test_base_types import to_hex
 from ethereum_test_fixtures import BaseFixture, FixtureFormats
 from ethereum_test_forks import Fork
-from ethereum_test_types import Alloc, Environment, Transaction, VerkleTree, Withdrawal
+from ethereum_test_types import Alloc, Environment, Transaction, Withdrawal
+from ethereum_test_types.verkle import VerkleTree
 from evm_transition_tool import Result, TransitionTool
 
 

src/ethereum_test_specs/blockchain.py

@@ -18,7 +18,6 @@
     HeaderNonce,
     HexNumber,
     Number,
-    to_json,
 )
 from ethereum_test_exceptions import BlockException, EngineAPIError, TransactionException
 from ethereum_test_fixtures import BaseFixture, FixtureFormats
@@ -34,6 +33,7 @@
     FixtureTransaction,
     FixtureWithdrawal,
     FixtureWithdrawalRequest,
+    FixtureWitness,
     InvalidFixtureBlock,
 )
 from ethereum_test_forks import EIP6800Transition, Fork, Verkle
@@ -45,10 +45,10 @@
     Removable,
     Requests,
     Transaction,
-    VerkleTree,
     Withdrawal,
     WithdrawalRequest,
 )
+from ethereum_test_types.verkle import VerkleTree, Witness
 from evm_transition_tool import TransitionTool
 
 from .base import BaseTest, verify_result, verify_transactions
@@ -328,6 +328,7 @@ class BlockchainTest(BaseTest):
     def make_genesis(
         self,
         fork: Fork,
+        t8n: TransitionTool,
     ) -> Tuple[Alloc, FixtureBlock]:
         """
         Create a genesis block from the blockchain test definition.
@@ -346,7 +347,14 @@ def make_genesis(
         )
         if empty_accounts := pre_alloc.empty_accounts():
             raise Exception(f"Empty accounts in pre state: {empty_accounts}")
-        state_root = pre_alloc.state_root()
+
+        state_root: bytes
+        # TODO: refine, currently uses `evm verkle state-root` to get this.
+        if fork < Verkle or fork is EIP6800Transition:
+            state_root = pre_alloc.state_root()
+        else:
+            state_root = t8n.get_verkle_state_root(mpt_alloc=pre_alloc)
+
         genesis = FixtureHeader(
             parent_hash=0,
             ommers_hash=EmptyOmmersRoot,
@@ -404,6 +412,7 @@ def generate_block_data(
         Alloc,
         Optional[Requests],
         Optional[VerkleTree],
+        Optional[Witness],
     ]:
         """
         Generate common block data for both make_fixture and make_hive_fixture.
@@ -436,7 +445,7 @@ def generate_block_data(
             txs=txs,
             env=env,
             fork=fork,
-            vkt=to_json(previous_vkt) if previous_vkt is not None else None,
+            vkt=previous_vkt,
             chain_id=self.chain_id,
             reward=fork.get_reward(env.number, env.timestamp),
             eips=eips,
@@ -446,13 +455,17 @@ def generate_block_data(
         try:
             rejected_txs = verify_transactions(txs, transition_tool_output.result)
             verify_result(transition_tool_output.result, env)
+            # TODO: add verify witness (against vkt)
+            # verify_witness(transition_tool_output.witness, transition_tool_output.vkt)
         except Exception as e:
             print_traces(t8n.get_traces())
             pprint(transition_tool_output.result)
             pprint(previous_alloc)
             pprint(transition_tool_output.alloc)
             if transition_tool_output.vkt is not None:
                 pprint(transition_tool_output.vkt)
+            if transition_tool_output.witness is not None:
+                pprint(transition_tool_output.witness)
             raise e
 
         if len(rejected_txs) > 0 and block.exception is None:
@@ -525,6 +538,11 @@ def generate_block_data(
                 )
             )
             transition_tool_output.alloc = previous_alloc
+            # TODO: hack for now
+            transition_tool_output.witness = Witness(
+                verkle_proof=transition_tool_output.result.verkle_proof,
+                state_diff=transition_tool_output.result.state_diff,
+            )
 
         return (
             env,
@@ -533,6 +551,7 @@ def generate_block_data(
             transition_tool_output.alloc,
             requests,
             transition_tool_output.vkt,
+            transition_tool_output.witness,
         )
 
     def network_info(self, fork: Fork, eips: Optional[List[int]] = None):
@@ -556,7 +575,7 @@ def verify_post_state(
         Verifies the post state after all block/s or payload/s are generated.
         """
         try:
-            if env.verkle_conversion_started:
+            if env.verkle_conversion_started or env.verkle_conversion_ended:
                 if vkt is not None:
                     pass  # TODO: skip exact account verify checks
                     # verify_post_vkt(t8n=t8n, expected_post=self.post, got_vkt=vkt)
@@ -579,13 +598,19 @@ def make_fixture(
         """
         fixture_blocks: List[FixtureBlock | InvalidFixtureBlock] = []
 
-        pre, genesis = self.make_genesis(fork)
+        pre, genesis = self.make_genesis(fork, t8n)
 
         alloc = pre
         env = environment_from_parent_header(genesis.header)
         head = genesis.header.block_hash
         vkt: Optional[VerkleTree] = None
 
+        # Filling for verkle genesis tests
+        if fork is Verkle:
+            env.verkle_conversion_ended = True
+            # convert alloc to vkt
+            vkt = t8n.from_mpt_to_vkt(alloc)
+
         # Hack for filling naive verkle transition tests
         if fork is EIP6800Transition:
             # Add a dummy block before the fork transition
@@ -603,14 +628,16 @@ def make_fixture(
                 # This is the most common case, the RLP needs to be constructed
                 # based on the transactions to be included in the block.
                 # Set the environment according to the block to execute.
-                new_env, header, txs, new_alloc, requests, new_vkt = self.generate_block_data(
-                    t8n=t8n,
-                    fork=fork,
-                    block=block,
-                    previous_env=env,
-                    previous_alloc=alloc,
-                    previous_vkt=vkt,
-                    eips=eips,
+                new_env, header, txs, new_alloc, requests, new_vkt, witness = (
+                    self.generate_block_data(
+                        t8n=t8n,
+                        fork=fork,
+                        block=block,
+                        previous_env=env,
+                        previous_alloc=alloc,
+                        previous_vkt=vkt,
+                        eips=eips,
+                    )
                 )
                 fixture_block = FixtureBlockBase(
                     header=header,
@@ -645,6 +672,7 @@ def make_fixture(
                         if requests is not None
                         else None
                     ),
+                    witness=FixtureWitness.from_witness(witness) if witness is not None else None,
                 ).with_rlp(txs=txs, requests=requests)
                 if block.exception is None:
                     fixture_blocks.append(fixture_block)
@@ -699,7 +727,7 @@ def make_hive_fixture(
         """
         fixture_payloads: List[FixtureEngineNewPayload] = []
 
-        pre, genesis = self.make_genesis(fork)
+        pre, genesis = self.make_genesis(fork, t8n)
         alloc = pre
         env = environment_from_parent_header(genesis.header)
         head_hash = genesis.header.block_hash
@@ -718,7 +746,8 @@ def make_hive_fixture(
             self.blocks.append(Block())
 
         for block in self.blocks:
-            new_env, header, txs, new_alloc, requests, new_vkt = self.generate_block_data(
+            # TODO: fix witness for hive fixture? Do we need it?
+            new_env, header, txs, new_alloc, requests, new_vkt, _ = self.generate_block_data(
                 t8n=t8n,
                 fork=fork,
                 block=block,
@@ -762,7 +791,7 @@ def make_hive_fixture(
             # Most clients require the header to start the sync process, so we create an empty
             # block on top of the last block of the test to send it as new payload and trigger the
             # sync process.
-            _, sync_header, _, _, requests, _ = self.generate_block_data(
+            _, sync_header, _, _, requests, _, _ = self.generate_block_data(
                 t8n=t8n,
                 fork=fork,
                 block=Block(),

src/ethereum_test_tools/__init__.py

@@ -45,7 +45,6 @@
     Storage,
     TestParameterGroup,
     Transaction,
-    VerkleTree,
     Withdrawal,
     WithdrawalRequest,
     add_kzg_version,
@@ -133,7 +132,6 @@
     "TransactionException",
     "Withdrawal",
     "WithdrawalRequest",
-    "VerkleTree",
     "Yul",
     "YulCompiler",
     "add_kzg_version",

src/ethereum_test_types/__init__.py

@@ -27,7 +27,6 @@
     Requests,
     Storage,
     Transaction,
-    VerkleTree,
     Withdrawal,
     WithdrawalRequest,
 )
@@ -54,7 +53,6 @@
     "TestPrivateKey",
     "TestPrivateKey2",
     "Transaction",
-    "VerkleTree",
     "Withdrawal",
     "WithdrawalRequest",
     "ZeroPaddedHexNumber",

src/ethereum_test_types/types.py

@@ -1250,12 +1250,3 @@ def consolidation_requests(self) -> List[ConsolidationRequest]:
         Returns the list of consolidation requests.
         """
         return [c for c in self.root if isinstance(c, ConsolidationRequest)]
-
-
-# TODO: use a type like HashInt but that doesn't pad zero. DO NOT PAD THE ZEROS. KEEP ALL ZEROS.
-class VerkleTree(RootModel[Dict[str, str]]):
-    """
-    Definition of a verkle tree return from the geth t8n.
-    """
-
-    root: Dict[str, str] = Field(default_factory=dict)

src/ethereum_test_types/verkle/__init__.py

@@ -0,0 +1,14 @@
+"""
+Ethereum Verkle Test Types.
+"""
+
+from .types import IpaProof, StateDiff, SuffixStateDiff, VerkleProof, VerkleTree, Witness
+
+__all__ = (
+    "IpaProof",
+    "StateDiff",
+    "SuffixStateDiff",
+    "VerkleProof",
+    "VerkleTree",
+    "Witness",
+)