Skip to content

v2.2.9#1644

Merged
pratikspatil024 merged 18 commits intomasterfrom
v2.2.9-candidate
Jul 17, 2025
Merged

v2.2.9#1644
pratikspatil024 merged 18 commits intomasterfrom
v2.2.9-candidate

Conversation

@pratikspatil024
Copy link
Copy Markdown
Member

Description

Please provide a detailed description of what was done in this PR

Changes

  • Bugfix (non-breaking change that solves an issue)
  • Hotfix (change that solves an urgent issue, and requires immediate attention)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (change that is not backwards-compatible and/or changes current functionality)
  • Changes only for a subset of nodes

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

  • I have added at least 2 reviewer or the whole pos-v1 team
  • I have added sufficient documentation in code
  • I will be resolving comments - if any - by pushing each fix in a separate commit and linking the commit hash in the comment reply
  • Created a task in Jira and informed the team for implementation in Erigon client (if applicable)
  • Includes RPC methods changes, and the Notion documentation has been updated

Cross repository changes

  • This PR requires changes to heimdall
    • In case link the PR here:
  • This PR requires changes to matic-cli
    • In case link the PR here:

Testing

  • I have added unit tests
  • I have added tests to CI
  • I have tested this code manually on local environment
  • I have tested this code manually on remote devnet using express-cli
  • I have tested this code manually on amoy
  • I have created new e2e tests into express-cli

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

cffls and others added 18 commits June 25, 2025 17:40
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.
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
@pratikspatil024 pratikspatil024 changed the title V2.2.9 v2.2.9 Jul 17, 2025
@pratikspatil024 pratikspatil024 requested a review from a team July 17, 2025 04:05
@pratikspatil024 pratikspatil024 added the do not squash and merge This PR will be NOT be squashed and merged label Jul 17, 2025
@pratikspatil024 pratikspatil024 merged commit 3c7256e into master Jul 17, 2025
9 of 12 checks passed
@pratikspatil024 pratikspatil024 deleted the v2.2.9-candidate branch July 17, 2025 04:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do not squash and merge This PR will be NOT be squashed and merged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants