@aztec/archiver 0.0.1-commit.2b2662070 → 0.0.1-commit.2c0ee1788

package/dest/modules/validation.js

@@ -5,15 +5,15 @@ import { ConsensusPayload } from '@aztec/stdlib/p2p';
 /**
  * Extracts attestation information from a published checkpoint.
  * Returns info for each attestation, preserving array indices.
- */ export function getAttestationInfoFromPublishedCheckpoint({ checkpoint, attestations }) {
-    const payload = ConsensusPayload.fromCheckpoint(checkpoint);
+ */ export function getAttestationInfoFromPublishedCheckpoint({ checkpoint, attestations }, signatureContext) {
+    const payload = ConsensusPayload.fromCheckpoint(checkpoint, signatureContext);
     return getAttestationInfoFromPayload(payload, attestations);
 }
 /**
  * Validates the attestations submitted for the given checkpoint.
  * Returns true if the attestations are valid and sufficient, false otherwise.
- */ export async function validateCheckpointAttestations(publishedCheckpoint, epochCache, constants, logger) {
-    const attestorInfos = getAttestationInfoFromPublishedCheckpoint(publishedCheckpoint);
+ */ export async function validateCheckpointAttestations(publishedCheckpoint, epochCache, constants, signatureContext, logger) {
+    const attestorInfos = getAttestationInfoFromPublishedCheckpoint(publishedCheckpoint, signatureContext);
     const attestors = compactArray(attestorInfos.map((info)=>'address' in info ? info.address : undefined));
     const { checkpoint, attestations } = publishedCheckpoint;
     const headerHash = checkpoint.header.hash();

package/dest/store/block_store.d.ts

@@ -2,8 +2,8 @@ import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/bra
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { type BlockData, BlockHash, CheckpointedL2Block, L2Block, type ValidateCheckpointResult } from '@aztec/stdlib/block';
-import { type CheckpointData, type CommonCheckpointData, type ProposedCheckpointData, type ProposedCheckpointInput, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+import { type BlockData, type BlockDataWithCheckpointContext, BlockHash, CheckpointedL2Block, CommitteeAttestation, L2Block, type ValidateCheckpointResult } from '@aztec/stdlib/block';
+import { type CheckpointData, type CommonCheckpointData, L1PublishedData, type ProposedCheckpointData, type ProposedCheckpointInput, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import { BlockHeader, type IndexedTxEffect, TxHash, TxReceipt } from '@aztec/stdlib/tx';
 export { TxReceipt, type TxEffect, type TxHash } from '@aztec/stdlib/tx';
@@ -46,7 +46,7 @@ export declare class BlockStore {
     /**
      * Validates that blocks are sequential, have correct indexes, and chain via archive roots.
      * This is the same validation used for both confirmed checkpoints (addCheckpoints) and
-     * proposed checkpoints (setProposedCheckpoint).
+     * proposed checkpoints (addProposedCheckpoint).
      */
     private validateCheckpointBlocks;
     private addBlockToDatabase;
@@ -80,19 +80,39 @@ export declare class BlockStore {
     getProvenBlockNumber(): Promise<BlockNumber>;
     getLatestCheckpointNumber(): Promise<CheckpointNumber>;
     hasProposedCheckpoint(): Promise<boolean>;
-    /** Deletes the proposed checkpoint from storage. */
-    deleteProposedCheckpoint(): Promise<void>;
-    /** Clears the proposed checkpoint if the given confirmed checkpoint number supersedes it. */
-    clearProposedCheckpointIfSuperseded(confirmedCheckpointNumber: CheckpointNumber): Promise<void>;
-    /** Returns the proposed checkpoint data, or undefined if no proposed checkpoint exists. No fallback to confirmed. */
-    getProposedCheckpointOnly(): Promise<ProposedCheckpointData | undefined>;
-    /**
-     * Gets the checkpoint at the proposed tip
-     * - pending checkpoint if it exists
+    /** Deletes all pending proposed checkpoints from storage. */
+    deleteProposedCheckpoints(): Promise<void>;
+    /**
+     * Promotes a specific pending checkpoint to a confirmed checkpoint entry.
+     * This persists the checkpoint to the store, removes only that pending entry, and updates the L1 sync point.
+     * Remaining pending entries (e.g. N+1, N+2) are left intact — they chain off the just-promoted one.
+     * @param checkpointNumber - The checkpoint number to promote.
+     * @param l1 - L1 published data for the checkpoint.
+     * @param attestations - Committee attestations.
+     * @param expectedArchiveRoot - Archive root guard against races.
+     */
+    promoteProposedToCheckpointed(checkpointNumber: CheckpointNumber, l1: L1PublishedData, attestations: CommitteeAttestation[], expectedArchiveRoot: Fr): Promise<void>;
+    /**
+     * Returns the latest pending checkpoint (highest-numbered entry), or undefined if none.
+     * No fallback to confirmed.
+     */
+    getLastProposedCheckpoint(): Promise<ProposedCheckpointData | undefined>;
+    /** Returns the pending checkpoint for a specific checkpoint number, or undefined if not found. */
+    getProposedCheckpointByNumber(n: CheckpointNumber): Promise<ProposedCheckpointData | undefined>;
+    /** Returns all pending checkpoints in ascending checkpoint-number order. */
+    getProposedCheckpoints(): Promise<ProposedCheckpointData[]>;
+    /**
+     * Evicts all pending checkpoints with checkpoint number >= fromNumber.
+     * Used for divergent-mined-checkpoint cleanup: when L1 mines checkpoint N with a different archive,
+     * all pending >= N must be evicted since they chain off the now-invalid pending N.
+     */
+    evictProposedCheckpointsFrom(fromNumber: CheckpointNumber): Promise<void>;
+    /**
+     * Gets the checkpoint at the proposed tip:
+     * - latest pending checkpoint if any exist
      * - fallsback to latest confirmed checkpoint otherwise
-     * @returns CommonCheckpointData
      */
-    getProposedCheckpoint(): Promise<CommonCheckpointData | undefined>;
+    getLastCheckpoint(): Promise<CommonCheckpointData | undefined>;
     private convertToProposedCheckpointData;
     /**
      * Attempts to get the proposedCheckpoint's number, if there is not one, then fallback to the latest confirmed checkpoint number.
@@ -111,7 +131,9 @@ export declare class BlockStore {
      * @param limit - The number of blocks to return.
      * @returns The requested L2 blocks
      */
-    getCheckpointedBlocks(start: BlockNumber, limit: number): AsyncIterableIterator<CheckpointedL2Block>;
+    getCheckpointedBlocks(start: BlockNumber, limit: number): Promise<CheckpointedL2Block[]>;
+    /** Async iterator variant of {@link getCheckpointedBlocks}. */
+    iterateCheckpointedBlocks(start: BlockNumber, limit: number): AsyncIterableIterator<CheckpointedL2Block>;
     getCheckpointedBlockByHash(blockHash: BlockHash): Promise<CheckpointedL2Block | undefined>;
     getCheckpointedBlockByArchive(archive: Fr): Promise<CheckpointedL2Block | undefined>;
     /**
@@ -120,13 +142,23 @@ export declare class BlockStore {
      * @param limit - The number of blocks to return.
      * @returns The requested L2 blocks
      */
-    getBlocks(start: BlockNumber, limit: number): AsyncIterableIterator<L2Block>;
+    getBlocks(start: BlockNumber, limit: number): Promise<L2Block[]>;
+    /** Async iterator variant of {@link getBlocks}. */
+    iterateBlocks(start: BlockNumber, limit: number): AsyncIterableIterator<L2Block>;
     /**
      * Gets block metadata (without tx data) by block number.
      * @param blockNumber - The number of the block to return.
      * @returns The requested block data.
      */
     getBlockData(blockNumber: BlockNumber): Promise<BlockData | undefined>;
+    /**
+     * Gets block metadata plus checkpoint-derived context (L1 publish info, attestations) without
+     * deserializing tx bodies. When the block's containing checkpoint has not yet been L1-confirmed,
+     * `checkpoint` and `l1` are `undefined` and `attestations` is empty.
+     */
+    getBlockDataWithCheckpointContext(blockNumber: BlockNumber): Promise<BlockDataWithCheckpointContext | undefined>;
+    /** Returns the checkpoint number that contains the given slot (or undefined if not found). */
+    getCheckpointNumberBySlot(slot: SlotNumber): Promise<CheckpointNumber | undefined>;
     /**
      * Gets block metadata (without tx data) by archive root.
      * @param archive - The archive root of the block to return.
@@ -169,7 +201,9 @@ export declare class BlockStore {
      * @param limit - The number of blocks to return.
      * @returns The requested L2 block headers
      */
-    getBlockHeaders(start: BlockNumber, limit: number): AsyncIterableIterator<BlockHeader>;
+    getBlockHeaders(start: BlockNumber, limit: number): Promise<BlockHeader[]>;
+    /** Async iterator variant of {@link getBlockHeaders}. */
+    iterateBlockHeaders(start: BlockNumber, limit: number): AsyncIterableIterator<BlockHeader>;
     private getBlockStorages;
     private getBlockDataFromBlockStorage;
     private getBlockFromBlockStorage;
@@ -209,9 +243,13 @@ export declare class BlockStore {
      */
     getSynchedL1BlockNumber(): Promise<bigint | undefined>;
     setSynchedL1BlockNumber(l1BlockNumber: bigint): Promise<boolean>;
-    /** Sets the proposed checkpoint (not yet L1-confirmed). Only accepts confirmed + 1.
-     *  Computes archive and checkpointOutHash from the stored blocks. */
-    setProposedCheckpoint(proposed: ProposedCheckpointInput): Promise<void>;
+    /**
+     * Adds a proposed checkpoint to the pending queue.
+     * Accepts proposed.checkpointNumber === latestTip + 1, where latestTip is the highest of
+     * confirmed and the highest pending checkpoint number.
+     * Computes archive and checkpointOutHash from the stored blocks.
+     */
+    addProposedCheckpoint(proposed: ProposedCheckpointInput): Promise<void>;
     getProvenCheckpointNumber(): Promise<CheckpointNumber>;
     setProvenCheckpointNumber(checkpointNumber: CheckpointNumber): Promise<boolean>;
     getFinalizedCheckpointNumber(): Promise<CheckpointNumber>;
@@ -227,4 +265,4 @@ export declare class BlockStore {
      */
     setPendingChainValidationStatus(status: ValidateCheckpointResult | undefined): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZS9ibG9ja19zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsV0FBVyxFQUFFLGdCQUFnQixFQUF5QixVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuSCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFNcEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQTZDLE1BQU0saUJBQWlCLENBQUM7QUFDcEcsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxFQUNMLEtBQUssU0FBUyxFQUNkLFNBQVMsRUFFVCxtQkFBbUIsRUFFbkIsT0FBTyxFQUNQLEtBQUssd0JBQXdCLEVBRzlCLE1BQU0scUJBQXFCLENBQUM7QUFDN0IsT0FBTyxFQUVMLEtBQUssY0FBYyxFQUNuQixLQUFLLG9CQUFvQixFQUV6QixLQUFLLHNCQUFzQixFQUMzQixLQUFLLHVCQUF1QixFQUM1QixtQkFBbUIsRUFDcEIsTUFBTSwwQkFBMEIsQ0FBQztBQUNsQyxPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBa0IsTUFBTSw2QkFBNkIsQ0FBQztBQUdyRixPQUFPLEVBQ0wsV0FBVyxFQUNYLEtBQUssZUFBZSxFQUVwQixNQUFNLEVBQ04sU0FBUyxFQUlWLE1BQU0sa0JBQWtCLENBQUM7QUFnQjFCLE9BQU8sRUFBRSxTQUFTLEVBQUUsS0FBSyxRQUFRLEVBQUUsS0FBSyxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQWlDekUsTUFBTSxNQUFNLHVCQUF1QixHQUFHO0lBQUUsYUFBYSxFQUFFLE9BQU8sRUFBRSxHQUFHLFNBQVMsQ0FBQTtDQUFFLENBQUM7QUFFL0U7O0dBRUc7QUFDSCxxQkFBYSxVQUFVOztJQTBDVCxPQUFPLENBQUMsRUFBRTtJQUF0QixZQUFvQixFQUFFLEVBQUUs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZS9ibG9ja19zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsV0FBVyxFQUFFLGdCQUFnQixFQUF5QixVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuSCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFNcEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQTZDLE1BQU0saUJBQWlCLENBQUM7QUFDcEcsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxFQUNMLEtBQUssU0FBUyxFQUNkLEtBQUssOEJBQThCLEVBQ25DLFNBQVMsRUFFVCxtQkFBbUIsRUFDbkIsb0JBQW9CLEVBQ3BCLE9BQU8sRUFDUCxLQUFLLHdCQUF3QixFQUc5QixNQUFNLHFCQUFxQixDQUFDO0FBQzdCLE9BQU8sRUFFTCxLQUFLLGNBQWMsRUFDbkIsS0FBSyxvQkFBb0IsRUFDekIsZUFBZSxFQUNmLEtBQUssc0JBQXNCLEVBQzNCLEtBQUssdUJBQXVCLEVBQzVCLG1CQUFtQixFQUNwQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xDLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUFrQixNQUFNLDZCQUE2QixDQUFDO0FBR3JGLE9BQU8sRUFDTCxXQUFXLEVBQ1gsS0FBSyxlQUFlLEVBRXBCLE1BQU0sRUFDTixTQUFTLEVBSVYsTUFBTSxrQkFBa0IsQ0FBQztBQW1CMUIsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLFFBQVEsRUFBRSxLQUFLLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBa0N6RSxNQUFNLE1BQU0sdUJBQXVCLEdBQUc7SUFBRSxhQUFhLEVBQUUsT0FBTyxFQUFFLEdBQUcsU0FBUyxDQUFBO0NBQUUsQ0FBQztBQUUvRTs7R0FFRztBQUNILHFCQUFhLFVBQVU7O0lB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

package/dest/store/block_store.d.ts.map

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

package/dest/store/block_store.js

@@ -12,14 +12,15 @@ import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
 import { BlockHeader, TxHash, TxReceipt, TxStatus, deserializeIndexedTxEffect, serializeIndexedTxEffect } from '@aztec/stdlib/tx';
-import { BlockAlreadyCheckpointedError, BlockArchiveNotConsistentError, BlockIndexNotSequentialError, BlockNotFoundError, BlockNumberNotSequentialError, CannotOverwriteCheckpointedBlockError, CheckpointNotFoundError, CheckpointNumberNotSequentialError, InitialCheckpointNumberNotSequentialError, ProposedCheckpointNotSequentialError, ProposedCheckpointStaleError } from '../errors.js';
+import { BlockAlreadyCheckpointedError, BlockArchiveNotConsistentError, BlockCheckpointNumberNotSequentialError, BlockIndexNotSequentialError, BlockNotFoundError, BlockNumberNotSequentialError, CannotOverwriteCheckpointedBlockError, CheckpointNotFoundError, CheckpointNumberNotSequentialError, InitialCheckpointNumberNotSequentialError, NoProposedCheckpointToPromoteError, ProposedCheckpointArchiveRootMismatchError, ProposedCheckpointNotSequentialError, ProposedCheckpointPromotionNotSequentialError } from '../errors.js';
 export { TxReceipt } from '@aztec/stdlib/tx';
 /**
  * LMDB-based block storage for the archiver.
  */ export class BlockStore {
     db;
     /** Map block number to block data */ #blocks;
-    /** Map checkpoint number to checkpoint data */ #checkpoints;
+    /** Map keyed by checkpoint number holding proposed (locally-validated, not yet L1-confirmed) checkpoints. */ #proposedCheckpoints;
+    /** Map checkpoint number to checkpoint data for mined checkpoints only */ #checkpoints;
     /** Map slot number to checkpoint number, for looking up checkpoints by slot range. */ #slotToCheckpoint;
     /** Map block hash to list of tx hashes */ #blockTxs;
     /** Tx hash to serialized IndexedTxEffect */ #txEffects;
@@ -30,7 +31,6 @@ export { TxReceipt } from '@aztec/stdlib/tx';
     /** 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;
-    /** Singleton: assumes max 1-deep pipeline. For deeper pipelining, replace with a map keyed by checkpoint number. */ #proposedCheckpoint;
     #log;
     constructor(db){
         this.db = db;
@@ -47,7 +47,7 @@ export { TxReceipt } from '@aztec/stdlib/tx';
         this.#pendingChainValidationStatus = db.openSingleton('archiver_pending_chain_validation_status');
         this.#checkpoints = db.openMap('archiver_checkpoints');
         this.#slotToCheckpoint = db.openMap('archiver_slot_to_checkpoint');
-        this.#proposedCheckpoint = db.openSingleton('proposed_checkpoint_data');
+        this.#proposedCheckpoints = db.openMap('archiver_proposed_checkpoints');
     }
     /**
    * Returns the finalized L2 block number. An L2 block is finalized when it was proven
@@ -78,8 +78,7 @@ export { TxReceipt } from '@aztec/stdlib/tx';
             const blockLastArchive = block.header.lastArchive.root;
             // Extract the latest block and checkpoint numbers
             const previousBlockNumber = await this.getLatestL2BlockNumber();
-            const proposedCheckpointNumber = await this.getProposedCheckpointNumber();
-            const previousCheckpointNumber = await this.getLatestCheckpointNumber();
+            const latestCheckpointNumber = await this.getLatestCheckpointNumber();
             // Verify we're not overwriting checkpointed blocks
             const lastCheckpointedBlockNumber = await this.getCheckpointedL2BlockNumber();
             if (!opts.force && blockNumber <= lastCheckpointedBlockNumber) {
@@ -94,18 +93,17 @@ export { TxReceipt } from '@aztec/stdlib/tx';
             if (!opts.force && previousBlockNumber !== blockNumber - 1) {
                 throw new BlockNumberNotSequentialError(blockNumber, previousBlockNumber);
             }
-            // The same check as above but for checkpoints. Accept the block if either the confirmed
-            // checkpoint or the pending (locally validated but not yet confirmed) checkpoint matches.
+            // Accept the block if either the confirmed checkpoint or a pending checkpoint matches
+            // the expected predecessor. We look for a pending entry at exactly blockCheckpointNumber - 1.
             const expectedCheckpointNumber = blockCheckpointNumber - 1;
-            if (!opts.force && previousCheckpointNumber !== expectedCheckpointNumber && proposedCheckpointNumber !== expectedCheckpointNumber) {
-                const [reported, source] = proposedCheckpointNumber > previousCheckpointNumber ? [
-                    proposedCheckpointNumber,
-                    'proposed'
-                ] : [
-                    previousCheckpointNumber,
-                    'confirmed'
-                ];
-                throw new CheckpointNumberNotSequentialError(blockCheckpointNumber, reported, source);
+            const hasPendingAtExpected = await this.#proposedCheckpoints.hasAsync(expectedCheckpointNumber);
+            if (!opts.force && latestCheckpointNumber !== expectedCheckpointNumber && !hasPendingAtExpected) {
+                const [latestPendingKey] = await toArray(this.#proposedCheckpoints.keysAsync({
+                    reverse: true,
+                    limit: 1
+                }));
+                const previous = CheckpointNumber(Math.max(latestCheckpointNumber, latestPendingKey ?? 0));
+                throw new BlockCheckpointNumberNotSequentialError(blockNumber, blockCheckpointNumber, previous);
             }
             // Extract the previous block if there is one and see if it is for the same checkpoint or not
             const previousBlockResult = await this.getBlock(previousBlockNumber);
@@ -181,14 +179,14 @@ export { TxReceipt } from '@aztec/stdlib/tx';
                     attestations: checkpoint.attestations.map((attestation)=>attestation.toBuffer()),
                     checkpointNumber: checkpoint.checkpoint.number,
                     startBlock: checkpoint.checkpoint.blocks[0].number,
-                    blockCount: checkpoint.checkpoint.blocks.length
+                    blockCount: checkpoint.checkpoint.blocks.length,
+                    feeAssetPriceModifier: checkpoint.checkpoint.feeAssetPriceModifier.toString()
                 });
                 // Update slot-to-checkpoint index
                 await this.#slotToCheckpoint.set(checkpoint.checkpoint.header.slotNumber, checkpoint.checkpoint.number);
+                // Remove proposed checkpoint if it exists, since L1 is authoritative
+                await this.#proposedCheckpoints.delete(checkpoint.checkpoint.number);
             }
-            // Clear the proposed checkpoint if any of the confirmed checkpoints match or supersede it
-            const lastConfirmedCheckpointNumber = checkpoints[checkpoints.length - 1].checkpoint.number;
-            await this.clearProposedCheckpointIfSuperseded(lastConfirmedCheckpointNumber);
             await this.#lastSynchedL1Block.set(checkpoints[checkpoints.length - 1].l1.blockNumber);
             return true;
         });
@@ -218,7 +216,8 @@ export { TxReceipt } from '@aztec/stdlib/tx';
                 attestations: incoming.attestations.map((a)=>a.toBuffer()),
                 checkpointNumber: incoming.checkpoint.number,
                 startBlock: incoming.checkpoint.blocks[0].number,
-                blockCount: incoming.checkpoint.blocks.length
+                blockCount: incoming.checkpoint.blocks.length,
+                feeAssetPriceModifier: incoming.checkpoint.feeAssetPriceModifier.toString()
             });
             // Update the sync point to reflect the new L1 block
             await this.#lastSynchedL1Block.set(incoming.l1.blockNumber);
@@ -233,11 +232,12 @@ export { TxReceipt } from '@aztec/stdlib/tx';
         if (previousCheckpointNumber === INITIAL_CHECKPOINT_NUMBER - 1) {
             return undefined;
         }
-        const previousCheckpointData = await this.getCheckpointData(previousCheckpointNumber);
-        if (previousCheckpointData === undefined) {
+        // Check across both proposed and mined checkpoints
+        const predecessor = await this.getProposedCheckpointByNumber(previousCheckpointNumber) ?? await this.getCheckpointData(previousCheckpointNumber);
+        if (!predecessor) {
             throw new CheckpointNotFoundError(previousCheckpointNumber);
         }
-        const previousBlockNumber = BlockNumber(previousCheckpointData.startBlock + previousCheckpointData.blockCount - 1);
+        const previousBlockNumber = BlockNumber(predecessor.startBlock + predecessor.blockCount - 1);
         const previousBlock = await this.getBlock(previousBlockNumber);
         if (previousBlock === undefined) {
             throw new BlockNotFoundError(previousBlockNumber);
@@ -247,7 +247,7 @@ export { TxReceipt } from '@aztec/stdlib/tx';
     /**
    * Validates that blocks are sequential, have correct indexes, and chain via archive roots.
    * This is the same validation used for both confirmed checkpoints (addCheckpoints) and
-   * proposed checkpoints (setProposedCheckpoint).
+   * proposed checkpoints (addProposedCheckpoint).
    */ validateCheckpointBlocks(blocks, previousBlock) {
         for (const block of blocks){
             if (previousBlock) {
@@ -352,11 +352,8 @@ export { TxReceipt } from '@aztec/stdlib/tx';
                 await this.#checkpoints.delete(c);
                 this.#log.debug(`Removed checkpoint ${c}`);
             }
-            // Clear any proposed checkpoint that was orphaned by the removal (its base chain no longer exists)
-            const proposedCheckpointNumber = await this.getProposedCheckpointNumber();
-            if (proposedCheckpointNumber > checkpointNumber) {
-                await this.#proposedCheckpoint.delete();
-            }
+            // Evict all pending checkpoints > checkpointNumber (their base chain no longer exists)
+            await this.evictProposedCheckpointsFrom(CheckpointNumber(checkpointNumber + 1));
             return {
                 blocksRemoved
             };
@@ -401,6 +398,7 @@ export { TxReceipt } from '@aztec/stdlib/tx';
             checkpointNumber: CheckpointNumber(checkpointStorage.checkpointNumber),
             startBlock: BlockNumber(checkpointStorage.startBlock),
             blockCount: checkpointStorage.blockCount,
+            feeAssetPriceModifier: BigInt(checkpointStorage.feeAssetPriceModifier),
             l1: L1PublishedData.fromBuffer(checkpointStorage.l1),
             attestations: checkpointStorage.attestations.map((buf)=>CommitteeAttestation.fromBuffer(buf))
         };
@@ -487,36 +485,108 @@ export { TxReceipt } from '@aztec/stdlib/tx';
         return CheckpointNumber(latestCheckpointNumber);
     }
     async hasProposedCheckpoint() {
-        const proposed = await this.#proposedCheckpoint.getAsync();
-        return proposed !== undefined;
-    }
-    /** Deletes the proposed checkpoint from storage. */ async deleteProposedCheckpoint() {
-        await this.#proposedCheckpoint.delete();
+        const [key] = await toArray(this.#proposedCheckpoints.keysAsync({
+            limit: 1
+        }));
+        return key !== undefined;
     }
-    /** Clears the proposed checkpoint if the given confirmed checkpoint number supersedes it. */ async clearProposedCheckpointIfSuperseded(confirmedCheckpointNumber) {
-        const proposedCheckpointNumber = await this.getProposedCheckpointNumber();
-        if (proposedCheckpointNumber <= confirmedCheckpointNumber) {
-            await this.#proposedCheckpoint.delete();
+    /** Deletes all pending proposed checkpoints from storage. */ async deleteProposedCheckpoints() {
+        for await (const key of this.#proposedCheckpoints.keysAsync()){
+            await this.#proposedCheckpoints.delete(key);
         }
     }
-    /** Returns the proposed checkpoint data, or undefined if no proposed checkpoint exists. No fallback to confirmed. */ async getProposedCheckpointOnly() {
-        const stored = await this.#proposedCheckpoint.getAsync();
-        if (!stored) {
+    /**
+   * Promotes a specific pending checkpoint to a confirmed checkpoint entry.
+   * This persists the checkpoint to the store, removes only that pending entry, and updates the L1 sync point.
+   * Remaining pending entries (e.g. N+1, N+2) are left intact — they chain off the just-promoted one.
+   * @param checkpointNumber - The checkpoint number to promote.
+   * @param l1 - L1 published data for the checkpoint.
+   * @param attestations - Committee attestations.
+   * @param expectedArchiveRoot - Archive root guard against races.
+   */ async promoteProposedToCheckpointed(checkpointNumber, l1, attestations, expectedArchiveRoot) {
+        return await this.db.transactionAsync(async ()=>{
+            const proposed = await this.getProposedCheckpointByNumber(checkpointNumber);
+            if (!proposed) {
+                throw new NoProposedCheckpointToPromoteError();
+            }
+            if (!proposed.archive.root.equals(expectedArchiveRoot)) {
+                throw new ProposedCheckpointArchiveRootMismatchError(expectedArchiveRoot, proposed.archive.root);
+            }
+            // Verify sequentiality: promoted checkpoint must follow the latest confirmed one
+            const latestCheckpointNumber = await this.getLatestCheckpointNumber();
+            if (latestCheckpointNumber !== proposed.checkpointNumber - 1) {
+                throw new ProposedCheckpointPromotionNotSequentialError(proposed.checkpointNumber, latestCheckpointNumber);
+            }
+            // Write the checkpoint entry
+            await this.#checkpoints.set(proposed.checkpointNumber, {
+                header: proposed.header.toBuffer(),
+                archive: proposed.archive.toBuffer(),
+                checkpointOutHash: proposed.checkpointOutHash.toBuffer(),
+                l1: l1.toBuffer(),
+                attestations: attestations.map((attestation)=>attestation.toBuffer()),
+                checkpointNumber: proposed.checkpointNumber,
+                startBlock: proposed.startBlock,
+                blockCount: proposed.blockCount,
+                feeAssetPriceModifier: proposed.feeAssetPriceModifier.toString()
+            });
+            // Update the slot-to-checkpoint index
+            await this.#slotToCheckpoint.set(proposed.header.slotNumber, proposed.checkpointNumber);
+            // Remove only this pending entry — remaining entries N+1, N+2, ... stay valid
+            await this.#proposedCheckpoints.delete(proposed.checkpointNumber);
+            // Update the last synced L1 block
+            await this.#lastSynchedL1Block.set(l1.blockNumber);
+        });
+    }
+    /**
+   * Returns the latest pending checkpoint (highest-numbered entry), or undefined if none.
+   * No fallback to confirmed.
+   */ async getLastProposedCheckpoint() {
+        const [key] = await toArray(this.#proposedCheckpoints.keysAsync({
+            reverse: true,
+            limit: 1
+        }));
+        if (key === undefined) {
             return undefined;
         }
-        return this.convertToProposedCheckpointData(stored);
+        const stored = await this.#proposedCheckpoints.getAsync(key);
+        return stored ? this.convertToProposedCheckpointData(stored) : undefined;
+    }
+    /** Returns the pending checkpoint for a specific checkpoint number, or undefined if not found. */ async getProposedCheckpointByNumber(n) {
+        const stored = await this.#proposedCheckpoints.getAsync(n);
+        return stored ? this.convertToProposedCheckpointData(stored) : undefined;
+    }
+    /** Returns all pending checkpoints in ascending checkpoint-number order. */ async getProposedCheckpoints() {
+        const results = [];
+        for await (const [, stored] of this.#proposedCheckpoints.entriesAsync()){
+            results.push(this.convertToProposedCheckpointData(stored));
+        }
+        return results;
+    }
+    /**
+   * Evicts all pending checkpoints with checkpoint number >= fromNumber.
+   * Used for divergent-mined-checkpoint cleanup: when L1 mines checkpoint N with a different archive,
+   * all pending >= N must be evicted since they chain off the now-invalid pending N.
+   */ async evictProposedCheckpointsFrom(fromNumber) {
+        const keysToDelete = [];
+        for await (const key of this.#proposedCheckpoints.keysAsync()){
+            if (key >= fromNumber) {
+                keysToDelete.push(key);
+            }
+        }
+        for (const key of keysToDelete){
+            await this.#proposedCheckpoints.delete(key);
+        }
     }
     /**
-   * Gets the checkpoint at the proposed tip
-   * - pending checkpoint if it exists
+   * Gets the checkpoint at the proposed tip:
+   * - latest pending checkpoint if any exist
    * - fallsback to latest confirmed checkpoint otherwise
-   * @returns CommonCheckpointData
-   */ async getProposedCheckpoint() {
-        const stored = await this.#proposedCheckpoint.getAsync();
-        if (!stored) {
+   */ async getLastCheckpoint() {
+        const latest = await this.getLastProposedCheckpoint();
+        if (!latest) {
             return this.getCheckpointData(await this.getLatestCheckpointNumber());
         }
-        return this.convertToProposedCheckpointData(stored);
+        return latest;
     }
     convertToProposedCheckpointData(stored) {
         return {
@@ -534,7 +604,7 @@ export { TxReceipt } from '@aztec/stdlib/tx';
    * Attempts to get the proposedCheckpoint's number, if there is not one, then fallback to the latest confirmed checkpoint number.
    * @returns CheckpointNumber
    */ async getProposedCheckpointNumber() {
-        const proposed = await this.getProposedCheckpoint();
+        const proposed = await this.getLastCheckpoint();
         if (!proposed) {
             return await this.getLatestCheckpointNumber();
         }
@@ -544,7 +614,7 @@ export { TxReceipt } from '@aztec/stdlib/tx';
    * Attempts to get the proposedCheckpoint's block number, if there is not one, then fallback to the checkpointed block number
    * @returns BlockNumber
    */ async getProposedCheckpointL2BlockNumber() {
-        const proposed = await this.getProposedCheckpoint();
+        const proposed = await this.getLastCheckpoint();
         if (!proposed) {
             return await this.getCheckpointedL2BlockNumber();
         }
@@ -570,7 +640,10 @@ export { TxReceipt } from '@aztec/stdlib/tx';
    * @param start - Number of the first block to return (inclusive).
    * @param limit - The number of blocks to return.
    * @returns The requested L2 blocks
-   */ async *getCheckpointedBlocks(start, limit) {
+   */ getCheckpointedBlocks(start, limit) {
+        return toArray(this.iterateCheckpointedBlocks(start, limit));
+    }
+    /** Async iterator variant of {@link getCheckpointedBlocks}. */ async *iterateCheckpointedBlocks(start, limit) {
         const checkpointCache = new Map();
         for await (const [blockNumber, blockStorage] of this.getBlockStorages(start, limit)){
             const block = await this.getBlockFromBlockStorage(blockNumber, blockStorage);
@@ -603,7 +676,10 @@ export { TxReceipt } from '@aztec/stdlib/tx';
    * @param start - Number of the first block to return (inclusive).
    * @param limit - The number of blocks to return.
    * @returns The requested L2 blocks
-   */ async *getBlocks(start, limit) {
+   */ getBlocks(start, limit) {
+        return toArray(this.iterateBlocks(start, limit));
+    }
+    /** Async iterator variant of {@link getBlocks}. */ async *iterateBlocks(start, limit) {
         for await (const [blockNumber, blockStorage] of this.getBlockStorages(start, limit)){
             const block = await this.getBlockFromBlockStorage(blockNumber, blockStorage);
             if (block) {
@@ -623,6 +699,37 @@ export { TxReceipt } from '@aztec/stdlib/tx';
         return this.getBlockDataFromBlockStorage(blockStorage);
     }
     /**
+   * Gets block metadata plus checkpoint-derived context (L1 publish info, attestations) without
+   * deserializing tx bodies. When the block's containing checkpoint has not yet been L1-confirmed,
+   * `checkpoint` and `l1` are `undefined` and `attestations` is empty.
+   */ async getBlockDataWithCheckpointContext(blockNumber) {
+        const blockStorage = await this.#blocks.getAsync(blockNumber);
+        if (!blockStorage || !blockStorage.header) {
+            return undefined;
+        }
+        const data = this.getBlockDataFromBlockStorage(blockStorage);
+        const checkpointStorage = await this.#checkpoints.getAsync(blockStorage.checkpointNumber);
+        if (!checkpointStorage) {
+            return {
+                data,
+                checkpoint: undefined,
+                l1: undefined,
+                attestations: []
+            };
+        }
+        const checkpoint = this.checkpointDataFromCheckpointStorage(checkpointStorage);
+        return {
+            data,
+            checkpoint,
+            l1: checkpoint.l1,
+            attestations: checkpoint.attestations
+        };
+    }
+    /** Returns the checkpoint number that contains the given slot (or undefined if not found). */ async getCheckpointNumberBySlot(slot) {
+        const checkpointNumber = await this.#slotToCheckpoint.getAsync(slot);
+        return checkpointNumber === undefined ? undefined : CheckpointNumber(checkpointNumber);
+    }
+    /**
    * Gets block metadata (without tx data) by archive root.
    * @param archive - The archive root of the block to return.
    * @returns The requested block data.
@@ -701,7 +808,10 @@ export { TxReceipt } from '@aztec/stdlib/tx';
    * @param start - Number of the first block to return (inclusive).
    * @param limit - The number of blocks to return.
    * @returns The requested L2 block headers
-   */ async *getBlockHeaders(start, limit) {
+   */ getBlockHeaders(start, limit) {
+        return toArray(this.iterateBlockHeaders(start, limit));
+    }
+    /** Async iterator variant of {@link getBlockHeaders}. */ async *iterateBlockHeaders(start, limit) {
         for await (const [blockNumber, blockStorage] of this.getBlockStorages(start, limit)){
             const header = BlockHeader.fromBuffer(blockStorage.header);
             if (header.getBlockNumber() !== blockNumber) {
@@ -849,18 +959,23 @@ export { TxReceipt } from '@aztec/stdlib/tx';
     setSynchedL1BlockNumber(l1BlockNumber) {
         return this.#lastSynchedL1Block.set(l1BlockNumber);
     }
-    /** Sets the proposed checkpoint (not yet L1-confirmed). Only accepts confirmed + 1.
-   *  Computes archive and checkpointOutHash from the stored blocks. */ async setProposedCheckpoint(proposed) {
+    /**
+   * Adds a proposed checkpoint to the pending queue.
+   * Accepts proposed.checkpointNumber === latestTip + 1, where latestTip is the highest of
+   * confirmed and the highest pending checkpoint number.
+   * Computes archive and checkpointOutHash from the stored blocks.
+   */ async addProposedCheckpoint(proposed) {
         return await this.db.transactionAsync(async ()=>{
-            const current = await this.getProposedCheckpointNumber();
-            if (proposed.checkpointNumber <= current) {
-                throw new ProposedCheckpointStaleError(proposed.checkpointNumber, current);
-            }
             const confirmed = await this.getLatestCheckpointNumber();
-            if (proposed.checkpointNumber !== confirmed + 1) {
-                throw new ProposedCheckpointNotSequentialError(proposed.checkpointNumber, confirmed);
+            const [latestPendingKey] = await toArray(this.#proposedCheckpoints.keysAsync({
+                reverse: true,
+                limit: 1
+            }));
+            const latestTip = CheckpointNumber(latestPendingKey !== undefined ? Math.max(latestPendingKey, confirmed) : confirmed);
+            if (proposed.checkpointNumber !== latestTip + 1) {
+                throw new ProposedCheckpointNotSequentialError(proposed.checkpointNumber, latestTip);
             }
-            // Ensure the previous checkpoint + blocks exist
+            // Ensure the predecessor block (from pending or confirmed chain) exists
             const previousBlock = await this.getPreviousCheckpointBlock(proposed.checkpointNumber);
             const blocks = [];
             for(let i = 0; i < proposed.blockCount; i++){
@@ -873,7 +988,7 @@ export { TxReceipt } from '@aztec/stdlib/tx';
             this.validateCheckpointBlocks(blocks, previousBlock);
             const archive = blocks[blocks.length - 1].archive;
             const checkpointOutHash = Checkpoint.getCheckpointOutHash(blocks);
-            await this.#proposedCheckpoint.set({
+            await this.#proposedCheckpoints.set(proposed.checkpointNumber, {
                 header: proposed.header.toBuffer(),
                 archive: archive.toBuffer(),
                 checkpointOutHash: checkpointOutHash.toBuffer(),