From c61d2d307d2fc1c038a12bf6557bc29f17de18f7 Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Wed, 4 Feb 2026 16:54:10 +0100
Subject: [PATCH] move stuff around

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

diff --git a/core/state/database.go b/core/state/database.go
index 01ece45b8b..d79324b84c 100644
--- a/core/state/database.go
+++ b/core/state/database.go
@@ -308,7 +308,6 @@ func (db *CachingDB) ReadersWithCacheStats(stateRoot common.Hash) (ReaderWithSta
 // OpenTrie opens the main account trie at a specific root hash.
 func (db *CachingDB) OpenTrie(root common.Hash) (Trie, error) {
 	reader, err := db.triedb.StateReader(root)
-	flatReader := newFlatReader(reader)
 	if err != nil {
 		tr, err := trie.NewStateTrie(trie.StateTrieID(root), db.triedb)
 		if err != nil {
@@ -316,13 +315,14 @@ func (db *CachingDB) OpenTrie(root common.Hash) (Trie, error) {
 		}
 		return tr, nil
 	}
+	flatReader := newFlatReader(reader)
 
+	ts := LoadTransitionState(flatReader, root)
 	if isTransitionActive(flatReader) || db.triedb.IsVerkle() {
 		bt, err := bintrie.NewBinaryTrie(root, db.triedb)
 		if err != nil {
 			return nil, fmt.Errorf("could not open the overlay tree: %w", err)
 		}
-		ts := LoadTransitionState(flatReader, root)
 		if !ts.InTransition() {
 			// Transition complete, use BinaryTrie only
 			return bt, nil