@aztec/stdlib 0.0.1-commit.993d240 → 0.0.1-commit.9a89641

package/src/block/l2_block_stream/l2_block_stream.ts

@@ -1,14 +1,39 @@
-import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import { AbortError } from '@aztec/foundation/error';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 
-import type { PublishedCheckpoint } from '../../checkpoint/published_checkpoint.js';
-import { type L2BlockId, type L2BlockSource, makeL2BlockId } from '../l2_block_source.js';
-import type { L2BlockStreamEvent, L2BlockStreamEventHandler, L2BlockStreamLocalDataProvider } from './interfaces.js';
-
-/** Maximum number of checkpoints to prefetch at once during sync. Matches MAX_RPC_CHECKPOINTS_LEN. */
-export const CHECKPOINT_PREFETCH_LIMIT = 50;
+import type { BlockHeader } from '../../tx/block_header.js';
+import { BlockHash } from '../block_hash.js';
+import type { L2Block } from '../l2_block.js';
+import { type L2BlockId, type L2BlockSource, type LocalL2Tips, makeL2BlockId } from '../l2_block_source.js';
+import {
+  type L2BlockStreamEvent,
+  type L2BlockStreamEventHandler,
+  type L2BlockStreamLocalDataProvider,
+  localBlockIdDiffers,
+} from './interfaces.js';
+
+/** Subset of the block source the stream depends on. Checkpoint payloads are no longer fetched here. */
+export type L2BlockStreamSource = Pick<L2BlockSource, 'getBlocks' | 'getBlockData' | 'getL2Tips'>;
+
+/** Options accepted by {@link L2BlockStream} and {@link EventDrivenL2BlockStream}. */
+export type L2BlockStreamOptions = {
+  pollIntervalMS?: number;
+  batchSize?: number;
+  startingBlock?: number;
+  /** Instead of downloading all blocks, only fetch the smallest subset that results in reliable reorg detection. */
+  skipFinalized?: boolean;
+  /** When true, checkpoint events will not be emitted. Blocks are still fetched but only blocks-added events are emitted. */
+  ignoreCheckpoints?: boolean;
+  /**
+   * When true, the block download loop is skipped entirely: `getBlocks` is never called and `blocks-added` is
+   * never emitted. Only the tip events (`chain-proposed`/`chain-checkpointed`/`chain-proven`/`chain-finalized`)
+   * and `chain-pruned` are emitted, driven by the `getL2Tips` snapshot. For consumers that track tips but never
+   * consume block payloads.
+   */
+  tipsOnly?: boolean;
+};
 
 /** Creates a stream of events for new blocks, chain tips updates, and reorgs, out of polling an archiver or a node. */
 export class L2BlockStream {
@@ -17,22 +42,18 @@ export class L2BlockStream {
   private hasStarted = false;
 
   constructor(
-    private l2BlockSource: Pick<L2BlockSource, 'getBlocks' | 'getBlockData' | 'getL2Tips' | 'getCheckpoints'>,
+    private l2BlockSource: L2BlockStreamSource,
     private localData: L2BlockStreamLocalDataProvider,
     private handler: L2BlockStreamEventHandler,
     private readonly log = createLogger('types:block_stream'),
-    private opts: {
-      pollIntervalMS?: number;
-      batchSize?: number;
-      startingBlock?: number;
-      /** Instead of downloading all blocks, only fetch the smallest subset that results in reliable reorg detection. */
-      skipFinalized?: boolean;
-      /** When true, checkpoint events will not be emitted. Blocks are still fetched via checkpoints but only blocks-added events are emitted. */
-      ignoreCheckpoints?: boolean;
-      /** Maximum number of checkpoints to prefetch at once during sync. Defaults to CHECKPOINT_PREFETCH_LIMIT (50). */
-      checkpointPrefetchLimit?: number;
-    } = {},
+    private opts: L2BlockStreamOptions = {},
   ) {
+    if (opts.tipsOnly && (opts.startingBlock !== undefined || opts.batchSize !== undefined || opts.skipFinalized)) {
+      throw new Error(
+        'tipsOnly is incompatible with startingBlock, batchSize, and skipFinalized: all three are ' +
+          'block-download options and there is no download loop in tips-only mode.',
+      );
+    }
     // Note that RunningPromise is in stopped state by default. This promise won't run until someone invokes `start`,
     // which makes it run periodically, or `sync`, which triggers it once.
     // Users of L2BlockStream decide what mode to run it in (_periodically_ vs _manually triggered_).
@@ -66,20 +87,45 @@ export class L2BlockStream {
 
   protected async work() {
     try {
-      const sourceTips = await this.l2BlockSource.getL2Tips();
+      // The source tips snapshot is the plan for this pass; it is re-read after the walk-back if a divergence is found.
+      let sourceTips = await this.l2BlockSource.getL2Tips();
       const localTips = await this.localData.getL2Tips();
       this.log.trace(`Running L2 block stream`, { sourceTips, localTips });
 
-      // Check if there was a reorg and emit a chain-pruned event if so.
+      if (!this.opts.ignoreCheckpoints && localTips.checkpointed === undefined) {
+        throw new Error(
+          'Local data provider does not expose a checkpointed tip; checkpoint events require one ' +
+            '(set ignoreCheckpoints or provide checkpointed tips).',
+        );
+      }
+
+      // Baseline for the chain-proposed event; captured before the local store mutates during the pass.
+      const prePassProposed = localTips.proposed;
+
+      // In tips-only mode there is no download loop to supply the chain-proposed event's header, so it must be
+      // fetched. Start the read now so it runs in parallel with the walk-back below.
+      const prefetch: ProposedHeaderPrefetch | undefined =
+        this.opts.tipsOnly && localBlockIdDiffers(prePassProposed, sourceTips.proposed)
+          ? { hash: sourceTips.proposed.hash, header: this.getHeaderFromSource(sourceTips.proposed.hash) }
+          : undefined;
+
+      // Walk back to find a reorg, floored at the local finalized tip (a legitimate reorg can never reach it, since
+      // finalized means the proving tx is itself L1-finalized). Seed the cache with ONLY the proposed tip: a stale
+      // tier seed at a reorged height equals the local old-fork hash, faking agreement and stopping the walk above the
+      // true divergence (an under-deep prune no later pass re-detects), whereas a stale proposed seed only masks the
+      // tip for one pass.
       let latestBlockNumber = localTips.proposed.number;
       const sourceCache = new BlockHashCache([sourceTips.proposed]);
-      while (!(await this.areBlockHashesEqualAt(latestBlockNumber, { sourceCache }))) {
+      const walkFloor = localTips.finalized.block.number;
+      while (
+        !(await this.areBlockHashesEqualAt(latestBlockNumber, {
+          sourceCache,
+          sourceProposed: sourceTips.proposed.number,
+        }))
+      ) {
         if (latestBlockNumber === 0) {
-          // We walked all the way back to genesis and the hashes still differ. This means the
-          // local store and the source disagree on the genesis block itself — typically because
-          // they were configured with different `genesisTimestamp`/prefilled state. Continuing
-          // would underflow into negative block numbers and surface as "block hash not found
-          // for -1" further down. Fail loudly with a meaningful error instead.
+          // Walked back to genesis and the hashes still differ: the two sides disagree on block 0 itself (usually
+          // different genesisTimestamp/prefilled state). Fail loudly rather than underflow into negative heights.
           this.log.error(`Genesis block hash mismatch between local store and source`, {
             localBlockHash: await this.localData.getL2BlockHash(BlockNumber.ZERO),
             sourceBlockHash: sourceCache.get(0) ?? (await this.getBlockHashFromSource(BlockNumber.ZERO)),
@@ -90,10 +136,30 @@ export class L2BlockStream {
               '(e.g. genesisTimestamp or prefilled public data).',
           );
         }
+        if (latestBlockNumber <= walkFloor) {
+          // A mismatch at or below the finalized tip cannot be a reorg (it contradicts L1-finalized state), so stop
+          // here and prune at most to the finalized tip rather than pruning finalized state on non-reorg evidence.
+          this.log.warn(`Block hash mismatch at or below the local finalized tip; stopping the walk-back here`, {
+            blockNumber: latestBlockNumber,
+            finalizedBlockNumber: walkFloor,
+            localBlockHash: await this.localData.getL2BlockHash(latestBlockNumber),
+            sourceBlockHash:
+              sourceCache.get(latestBlockNumber) ?? (await this.getBlockHashFromSource(latestBlockNumber)),
+          });
+          break;
+        }
         latestBlockNumber--;
       }
 
+      let pruned = false;
       if (latestBlockNumber < localTips.proposed.number) {
+        // Re-read the source tips after the (possibly slow) walk-back so the prune event carries fresh checkpointed
+        // and proven tips, and the prune-target clamp, download plan, and tier reconciliation track the post-prune
+        // source chain. Append only the re-read proposed tip: it is a fresh entry that cannot poison the (already
+        // finished) walk and serves the prune-event hash lookup below.
+        sourceTips = await this.l2BlockSource.getL2Tips();
+        sourceCache.add(sourceTips.proposed);
+
         latestBlockNumber = BlockNumber(Math.min(latestBlockNumber, sourceTips.proposed.number)); // see #13471
         const hash = sourceCache.get(latestBlockNumber) ?? (await this.getBlockHashFromSource(latestBlockNumber));
         if (latestBlockNumber !== 0 && !hash) {
@@ -105,166 +171,68 @@ export class L2BlockStream {
         await this.emitEvent({
           type: 'chain-pruned',
           block: makeL2BlockId(latestBlockNumber, hash),
-          checkpoint: sourceTips.checkpointed.checkpoint,
+          checkpointed: sourceTips.checkpointed,
+          proven: sourceTips.proven,
         });
+        pruned = true;
       }
 
-      // If we are just starting, use the starting block number from the options.
-      const startingBlock = this.opts.startingBlock !== undefined ? BlockNumber(this.opts.startingBlock) : undefined;
-      if (latestBlockNumber === 0 && startingBlock !== undefined) {
-        latestBlockNumber = BlockNumber(Math.max(startingBlock - 1, 0));
-      }
-
-      // Only log this entry once (for sanity)
-      if (!this.hasStarted) {
-        this.log.verbose(`Starting sync from block number ${latestBlockNumber}`);
-        this.hasStarted = true;
-      }
-
-      let nextBlockNumber = latestBlockNumber + 1;
-      let nextCheckpointToEmit = CheckpointNumber(localTips.checkpointed.checkpoint.number + 1);
-
-      // When startingBlock is set, also skip ahead for checkpoints.
-      if (
-        startingBlock !== undefined &&
-        startingBlock >= 1 &&
-        nextCheckpointToEmit <= sourceTips.checkpointed.checkpoint.number
-      ) {
-        if (startingBlock > sourceTips.checkpointed.block.number) {
-          // startingBlock is past all checkpointed blocks; skip Loop 1 entirely.
-          nextCheckpointToEmit = CheckpointNumber(sourceTips.checkpointed.checkpoint.number + 1);
-        } else {
-          const startingBlockData = await this.l2BlockSource.getBlockData({ number: startingBlock });
-          if (startingBlockData) {
-            nextCheckpointToEmit = CheckpointNumber(Math.max(nextCheckpointToEmit, startingBlockData.checkpointNumber));
-          }
-        }
-      }
-
-      if (this.opts.skipFinalized) {
-        // When skipping finalized blocks we need to provide reliable reorg detection while fetching as few blocks as
-        // possible. Finalized blocks cannot be reorged by definition, so we can skip most of them. We do need the very
-        // last finalized block however in order to guarantee that we will eventually find a block in which our local
-        // store matches the source.
-        // If the last finalized block is behind our local tip, there is nothing to skip.
-        nextBlockNumber = Math.max(sourceTips.finalized.block.number, nextBlockNumber);
-        // If the next checkpoint to emit is behind the finalized tip then skip forward
-        nextCheckpointToEmit = CheckpointNumber(Math.max(nextCheckpointToEmit, sourceTips.finalized.checkpoint.number));
-      }
-
-      // Loop 1: Emit checkpoint events for checkpoints whose blocks are already in local storage.
-      // This handles the case where blocks were synced as uncheckpointed and later became checkpointed.
-      // The guard `lastBlockInCheckpoint.number > localTips.proposed.number` ensures we don't emit
-      // checkpoints for blocks we don't have (e.g., when startingBlock skips earlier blocks).
-      // Since only one checkpoint can ever be uncheckpointed, this loop should iterate at most once.
-      if (!this.opts.ignoreCheckpoints) {
-        let loop1Iterations = 0;
-        while (nextCheckpointToEmit <= sourceTips.checkpointed.checkpoint.number) {
-          const checkpoints = await this.l2BlockSource.getCheckpoints({ from: nextCheckpointToEmit, limit: 1 });
-          if (checkpoints.length === 0) {
-            break;
-          }
-          const lastBlockInCheckpoint = checkpoints[0].checkpoint.blocks.at(-1)!;
-          // If this checkpoint has blocks we haven't seen yet, stop - they need to be fetched first
-          if (lastBlockInCheckpoint.number > localTips.proposed.number) {
-            break;
-          }
-          loop1Iterations++;
-          if (loop1Iterations > 1) {
-            this.log.warn(
-              `Emitting multiple checkpoints (${loop1Iterations}) for already-local blocks. ` +
-                `Next checkpoint: ${nextCheckpointToEmit}, source checkpointed: ${sourceTips.checkpointed.checkpoint.number}`,
-            );
-          }
-          const lastBlockHash = await lastBlockInCheckpoint.hash();
-          await this.emitEvent({
-            type: 'chain-checkpointed',
-            checkpoint: checkpoints[0],
-            block: makeL2BlockId(lastBlockInCheckpoint.number, lastBlockHash.toString()),
+      // Pass atomicity: a prune mid-download leaves the source unable to serve the planned blocks, so the snapshot's
+      // tier tips may reference blocks the consumer never saw — downloadBlocks aborts the pass in that case.
+      // Tips-only mode has no download plan (the snapshot is one atomic getL2Tips read), so it always reconciles.
+      const deliveredProposedHeader = this.opts.tipsOnly
+        ? undefined
+        : await this.downloadBlocks(latestBlockNumber, sourceTips);
+
+      // End-of-pass reconciliation: chain-proposed fires against the pre-pass baseline (a post-prune re-read would
+      // equal the source tip and suppress it), then the tiers highest-to-lowest so the finalized <= proven <=
+      // checkpointed <= proposed invariant holds mid-pass.
+      if (localBlockIdDiffers(prePassProposed, sourceTips.proposed)) {
+        const availableHeader =
+          prefetch?.hash === sourceTips.proposed.hash ? await prefetch.header : deliveredProposedHeader;
+        const header = availableHeader ?? (await this.getHeaderFromSource(sourceTips.proposed.hash));
+        if (header === undefined) {
+          // Abort the pass rather than skip just this event: the later tier events must not get ahead of a
+          // proposed tip the consumer never received. Nothing advanced, so the next pass retries.
+          this.log.warn(`No header for the proposed tip; aborting this sync pass`, {
+            blockNumber: sourceTips.proposed.number,
+            blockHash: sourceTips.proposed.hash,
           });
-          nextCheckpointToEmit = CheckpointNumber(nextCheckpointToEmit + 1);
+          throw new AbortError();
         }
+        await this.emitEvent({ type: 'chain-proposed', block: sourceTips.proposed, header });
       }
 
-      // Loop 2: Fetch new checkpointed blocks. For each checkpoint, emit all blocks
-      // from that checkpoint that we need, then emit the checkpoint event.
-      // We prefetch multiple checkpoints, then process them one by one.
-      let prefetchedCheckpoints: PublishedCheckpoint[] = [];
-      let prefetchIdx = 0;
-      let nextCheckpointNumber: CheckpointNumber | undefined;
-
-      // Find the starting checkpoint number
-      if (nextBlockNumber <= sourceTips.checkpointed.block.number) {
-        const blockData = await this.l2BlockSource.getBlockData({ number: BlockNumber(nextBlockNumber) });
-        if (blockData) {
-          nextCheckpointNumber = blockData.checkpointNumber;
-        }
-      }
-
-      while (nextBlockNumber <= sourceTips.checkpointed.block.number && nextCheckpointNumber !== undefined) {
-        // Refill the prefetch buffer when exhausted
-        if (prefetchIdx >= prefetchedCheckpoints.length) {
-          const prefetchLimit = this.opts.checkpointPrefetchLimit ?? CHECKPOINT_PREFETCH_LIMIT;
-          prefetchedCheckpoints = await this.l2BlockSource.getCheckpoints({
-            from: nextCheckpointNumber,
-            limit: prefetchLimit,
-          });
-          prefetchIdx = 0;
-          if (prefetchedCheckpoints.length === 0) {
-            break;
-          }
-        }
-
-        const checkpoint = prefetchedCheckpoints[prefetchIdx]!;
-
-        // Get all blocks from this checkpoint that we need, respecting batchSize
-        const limit = Math.min(this.opts.batchSize ?? 50, sourceTips.checkpointed.block.number - nextBlockNumber + 1);
-        const blocksForCheckpoint = checkpoint.checkpoint.blocks
-          .filter(b => b.number >= nextBlockNumber)
-          .slice(0, limit);
-        if (blocksForCheckpoint.length === 0) {
-          break;
-        }
-        await this.emitEvent({ type: 'blocks-added', blocks: blocksForCheckpoint });
-        nextBlockNumber = blocksForCheckpoint.at(-1)!.number + 1;
-
-        // If we've reached the end of this checkpoint, emit the checkpoint event and move to next
-        const lastBlockInCheckpoint = checkpoint.checkpoint.blocks.at(-1)!;
-        if (nextBlockNumber > lastBlockInCheckpoint.number) {
-          if (!this.opts.ignoreCheckpoints) {
-            const lastBlockHash = await lastBlockInCheckpoint.hash();
-            await this.emitEvent({
-              type: 'chain-checkpointed',
-              checkpoint,
-              block: makeL2BlockId(lastBlockInCheckpoint.number, lastBlockHash.toString()),
-            });
-          }
-          prefetchIdx++;
-          nextCheckpointNumber = CheckpointNumber(nextCheckpointNumber + 1);
-        }
-      }
-
-      // Loop 3: Fetch any remaining uncheckpointed (proposed) blocks.
-      while (nextBlockNumber <= sourceTips.proposed.number) {
-        const limit = Math.min(this.opts.batchSize ?? 50, sourceTips.proposed.number - nextBlockNumber + 1);
-        this.log.trace(`Requesting blocks from ${nextBlockNumber} limit ${limit}`);
-        const blocks = await this.l2BlockSource.getBlocks({ from: BlockNumber(nextBlockNumber), limit });
-        if (blocks.length === 0) {
-          break;
-        }
-        await this.emitEvent({ type: 'blocks-added', blocks });
-        nextBlockNumber = blocks.at(-1)!.number + 1;
+      const reconcileTips = pruned ? await this.localData.getL2Tips() : localTips;
+      if (
+        !this.opts.ignoreCheckpoints &&
+        localBlockIdDiffers(reconcileTips.checkpointed?.block, sourceTips.checkpointed.block)
+      ) {
+        await this.emitEvent({
+          type: 'chain-checkpointed',
+          block: sourceTips.checkpointed.block,
+          checkpoint: sourceTips.checkpointed.checkpoint,
+        });
       }
-
-      // Update the proven and finalized tips.
-      if (localTips.proven !== undefined && sourceTips.proven.block.number !== localTips.proven.block.number) {
+      if (
+        reconcileTips.proven !== undefined &&
+        localBlockIdDiffers(reconcileTips.proven.block, sourceTips.proven.block)
+      ) {
         await this.emitEvent({
           type: 'chain-proven',
           block: sourceTips.proven.block,
+          checkpoint: sourceTips.proven.checkpoint,
         });
       }
-      if (localTips.finalized !== undefined && sourceTips.finalized.block.number !== localTips.finalized.block.number) {
-        await this.emitEvent({ type: 'chain-finalized', block: sourceTips.finalized.block });
+      if (
+        reconcileTips.finalized !== undefined &&
+        localBlockIdDiffers(reconcileTips.finalized.block, sourceTips.finalized.block)
+      ) {
+        await this.emitEvent({
+          type: 'chain-finalized',
+          block: sourceTips.finalized.block,
+          checkpoint: sourceTips.finalized.checkpoint,
+        });
       }
     } catch (err: any) {
       if (err.name === 'AbortError') {
@@ -274,12 +242,87 @@ export class L2BlockStream {
     }
   }
 
+  /**
+   * Delivers every block from the agreed-on point through the advertised proposed tip as `blocks-added` events,
+   * aborting the pass when the source's own answers prove that tip is no longer real.
+   * @returns The delivered tip's header, so the caller can avoid a re-fetch; undefined when there was nothing to
+   * download (already at the tip, or startingBlock past it).
+   */
+  private async downloadBlocks(
+    latestBlockNumber: BlockNumber,
+    sourceTips: LocalL2Tips,
+  ): Promise<BlockHeader | undefined> {
+    // The post-prune cursor: the highest block number both sides agree on. Block downloads resume from here.
+    let nextBlockNumber = latestBlockNumber + 1;
+
+    // From a fresh local store, fast-forward past history the consumer doesn't care about.
+    const startingBlock = this.opts.startingBlock !== undefined ? BlockNumber(this.opts.startingBlock) : undefined;
+    if (latestBlockNumber === 0 && startingBlock !== undefined) {
+      nextBlockNumber = Math.max(startingBlock, 1);
+    }
+
+    if (this.opts.skipFinalized) {
+      // Finalized blocks cannot be reorged, so skip them — but keep the last finalized block as the guaranteed point
+      // where local and source agree, the floor the walk-back terminates against.
+      nextBlockNumber = Math.max(sourceTips.finalized.block.number, nextBlockNumber);
+    }
+
+    if (!this.hasStarted) {
+      this.log.verbose(`Starting sync from block number ${nextBlockNumber - 1}`);
+      this.hasStarted = true;
+    }
+
+    let lastDeliveredBlock: L2Block | undefined;
+
+    while (nextBlockNumber <= sourceTips.proposed.number) {
+      const limit = Math.min(this.opts.batchSize ?? 50, sourceTips.proposed.number - nextBlockNumber + 1);
+      this.log.trace(`Requesting blocks from ${nextBlockNumber} limit ${limit}`);
+      const blocks = await this.l2BlockSource.getBlocks({ from: BlockNumber(nextBlockNumber), limit });
+      if (blocks.length === 0) {
+        // The source no longer has a block the snapshot promised: the snapshot is provably stale, so report the plan
+        // incomplete and skip reconciliation this pass.
+        this.log.warn(`Block source returned no blocks for a promised range; aborting this sync pass`, {
+          from: nextBlockNumber,
+          limit,
+          sourceProposed: sourceTips.proposed.number,
+        });
+        throw new AbortError();
+      }
+      await this.emitEvent({ type: 'blocks-added', blocks });
+      lastDeliveredBlock = blocks.at(-1)!;
+      nextBlockNumber = lastDeliveredBlock.number + 1;
+    }
+
+    if (lastDeliveredBlock === undefined) {
+      // Loop never ran (caught up before the plan started, or startingBlock past the tip, see A-1061), so nothing
+      // was downloaded that could disprove the snapshot.
+      return undefined;
+    }
+
+    // The block delivered at the proposed height must carry the snapshot's proposed hash; a different hash means a
+    // same-height fork swap happened mid-pass, so the snapshot is stale.
+    const deliveredHash = (await lastDeliveredBlock.hash()).toString();
+    if (deliveredHash !== sourceTips.proposed.hash) {
+      this.log.warn(`Delivered proposed-block hash differs from snapshot; aborting this sync pass`, {
+        blockNumber: lastDeliveredBlock.number,
+        deliveredHash,
+        snapshotHash: sourceTips.proposed.hash,
+      });
+      throw new AbortError();
+    }
+    return lastDeliveredBlock.header;
+  }
+
   /**
    * Returns whether the source and local agree on the block hash at a given height.
    * @param blockNumber - The block number to test.
-   * @param args - A cache of data already requested from source, to avoid re-requesting it.
+   * @param args - A cache of data already requested from source (to avoid re-requesting it) and the source's
+   * advertised proposed tip from the pass snapshot (to detect an incoherent source).
    */
-  private async areBlockHashesEqualAt(blockNumber: BlockNumber, args: { sourceCache: BlockHashCache }) {
+  private async areBlockHashesEqualAt(
+    blockNumber: BlockNumber,
+    args: { sourceCache: BlockHashCache; sourceProposed: BlockNumber },
+  ) {
     const localBlockHash = await this.localData.getL2BlockHash(blockNumber);
     if (!localBlockHash && this.opts.skipFinalized) {
       // Failing to find a block hash when skipping finalized blocks can be highly problematic as we'd potentially need
@@ -289,12 +332,28 @@ export class L2BlockStream {
       this.log.error(`No local block hash for block number ${blockNumber}`);
       throw new AbortError();
     }
+    if (!localBlockHash) {
+      // A missing local hash compares UNEQUAL: treating both-undefined as equal would stop the walk above the true
+      // divergence (an under-deep prune no later pass re-detects). Over-deep is the safe direction, and block 0 always
+      // resolves via the store's initialBlockHash so the walk always terminates.
+      this.log.trace(`No local block hash for block number ${blockNumber}; treating as unequal`);
+      return false;
+    }
 
     const sourceBlockHashFromCache = args.sourceCache.get(blockNumber);
     const sourceBlockHash = args.sourceCache.get(blockNumber) ?? (await this.getBlockHashFromSource(blockNumber));
     if (!sourceBlockHashFromCache && sourceBlockHash) {
       args.sourceCache.add({ number: blockNumber, hash: sourceBlockHash });
     }
+    if (!sourceBlockHash && blockNumber !== 0 && blockNumber <= args.sourceProposed) {
+      // No source data at or below the source's own proposed tip: the source contradicts itself (mid-reorg unwind or
+      // a transient read failure), so skip this pass.
+      this.log.warn(`Source has no data for a block at or below its proposed tip; skipping this sync pass`, {
+        blockNumber,
+        sourceProposed: args.sourceProposed,
+      });
+      throw new AbortError();
+    }
 
     this.log.trace(`Comparing block hashes for block ${blockNumber}`, { localBlockHash, sourceBlockHash });
     return localBlockHash === sourceBlockHash;
@@ -307,9 +366,25 @@ export class L2BlockStream {
       .then(hash => hash?.toString());
   }
 
+  private getHeaderFromSource(hash: string): Promise<BlockHeader | undefined> {
+    return this.l2BlockSource
+      .getBlockData({ hash: BlockHash.fromString(hash) })
+      .then(data => data?.header)
+      .catch(err => {
+        this.log.error(`Failed to read header for block`, err, { blockHash: hash });
+        return undefined;
+      });
+  }
+
   private async emitEvent(event: L2BlockStreamEvent) {
     this.log.debug(
-      `Emitting ${event.type} (${event.type === 'blocks-added' ? event.blocks.length : event.type === 'chain-checkpointed' ? event.checkpoint.checkpoint.number : event.block.number})`,
+      `Emitting ${event.type} (${
+        event.type === 'blocks-added'
+          ? event.blocks.length
+          : event.type === 'chain-checkpointed'
+            ? event.checkpoint.number
+            : event.block.number
+      })`,
     );
     await this.handler.handleBlockStreamEvent(event);
     if (!this.isRunning() && !this.isSyncing) {
@@ -318,6 +393,9 @@ export class L2BlockStream {
   }
 }
 
+/** A speculative proposed-tip header read, tagged with the hash it targets so a moved tip is detectable. */
+type ProposedHeaderPrefetch = { hash: string; header: Promise<BlockHeader | undefined> };
+
 class BlockHashCache {
   private readonly cache: Map<number, string> = new Map();
 

package/src/block/l2_block_stream/l2_tips_memory_store.ts

@@ -1,8 +1,7 @@
-import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import type { BlockNumber } from '@aztec/foundation/branded-types';
 
-import type { PublishedCheckpoint } from '../../checkpoint/published_checkpoint.js';
 import type { BlockHash } from '../block_hash.js';
-import type { L2BlockTag } from '../l2_block_source.js';
+import type { CheckpointId, L2BlockTag } from '../l2_block_source.js';
 import { L2TipsStoreBase } from './l2_tips_store_base.js';
 
 /**
@@ -15,9 +14,8 @@ export class L2TipsMemoryStore extends L2TipsStoreBase {
   }
 
   private readonly tips = new Map<L2BlockTag, BlockNumber>();
+  private readonly tipCheckpoints = new Map<L2BlockTag, CheckpointId>();
   private readonly blockHashes = new Map<number, string>();
-  private readonly blockToCheckpoint = new Map<number, CheckpointNumber>();
-  private readonly checkpoints = new Map<number, PublishedCheckpoint>();
 
   protected getTip(tag: L2BlockTag): Promise<BlockNumber | undefined> {
     return Promise.resolve(this.tips.get(tag));
@@ -28,6 +26,15 @@ export class L2TipsMemoryStore extends L2TipsStoreBase {
     return Promise.resolve();
   }
 
+  protected getTipCheckpoint(tag: L2BlockTag): Promise<CheckpointId | undefined> {
+    return Promise.resolve(this.tipCheckpoints.get(tag));
+  }
+
+  protected setTipCheckpoint(tag: L2BlockTag, checkpoint: CheckpointId): Promise<void> {
+    this.tipCheckpoints.set(tag, checkpoint);
+    return Promise.resolve();
+  }
+
   protected getStoredBlockHash(blockNumber: BlockNumber): Promise<string | undefined> {
     return Promise.resolve(this.blockHashes.get(blockNumber));
   }
@@ -46,42 +53,6 @@ export class L2TipsMemoryStore extends L2TipsStoreBase {
     return Promise.resolve();
   }
 
-  protected getCheckpointNumberForBlock(blockNumber: BlockNumber): Promise<CheckpointNumber | undefined> {
-    return Promise.resolve(this.blockToCheckpoint.get(blockNumber));
-  }
-
-  protected setCheckpointNumberForBlock(blockNumber: BlockNumber, checkpointNumber: CheckpointNumber): Promise<void> {
-    this.blockToCheckpoint.set(blockNumber, checkpointNumber);
-    return Promise.resolve();
-  }
-
-  protected deleteBlockToCheckpointBefore(blockNumber: BlockNumber): Promise<void> {
-    for (const key of this.blockToCheckpoint.keys()) {
-      if (key < blockNumber) {
-        this.blockToCheckpoint.delete(key);
-      }
-    }
-    return Promise.resolve();
-  }
-
-  protected getCheckpoint(checkpointNumber: CheckpointNumber): Promise<PublishedCheckpoint | undefined> {
-    return Promise.resolve(this.checkpoints.get(checkpointNumber));
-  }
-
-  protected saveCheckpointData(checkpoint: PublishedCheckpoint): Promise<void> {
-    this.checkpoints.set(checkpoint.checkpoint.number, checkpoint);
-    return Promise.resolve();
-  }
-
-  protected deleteCheckpointsBefore(checkpointNumber: CheckpointNumber): Promise<void> {
-    for (const key of this.checkpoints.keys()) {
-      if (key < checkpointNumber) {
-        this.checkpoints.delete(key);
-      }
-    }
-    return Promise.resolve();
-  }
-
   protected runInTransaction<T>(fn: () => Promise<T>): Promise<T> {
     // Memory store doesn't need transactions - just execute immediately
     return fn();