From 65255f165100a40c163245947ab1e8cee329f2f0 Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Fri, 6 Dec 2024 21:16:08 +0100
Subject: [PATCH] trie/pathdb: decode verkle node in loadLayer

---
 triedb/pathdb/journal.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/triedb/pathdb/journal.go b/triedb/pathdb/journal.go
index 779a262fdd..24edd77047 100644
--- a/triedb/pathdb/journal.go
+++ b/triedb/pathdb/journal.go
@@ -29,6 +29,7 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/ethereum/go-verkle"
 )
 
 var (
@@ -95,7 +96,15 @@ func (db *Database) loadLayers() layer {
 	// Retrieve the root node of persistent state.
 	var root = types.EmptyRootHash
 	if blob := rawdb.ReadAccountTrieNode(db.diskdb, nil); len(blob) > 0 {
-		root = crypto.Keccak256Hash(blob)
+		if db.isVerkle {
+			rootnode, err := verkle.ParseNode(blob, 0)
+			if err != nil {
+				log.Crit("Could not decode verkle root node")
+			}
+			root = rootnode.Commit().Bytes()
+		} else {
+			root = crypto.Keccak256Hash(blob)
+		}
 	}
 	// Load the layers by resolving the journal
 	head, err := db.loadJournal(root)