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

package/dest/block/index.d.ts

@@ -1,5 +1,5 @@
 export * from './l2_block.js';
-export * from './l2_block_downloader/index.js';
+export * from './l2_block_stream/index.js';
 export * from './in_block.js';
 export * from './body.js';
 export * from './l2_block_number.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,gCAAgC,CAAC;AAC/C,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC"}

package/dest/block/index.js

@@ -1,5 +1,5 @@
 export * from './l2_block.js';
-export * from './l2_block_downloader/index.js';
+export * from './l2_block_stream/index.js';
 export * from './in_block.js';
 export * from './body.js';
 export * from './l2_block_number.js';

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/stdlib",
-  "version": "0.84.0-nightly.20250410",
+  "version": "0.84.0-nightly.20250412",
   "type": "module",
   "inherits": [
     "../package.common.json",
@@ -39,6 +39,7 @@
     "./stats": "./dest/stats/index.js",
     "./auth-witness": "./dest/auth_witness/index.js",
     "./block": "./dest/block/index.js",
+    "./block/test": "./dest/block/test/index.js",
     "./versioning": "./dest/versioning/index.js",
     "./interfaces/client": "./dest/interfaces/client.js",
     "./interfaces/server": "./dest/interfaces/server.js",
@@ -67,11 +68,11 @@
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "dependencies": {
-    "@aztec/bb.js": "0.84.0-nightly.20250410",
-    "@aztec/blob-lib": "0.84.0-nightly.20250410",
-    "@aztec/constants": "0.84.0-nightly.20250410",
-    "@aztec/ethereum": "0.84.0-nightly.20250410",
-    "@aztec/foundation": "0.84.0-nightly.20250410",
+    "@aztec/bb.js": "0.84.0-nightly.20250412",
+    "@aztec/blob-lib": "0.84.0-nightly.20250412",
+    "@aztec/constants": "0.84.0-nightly.20250412",
+    "@aztec/ethereum": "0.84.0-nightly.20250412",
+    "@aztec/foundation": "0.84.0-nightly.20250412",
     "@google-cloud/storage": "^7.15.0",
     "lodash.chunk": "^4.2.0",
     "lodash.isequal": "^4.5.0",
@@ -84,6 +85,7 @@
     "zod": "^3.23.8"
   },
   "devDependencies": {
+    "@jest/expect": "^29.5.0",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/lodash.chunk": "^4.2.9",

package/src/block/index.ts

@@ -1,5 +1,5 @@
 export * from './l2_block.js';
-export * from './l2_block_downloader/index.js';
+export * from './l2_block_stream/index.js';
 export * from './in_block.js';
 export * from './body.js';
 export * from './l2_block_number.js';

package/src/block/l2_block_source.ts

@@ -140,6 +140,14 @@ 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 function makeL2BlockId(number: number, hash?: string): L2BlockId {
+  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/src/block/l2_block_stream/index.ts

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

package/src/block/l2_block_stream/interfaces.ts

@@ -0,0 +1,33 @@
+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;

package/src/block/{l2_block_downloader → l2_block_stream}/l2_block_stream.ts

@@ -2,8 +2,8 @@ import { AbortError } from '@aztec/foundation/error';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 
-import type { L2BlockId, L2BlockSource, L2Tips } from '../l2_block_source.js';
-import type { PublishedL2Block } from '../published_l2_block.js';
+import { type L2BlockId, type L2BlockSource, makeL2BlockId } from '../l2_block_source.js';
+import type { L2BlockStreamEvent, 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 class L2BlockStream {
@@ -21,6 +21,8 @@ export 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;
     } = {},
   ) {
     this.runningPromise = new RunningPromise(() => this.work(), log, this.opts.pollIntervalMS ?? 1000);
@@ -72,14 +74,13 @@ export class L2BlockStream {
       }
 
       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))!,
-          },
-        });
+        await this.emitEvent({ type: 'chain-pruned', block: makeL2BlockId(latestBlockNumber, hash) });
       }
 
       // If we are just starting, use the starting block number from the options.
@@ -93,17 +94,26 @@ export class L2BlockStream {
         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;
         }
         await this.emitEvent({ type: 'blocks-added', blocks });
-        latestBlockNumber = blocks.at(-1)!.block.number;
+        nextBlockNumber = blocks.at(-1)!.block.number + 1;
       }
 
       // Update the proven and finalized tips.
@@ -134,6 +144,15 @@ export class L2BlockStream {
       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) {
@@ -181,32 +200,3 @@ class BlockHashCache {
     return this.cache.get(blockNumber);
   }
 }
-
-/** 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;
-    };

package/src/block/l2_block_stream/l2_tips_memory_store.ts

@@ -0,0 +1,75 @@
+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 class L2TipsMemoryStore implements L2BlockStreamEventHandler, L2BlockStreamLocalDataProvider {
+  protected readonly l2TipsStore: Map<L2BlockTag, number> = new Map();
+  protected readonly l2BlockHashesStore: Map<number, string> = new Map();
+
+  public getL2BlockHash(number: number): Promise<string | undefined> {
+    return Promise.resolve(this.l2BlockHashesStore.get(number));
+  }
+
+  public getL2Tips(): Promise<L2Tips> {
+    return Promise.resolve({
+      latest: this.getL2Tip('latest'),
+      finalized: this.getL2Tip('finalized'),
+      proven: this.getL2Tip('proven'),
+    });
+  }
+
+  private getL2Tip(tag: L2BlockTag): L2BlockId {
+    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 };
+  }
+
+  public async handleBlockStreamEvent(event: L2BlockStreamEvent): Promise<void> {
+    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;
+    }
+  }
+
+  protected saveTag(name: L2BlockTag, block: L2BlockId) {
+    this.l2TipsStore.set(name, block.number);
+    if (block.hash) {
+      this.l2BlockHashesStore.set(block.number, block.hash);
+    }
+  }
+
+  protected computeBlockHash(block: L2Block) {
+    return block.header.hash().then(hash => hash.toString());
+  }
+}

package/src/block/test/index.ts

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

package/src/block/test/l2_tips_store_test_suite.ts

@@ -0,0 +1,87 @@
+import { times } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/fields';
+import type { L2Block, L2BlockId, PublishedL2Block } from '@aztec/stdlib/block';
+import type { BlockHeader } from '@aztec/stdlib/tx';
+
+import { jestExpect as expect } from '@jest/expect';
+
+import type { L2TipsStore } from '../l2_block_stream/index.js';
+
+export function testL2TipsStore(makeTipsStore: () => Promise<L2TipsStore>) {
+  let tipsStore: L2TipsStore;
+
+  beforeEach(async () => {
+    tipsStore = await makeTipsStore();
+  });
+
+  const makeBlock = (number: number): PublishedL2Block => ({
+    block: { number, header: { hash: () => Promise.resolve(new Fr(number)) } as BlockHeader } as L2Block,
+    l1: { blockNumber: BigInt(number), blockHash: `0x${number}`, timestamp: BigInt(number) },
+    signatures: [],
+  });
+
+  const makeBlockId = (number: number): L2BlockId => ({
+    number,
+    hash: new Fr(number).toString(),
+  });
+
+  const makeTip = (number: number) => ({ number, hash: number === 0 ? undefined : new Fr(number).toString() });
+
+  const makeTips = (latest: number, proven: number, finalized: number) => ({
+    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/block/l2_block_downloader/index.d.ts

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/block/l2_block_downloader/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC"}

package/dest/block/l2_block_downloader/index.js

@@ -1,2 +0,0 @@
-export * from './l2_block_downloader.js';
-export * from './l2_block_stream.js';

package/dest/block/l2_block_downloader/l2_block_downloader.d.ts

@@ -1,58 +0,0 @@
-import type { L2Block } from '../l2_block.js';
-import type { L2BlockSource } from '../l2_block_source.js';
-/**
- * Downloads L2 blocks from a L2BlockSource.
- * The blocks are stored in a queue and can be retrieved using the getBlocks method.
- * The queue size is limited by the maxQueueSize parameter.
- * The downloader will pause when the queue is full or when the L2BlockSource is out of blocks.
- */
-export declare class L2BlockDownloader {
-    private l2BlockSource;
-    private runningPromise?;
-    private running;
-    private from;
-    private interruptibleSleep;
-    private readonly semaphore;
-    private readonly jobQueue;
-    private readonly blockQueue;
-    private readonly proven;
-    private readonly pollIntervalMS;
-    constructor(l2BlockSource: L2BlockSource, opts: {
-        maxQueueSize: number;
-        proven?: boolean;
-        pollIntervalMS?: number;
-    });
-    /**
-     * Starts the downloader.
-     * @param from - The block number to start downloading from. Defaults to INITIAL_L2_BLOCK_NUM.
-     */
-    start(from?: number): void;
-    /**
-     * Repeatedly queries the block source and adds the received blocks to the block queue.
-     * Stops when no further blocks are received.
-     * @param targetBlockNumber - Optional block number to stop at.
-     * @param proven - Optional override of the default "proven" setting.
-     * @returns The total number of blocks added to the block queue.
-     */
-    private collectBlocks;
-    /**
-     * Stops the downloader.
-     */
-    stop(): Promise<void>;
-    /**
-     * Gets the next batch of blocks from the queue.
-     * @param timeout - optional timeout value to prevent permanent blocking
-     * @returns The next batch of blocks from the queue.
-     */
-    getBlocks(timeout?: number): Promise<L2Block[]>;
-    /**
-     * Forces an immediate request for blocks.
-     * Repeatedly queries the block source and adds the received blocks to the block queue.
-     * Stops when no further blocks are received.
-     * @param targetBlockNumber - Optional block number to stop at.
-     * @param proven - Optional override of the default "proven" setting.
-     * @returns A promise that fulfills once the poll is complete
-     */
-    pollImmediate(targetBlockNumber?: number, onlyProven?: boolean): Promise<number>;
-}
-//# sourceMappingURL=l2_block_downloader.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"l2_block_downloader.d.ts","sourceRoot":"","sources":["../../../src/block/l2_block_downloader/l2_block_downloader.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAI3D;;;;;GAKG;AACH,qBAAa,iBAAiB;IAY1B,OAAO,CAAC,aAAa;IAXvB,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAC9C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;gBAG9B,aAAa,EAAE,aAAa,EACpC,IAAI,EAAE;QACJ,YAAY,EAAE,MAAM,CAAC;QACrB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB;IAOH;;;OAGG;IACI,KAAK,CAAC,IAAI,SAAuB;IAuBxC;;;;;;OAMG;YACW,aAAa;IAiC3B;;OAEG;IACU,IAAI;IAQjB;;;;OAIG;IACU,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAc5D;;;;;;;OAOG;IACI,aAAa,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAGxF"}

package/dest/block/l2_block_downloader/l2_block_downloader.js

@@ -1,124 +0,0 @@
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
-import { createLogger } from '@aztec/foundation/log';
-import { FifoMemoryQueue, Semaphore, SerialQueue } from '@aztec/foundation/queue';
-import { InterruptibleSleep } from '@aztec/foundation/sleep';
-const log = createLogger('types:l2_block_downloader');
-/**
- * Downloads L2 blocks from a L2BlockSource.
- * The blocks are stored in a queue and can be retrieved using the getBlocks method.
- * The queue size is limited by the maxQueueSize parameter.
- * The downloader will pause when the queue is full or when the L2BlockSource is out of blocks.
- */ export class L2BlockDownloader {
-    l2BlockSource;
-    runningPromise;
-    running;
-    from;
-    interruptibleSleep;
-    semaphore;
-    jobQueue;
-    blockQueue;
-    proven;
-    pollIntervalMS;
-    constructor(l2BlockSource, opts){
-        this.l2BlockSource = l2BlockSource;
-        this.running = false;
-        this.from = 0;
-        this.interruptibleSleep = new InterruptibleSleep();
-        this.jobQueue = new SerialQueue();
-        this.blockQueue = new FifoMemoryQueue();
-        this.pollIntervalMS = opts.pollIntervalMS ?? 1000;
-        this.proven = opts.proven ?? false;
-        this.semaphore = new Semaphore(opts.maxQueueSize);
-    }
-    /**
-   * Starts the downloader.
-   * @param from - The block number to start downloading from. Defaults to INITIAL_L2_BLOCK_NUM.
-   */ start(from = INITIAL_L2_BLOCK_NUM) {
-        if (this.running) {
-            this.interruptibleSleep.interrupt();
-            return;
-        }
-        this.from = from;
-        this.running = true;
-        const fn = async ()=>{
-            while(this.running){
-                try {
-                    await this.jobQueue.put(()=>this.collectBlocks());
-                    await this.interruptibleSleep.sleep(this.pollIntervalMS);
-                } catch (err) {
-                    log.error(`Error downloading L2 block`, err);
-                    await this.interruptibleSleep.sleep(this.pollIntervalMS);
-                }
-            }
-        };
-        this.jobQueue.start();
-        this.runningPromise = fn();
-    }
-    /**
-   * Repeatedly queries the block source and adds the received blocks to the block queue.
-   * Stops when no further blocks are received.
-   * @param targetBlockNumber - Optional block number to stop at.
-   * @param proven - Optional override of the default "proven" setting.
-   * @returns The total number of blocks added to the block queue.
-   */ async collectBlocks(targetBlockNumber, onlyProven) {
-        let totalBlocks = 0;
-        while(true){
-            // If we have a target and have reached it, return
-            if (targetBlockNumber !== undefined && this.from > targetBlockNumber) {
-                log.verbose(`Reached target block number ${targetBlockNumber}`);
-                return totalBlocks;
-            }
-            // If we have a target, then request at most the number of blocks to get to it
-            const limit = targetBlockNumber !== undefined ? Math.min(targetBlockNumber - this.from + 1, 10) : 10;
-            const proven = onlyProven === undefined ? this.proven : onlyProven;
-            // Hit the archiver for blocks
-            const blocks = await this.l2BlockSource.getBlocks(this.from, limit, proven);
-            // If there are no more blocks, return
-            if (!blocks.length) {
-                return totalBlocks;
-            }
-            log.verbose(`Received ${blocks.length} blocks from archiver after querying from ${this.from} limit ${limit} (proven ${proven})`);
-            // Push new blocks into the queue and loop
-            await this.semaphore.acquire();
-            this.blockQueue.put(blocks);
-            this.from += blocks.length;
-            totalBlocks += blocks.length;
-        }
-    }
-    /**
-   * Stops the downloader.
-   */ async stop() {
-        this.running = false;
-        this.interruptibleSleep.interrupt();
-        await this.jobQueue.cancel();
-        this.blockQueue.cancel();
-        await this.runningPromise;
-    }
-    /**
-   * Gets the next batch of blocks from the queue.
-   * @param timeout - optional timeout value to prevent permanent blocking
-   * @returns The next batch of blocks from the queue.
-   */ async getBlocks(timeout) {
-        try {
-            const blocks = await this.blockQueue.get(timeout);
-            if (!blocks) {
-                return [];
-            }
-            this.semaphore.release();
-            return blocks;
-        } catch (err) {
-            // nothing to do
-            return [];
-        }
-    }
-    /**
-   * Forces an immediate request for blocks.
-   * Repeatedly queries the block source and adds the received blocks to the block queue.
-   * Stops when no further blocks are received.
-   * @param targetBlockNumber - Optional block number to stop at.
-   * @param proven - Optional override of the default "proven" setting.
-   * @returns A promise that fulfills once the poll is complete
-   */ pollImmediate(targetBlockNumber, onlyProven) {
-        return this.jobQueue.put(()=>this.collectBlocks(targetBlockNumber, onlyProven));
-    }
-}

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

@@ -1 +0,0 @@
-{"version":3,"file":"l2_block_stream.d.ts","sourceRoot":"","sources":["../../../src/block/l2_block_downloader/l2_block_stream.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,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;KACnB;IAKD,KAAK;IAKC,IAAI;IAIV,SAAS;IAIH,IAAI;cAMD,IAAI;IA+EpB;;;;OAIG;YACW,qBAAqB;IAenC,OAAO,CAAC,sBAAsB;YAOhB,SAAS;CASxB;AAsBD,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"}

package/src/block/l2_block_downloader/index.ts

@@ -1,2 +0,0 @@
-export * from './l2_block_downloader.js';
-export * from './l2_block_stream.js';

package/src/block/l2_block_downloader/l2_block_downloader.ts

@@ -1,149 +0,0 @@
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
-import { createLogger } from '@aztec/foundation/log';
-import { FifoMemoryQueue, Semaphore, SerialQueue } from '@aztec/foundation/queue';
-import { InterruptibleSleep } from '@aztec/foundation/sleep';
-
-import type { L2Block } from '../l2_block.js';
-import type { L2BlockSource } from '../l2_block_source.js';
-
-const log = createLogger('types:l2_block_downloader');
-
-/**
- * Downloads L2 blocks from a L2BlockSource.
- * The blocks are stored in a queue and can be retrieved using the getBlocks method.
- * The queue size is limited by the maxQueueSize parameter.
- * The downloader will pause when the queue is full or when the L2BlockSource is out of blocks.
- */
-export class L2BlockDownloader {
-  private runningPromise?: Promise<void>;
-  private running = false;
-  private from = 0;
-  private interruptibleSleep = new InterruptibleSleep();
-  private readonly semaphore: Semaphore;
-  private readonly jobQueue = new SerialQueue();
-  private readonly blockQueue = new FifoMemoryQueue<L2Block[]>();
-  private readonly proven: boolean;
-  private readonly pollIntervalMS: number;
-
-  constructor(
-    private l2BlockSource: L2BlockSource,
-    opts: {
-      maxQueueSize: number;
-      proven?: boolean;
-      pollIntervalMS?: number;
-    },
-  ) {
-    this.pollIntervalMS = opts.pollIntervalMS ?? 1000;
-    this.proven = opts.proven ?? false;
-    this.semaphore = new Semaphore(opts.maxQueueSize);
-  }
-
-  /**
-   * Starts the downloader.
-   * @param from - The block number to start downloading from. Defaults to INITIAL_L2_BLOCK_NUM.
-   */
-  public start(from = INITIAL_L2_BLOCK_NUM) {
-    if (this.running) {
-      this.interruptibleSleep.interrupt();
-      return;
-    }
-    this.from = from;
-    this.running = true;
-
-    const fn = async () => {
-      while (this.running) {
-        try {
-          await this.jobQueue.put(() => this.collectBlocks());
-          await this.interruptibleSleep.sleep(this.pollIntervalMS);
-        } catch (err) {
-          log.error(`Error downloading L2 block`, err);
-          await this.interruptibleSleep.sleep(this.pollIntervalMS);
-        }
-      }
-    };
-    this.jobQueue.start();
-    this.runningPromise = fn();
-  }
-
-  /**
-   * Repeatedly queries the block source and adds the received blocks to the block queue.
-   * Stops when no further blocks are received.
-   * @param targetBlockNumber - Optional block number to stop at.
-   * @param proven - Optional override of the default "proven" setting.
-   * @returns The total number of blocks added to the block queue.
-   */
-  private async collectBlocks(targetBlockNumber?: number, onlyProven?: boolean) {
-    let totalBlocks = 0;
-    while (true) {
-      // If we have a target and have reached it, return
-      if (targetBlockNumber !== undefined && this.from > targetBlockNumber) {
-        log.verbose(`Reached target block number ${targetBlockNumber}`);
-        return totalBlocks;
-      }
-
-      // If we have a target, then request at most the number of blocks to get to it
-      const limit = targetBlockNumber !== undefined ? Math.min(targetBlockNumber - this.from + 1, 10) : 10;
-      const proven = onlyProven === undefined ? this.proven : onlyProven;
-
-      // Hit the archiver for blocks
-      const blocks = await this.l2BlockSource.getBlocks(this.from, limit, proven);
-
-      // If there are no more blocks, return
-      if (!blocks.length) {
-        return totalBlocks;
-      }
-
-      log.verbose(
-        `Received ${blocks.length} blocks from archiver after querying from ${this.from} limit ${limit} (proven ${proven})`,
-      );
-
-      // Push new blocks into the queue and loop
-      await this.semaphore.acquire();
-      this.blockQueue.put(blocks);
-      this.from += blocks.length;
-      totalBlocks += blocks.length;
-    }
-  }
-
-  /**
-   * Stops the downloader.
-   */
-  public async stop() {
-    this.running = false;
-    this.interruptibleSleep.interrupt();
-    await this.jobQueue.cancel();
-    this.blockQueue.cancel();
-    await this.runningPromise;
-  }
-
-  /**
-   * Gets the next batch of blocks from the queue.
-   * @param timeout - optional timeout value to prevent permanent blocking
-   * @returns The next batch of blocks from the queue.
-   */
-  public async getBlocks(timeout?: number): Promise<L2Block[]> {
-    try {
-      const blocks = await this.blockQueue.get(timeout);
-      if (!blocks) {
-        return [];
-      }
-      this.semaphore.release();
-      return blocks;
-    } catch (err) {
-      // nothing to do
-      return [];
-    }
-  }
-
-  /**
-   * Forces an immediate request for blocks.
-   * Repeatedly queries the block source and adds the received blocks to the block queue.
-   * Stops when no further blocks are received.
-   * @param targetBlockNumber - Optional block number to stop at.
-   * @param proven - Optional override of the default "proven" setting.
-   * @returns A promise that fulfills once the poll is complete
-   */
-  public pollImmediate(targetBlockNumber?: number, onlyProven?: boolean): Promise<number> {
-    return this.jobQueue.put(() => this.collectBlocks(targetBlockNumber, onlyProven));
-  }
-}