eth: fix canonical chain state inconsistency in checkpoint verifier#1593
Merged
cffls merged 2 commits into0xPolygon:developfrom Jun 26, 2025
Merged
eth: fix canonical chain state inconsistency in checkpoint verifier#1593cffls merged 2 commits into0xPolygon:developfrom
cffls merged 2 commits into0xPolygon:developfrom
Conversation
Add fallback logic to find potentialcommon ancestor using future milestones when no whitelisted milestone exists in the current chain. Such scenario usually happens in a devnet. This prevents nodes from getting stuck on wrong forks during milestone verification. The issue occurs when nodes are on a fork and receive a new milestone: - Existing logic only checks whitelisted milestones in current chain - If current chain has no whitelisted milestones, rewind defaults to milestone start-1 - This can leave nodes on wrong fork instead of finding actual common ancestor New logic adds findCommonAncestorWithFutureMilestones() which: - Reads future milestone list from database (contains previously failed milestones) - Searches from newest to oldest milestone to find matches with local chain - Returns matching milestone block number to minimize rewind distance - Falls back to calculated target block if no matches found
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #1593 +/- ##
===========================================
- Coverage 50.83% 48.10% -2.74%
===========================================
Files 780 819 +39
Lines 125430 132545 +7115
===========================================
- Hits 63765 63759 -6
- Misses 57555 64653 +7098
- Partials 4110 4133 +23 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
pratikspatil024
approved these changes
Jun 26, 2025
cffls
added a commit
to cffls/bor
that referenced
this pull request
Jun 30, 2025
eth: fix canonical chain state inconsistency in checkpoint verifier
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add fallback logic to find potentialcommon ancestor using future milestones when no whitelisted milestone exists in the current chain. Such scenario usually happens in a devnet. This prevents nodes from getting stuck on wrong forks during milestone verification.
The issue occurs when nodes are on a fork and receive a new milestone:
New logic adds findCommonAncestorWithFutureMilestones() which:
Changes
Breaking changes
Please complete this section if any breaking changes have been made, otherwise delete it
Nodes audience
In case this PR includes changes that must be applied only to a subset of nodes, please specify how you handled it (e.g. by adding a flag with a default value...)
Checklist
Cross repository changes
Testing
Manual tests
Please complete this section with the steps you performed if you ran manual tests for this functionality, otherwise delete it
Additional comments
Please post additional comments in this section if you have them, otherwise delete it