trie: keep trie prefetch during validation phase (bnb-chain#1954)

tylerteea · Dec 6, 2023 · 7302c5b · 7302c5b
1 parent 6c96460
commit 7302c5b
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/core/state/state_object.go b/core/state/state_object.go
@@ -149,17 +149,17 @@ func (s *stateObject) touch() {
 func (s *stateObject) getTrie() (Trie, error) {
 	if s.trie == nil {
 		// Try fetching from prefetcher first
-		if s.data.Root != types.EmptyRootHash && s.db.prefetcher != nil {
-			// When the miner is creating the pending state, there is no prefetcher
-			s.trie = s.db.prefetcher.trie(s.addrHash, s.data.Root)
-		}
-		if s.trie == nil {
-			tr, err := s.db.db.OpenStorageTrie(s.db.originalRoot, s.address, s.data.Root)
-			if err != nil {
-				return nil, err
-			}
-			s.trie = tr
+		// if s.data.Root != types.EmptyRootHash && s.db.prefetcher != nil {
+		// When the miner is creating the pending state, there is no prefetcher
+		//	s.trie = s.db.prefetcher.trie(s.addrHash, s.data.Root)
+		// }
+		// if s.trie == nil {
+		tr, err := s.db.db.OpenStorageTrie(s.db.originalRoot, s.address, s.data.Root)
+		if err != nil {
+			return nil, err
 		}
+		s.trie = tr
+		// }
 	}
 	return s.trie, nil
 }