chore: change check for rewind

bnb-chain · Sep 4, 2024 · de4be08 · de4be08
1 parent 3e7f56f
commit de4be08
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/blockchain.go b/core/blockchain.go
@@ -785,13 +785,15 @@ func (bc *BlockChain) loadLastState() error {
 		log.Info("begin rewind versa db head", "target_number", archiveVersion, "target_root", archiveRoot.String())
 		for {
 			log.Info("rewinding block", "number", headBlock.NumberU64(), "hash", headBlock.Hash(), "root", headBlock.Root().String(), "target_number", archiveVersion, "target_root", archiveRoot.String())
-			if archiveRoot.Cmp(headBlock.Root()) == 0 {
+			if archiveRoot.Cmp(headBlock.Root()) == 0 && archiveVersion == headBlock.Number().Int64() {
 				rawdb.WriteCanonicalHash(bc.db, headBlock.Hash(), headBlock.NumberU64())
 				rawdb.WriteHeadHeaderHash(bc.db, headBlock.Hash())
 				rawdb.WriteHeadBlockHash(bc.db, headBlock.Hash())
 				rawdb.WriteHeadFastBlockHash(bc.db, headBlock.Hash())
 				log.Info("success to reset versa db head block", "number", headBlock.NumberU64(), "hash", headBlock.Hash(), "root", headBlock.Root().String())
 				break
+			} else if archiveRoot.Cmp(headBlock.Root()) == 0 {
+				log.Info("reset versa db meet same root", "number", headBlock.NumberU64(), "target_number", archiveVersion, "target_root", archiveRoot.String())
 			} else if archiveVersion == headBlock.Number().Int64() {
 				log.Crit("failed to reset versa db meet same version", "number", headBlock.NumberU64(), "target_number", archiveVersion, "target_root", archiveRoot.String())
 			}