Skip to content

backport v2.5.6 into develop#1971

Merged
pratikspatil024 merged 17 commits intodevelopfrom
master
Jan 8, 2026
Merged

backport v2.5.6 into develop#1971
pratikspatil024 merged 17 commits intodevelopfrom
master

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

lucca30 and others added 17 commits December 16, 2025 14:47
* bump version

* stable version

* V2.5.6 candidate (#1941)

* Revert recorded write operations when tx fails

* Revert selfdestruct on failure

* Added test for selfdestruct revert write

* Add HasSelfDestructed check when applying to final db

* p2p: added functionality to temporarily ban peers to prevent connections (#1922)

* p2p: added functionality to temporarily ban peers to prevent connections

* p2p: cleanup

* chore: bump kurtosis-pos (#1923)

* chore: bump kurtosis-pos

* chore: nits

* chore: install go

* fix(miner): delete pending task after successful block sealing to prevent node stall (#1929)

* fix(miner): delete pending task after successful block sealing to prevent node stall

* chore: nits

* chore: set staleThreshold to 0

* chore: update comment

* Remove Recommit and Fix Parent Actual Time track on Prepare (#1938)

* remove recommit and track parent actual time

* applying pr comments

* fix actual time cache store place

* chore: update deps (#1939)

chore: update deps

* bump version

* bump version

* stable version

---------

Co-authored-by: Angel Valkov <avalkov@polygon.technology>
Co-authored-by: Marcello Ardizzone <marcelloardizzone@hotmail.it>
Co-authored-by: Pratik Patil <pratikspatil024@gmail.com>
Co-authored-by: Krishang <109511742+kamuikatsurgi@users.noreply.github.com>
Co-authored-by: kamuikatsurgi <shahkrishang11@gmail.com>

* Unstuck

* Added block range check

* bump version 2.5.7

* bump to 2.5.6-beta3

---------

Co-authored-by: Lucca Martins <lucca_martins30@yahoo.com.br>
Co-authored-by: Marcello Ardizzone <marcelloardizzone@hotmail.it>
Co-authored-by: Pratik Patil <pratikspatil024@gmail.com>
Co-authored-by: Krishang <109511742+kamuikatsurgi@users.noreply.github.com>
Co-authored-by: kamuikatsurgi <shahkrishang11@gmail.com>
…block building work (#1943)

* bump version

* stable version

* V2.5.6 candidate (#1941)

* Revert recorded write operations when tx fails

* Revert selfdestruct on failure

* Added test for selfdestruct revert write

* Add HasSelfDestructed check when applying to final db

* p2p: added functionality to temporarily ban peers to prevent connections (#1922)

* p2p: added functionality to temporarily ban peers to prevent connections

* p2p: cleanup

* chore: bump kurtosis-pos (#1923)

* chore: bump kurtosis-pos

* chore: nits

* chore: install go

* fix(miner): delete pending task after successful block sealing to prevent node stall (#1929)

* fix(miner): delete pending task after successful block sealing to prevent node stall

* chore: nits

* chore: set staleThreshold to 0

* chore: update comment

* Remove Recommit and Fix Parent Actual Time track on Prepare (#1938)

* remove recommit and track parent actual time

* applying pr comments

* fix actual time cache store place

* chore: update deps (#1939)

chore: update deps

* bump version

* bump version

* stable version

---------

Co-authored-by: Angel Valkov <avalkov@polygon.technology>
Co-authored-by: Marcello Ardizzone <marcelloardizzone@hotmail.it>
Co-authored-by: Pratik Patil <pratikspatil024@gmail.com>
Co-authored-by: Krishang <109511742+kamuikatsurgi@users.noreply.github.com>
Co-authored-by: kamuikatsurgi <shahkrishang11@gmail.com>

* fix: add pendingWorkBlock to prevent duplicate work

* fix: if check

* nit: comment

* chore: bump version

* chore: add pending work check in new head event as well

* chore: read veblop timeout

---------

Co-authored-by: Lucca Martins <lucca_martins30@yahoo.com.br>
Co-authored-by: Angel Valkov <avalkov@polygon.technology>
Co-authored-by: Marcello Ardizzone <marcelloardizzone@hotmail.it>
Co-authored-by: Pratik Patil <pratikspatil024@gmail.com>
* eth/protocols/wit: made protocol version consistent (#1940)

* eth: add missing checker initialization

* core: add log when verifyPendingHeaders is skipped

* Revert "eth/protocols/wit: made protocol version consistent (#1940)"

This reverts commit c98a00e.

---------

Co-authored-by: Pratik Patil <pratikspatil024@gmail.com>
This reverts commit 809b189, reversing
changes made to 1dbae9d.
* remove baseFee validation after hf

* remove logs

* params, consensus: use target gas percentage for base fee calculations

* cleanup

* add comments

* consensus/misc/eip1559: add tests for untitled HF

* typo

* test fixes

* update HF name to dandeli

* simplify

* update gas target to 65%, fix tests

* update comment

* fix tests

* fix tests

* fix tests

* schedule dandeli HF for amoy at block 31890000

* fix lint

* add missing madhugiripro HF in amoy genesis

---------

Co-authored-by: Lucca Martins <lucca_martins30@yahoo.com.br>
@pratikspatil024 pratikspatil024 requested a review from a team January 8, 2026 06:50
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Jan 8, 2026

@manav2401 manav2401 added the do not squash and merge This PR will be NOT be squashed and merged label Jan 8, 2026
@pratikspatil024 pratikspatil024 merged commit 6ee936c into develop Jan 8, 2026
34 of 39 checks passed
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