Skip to content

fix(miner): track pending work using block number to avoid duplicate block building work#1943

Merged
kamuikatsurgi merged 12 commits intov2.5.6-candidatefrom
veblop_timer_fix
Dec 18, 2025
Merged

fix(miner): track pending work using block number to avoid duplicate block building work#1943
kamuikatsurgi merged 12 commits intov2.5.6-candidatefrom
veblop_timer_fix

Conversation

@kamuikatsurgi
Copy link
Copy Markdown
Member

Description

Fixes the race condition with veblopTimer, which causes duplicate sealing of blocks.

lucca30 and others added 6 commits December 16, 2025 14:48
* 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>
Copy link
Copy Markdown
Contributor

@lucca30 lucca30 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@cffls
Copy link
Copy Markdown
Contributor

cffls commented Dec 18, 2025

Please make sure all E2E tests are passing

@kamuikatsurgi
Copy link
Copy Markdown
Member Author

Please make sure all E2E tests are passing

All the tests are passing, except for the fast-forward test, which fails at the end of the stateless sync E2E test. It's also failing in other PRs. We need to investigate what happened there, but this PR doesn't change anything related to that issue.

@pratikspatil024 pratikspatil024 changed the base branch from master to v2.5.6-candidate December 18, 2025 07:48
@sonarqubecloud
Copy link
Copy Markdown

@kamuikatsurgi kamuikatsurgi merged commit 6591fd0 into v2.5.6-candidate Dec 18, 2025
7 checks passed
@kamuikatsurgi kamuikatsurgi deleted the veblop_timer_fix branch December 18, 2025 09:03
pratikspatil024 added a commit that referenced this pull request Jan 8, 2026
* bump version

* Revert "V2.5.6 candidate (#1941)"

This reverts commit 85b5ef7.

* fix: ignore invalid signer error for specific block range (#1944)

* 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>

* fix(miner): track pending work using block number to avoid duplicate 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>

* chore: bump version to v2.5.6-beta4

* fix(rpc): maxFeePerGas and maxPriorityFeePerGas for StateSyncTx type (#1952)

* Fix missing chain validator service setup (#1957)

* 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>

* fix(api): traceBlock (#1959)

* Revert "Merge branch 'master' into v2.5.6-candidate"

This reverts commit 809b189, reversing
changes made to 1dbae9d.

* version bump to v2.5.6-beta5

* Dandeli HF: modify block gas target calculations (#1968)

* 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>

* params: bump version to v2.5.6-beta6

* Update DandeliBlock HF for mainnet and bump version

---------

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: Krishang <109511742+kamuikatsurgi@users.noreply.github.com>
Co-authored-by: kamuikatsurgi <shahkrishang11@gmail.com>
Co-authored-by: Raneet Debnath <35629432+Raneet10@users.noreply.github.com>
Co-authored-by: Manav Darji <manavdarji.india@gmail.com>
Co-authored-by: Jerry <jerrycgh@gmail.com>
Copy link
Copy Markdown

@karumirko132-max karumirko132-max left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants