Merge pull request #1591 from cffls/v2.2.1-beta-candidate

eth: fix canonical chain state inconsistency in checkpoint verifier

Author: cffls

eth/bor_checkpoint_verifier.go

@@ -150,9 +150,17 @@ func borVerify(ctx context.Context, eth *Ethereum, handler *ethHandler, start ui
 			if err != nil {
 				log.Warn("Failed to insert canonical chain", "err", err)
 				return hash, err
-			} else {
-				log.Info("Successfully inserted canonical chain")
 			}
+
+			// Then explicitly set the final block as canonical to ensure proper canonical mapping
+			finalBlock := canonicalChain[len(canonicalChain)-1]
+			_, err = eth.BlockChain().SetCanonical(finalBlock)
+			if err != nil {
+				log.Warn("Failed to set canonical head after insertion", "err", err, "block", finalBlock.NumberU64(), "hash", finalBlock.Hash())
+				return hash, err
+			}
+
+			log.Info("Successfully inserted canonical chain")
 		} else {
 			log.Warn("Failed to insert canonical chain", "length", len(canonicalChain), "expected", length)
 			return hash, errHashMismatch

params/version.go

@@ -25,7 +25,7 @@ import (
 const (
 	VersionMajor = 2      // Major version component of the current release
 	VersionMinor = 2      // Minor version component of the current release
-	VersionPatch = 1      // Patch version component of the current release
+	VersionPatch = 2      // Patch version component of the current release
 	VersionMeta  = "beta" // Version metadata to append to the version string
 )