@aztec/stdlib 0.84.0-nightly.20250409 → 0.84.0-nightly.20250412

package/dest/block/l2_block_source.d.ts

@@ -118,6 +118,8 @@ export type L2BlockTag = 'latest' | 'proven' | 'finalized';
 export type L2Tips = Record<L2BlockTag, L2BlockId>;
 /** Identifies a block by number and hash. */
 export type L2BlockId = z.infer<typeof L2BlockIdSchema>;
+/** Creates an L2 block id */
+export declare function makeL2BlockId(number: number, hash?: string): L2BlockId;
 declare const L2BlockIdSchema: z.ZodUnion<[z.ZodObject<{
     number: z.ZodLiteral<0>;
     hash: z.ZodUndefined;

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

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

package/dest/block/l2_block_source.js

@@ -1,4 +1,13 @@
 import { z } from 'zod';
+/** Creates an L2 block id */ export function makeL2BlockId(number, hash) {
+    if (number !== 0 && !hash) {
+        throw new Error(`Hash is required for non-genesis blocks (got block number ${number})`);
+    }
+    return {
+        number,
+        hash: hash
+    };
+}
 // TODO(palla/schemas): This package should know what is the block hash of the genesis block 0.
 const L2BlockIdSchema = z.union([
     z.object({

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

@@ -0,0 +1,4 @@
+export * from './interfaces.js';
+export * from './l2_block_stream.js';
+export * from './l2_tips_memory_store.js';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/block/l2_block_stream/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC"}

package/dest/block/l2_block_stream/index.js

@@ -0,0 +1,3 @@
+export * from './interfaces.js';
+export * from './l2_block_stream.js';
+export * from './l2_tips_memory_store.js';

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

@@ -0,0 +1,26 @@
+import type { L2BlockId, L2Tips } from '../l2_block_source.js';
+import type { PublishedL2Block } from '../published_l2_block.js';
+/** Interface to the local view of the chain. Implemented by world-state and l2-tips-store. */
+export interface L2BlockStreamLocalDataProvider {
+    getL2BlockHash(number: number): Promise<string | undefined>;
+    getL2Tips(): Promise<L2Tips>;
+}
+/** Interface to a handler of events emitted. */
+export interface L2BlockStreamEventHandler {
+    handleBlockStreamEvent(event: L2BlockStreamEvent): Promise<void>;
+}
+export type L2BlockStreamEvent = /** Emits blocks added to the chain. */ {
+    type: 'blocks-added';
+    blocks: PublishedL2Block[];
+} | /** Reports last correct block (new tip of the unproven chain). */ {
+    type: 'chain-pruned';
+    block: L2BlockId;
+} | /** Reports new proven block. */ {
+    type: 'chain-proven';
+    block: L2BlockId;
+} | /** Reports new finalized block (proven and finalized on L1). */ {
+    type: 'chain-finalized';
+    block: L2BlockId;
+};
+export type L2TipsStore = L2BlockStreamEventHandler & L2BlockStreamLocalDataProvider;
+//# sourceMappingURL=interfaces.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/block/l2_block_stream/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,8FAA8F;AAC9F,MAAM,WAAW,8BAA8B;IAC7C,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC5D,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9B;AAED,gDAAgD;AAChD,MAAM,WAAW,yBAAyB;IACxC,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE;AAED,MAAM,MAAM,kBAAkB,GAC1B,uCAAuC,CAAC;IACtC,IAAI,EAAE,cAAc,CAAC;IACrB,MAAM,EAAE,gBAAgB,EAAE,CAAC;CAC5B,GACD,kEAAkE,CAAC;IACjE,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,SAAS,CAAC;CAClB,GACD,gCAAgC,CAAC;IAC/B,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,SAAS,CAAC;CAClB,GACD,gEAAgE,CAAC;IAC/D,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC;AAEN,MAAM,MAAM,WAAW,GAAG,yBAAyB,GAAG,8BAA8B,CAAC"}

package/dest/block/l2_block_stream/interfaces.js

@@ -0,0 +1 @@
+export { };

package/dest/block/{l2_block_downloader → l2_block_stream}/l2_block_stream.d.ts

@@ -1,5 +1,5 @@
-import type { L2BlockId, L2BlockSource, L2Tips } from '../l2_block_source.js';
-import type { PublishedL2Block } from '../published_l2_block.js';
+import { type L2BlockSource } from '../l2_block_source.js';
+import type { L2BlockStreamEventHandler, L2BlockStreamLocalDataProvider } 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 declare class L2BlockStream {
     private l2BlockSource;
@@ -15,6 +15,8 @@ export declare class L2BlockStream {
         pollIntervalMS?: number;
         batchSize?: number;
         startingBlock?: number;
+        /** Instead of downloading all blocks, only fetch the smallest subset that results in reliable reorg detection. */
+        skipFinalized?: boolean;
     });
     start(): void;
     stop(): Promise<void>;
@@ -30,26 +32,4 @@ export declare class L2BlockStream {
     private getBlockHashFromSource;
     private emitEvent;
 }
-/** Interface to the local view of the chain. Implemented by world-state and l2-tips-store. */
-export interface L2BlockStreamLocalDataProvider {
-    getL2BlockHash(number: number): Promise<string | undefined>;
-    getL2Tips(): Promise<L2Tips>;
-}
-/** Interface to a handler of events emitted. */
-export interface L2BlockStreamEventHandler {
-    handleBlockStreamEvent(event: L2BlockStreamEvent): Promise<void>;
-}
-export type L2BlockStreamEvent = /** Emits blocks added to the chain. */ {
-    type: 'blocks-added';
-    blocks: PublishedL2Block[];
-} | /** Reports last correct block (new tip of the unproven chain). */ {
-    type: 'chain-pruned';
-    block: L2BlockId;
-} | /** Reports new proven block. */ {
-    type: 'chain-proven';
-    block: L2BlockId;
-} | /** Reports new finalized block (proven and finalized on L1). */ {
-    type: 'chain-finalized';
-    block: L2BlockId;
-};
 //# sourceMappingURL=l2_block_stream.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"l2_block_stream.d.ts","sourceRoot":"","sources":["../../../src/block/l2_block_stream/l2_block_stream.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkB,KAAK,aAAa,EAAiB,MAAM,uBAAuB,CAAC;AAC1F,OAAO,KAAK,EAAsB,yBAAyB,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAC;AAErH,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;gBAGjB,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,oBAAoB,GAAG,gBAAgB,GAAG,WAAW,CAAC,EACzF,SAAS,EAAE,8BAA8B,EACzC,OAAO,EAAE,yBAAyB,EACzB,GAAG,yCAAqC,EACjD,IAAI,GAAE;QACZ,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,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;KACpB;IAKD,KAAK;IAKC,IAAI;IAIV,SAAS;IAIH,IAAI;cAMD,IAAI;IAuFpB;;;;OAIG;YACW,qBAAqB;IAwBnC,OAAO,CAAC,sBAAsB;YAOhB,SAAS;CASxB"}

package/dest/block/{l2_block_downloader → l2_block_stream}/l2_block_stream.js

@@ -1,6 +1,7 @@
 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';
 /** 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;
@@ -64,13 +65,15 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
                 latestBlockNumber--;
             }
             if (latestBlockNumber < localTips.latest.number) {
+                latestBlockNumber = Math.min(latestBlockNumber, sourceTips.latest.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}.`);
                 await this.emitEvent({
                     type: 'chain-pruned',
-                    block: {
-                        number: latestBlockNumber,
-                        hash: sourceCache.get(latestBlockNumber) ?? await this.getBlockHashFromSource(latestBlockNumber)
-                    }
+                    block: makeL2BlockId(latestBlockNumber, hash)
                 });
             }
             // If we are just starting, use the starting block number from the options.
@@ -82,12 +85,20 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
                 this.log.verbose(`Starting sync from block number ${latestBlockNumber}`);
                 this.hasStarted = true;
             }
+            let nextBlockNumber = latestBlockNumber + 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);
+            }
             // Request new blocks from the source.
-            while(latestBlockNumber < sourceTips.latest.number){
-                const from = latestBlockNumber + 1;
-                const limit = Math.min(this.opts.batchSize ?? 20, sourceTips.latest.number - from + 1);
-                this.log.trace(`Requesting blocks from ${from} limit ${limit} proven=${this.opts.proven}`);
-                const blocks = await this.l2BlockSource.getPublishedBlocks(from, limit, this.opts.proven);
+            while(nextBlockNumber <= sourceTips.latest.number){
+                const limit = Math.min(this.opts.batchSize ?? 20, sourceTips.latest.number - nextBlockNumber + 1);
+                this.log.trace(`Requesting blocks from ${nextBlockNumber} limit ${limit} proven=${this.opts.proven}`);
+                const blocks = await this.l2BlockSource.getPublishedBlocks(nextBlockNumber, limit, this.opts.proven);
                 if (blocks.length === 0) {
                     break;
                 }
@@ -95,7 +106,7 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
                     type: 'blocks-added',
                     blocks
                 });
-                latestBlockNumber = blocks.at(-1).block.number;
+                nextBlockNumber = blocks.at(-1).block.number + 1;
             }
             // Update the proven and finalized tips.
             if (localTips.proven !== undefined && sourceTips.proven.number !== localTips.proven.number) {
@@ -126,6 +137,14 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
             return true;
         }
         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
+            // to go all the way back to the genesis block to find a block in which we agree with the source (since we've
+            // potentially skipped all history). This means that stores that prune old blocks must be careful to leave no gaps
+            // when going back from latest block to the last finalized one.
+            this.log.error(`No local block hash for block number ${blockNumber}`);
+            throw new AbortError();
+        }
         const sourceBlockHashFromCache = args.sourceCache.get(blockNumber);
         const sourceBlockHash = args.sourceCache.get(blockNumber) ?? await this.getBlockHashFromSource(blockNumber);
         if (!sourceBlockHashFromCache && sourceBlockHash) {

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

@@ -0,0 +1,18 @@
+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';
+/**
+ * Stores currently synced L2 tips and unfinalized block hashes.
+ * @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, number>;
+    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}`>;
+}
+//# sourceMappingURL=l2_tips_memory_store.d.ts.map

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

@@ -0,0 +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,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,MAAM,CAAC,CAAa;IACpE,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;IAI3D,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAQnC,OAAO,CAAC,QAAQ;IAaH,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B7E,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS;IAOpD,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO;CAG1C"}

package/dest/block/l2_block_stream/l2_tips_memory_store.js

@@ -0,0 +1,70 @@
+/**
+ * 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));
+    }
+    getL2Tips() {
+        return Promise.resolve({
+            latest: this.getL2Tip('latest'),
+            finalized: this.getL2Tip('finalized'),
+            proven: this.getL2Tip('proven')
+        });
+    }
+    getL2Tip(tag) {
+        const blockNumber = this.l2TipsStore.get(tag);
+        if (blockNumber === undefined || blockNumber === 0) {
+            return {
+                number: 0,
+                hash: undefined
+            };
+        }
+        const blockHash = this.l2BlockHashesStore.get(blockNumber);
+        if (!blockHash) {
+            throw new Error(`Block hash not found for block number ${blockNumber}`);
+        }
+        return {
+            number: blockNumber,
+            hash: blockHash
+        };
+    }
+    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;
+        }
+    }
+    saveTag(name, block) {
+        this.l2TipsStore.set(name, block.number);
+        if (block.hash) {
+            this.l2BlockHashesStore.set(block.number, block.hash);
+        }
+    }
+    computeBlockHash(block) {
+        return block.header.hash().then((hash)=>hash.toString());
+    }
+}

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

@@ -0,0 +1,2 @@
+export * from './l2_tips_store_test_suite.js';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/block/test/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC"}

package/dest/block/test/index.js

@@ -0,0 +1 @@
+export * from './l2_tips_store_test_suite.js';

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

@@ -0,0 +1,3 @@
+import type { L2TipsStore } from '../l2_block_stream/index.js';
+export declare function testL2TipsStore(makeTipsStore: () => Promise<L2TipsStore>): void;
+//# sourceMappingURL=l2_tips_store_test_suite.d.ts.map

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

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

package/dest/block/test/l2_tips_store_test_suite.js

@@ -0,0 +1,107 @@
+import { times } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/fields';
+import { jestExpect as expect } from '@jest/expect';
+export function testL2TipsStore(makeTipsStore) {
+    let tipsStore;
+    beforeEach(async ()=>{
+        tipsStore = await makeTipsStore();
+    });
+    const makeBlock = (number)=>({
+            block: {
+                number,
+                header: {
+                    hash: ()=>Promise.resolve(new Fr(number))
+                }
+            },
+            l1: {
+                blockNumber: BigInt(number),
+                blockHash: `0x${number}`,
+                timestamp: BigInt(number)
+            },
+            signatures: []
+        });
+    const makeBlockId = (number)=>({
+            number,
+            hash: new Fr(number).toString()
+        });
+    const makeTip = (number)=>({
+            number,
+            hash: number === 0 ? undefined : new Fr(number).toString()
+        });
+    const makeTips = (latest, proven, finalized)=>({
+            latest: makeTip(latest),
+            proven: makeTip(proven),
+            finalized: makeTip(finalized)
+        });
+    it('returns zero if no tips are stored', async ()=>{
+        const tips = await tipsStore.getL2Tips();
+        expect(tips).toEqual(makeTips(0, 0, 0));
+    });
+    it('stores chain tips', async ()=>{
+        await tipsStore.handleBlockStreamEvent({
+            type: 'blocks-added',
+            blocks: times(20, (i)=>makeBlock(i + 1))
+        });
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-finalized',
+            block: makeBlockId(5)
+        });
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-proven',
+            block: makeBlockId(8)
+        });
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-pruned',
+            block: makeBlockId(10)
+        });
+        const tips = await tipsStore.getL2Tips();
+        expect(tips).toEqual(makeTips(10, 8, 5));
+    });
+    it('sets latest tip from blocks added', async ()=>{
+        await tipsStore.handleBlockStreamEvent({
+            type: 'blocks-added',
+            blocks: times(3, (i)=>makeBlock(i + 1))
+        });
+        const tips = await tipsStore.getL2Tips();
+        expect(tips).toEqual(makeTips(3, 0, 0));
+        expect(await tipsStore.getL2BlockHash(1)).toEqual(new Fr(1).toString());
+        expect(await tipsStore.getL2BlockHash(2)).toEqual(new Fr(2).toString());
+        expect(await tipsStore.getL2BlockHash(3)).toEqual(new Fr(3).toString());
+    });
+    it('clears block hashes when setting finalized chain', async ()=>{
+        await tipsStore.handleBlockStreamEvent({
+            type: 'blocks-added',
+            blocks: times(5, (i)=>makeBlock(i + 1))
+        });
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-proven',
+            block: makeBlockId(3)
+        });
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-finalized',
+            block: makeBlockId(3)
+        });
+        const tips = await tipsStore.getL2Tips();
+        expect(tips).toEqual(makeTips(5, 3, 3));
+        expect(await tipsStore.getL2BlockHash(1)).toBeUndefined();
+        expect(await tipsStore.getL2BlockHash(2)).toBeUndefined();
+        expect(await tipsStore.getL2BlockHash(3)).toEqual(new Fr(3).toString());
+        expect(await tipsStore.getL2BlockHash(4)).toEqual(new Fr(4).toString());
+        expect(await tipsStore.getL2BlockHash(5)).toEqual(new Fr(5).toString());
+    });
+    // Regression test for #13142
+    it('does not blow up when setting proven chain on an unseen block number', async ()=>{
+        await tipsStore.handleBlockStreamEvent({
+            type: 'blocks-added',
+            blocks: [
+                makeBlock(5)
+            ]
+        });
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-proven',
+            block: makeBlockId(3)
+        });
+        const tips = await tipsStore.getL2Tips();
+        expect(tips).toEqual(makeTips(5, 3, 0));
+    });
+}

package/dest/database-version/version_manager.d.ts

@@ -3,6 +3,7 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { type Logger } from '@aztec/foundation/log';
 import fs from 'fs/promises';
 import { inspect } from 'node:util';
 import { z } from 'zod';
@@ -10,9 +11,15 @@ import { z } from 'zod';
  * Represents a version record for storing in a version file.
  */
 export declare class DatabaseVersion {
+    /** The version of the data on disk. Used to perform upgrades */
     readonly schemaVersion: number;
+    /** The rollup the data pertains to */
     readonly rollupAddress: EthAddress;
-    constructor(schemaVersion: number, rollupAddress: EthAddress);
+    constructor(
+    /** The version of the data on disk. Used to perform upgrades */
+    schemaVersion: number, 
+    /** The rollup the data pertains to */
+    rollupAddress: EthAddress);
     toBuffer(): Buffer;
     static fromBuffer(buf: Buffer): DatabaseVersion;
     /**
@@ -49,20 +56,29 @@ export declare class DatabaseVersion {
 }
 export type DatabaseVersionManagerFs = Pick<typeof fs, 'readFile' | 'writeFile' | 'rm' | 'mkdir'>;
 export declare const DATABASE_VERSION_FILE_NAME = "db_version";
+export type DatabaseVersionManagerOptions<T> = {
+    schemaVersion: number;
+    rollupAddress: EthAddress;
+    dataDirectory: string;
+    onOpen: (dataDir: string) => Promise<T>;
+    onUpgrade?: (dataDir: string, currentVersion: number, latestVersion: number) => Promise<void>;
+    fileSystem?: DatabaseVersionManagerFs;
+    log?: Logger;
+};
 /**
  * A manager for handling database versioning and migrations.
  * This class will check the version of data in a directory and either
  * reset or upgrade based on version compatibility.
  */
 export declare class DatabaseVersionManager<T> {
+    static readonly VERSION_FILE = "db_version";
+    private readonly versionFile;
+    private readonly currentVersion;
     private dataDirectory;
     private onOpen;
     private onUpgrade?;
     private fileSystem;
     private log;
-    static readonly VERSION_FILE = "db_version";
-    private readonly versionFile;
-    private readonly currentVersion;
     /**
      * Create a new version manager
      *
@@ -75,7 +91,7 @@ export declare class DatabaseVersionManager<T> {
      * @param log - Optional custom logger
      * @param options - Configuration options
      */
-    constructor(schemaVersion: number, rollupAddress: EthAddress, dataDirectory: string, onOpen: (dataDir: string) => Promise<T>, onUpgrade?: ((dataDir: string, currentVersion: number, latestVersion: number) => Promise<void>) | undefined, fileSystem?: DatabaseVersionManagerFs, log?: import("@aztec/foundation/log").Logger);
+    constructor({ schemaVersion, rollupAddress, dataDirectory, onOpen, onUpgrade, fileSystem, log, }: DatabaseVersionManagerOptions<T>);
     static writeVersion(version: DatabaseVersion, dataDir: string, fileSystem?: DatabaseVersionManagerFs): Promise<void>;
     /**
      * Checks the stored version against the current version and handles the outcome

package/dest/database-version/version_manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version_manager.d.ts","sourceRoot":"","sources":["../../src/database-version/version_manager.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAI3D,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,qBAAa,eAAe;aACE,aAAa,EAAE,MAAM;aAAkB,aAAa,EAAE,UAAU;gBAAhE,aAAa,EAAE,MAAM,EAAkB,aAAa,EAAE,UAAU;IAErF,QAAQ,IAAI,MAAM;WAIX,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe;IAQtD;;OAEG;IACI,GAAG,CAAC,KAAK,EAAE,eAAe,GAAG,SAAS,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;IAa1D;;OAEG;IACI,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO;IAI9C;;OAEG;IACH,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,uCAAuC;IAChC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM;IAI1B,QAAQ,IAAI,MAAM;IAIzB;;OAEG;IACH,MAAM,CAAC,KAAK;CAGb;AAED,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC;AAElG,eAAO,MAAM,0BAA0B,eAAe,CAAC;AAEvD;;;;GAIG;AACH,qBAAa,sBAAsB,CAAC,CAAC;IAqBjC,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,SAAS,CAAC;IAClB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,GAAG;IAxBb,gBAAuB,YAAY,gBAA8B;IAEjE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkB;IAEjD;;;;;;;;;;;OAWG;gBAED,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,UAAU,EACjB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EACvC,SAAS,CAAC,aAAY,MAAM,kBAAkB,MAAM,iBAAiB,MAAM,KAAK,QAAQ,IAAI,CAAC,aAAA,EAC7F,UAAU,GAAE,wBAA6B,EACzC,GAAG,yCAA6C;WAU7C,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,GAAE,wBAA6B;IAK9G;;;;;;;OAOG;IACU,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAmD1C;;OAEG;IACI,YAAY,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD;;OAEG;IACU,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhD;;OAEG;IACI,gBAAgB,IAAI,MAAM;IAIjC;;OAEG;IACI,gBAAgB,IAAI,MAAM;CAGlC"}
+{"version":3,"file":"version_manager.d.ts","sourceRoot":"","sources":["../../src/database-version/version_manager.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,qBAAa,eAAe;IAExB,gEAAgE;aAChD,aAAa,EAAE,MAAM;IACrC,sCAAsC;aACtB,aAAa,EAAE,UAAU;;IAHzC,gEAAgE;IAChD,aAAa,EAAE,MAAM;IACrC,sCAAsC;IACtB,aAAa,EAAE,UAAU;IAGpC,QAAQ,IAAI,MAAM;WAIX,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe;IAQtD;;OAEG;IACI,GAAG,CAAC,KAAK,EAAE,eAAe,GAAG,SAAS,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;IAa1D;;OAEG;IACI,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO;IAI9C;;OAEG;IACH,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,uCAAuC;IAChC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM;IAI1B,QAAQ,IAAI,MAAM;IAIzB;;OAEG;IACH,MAAM,CAAC,KAAK;CAGb;AAED,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC;AAElG,eAAO,MAAM,0BAA0B,eAAe,CAAC;AAEvD,MAAM,MAAM,6BAA6B,CAAC,CAAC,IAAI;IAC7C,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,UAAU,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACxC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9F,UAAU,CAAC,EAAE,wBAAwB,CAAC;IACtC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;;;GAIG;AACH,qBAAa,sBAAsB,CAAC,CAAC;IACnC,gBAAuB,YAAY,gBAA8B;IAEjE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkB;IAEjD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAkC;IAChD,OAAO,CAAC,SAAS,CAAC,CAAoF;IACtG,OAAO,CAAC,UAAU,CAA2B;IAC7C,OAAO,CAAC,GAAG,CAAS;IAEpB;;;;;;;;;;;OAWG;gBACS,EACV,aAAa,EACb,aAAa,EACb,aAAa,EACb,MAAM,EACN,SAAS,EACT,UAAe,EACf,GAAgD,GACjD,EAAE,6BAA6B,CAAC,CAAC,CAAC;WAetB,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,GAAE,wBAA6B;IAK9G;;;;;;;OAOG;IACU,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IA+D1C;;OAEG;IACI,YAAY,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD;;OAEG;IACU,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhD;;OAEG;IACI,gBAAgB,IAAI,MAAM;IAIjC;;OAEG;IACI,gBAAgB,IAAI,MAAM;CAGlC"}

package/dest/database-version/version_manager.js

@@ -10,7 +10,7 @@ import { z } from 'zod';
  */ export class DatabaseVersion {
     schemaVersion;
     rollupAddress;
-    constructor(schemaVersion, rollupAddress){
+    constructor(/** The version of the data on disk. Used to perform upgrades */ schemaVersion, /** The rollup the data pertains to */ rollupAddress){
         this.schemaVersion = schemaVersion;
         this.rollupAddress = rollupAddress;
     }
@@ -57,7 +57,7 @@ import { z } from 'zod';
         return this.toString();
     }
     toString() {
-        return this.schemaVersion.toString();
+        return `DatabaseVersion{schemaVersion=${this.schemaVersion},rollupAddress=${this.rollupAddress}"}`;
     }
     /**
    * Returns an empty instance
@@ -71,14 +71,14 @@ export const DATABASE_VERSION_FILE_NAME = 'db_version';
  * This class will check the version of data in a directory and either
  * reset or upgrade based on version compatibility.
  */ export class DatabaseVersionManager {
+    static VERSION_FILE = DATABASE_VERSION_FILE_NAME;
+    versionFile;
+    currentVersion;
     dataDirectory;
     onOpen;
     onUpgrade;
     fileSystem;
     log;
-    static VERSION_FILE = DATABASE_VERSION_FILE_NAME;
-    versionFile;
-    currentVersion;
     /**
    * Create a new version manager
    *
@@ -90,17 +90,17 @@ export const DATABASE_VERSION_FILE_NAME = 'db_version';
    * @param fileSystem - An interface to access the filesystem
    * @param log - Optional custom logger
    * @param options - Configuration options
-   */ constructor(schemaVersion, rollupAddress, dataDirectory, onOpen, onUpgrade, fileSystem = fs, log = createLogger(`foundation:version-manager`)){
+   */ constructor({ schemaVersion, rollupAddress, dataDirectory, onOpen, onUpgrade, fileSystem = fs, log = createLogger(`foundation:version-manager`) }){
+        if (schemaVersion < 1) {
+            throw new TypeError(`Invalid schema version received: ${schemaVersion}`);
+        }
+        this.versionFile = join(dataDirectory, DatabaseVersionManager.VERSION_FILE);
+        this.currentVersion = new DatabaseVersion(schemaVersion, rollupAddress);
         this.dataDirectory = dataDirectory;
         this.onOpen = onOpen;
         this.onUpgrade = onUpgrade;
         this.fileSystem = fileSystem;
         this.log = log;
-        if (schemaVersion < 1) {
-            throw new TypeError(`Invalid schema version received: ${schemaVersion}`);
-        }
-        this.versionFile = join(this.dataDirectory, DatabaseVersionManager.VERSION_FILE);
-        this.currentVersion = new DatabaseVersion(schemaVersion, rollupAddress);
     }
     static async writeVersion(version, dataDir, fileSystem = fs) {
         await fileSystem.mkdir(dataDir, {
@@ -118,12 +118,16 @@ export const DATABASE_VERSION_FILE_NAME = 'db_version';
    */ async open() {
         // const storedVersion = await DatabaseVersion.readVersion(this.versionFile);
         let storedVersion;
+        // a flag to suppress logs about 'resetting the data dir' when starting from an empty state
+        let shouldLogDataReset = true;
         try {
             const versionBuf = await this.fileSystem.readFile(this.versionFile);
             storedVersion = DatabaseVersion.fromBuffer(versionBuf);
         } catch (err) {
             if (err && err.code === 'ENOENT') {
                 storedVersion = DatabaseVersion.empty();
+                // only turn off these logs if the data dir didn't exist before
+                shouldLogDataReset = false;
             } else {
                 this.log.warn(`Failed to read stored version information: ${err}. Defaulting to empty version`);
                 storedVersion = DatabaseVersion.empty();
@@ -142,13 +146,19 @@ export const DATABASE_VERSION_FILE_NAME = 'db_version';
                     needsReset = true;
                 }
             } else if (cmp !== 0) {
-                this.log.info(`Can't upgrade from version ${storedVersion.schemaVersion} to ${this.currentVersion.schemaVersion}. Resetting database at ${this.dataDirectory}`);
+                if (shouldLogDataReset) {
+                    this.log.info(`Can't upgrade from version ${storedVersion} to ${this.currentVersion}. Resetting database at ${this.dataDirectory}`);
+                }
                 needsReset = true;
             }
         } else {
-            this.log.warn('Rollup address changed, resetting data directory', {
-                versionFile: this.versionFile
-            });
+            if (shouldLogDataReset) {
+                this.log.warn('Rollup address has changed, resetting data directory', {
+                    versionFile: this.versionFile,
+                    storedVersion,
+                    currentVersion: this.currentVersion
+                });
+            }
             needsReset = true;
         }
         // Handle reset if needed