Skip to content

fix: batch checkpoint unwinding in handleEpochPrune (A-690) #21668

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

fix: batch checkpoint unwinding in handleEpochPrune (A-690) #21668

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3e214e
fix: batch checkpoint unwinding in handleEpochPrune (A-690)
PhilWindle Mar 17, 2026
12c2e49
Review changes
PhilWindle 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: 14 additions & 10 deletions yarn-project/archiver/src/modules/l1_synchronizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { EpochCache } from '@aztec/epoch-cache';
import { InboxContract, RollupContract } from '@aztec/ethereum/contracts';
import type { L1BlockId } from '@aztec/ethereum/l1-types';
import type { ViemPublicClient, ViemPublicDebugClient } from '@aztec/ethereum/types';
import { asyncPool } from '@aztec/foundation/async-pool';
import { maxBigint } from '@aztec/foundation/bigint';
import { BlockNumber, CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
import { Buffer32 } from '@aztec/foundation/buffer';
Expand Down Expand Up @@ -333,17 +334,20 @@ export class ArchiverL1Synchronizer implements Traceable {

const checkpointsToUnwind = localPendingCheckpointNumber - provenCheckpointNumber;

const checkpointPromises = Array.from({ length: checkpointsToUnwind })
.fill(0)
.map((_, i) => this.store.getCheckpointData(CheckpointNumber(i + pruneFrom)));
const checkpoints = await Promise.all(checkpointPromises);

const blockPromises = await Promise.all(
checkpoints
.filter(isDefined)
.map(cp => this.store.getBlocksForCheckpoint(CheckpointNumber(cp.checkpointNumber))),
// Fetch checkpoints and blocks in bounded batches to avoid unbounded concurrent
// promises when the gap between local pending and proven checkpoint numbers is large.
const BATCH_SIZE = 10;
const indices = Array.from({ length: checkpointsToUnwind }, (_, i) => CheckpointNumber(i + pruneFrom));
const checkpoints = (await asyncPool(BATCH_SIZE, indices, idx => this.store.getCheckpointData(idx))).filter(
isDefined,
);
const newBlocks = blockPromises.filter(isDefined).flat();
const newBlocks = (
await asyncPool(BATCH_SIZE, checkpoints, cp =>
this.store.getBlocksForCheckpoint(CheckpointNumber(cp.checkpointNumber)),
)
)
.filter(isDefined)
.flat();

// Emit an event for listening services to react to the chain prune
this.events.emit(L2BlockSourceEvents.L2PruneUnproven, {
Expand Down
Loading