Fix to check state root at first loop

kaiachain · Jul 14, 2024 · 7b38759 · 7b38759
1 parent b6bd6a9
commit 7b38759
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/consensus/istanbul/backend/snapshot.go b/consensus/istanbul/backend/snapshot.go
@@ -406,12 +406,12 @@ func preloadStakingInfo(headers []*types.Header, engine governance.HeaderEngine)
 		database.TrieDB().ReferenceRoot(root)
 		if !common.EmptyHash(parent) {
 			database.TrieDB().Dereference(parent)
-			if current.Root() != root {
-				err = fmt.Errorf("mistmatching state root block expected %x reexecuted %x", current.Root(), root)
-				// Logging here because something went wrong when the state roots disagree even if the execution was successful.
-				logger.Error("incorrectly regenerated historical state", "block", current.NumberU64(), "err", err)
-				return nil, fmt.Errorf("incorrectly regenerated historical state for block %d: %v", current.NumberU64(), err)
-			}
+		}
+		if current.Root() != root {
+			err = fmt.Errorf("mistmatching state root block expected %x reexecuted %x", current.Root(), root)
+			// Logging here because something went wrong when the state roots disagree even if the execution was successful.
+			logger.Error("incorrectly regenerated historical state", "block", current.NumberU64(), "err", err)
+			return nil, fmt.Errorf("incorrectly regenerated historical state for block %d: %v", current.NumberU64(), err)
 		}
 		parent = root
 	}

diff --git a/node/cn/state_accessor.go b/node/cn/state_accessor.go
@@ -156,12 +156,12 @@ func (cn *CN) stateAtBlock(block *types.Block, reexec uint64, base *state.StateD
 		database.TrieDB().ReferenceRoot(root)
 		if !common.EmptyHash(parent) {
 			database.TrieDB().Dereference(parent)
-			if current.Header().Root != root {
-				err = fmt.Errorf("mistmatching state root block expected %x reexecuted %x", current.Header().Root, root)
-				// Logging here because something went wrong when the state roots disagree even if the execution was successful.
-				logger.Error("incorrectly regenerated historical state", "block", current.NumberU64(), "err", err)
-				return nil, fmt.Errorf("incorrectly regenerated historical state for block %d: %v", current.NumberU64(), err)
-			}
+		}
+		if current.Header().Root != root {
+			err = fmt.Errorf("mistmatching state root block expected %x reexecuted %x", current.Header().Root, root)
+			// Logging here because something went wrong when the state roots disagree even if the execution was successful.
+			logger.Error("incorrectly regenerated historical state", "block", current.NumberU64(), "err", err)
+			return nil, fmt.Errorf("incorrectly regenerated historical state for block %d: %v", current.NumberU64(), err)
 		}
 		parent = root
 	}