From d9e3bceb92f2b48db164e27e5dd2edaac989ce9c Mon Sep 17 00:00:00 2001
From: Jared Wasinger <j-wasinger@hotmail.com>
Date: Mon, 13 May 2024 20:54:04 -0700
Subject: [PATCH] apply suggestion

> Co-authored-by: Gary Rong <garyrong0905@gmail.com>
---
 core/state/state_object.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/state/state_object.go b/core/state/state_object.go
index 8eea609f03..8725eafa3e 100644
--- a/core/state/state_object.go
+++ b/core/state/state_object.go
@@ -314,9 +314,12 @@ func (s *stateObject) updateTrie() (Trie, error) {
 	}
 	// Retrieve a pretecher populated trie, or fall back to the database
 	tr := s.getPrefetchedTrie()
-	if tr == nil {
-		var err error
+	if tr != nil {
+		// Prefetcher returned a live trie, swap it out for the current one
+		s.trie = tr
+	} else {
 		// Fetcher not running or empty trie, fallback to the database trie
+		var err error
 		tr, err = s.getTrie()
 		if err != nil {
 			s.db.setError(err)