Skip to content

Snap download: Fallback to resync world state if incomplete #10019

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
macfarla merged 3 commits into from
Mar 18, 2026
Merged

Snap download: Fallback to resync world state if incomplete #10019

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2902614
fallback to resync
macfarla Mar 10, 2026
ef1d673
Merge branch 'main' of github.com:hyperledger/besu into fallback-to-r…
macfarla Mar 10, 2026
d435267
Merge branch 'main' into fallback-to-resync-world-state
macfarla 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
24 changes: 19 additions & 5 deletions ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DefaultSynchronizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.hyperledger.besu.consensus.merge.UnverifiedForkchoiceListener;
import org.hyperledger.besu.datatypes.Address;
import org.hyperledger.besu.ethereum.ProtocolContext;
import org.hyperledger.besu.ethereum.core.BlockHeader;
import org.hyperledger.besu.ethereum.core.Synchronizer;
import org.hyperledger.besu.ethereum.eth.manager.ChainHeadEstimate;
import org.hyperledger.besu.ethereum.eth.manager.EthContext;
Expand Down Expand Up @@ -236,11 +237,24 @@ private CompletableFuture<Void> handleSyncResult(final PivotSyncState result) {
syncState.markInitialSyncPhaseAsDone();
} else {
fastSyncDownloader.ifPresent(PivotSyncDownloader::deletePivotSyncState);
result
.getPivotBlockHeader()
.ifPresent(
blockHeader ->
protocolContext.getWorldStateArchive().resetArchiveStateTo(blockHeader));
final Optional<BlockHeader> maybePivotHeader = result.getPivotBlockHeader();
maybePivotHeader.ifPresent(
blockHeader -> protocolContext.getWorldStateArchive().resetArchiveStateTo(blockHeader));

if (maybePivotHeader
.map(
bh ->
!protocolContext
.getWorldStateArchive()
.isWorldStateAvailable(bh.getStateRoot(), bh.getHash()))
.orElse(false)) {
LOG.warn(
"World state not available for pivot block {} after snap sync completion, resyncing",
maybePivotHeader.map(BlockHeader::toLogString).orElse("unknown"));
resyncWorldState();
return CompletableFuture.completedFuture(null);
Comment thread
macfarla marked this conversation as resolved.
}
Comment thread
pinges marked this conversation as resolved.

if (result.hasPivotBlockHash())
LOG.info(
"Sync completed successfully with pivot block {}",
Expand Down
Loading