@aztec/archiver 0.0.0-test.1 → 0.0.1-commit.5476d83

package/dest/archiver/instrumentation.js

@@ -5,13 +5,18 @@ export class ArchiverInstrumentation {
     tracer;
     blockHeight;
     txCount;
-    syncDuration;
-    l1BlocksSynced;
     l1BlockHeight;
     proofsSubmittedDelay;
     proofsSubmittedCount;
     dbMetrics;
+    pruneDuration;
     pruneCount;
+    syncDurationPerBlock;
+    syncBlockCount;
+    manaPerBlock;
+    txsPerBlock;
+    syncDurationPerMessage;
+    syncMessageCount;
     log;
     constructor(telemetry, lmdbStats){
         this.telemetry = telemetry;
@@ -22,13 +27,12 @@ export class ArchiverInstrumentation {
             description: 'The height of the latest block processed by the archiver',
             valueType: ValueType.INT
         });
-        this.txCount = meter.createUpDownCounter(Metrics.ARCHIVER_TX_COUNT, {
-            description: 'The total number of transactions',
+        this.l1BlockHeight = meter.createGauge(Metrics.ARCHIVER_L1_BLOCK_HEIGHT, {
+            description: 'The height of the latest L1 block processed by the archiver',
             valueType: ValueType.INT
         });
-        this.syncDuration = meter.createHistogram(Metrics.ARCHIVER_SYNC_DURATION, {
-            unit: 'ms',
-            description: 'Duration to sync a block',
+        this.txCount = meter.createUpDownCounter(Metrics.ARCHIVER_TOTAL_TXS, {
+            description: 'The total number of transactions',
             valueType: ValueType.INT
         });
         this.proofsSubmittedCount = meter.createUpDownCounter(Metrics.ARCHIVER_ROLLUP_PROOF_COUNT, {
@@ -40,25 +44,52 @@ export class ArchiverInstrumentation {
             description: 'Time after a block is submitted until its proof is published',
             valueType: ValueType.INT
         });
-        this.l1BlocksSynced = meter.createUpDownCounter(Metrics.ARCHIVER_L1_BLOCKS_SYNCED, {
+        this.syncDurationPerBlock = meter.createHistogram(Metrics.ARCHIVER_SYNC_PER_BLOCK, {
+            unit: 'ms',
+            description: 'Duration to sync a block',
+            valueType: ValueType.INT
+        });
+        this.syncBlockCount = meter.createUpDownCounter(Metrics.ARCHIVER_SYNC_BLOCK_COUNT, {
             description: 'Number of blocks synced from L1',
             valueType: ValueType.INT
         });
-        this.l1BlockHeight = meter.createGauge(Metrics.ARCHIVER_L1_BLOCK_HEIGHT, {
-            description: 'The height of the latest L1 block processed by the archiver',
+        this.manaPerBlock = meter.createHistogram(Metrics.ARCHIVER_MANA_PER_BLOCK, {
+            description: 'The mana consumed by blocks',
+            valueType: ValueType.DOUBLE,
+            unit: 'Mmana'
+        });
+        this.txsPerBlock = meter.createHistogram(Metrics.ARCHIVER_TXS_PER_BLOCK, {
+            description: 'The block tx count',
+            valueType: ValueType.INT,
+            unit: 'tx'
+        });
+        this.syncDurationPerMessage = meter.createHistogram(Metrics.ARCHIVER_SYNC_PER_MESSAGE, {
+            unit: 'ms',
+            description: 'Duration to sync a message',
+            valueType: ValueType.INT
+        });
+        this.syncMessageCount = meter.createUpDownCounter(Metrics.ARCHIVER_SYNC_MESSAGE_COUNT, {
+            description: 'Number of L1 to L2 messages synced',
+            valueType: ValueType.INT
+        });
+        this.pruneDuration = meter.createHistogram(Metrics.ARCHIVER_PRUNE_DURATION, {
+            unit: 'ms',
+            description: 'Duration to sync a message',
             valueType: ValueType.INT
         });
-        this.dbMetrics = new LmdbMetrics(meter, {
-            [Attributes.DB_DATA_TYPE]: 'archiver'
-        }, lmdbStats);
         this.pruneCount = meter.createUpDownCounter(Metrics.ARCHIVER_PRUNE_COUNT, {
             description: 'Number of prunes detected',
             valueType: ValueType.INT
         });
+        this.dbMetrics = new LmdbMetrics(meter, {
+            [Attributes.DB_DATA_TYPE]: 'archiver'
+        }, lmdbStats);
     }
     static async new(telemetry, lmdbStats) {
         const instance = new ArchiverInstrumentation(telemetry, lmdbStats);
-        instance.l1BlocksSynced.add(0);
+        instance.syncBlockCount.add(0);
+        instance.syncMessageCount.add(0);
+        instance.pruneCount.add(0);
         await instance.telemetry.flush();
         return instance;
     }
@@ -66,15 +97,25 @@ export class ArchiverInstrumentation {
         return this.telemetry.isEnabled();
     }
     processNewBlocks(syncTimePerBlock, blocks) {
-        this.syncDuration.record(Math.ceil(syncTimePerBlock));
+        this.syncDurationPerBlock.record(Math.ceil(syncTimePerBlock));
         this.blockHeight.record(Math.max(...blocks.map((b)=>b.number)));
-        this.l1BlocksSynced.add(blocks.length);
+        this.syncBlockCount.add(blocks.length);
         for (const block of blocks){
             this.txCount.add(block.body.txEffects.length);
+            this.txsPerBlock.record(block.body.txEffects.length);
+            this.manaPerBlock.record(block.header.totalManaUsed.toNumber() / 1e6);
+        }
+    }
+    processNewMessages(count, syncPerMessageMs) {
+        if (count === 0) {
+            return;
         }
+        this.syncMessageCount.add(count);
+        this.syncDurationPerMessage.record(Math.ceil(syncPerMessageMs));
     }
-    processPrune() {
+    processPrune(duration) {
         this.pruneCount.add(1);
+        this.pruneDuration.record(Math.ceil(duration));
     }
     updateLastProvenBlock(blockNumber) {
         this.blockHeight.record(blockNumber, {

package/dest/archiver/kv_archiver_store/block_store.d.ts

@@ -1,9 +1,9 @@
+import { Fr } from '@aztec/foundation/fields';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { type InBlock, L2Block } from '@aztec/stdlib/block';
-import { BlockHeader, TxEffect, TxHash, TxReceipt } from '@aztec/stdlib/tx';
-import type { L1Published } from '../structs/published.js';
-export { type TxEffect, type TxHash, TxReceipt } from '@aztec/stdlib/tx';
+import { L2BlockHash, PublishedL2Block, type ValidateBlockResult } from '@aztec/stdlib/block';
+import { BlockHeader, type IndexedTxEffect, TxHash, TxReceipt } from '@aztec/stdlib/tx';
+export { TxReceipt, type TxEffect, type TxHash } from '@aztec/stdlib/tx';
 /**
  * LMDB implementation of the ArchiverDataStore interface.
  */
@@ -16,7 +16,9 @@ export declare class BlockStore {
      * @param blocks - The L2 blocks to be added to the store.
      * @returns True if the operation is successful.
      */
-    addBlocks(blocks: L1Published<L2Block>[]): Promise<boolean>;
+    addBlocks(blocks: PublishedL2Block[], opts?: {
+        force?: boolean;
+    }): Promise<boolean>;
     /**
      * Unwinds blocks from the database
      * @param from -  The tip of the chain, passed for verification purposes,
@@ -31,13 +33,37 @@ export declare class BlockStore {
      * @param limit - The number of blocks to return.
      * @returns The requested L2 blocks
      */
-    getBlocks(start: number, limit: number): AsyncIterableIterator<L1Published<L2Block>>;
+    getBlocks(start: number, limit: number): AsyncIterableIterator<PublishedL2Block>;
     /**
      * Gets an L2 block.
      * @param blockNumber - The number of the block to return.
      * @returns The requested L2 block.
      */
-    getBlock(blockNumber: number): Promise<L1Published<L2Block> | undefined>;
+    getBlock(blockNumber: number): Promise<PublishedL2Block | undefined>;
+    /**
+     * Gets an L2 block by its hash.
+     * @param blockHash - The hash of the block to return.
+     * @returns The requested L2 block.
+     */
+    getBlockByHash(blockHash: L2BlockHash): Promise<PublishedL2Block | undefined>;
+    /**
+     * Gets an L2 block by its archive root.
+     * @param archive - The archive root of the block to return.
+     * @returns The requested L2 block.
+     */
+    getBlockByArchive(archive: Fr): Promise<PublishedL2Block | undefined>;
+    /**
+     * Gets a block header by its hash.
+     * @param blockHash - The hash of the block to return.
+     * @returns The requested block header.
+     */
+    getBlockHeaderByHash(blockHash: L2BlockHash): Promise<BlockHeader | undefined>;
+    /**
+     * Gets a block header by its archive root.
+     * @param archive - The archive root of the block to return.
+     * @returns The requested block header.
+     */
+    getBlockHeaderByArchive(archive: Fr): Promise<BlockHeader | undefined>;
     /**
      * Gets the headers for a sequence of L2 blocks.
      * @param start - Number of the first block to return (inclusive).
@@ -45,13 +71,14 @@ export declare class BlockStore {
      * @returns The requested L2 block headers
      */
     getBlockHeaders(start: number, limit: number): AsyncIterableIterator<BlockHeader>;
+    private getBlockStorages;
     private getBlockFromBlockStorage;
     /**
      * Gets a tx effect.
-     * @param txHash - The txHash of the tx corresponding to the tx effect.
-     * @returns The requested tx effect (or undefined if not found).
+     * @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.
@@ -83,5 +110,15 @@ export declare class BlockStore {
     setSynchedL1BlockNumber(l1BlockNumber: bigint): Promise<boolean>;
     getProvenL2BlockNumber(): Promise<number>;
     setProvenL2BlockNumber(blockNumber: number): Promise<boolean>;
+    /**
+     * Gets the pending chain validation status.
+     * @returns The validation status or undefined if not set.
+     */
+    getPendingChainValidationStatus(): Promise<ValidateBlockResult | undefined>;
+    /**
+     * Sets the pending chain validation status.
+     * @param status - The validation status to store.
+     */
+    setPendingChainValidationStatus(status: ValidateBlockResult | undefined): Promise<void>;
 }
-//# sourceMappingURL=block_store.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9rdl9hcmNoaXZlcl9zdG9yZS9ibG9ja19zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFLOUMsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQTZDLE1BQU0saUJBQWlCLENBQUM7QUFDcEcsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxFQUlMLFdBQVcsRUFDWCxnQkFBZ0IsRUFDaEIsS0FBSyxtQkFBbUIsRUFDekIsTUFBTSxxQkFBcUIsQ0FBQztBQUc3QixPQUFPLEVBQ0wsV0FBVyxFQUNYLEtBQUssZUFBZSxFQUVwQixNQUFNLEVBQ04sU0FBUyxFQUdWLE1BQU0sa0JBQWtCLENBQUM7QUFLMUIsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLFFBQVEsRUFBRSxLQUFLLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBWXpFOztHQUVHO0FBQ0gscUJBQWEsVUFBVTs7SUE4QlQsT0FBTyxDQUFDLEVBQUU7SUFBdEIsWUFBb0IsRUFBRSxFQUFFLGlCQUFpQixFQVV4QztJQUVEOzs7O09BSUc7SUFDRyxTQUFTLENBQUMsTUFBTSxFQUFFLGdCQUFnQixFQUFFLEVBQUUsSUFBSSxHQUFFO1FBQUUsS0FBSyxDQUFDLEVBQUUsT0FBTyxDQUFBO0tBQU8sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBMEQ1RjtJQUVEOzs7Ozs7T0FNRztJQUNHLFlBQVksQ0FBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQWtDdEQ7SUFFRDs7Ozs7T0FLRztJQUNJLFNBQVMsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcscUJBQXFCLENBQUMsZ0JBQWdCLENBQUMsQ0FPdEY7SUFFRDs7OztPQUlHO0lBQ0csUUFBUSxDQUFDLFdBQVcsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixHQUFHLFNBQVMsQ0FBQyxDQU16RTtJQUVEOzs7O09BSUc7SUFDRyxjQUFjLENBQUMsU0FBUyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLEdBQUcsU0FBUyxDQUFDLENBTWxGO0lBRUQ7Ozs7T0FJRztJQUNHLGlCQUFpQixDQUFDLE9BQU8sRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixHQUFHLFNBQVMsQ0FBQyxDQU0xRTtJQUVEOzs7O09BSUc7SUFDRyxvQkFBb0IsQ0FBQyxTQUFTLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxXQUFXLEdBQUcsU0FBUyxDQUFDLENBVW5GO0lBRUQ7Ozs7T0FJRztJQUNHLHVCQUF1QixDQUFDLE9BQU8sRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLFdBQVcsR0FBRyxTQUFTLENBQUMsQ0FVM0U7SUFFRDs7Ozs7T0FLRztJQUNJLGVBQWUsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcscUJBQXFCLENBQUMsV0FBVyxDQUFDLENBVXZGO1lBRWMsZ0JBQWdCO1lBYWpCLHdCQUF3QjtJQXVDdEM7Ozs7T0FJRztJQUNHLFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxlQUFlLEdBQUcsU0FBUyxDQUFDLENBTXRFO0lBRUQ7Ozs7T0FJRztJQUNHLG1CQUFtQixDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUMsQ0FjeEU7SUFFRDs7OztPQUlHO0lBQ1UsYUFBYSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLENBQUMsV0FBVyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsTUFBTSxDQUFDLEdBQUcsU0FBUyxDQUFDLENBT3RHO0lBRUQ7Ozs7T0FJRztJQUNILG1CQUFtQixDQUFDLGVBQWUsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLENBQUMsV0FBVyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxDQUFDLEdBQUcsU0FBUyxDQUFDLENBRTVHO0lBRUQ7OztPQUdHO0lBQ0csdUJBQXVCLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUcvQztJQUVEOzs7T0FHRztJQUNILHVCQUF1QixJQUFJLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRXJEO0lBRUQsdUJBQXVCLENBQUMsYUFBYSxFQUFFLE1BQU0sb0JBRTVDO0lBRUssc0JBQXNCLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQU05QztJQUVELHNCQUFzQixDQUFDLFdBQVcsRUFBRSxNQUFNLG9CQUV6QztJQWNEOzs7T0FHRztJQUNHLCtCQUErQixJQUFJLE9BQU8sQ0FBQyxtQkFBbUIsR0FBRyxTQUFTLENBQUMsQ0FNaEY7SUFFRDs7O09BR0c7SUFDRywrQkFBK0IsQ0FBQyxNQUFNLEVBQUUsbUJBQW1CLEdBQUcsU0FBUyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FPNUY7Q0FDRiJ9

package/dest/archiver/kv_archiver_store/block_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/block_store.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAA6C,MAAM,iBAAiB,CAAC;AACpG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAQ,KAAK,OAAO,EAAE,OAAO,EAAe,MAAM,qBAAqB,CAAC;AAE/E,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE5E,OAAO,KAAK,EAAE,WAAW,EAAmB,MAAM,yBAAyB,CAAC;AAE5E,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAUzE;;GAEG;AACH,qBAAa,UAAU;;IAwBT,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,iBAAiB;IAUzC;;;;OAIG;IACG,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IA0BjE;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IA0BvD;;;;;OAKG;IACI,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,qBAAqB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAO3F;;;;OAIG;IACG,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;IAS9E;;;;;OAKG;IACI,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,qBAAqB,CAAC,WAAW,CAAC;YAM1E,wBAAwB;IAgBtC;;;;OAIG;IACG,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC;IAkBzE;;;;OAIG;IACG,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAmBzE;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IAI1F;;;;OAIG;IACH,mBAAmB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IAI7G;;;OAGG;IACG,uBAAuB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKhD;;;OAGG;IACH,uBAAuB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAItD,uBAAuB,CAAC,aAAa,EAAE,MAAM;IAIvC,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/C,sBAAsB,CAAC,WAAW,EAAE,MAAM;CAe3C"}
+{"version":3,"file":"block_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/block_store.ts"],"names":[],"mappings":"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"}

package/dest/archiver/kv_archiver_store/block_store.js

@@ -1,56 +1,90 @@
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
 import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
-import { Body, L2Block, L2BlockHash } from '@aztec/stdlib/block';
+import { BufferReader } from '@aztec/foundation/serialize';
+import { bufferToHex } from '@aztec/foundation/string';
+import { Body, CommitteeAttestation, L2Block, L2BlockHash, PublishedL2Block } from '@aztec/stdlib/block';
+import { L2BlockHeader, deserializeValidateBlockResult, serializeValidateBlockResult } from '@aztec/stdlib/block';
 import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
-import { BlockHeader, TxReceipt } from '@aztec/stdlib/tx';
+import { TxHash, TxReceipt, deserializeIndexedTxEffect, serializeIndexedTxEffect } from '@aztec/stdlib/tx';
+import { BlockNumberNotSequentialError, InitialBlockNumberNotSequentialError } from '../errors.js';
 export { TxReceipt } from '@aztec/stdlib/tx';
 /**
  * LMDB implementation of the ArchiverDataStore interface.
  */ export class BlockStore {
     db;
     /** Map block number to block data */ #blocks;
-    /** Map block hash to block body */ #blockBodies;
+    /** Map block hash to list of tx hashes */ #blockTxs;
+    /** Tx hash to serialized IndexedTxEffect */ #txEffects;
     /** Stores L1 block number in which the last processed L2 block was included */ #lastSynchedL1Block;
     /** Stores l2 block number of the last proven block */ #lastProvenL2Block;
-    /** Stores l2 epoch number of the last proven epoch */ #lastProvenL2Epoch;
-    /** Index mapping transaction hash (as a string) to its location in a block */ #txIndex;
+    /** Stores the pending chain validation status */ #pendingChainValidationStatus;
     /** Index mapping a contract's address (as a string) to its location in a block */ #contractIndex;
+    /** Index mapping block hash to block number */ #blockHashIndex;
+    /** Index mapping block archive to block number */ #blockArchiveIndex;
     #log;
     constructor(db){
         this.db = db;
         this.#log = createLogger('archiver:block_store');
         this.#blocks = db.openMap('archiver_blocks');
-        this.#blockBodies = db.openMap('archiver_block_bodies');
-        this.#txIndex = db.openMap('archiver_tx_index');
+        this.#blockTxs = db.openMap('archiver_block_txs');
+        this.#txEffects = db.openMap('archiver_tx_effects');
         this.#contractIndex = db.openMap('archiver_contract_index');
+        this.#blockHashIndex = db.openMap('archiver_block_hash_index');
+        this.#blockArchiveIndex = db.openMap('archiver_block_archive_index');
         this.#lastSynchedL1Block = db.openSingleton('archiver_last_synched_l1_block');
         this.#lastProvenL2Block = db.openSingleton('archiver_last_proven_l2_block');
-        this.#lastProvenL2Epoch = db.openSingleton('archiver_last_proven_l2_epoch');
+        this.#pendingChainValidationStatus = db.openSingleton('archiver_pending_chain_validation_status');
     }
     /**
    * Append new blocks to the store's list.
    * @param blocks - The L2 blocks to be added to the store.
    * @returns True if the operation is successful.
-   */ async addBlocks(blocks) {
+   */ async addBlocks(blocks, opts = {}) {
         if (blocks.length === 0) {
             return true;
         }
         return await this.db.transactionAsync(async ()=>{
+            // Check that the block immediately before the first block to be added is present in the store.
+            const firstBlockNumber = blocks[0].block.number;
+            const [previousBlockNumber] = await toArray(this.#blocks.keysAsync({
+                reverse: true,
+                limit: 1,
+                end: firstBlockNumber - 1
+            }));
+            const hasPreviousBlock = firstBlockNumber === INITIAL_L2_BLOCK_NUM || previousBlockNumber !== undefined && previousBlockNumber === firstBlockNumber - 1;
+            if (!opts.force && !hasPreviousBlock) {
+                throw new InitialBlockNumberNotSequentialError(firstBlockNumber, previousBlockNumber);
+            }
+            // Iterate over blocks array and insert them, checking that the block numbers are sequential.
+            let previousBlock = undefined;
             for (const block of blocks){
-                await this.#blocks.set(block.data.number, {
-                    header: block.data.header.toBuffer(),
-                    archive: block.data.archive.toBuffer(),
-                    l1: block.l1
+                if (!opts.force && previousBlock && previousBlock.block.number + 1 !== block.block.number) {
+                    throw new BlockNumberNotSequentialError(block.block.number, previousBlock.block.number);
+                }
+                previousBlock = block;
+                const blockHash = L2BlockHash.fromField(await block.block.hash());
+                await this.#blocks.set(block.block.number, {
+                    header: block.block.header.toBuffer(),
+                    blockHash: blockHash.toBuffer(),
+                    archive: block.block.archive.toBuffer(),
+                    l1: block.l1,
+                    attestations: block.attestations.map((attestation)=>attestation.toBuffer())
                 });
-                for(let i = 0; i < block.data.body.txEffects.length; i++){
-                    const txEffect = block.data.body.txEffects[i];
-                    await this.#txIndex.set(txEffect.txHash.toString(), [
-                        block.data.number,
-                        i
-                    ]);
+                for(let i = 0; i < block.block.body.txEffects.length; i++){
+                    const txEffect = {
+                        data: block.block.body.txEffects[i],
+                        l2BlockNumber: block.block.number,
+                        l2BlockHash: blockHash,
+                        txIndexInBlock: i
+                    };
+                    await this.#txEffects.set(txEffect.data.txHash.toString(), serializeIndexedTxEffect(txEffect));
                 }
-                await this.#blockBodies.set((await block.data.hash()).toString(), block.data.body.toBuffer());
+                await this.#blockTxs.set(blockHash.toString(), Buffer.concat(block.block.body.txEffects.map((tx)=>tx.txHash.toBuffer())));
+                // Update indices for block hash and archive
+                await this.#blockHashIndex.set(blockHash.toString(), block.block.number);
+                await this.#blockArchiveIndex.set(block.block.archive.root.toString(), block.block.number);
             }
             await this.#lastSynchedL1Block.set(blocks[blocks.length - 1].l1.blockNumber);
             return true;
@@ -68,6 +102,10 @@ export { TxReceipt } from '@aztec/stdlib/tx';
             if (from !== last) {
                 throw new Error(`Can only unwind blocks from the tip (requested ${from} but current tip is ${last})`);
             }
+            const proven = await this.getProvenL2BlockNumber();
+            if (from - blocksToUnwind < proven) {
+                await this.setProvenL2BlockNumber(from - blocksToUnwind);
+            }
             for(let i = 0; i < blocksToUnwind; i++){
                 const blockNumber = from - i;
                 const block = await this.getBlock(blockNumber);
@@ -75,10 +113,13 @@ export { TxReceipt } from '@aztec/stdlib/tx';
                     this.#log.warn(`Cannot remove block ${blockNumber} from the store since we don't have it`);
                     continue;
                 }
-                await this.#blocks.delete(block.data.number);
-                await Promise.all(block.data.body.txEffects.map((tx)=>this.#txIndex.delete(tx.txHash.toString())));
-                const blockHash = (await block.data.hash()).toString();
-                await this.#blockBodies.delete(blockHash);
+                await this.#blocks.delete(block.block.number);
+                await Promise.all(block.block.body.txEffects.map((tx)=>this.#txEffects.delete(tx.txHash.toString())));
+                const blockHash = (await block.block.hash()).toString();
+                await this.#blockTxs.delete(blockHash);
+                // Clean up indices
+                await this.#blockHashIndex.delete(blockHash);
+                await this.#blockArchiveIndex.delete(block.block.archive.root.toString());
                 this.#log.debug(`Unwound block ${blockNumber} ${blockHash}`);
             }
             return true;
@@ -90,9 +131,11 @@ export { TxReceipt } from '@aztec/stdlib/tx';
    * @param limit - The number of blocks to return.
    * @returns The requested L2 blocks
    */ async *getBlocks(start, limit) {
-        for await (const blockStorage of this.#blocks.valuesAsync(this.#computeBlockRange(start, limit))){
-            const block = await this.getBlockFromBlockStorage(blockStorage);
-            yield block;
+        for await (const [blockNumber, blockStorage] of this.getBlockStorages(start, limit)){
+            const block = await this.getBlockFromBlockStorage(blockNumber, blockStorage);
+            if (block) {
+                yield block;
+            }
         }
     }
     /**
@@ -104,7 +147,59 @@ export { TxReceipt } from '@aztec/stdlib/tx';
         if (!blockStorage || !blockStorage.header) {
             return Promise.resolve(undefined);
         }
-        return this.getBlockFromBlockStorage(blockStorage);
+        return this.getBlockFromBlockStorage(blockNumber, blockStorage);
+    }
+    /**
+   * Gets an L2 block by its hash.
+   * @param blockHash - The hash of the block to return.
+   * @returns The requested L2 block.
+   */ async getBlockByHash(blockHash) {
+        const blockNumber = await this.#blockHashIndex.getAsync(blockHash.toString());
+        if (blockNumber === undefined) {
+            return undefined;
+        }
+        return this.getBlock(blockNumber);
+    }
+    /**
+   * Gets an L2 block by its archive root.
+   * @param archive - The archive root of the block to return.
+   * @returns The requested L2 block.
+   */ async getBlockByArchive(archive) {
+        const blockNumber = await this.#blockArchiveIndex.getAsync(archive.toString());
+        if (blockNumber === undefined) {
+            return undefined;
+        }
+        return this.getBlock(blockNumber);
+    }
+    /**
+   * Gets a block header by its hash.
+   * @param blockHash - The hash of the block to return.
+   * @returns The requested block header.
+   */ async getBlockHeaderByHash(blockHash) {
+        const blockNumber = await this.#blockHashIndex.getAsync(blockHash.toString());
+        if (blockNumber === undefined) {
+            return undefined;
+        }
+        const blockStorage = await this.#blocks.getAsync(blockNumber);
+        if (!blockStorage || !blockStorage.header) {
+            return undefined;
+        }
+        return L2BlockHeader.fromBuffer(blockStorage.header).toBlockHeader();
+    }
+    /**
+   * Gets a block header by its archive root.
+   * @param archive - The archive root of the block to return.
+   * @returns The requested block header.
+   */ async getBlockHeaderByArchive(archive) {
+        const blockNumber = await this.#blockArchiveIndex.getAsync(archive.toString());
+        if (blockNumber === undefined) {
+            return undefined;
+        }
+        const blockStorage = await this.#blocks.getAsync(blockNumber);
+        if (!blockStorage || !blockStorage.header) {
+            return undefined;
+        }
+        return L2BlockHeader.fromBuffer(blockStorage.header).toBlockHeader();
     }
     /**
    * Gets the headers for a sequence of L2 blocks.
@@ -112,63 +207,96 @@ export { TxReceipt } from '@aztec/stdlib/tx';
    * @param limit - The number of blocks to return.
    * @returns The requested L2 block headers
    */ async *getBlockHeaders(start, limit) {
-        for await (const blockStorage of this.#blocks.valuesAsync(this.#computeBlockRange(start, limit))){
-            yield BlockHeader.fromBuffer(blockStorage.header);
+        for await (const [blockNumber, blockStorage] of this.getBlockStorages(start, limit)){
+            const header = L2BlockHeader.fromBuffer(blockStorage.header).toBlockHeader();
+            if (header.getBlockNumber() !== blockNumber) {
+                throw new Error(`Block number mismatch when retrieving block header from archive (expected ${blockNumber} but got ${header.getBlockNumber()})`);
+            }
+            yield header;
+        }
+    }
+    async *getBlockStorages(start, limit) {
+        let expectedBlockNumber = start;
+        for await (const [blockNumber, blockStorage] of this.#blocks.entriesAsync(this.#computeBlockRange(start, limit))){
+            if (blockNumber !== expectedBlockNumber) {
+                throw new Error(`Block number mismatch when iterating blocks from archive (expected ${expectedBlockNumber} but got ${blockNumber})`);
+            }
+            expectedBlockNumber++;
+            yield [
+                blockNumber,
+                blockStorage
+            ];
         }
     }
-    async getBlockFromBlockStorage(blockStorage) {
-        const header = BlockHeader.fromBuffer(blockStorage.header);
+    async getBlockFromBlockStorage(blockNumber, blockStorage) {
+        const header = L2BlockHeader.fromBuffer(blockStorage.header);
         const archive = AppendOnlyTreeSnapshot.fromBuffer(blockStorage.archive);
-        const blockHash = (await header.hash()).toString();
-        const blockBodyBuffer = await this.#blockBodies.getAsync(blockHash);
-        if (blockBodyBuffer === undefined) {
-            throw new Error(`Could not retrieve body for block ${header.globalVariables.blockNumber.toNumber()} ${blockHash}`);
+        const blockHash = blockStorage.blockHash;
+        const blockHashString = bufferToHex(blockHash);
+        const blockTxsBuffer = await this.#blockTxs.getAsync(blockHashString);
+        if (blockTxsBuffer === undefined) {
+            this.#log.warn(`Could not find body for block ${header.globalVariables.blockNumber} ${blockHash}`);
+            return undefined;
         }
-        const body = Body.fromBuffer(blockBodyBuffer);
-        const l2Block = new L2Block(archive, header, body);
-        return {
-            data: l2Block,
-            l1: blockStorage.l1
-        };
+        const txEffects = [];
+        const reader = BufferReader.asReader(blockTxsBuffer);
+        while(!reader.isEmpty()){
+            const txHash = reader.readObject(TxHash);
+            const txEffect = await this.#txEffects.getAsync(txHash.toString());
+            if (txEffect === undefined) {
+                this.#log.warn(`Could not find tx effect for tx ${txHash} in block ${blockNumber}`);
+                return undefined;
+            }
+            txEffects.push(deserializeIndexedTxEffect(txEffect).data);
+        }
+        const body = new Body(txEffects);
+        const block = new L2Block(archive, header, body, Fr.fromBuffer(blockHash));
+        if (block.number !== blockNumber) {
+            throw new Error(`Block number mismatch when retrieving block from archive (expected ${blockNumber} but got ${block.number} with hash ${blockHashString})`);
+        }
+        const attestations = blockStorage.attestations.map(CommitteeAttestation.fromBuffer);
+        return PublishedL2Block.fromFields({
+            block,
+            l1: blockStorage.l1,
+            attestations
+        });
     }
     /**
    * Gets a tx effect.
-   * @param txHash - The txHash of the tx corresponding to the tx effect.
-   * @returns The requested tx effect (or undefined if not found).
+   * @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).
    */ async getTxEffect(txHash) {
-        const [blockNumber, txIndex] = await this.getTxLocation(txHash) ?? [];
-        if (typeof blockNumber !== 'number' || typeof txIndex !== 'number') {
+        const buffer = await this.#txEffects.getAsync(txHash.toString());
+        if (!buffer) {
             return undefined;
         }
-        const block = await this.getBlock(blockNumber);
-        if (!block) {
-            return undefined;
-        }
-        return {
-            data: block.data.body.txEffects[txIndex],
-            l2BlockNumber: block.data.number,
-            l2BlockHash: (await block.data.hash()).toString()
-        };
+        return deserializeIndexedTxEffect(buffer);
     }
     /**
    * Gets a receipt of a settled tx.
    * @param txHash - The hash of a tx we try to get the receipt for.
    * @returns The requested tx receipt (or undefined if not found).
    */ async getSettledTxReceipt(txHash) {
-        const [blockNumber, txIndex] = await this.getTxLocation(txHash) ?? [];
-        if (typeof blockNumber !== 'number' || typeof txIndex !== 'number') {
+        const txEffect = await this.getTxEffect(txHash);
+        if (!txEffect) {
             return undefined;
         }
-        const block = await this.getBlock(blockNumber);
-        const tx = block.data.body.txEffects[txIndex];
-        return new TxReceipt(txHash, TxReceipt.statusFromRevertCode(tx.revertCode), '', tx.transactionFee.toBigInt(), L2BlockHash.fromField(await block.data.hash()), block.data.number);
+        return new TxReceipt(txHash, TxReceipt.statusFromRevertCode(txEffect.data.revertCode), '', txEffect.data.transactionFee.toBigInt(), txEffect.l2BlockHash, txEffect.l2BlockNumber);
     }
     /**
    * Looks up which block included the requested tx effect.
    * @param txHash - The txHash of the tx.
    * @returns The block number and index of the tx.
-   */ getTxLocation(txHash) {
-        return this.#txIndex.getAsync(txHash.toString());
+   */ async getTxLocation(txHash) {
+        const txEffect = await this.#txEffects.getAsync(txHash.toString());
+        if (!txEffect) {
+            return undefined;
+        }
+        const { l2BlockNumber, txIndexInBlock } = deserializeIndexedTxEffect(txEffect);
+        return [
+            l2BlockNumber,
+            txIndexInBlock
+        ];
     }
     /**
    * Looks up which block deployed a particular contract.
@@ -197,7 +325,11 @@ export { TxReceipt } from '@aztec/stdlib/tx';
         return this.#lastSynchedL1Block.set(l1BlockNumber);
     }
     async getProvenL2BlockNumber() {
-        return await this.#lastProvenL2Block.getAsync() ?? 0;
+        const [latestBlockNumber, provenBlockNumber] = await Promise.all([
+            this.getSynchedL2BlockNumber(),
+            this.#lastProvenL2Block.getAsync()
+        ]);
+        return (provenBlockNumber ?? 0) > latestBlockNumber ? latestBlockNumber : provenBlockNumber ?? 0;
     }
     setProvenL2BlockNumber(blockNumber) {
         return this.#lastProvenL2Block.set(blockNumber);
@@ -214,4 +346,25 @@ export { TxReceipt } from '@aztec/stdlib/tx';
             limit
         };
     }
+    /**
+   * Gets the pending chain validation status.
+   * @returns The validation status or undefined if not set.
+   */ async getPendingChainValidationStatus() {
+        const buffer = await this.#pendingChainValidationStatus.getAsync();
+        if (!buffer) {
+            return undefined;
+        }
+        return deserializeValidateBlockResult(buffer);
+    }
+    /**
+   * Sets the pending chain validation status.
+   * @param status - The validation status to store.
+   */ async setPendingChainValidationStatus(status) {
+        if (status) {
+            const buffer = serializeValidateBlockResult(status);
+            await this.#pendingChainValidationStatus.set(buffer);
+        } else {
+            await this.#pendingChainValidationStatus.delete();
+        }
+    }
 }

package/dest/archiver/kv_archiver_store/contract_class_store.d.ts

@@ -1,6 +1,6 @@
 import { Fr } from '@aztec/foundation/fields';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import type { ContractClassPublic, ExecutablePrivateFunctionWithMembershipProof, UnconstrainedFunctionWithMembershipProof } from '@aztec/stdlib/contract';
+import type { ContractClassPublic, ExecutablePrivateFunctionWithMembershipProof, UtilityFunctionWithMembershipProof } from '@aztec/stdlib/contract';
 /**
  * LMDB implementation of the ArchiverDataStore interface.
  */
@@ -13,6 +13,6 @@ export declare class ContractClassStore {
     getContractClass(id: Fr): Promise<ContractClassPublic | undefined>;
     getBytecodeCommitment(id: Fr): Promise<Fr | undefined>;
     getContractClassIds(): Promise<Fr[]>;
-    addFunctions(contractClassId: Fr, newPrivateFunctions: ExecutablePrivateFunctionWithMembershipProof[], newUnconstrainedFunctions: UnconstrainedFunctionWithMembershipProof[]): Promise<boolean>;
+    addFunctions(contractClassId: Fr, newPrivateFunctions: ExecutablePrivateFunctionWithMembershipProof[], newUtilityFunctions: UtilityFunctionWithMembershipProof[]): Promise<boolean>;
 }
-//# sourceMappingURL=contract_class_store.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3Nfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9rdl9hcmNoaXZlcl9zdG9yZS9jb250cmFjdF9jbGFzc19zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFHOUMsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFFeEUsT0FBTyxLQUFLLEVBQ1YsbUJBQW1CLEVBRW5CLDRDQUE0QyxFQUM1QyxrQ0FBa0MsRUFDbkMsTUFBTSx3QkFBd0IsQ0FBQztBQUdoQzs7R0FFRztBQUNILHFCQUFhLGtCQUFrQjs7SUFJakIsT0FBTyxDQUFDLEVBQUU7SUFBdEIsWUFBb0IsRUFBRSxFQUFFLGlCQUFpQixFQUd4QztJQUVLLGdCQUFnQixDQUNwQixhQUFhLEVBQUUsbUJBQW1CLEVBQ2xDLGtCQUFrQixFQUFFLEVBQUUsRUFDdEIsV0FBVyxFQUFFLE1BQU0sR0FDbEIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU1mO0lBRUsscUJBQXFCLENBQUMsYUFBYSxFQUFFLG1CQUFtQixFQUFFLFdBQVcsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU1sRztJQUVLLGdCQUFnQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLG1CQUFtQixHQUFHLFNBQVMsQ0FBQyxDQUd2RTtJQUVLLHFCQUFxQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FHM0Q7SUFFSyxtQkFBbUIsSUFBSSxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FFekM7SUFFSyxZQUFZLENBQ2hCLGVBQWUsRUFBRSxFQUFFLEVBQ25CLG1CQUFtQixFQUFFLDRDQUE0QyxFQUFFLEVBQ25FLG1CQUFtQixFQUFFLGtDQUFrQyxFQUFFLEdBQ3hELE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0F5QmxCO0NBQ0YifQ==