Skip to content

fix: add blockchain-head guard to handleBlockTimerExpiry #10052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jframe merged 5 commits into from
Mar 18, 2026
Merged

fix: add blockchain-head guard to handleBlockTimerExpiry #10052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c396295
fix: add blockchain-head guard to handleBlockTimerExpiry
Qian-Cheng-nju Mar 16, 2026
ea86fc2
style: fix spotless formatting for LOG.debug call
Qian-Cheng-nju Mar 17, 2026
7990097
Merge branch 'main' into fix/block-timer-expiry-chain-head-guard
Qian-Cheng-nju Mar 17, 2026
442df40
Merge branch 'main' into fix/block-timer-expiry-chain-head-guard
jframe Mar 18, 2026
16e2119
test: add test for block timer below current chain height
Qian-Cheng-nju Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...e/src/main/java/org/hyperledger/besu/consensus/qbft/core/statemachine/QbftController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,12 @@ public void handleNewBlockEvent(final QbftNewChainHead newChainHead) {
@Override
public void handleBlockTimerExpiry(final BlockTimerExpiry blockTimerExpiry) {
final ConsensusRoundIdentifier roundIdentifier = blockTimerExpiry.getRoundIdentifier();
// Discard block timer events that target a height already on the blockchain (e.g., block
// was imported via peer sync while the timer was pending). Same guard as handleRoundExpiry.
if (roundIdentifier.getSequenceNumber() <= blockchain.getChainHeadBlockNumber()) {
LOG.debug("Discarding a block-timer which targets a height not above current chain height.");
return;
}
if (isMsgForCurrentHeight(roundIdentifier, getCurrentChainHeight())) {
getCurrentHeightManager().handleBlockTimerExpiry(roundIdentifier);
} else {
Expand Down
22 changes: 22 additions & 0 deletions ...c/test/java/org/hyperledger/besu/consensus/qbft/core/statemachine/QbftControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,28 @@ public void blockTimerForPastHeightIsDiscarded() {
verify(blockHeightManager, never()).handleBlockTimerExpiry(any());
}

@Test
public void blockTimerForAlreadyImportedHeightIsDiscarded() {
Comment thread
Qian-Cheng-nju marked this conversation as resolved.
// Simulate peer sync: blockchain head advances to current height while block timer is pending
when(blockChain.getChainHeadBlockNumber()).thenReturn(4L);
final BlockTimerExpiry blockTimerExpiry = new BlockTimerExpiry(roundIdentifier);
constructQbftController();
qbftController.start();
qbftController.handleBlockTimerExpiry(blockTimerExpiry);
verify(blockHeightManager, never()).handleBlockTimerExpiry(any());
}

@Test
public void blockTimerForHeightBelowChainHeadIsDiscarded() {
// Blockchain head has advanced beyond the timer's target height
when(blockChain.getChainHeadBlockNumber()).thenReturn(5L);
final BlockTimerExpiry blockTimerExpiry = new BlockTimerExpiry(roundIdentifier);
constructQbftController();
qbftController.start();
qbftController.handleBlockTimerExpiry(blockTimerExpiry);
verify(blockHeightManager, never()).handleBlockTimerExpiry(any());
}

@Test
public void proposalForUnknownValidatorIsDiscarded() {
setupProposal(roundIdentifier, unknownValidator);
Expand Down
Loading