Merged
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
eth: fix canonical chain state inconsistency in checkpoint verifier
v2.2.5 - backport to develop
core/types: bumped fakesigner from london to prague
Add flags from upstream (geth) which control data retention for transactions, logs, and state. Also, add a deprecation notice for `txlookuplimit` flag which will be replaced by `history.transactions` flag in next release.
Signed-off-by: gopherorg <gopherworld@icloud.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com>
Use a simple atomic flag for handling commit interrupt instead of using context based timeout. Internal benchmarks revealed that checking for `context.Done()` for every OPCODE leads to 40% CPU usage (out of the total CPU used in block building loop) which is not very optimal. Instead of context, a pointer to this atomic flag is passed and is toggled when the block building time is completed to interrupt. This also allows us to simply the use of commit interrupt and the worker - evm interaction.
backport v2.2.8
This resolved a possible race condition when a milestone reorg happens at the same time when a validator mines a new block. The miner should be completely stopped when setHead canonical head and inserting finalized chain.
- Skip stale sealed blocks that are behind current chain head to prevent
resultLoop from attempting to write outdated blocks after reorgs
- Add 1-second timeout to chDeps channel send to prevent indefinite
blocking when receiver is dead or channel is full
- Return error when transaction count exceeds dependency list length
to prevent array index out of bounds panic
These fixes address production issues where mining nodes would deadlock
for hours after milestone-triggered reorgs, unable to
process new blocks or respond to chain updates.
* debu logs * debug logs * debug logs for trace start of grpc * grpc start after backend assignment * removing logs * fix tests
cffls
approved these changes
Jul 17, 2025
ssandeep
approved these changes
Jul 17, 2025
Raneet10
approved these changes
Jul 17, 2025
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.
Description
Please provide a detailed description of what was done in this PR
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