Merge pull request #1611 from maticnetwork/milestone_whitelist_hotfix

Fix milestone whitelist delay on restart

Author: cffls

eth/backend.go

@@ -803,8 +803,6 @@ func (s *Ethereum) fetchAndHandleWhitelistCheckpoint(ctx context.Context, ethHan
 
 type heimdallHandler func(ctx context.Context, ethHandler *ethHandler, bor *bor.Bor) error
 
-var lastSeenMilestoneBlockNumber uint64
-
 // fetchAndHandleMilestone handles the milestone mechanism.
 func (s *Ethereum) fetchAndHandleMilestone(ctx context.Context, ethHandler *ethHandler, bor *bor.Bor) error {
 	// Create a new bor verifier, which will be used to verify checkpoints and milestones

eth/handler_bor.go

@@ -159,12 +159,14 @@ func (h *ethHandler) handleMilestone(ctx context.Context, eth *Ethereum, milesto
 		return err
 	}
 
-	for lastSeenMilestoneBlockNumber < num {
-		lastSeenMilestoneBlockNumber += 1
-		block := eth.blockchain.GetBlockByNumber(lastSeenMilestoneBlockNumber)
+	start := milestone.StartBlock
+
+	for start <= milestone.EndBlock {
+		block := eth.blockchain.GetBlockByNumber(start)
 		if block != nil && block.Header() != nil {
 			MilestoneWhitelistedDelayTimer.UpdateSince(time.Unix(int64(block.Time()), 0))
 		}
+		start += 1
 	}
 
 	h.downloader.ProcessMilestone(num, hash)

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 = 4  // Patch version component of the current release
+	VersionPatch = 5  // Patch version component of the current release
 	VersionMeta  = "" // Version metadata to append to the version string
 )