fixes

Signed-off-by: Ignacio Hagopian <[email protected]>
gballet · Oct 25, 2024 · c229a56 · c229a56
1 parent b738092
commit c229a56
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/block_validator.go b/core/block_validator.go
@@ -133,7 +133,7 @@ func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateD
 		return fmt.Errorf("invalid merkle root (remote: %x local: %x) dberr: %w", header.Root, root, statedb.Error())
 	}
 
-	if v.bc.Config().IsVerkle(header.Number, header.Time) {
+	if blockEw := block.ExecutionWitness(); blockEw != nil && v.bc.Config().IsVerkle(header.Number, header.Time) {
 		parent := v.bc.GetHeaderByNumber(header.Number.Uint64() - 1)
 		if parent == nil {
 			return fmt.Errorf("nil parent header for block %d", header.Number)
@@ -147,7 +147,7 @@ func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateD
 			VerkleProof:     proof,
 			ParentStateRoot: parent.Root,
 		}
-		if err := ew.Equal(block.ExecutionWitness()); err != nil {
+		if err := ew.Equal(blockEw); err != nil {
 			return fmt.Errorf("invalid execution witness: %v", err)
 		}
 	}

diff --git a/core/state_processor_test.go b/core/state_processor_test.go
@@ -609,7 +609,7 @@ func TestProcessVerkle(t *testing.T) {
 	//fmt.Printf("root= %x\n", chain[0].Root())
 
 	// check the proof for the 1st block
-	err = trie.DeserializeAndVerifyVerkleProof(proofs[0], genesis.Root().Bytes(), chain[0].Root().Bytes(), keyvals[0])
+	err = verkle.Verify(proofs[0], genesis.Root().Bytes(), chain[0].Root().Bytes(), keyvals[0])
 	if err != nil {
 		spew.Dump(genesis.Root().Bytes(), proofs[0])
 		t.Fatal(err)