@aztec/stdlib 6.0.0-nightly.20260604 → 6.0.0-nightly.20260721

package/dest/block/l2_block_stream/interfaces.js

@@ -1 +1,25 @@
-export { };
+/**
+ * Returns whether a local block id differs from a source block id. Compares block number and, when the local hash is
+ * known, block hash. The hash comparison is skipped when the local hash is undefined: world-state legitimately
+ * reports `undefined` hashes for tips ahead of its synced range, and comparing against an undefined hash would treat
+ * such a tip as different on every poll. An `undefined` local block (no local tip yet) always counts as differing.
+ */ export function localBlockIdDiffers(localBlock, sourceBlock) {
+    if (localBlock === undefined) {
+        return true;
+    }
+    if (sourceBlock.number !== localBlock.number) {
+        return true;
+    }
+    if (localBlock.hash === undefined) {
+        return false;
+    }
+    return sourceBlock.hash !== localBlock.hash;
+}
+/**
+ * Returns whether the local chain tips agree with the given source tips on every tier the local provider exposes.
+ * Each tier is compared at the block level via {@link localBlockIdDiffers} (so an unresolved local hash matches on
+ * number alone); checkpoint ids are not compared, mirroring the stream's own tier reconciliation. The optional
+ * `checkpointed` tier is only compared when present (it is absent when the stream ignores checkpoints).
+ */ export function localTipsMatch(local, source) {
+    return !localBlockIdDiffers(local.proposed, source.proposed) && (local.checkpointed === undefined || !localBlockIdDiffers(local.checkpointed.block, source.checkpointed.block)) && !localBlockIdDiffers(local.proven.block, source.proven.block) && !localBlockIdDiffers(local.finalized.block, source.finalized.block);
+}

package/dest/block/l2_block_stream/l2_block_stream.d.ts

@@ -1,7 +1,24 @@
 import { type L2BlockSource } from '../l2_block_source.js';
-import type { L2BlockStreamEventHandler, L2BlockStreamLocalDataProvider } from './interfaces.js';
-/** Maximum number of checkpoints to prefetch at once during sync. Matches MAX_RPC_CHECKPOINTS_LEN. */
-export declare const CHECKPOINT_PREFETCH_LIMIT = 50;
+import { type L2BlockStreamEventHandler, type L2BlockStreamLocalDataProvider } 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 declare class L2BlockStream {
     private l2BlockSource;
@@ -12,17 +29,7 @@ export declare class L2BlockStream {
     private readonly runningPromise;
     private isSyncing;
     private hasStarted;
-    constructor(l2BlockSource: Pick<L2BlockSource, 'getBlocks' | 'getBlockData' | 'getL2Tips' | 'getCheckpoints'>, localData: L2BlockStreamLocalDataProvider, handler: L2BlockStreamEventHandler, log?: import("@aztec/foundation/log").Logger, 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;
-    });
+    constructor(l2BlockSource: L2BlockStreamSource, localData: L2BlockStreamLocalDataProvider, handler: L2BlockStreamEventHandler, log?: import("@aztec/foundation/log").Logger, opts?: L2BlockStreamOptions);
     start(): void;
     stop(): Promise<void>;
     isRunning(): boolean;
@@ -33,8 +40,9 @@ export declare class L2BlockStream {
      */
     sync(): Promise<void>;
     protected work(): Promise<void>;
+    private downloadBlocks;
     private areBlockHashesEqualAt;
     private getBlockHashFromSource;
     private emitEvent;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfc3RyZWFtLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYmxvY2svbDJfYmxvY2tfc3RyZWFtL2wyX2Jsb2NrX3N0cmVhbS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFNQSxPQUFPLEVBQWtCLEtBQUssYUFBYSxFQUFpQixNQUFNLHVCQUF1QixDQUFDO0FBQzFGLE9BQU8sS0FBSyxFQUFzQix5QkFBeUIsRUFBRSw4QkFBOEIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXJILHNHQUFzRztBQUN0RyxlQUFPLE1BQU0seUJBQXlCLEtBQUssQ0FBQztBQUU1Qyx1SEFBdUg7QUFDdkgscUJBQWEsYUFBYTtJQU10QixPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsT0FBTztJQUNmLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRztJQUNwQixPQUFPLENBQUMsSUFBSTtJQVRkLE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFpQjtJQUNoRCxPQUFPLENBQUMsU0FBUyxDQUFTO0lBQzFCLE9BQU8sQ0FBQyxVQUFVLENBQVM7SUFFM0IsWUFDVSxhQUFhLEVBQUUsSUFBSSxDQUFDLGFBQWEsRUFBRSxXQUFXLEdBQUcsY0FBYyxHQUFHLFdBQVcsR0FBRyxnQkFBZ0IsQ0FBQyxFQUNqRyxTQUFTLEVBQUUsOEJBQThCLEVBQ3pDLE9BQU8sRUFBRSx5QkFBeUIsRUFDekIsR0FBRyx5Q0FBcUMsRUFDakQsSUFBSSxHQUFFO1FBQ1osY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQ3hCLFNBQVMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUNuQixhQUFhLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDdkIsa0hBQWtIO1FBQ2xILGFBQWEsQ0FBQyxFQUFFLE9BQU8sQ0FBQztRQUN4QiwySUFBMkk7UUFDM0ksaUJBQWlCLENBQUMsRUFBRSxPQUFPLENBQUM7UUFDNUIsaUhBQWlIO1FBQ2pILHVCQUF1QixDQUFDLEVBQUUsTUFBTSxDQUFDO0tBQzdCLEVBT1A7SUFFTSxLQUFLLFNBR1g7SUFFWSxJQUFJLGtCQUVoQjtJQUVNLFNBQVMsWUFFZjtJQUVEOzs7O09BSUc7SUFDVSxJQUFJLGtCQUloQjtJQUVELFVBQWdCLElBQUksa0JBZ05uQjtZQU9hLHFCQUFxQjtJQXFCbkMsT0FBTyxDQUFDLHNCQUFzQjtZQU9oQixTQUFTO0NBU3hCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfc3RyZWFtLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYmxvY2svbDJfYmxvY2tfc3RyZWFtL2wyX2Jsb2NrX3N0cmVhbS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFNQSxPQUFPLEVBQWtCLEtBQUssYUFBYSxFQUFtQyxNQUFNLHVCQUF1QixDQUFDO0FBQzVHLE9BQU8sRUFFTCxLQUFLLHlCQUF5QixFQUM5QixLQUFLLDhCQUE4QixFQUVwQyxNQUFNLGlCQUFpQixDQUFDO0FBRXpCLHdHQUF3RztBQUN4RyxNQUFNLE1BQU0sbUJBQW1CLEdBQUcsSUFBSSxDQUFDLGFBQWEsRUFBRSxXQUFXLEdBQUcsY0FBYyxHQUFHLFdBQVcsQ0FBQyxDQUFDO0FBRWxHLHNGQUFzRjtBQUN0RixNQUFNLE1BQU0sb0JBQW9CLEdBQUc7SUFDakMsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3hCLFNBQVMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNuQixhQUFhLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDdkIsa0hBQWtIO0lBQ2xILGFBQWEsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUN4QiwySEFBMkg7SUFDM0gsaUJBQWlCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDNUI7Ozs7O09BS0c7SUFDSCxRQUFRLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDcEIsQ0FBQztBQUVGLHVIQUF1SDtBQUN2SCxxQkFBYSxhQUFhO0lBTXRCLE9BQU8sQ0FBQyxhQUFhO0lBQ3JCLE9BQU8sQ0FBQyxTQUFTO0lBQ2pCLE9BQU8sQ0FBQyxPQUFPO0lBQ2YsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHO0lBQ3BCLE9BQU8sQ0FBQyxJQUFJO0lBVGQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQWlCO0lBQ2hELE9BQU8sQ0FBQyxTQUFTLENBQVM7SUFDMUIsT0FBTyxDQUFDLFVBQVUsQ0FBUztJQUUzQixZQUNVLGFBQWEsRUFBRSxtQkFBbUIsRUFDbEMsU0FBUyxFQUFFLDhCQUE4QixFQUN6QyxPQUFPLEVBQUUseUJBQXlCLEVBQ3pCLEdBQUcseUNBQXFDLEVBQ2pELElBQUksR0FBRSxvQkFBeUIsRUFheEM7SUFFTSxLQUFLLFNBR1g7SUFFWSxJQUFJLGtCQUVoQjtJQUVNLFNBQVMsWUFFZjtJQUVEOzs7O09BSUc7SUFDVSxJQUFJLGtCQUloQjtJQUVELFVBQWdCLElBQUksa0JBd0luQjtZQVNhLGNBQWM7WUFtRWQscUJBQXFCO0lBd0NuQyxPQUFPLENBQUMsc0JBQXNCO1lBT2hCLFNBQVM7Q0FleEIifQ==

package/dest/block/l2_block_stream/l2_block_stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2_block_stream.d.ts","sourceRoot":"","sources":["../../../src/block/l2_block_stream/l2_block_stream.ts"],"names":[],"mappings":"AAMA,OAAO,EAAkB,KAAK,aAAa,EAAiB,MAAM,uBAAuB,CAAC;AAC1F,OAAO,KAAK,EAAsB,yBAAyB,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAC;AAErH,sGAAsG;AACtG,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAE5C,uHAAuH;AACvH,qBAAa,aAAa;IAMtB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,IAAI;IATd,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,UAAU,CAAS;IAE3B,YACU,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,WAAW,GAAG,cAAc,GAAG,WAAW,GAAG,gBAAgB,CAAC,EACjG,SAAS,EAAE,8BAA8B,EACzC,OAAO,EAAE,yBAAyB,EACzB,GAAG,yCAAqC,EACjD,IAAI,GAAE;QACZ,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,kHAAkH;QAClH,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,2IAA2I;QAC3I,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B,iHAAiH;QACjH,uBAAuB,CAAC,EAAE,MAAM,CAAC;KAC7B,EAOP;IAEM,KAAK,SAGX;IAEY,IAAI,kBAEhB;IAEM,SAAS,YAEf;IAED;;;;OAIG;IACU,IAAI,kBAIhB;IAED,UAAgB,IAAI,kBAgNnB;YAOa,qBAAqB;IAqBnC,OAAO,CAAC,sBAAsB;YAOhB,SAAS;CASxB"}
+{"version":3,"file":"l2_block_stream.d.ts","sourceRoot":"","sources":["../../../src/block/l2_block_stream/l2_block_stream.ts"],"names":[],"mappings":"AAMA,OAAO,EAAkB,KAAK,aAAa,EAAmC,MAAM,uBAAuB,CAAC;AAC5G,OAAO,EAEL,KAAK,yBAAyB,EAC9B,KAAK,8BAA8B,EAEpC,MAAM,iBAAiB,CAAC;AAEzB,wGAAwG;AACxG,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,aAAa,EAAE,WAAW,GAAG,cAAc,GAAG,WAAW,CAAC,CAAC;AAElG,sFAAsF;AACtF,MAAM,MAAM,oBAAoB,GAAG;IACjC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kHAAkH;IAClH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,2HAA2H;IAC3H,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,uHAAuH;AACvH,qBAAa,aAAa;IAMtB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,IAAI;IATd,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,UAAU,CAAS;IAE3B,YACU,aAAa,EAAE,mBAAmB,EAClC,SAAS,EAAE,8BAA8B,EACzC,OAAO,EAAE,yBAAyB,EACzB,GAAG,yCAAqC,EACjD,IAAI,GAAE,oBAAyB,EAaxC;IAEM,KAAK,SAGX;IAEY,IAAI,kBAEhB;IAEM,SAAS,YAEf;IAED;;;;OAIG;IACU,IAAI,kBAIhB;IAED,UAAgB,IAAI,kBAwInB;YASa,cAAc;YAmEd,qBAAqB;IAwCnC,OAAO,CAAC,sBAAsB;YAOhB,SAAS;CAexB"}

package/dest/block/l2_block_stream/l2_block_stream.js

@@ -1,9 +1,9 @@
-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 { makeL2BlockId } from '../l2_block_source.js';
-/** Maximum number of checkpoints to prefetch at once during sync. Matches MAX_RPC_CHECKPOINTS_LEN. */ export const CHECKPOINT_PREFETCH_LIMIT = 50;
+import { localBlockIdDiffers } from './interfaces.js';
 /** Creates a stream of events for new blocks, chain tips updates, and reorgs, out of polling an archiver or a node. */ export class L2BlockStream {
     l2BlockSource;
     localData;
@@ -21,6 +21,9 @@ import { makeL2BlockId } from '../l2_block_source.js';
         this.opts = opts;
         this.isSyncing = false;
         this.hasStarted = false;
+        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_).
@@ -48,35 +51,62 @@ import { makeL2BlockId } from '../l2_block_source.js';
     }
     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;
+            // 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
             ]);
+            const walkFloor = localTips.finalized.block.number;
             while(!await this.areBlockHashesEqualAt(latestBlockNumber, {
-                sourceCache
+                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)
                     });
                     throw new Error('Genesis block hash mismatch between local store and source: refusing to walk past block 0. ' + 'This usually indicates the two sides were configured with different genesis values ' + '(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) {
@@ -86,161 +116,46 @@ import { makeL2BlockId } from '../l2_block_source.js';
                 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())
-                    });
-                    nextCheckpointToEmit = CheckpointNumber(nextCheckpointToEmit + 1);
-                }
-            }
-            // 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 = [];
-            let prefetchIdx = 0;
-            let nextCheckpointNumber;
-            // 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;
-                }
+            // 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 — skip tier reconciliation in that case. Tips-only mode
+            // has no download plan (the snapshot is one atomic getL2Tips read), so it always reconciles.
+            if (!this.opts.tipsOnly && !await this.downloadBlocks(latestBlockNumber, sourceTips)) {
+                return;
             }
-            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;
-                }
+            // 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)) {
                 await this.emitEvent({
-                    type: 'blocks-added',
-                    blocks: blocksForCheckpoint
+                    type: 'chain-proposed',
+                    block: sourceTips.proposed
                 });
-                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;
-                }
+            const reconcileTips = pruned ? await this.localData.getL2Tips() : localTips;
+            if (!this.opts.ignoreCheckpoints && localBlockIdDiffers(reconcileTips.checkpointed?.block, sourceTips.checkpointed.block)) {
                 await this.emitEvent({
-                    type: 'blocks-added',
-                    blocks
+                    type: 'chain-checkpointed',
+                    block: sourceTips.checkpointed.block,
+                    checkpoint: sourceTips.checkpointed.checkpoint
                 });
-                nextBlockNumber = blocks.at(-1).number + 1;
             }
-            // 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
+                    block: sourceTips.proven.block,
+                    checkpoint: sourceTips.proven.checkpoint
                 });
             }
-            if (localTips.finalized !== undefined && sourceTips.finalized.block.number !== localTips.finalized.block.number) {
+            if (reconcileTips.finalized !== undefined && localBlockIdDiffers(reconcileTips.finalized.block, sourceTips.finalized.block)) {
                 await this.emitEvent({
                     type: 'chain-finalized',
-                    block: sourceTips.finalized.block
+                    block: sourceTips.finalized.block,
+                    checkpoint: sourceTips.finalized.checkpoint
                 });
             }
         } catch (err) {
@@ -251,9 +166,75 @@ import { makeL2BlockId } from '../l2_block_source.js';
         }
     }
     /**
+   * Downloads every block from the post-prune cursor through the source's proposed tip, emitting `blocks-added`
+   * events. The return value gates tier-cursor advancement (pass atomicity): tier tips may only be reconciled when
+   * the plan that backs them ran to the proposed tip.
+   * @returns `true` if the plan completed (caught up, or delivered the proposed tip with a matching hash); `false` if
+   * the source no longer has a promised block, or served a fork at the proposed height mid-pass.
+   */ async downloadBlocks(latestBlockNumber, sourceTips) {
+        // 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;
+        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; skipping reconciliation this pass`, {
+                    from: nextBlockNumber,
+                    limit,
+                    sourceProposed: sourceTips.proposed.number
+                });
+                return false;
+            }
+            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 (A-1061). Trivially complete.
+            return true;
+        }
+        // Complete iff the block delivered at the proposed height carries 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; skipping reconciliation this pass`, {
+                blockNumber: lastDeliveredBlock.number,
+                deliveredHash,
+                snapshotHash: sourceTips.proposed.hash
+            });
+            return false;
+        }
+        return true;
+    }
+    /**
    * 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).
    */ async areBlockHashesEqualAt(blockNumber, args) {
         const localBlockHash = await this.localData.getL2BlockHash(blockNumber);
         if (!localBlockHash && this.opts.skipFinalized) {
@@ -264,6 +245,13 @@ import { makeL2BlockId } from '../l2_block_source.js';
             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) {
@@ -272,6 +260,15 @@ import { makeL2BlockId } from '../l2_block_source.js';
                 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
@@ -284,7 +281,7 @@ import { makeL2BlockId } from '../l2_block_source.js';
         }).then((d)=>d?.header.hash()).then((hash)=>hash?.toString());
     }
     async emitEvent(event) {
-        this.log.debug(`Emitting ${event.type} (${event.type === 'blocks-added' ? event.blocks.length : event.type === 'chain-checkpointed' ? event.checkpoint.checkpoint.number : event.block.number})`);
+        this.log.debug(`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) {
             throw new AbortError();

package/dest/block/l2_block_stream/l2_tips_memory_store.d.ts

@@ -1,7 +1,6 @@
-import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
-import type { PublishedCheckpoint } from '../../checkpoint/published_checkpoint.js';
+import type { BlockNumber } from '@aztec/foundation/branded-types';
 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';
 /**
  * In-memory implementation of L2 tips store. Useful for testing and lightweight clients.
@@ -10,20 +9,15 @@ import { L2TipsStoreBase } from './l2_tips_store_base.js';
 export declare class L2TipsMemoryStore extends L2TipsStoreBase {
     constructor(initialBlockHash: BlockHash);
     private readonly tips;
+    private readonly tipCheckpoints;
     private readonly blockHashes;
-    private readonly blockToCheckpoint;
-    private readonly checkpoints;
     protected getTip(tag: L2BlockTag): Promise<BlockNumber | undefined>;
     protected setTip(tag: L2BlockTag, blockNumber: BlockNumber): Promise<void>;
+    protected getTipCheckpoint(tag: L2BlockTag): Promise<CheckpointId | undefined>;
+    protected setTipCheckpoint(tag: L2BlockTag, checkpoint: CheckpointId): Promise<void>;
     protected getStoredBlockHash(blockNumber: BlockNumber): Promise<string | undefined>;
     protected setBlockHash(blockNumber: BlockNumber, hash: string): Promise<void>;
     protected deleteBlockHashesBefore(blockNumber: BlockNumber): Promise<void>;
-    protected getCheckpointNumberForBlock(blockNumber: BlockNumber): Promise<CheckpointNumber | undefined>;
-    protected setCheckpointNumberForBlock(blockNumber: BlockNumber, checkpointNumber: CheckpointNumber): Promise<void>;
-    protected deleteBlockToCheckpointBefore(blockNumber: BlockNumber): Promise<void>;
-    protected getCheckpoint(checkpointNumber: CheckpointNumber): Promise<PublishedCheckpoint | undefined>;
-    protected saveCheckpointData(checkpoint: PublishedCheckpoint): Promise<void>;
-    protected deleteCheckpointsBefore(checkpointNumber: CheckpointNumber): Promise<void>;
     protected runInTransaction<T>(fn: () => Promise<T>): Promise<T>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdGlwc19tZW1vcnlfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9ibG9jay9sMl9ibG9ja19zdHJlYW0vbDJfdGlwc19tZW1vcnlfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRWhGLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFDcEYsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDbEQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDeEQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTFEOzs7R0FHRztBQUNILHFCQUFhLGlCQUFrQixTQUFRLGVBQWU7SUFDcEQsWUFBWSxnQkFBZ0IsRUFBRSxTQUFTLEVBRXRDO0lBRUQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQXNDO0lBQzNELE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUE2QjtJQUN6RCxPQUFPLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUF1QztJQUN6RSxPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBMEM7SUFFdEUsU0FBUyxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxXQUFXLEdBQUcsU0FBUyxDQUFDLENBRWxFO0lBRUQsU0FBUyxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsVUFBVSxFQUFFLFdBQVcsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUd6RTtJQUVELFNBQVMsQ0FBQyxrQkFBa0IsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRWxGO0lBRUQsU0FBUyxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUc1RTtJQUVELFNBQVMsQ0FBQyx1QkFBdUIsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FPekU7SUFFRCxTQUFTLENBQUMsMkJBQTJCLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLEdBQUcsU0FBUyxDQUFDLENBRXJHO0lBRUQsU0FBUyxDQUFDLDJCQUEyQixDQUFDLFdBQVcsRUFBRSxXQUFXLEVBQUUsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUdqSDtJQUVELFNBQVMsQ0FBQyw2QkFBNkIsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FPL0U7SUFFRCxTQUFTLENBQUMsYUFBYSxDQUFDLGdCQUFnQixFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsR0FBRyxTQUFTLENBQUMsQ0FFcEc7SUFFRCxTQUFTLENBQUMsa0JBQWtCLENBQUMsVUFBVSxFQUFFLG1CQUFtQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHM0U7SUFFRCxTQUFTLENBQUMsdUJBQXVCLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU9uRjtJQUVELFNBQVMsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLE1BQU0sT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FHOUQ7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdGlwc19tZW1vcnlfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9ibG9jay9sMl9ibG9ja19zdHJlYW0vbDJfdGlwc19tZW1vcnlfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFbkUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDbEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLFVBQVUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3RFLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUUxRDs7O0dBR0c7QUFDSCxxQkFBYSxpQkFBa0IsU0FBUSxlQUFlO0lBQ3BELFlBQVksZ0JBQWdCLEVBQUUsU0FBUyxFQUV0QztJQUVELE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFzQztJQUMzRCxPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBdUM7SUFDdEUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQTZCO0lBRXpELFNBQVMsQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsV0FBVyxHQUFHLFNBQVMsQ0FBQyxDQUVsRTtJQUVELFNBQVMsQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLFVBQVUsRUFBRSxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHekU7SUFFRCxTQUFTLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsWUFBWSxHQUFHLFNBQVMsQ0FBQyxDQUU3RTtJQUVELFNBQVMsQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsVUFBVSxFQUFFLFVBQVUsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUduRjtJQUVELFNBQVMsQ0FBQyxrQkFBa0IsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRWxGO0lBRUQsU0FBUyxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUc1RTtJQUVELFNBQVMsQ0FBQyx1QkFBdUIsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FPekU7SUFFRCxTQUFTLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxNQUFNLE9BQU8sQ0FBQyxDQUFDLENBQUMsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBRzlEO0NBQ0YifQ==

package/dest/block/l2_block_stream/l2_tips_memory_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2_tips_memory_store.d.ts","sourceRoot":"","sources":["../../../src/block/l2_block_stream/l2_tips_memory_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEhF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D;;;GAGG;AACH,qBAAa,iBAAkB,SAAQ,eAAe;IACpD,YAAY,gBAAgB,EAAE,SAAS,EAEtC;IAED,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAsC;IAC3D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA6B;IACzD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuC;IACzE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0C;IAEtE,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAElE;IAED,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAGzE;IAED,SAAS,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAElF;IAED,SAAS,CAAC,YAAY,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG5E;IAED,SAAS,CAAC,uBAAuB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAOzE;IAED,SAAS,CAAC,2BAA2B,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAErG;IAED,SAAS,CAAC,2BAA2B,CAAC,WAAW,EAAE,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAGjH;IAED,SAAS,CAAC,6BAA6B,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAO/E;IAED,SAAS,CAAC,aAAa,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAEpG;IAED,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAG3E;IAED,SAAS,CAAC,uBAAuB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAOnF;IAED,SAAS,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAG9D;CACF"}
+{"version":3,"file":"l2_tips_memory_store.d.ts","sourceRoot":"","sources":["../../../src/block/l2_block_stream/l2_tips_memory_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D;;;GAGG;AACH,qBAAa,iBAAkB,SAAQ,eAAe;IACpD,YAAY,gBAAgB,EAAE,SAAS,EAEtC;IAED,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAsC;IAC3D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAuC;IACtE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA6B;IAEzD,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAElE;IAED,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAGzE;IAED,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAE7E;IAED,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAGnF;IAED,SAAS,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAElF;IAED,SAAS,CAAC,YAAY,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG5E;IAED,SAAS,CAAC,uBAAuB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAOzE;IAED,SAAS,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAG9D;CACF"}

package/dest/block/l2_block_stream/l2_tips_memory_store.js

@@ -7,9 +7,8 @@ import { L2TipsStoreBase } from './l2_tips_store_base.js';
         super(initialBlockHash);
     }
     tips = new Map();
+    tipCheckpoints = new Map();
     blockHashes = new Map();
-    blockToCheckpoint = new Map();
-    checkpoints = new Map();
     getTip(tag) {
         return Promise.resolve(this.tips.get(tag));
     }
@@ -17,6 +16,13 @@ import { L2TipsStoreBase } from './l2_tips_store_base.js';
         this.tips.set(tag, blockNumber);
         return Promise.resolve();
     }
+    getTipCheckpoint(tag) {
+        return Promise.resolve(this.tipCheckpoints.get(tag));
+    }
+    setTipCheckpoint(tag, checkpoint) {
+        this.tipCheckpoints.set(tag, checkpoint);
+        return Promise.resolve();
+    }
     getStoredBlockHash(blockNumber) {
         return Promise.resolve(this.blockHashes.get(blockNumber));
     }
@@ -32,36 +38,6 @@ import { L2TipsStoreBase } from './l2_tips_store_base.js';
         }
         return Promise.resolve();
     }
-    getCheckpointNumberForBlock(blockNumber) {
-        return Promise.resolve(this.blockToCheckpoint.get(blockNumber));
-    }
-    setCheckpointNumberForBlock(blockNumber, checkpointNumber) {
-        this.blockToCheckpoint.set(blockNumber, checkpointNumber);
-        return Promise.resolve();
-    }
-    deleteBlockToCheckpointBefore(blockNumber) {
-        for (const key of this.blockToCheckpoint.keys()){
-            if (key < blockNumber) {
-                this.blockToCheckpoint.delete(key);
-            }
-        }
-        return Promise.resolve();
-    }
-    getCheckpoint(checkpointNumber) {
-        return Promise.resolve(this.checkpoints.get(checkpointNumber));
-    }
-    saveCheckpointData(checkpoint) {
-        this.checkpoints.set(checkpoint.checkpoint.number, checkpoint);
-        return Promise.resolve();
-    }
-    deleteCheckpointsBefore(checkpointNumber) {
-        for (const key of this.checkpoints.keys()){
-            if (key < checkpointNumber) {
-                this.checkpoints.delete(key);
-            }
-        }
-        return Promise.resolve();
-    }
     runInTransaction(fn) {
         // Memory store doesn't need transactions - just execute immediately
         return fn();