From 9f89625a0d376be6ba98346618af15613abcfb6b Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Thu, 5 Feb 2026 10:06:25 +0100
Subject: [PATCH] fix some incorrect shuffling

---
 core/state/database.go | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/core/state/database.go b/core/state/database.go
index d79324b84c..fadaae1b5b 100644
--- a/core/state/database.go
+++ b/core/state/database.go
@@ -309,11 +309,7 @@ func (db *CachingDB) ReadersWithCacheStats(stateRoot common.Hash) (ReaderWithSta
 func (db *CachingDB) OpenTrie(root common.Hash) (Trie, error) {
 	reader, err := db.triedb.StateReader(root)
 	if err != nil {
-		tr, err := trie.NewStateTrie(trie.StateTrieID(root), db.triedb)
-		if err != nil {
-			return nil, err
-		}
-		return tr, nil
+		return nil, err
 	}
 	flatReader := newFlatReader(reader)
 
@@ -328,17 +324,14 @@ func (db *CachingDB) OpenTrie(root common.Hash) (Trie, error) {
 			return bt, nil
 		}
 
-		base, err := trie.NewStateTrie(trie.StateTrieID(root), db.triedb)
+		base, err := trie.NewStateTrie(trie.StateTrieID(ts.BaseRoot), db.triedb)
 		if err != nil {
 			return nil, fmt.Errorf("could not create base trie in OpenTrie: %w", err)
 		}
 		return transitiontrie.NewTransitionTrie(base, bt, false), nil
 	}
-	tr, err := trie.NewStateTrie(trie.StateTrieID(root), db.triedb)
-	if err != nil {
-		return nil, err
-	}
-	return tr, nil
+
+	return trie.NewStateTrie(trie.StateTrieID(root), db.triedb)
 }
 
 // OpenStorageTrie opens the storage trie of an account.