feat(verkle): add parent root to witness & fix proof.

Author: spencer-tb

src/ethereum_test_specs/blockchain.py

@@ -607,11 +607,14 @@ def generate_block_data(
                 )
             )
             transition_tool_output.alloc = previous_alloc
+            # TODO: hack for now, replace with actual witness output once available from t8n
             if transition_tool_output.result.verkle_conversion_ended:
-                # TODO: hack for now, replace with actual witness output once available from t8n
+                witness_parent_root = transition_tool_output.result.parent_root
+                assert witness_parent_root == header.parent_hash
                 transition_tool_output.witness = Witness(
                     verkle_proof=transition_tool_output.result.verkle_proof,
                     state_diff=transition_tool_output.result.state_diff,
+                    parent_root=witness_parent_root,
                 )
             else:
                 transition_tool_output.witness = None

src/ethereum_test_types/verkle/tests/test_verkle_witness.py

@@ -152,6 +152,7 @@ def witness_data(state_diff_data, verkle_proof_data):
     return {
         "stateDiff": state_diff_data,
         "verkleProof": verkle_proof_data,
+        "parentRoot": "0x5b5fdfedd6a0e932da408ac7d772a36513d1eee9b9926e52620c43a433aad7",
     }
 
 
@@ -170,3 +171,6 @@ def test_witness_validation(witness_data):
         == 0x647ED3C87A4F764421EA2F5BFC73195812F6B7DD15AC2B8D295730C1DEDE1EDF
     )
     assert witness.state_diff.root[0].suffix_diffs[0].new_value is None
+    assert witness.parent_root == (
+        0x5B5FDFEDD6A0E932DA408AC7D772A36513D1EEE9B9926E52620C43A433AAD7
+    )

src/ethereum_test_types/verkle/types.py

@@ -12,7 +12,7 @@
 from ethereum_test_base_types import (
     Address,
     CamelModel,
-    HexNumber,
+    ZeroPaddedHexNumber,
     PaddedFixedSizeBytes,
 )
 from ethereum_test_forks import Fork, Verkle
@@ -69,7 +69,7 @@ class VerkleProof(CamelModel):
     """
 
     other_stems: List[Stem]
-    depth_extension_present: HexNumber
+    depth_extension_present: ZeroPaddedHexNumber
     commitments_by_path: List[Hash]
     d: Hash
     ipa_proof: IpaProof | None = Field(None)
@@ -143,7 +143,7 @@ class Witness(CamelModel):
 
     state_diff: StateDiff
     verkle_proof: VerkleProof
-    # parent_state_root: Hash
+    parent_root: Hash
 
 
 class VerkleTree(RootModel[Dict[Hash, Hash]]):

src/evm_transition_tool/types.py

@@ -112,6 +112,7 @@ class Result(CamelModel):
 
     verkle_proof: VerkleProof | None = None
     state_diff: StateDiff | None = None
+    parent_root: Hash | None = None
 
 
 class TransitionToolInput(CamelModel):