@aztec/archiver 3.0.0-canary.a9708bd → 3.0.0-devnet.2-patch.1

package/dest/archiver/structs/inbox_message.d.ts

@@ -1,10 +1,10 @@
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
-import { Fr } from '@aztec/foundation/fields';
-import type { UInt32 } from '@aztec/stdlib/types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 export type InboxMessage = {
     index: bigint;
     leaf: Fr;
-    l2BlockNumber: UInt32;
+    checkpointNumber: CheckpointNumber;
     l1BlockNumber: bigint;
     l1BlockHash: Buffer32;
     rollingHash: Buffer16;
@@ -12,4 +12,4 @@ export type InboxMessage = {
 export declare function updateRollingHash(currentRollingHash: Buffer16, leaf: Fr): Buffer16;
 export declare function serializeInboxMessage(message: InboxMessage): Buffer;
 export declare function deserializeInboxMessage(buffer: Buffer): InboxMessage;
-//# sourceMappingURL=inbox_message.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5ib3hfbWVzc2FnZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2FyY2hpdmVyL3N0cnVjdHMvaW5ib3hfbWVzc2FnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTlELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUdwRCxNQUFNLE1BQU0sWUFBWSxHQUFHO0lBQ3pCLEtBQUssRUFBRSxNQUFNLENBQUM7SUFDZCxJQUFJLEVBQUUsRUFBRSxDQUFDO0lBQ1QsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUM7SUFDbkMsYUFBYSxFQUFFLE1BQU0sQ0FBQztJQUN0QixXQUFXLEVBQUUsUUFBUSxDQUFDO0lBQ3RCLFdBQVcsRUFBRSxRQUFRLENBQUM7Q0FDdkIsQ0FBQztBQUVGLHdCQUFnQixpQkFBaUIsQ0FBQyxrQkFBa0IsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLEVBQUUsR0FBRyxRQUFRLENBR2xGO0FBRUQsd0JBQWdCLHFCQUFxQixDQUFDLE9BQU8sRUFBRSxZQUFZLEdBQUcsTUFBTSxDQVNuRTtBQUVELHdCQUFnQix1QkFBdUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksQ0FTcEUifQ==

package/dest/archiver/structs/inbox_message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inbox_message.d.ts","sourceRoot":"","sources":["../../../src/archiver/structs/inbox_message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,EAAE,CAAC;IACT,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,QAAQ,CAAC;IACtB,WAAW,EAAE,QAAQ,CAAC;CACvB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,kBAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,GAAG,QAAQ,CAGlF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,CASnE;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CASpE"}
+{"version":3,"file":"inbox_message.d.ts","sourceRoot":"","sources":["../../../src/archiver/structs/inbox_message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,EAAE,CAAC;IACT,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,QAAQ,CAAC;IACtB,WAAW,EAAE,QAAQ,CAAC;CACvB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,kBAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,GAAG,QAAQ,CAGlF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,CASnE;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CASpE"}

package/dest/archiver/structs/inbox_message.js

@@ -1,6 +1,7 @@
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
-import { keccak256 } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { keccak256 } from '@aztec/foundation/crypto/keccak';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, bigintToUInt64BE, numToUInt32BE, serializeToBuffer } from '@aztec/foundation/serialize';
 export function updateRollingHash(currentRollingHash, leaf) {
     const input = Buffer.concat([
@@ -15,7 +16,7 @@ export function serializeInboxMessage(message) {
         message.leaf,
         message.l1BlockHash,
         numToUInt32BE(Number(message.l1BlockNumber)),
-        numToUInt32BE(message.l2BlockNumber),
+        numToUInt32BE(message.checkpointNumber),
         message.rollingHash
     ]);
 }
@@ -25,14 +26,14 @@ export function deserializeInboxMessage(buffer) {
     const leaf = reader.readObject(Fr);
     const l1BlockHash = reader.readObject(Buffer32);
     const l1BlockNumber = BigInt(reader.readNumber());
-    const l2BlockNumber = reader.readNumber();
+    const checkpointNumber = CheckpointNumber(reader.readNumber());
     const rollingHash = reader.readObject(Buffer16);
     return {
         index,
         leaf,
         l1BlockHash,
         l1BlockNumber,
-        l2BlockNumber,
+        checkpointNumber,
         rollingHash
     };
 }

package/dest/archiver/structs/published.d.ts

@@ -1,2 +1,3 @@
-export type { PublishedL2Block, L1PublishedData } from '@aztec/stdlib/block';
-//# sourceMappingURL=published.d.ts.map
+export type { PublishedL2Block } from '@aztec/stdlib/block';
+export type { L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGlzaGVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXJjaGl2ZXIvc3RydWN0cy9wdWJsaXNoZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsWUFBWSxFQUFFLGdCQUFnQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDNUQsWUFBWSxFQUFFLGVBQWUsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDIn0=

package/dest/archiver/structs/published.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"published.d.ts","sourceRoot":"","sources":["../../../src/archiver/structs/published.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"published.d.ts","sourceRoot":"","sources":["../../../src/archiver/structs/published.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,YAAY,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC"}

package/dest/archiver/validation.d.ts

@@ -1,11 +1,17 @@
 import type { EpochCache } from '@aztec/epoch-cache';
 import type { Logger } from '@aztec/foundation/log';
-import { type PublishedL2Block, type ValidateBlockResult } from '@aztec/stdlib/block';
+import { type AttestationInfo, type ValidateBlockResult } from '@aztec/stdlib/block';
+import type { PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 export type { ValidateBlockResult };
 /**
- * Validates the attestations submitted for the given block.
+ * Extracts attestation information from a published checkpoint.
+ * Returns info for each attestation, preserving array indices.
+ */
+export declare function getAttestationInfoFromPublishedCheckpoint({ checkpoint, attestations }: PublishedCheckpoint): AttestationInfo[];
+/**
+ * Validates the attestations submitted for the given checkpoint.
  * Returns true if the attestations are valid and sufficient, false otherwise.
  */
-export declare function validateBlockAttestations(publishedBlock: PublishedL2Block, epochCache: EpochCache, constants: Pick<L1RollupConstants, 'epochDuration'>, logger?: Logger): Promise<ValidateBlockResult>;
-//# sourceMappingURL=validation.d.ts.map
+export declare function validateCheckpointAttestations(publishedCheckpoint: PublishedCheckpoint, epochCache: EpochCache, constants: Pick<L1RollupConstants, 'epochDuration'>, logger?: Logger): Promise<ValidateBlockResult>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FyY2hpdmVyL3ZhbGlkYXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFHckQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxFQUNMLEtBQUssZUFBZSxFQUVwQixLQUFLLG1CQUFtQixFQUV6QixNQUFNLHFCQUFxQixDQUFDO0FBQzdCLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDcEUsT0FBTyxFQUFFLEtBQUssaUJBQWlCLEVBQWtCLE1BQU0sNkJBQTZCLENBQUM7QUFHckYsWUFBWSxFQUFFLG1CQUFtQixFQUFFLENBQUM7QUFFcEM7OztHQUdHO0FBQ0gsd0JBQWdCLHlDQUF5QyxDQUFDLEVBQ3hELFVBQVUsRUFDVixZQUFZLEVBQ2IsRUFBRSxtQkFBbUIsR0FBRyxlQUFlLEVBQUUsQ0FHekM7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0IsOEJBQThCLENBQ2xELG1CQUFtQixFQUFFLG1CQUFtQixFQUN4QyxVQUFVLEVBQUUsVUFBVSxFQUN0QixTQUFTLEVBQUUsSUFBSSxDQUFDLGlCQUFpQixFQUFFLGVBQWUsQ0FBQyxFQUNuRCxNQUFNLENBQUMsRUFBRSxNQUFNLEdBQ2QsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBc0Y5QiJ9

package/dest/archiver/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/archiver/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EAEzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,iBAAiB,EAAkB,MAAM,6BAA6B,CAAC;AAErF,YAAY,EAAE,mBAAmB,EAAE,CAAC;AAEpC;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,cAAc,EAAE,gBAAgB,EAChC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,EACnD,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,CAAC,CAiD9B"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/archiver/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EACL,KAAK,eAAe,EAEpB,KAAK,mBAAmB,EAEzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,KAAK,iBAAiB,EAAkB,MAAM,6BAA6B,CAAC;AAGrF,YAAY,EAAE,mBAAmB,EAAE,CAAC;AAEpC;;;GAGG;AACH,wBAAgB,yCAAyC,CAAC,EACxD,UAAU,EACV,YAAY,EACb,EAAE,mBAAmB,GAAG,eAAe,EAAE,CAGzC;AAED;;;GAGG;AACH,wBAAsB,8BAA8B,CAClD,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,EACnD,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,CAAC,CAsF9B"}

package/dest/archiver/validation.js

@@ -1,75 +1,97 @@
-import { getAttestationsFromPublishedL2Block } from '@aztec/stdlib/block';
+import { compactArray } from '@aztec/foundation/collection';
+import { getAttestationInfoFromPayload } from '@aztec/stdlib/block';
 import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
+import { ConsensusPayload } from '@aztec/stdlib/p2p';
 /**
- * Validates the attestations submitted for the given block.
+ * 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);
+    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 validateBlockAttestations(publishedBlock, epochCache, constants, logger) {
-    const attestations = getAttestationsFromPublishedL2Block(publishedBlock);
-    const { block } = publishedBlock;
-    const blockHash = await block.hash().then((hash)=>hash.toString());
-    const archiveRoot = block.archive.root.toString();
-    const slot = block.header.getSlot();
+ */ export async function validateCheckpointAttestations(publishedCheckpoint, epochCache, constants, logger) {
+    const attestorInfos = getAttestationInfoFromPublishedCheckpoint(publishedCheckpoint);
+    const attestors = compactArray(attestorInfos.map((info)=>'address' in info ? info.address : undefined));
+    const { checkpoint, attestations } = publishedCheckpoint;
+    const headerHash = checkpoint.header.hash();
+    const archiveRoot = checkpoint.archive.root.toString();
+    const slot = checkpoint.header.slotNumber;
     const epoch = getEpochAtSlot(slot, constants);
     const { committee, seed } = await epochCache.getCommitteeForEpoch(epoch);
     const logData = {
-        blockNumber: block.number,
+        checkpointNumber: checkpoint.number,
         slot,
         epoch,
-        blockHash,
+        headerHash,
         archiveRoot
     };
-    logger?.debug(`Validating attestations for block ${block.number} at slot ${slot} in epoch ${epoch}`, {
+    logger?.debug(`Validating attestations for checkpoint ${checkpoint.number} at slot ${slot} in epoch ${epoch}`, {
         committee: (committee ?? []).map((member)=>member.toString()),
-        recoveredAttestors: attestations.map((a)=>a.getSender().toString()),
-        postedAttestations: publishedBlock.attestations.map((a)=>a.address.isZero() ? a.signature.toString() : a.address.toString()),
+        recoveredAttestors: attestorInfos,
+        postedAttestations: attestations.map((a)=>(a.address.isZero() ? a.signature : a.address).toString()),
         ...logData
     });
     if (!committee || committee.length === 0) {
-        logger?.warn(`No committee found for epoch ${epoch} at slot ${slot}. Accepting block without validation.`, logData);
+        logger?.warn(`No committee found for epoch ${epoch} at slot ${slot}. Accepting checkpoint without validation.`, logData);
         return {
             valid: true
         };
     }
-    const committeeSet = new Set(committee.map((member)=>member.toString()));
     const requiredAttestationCount = Math.floor(committee.length * 2 / 3) + 1;
-    for(let i = 0; i < attestations.length; i++){
-        const attestation = attestations[i];
-        const signer = attestation.getSender().toString();
-        if (!committeeSet.has(signer)) {
-            logger?.warn(`Attestation from non-committee member ${signer} at slot ${slot}`, {
-                committee
+    const failedValidationResult = (reason)=>({
+            valid: false,
+            reason,
+            block: checkpoint.blocks[0].toBlockInfo(),
+            committee,
+            seed,
+            epoch,
+            attestors,
+            attestations
+        });
+    for(let i = 0; i < attestorInfos.length; i++){
+        const info = attestorInfos[i];
+        // Fail on invalid signatures (no address recovered)
+        if (info.status === 'invalid-signature' || info.status === 'empty') {
+            logger?.warn(`Attestation with empty or invalid signature at slot ${slot}`, {
+                committee,
+                invalidIndex: i,
+                ...logData
             });
-            const reason = 'invalid-attestation';
             return {
-                valid: false,
-                reason,
-                invalidIndex: i,
-                block: publishedBlock,
-                committee,
-                seed,
-                epoch,
-                attestations
+                ...failedValidationResult('invalid-attestation'),
+                invalidIndex: i
             };
         }
+        // Check if the attestor at this index matches the committee member at the same index
+        if (info.status === 'recovered-from-signature' || info.status === 'provided-as-address') {
+            const signer = info.address.toString();
+            const expectedCommitteeMember = committee[i]?.toString();
+            if (!expectedCommitteeMember || signer !== expectedCommitteeMember) {
+                logger?.warn(`Attestation at index ${i} from ${signer} does not match expected committee member ${expectedCommitteeMember} at slot ${slot}`, {
+                    committee,
+                    invalidIndex: i,
+                    ...logData
+                });
+                return {
+                    ...failedValidationResult('invalid-attestation'),
+                    invalidIndex: i
+                };
+            }
+        }
     }
-    if (attestations.length < requiredAttestationCount) {
-        logger?.warn(`Insufficient attestations for block at slot ${slot}`, {
+    const validAttestationCount = attestorInfos.filter((info)=>info.status === 'recovered-from-signature').length;
+    if (validAttestationCount < requiredAttestationCount) {
+        logger?.warn(`Insufficient attestations for checkpoint at slot ${slot}`, {
             requiredAttestations: requiredAttestationCount,
-            actualAttestations: attestations.length,
+            actualAttestations: validAttestationCount,
             ...logData
         });
-        const reason = 'insufficient-attestations';
-        return {
-            valid: false,
-            reason,
-            block: publishedBlock,
-            committee,
-            seed,
-            epoch,
-            attestations
-        };
+        return failedValidationResult('insufficient-attestations');
     }
-    logger?.debug(`Block attestations validated successfully for block ${block.number} at slot ${slot}`, logData);
+    logger?.debug(`Checkpoint attestations validated successfully for checkpoint ${checkpoint.number} at slot ${slot}`, logData);
     return {
         valid: true
     };

package/dest/factory.d.ts

@@ -1,7 +1,5 @@
 import type { DataStoreConfig } from '@aztec/kv-store/config';
-import type { L2BlockSourceEventEmitter } from '@aztec/stdlib/block';
-import type { ArchiverApi, Service } from '@aztec/stdlib/interfaces/server';
-import { type ArchiverDeps } from './archiver/archiver.js';
+import { Archiver, type ArchiverDeps } from './archiver/archiver.js';
 import type { ArchiverConfig } from './archiver/config.js';
 import { KVArchiverDataStore } from './archiver/kv_archiver_store/kv_archiver_store.js';
 export declare const ARCHIVER_STORE_NAME = "archiver";
@@ -17,11 +15,5 @@ export declare function createArchiverStore(userConfig: Pick<ArchiverConfig, 'ar
  */
 export declare function createArchiver(config: ArchiverConfig & DataStoreConfig, deps: ArchiverDeps, opts?: {
     blockUntilSync: boolean;
-}): Promise<ArchiverApi & Service & L2BlockSourceEventEmitter>;
-/**
- * Creates a remote archiver client.
- * @param config - The archiver configuration.
- * @returns The remote archiver client.
- */
-export declare function createRemoteArchiver(config: ArchiverConfig): ArchiverApi;
-//# sourceMappingURL=factory.d.ts.map
+}): Promise<Archiver>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFPOUQsT0FBTyxFQUFFLFFBQVEsRUFBRSxLQUFLLFlBQVksRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzNELE9BQU8sRUFBdUIsbUJBQW1CLEVBQUUsTUFBTSxtREFBbUQsQ0FBQztBQUU3RyxlQUFPLE1BQU0sbUJBQW1CLGFBQWEsQ0FBQztBQUU5QyxpQ0FBaUM7QUFDakMsd0JBQXNCLG1CQUFtQixDQUN2QyxVQUFVLEVBQUUsSUFBSSxDQUFDLGNBQWMsRUFBRSx3QkFBd0IsR0FBRyxTQUFTLENBQUMsR0FBRyxlQUFlLGdDQVF6RjtBQUVEOzs7Ozs7O0dBT0c7QUFDSCx3QkFBc0IsY0FBYyxDQUNsQyxNQUFNLEVBQUUsY0FBYyxHQUFHLGVBQWUsRUFDeEMsSUFBSSxFQUFFLFlBQVksRUFDbEIsSUFBSSxHQUFFO0lBQUUsY0FBYyxFQUFFLE9BQU8sQ0FBQTtDQUE2QixHQUMzRCxPQUFPLENBQUMsUUFBUSxDQUFDLENBSW5CIn0=

package/dest/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAM9D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAErE,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAG5E,OAAO,EAAY,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAuB,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AAG7G,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAE9C,iCAAiC;AACjC,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE,wBAAwB,GAAG,SAAS,CAAC,GAAG,eAAe,gCAQzF;AAED;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE,YAAY,EAClB,IAAI,GAAE;IAAE,cAAc,EAAE,OAAO,CAAA;CAA6B,GAC3D,OAAO,CAAC,WAAW,GAAG,OAAO,GAAG,yBAAyB,CAAC,CAI5D;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,WAAW,CASxE"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAO9D,OAAO,EAAE,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAuB,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AAE7G,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAE9C,iCAAiC;AACjC,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE,wBAAwB,GAAG,SAAS,CAAC,GAAG,eAAe,gCAQzF;AAED;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE,YAAY,EAClB,IAAI,GAAE;IAAE,cAAc,EAAE,OAAO,CAAA;CAA6B,GAC3D,OAAO,CAAC,QAAQ,CAAC,CAInB"}

package/dest/factory.js

@@ -1,19 +1,17 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import { createLogger } from '@aztec/foundation/log';
 import { createStore } from '@aztec/kv-store/lmdb-v2';
-import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { protocolContractNames, protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { protocolContractNames } from '@aztec/protocol-contracts';
 import { BundledProtocolContractsProvider } from '@aztec/protocol-contracts/providers/bundle';
 import { FunctionType, decodeFunctionSignature } from '@aztec/stdlib/abi';
 import { computePublicBytecodeCommitment } from '@aztec/stdlib/contract';
-import { getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
 import { Archiver } from './archiver/archiver.js';
 import { ARCHIVER_DB_VERSION, KVArchiverDataStore } from './archiver/kv_archiver_store/kv_archiver_store.js';
-import { createArchiverClient } from './rpc/index.js';
 export const ARCHIVER_STORE_NAME = 'archiver';
 /** Creates an archiver store. */ export async function createArchiverStore(userConfig) {
     const config = {
         ...userConfig,
-        dataStoreMapSizeKB: userConfig.archiverStoreMapSizeKb ?? userConfig.dataStoreMapSizeKB
+        dataStoreMapSizeKb: userConfig.archiverStoreMapSizeKb ?? userConfig.dataStoreMapSizeKb
     };
     const store = await createStore(ARCHIVER_STORE_NAME, ARCHIVER_DB_VERSION, config, createLogger('archiver:lmdb'));
     return new KVArchiverDataStore(store, config.maxLogs);
@@ -32,16 +30,6 @@ export const ARCHIVER_STORE_NAME = 'archiver';
     await registerProtocolContracts(archiverStore);
     return Archiver.createAndSync(config, archiverStore, deps, opts.blockUntilSync);
 }
-/**
- * Creates a remote archiver client.
- * @param config - The archiver configuration.
- * @returns The remote archiver client.
- */ export function createRemoteArchiver(config) {
-    if (!config.archiverUrl) {
-        throw new Error('Archiver URL is required');
-    }
-    return createArchiverClient(config.archiverUrl, getComponentsVersionsFromConfig(config, protocolContractTreeRoot, getVKTreeRoot()));
-}
 async function registerProtocolContracts(store) {
     const blockNumber = 0;
     for (const name of protocolContractNames){
@@ -59,9 +47,9 @@ async function registerProtocolContracts(store) {
             contractClassPublic
         ], [
             bytecodeCommitment
-        ], blockNumber);
+        ], BlockNumber(blockNumber));
         await store.addContractInstances([
             contract.instance
-        ], blockNumber);
+        ], BlockNumber(blockNumber));
     }
 }

package/dest/index.d.ts

@@ -1,5 +1,5 @@
 export * from './archiver/index.js';
 export * from './factory.js';
 export * from './rpc/index.js';
-export { retrieveBlocksFromRollup, retrieveL2ProofVerifiedEvents } from './archiver/data_retrieval.js';
-//# sourceMappingURL=index.d.ts.map
+export { retrieveCheckpointsFromRollup, retrieveL2ProofVerifiedEvents } from './archiver/l1/data_retrieval.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsZ0JBQWdCLENBQUM7QUFFL0IsT0FBTyxFQUFFLDZCQUE2QixFQUFFLDZCQUE2QixFQUFFLE1BQU0saUNBQWlDLENBQUMifQ==

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAE/B,OAAO,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAE/B,OAAO,EAAE,6BAA6B,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC"}

package/dest/index.js

@@ -1,4 +1,4 @@
 export * from './archiver/index.js';
 export * from './factory.js';
 export * from './rpc/index.js';
-export { retrieveBlocksFromRollup, retrieveL2ProofVerifiedEvents } from './archiver/data_retrieval.js';
+export { retrieveCheckpointsFromRollup, retrieveL2ProofVerifiedEvents } from './archiver/l1/data_retrieval.js';

package/dest/rpc/index.d.ts

@@ -1,9 +1,9 @@
 import { type ArchiverApi } from '@aztec/stdlib/interfaces/server';
 import { type ComponentsVersions } from '@aztec/stdlib/versioning';
-export declare function createArchiverClient(url: string, versions: Partial<ComponentsVersions>, fetch?: (host: string, body: unknown, extraHeaders?: Record<string, string>, noRetry?: boolean) => Promise<{
+export declare function createArchiverClient(url: string, versions: Partial<ComponentsVersions>, fetch?: (host: string, body: unknown, extraHeaders?: Record<string, string> | undefined, noRetry?: boolean | undefined) => Promise<{
     response: any;
     headers: {
         get: (header: string) => string | null | undefined;
     };
 }>): ArchiverApi;
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ycGMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssV0FBVyxFQUFxQixNQUFNLGlDQUFpQyxDQUFDO0FBQ3RGLE9BQU8sRUFBRSxLQUFLLGtCQUFrQixFQUFnQyxNQUFNLDBCQUEwQixDQUFDO0FBR2pHLHdCQUFnQixvQkFBb0IsQ0FDbEMsR0FBRyxFQUFFLE1BQU0sRUFDWCxRQUFRLEVBQUUsT0FBTyxDQUFDLGtCQUFrQixDQUFDLEVBQ3JDLEtBQUs7Ozs7O0VBQW1DLEdBQ3ZDLFdBQVcsQ0FNYiJ9

package/dest/test/index.d.ts

@@ -1,4 +1,4 @@
 export * from './mock_l2_block_source.js';
 export * from './mock_l1_to_l2_message_source.js';
 export * from './mock_archiver.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsMkJBQTJCLENBQUM7QUFDMUMsY0FBYyxtQ0FBbUMsQ0FBQztBQUNsRCxjQUFjLG9CQUFvQixDQUFDIn0=

package/dest/test/mock_archiver.d.ts

@@ -1,5 +1,7 @@
-import type { Fr } from '@aztec/foundation/fields';
-import type { L2Block, L2BlockSource } from '@aztec/stdlib/block';
+import type { CheckpointNumber } from '@aztec/foundation/branded-types';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import { type L2BlockSource } from '@aztec/stdlib/block';
+import type { Checkpoint } from '@aztec/stdlib/checkpoint';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
 import { MockL2BlockSource } from './mock_l2_block_source.js';
 /**
@@ -7,17 +9,23 @@ import { MockL2BlockSource } from './mock_l2_block_source.js';
  */
 export declare class MockArchiver extends MockL2BlockSource implements L2BlockSource, L1ToL2MessageSource {
     private messageSource;
-    setL1ToL2Messages(blockNumber: number, msgs: Fr[]): void;
-    getL1ToL2Messages(blockNumber: number): Promise<Fr[]>;
+    setL1ToL2Messages(checkpointNumber: CheckpointNumber, msgs: Fr[]): void;
+    getL1ToL2Messages(checkpointNumber: CheckpointNumber): Promise<Fr[]>;
     getL1ToL2MessageIndex(_l1ToL2Message: Fr): Promise<bigint | undefined>;
 }
 /**
  * A mocked implementation of the archiver with a set of precomputed blocks and messages.
  */
 export declare class MockPrefilledArchiver extends MockArchiver {
-    private precomputed;
-    constructor(precomputed: L2Block[], messages: Fr[][]);
-    setPrefilledBlocks(blocks: L2Block[], messages: Fr[][]): void;
+    private prefilled;
+    constructor(prefilled: {
+        checkpoint: Checkpoint;
+        messages: Fr[];
+    }[]);
+    setPrefilled(prefilled: {
+        checkpoint: Checkpoint;
+        messages: Fr[];
+    }[]): void;
     createBlocks(numBlocks: number): Promise<void>;
 }
-//# sourceMappingURL=mock_archiver.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19hcmNoaXZlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvbW9ja19hcmNoaXZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sRUFBVyxLQUFLLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2xFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHbkUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFOUQ7O0dBRUc7QUFDSCxxQkFBYSxZQUFhLFNBQVEsaUJBQWtCLFlBQVcsYUFBYSxFQUFFLG1CQUFtQjtJQUMvRixPQUFPLENBQUMsYUFBYSxDQUFrQztJQUVoRCxpQkFBaUIsQ0FBQyxnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLFFBRXRFO0lBRUQsaUJBQWlCLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBRW5FO0lBRUQscUJBQXFCLENBQUMsY0FBYyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUVyRTtDQUNGO0FBRUQ7O0dBRUc7QUFDSCxxQkFBYSxxQkFBc0IsU0FBUSxZQUFZO0lBQ3JELE9BQU8sQ0FBQyxTQUFTLENBQW9CO0lBRXJDLFlBQVksU0FBUyxFQUFFO1FBQUUsVUFBVSxFQUFFLFVBQVUsQ0FBQztRQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsQ0FBQTtLQUFFLEVBQUUsRUFHbEU7SUFFTSxZQUFZLENBQUMsU0FBUyxFQUFFO1FBQUUsVUFBVSxFQUFFLFVBQVUsQ0FBQztRQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsQ0FBQTtLQUFFLEVBQUUsUUFRMUU7SUFFZSxZQUFZLENBQUMsU0FBUyxFQUFFLE1BQU0saUJBWTdDO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"mock_archiver.d.ts","sourceRoot":"","sources":["../../src/test/mock_archiver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAGnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D;;GAEG;AACH,qBAAa,YAAa,SAAQ,iBAAkB,YAAW,aAAa,EAAE,mBAAmB;IAC/F,OAAO,CAAC,aAAa,CAAkC;IAEhD,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE;IAIxD,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAIrD,qBAAqB,CAAC,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAGvE;AAED;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,YAAY;IACrD,OAAO,CAAC,WAAW,CAAY;gBAEnB,WAAW,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE;IAM7C,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE;IAO7C,YAAY,CAAC,SAAS,EAAE,MAAM;CAW/C"}
+{"version":3,"file":"mock_archiver.d.ts","sourceRoot":"","sources":["../../src/test/mock_archiver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAW,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAGnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D;;GAEG;AACH,qBAAa,YAAa,SAAQ,iBAAkB,YAAW,aAAa,EAAE,mBAAmB;IAC/F,OAAO,CAAC,aAAa,CAAkC;IAEhD,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,IAAI,EAAE,EAAE,EAAE,QAEtE;IAED,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAEnE;IAED,qBAAqB,CAAC,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAErE;CACF;AAED;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,YAAY;IACrD,OAAO,CAAC,SAAS,CAAoB;IAErC,YAAY,SAAS,EAAE;QAAE,UAAU,EAAE,UAAU,CAAC;QAAC,QAAQ,EAAE,EAAE,EAAE,CAAA;KAAE,EAAE,EAGlE;IAEM,YAAY,CAAC,SAAS,EAAE;QAAE,UAAU,EAAE,UAAU,CAAC;QAAC,QAAQ,EAAE,EAAE,EAAE,CAAA;KAAE,EAAE,QAQ1E;IAEe,YAAY,CAAC,SAAS,EAAE,MAAM,iBAY7C;CACF"}

package/dest/test/mock_archiver.js

@@ -1,14 +1,15 @@
+import { L2Block } from '@aztec/stdlib/block';
 import { MockL1ToL2MessageSource } from './mock_l1_to_l2_message_source.js';
 import { MockL2BlockSource } from './mock_l2_block_source.js';
 /**
  * A mocked implementation of the archiver that implements L2BlockSource and L1ToL2MessageSource.
  */ export class MockArchiver extends MockL2BlockSource {
     messageSource = new MockL1ToL2MessageSource(0);
-    setL1ToL2Messages(blockNumber, msgs) {
-        this.messageSource.setL1ToL2Messages(blockNumber, msgs);
+    setL1ToL2Messages(checkpointNumber, msgs) {
+        this.messageSource.setL1ToL2Messages(checkpointNumber, msgs);
     }
-    getL1ToL2Messages(blockNumber) {
-        return this.messageSource.getL1ToL2Messages(blockNumber);
+    getL1ToL2Messages(checkpointNumber) {
+        return this.messageSource.getL1ToL2Messages(checkpointNumber);
     }
     getL1ToL2MessageIndex(_l1ToL2Message) {
         return this.messageSource.getL1ToL2MessageIndex(_l1ToL2Message);
@@ -17,24 +18,28 @@ import { MockL2BlockSource } from './mock_l2_block_source.js';
 /**
  * A mocked implementation of the archiver with a set of precomputed blocks and messages.
  */ export class MockPrefilledArchiver extends MockArchiver {
-    precomputed;
-    constructor(precomputed, messages){
+    prefilled = [];
+    constructor(prefilled){
         super();
-        this.precomputed = precomputed.slice();
-        messages.forEach((msgs, i)=>this.setL1ToL2Messages(i + 1, msgs));
+        this.setPrefilled(prefilled);
     }
-    setPrefilledBlocks(blocks, messages) {
-        for (const block of blocks){
-            this.precomputed[block.number - 1] = block;
+    setPrefilled(prefilled) {
+        for (const { checkpoint, messages } of prefilled){
+            this.prefilled[checkpoint.number - 1] = checkpoint;
+            if (checkpoint.blocks.length !== 1) {
+                throw new Error('Prefilled checkpoint must only have 1 block at the moment.');
+            }
+            this.setL1ToL2Messages(checkpoint.number, messages);
         }
-        messages.forEach((msgs, i)=>this.setL1ToL2Messages(blocks[i].number, msgs));
     }
     createBlocks(numBlocks) {
-        if (this.l2Blocks.length + numBlocks > this.precomputed.length) {
+        const flattenedBlocks = this.prefilled.flatMap((c)=>c.blocks);
+        if (this.l2Blocks.length + numBlocks > flattenedBlocks.length) {
             throw new Error(`Not enough precomputed blocks to create ${numBlocks} more blocks (already at ${this.l2Blocks.length})`);
         }
         const fromBlock = this.l2Blocks.length;
-        this.addBlocks(this.precomputed.slice(fromBlock, fromBlock + numBlocks));
+        // TODO: Add L2 blocks and checkpoints separately once archiver has the apis for that.
+        this.addBlocks(this.prefilled.slice(fromBlock, fromBlock + numBlocks).map((c)=>L2Block.fromCheckpoint(c)));
         return Promise.resolve();
     }
 }

package/dest/test/mock_l1_to_l2_message_source.d.ts

@@ -1,4 +1,5 @@
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber, type CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { L2Tips } from '@aztec/stdlib/block';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
 /**
@@ -6,13 +7,13 @@ import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
  */
 export declare class MockL1ToL2MessageSource implements L1ToL2MessageSource {
     private blockNumber;
-    private messagesPerBlock;
+    private messagesPerCheckpoint;
     constructor(blockNumber: number);
-    setL1ToL2Messages(blockNumber: number, msgs: Fr[]): void;
+    setL1ToL2Messages(checkpointNumber: CheckpointNumber, msgs: Fr[]): void;
     setBlockNumber(blockNumber: number): void;
-    getL1ToL2Messages(blockNumber: number): Promise<Fr[]>;
+    getL1ToL2Messages(checkpointNumber: CheckpointNumber): Promise<Fr[]>;
     getL1ToL2MessageIndex(_l1ToL2Message: Fr): Promise<bigint | undefined>;
-    getBlockNumber(): Promise<number>;
+    getBlockNumber(): Promise<BlockNumber>;
     getL2Tips(): Promise<L2Tips>;
 }
-//# sourceMappingURL=mock_l1_to_l2_message_source.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19sMV90b19sMl9tZXNzYWdlX3NvdXJjZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvbW9ja19sMV90b19sMl9tZXNzYWdlX3NvdXJjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLEtBQUssZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNyRixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVuRTs7R0FFRztBQUNILHFCQUFhLHVCQUF3QixZQUFXLG1CQUFtQjtJQUdyRCxPQUFPLENBQUMsV0FBVztJQUYvQixPQUFPLENBQUMscUJBQXFCLENBQXFDO0lBRWxFLFlBQW9CLFdBQVcsRUFBRSxNQUFNLEVBQUk7SUFFcEMsaUJBQWlCLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxRQUV0RTtJQUVNLGNBQWMsQ0FBQyxXQUFXLEVBQUUsTUFBTSxRQUV4QztJQUVELGlCQUFpQixDQUFDLGdCQUFnQixFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUVuRTtJQUVELHFCQUFxQixDQUFDLGNBQWMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsQ0FFckU7SUFFRCxjQUFjLHlCQUViO0lBRUQsU0FBUyxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FRM0I7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"mock_l1_to_l2_message_source.d.ts","sourceRoot":"","sources":["../../src/test/mock_l1_to_l2_message_source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEnE;;GAEG;AACH,qBAAa,uBAAwB,YAAW,mBAAmB;IAGrD,OAAO,CAAC,WAAW;IAF/B,OAAO,CAAC,gBAAgB,CAA2B;gBAE/B,WAAW,EAAE,MAAM;IAEhC,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE;IAIjD,cAAc,CAAC,WAAW,EAAE,MAAM;IAIzC,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAIrD,qBAAqB,CAAC,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAItE,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAIjC,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;CAS7B"}
+{"version":3,"file":"mock_l1_to_l2_message_source.d.ts","sourceRoot":"","sources":["../../src/test/mock_l1_to_l2_message_source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACrF,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEnE;;GAEG;AACH,qBAAa,uBAAwB,YAAW,mBAAmB;IAGrD,OAAO,CAAC,WAAW;IAF/B,OAAO,CAAC,qBAAqB,CAAqC;IAElE,YAAoB,WAAW,EAAE,MAAM,EAAI;IAEpC,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,IAAI,EAAE,EAAE,EAAE,QAEtE;IAEM,cAAc,CAAC,WAAW,EAAE,MAAM,QAExC;IAED,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAEnE;IAED,qBAAqB,CAAC,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAErE;IAED,cAAc,yBAEb;IAED,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAQ3B;CACF"}

package/dest/test/mock_l1_to_l2_message_source.js

@@ -1,32 +1,33 @@
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 /**
  * A mocked implementation of L1ToL2MessageSource to be used in tests.
  */ export class MockL1ToL2MessageSource {
     blockNumber;
-    messagesPerBlock;
+    messagesPerCheckpoint;
     constructor(blockNumber){
         this.blockNumber = blockNumber;
-        this.messagesPerBlock = new Map();
+        this.messagesPerCheckpoint = new Map();
     }
-    setL1ToL2Messages(blockNumber, msgs) {
-        this.messagesPerBlock.set(blockNumber, msgs);
+    setL1ToL2Messages(checkpointNumber, msgs) {
+        this.messagesPerCheckpoint.set(checkpointNumber, msgs);
     }
     setBlockNumber(blockNumber) {
         this.blockNumber = blockNumber;
     }
-    getL1ToL2Messages(blockNumber) {
-        return Promise.resolve(this.messagesPerBlock.get(blockNumber) ?? []);
+    getL1ToL2Messages(checkpointNumber) {
+        return Promise.resolve(this.messagesPerCheckpoint.get(checkpointNumber) ?? []);
     }
     getL1ToL2MessageIndex(_l1ToL2Message) {
         throw new Error('Method not implemented.');
     }
     getBlockNumber() {
-        return Promise.resolve(this.blockNumber);
+        return Promise.resolve(BlockNumber(this.blockNumber));
     }
     getL2Tips() {
         const number = this.blockNumber;
         const tip = {
-            number,
+            number: BlockNumber(number),
             hash: new Fr(number).toString()
         };
         return Promise.resolve({