@aztec/stdlib 4.0.0-nightly.20260112 → 4.0.0-nightly.20260114

package/dest/block/l2_block_stream/l2_block_stream.js

@@ -1,4 +1,4 @@
-import { BlockNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import { AbortError } from '@aztec/foundation/error';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
@@ -50,39 +50,39 @@ import { makeL2BlockId } from '../l2_block_source.js';
             const sourceTips = await this.l2BlockSource.getL2Tips();
             const localTips = await this.localData.getL2Tips();
             this.log.trace(`Running L2 block stream`, {
-                sourceLatest: sourceTips.latest.number,
-                localLatest: localTips.latest.number,
-                sourceFinalized: sourceTips.finalized.number,
-                localFinalized: localTips.finalized.number,
-                sourceProven: sourceTips.proven.number,
-                localProven: localTips.proven.number,
-                sourceLatestHash: sourceTips.latest.hash,
-                localLatestHash: localTips.latest.hash,
-                sourceProvenHash: sourceTips.proven.hash,
-                localProvenHash: localTips.proven.hash,
-                sourceFinalizedHash: sourceTips.finalized.hash,
-                localFinalizedHash: localTips.finalized.hash
+                sourceTips,
+                localTips
             });
             // Check if there was a reorg and emit a chain-pruned event if so.
-            let latestBlockNumber = localTips.latest.number;
+            let latestBlockNumber = localTips.proposed.number;
             const sourceCache = new BlockHashCache([
-                sourceTips.latest
+                sourceTips.proposed
             ]);
             while(!await this.areBlockHashesEqualAt(latestBlockNumber, {
                 sourceCache
             })){
                 latestBlockNumber--;
             }
-            if (latestBlockNumber < localTips.latest.number) {
-                latestBlockNumber = BlockNumber(Math.min(latestBlockNumber, sourceTips.latest.number)); // see #13471
+            if (latestBlockNumber < localTips.proposed.number) {
+                latestBlockNumber = BlockNumber(Math.min(latestBlockNumber, sourceTips.proposed.number)); // see #13471
                 const hash = sourceCache.get(latestBlockNumber) ?? await this.getBlockHashFromSource(latestBlockNumber);
                 if (latestBlockNumber !== 0 && !hash) {
                     throw new Error(`Block hash not found in block source for block number ${latestBlockNumber}`);
                 }
-                this.log.verbose(`Reorg detected. Pruning blocks from ${latestBlockNumber + 1} to ${localTips.latest.number}.`);
+                this.log.verbose(`Reorg detected. Pruning blocks from ${latestBlockNumber + 1} to ${localTips.proposed.number}.`);
+                // This check is not 100% accurate
+                // If the local tips are sufficiently behind the source tips, such that we are missing at least one checkpoint
+                // that has now been re-orged due to a proof failure then this will indicate a failure to checkpoint rather than a failure to prove
+                // TODO: (mbps/PhilWindle): Improve re-org detection accuracy when we come to do re-orgs
+                let reason = 'unproven';
+                if (latestBlockNumber === localTips.checkpointed.block.number && !this.opts.ignoreCheckpoints) {
+                    reason = 'uncheckpointed';
+                }
                 await this.emitEvent({
                     type: 'chain-pruned',
-                    block: makeL2BlockId(latestBlockNumber, hash)
+                    block: makeL2BlockId(latestBlockNumber, hash),
+                    reason,
+                    checkpoint: sourceTips.checkpointed.checkpoint
                 });
             }
             // If we are just starting, use the starting block number from the options.
@@ -95,19 +95,91 @@ import { makeL2BlockId } from '../l2_block_source.js';
                 this.hasStarted = true;
             }
             let nextBlockNumber = latestBlockNumber + 1;
+            let nextCheckpointToEmit = CheckpointNumber(localTips.checkpointed.checkpoint.number + 1);
             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.number, nextBlockNumber);
+                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.getPublishedCheckpoints(nextCheckpointToEmit, 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 block, get its checkpoint, emit all blocks
+            // from that checkpoint that we need, then emit the checkpoint event.
+            // We cache the current checkpoint to avoid redundant fetches when batchSize < checkpoint size.
+            let checkpoint;
+            while(nextBlockNumber <= sourceTips.checkpointed.block.number){
+                const limit = Math.min(this.opts.batchSize ?? 50, sourceTips.checkpointed.block.number - nextBlockNumber + 1);
+                // Check if we need to fetch a new checkpoint (nextBlockNumber is beyond the cached one)
+                if (!checkpoint || nextBlockNumber > checkpoint.checkpoint.blocks.at(-1).number) {
+                    const blocks = await this.l2BlockSource.getCheckpointedBlocks(BlockNumber(nextBlockNumber), 1);
+                    if (blocks.length === 0) {
+                        break;
+                    }
+                    const checkpoints = await this.l2BlockSource.getPublishedCheckpoints(blocks[0].checkpointNumber, 1);
+                    if (checkpoints.length === 0) {
+                        break;
+                    }
+                    checkpoint = checkpoints[0];
+                }
+                // Get all blocks from this checkpoint that we need, respecting batchSize
+                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
+                const lastBlockInCheckpoint = checkpoint.checkpoint.blocks.at(-1);
+                if (!this.opts.ignoreCheckpoints && nextBlockNumber > lastBlockInCheckpoint.number) {
+                    const lastBlockHash = await lastBlockInCheckpoint.hash();
+                    await this.emitEvent({
+                        type: 'chain-checkpointed',
+                        checkpoint,
+                        block: makeL2BlockId(lastBlockInCheckpoint.number, lastBlockHash.toString())
+                    });
+                }
             }
-            // Request new blocks from the source.
-            while(nextBlockNumber <= sourceTips.latest.number){
-                const limit = Math.min(this.opts.batchSize ?? 50, sourceTips.latest.number - nextBlockNumber + 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} proven=${this.opts.proven}`);
-                const blocks = await this.l2BlockSource.getPublishedBlocks(BlockNumber(nextBlockNumber), limit, this.opts.proven);
+                const blocks = await this.l2BlockSource.getL2BlocksNew(BlockNumber(nextBlockNumber), limit, this.opts.proven);
                 if (blocks.length === 0) {
                     break;
                 }
@@ -115,19 +187,19 @@ import { makeL2BlockId } from '../l2_block_source.js';
                     type: 'blocks-added',
                     blocks
                 });
-                nextBlockNumber = blocks.at(-1).block.number + 1;
+                nextBlockNumber = blocks.at(-1).number + 1;
             }
             // Update the proven and finalized tips.
-            if (localTips.proven !== undefined && sourceTips.proven.number !== localTips.proven.number) {
+            if (localTips.proven !== undefined && sourceTips.proven.block.number !== localTips.proven.block.number) {
                 await this.emitEvent({
                     type: 'chain-proven',
-                    block: sourceTips.proven
+                    block: sourceTips.proven.block
                 });
             }
-            if (localTips.finalized !== undefined && sourceTips.finalized.number !== localTips.finalized.number) {
+            if (localTips.finalized !== undefined && sourceTips.finalized.block.number !== localTips.finalized.block.number) {
                 await this.emitEvent({
                     type: 'chain-finalized',
-                    block: sourceTips.finalized
+                    block: sourceTips.finalized.block
                 });
             }
         } catch (err) {
@@ -172,7 +244,7 @@ import { makeL2BlockId } from '../l2_block_source.js';
         return this.l2BlockSource.getBlockHeader(blockNumber).then((h)=>h?.hash()).then((hash)=>hash?.toString());
     }
     async emitEvent(event) {
-        this.log.debug(`Emitting ${event.type} (${event.type === 'blocks-added' ? event.blocks.length : event.block.number})`);
+        this.log.debug(`Emitting ${event.type} (${event.type === 'blocks-added' ? event.blocks.length : event.type === 'chain-checkpointed' ? event.checkpoint.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,19 +1,27 @@
-import { BlockNumber } from '@aztec/foundation/branded-types';
-import type { L2Block } from '../l2_block.js';
-import type { L2BlockId, L2BlockTag, L2Tips } from '../l2_block_source.js';
-import type { L2BlockStreamEvent, L2BlockStreamEventHandler, L2BlockStreamLocalDataProvider } from './interfaces.js';
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import type { PublishedCheckpoint } from '../../checkpoint/published_checkpoint.js';
+import type { L2BlockTag } from '../l2_block_source.js';
+import { L2TipsStoreBase } from './l2_tips_store_base.js';
 /**
- * Stores currently synced L2 tips and unfinalized block hashes.
- * @dev tests in kv-store/src/stores/l2_tips_memory_store.test.ts
+ * In-memory implementation of L2 tips store. Useful for testing and lightweight clients.
+ * @dev Tests in kv-store/src/stores/l2_tips_memory_store.test.ts
  */
-export declare class L2TipsMemoryStore implements L2BlockStreamEventHandler, L2BlockStreamLocalDataProvider {
-    protected readonly l2TipsStore: Map<L2BlockTag, BlockNumber>;
-    protected readonly l2BlockHashesStore: Map<number, string>;
-    getL2BlockHash(number: number): Promise<string | undefined>;
-    getL2Tips(): Promise<L2Tips>;
-    private getL2Tip;
-    handleBlockStreamEvent(event: L2BlockStreamEvent): Promise<void>;
-    protected saveTag(name: L2BlockTag, block: L2BlockId): void;
-    protected computeBlockHash(block: L2Block): Promise<`0x${string}`>;
+export declare class L2TipsMemoryStore extends L2TipsStoreBase {
+    private readonly tips;
+    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 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdGlwc19tZW1vcnlfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9ibG9jay9sMl9ibG9ja19zdHJlYW0vbDJfdGlwc19tZW1vcnlfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDM0UsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUseUJBQXlCLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUVySDs7O0dBR0c7QUFDSCxxQkFBYSxpQkFBa0IsWUFBVyx5QkFBeUIsRUFBRSw4QkFBOEI7SUFDakcsU0FBUyxDQUFDLFFBQVEsQ0FBQyxXQUFXLEVBQUUsR0FBRyxDQUFDLFVBQVUsRUFBRSxXQUFXLENBQUMsQ0FBYTtJQUN6RSxTQUFTLENBQUMsUUFBUSxDQUFDLGtCQUFrQixFQUFFLEdBQUcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQWE7SUFFaEUsY0FBYyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsQ0FFakU7SUFFTSxTQUFTLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQU1sQztJQUVELE9BQU8sQ0FBQyxRQUFRO0lBYUgsc0JBQXNCLENBQUMsS0FBSyxFQUFFLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0F5QjVFO0lBRUQsU0FBUyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLEtBQUssRUFBRSxTQUFTLFFBS25EO0lBRUQsU0FBUyxDQUFDLGdCQUFnQixDQUFDLEtBQUssRUFBRSxPQUFPLDBCQUV4QztDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdGlwc19tZW1vcnlfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9ibG9jay9sMl9ibG9ja19zdHJlYW0vbDJfdGlwc19tZW1vcnlfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRWhGLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFDcEYsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDeEQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTFEOzs7R0FHRztBQUNILHFCQUFhLGlCQUFrQixTQUFRLGVBQWU7SUFDcEQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQXNDO0lBQzNELE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUE2QjtJQUN6RCxPQUFPLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUF1QztJQUN6RSxPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBMEM7SUFFdEUsU0FBUyxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxXQUFXLEdBQUcsU0FBUyxDQUFDLENBRWxFO0lBRUQsU0FBUyxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsVUFBVSxFQUFFLFdBQVcsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUd6RTtJQUVELFNBQVMsQ0FBQyxrQkFBa0IsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRWxGO0lBRUQsU0FBUyxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUc1RTtJQUVELFNBQVMsQ0FBQyx1QkFBdUIsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FPekU7SUFFRCxTQUFTLENBQUMsMkJBQTJCLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLEdBQUcsU0FBUyxDQUFDLENBRXJHO0lBRUQsU0FBUyxDQUFDLDJCQUEyQixDQUFDLFdBQVcsRUFBRSxXQUFXLEVBQUUsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUdqSDtJQUVELFNBQVMsQ0FBQyw2QkFBNkIsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FPL0U7SUFFRCxTQUFTLENBQUMsYUFBYSxDQUFDLGdCQUFnQixFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsR0FBRyxTQUFTLENBQUMsQ0FFcEc7SUFFRCxTQUFTLENBQUMsa0JBQWtCLENBQUMsVUFBVSxFQUFFLG1CQUFtQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHM0U7SUFFRCxTQUFTLENBQUMsdUJBQXVCLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU9uRjtJQUVELFNBQVMsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLE1BQU0sT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FHOUQ7Q0FDRiJ9

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":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAC;AAErH;;;GAGG;AACH,qBAAa,iBAAkB,YAAW,yBAAyB,EAAE,8BAA8B;IACjG,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,CAAa;IACzE,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEhE,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAEjE;IAEM,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAMlC;IAED,OAAO,CAAC,QAAQ;IAaH,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyB5E;IAED,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,QAKnD;IAED,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,0BAExC;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,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEhF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D;;;GAGG;AACH,qBAAa,iBAAkB,SAAQ,eAAe;IACpD,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"}

package/dest/block/l2_block_stream/l2_tips_memory_store.js

@@ -1,72 +1,66 @@
-import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/constants';
-import { BlockNumber } from '@aztec/foundation/branded-types';
+import { L2TipsStoreBase } from './l2_tips_store_base.js';
 /**
- * Stores currently synced L2 tips and unfinalized block hashes.
- * @dev tests in kv-store/src/stores/l2_tips_memory_store.test.ts
- */ export class L2TipsMemoryStore {
-    l2TipsStore = new Map();
-    l2BlockHashesStore = new Map();
-    getL2BlockHash(number) {
-        return Promise.resolve(this.l2BlockHashesStore.get(number));
+ * In-memory implementation of L2 tips store. Useful for testing and lightweight clients.
+ * @dev Tests in kv-store/src/stores/l2_tips_memory_store.test.ts
+ */ export class L2TipsMemoryStore extends L2TipsStoreBase {
+    tips = new Map();
+    blockHashes = new Map();
+    blockToCheckpoint = new Map();
+    checkpoints = new Map();
+    getTip(tag) {
+        return Promise.resolve(this.tips.get(tag));
     }
-    getL2Tips() {
-        return Promise.resolve({
-            latest: this.getL2Tip('latest'),
-            finalized: this.getL2Tip('finalized'),
-            proven: this.getL2Tip('proven')
-        });
+    setTip(tag, blockNumber) {
+        this.tips.set(tag, blockNumber);
+        return Promise.resolve();
     }
-    getL2Tip(tag) {
-        const blockNumber = this.l2TipsStore.get(tag);
-        if (blockNumber === undefined || blockNumber === 0) {
-            return {
-                number: BlockNumber.ZERO,
-                hash: GENESIS_BLOCK_HEADER_HASH.toString()
-            };
-        }
-        const blockHash = this.l2BlockHashesStore.get(blockNumber);
-        if (!blockHash) {
-            throw new Error(`Block hash not found for block number ${blockNumber}`);
+    getStoredBlockHash(blockNumber) {
+        return Promise.resolve(this.blockHashes.get(blockNumber));
+    }
+    setBlockHash(blockNumber, hash) {
+        this.blockHashes.set(blockNumber, hash);
+        return Promise.resolve();
+    }
+    deleteBlockHashesBefore(blockNumber) {
+        for (const key of this.blockHashes.keys()){
+            if (key < blockNumber) {
+                this.blockHashes.delete(key);
+            }
         }
-        return {
-            number: blockNumber,
-            hash: blockHash
-        };
+        return Promise.resolve();
+    }
+    getCheckpointNumberForBlock(blockNumber) {
+        return Promise.resolve(this.blockToCheckpoint.get(blockNumber));
     }
-    async handleBlockStreamEvent(event) {
-        switch(event.type){
-            case 'blocks-added':
-                {
-                    const blocks = event.blocks.map((b)=>b.block);
-                    for (const block of blocks){
-                        this.l2BlockHashesStore.set(block.number, await this.computeBlockHash(block));
-                    }
-                    this.l2TipsStore.set('latest', blocks.at(-1).number);
-                    break;
-                }
-            case 'chain-pruned':
-                this.saveTag('latest', event.block);
-                break;
-            case 'chain-proven':
-                this.saveTag('proven', event.block);
-                break;
-            case 'chain-finalized':
-                this.saveTag('finalized', event.block);
-                for (const key of this.l2BlockHashesStore.keys()){
-                    if (key < event.block.number) {
-                        this.l2BlockHashesStore.delete(key);
-                    }
-                }
-                break;
+    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();
     }
-    saveTag(name, block) {
-        this.l2TipsStore.set(name, block.number);
-        if (block.hash) {
-            this.l2BlockHashesStore.set(block.number, block.hash);
+    deleteCheckpointsBefore(checkpointNumber) {
+        for (const key of this.checkpoints.keys()){
+            if (key < checkpointNumber) {
+                this.checkpoints.delete(key);
+            }
         }
+        return Promise.resolve();
     }
-    computeBlockHash(block) {
-        return block.hash().then((hash)=>hash.toString());
+    runInTransaction(fn) {
+        // Memory store doesn't need transactions - just execute immediately
+        return fn();
     }
 }

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

@@ -0,0 +1,49 @@
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import type { PublishedCheckpoint } from '../../checkpoint/published_checkpoint.js';
+import type { L2BlockNew } from '../l2_block_new.js';
+import { type L2BlockTag, type L2Tips } from '../l2_block_source.js';
+import type { L2BlockStreamEvent, L2BlockStreamEventHandler, L2BlockStreamLocalDataProvider } from './interfaces.js';
+/**
+ * Abstract base class for L2 tips stores. Provides common event handling logic
+ * while delegating storage operations to subclasses.
+ */
+export declare abstract class L2TipsStoreBase implements L2BlockStreamEventHandler, L2BlockStreamLocalDataProvider {
+    /** Gets the block number for a given tag. */
+    protected abstract getTip(tag: L2BlockTag): Promise<BlockNumber | undefined>;
+    /** Sets the block number for a given tag. */
+    protected abstract setTip(tag: L2BlockTag, blockNumber: BlockNumber): Promise<void>;
+    /** Gets the block hash for a given block number. */
+    protected abstract getStoredBlockHash(blockNumber: BlockNumber): Promise<string | undefined>;
+    /** Sets the block hash for a given block number. */
+    protected abstract setBlockHash(blockNumber: BlockNumber, hash: string): Promise<void>;
+    /** Deletes all block hashes for blocks before the given block number. */
+    protected abstract deleteBlockHashesBefore(blockNumber: BlockNumber): Promise<void>;
+    /** Gets the checkpoint number for a given block number. */
+    protected abstract getCheckpointNumberForBlock(blockNumber: BlockNumber): Promise<CheckpointNumber | undefined>;
+    /** Sets the checkpoint number for a given block number. */
+    protected abstract setCheckpointNumberForBlock(blockNumber: BlockNumber, checkpointNumber: CheckpointNumber): Promise<void>;
+    /** Deletes all block-to-checkpoint mappings for blocks before the given block number. */
+    protected abstract deleteBlockToCheckpointBefore(blockNumber: BlockNumber): Promise<void>;
+    /** Gets a checkpoint by its number. */
+    protected abstract getCheckpoint(checkpointNumber: CheckpointNumber): Promise<PublishedCheckpoint | undefined>;
+    /** Saves a checkpoint. */
+    protected abstract saveCheckpointData(checkpoint: PublishedCheckpoint): Promise<void>;
+    /** Deletes all checkpoints before the given checkpoint number. */
+    protected abstract deleteCheckpointsBefore(checkpointNumber: CheckpointNumber): Promise<void>;
+    /** Runs the given function in a transaction. Memory stores can just execute immediately. */
+    protected abstract runInTransaction<T>(fn: () => Promise<T>): Promise<T>;
+    getL2BlockHash(number: BlockNumber): Promise<string | undefined>;
+    getL2Tips(): Promise<L2Tips>;
+    handleBlockStreamEvent(event: L2BlockStreamEvent): Promise<void>;
+    protected computeBlockHash(block: L2BlockNew): Promise<string>;
+    private getBlockId;
+    private getCheckpointId;
+    private handleBlocksAdded;
+    private handleChainCheckpointed;
+    private handleChainPruned;
+    private handleChainProven;
+    private handleChainFinalized;
+    private saveTag;
+    private saveCheckpoint;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdGlwc19zdG9yZV9iYXNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYmxvY2svbDJfYmxvY2tfc3RyZWFtL2wyX3RpcHNfc3RvcmVfYmFzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsV0FBVyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFaEYsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwwQ0FBMEMsQ0FBQztBQUNwRixPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNyRCxPQUFPLEVBSUwsS0FBSyxVQUFVLEVBQ2YsS0FBSyxNQUFNLEVBQ1osTUFBTSx1QkFBdUIsQ0FBQztBQUMvQixPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSx5QkFBeUIsRUFBRSw4QkFBOEIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXJIOzs7R0FHRztBQUNILDhCQUFzQixlQUFnQixZQUFXLHlCQUF5QixFQUFFLDhCQUE4QjtJQUd4Ryw2Q0FBNkM7SUFDN0MsU0FBUyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsV0FBVyxHQUFHLFNBQVMsQ0FBQyxDQUFDO0lBRTdFLDZDQUE2QztJQUM3QyxTQUFTLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsVUFBVSxFQUFFLFdBQVcsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXBGLG9EQUFvRDtJQUNwRCxTQUFTLENBQUMsUUFBUSxDQUFDLGtCQUFrQixDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsQ0FBQztJQUU3RixvREFBb0Q7SUFDcEQsU0FBUyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsV0FBVyxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUV2Rix5RUFBeUU7SUFDekUsU0FBUyxDQUFDLFFBQVEsQ0FBQyx1QkFBdUIsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUVwRiwyREFBMkQ7SUFDM0QsU0FBUyxDQUFDLFFBQVEsQ0FBQywyQkFBMkIsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsR0FBRyxTQUFTLENBQUMsQ0FBQztJQUVoSCwyREFBMkQ7SUFDM0QsU0FBUyxDQUFDLFFBQVEsQ0FBQywyQkFBMkIsQ0FDNUMsV0FBVyxFQUFFLFdBQVcsRUFDeEIsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQ2pDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUVqQix5RkFBeUY7SUFDekYsU0FBUyxDQUFDLFFBQVEsQ0FBQyw2QkFBNkIsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUUxRix1Q0FBdUM7SUFDdkMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLG1CQUFtQixHQUFHLFNBQVMsQ0FBQyxDQUFDO0lBRS9HLDBCQUEwQjtJQUMxQixTQUFTLENBQUMsUUFBUSxDQUFDLGtCQUFrQixDQUFDLFVBQVUsRUFBRSxtQkFBbUIsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFdEYsa0VBQWtFO0lBQ2xFLFNBQVMsQ0FBQyxRQUFRLENBQUMsdUJBQXVCLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRTlGLDRGQUE0RjtJQUM1RixTQUFTLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsTUFBTSxPQUFPLENBQUMsQ0FBQyxDQUFDLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBSWxFLGNBQWMsQ0FBQyxNQUFNLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRXRFO0lBRU0sU0FBUyxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FzQmxDO0lBRVksc0JBQXNCLENBQUMsS0FBSyxFQUFFLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FrQjVFO0lBR0QsU0FBUyxDQUFDLGdCQUFnQixDQUFDLEtBQUssRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUU3RDtZQUlhLFVBQVU7WUFZVixlQUFlO1lBaUJmLGlCQUFpQjtZQWFqQix1QkFBdUI7WUFVdkIsaUJBQWlCO1lBY2pCLGlCQUFpQjtZQVNqQixvQkFBb0I7WUFpQnBCLE9BQU87WUFPUCxjQUFjO0NBUzdCIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"l2_tips_store_base.d.ts","sourceRoot":"","sources":["../../../src/block/l2_block_stream/l2_tips_store_base.ts"],"names":[],"mappings":"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"}

package/dest/block/l2_block_stream/l2_tips_store_base.js

@@ -0,0 +1,179 @@
+import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/constants';
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import { GENESIS_CHECKPOINT_HEADER_HASH } from '../l2_block_source.js';
+/**
+ * Abstract base class for L2 tips stores. Provides common event handling logic
+ * while delegating storage operations to subclasses.
+ */ export class L2TipsStoreBase {
+    // Public interface implementation
+    getL2BlockHash(number) {
+        return this.getStoredBlockHash(number);
+    }
+    getL2Tips() {
+        return this.runInTransaction(async ()=>{
+            const [proposedBlockId, finalizedBlockId, provenBlockId, checkpointedBlockId] = await Promise.all([
+                this.getBlockId('proposed'),
+                this.getBlockId('finalized'),
+                this.getBlockId('proven'),
+                this.getBlockId('checkpointed')
+            ]);
+            const [finalizedCheckpointId, provenCheckpointId, checkpointedCheckpointId] = await Promise.all([
+                this.getCheckpointId('finalized'),
+                this.getCheckpointId('proven'),
+                this.getCheckpointId('checkpointed')
+            ]);
+            return {
+                proposed: proposedBlockId,
+                finalized: {
+                    block: finalizedBlockId,
+                    checkpoint: finalizedCheckpointId
+                },
+                proven: {
+                    block: provenBlockId,
+                    checkpoint: provenCheckpointId
+                },
+                checkpointed: {
+                    block: checkpointedBlockId,
+                    checkpoint: checkpointedCheckpointId
+                }
+            };
+        });
+    }
+    async handleBlockStreamEvent(event) {
+        switch(event.type){
+            case 'blocks-added':
+                await this.handleBlocksAdded(event);
+                break;
+            case 'chain-checkpointed':
+                await this.handleChainCheckpointed(event);
+                break;
+            case 'chain-pruned':
+                await this.handleChainPruned(event);
+                break;
+            case 'chain-proven':
+                await this.handleChainProven(event);
+                break;
+            case 'chain-finalized':
+                await this.handleChainFinalized(event);
+                break;
+        }
+    }
+    // Protected helper that subclasses can override for block hash computation
+    computeBlockHash(block) {
+        return block.hash().then((hash)=>hash.toString());
+    }
+    // Private implementation
+    async getBlockId(tag) {
+        const blockNumber = await this.getTip(tag);
+        if (blockNumber === undefined || blockNumber === 0) {
+            return {
+                number: BlockNumber.ZERO,
+                hash: GENESIS_BLOCK_HEADER_HASH.toString()
+            };
+        }
+        const blockHash = await this.getStoredBlockHash(blockNumber);
+        if (!blockHash) {
+            throw new Error(`Block hash not found for block number ${blockNumber}`);
+        }
+        return {
+            number: blockNumber,
+            hash: blockHash
+        };
+    }
+    async getCheckpointId(tag) {
+        const blockNumber = await this.getTip(tag);
+        if (blockNumber === undefined || blockNumber === 0) {
+            return {
+                number: CheckpointNumber.ZERO,
+                hash: GENESIS_CHECKPOINT_HEADER_HASH.toString()
+            };
+        }
+        const checkpointNumber = await this.getCheckpointNumberForBlock(blockNumber);
+        if (checkpointNumber === undefined) {
+            // No checkpoint associated with this block yet
+            return {
+                number: CheckpointNumber.ZERO,
+                hash: GENESIS_CHECKPOINT_HEADER_HASH.toString()
+            };
+        }
+        const checkpoint = await this.getCheckpoint(checkpointNumber);
+        if (!checkpoint) {
+            throw new Error(`Checkpoint not found for checkpoint number ${checkpointNumber}`);
+        }
+        return {
+            number: checkpointNumber,
+            hash: checkpoint.checkpoint.hash().toString()
+        };
+    }
+    async handleBlocksAdded(event) {
+        if (event.type !== 'blocks-added') {
+            return;
+        }
+        await this.runInTransaction(async ()=>{
+            const blocks = event.blocks;
+            for (const block of blocks){
+                await this.setBlockHash(block.number, await this.computeBlockHash(block));
+            }
+            await this.setTip('proposed', blocks.at(-1).number);
+        });
+    }
+    async handleChainCheckpointed(event) {
+        if (event.type !== 'chain-checkpointed') {
+            return;
+        }
+        await this.runInTransaction(async ()=>{
+            await this.saveTag('checkpointed', event.block);
+            await this.saveCheckpoint(event.checkpoint);
+        });
+    }
+    async handleChainPruned(event) {
+        if (event.type !== 'chain-pruned') {
+            return;
+        }
+        await this.runInTransaction(async ()=>{
+            await this.saveTag('proposed', event.block);
+            await this.saveTag('checkpointed', event.block);
+            const storeProven = await this.getBlockId('proven');
+            if (storeProven.number > event.block.number) {
+                await this.saveTag('proven', event.block);
+            }
+        });
+    }
+    async handleChainProven(event) {
+        if (event.type !== 'chain-proven') {
+            return;
+        }
+        await this.runInTransaction(async ()=>{
+            await this.saveTag('proven', event.block);
+        });
+    }
+    async handleChainFinalized(event) {
+        if (event.type !== 'chain-finalized') {
+            return;
+        }
+        await this.runInTransaction(async ()=>{
+            await this.saveTag('finalized', event.block);
+            const finalizedCheckpointNumber = await this.getCheckpointNumberForBlock(event.block.number);
+            await this.deleteBlockHashesBefore(event.block.number);
+            await this.deleteBlockToCheckpointBefore(event.block.number);
+            if (finalizedCheckpointNumber !== undefined) {
+                await this.deleteCheckpointsBefore(finalizedCheckpointNumber);
+            }
+        });
+    }
+    async saveTag(name, block) {
+        await this.setTip(name, block.number);
+        if (block.hash) {
+            await this.setBlockHash(block.number, block.hash);
+        }
+    }
+    async saveCheckpoint(publishedCheckpoint) {
+        const checkpoint = publishedCheckpoint.checkpoint;
+        const lastBlock = checkpoint.blocks.at(-1);
+        // Only store the mapping for the last block since tips only point to checkpoint boundaries
+        await Promise.all([
+            this.setCheckpointNumberForBlock(lastBlock.number, checkpoint.number),
+            this.saveCheckpointData(publishedCheckpoint)
+        ]);
+    }
+}

package/dest/block/test/l2_tips_store_test_suite.d.ts

@@ -1,3 +1,3 @@
 import type { L2TipsStore } from '../l2_block_stream/index.js';
 export declare function testL2TipsStore(makeTipsStore: () => Promise<L2TipsStore>): void;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdGlwc19zdG9yZV90ZXN0X3N1aXRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYmxvY2svdGVzdC9sMl90aXBzX3N0b3JlX3Rlc3Rfc3VpdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBU0EsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFL0Qsd0JBQWdCLGVBQWUsQ0FBQyxhQUFhLEVBQUUsTUFBTSxPQUFPLENBQUMsV0FBVyxDQUFDLFFBaUZ4RSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdGlwc19zdG9yZV90ZXN0X3N1aXRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYmxvY2svdGVzdC9sMl90aXBzX3N0b3JlX3Rlc3Rfc3VpdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBZUEsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFL0Qsd0JBQWdCLGVBQWUsQ0FBQyxhQUFhLEVBQUUsTUFBTSxPQUFPLENBQUMsV0FBVyxDQUFDLFFBNGdCeEUifQ==

package/dest/block/test/l2_tips_store_test_suite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2_tips_store_test_suite.d.ts","sourceRoot":"","sources":["../../../src/block/test/l2_tips_store_test_suite.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,QAiFxE"}
+{"version":3,"file":"l2_tips_store_test_suite.d.ts","sourceRoot":"","sources":["../../../src/block/test/l2_tips_store_test_suite.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,QA4gBxE"}