@aztec/archiver 0.0.1-commit.b33fc05d0 → 0.0.1-commit.b3d3157a

package/dest/test/mock_l2_block_source.js

@@ -1,16 +1,17 @@
 import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
 import { DefaultL1ContractsConfig } from '@aztec/ethereum/config';
-import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber, CheckpointNumber, IndexWithinCheckpoint, SlotNumber } from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
-import { CheckpointedL2Block } from '@aztec/stdlib/block';
+import { Body, GENESIS_BLOCK_HEADER_HASH, GENESIS_CHECKPOINT_HEADER_HASH, L2Block } from '@aztec/stdlib/block';
 import { Checkpoint, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
-import { EmptyL1RollupConstants, getEpochAtSlot, getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
+import { EmptyL1RollupConstants, getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
 import { computeCheckpointOutHash } from '@aztec/stdlib/messaging';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
-import { TxExecutionResult, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
+import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
+import { BlockHeader } from '@aztec/stdlib/tx';
 /**
  * A mocked implementation of L2BlockSource to be used in tests.
  */ export class MockL2BlockSource {
@@ -19,7 +20,48 @@ import { TxExecutionResult, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
     provenBlockNumber = 0;
     finalizedBlockNumber = 0;
     checkpointedBlockNumber = 0;
+    proposedCheckpointBlockNumber = 0;
+    initialHeader = BlockHeader.empty();
+    initialHeaderHash = GENESIS_BLOCK_HEADER_HASH;
+    genesisArchiveRoot;
+    genesisBlock;
     log = createLogger('archiver:mock_l2_block_source');
+    /** Returns the initial header used to synthesize block 0. */ getInitialHeader() {
+        return this.initialHeader;
+    }
+    /**
+   * Sets the initial header used to synthesize block 0. Tests that wire up a real
+   * world-state should call this with `worldState.getInitialHeader()` so the L2BlockStream
+   * agrees on the genesis hash on both sides. Precomputes and caches the header hash so
+   * `getGenesisBlockHash()` can return synchronously.
+   */ async setInitialHeader(header) {
+        this.initialHeader = header;
+        this.initialHeaderHash = await header.hash();
+        this.genesisBlock = undefined;
+    }
+    /**
+   * Returns the precomputed hash of the genesis block header. Defaults to the static
+   * {@link GENESIS_BLOCK_HEADER_HASH} unless {@link setInitialHeader} has been called with a
+   * custom header.
+   */ getGenesisBlockHash() {
+        return this.initialHeaderHash;
+    }
+    /**
+   * Sets the post-genesis archive root used to synthesize block 0. Mirrors the real archiver,
+   * whose synthetic block 0 carries `new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1)` rather
+   * than `AppendOnlyTreeSnapshot.empty()`. Tests wiring up a real world-state should set this so
+   * archive-based block lookups against the mock match production semantics.
+   */ setGenesisArchiveRoot(root) {
+        this.genesisArchiveRoot = root;
+        this.genesisBlock = undefined;
+    }
+    getGenesisBlock() {
+        if (this.genesisBlock) {
+            return this.genesisBlock;
+        }
+        const archive = this.genesisArchiveRoot ? new AppendOnlyTreeSnapshot(this.genesisArchiveRoot, 1) : AppendOnlyTreeSnapshot.empty();
+        return this.genesisBlock = new L2Block(archive, this.initialHeader, Body.empty(), CheckpointNumber.ZERO, IndexWithinCheckpoint(0));
+    }
     /** Creates blocks grouped into single-block checkpoints. */ async createBlocks(numBlocks) {
         await this.createCheckpoints(numBlocks, 1);
     }
@@ -56,6 +98,7 @@ import { TxExecutionResult, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
         });
         // Keep tip numbers consistent with remaining blocks.
         this.checkpointedBlockNumber = Math.min(this.checkpointedBlockNumber, maxBlockNum);
+        this.proposedCheckpointBlockNumber = Math.min(this.proposedCheckpointBlockNumber, maxBlockNum);
         this.provenBlockNumber = Math.min(this.provenBlockNumber, maxBlockNum);
         this.finalizedBlockNumber = Math.min(this.finalizedBlockNumber, maxBlockNum);
         this.log.verbose(`Removed ${numBlocks} blocks from the mock L2 block source`);
@@ -69,9 +112,16 @@ import { TxExecutionResult, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
         }
         this.finalizedBlockNumber = finalizedBlockNumber;
     }
+    setProposedCheckpointBlockNumber(blockNumber) {
+        this.proposedCheckpointBlockNumber = blockNumber;
+    }
     setCheckpointedBlockNumber(checkpointedBlockNumber) {
         const prevCheckpointed = this.checkpointedBlockNumber;
         this.checkpointedBlockNumber = checkpointedBlockNumber;
+        // Proposed checkpoint is always at least as advanced as checkpointed
+        if (this.proposedCheckpointBlockNumber < checkpointedBlockNumber) {
+            this.proposedCheckpointBlockNumber = checkpointedBlockNumber;
+        }
         // Auto-create single-block checkpoints for newly checkpointed blocks that don't have one yet.
         // This handles blocks added via addProposedBlocks that are now being marked as checkpointed.
         const newCheckpoints = [];
@@ -109,176 +159,93 @@ import { TxExecutionResult, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
    */ getRegistryAddress() {
         return Promise.resolve(EthAddress.random());
     }
-    /**
-   * Gets the number of the latest L2 block processed by the block source implementation.
-   * @returns In this mock instance, returns the number of L2 blocks that we've mocked.
-   */ getBlockNumber() {
-        return Promise.resolve(BlockNumber(this.l2Blocks.length));
-    }
-    getProvenBlockNumber() {
-        return Promise.resolve(BlockNumber(this.provenBlockNumber));
-    }
-    getCheckpointedL2BlockNumber() {
-        return Promise.resolve(BlockNumber(this.checkpointedBlockNumber));
-    }
-    getFinalizedL2BlockNumber() {
-        return Promise.resolve(BlockNumber(this.finalizedBlockNumber));
-    }
-    getCheckpointedBlock(number) {
-        if (number > this.checkpointedBlockNumber) {
-            return Promise.resolve(undefined);
+    async getBlockNumber(query) {
+        if (!query) {
+            return BlockNumber(this.l2Blocks.length);
         }
-        const block = this.l2Blocks[number - 1];
-        if (!block) {
-            return Promise.resolve(undefined);
+        if ('number' in query) {
+            return query.number;
         }
-        return Promise.resolve(this.toCheckpointedBlock(block));
-    }
-    async getCheckpointedBlocks(from, limit) {
-        const result = [];
-        for(let i = 0; i < limit; i++){
-            const blockNum = from + i;
-            if (blockNum > this.checkpointedBlockNumber) {
-                break;
-            }
-            const block = await this.getCheckpointedBlock(BlockNumber(blockNum));
-            if (block) {
-                result.push(block);
-            }
+        if ('tag' in query) {
+            return BlockNumber(this.resolveBlockTag(query.tag));
         }
-        return result;
+        const block = await this.getBlock(query);
+        return block ? block.header.globalVariables.blockNumber : undefined;
     }
-    /**
-   * Gets an l2 block.
-   * @param number - The block number to return (inclusive).
-   * @returns The requested L2 block.
-   */ getBlock(number) {
-        const block = this.l2Blocks[number - 1];
-        return Promise.resolve(block);
+    getProposedCheckpointL2BlockNumber() {
+        return Promise.resolve(BlockNumber(this.proposedCheckpointBlockNumber));
     }
-    /**
-   * Gets an L2 block (new format).
-   * @param number - The block number to return.
-   * @returns The requested L2 block.
-   */ getL2Block(number) {
-        const block = this.l2Blocks[number - 1];
-        return Promise.resolve(block);
+    getCheckpoint(query) {
+        const checkpoint = this.resolveCheckpointQuery(query);
+        if (!checkpoint) {
+            return Promise.resolve(undefined);
+        }
+        return Promise.resolve(new PublishedCheckpoint(checkpoint, this.mockL1DataForCheckpoint(checkpoint), []));
     }
-    /**
-   * Gets up to `limit` amount of L2 blocks starting from `from`.
-   * @param from - Number of the first block to return (inclusive).
-   * @param limit - The maximum number of blocks to return.
-   * @returns The requested mocked L2 blocks.
-   */ getBlocks(from, limit) {
-        return Promise.resolve(this.l2Blocks.slice(from - 1, from - 1 + limit));
-    }
-    getCheckpoints(from, limit) {
-        const checkpoints = this.checkpointList.slice(from - 1, from - 1 + limit);
+    getCheckpoints(query) {
+        const checkpoints = this.resolveCheckpointsQuery(query);
         return Promise.resolve(checkpoints.map((checkpoint)=>new PublishedCheckpoint(checkpoint, this.mockL1DataForCheckpoint(checkpoint), [])));
     }
     getCheckpointByArchive(archive) {
         const checkpoint = this.checkpointList.find((c)=>c.archive.root.equals(archive));
         return Promise.resolve(checkpoint);
     }
-    async getCheckpointedBlockByHash(blockHash) {
-        for (const block of this.l2Blocks){
-            const hash = await block.hash();
-            if (hash.equals(blockHash)) {
-                return this.toCheckpointedBlock(block);
-            }
-        }
-        return undefined;
-    }
-    getCheckpointedBlockByArchive(archive) {
-        const block = this.l2Blocks.find((b)=>b.archive.root.equals(archive));
-        if (!block) {
+    getCheckpointData(query) {
+        const checkpoint = this.resolveCheckpointQuery(query);
+        if (!checkpoint) {
             return Promise.resolve(undefined);
         }
-        return Promise.resolve(this.toCheckpointedBlock(block));
-    }
-    async getL2BlockByHash(blockHash) {
-        for (const block of this.l2Blocks){
-            const hash = await block.hash();
-            if (hash.equals(blockHash)) {
-                return block;
-            }
-        }
-        return undefined;
-    }
-    getL2BlockByArchive(archive) {
-        const block = this.l2Blocks.find((b)=>b.archive.root.equals(archive));
-        return Promise.resolve(block);
-    }
-    async getBlockHeaderByHash(blockHash) {
-        for (const block of this.l2Blocks){
-            const hash = await block.hash();
-            if (hash.equals(blockHash)) {
-                return block.header;
-            }
-        }
-        return undefined;
+        return Promise.resolve(this.checkpointToData(checkpoint));
     }
-    getBlockHeaderByArchive(archive) {
-        const block = this.l2Blocks.find((b)=>b.archive.root.equals(archive));
-        return Promise.resolve(block?.header);
+    getCheckpointsData(query) {
+        const checkpoints = this.resolveCheckpointsQuery(query);
+        return Promise.resolve(checkpoints.map((c)=>this.checkpointToData(c)));
     }
-    async getBlockData(number) {
-        const block = this.l2Blocks[number - 1];
-        if (!block) {
-            return undefined;
-        }
+    checkpointToData(checkpoint) {
         return {
-            header: block.header,
-            archive: block.archive,
-            blockHash: await block.hash(),
-            checkpointNumber: block.checkpointNumber,
-            indexWithinCheckpoint: block.indexWithinCheckpoint
+            checkpointNumber: checkpoint.number,
+            header: checkpoint.header,
+            archive: checkpoint.archive,
+            checkpointOutHash: computeCheckpointOutHash(checkpoint.blocks.map((b)=>b.body.txEffects.map((tx)=>tx.l2ToL1Msgs))),
+            startBlock: checkpoint.blocks[0].number,
+            blockCount: checkpoint.blocks.length,
+            feeAssetPriceModifier: checkpoint.feeAssetPriceModifier,
+            attestations: [],
+            l1: this.mockL1DataForCheckpoint(checkpoint)
         };
     }
-    async getBlockDataByArchive(archive) {
-        const block = this.l2Blocks.find((b)=>b.archive.root.equals(archive));
-        if (!block) {
-            return undefined;
+    resolveCheckpointQuery(query) {
+        if ('number' in query) {
+            return this.checkpointList[query.number - 1];
+        }
+        if ('slot' in query) {
+            return this.checkpointList.find((c)=>c.header.slotNumber === query.slot);
+        }
+        switch(query.tag){
+            case 'checkpointed':
+                return this.checkpointList[this.checkpointList.length - 1];
+            case 'proven':
+                {
+                    const provenCheckpoint = this.checkpointList.filter((c)=>c.blocks.some((b)=>b.number <= this.provenBlockNumber));
+                    return provenCheckpoint.at(-1);
+                }
+            case 'finalized':
+                {
+                    const finalizedCheckpoint = this.checkpointList.filter((c)=>c.blocks.some((b)=>b.number <= this.finalizedBlockNumber));
+                    return finalizedCheckpoint.at(-1);
+                }
         }
-        return {
-            header: block.header,
-            archive: block.archive,
-            blockHash: await block.hash(),
-            checkpointNumber: block.checkpointNumber,
-            indexWithinCheckpoint: block.indexWithinCheckpoint
-        };
-    }
-    getBlockHeader(number) {
-        return Promise.resolve(this.l2Blocks.at(typeof number === 'number' ? number - 1 : -1)?.header);
-    }
-    getCheckpointsForEpoch(epochNumber) {
-        return Promise.resolve(this.getCheckpointsInEpoch(epochNumber));
-    }
-    getCheckpointsDataForEpoch(epochNumber) {
-        const checkpoints = this.getCheckpointsInEpoch(epochNumber);
-        return Promise.resolve(checkpoints.map((checkpoint)=>({
-                checkpointNumber: checkpoint.number,
-                header: checkpoint.header,
-                archive: checkpoint.archive,
-                checkpointOutHash: computeCheckpointOutHash(checkpoint.blocks.map((b)=>b.body.txEffects.map((tx)=>tx.l2ToL1Msgs))),
-                startBlock: checkpoint.blocks[0].number,
-                blockCount: checkpoint.blocks.length,
-                attestations: [],
-                l1: this.mockL1DataForCheckpoint(checkpoint)
-            })));
     }
-    getCheckpointedBlocksForEpoch(epochNumber) {
-        const checkpoints = this.getCheckpointsInEpoch(epochNumber);
-        return Promise.resolve(checkpoints.flatMap((checkpoint)=>checkpoint.blocks.map((block)=>this.toCheckpointedBlock(block))));
+    resolveCheckpointsQuery(query) {
+        if ('from' in query) {
+            return this.checkpointList.slice(query.from - 1, query.from - 1 + query.limit);
+        }
+        return this.getCheckpointsInEpoch(query.epoch);
     }
     getBlocksForSlot(slotNumber) {
         const blocks = this.l2Blocks.filter((b)=>b.header.globalVariables.slotNumber === slotNumber);
         return Promise.resolve(blocks);
     }
-    async getCheckpointedBlockHeadersForEpoch(epochNumber) {
-        const checkpointedBlocks = await this.getCheckpointedBlocksForEpoch(epochNumber);
-        return checkpointedBlocks.map((b)=>b.block.header);
-    }
     /**
    * Gets a tx effect.
    * @param txHash - The hash of the tx corresponding to the tx effect.
@@ -296,63 +263,76 @@ import { TxExecutionResult, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
             data: txEffect,
             l2BlockNumber: block.number,
             l2BlockHash: await block.hash(),
-            txIndexInBlock: block.body.txEffects.indexOf(txEffect)
+            txIndexInBlock: block.body.txEffects.findIndex((t)=>t.txHash.equals(txHash)),
+            slotNumber: block.header.globalVariables.slotNumber
         };
     }
-    /**
-   * 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) {
-        for (const block of this.l2Blocks){
-            for (const txEffect of block.body.txEffects){
-                if (txEffect.txHash.equals(txHash)) {
-                    // In mock, assume all txs are checkpointed with successful execution
-                    return new TxReceipt(txHash, TxStatus.CHECKPOINTED, TxExecutionResult.SUCCESS, undefined, txEffect.transactionFee.toBigInt(), await block.hash(), block.number, getEpochAtSlot(block.slot, EmptyL1RollupConstants));
-                }
-            }
-        }
-        return undefined;
+    getL2ToL1MembershipWitness() {
+        // Mock does not back the L2-to-L1 message witness flow.
+        return Promise.resolve(undefined);
     }
     async getL2Tips() {
-        const [latest, proven, finalized, checkpointed] = [
+        const [latest, proven, finalized, checkpointed, proposedCheckpoint] = [
             await this.getBlockNumber(),
-            await this.getProvenBlockNumber(),
+            this.provenBlockNumber,
             this.finalizedBlockNumber,
-            this.checkpointedBlockNumber
+            this.checkpointedBlockNumber,
+            await this.getProposedCheckpointL2BlockNumber()
         ];
         const latestBlock = this.l2Blocks[latest - 1];
         const provenBlock = this.l2Blocks[proven - 1];
         const finalizedBlock = this.l2Blocks[finalized - 1];
         const checkpointedBlock = this.l2Blocks[checkpointed - 1];
+        const proposedCheckpointBlock = this.l2Blocks[proposedCheckpoint - 1];
+        // For genesis tips (block number 0) report the dynamic initial header hash so consumers
+        // running L2BlockStream against this mock agree at block 0 with their local tip store.
+        const genesisHash = (await this.initialHeader.hash()).toString();
+        const tipHash = async (block, number)=>{
+            if (block) {
+                return (await block.hash()).toString();
+            }
+            return number === 0 ? genesisHash : '';
+        };
         const latestBlockId = {
             number: BlockNumber(latest),
-            hash: (await latestBlock?.hash())?.toString()
+            hash: await tipHash(latestBlock, latest)
         };
         const provenBlockId = {
             number: BlockNumber(proven),
-            hash: (await provenBlock?.hash())?.toString()
+            hash: await tipHash(provenBlock, proven)
         };
         const finalizedBlockId = {
             number: BlockNumber(finalized),
-            hash: (await finalizedBlock?.hash())?.toString()
+            hash: await tipHash(finalizedBlock, finalized)
         };
         const checkpointedBlockId = {
             number: BlockNumber(checkpointed),
-            hash: (await checkpointedBlock?.hash())?.toString()
+            hash: await tipHash(checkpointedBlock, checkpointed)
         };
-        const makeTipId = (blockId)=>({
+        const proposedCheckpointBlockId = {
+            number: BlockNumber(proposedCheckpoint),
+            hash: await tipHash(proposedCheckpointBlock, proposedCheckpoint)
+        };
+        const makeTipId = (blockId)=>{
+            const checkpointNumber = this.findCheckpointNumberForBlock(blockId.number) ?? CheckpointNumber(0);
+            // Match production semantics: checkpoint 0 is fully synthetic (no real checkpoint header
+            // exists at 0), so its hash stays at the protocol constant `GENESIS_CHECKPOINT_HEADER_HASH`
+            // even though the block-0 hash is dynamic. See L2TipsCache for the production path.
+            const hash = checkpointNumber === 0 ? GENESIS_CHECKPOINT_HEADER_HASH.toString() : blockId.hash;
+            return {
                 block: blockId,
                 checkpoint: {
-                    number: this.findCheckpointNumberForBlock(blockId.number) ?? CheckpointNumber(0),
-                    hash: blockId.hash
+                    number: checkpointNumber,
+                    hash
                 }
-            });
+            };
+        };
         return {
             proposed: latestBlockId,
             checkpointed: makeTipId(checkpointedBlockId),
             proven: makeTipId(provenBlockId),
-            finalized: makeTipId(finalizedBlockId)
+            finalized: makeTipId(finalizedBlockId),
+            proposedCheckpoint: makeTipId(proposedCheckpointBlockId)
         };
     }
     getSyncedL2EpochNumber() {
@@ -367,9 +347,12 @@ import { TxExecutionResult, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
     getL1Constants() {
         return Promise.resolve(EmptyL1RollupConstants);
     }
+    isPruneDueAtSlot(_slot) {
+        return Promise.resolve(false);
+    }
     getGenesisValues() {
         return Promise.resolve({
-            genesisArchiveRoot: new Fr(GENESIS_ARCHIVE_ROOT)
+            genesisArchiveRoot: this.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT)
         });
     }
     getL1Timestamp() {
@@ -410,6 +393,88 @@ import { TxExecutionResult, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
     syncImmediate() {
         return Promise.resolve();
     }
+    async getBlock(query) {
+        if ('number' in query) {
+            if (query.number === 0) {
+                return this.getGenesisBlock();
+            }
+            return this.l2Blocks[query.number - 1];
+        }
+        if ('hash' in query) {
+            const genesis = this.getGenesisBlock();
+            if ((await genesis.hash()).equals(query.hash)) {
+                return genesis;
+            }
+            for (const b of this.l2Blocks){
+                const hash = await b.hash();
+                if (hash.equals(query.hash)) {
+                    return b;
+                }
+            }
+            return undefined;
+        }
+        if ('archive' in query) {
+            const genesis = this.getGenesisBlock();
+            if (genesis.archive.root.equals(query.archive)) {
+                return genesis;
+            }
+            return this.l2Blocks.find((b)=>b.archive.root.equals(query.archive));
+        }
+        const number = this.resolveBlockTag(query.tag);
+        if (number === 0) {
+            return this.getGenesisBlock();
+        }
+        return this.l2Blocks[number - 1];
+    }
+    resolveBlockTag(tag) {
+        switch(tag){
+            case 'latest':
+            case 'proposed':
+                return this.l2Blocks.length;
+            case 'checkpointed':
+                return this.checkpointedBlockNumber;
+            case 'proven':
+                return this.provenBlockNumber;
+            case 'finalized':
+                return this.finalizedBlockNumber;
+        }
+    }
+    getBlocks(query) {
+        let blocks;
+        if ('from' in query) {
+            blocks = this.l2Blocks.slice(query.from - 1, query.from - 1 + query.limit);
+        } else {
+            const epochCheckpoints = this.getCheckpointsInEpoch(query.epoch);
+            blocks = epochCheckpoints.flatMap((c)=>c.blocks);
+        }
+        if (query.onlyCheckpointed) {
+            blocks = blocks.filter((b)=>b.header.globalVariables.blockNumber <= this.checkpointedBlockNumber);
+        }
+        return Promise.resolve(blocks);
+    }
+    async getBlockData(query) {
+        const block = await this.getBlock(query);
+        if (!block) {
+            return undefined;
+        }
+        return {
+            header: block.header,
+            archive: block.archive,
+            blockHash: await block.hash(),
+            checkpointNumber: block.checkpointNumber,
+            indexWithinCheckpoint: block.indexWithinCheckpoint
+        };
+    }
+    async getBlocksData(query) {
+        const blocks = await this.getBlocks(query);
+        return Promise.all(blocks.map(async (block)=>({
+                header: block.header,
+                archive: block.archive,
+                blockHash: await block.hash(),
+                checkpointNumber: block.checkpointNumber,
+                indexWithinCheckpoint: block.indexWithinCheckpoint
+            })));
+    }
     isPendingChainInvalid() {
         return Promise.resolve(false);
     }
@@ -418,6 +483,9 @@ import { TxExecutionResult, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
             valid: true
         });
     }
+    getProposedCheckpointData(_query) {
+        return Promise.resolve(undefined);
+    }
     /** Returns checkpoints whose slot falls within the given epoch. */ getCheckpointsInEpoch(epochNumber) {
         const epochDuration = DefaultL1ContractsConfig.aztecEpochDuration;
         const [start, end] = getSlotRangeForEpoch(epochNumber, {
@@ -428,11 +496,6 @@ import { TxExecutionResult, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
     /** Creates a mock L1PublishedData for a checkpoint. */ mockL1DataForCheckpoint(checkpoint) {
         return new L1PublishedData(BigInt(checkpoint.number), BigInt(checkpoint.number), Buffer32.random().toString());
     }
-    /** Creates a CheckpointedL2Block from a block using stored checkpoint info. */ toCheckpointedBlock(block) {
-        const checkpoint = this.checkpointList.find((c)=>c.blocks.some((b)=>b.number === block.number));
-        const checkpointNumber = checkpoint?.number ?? block.checkpointNumber;
-        return new CheckpointedL2Block(checkpointNumber, block, new L1PublishedData(BigInt(block.number), BigInt(block.number), `0x${block.number.toString(16).padStart(64, '0')}`), []);
-    }
     /** Finds the checkpoint number for a block, or undefined if the block is not in any checkpoint. */ findCheckpointNumberForBlock(blockNumber) {
         const checkpoint = this.checkpointList.find((c)=>c.blocks.some((b)=>b.number === blockNumber));
         return checkpoint?.number;

package/dest/test/noop_l1_archiver.d.ts

@@ -1,26 +1,30 @@
 import { SlotNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
+import { DateProvider } from '@aztec/foundation/timer';
+import type { BlockHash } from '@aztec/stdlib/block';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
+import type { BlockHeader } from '@aztec/stdlib/tx';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import { Archiver } from '../archiver.js';
 import { ArchiverInstrumentation } from '../modules/instrumentation.js';
-import type { KVArchiverDataStore } from '../store/kv_archiver_store.js';
+import type { ArchiverDataStores } from '../store/data_stores.js';
+import { L2TipsCache } from '../store/l2_tips_cache.js';
 /**
  * Archiver with mocked L1 connectivity for testing.
  * Uses mock L1 clients and a noop synchronizer, enabling tests that
  * don't require real Ethereum connectivity.
  */
 export declare class NoopL1Archiver extends Archiver {
-    constructor(dataStore: KVArchiverDataStore, l1Constants: L1RollupConstants & {
+    constructor(dataStores: ArchiverDataStores, l1Constants: L1RollupConstants & {
         genesisArchiveRoot: Fr;
-    }, instrumentation: ArchiverInstrumentation);
+    }, instrumentation: ArchiverInstrumentation, initialHeader: BlockHeader, initialBlockHash: BlockHash, l2TipsCache: L2TipsCache, dateProvider?: DateProvider);
     /** Override start to skip L1 validation checks. */
     start(_blockUntilSynced?: boolean): Promise<void>;
     /** Always reports as fully synced since there is no real L1 to sync from. */
     getSyncedL2SlotNumber(): Promise<SlotNumber | undefined>;
 }
 /** Creates an archiver with mocked L1 connectivity for testing. */
-export declare function createNoopL1Archiver(dataStore: KVArchiverDataStore, l1Constants: L1RollupConstants & {
+export declare function createNoopL1Archiver(dataStores: ArchiverDataStores, l1Constants: L1RollupConstants & {
     genesisArchiveRoot: Fr;
-}, telemetry?: TelemetryClient): Promise<NoopL1Archiver>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9vcF9sMV9hcmNoaXZlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3Qvbm9vcF9sMV9hcmNoaXZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFN0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBSXBELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDckUsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFtQyxNQUFNLHlCQUF5QixDQUFDO0FBS2hHLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUMxQyxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUV4RSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBeUJ6RTs7OztHQUlHO0FBQ0gscUJBQWEsY0FBZSxTQUFRLFFBQVE7SUFDMUMsWUFDRSxTQUFTLEVBQUUsbUJBQW1CLEVBQzlCLFdBQVcsRUFBRSxpQkFBaUIsR0FBRztRQUFFLGtCQUFrQixFQUFFLEVBQUUsQ0FBQTtLQUFFLEVBQzNELGVBQWUsRUFBRSx1QkFBdUIsRUF1Q3pDO0lBRUQsbURBQW1EO0lBQ25DLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxFQUFFLE9BQU8sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSWhFO0lBRUQsNkVBQTZFO0lBQzdELHFCQUFxQixJQUFJLE9BQU8sQ0FBQyxVQUFVLEdBQUcsU0FBUyxDQUFDLENBRXZFO0NBQ0Y7QUFFRCxtRUFBbUU7QUFDbkUsd0JBQXNCLG9CQUFvQixDQUN4QyxTQUFTLEVBQUUsbUJBQW1CLEVBQzlCLFdBQVcsRUFBRSxpQkFBaUIsR0FBRztJQUFFLGtCQUFrQixFQUFFLEVBQUUsQ0FBQTtDQUFFLEVBQzNELFNBQVMsR0FBRSxlQUFzQyxHQUNoRCxPQUFPLENBQUMsY0FBYyxDQUFDLENBR3pCIn0=
+}, telemetry: TelemetryClient | undefined, initialHeader: BlockHeader, dateProvider?: DateProvider): Promise<NoopL1Archiver>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9vcF9sMV9hcmNoaXZlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3Qvbm9vcF9sMV9hcmNoaXZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFN0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV2RCxPQUFPLEtBQUssRUFBbUIsU0FBUyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDdEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQW1DLE1BQU0seUJBQXlCLENBQUM7QUFLaEcsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQzFDLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRXhFLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbEUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBeUJ4RDs7OztHQUlHO0FBQ0gscUJBQWEsY0FBZSxTQUFRLFFBQVE7SUFDMUMsWUFDRSxVQUFVLEVBQUUsa0JBQWtCLEVBQzlCLFdBQVcsRUFBRSxpQkFBaUIsR0FBRztRQUFFLGtCQUFrQixFQUFFLEVBQUUsQ0FBQTtLQUFFLEVBQzNELGVBQWUsRUFBRSx1QkFBdUIsRUFDeEMsYUFBYSxFQUFFLFdBQVcsRUFDMUIsZ0JBQWdCLEVBQUUsU0FBUyxFQUMzQixXQUFXLEVBQUUsV0FBVyxFQUN4QixZQUFZLEdBQUUsWUFBaUMsRUFpRGhEO0lBRUQsbURBQW1EO0lBQ25DLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxFQUFFLE9BQU8sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSWhFO0lBRUQsNkVBQTZFO0lBQzdELHFCQUFxQixJQUFJLE9BQU8sQ0FBQyxVQUFVLEdBQUcsU0FBUyxDQUFDLENBRXZFO0NBQ0Y7QUFFRCxtRUFBbUU7QUFDbkUsd0JBQXNCLG9CQUFvQixDQUN4QyxVQUFVLEVBQUUsa0JBQWtCLEVBQzlCLFdBQVcsRUFBRSxpQkFBaUIsR0FBRztJQUFFLGtCQUFrQixFQUFFLEVBQUUsQ0FBQTtDQUFFLEVBQzNELFNBQVMsNkJBQXdDLEVBQ2pELGFBQWEsRUFBRSxXQUFXLEVBQzFCLFlBQVksQ0FBQyxFQUFFLFlBQVksR0FDMUIsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQWlCekIifQ==

package/dest/test/noop_l1_archiver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"noop_l1_archiver.d.ts","sourceRoot":"","sources":["../../src/test/noop_l1_archiver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,KAAK,eAAe,EAAmC,MAAM,yBAAyB,CAAC;AAKhG,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAyBzE;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IAC1C,YACE,SAAS,EAAE,mBAAmB,EAC9B,WAAW,EAAE,iBAAiB,GAAG;QAAE,kBAAkB,EAAE,EAAE,CAAA;KAAE,EAC3D,eAAe,EAAE,uBAAuB,EAuCzC;IAED,mDAAmD;IACnC,KAAK,CAAC,iBAAiB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAIhE;IAED,6EAA6E;IAC7D,qBAAqB,IAAI,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAEvE;CACF;AAED,mEAAmE;AACnE,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,mBAAmB,EAC9B,WAAW,EAAE,iBAAiB,GAAG;IAAE,kBAAkB,EAAE,EAAE,CAAA;CAAE,EAC3D,SAAS,GAAE,eAAsC,GAChD,OAAO,CAAC,cAAc,CAAC,CAGzB"}
+{"version":3,"file":"noop_l1_archiver.d.ts","sourceRoot":"","sources":["../../src/test/noop_l1_archiver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,KAAK,EAAmB,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,KAAK,eAAe,EAAmC,MAAM,yBAAyB,CAAC;AAKhG,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAyBxD;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IAC1C,YACE,UAAU,EAAE,kBAAkB,EAC9B,WAAW,EAAE,iBAAiB,GAAG;QAAE,kBAAkB,EAAE,EAAE,CAAA;KAAE,EAC3D,eAAe,EAAE,uBAAuB,EACxC,aAAa,EAAE,WAAW,EAC1B,gBAAgB,EAAE,SAAS,EAC3B,WAAW,EAAE,WAAW,EACxB,YAAY,GAAE,YAAiC,EAiDhD;IAED,mDAAmD;IACnC,KAAK,CAAC,iBAAiB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAIhE;IAED,6EAA6E;IAC7D,qBAAqB,IAAI,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAEvE;CACF;AAED,mEAAmE;AACnE,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,kBAAkB,EAC9B,WAAW,EAAE,iBAAiB,GAAG;IAAE,kBAAkB,EAAE,EAAE,CAAA;CAAE,EAC3D,SAAS,6BAAwC,EACjD,aAAa,EAAE,WAAW,EAC1B,YAAY,CAAC,EAAE,YAAY,GAC1B,OAAO,CAAC,cAAc,CAAC,CAiBzB"}