@aztec/stdlib 0.0.0-test.1 → 0.0.1-fake-ceab37513c

package/dest/block/l2_block_source.d.ts

@@ -1,14 +1,15 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import type { EventEmitter } from 'events';
+import type { Fr } from '@aztec/foundation/fields';
+import type { TypedEventEmitter } from '@aztec/foundation/types';
 import { z } from 'zod';
 import type { L1RollupConstants } from '../epoch-helpers/index.js';
 import type { BlockHeader } from '../tx/block_header.js';
-import type { TxEffect } from '../tx/tx_effect.js';
+import type { IndexedTxEffect } from '../tx/indexed_tx_effect.js';
 import type { TxHash } from '../tx/tx_hash.js';
 import type { TxReceipt } from '../tx/tx_receipt.js';
-import type { InBlock } from './in_block.js';
 import type { L2Block } from './l2_block.js';
+import { PublishedL2Block } from './published_l2_block.js';
+import type { ValidateBlockNegativeResult, ValidateBlockResult } from './validate_block_result.js';
 /**
  * Interface of classes allowing for the retrieval of L2 blocks.
  */
@@ -53,12 +54,38 @@ export interface L2BlockSource {
      * @returns The requested L2 blocks.
      */
     getBlocks(from: number, limit: number, proven?: boolean): Promise<L2Block[]>;
+    /** Equivalent to getBlocks but includes publish data. */
+    getPublishedBlocks(from: number, limit: number, proven?: boolean): Promise<PublishedL2Block[]>;
+    /**
+     * Gets a published block by its hash.
+     * @param blockHash - The block hash to retrieve.
+     * @returns The requested published block (or undefined if not found).
+     */
+    getPublishedBlockByHash(blockHash: Fr): Promise<PublishedL2Block | undefined>;
+    /**
+     * Gets a published block by its archive root.
+     * @param archive - The archive root to retrieve.
+     * @returns The requested published block (or undefined if not found).
+     */
+    getPublishedBlockByArchive(archive: Fr): Promise<PublishedL2Block | undefined>;
+    /**
+     * Gets a block header by its hash.
+     * @param blockHash - The block hash to retrieve.
+     * @returns The requested block header (or undefined if not found).
+     */
+    getBlockHeaderByHash(blockHash: Fr): Promise<BlockHeader | undefined>;
+    /**
+     * Gets a block header by its archive root.
+     * @param archive - The archive root to retrieve.
+     * @returns The requested block header (or undefined if not found).
+     */
+    getBlockHeaderByArchive(archive: Fr): Promise<BlockHeader | undefined>;
     /**
      * Gets a tx effect.
-     * @param txHash - The hash of a transaction which resulted in the returned tx effect.
-     * @returns The requested tx effect.
+     * @param txHash - The hash of the tx corresponding to the tx effect.
+     * @returns The requested tx effect with block info (or undefined if not found).
      */
-    getTxEffect(txHash: TxHash): Promise<InBlock<TxEffect> | undefined>;
+    getTxEffect(txHash: TxHash): Promise<IndexedTxEffect | undefined>;
     /**
      * Gets a receipt of a settled tx.
      * @param txHash - The hash of a tx we try to get the receipt for.
@@ -66,19 +93,25 @@ export interface L2BlockSource {
      */
     getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined>;
     /**
-     * Returns the current L2 slot number based on the current L1 timestamp.
+     * Returns the current L2 slot number based on the currently synced L1 timestamp.
      */
-    getL2SlotNumber(): Promise<bigint>;
+    getL2SlotNumber(): Promise<bigint | undefined>;
     /**
-     * Returns the current L2 epoch number based on the current L1 timestamp.
+     * Returns the current L2 epoch number based on the currently synced L1 timestamp.
      */
-    getL2EpochNumber(): Promise<bigint>;
+    getL2EpochNumber(): Promise<bigint | undefined>;
     /**
      * Returns all blocks for a given epoch.
      * @dev Use this method only with recent epochs, since it walks the block list backwards.
      * @param epochNumber - The epoch number to return blocks for.
      */
     getBlocksForEpoch(epochNumber: bigint): Promise<L2Block[]>;
+    /**
+     * Returns all block headers for a given epoch.
+     * @dev Use this method only with recent epochs, since it walks the block list backwards.
+     * @param epochNumber - The epoch number to return headers for.
+     */
+    getBlockHeadersForEpoch(epochNumber: bigint): Promise<BlockHeader[]>;
     /**
      * Returns whether the given epoch is completed on L1, based on the current L1 and L2 block numbers.
      * @param epochNumber - The epoch number to check.
@@ -92,12 +125,35 @@ export interface L2BlockSource {
      * Returns the rollup constants for the current chain.
      */
     getL1Constants(): Promise<L1RollupConstants>;
+    /** Returns values for the genesis block */
+    getGenesisValues(): Promise<{
+        genesisArchiveRoot: Fr;
+    }>;
+    /** Latest synced L1 timestamp. */
+    getL1Timestamp(): Promise<bigint | undefined>;
+    /**
+     * Returns whether the latest block in the pending chain on L1 is invalid (ie its attestations are incorrect).
+     * Note that invalid blocks do not get synced, so the latest block returned by the block source is always a valid one.
+     */
+    isPendingChainInvalid(): Promise<boolean>;
+    /**
+     * Returns the status of the pending chain validation. If the chain is invalid, reports the earliest consecutive block
+     * that is invalid, along with the reason for being invalid, which can be used to trigger an invalidation.
+     */
+    getPendingChainValidationStatus(): Promise<ValidateBlockResult>;
+    /** Force a sync. */
+    syncImmediate(): Promise<void>;
 }
 /**
  * L2BlockSource that emits events upon pending / proven chain changes.
  * see L2BlockSourceEvents for the events emitted.
  */
-export interface L2BlockSourceEventEmitter extends L2BlockSource, EventEmitter {
+export type ArchiverEmitter = TypedEventEmitter<{
+    [L2BlockSourceEvents.L2PruneDetected]: (args: L2BlockPruneEvent) => void;
+    [L2BlockSourceEvents.L2BlockProven]: (args: L2BlockProvenEvent) => void;
+    [L2BlockSourceEvents.InvalidAttestationsBlockDetected]: (args: InvalidBlockDetectedEvent) => void;
+}>;
+export interface L2BlockSourceEventEmitter extends L2BlockSource, ArchiverEmitter {
 }
 /**
  * Identifier for L2 block tags.
@@ -110,6 +166,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;
@@ -233,13 +291,24 @@ export declare const L2TipsSchema: z.ZodObject<{
     };
 }>;
 export declare enum L2BlockSourceEvents {
-    L2PruneDetected = "l2PruneDetected"
+    L2PruneDetected = "l2PruneDetected",
+    L2BlockProven = "l2BlockProven",
+    InvalidAttestationsBlockDetected = "invalidBlockDetected"
 }
-export type L2BlockSourceEvent = {
-    type: 'l2PruneDetected';
+export type L2BlockProvenEvent = {
+    type: 'l2BlockProven';
     blockNumber: bigint;
     slotNumber: bigint;
     epochNumber: bigint;
 };
+export type L2BlockPruneEvent = {
+    type: 'l2PruneDetected';
+    epochNumber: bigint;
+    blocks: L2Block[];
+};
+export type InvalidBlockDetectedEvent = {
+    type: 'invalidBlockDetected';
+    validationResult: ValidateBlockNegativeResult;
+};
 export {};
 //# sourceMappingURL=l2_block_source.d.ts.map

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({
@@ -17,5 +26,7 @@ export const L2TipsSchema = z.object({
 });
 export var L2BlockSourceEvents = /*#__PURE__*/ function(L2BlockSourceEvents) {
     L2BlockSourceEvents["L2PruneDetected"] = "l2PruneDetected";
+    L2BlockSourceEvents["L2BlockProven"] = "l2BlockProven";
+    L2BlockSourceEvents["InvalidAttestationsBlockDetected"] = "invalidBlockDetected";
     return L2BlockSourceEvents;
 }({});

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/l2_block_stream.d.ts

@@ -0,0 +1,35 @@
+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;
+    private localData;
+    private handler;
+    private readonly log;
+    private opts;
+    private readonly runningPromise;
+    private isSyncing;
+    private hasStarted;
+    constructor(l2BlockSource: Pick<L2BlockSource, 'getPublishedBlocks' | 'getBlockHeader' | 'getL2Tips'>, localData: L2BlockStreamLocalDataProvider, handler: L2BlockStreamEventHandler, log?: import("@aztec/foundation/log").Logger, opts?: {
+        proven?: boolean;
+        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>;
+    isRunning(): boolean;
+    sync(): Promise<void>;
+    protected work(): Promise<void>;
+    /**
+     * Returns whether the source and local agree on the block hash at a given height.
+     * @param blockNumber - The block number to test.
+     * @param args - A cache of data already requested from source, to avoid re-requesting it.
+     */
+    private areBlockHashesEqualAt;
+    private getBlockHashFromSource;
+    private emitEvent;
+}
+//# 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;
@@ -9,6 +10,7 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
     opts;
     runningPromise;
     isSyncing;
+    hasStarted;
     constructor(l2BlockSource, localData, handler, log = createLogger('types:block_stream'), opts = {}){
         this.l2BlockSource = l2BlockSource;
         this.localData = localData;
@@ -16,6 +18,7 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
         this.log = log;
         this.opts = opts;
         this.isSyncing = false;
+        this.hasStarted = false;
         this.runningPromise = new RunningPromise(()=>this.work(), log, this.opts.pollIntervalMS ?? 1000);
     }
     start() {
@@ -53,31 +56,49 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
             });
             // Check if there was a reorg and emit a chain-pruned event if so.
             let latestBlockNumber = localTips.latest.number;
+            const sourceCache = new BlockHashCache([
+                sourceTips.latest
+            ]);
             while(!await this.areBlockHashesEqualAt(latestBlockNumber, {
-                sourceCache: [
-                    sourceTips.latest
-                ]
+                sourceCache
             })){
                 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',
-                    blockNumber: latestBlockNumber
+                    block: makeL2BlockId(latestBlockNumber, hash)
                 });
             }
             // If we are just starting, use the starting block number from the options.
             if (latestBlockNumber === 0 && this.opts.startingBlock !== undefined) {
                 latestBlockNumber = Math.max(this.opts.startingBlock - 1, 0);
+            }
+            // Only log this entry once (for sanity)
+            if (!this.hasStarted) {
                 this.log.verbose(`Starting sync from block number ${latestBlockNumber}`);
+                this.hasStarted = true;
+            }
+            let nextBlockNumber = latestBlockNumber + 1;
+            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.getBlocks(from, limit, this.opts.proven);
+            while(nextBlockNumber <= sourceTips.latest.number){
+                const limit = Math.min(this.opts.batchSize ?? 50, 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;
                 }
@@ -85,21 +106,19 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
                     type: 'blocks-added',
                     blocks
                 });
-                latestBlockNumber = blocks.at(-1).number;
+                nextBlockNumber = blocks.at(-1).block.number + 1;
             }
             // Update the proven and finalized tips.
-            // TODO(palla/reorg): Should we emit this before passing the new blocks? This would allow world-state to skip
-            // building the data structures for the pending chain if it's unneeded.
             if (localTips.proven !== undefined && sourceTips.proven.number !== localTips.proven.number) {
                 await this.emitEvent({
                     type: 'chain-proven',
-                    blockNumber: sourceTips.proven.number
+                    block: sourceTips.proven
                 });
             }
             if (localTips.finalized !== undefined && sourceTips.finalized.number !== localTips.finalized.number) {
                 await this.emitEvent({
                     type: 'chain-finalized',
-                    blockNumber: sourceTips.finalized.number
+                    block: sourceTips.finalized
                 });
             }
         } catch (err) {
@@ -118,20 +137,52 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
             return true;
         }
         const localBlockHash = await this.localData.getL2BlockHash(blockNumber);
-        const sourceBlockHash = args.sourceCache.find((id)=>id.number === blockNumber && id.hash)?.hash ?? await this.l2BlockSource.getBlockHeader(blockNumber).then((h)=>h?.hash()).then((hash)=>hash?.toString());
+        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) {
+            args.sourceCache.add({
+                number: blockNumber,
+                hash: sourceBlockHash
+            });
+        }
         this.log.trace(`Comparing block hashes for block ${blockNumber}`, {
             localBlockHash,
-            sourceBlockHash,
-            sourceCacheNumber: args.sourceCache[0]?.number,
-            sourceCacheHash: args.sourceCache[0]?.hash
+            sourceBlockHash
         });
         return localBlockHash === sourceBlockHash;
     }
+    getBlockHashFromSource(blockNumber) {
+        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.blockNumber})`);
+        this.log.debug(`Emitting ${event.type} (${event.type === 'blocks-added' ? event.blocks.length : event.block.number})`);
         await this.handler.handleBlockStreamEvent(event);
         if (!this.isRunning() && !this.isSyncing) {
             throw new AbortError();
         }
     }
 }
+class BlockHashCache {
+    cache = new Map();
+    constructor(initial = []){
+        for (const block of initial){
+            this.add(block);
+        }
+    }
+    add(block) {
+        if (block.hash) {
+            this.cache.set(block.number, block.hash);
+        }
+    }
+    get(blockNumber) {
+        return this.cache.get(blockNumber);
+    }
+}

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/proposal/attestations_and_signers.d.ts

@@ -0,0 +1,48 @@
+import type { ViemCommitteeAttestations } from '@aztec/ethereum';
+import { z } from 'zod';
+import type { Signable, SignatureDomainSeparator } from '../../p2p/signature_utils.js';
+import { CommitteeAttestation } from './committee_attestation.js';
+export declare class CommitteeAttestationsAndSigners implements Signable {
+    attestations: CommitteeAttestation[];
+    constructor(attestations: CommitteeAttestation[]);
+    static get schema(): z.ZodEffects<z.ZodObject<{
+        attestations: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            address: z.ZodType<import("./committee_attestation.js").EthAddress, any, string>;
+            signature: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>, import("./committee_attestation.js").Signature, string>;
+        }, "strip", z.ZodTypeAny, {
+            address: import("./committee_attestation.js").EthAddress;
+            signature: import("./committee_attestation.js").Signature;
+        }, {
+            address: string;
+            signature: string;
+        }>, CommitteeAttestation, {
+            address: string;
+            signature: string;
+        }>, "many">;
+    }, "strip", z.ZodTypeAny, {
+        attestations: CommitteeAttestation[];
+    }, {
+        attestations: {
+            address: string;
+            signature: string;
+        }[];
+    }>, CommitteeAttestationsAndSigners, {
+        attestations: {
+            address: string;
+            signature: string;
+        }[];
+    }>;
+    getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer;
+    static empty(): CommitteeAttestationsAndSigners;
+    toString(): string;
+    getSigners(): import("./committee_attestation.js").EthAddress[];
+    getSignedAttestations(): CommitteeAttestation[];
+    /**
+     * Packs an array of committee attestations into the format expected by the Solidity contract
+     *
+     * @param attestations - Array of committee attestations with addresses and signatures
+     * @returns Packed attestations with bitmap and tightly packed signature/address data
+     */
+    getPackedAttestations(): ViemCommitteeAttestations;
+}
+//# sourceMappingURL=attestations_and_signers.d.ts.map

package/dest/block/proposal/attestations_and_signers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"attestations_and_signers.d.ts","sourceRoot":"","sources":["../../../src/block/proposal/attestations_and_signers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAIjE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,qBAAa,+BAAgC,YAAW,QAAQ;IAC3C,YAAY,EAAE,oBAAoB,EAAE;gBAApC,YAAY,EAAE,oBAAoB,EAAE;IAEvD,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;OAMhB;IAED,gBAAgB,CAAC,eAAe,EAAE,wBAAwB,GAAG,MAAM;IAanE,MAAM,CAAC,KAAK,IAAI,+BAA+B;IAI/C,QAAQ;IAIR,UAAU;IAIV,qBAAqB;IAIrB;;;;;OAKG;IACH,qBAAqB,IAAI,yBAAyB;CAiEnD"}