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

package/dest/archiver/kv_archiver_store/message_store.js

@@ -1,57 +1,112 @@
-import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
+import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { mapRange } from '@aztec/kv-store';
 import { InboxLeaf } from '@aztec/stdlib/messaging';
-/**
- * LMDB implementation of the ArchiverDataStore interface.
- */ export class MessageStore {
+import { deserializeInboxMessage, serializeInboxMessage, updateRollingHash } from '../structs/inbox_message.js';
+export class MessageStoreError extends Error {
+    inboxMessage;
+    constructor(message, inboxMessage){
+        super(message), this.inboxMessage = inboxMessage;
+        this.name = 'MessageStoreError';
+    }
+}
+export class MessageStore {
     db;
-    #l1ToL2Messages;
-    #l1ToL2MessageIndices;
-    #lastSynchedL1Block;
-    #totalMessageCount;
+    /** Maps from message index to serialized InboxMessage */ #l1ToL2Messages;
+    /** Maps from hex-stringified message leaf to its index */ #l1ToL2MessageIndices;
+    /** Stores L1 block number and hash of the L1 synchpoint */ #lastSynchedL1Block;
+    /** Stores total messages stored */ #totalMessageCount;
     #log;
-    #l1ToL2MessagesSubtreeSize;
     constructor(db){
         this.db = db;
         this.#log = createLogger('archiver:message_store');
-        this.#l1ToL2MessagesSubtreeSize = 2 ** L1_TO_L2_MSG_SUBTREE_HEIGHT;
         this.#l1ToL2Messages = db.openMap('archiver_l1_to_l2_messages');
         this.#l1ToL2MessageIndices = db.openMap('archiver_l1_to_l2_message_indices');
-        this.#lastSynchedL1Block = db.openSingleton('archiver_last_l1_block_new_messages');
+        this.#lastSynchedL1Block = db.openSingleton('archiver_last_l1_block_id');
         this.#totalMessageCount = db.openSingleton('archiver_l1_to_l2_message_count');
     }
     async getTotalL1ToL2MessageCount() {
         return await this.#totalMessageCount.getAsync() ?? 0n;
     }
-    /**
-   * Gets the last L1 block number that emitted new messages.
-   * @returns The last L1 block number processed
-   */ getSynchedL1BlockNumber() {
-        return this.#lastSynchedL1Block.getAsync();
+    /** Gets the last L1 block synced. */ async getSynchedL1Block() {
+        const buffer = await this.#lastSynchedL1Block.getAsync();
+        if (!buffer) {
+            return undefined;
+        }
+        const reader = BufferReader.asReader(buffer);
+        return {
+            l1BlockNumber: reader.readUInt256(),
+            l1BlockHash: Buffer32.fromBuffer(reader.readBytes(Buffer32.SIZE))
+        };
     }
-    async setSynchedL1BlockNumber(l1BlockNumber) {
-        await this.#lastSynchedL1Block.set(l1BlockNumber);
+    /** Sets the last L1 block synced */ async setSynchedL1Block(l1Block) {
+        const buffer = serializeToBuffer([
+            l1Block.l1BlockNumber,
+            l1Block.l1BlockHash
+        ]);
+        await this.#lastSynchedL1Block.set(buffer);
     }
     /**
    * Append L1 to L2 messages to the store.
-   * @param messages - The L1 to L2 messages to be added to the store and the last processed L1 block.
-   * @returns True if the operation is successful.
+   * Requires new messages to be in order and strictly after the last message added.
+   * Throws if out of order messages are added or if the rolling hash is invalid.
    */ addL1ToL2Messages(messages) {
+        if (messages.length === 0) {
+            return Promise.resolve();
+        }
         return this.db.transactionAsync(async ()=>{
-            const lastL1BlockNumber = await this.#lastSynchedL1Block.getAsync() ?? 0n;
-            if (lastL1BlockNumber >= messages.lastProcessedL1BlockNumber) {
-                return false;
+            let lastMessage = await this.getLastMessage();
+            let messageCount = 0;
+            for (const message of messages){
+                // Check messages are inserted in increasing order, but allow reinserting messages.
+                if (lastMessage && message.index <= lastMessage.index) {
+                    const existing = await this.#l1ToL2Messages.getAsync(this.indexToKey(message.index));
+                    if (existing && deserializeInboxMessage(existing).rollingHash.equals(message.rollingHash)) {
+                        // We reinsert instead of skipping in case the message was re-orged and got added in a different L1 block.
+                        this.#log.trace(`Reinserting message with index ${message.index} in the store`);
+                        await this.#l1ToL2Messages.set(this.indexToKey(message.index), serializeInboxMessage(message));
+                        continue;
+                    }
+                    throw new MessageStoreError(`Cannot insert L1 to L2 message with index ${message.index} before last message with index ${lastMessage.index}`, message);
+                }
+                // Check rolling hash is valid.
+                const previousRollingHash = lastMessage?.rollingHash ?? Buffer16.ZERO;
+                const expectedRollingHash = updateRollingHash(previousRollingHash, message.leaf);
+                if (!expectedRollingHash.equals(message.rollingHash)) {
+                    throw new MessageStoreError(`Invalid rolling hash for incoming L1 to L2 message ${message.leaf.toString()} ` + `with index ${message.index} ` + `(expected ${expectedRollingHash.toString()} from previous hash ${previousRollingHash} but got ${message.rollingHash.toString()})`, message);
+                }
+                // Check index corresponds to the L2 block number.
+                const [expectedStart, expectedEnd] = InboxLeaf.indexRangeFromL2Block(message.l2BlockNumber);
+                if (message.index < expectedStart || message.index >= expectedEnd) {
+                    throw new MessageStoreError(`Invalid index ${message.index} for incoming L1 to L2 message ${message.leaf.toString()} ` + `at block ${message.l2BlockNumber} (expected value in range [${expectedStart}, ${expectedEnd}))`, message);
+                }
+                // Check there are no gaps in the indices within the same block.
+                if (lastMessage && message.l2BlockNumber === lastMessage.l2BlockNumber && message.index !== lastMessage.index + 1n) {
+                    throw new MessageStoreError(`Missing prior message for incoming L1 to L2 message ${message.leaf.toString()} ` + `with index ${message.index}`, message);
+                }
+                // Check the first message in a block has the correct index.
+                if ((!lastMessage || message.l2BlockNumber > lastMessage.l2BlockNumber) && message.index !== InboxLeaf.smallestIndexFromL2Block(message.l2BlockNumber)) {
+                    throw new MessageStoreError(`Message ${message.leaf.toString()} for L2 block ${message.l2BlockNumber} has wrong index ` + `${message.index} (expected ${InboxLeaf.smallestIndexFromL2Block(message.l2BlockNumber)})`, message);
+                }
+                // Perform the insertions.
+                await this.#l1ToL2Messages.set(this.indexToKey(message.index), serializeInboxMessage(message));
+                await this.#l1ToL2MessageIndices.set(this.leafToIndexKey(message.leaf), message.index);
+                messageCount++;
+                this.#log.trace(`Inserted L1 to L2 message ${message.leaf} with index ${message.index} into the store`);
+                lastMessage = message;
             }
-            await this.#lastSynchedL1Block.set(messages.lastProcessedL1BlockNumber);
-            for (const message of messages.retrievedData){
-                const key = `${message.index}`;
-                await this.#l1ToL2Messages.set(key, message.leaf.toBuffer());
-                await this.#l1ToL2MessageIndices.set(message.leaf.toString(), message.index);
+            // Update the L1 sync point to that of the last message added.
+            const currentSyncPoint = await this.getSynchedL1Block();
+            if (!currentSyncPoint || currentSyncPoint.l1BlockNumber < lastMessage.l1BlockNumber) {
+                await this.setSynchedL1Block({
+                    l1BlockNumber: lastMessage.l1BlockNumber,
+                    l1BlockHash: lastMessage.l1BlockHash
+                });
             }
-            const lastTotalMessageCount = await this.getTotalL1ToL2MessageCount();
-            await this.#totalMessageCount.set(lastTotalMessageCount + BigInt(messages.retrievedData.length));
-            return true;
+            // Update total message count with the number of inserted messages.
+            await this.increaseTotalMessageCount(messageCount);
         });
     }
     /**
@@ -59,27 +114,74 @@ import { InboxLeaf } from '@aztec/stdlib/messaging';
    * @param l1ToL2Message - The L1 to L2 message.
    * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
    */ getL1ToL2MessageIndex(l1ToL2Message) {
-        return this.#l1ToL2MessageIndices.getAsync(l1ToL2Message.toString());
+        return this.#l1ToL2MessageIndices.getAsync(this.leafToIndexKey(l1ToL2Message));
+    }
+    async getLastMessage() {
+        const [msg] = await toArray(this.#l1ToL2Messages.valuesAsync({
+            reverse: true,
+            limit: 1
+        }));
+        return msg ? deserializeInboxMessage(msg) : undefined;
     }
     async getL1ToL2Messages(blockNumber) {
         const messages = [];
-        let undefinedMessageFound = false;
-        const startIndex = Number(InboxLeaf.smallestIndexFromL2Block(blockNumber));
-        for(let i = startIndex; i < startIndex + this.#l1ToL2MessagesSubtreeSize; i++){
-            // This is inefficient but probably fine for now.
-            const key = `${i}`;
-            const message = await this.#l1ToL2Messages.getAsync(key);
-            if (message) {
-                if (undefinedMessageFound) {
-                    throw new Error(`L1 to L2 message gap found in block ${blockNumber}`);
-                }
-                messages.push(Fr.fromBuffer(message));
-            } else {
-                undefinedMessageFound = true;
-            // We continue iterating over messages here to verify that there are no more messages after the undefined one.
-            // --> If this was the case this would imply there is some issue with log fetching.
+        const [startIndex, endIndex] = InboxLeaf.indexRangeFromL2Block(blockNumber);
+        let lastIndex = startIndex - 1n;
+        for await (const msgBuffer of this.#l1ToL2Messages.valuesAsync({
+            start: this.indexToKey(startIndex),
+            end: this.indexToKey(endIndex)
+        })){
+            const msg = deserializeInboxMessage(msgBuffer);
+            if (msg.l2BlockNumber !== blockNumber) {
+                throw new Error(`L1 to L2 message with index ${msg.index} has invalid block number ${msg.l2BlockNumber}`);
+            } else if (msg.index !== lastIndex + 1n) {
+                throw new Error(`Expected L1 to L2 message with index ${lastIndex + 1n} but got ${msg.index}`);
             }
+            lastIndex = msg.index;
+            messages.push(msg.leaf);
         }
         return messages;
     }
+    async *iterateL1ToL2Messages(range = {}) {
+        const entriesRange = mapRange(range, this.indexToKey);
+        for await (const msgBuffer of this.#l1ToL2Messages.valuesAsync(entriesRange)){
+            yield deserializeInboxMessage(msgBuffer);
+        }
+    }
+    removeL1ToL2Messages(startIndex) {
+        this.#log.debug(`Deleting L1 to L2 messages from index ${startIndex}`);
+        let deleteCount = 0;
+        return this.db.transactionAsync(async ()=>{
+            for await (const [key, msgBuffer] of this.#l1ToL2Messages.entriesAsync({
+                start: this.indexToKey(startIndex)
+            })){
+                this.#log.trace(`Deleting L1 to L2 message with index ${key - 1} from the store`);
+                await this.#l1ToL2Messages.delete(key);
+                await this.#l1ToL2MessageIndices.delete(this.leafToIndexKey(deserializeInboxMessage(msgBuffer).leaf));
+                deleteCount++;
+            }
+            await this.increaseTotalMessageCount(-deleteCount);
+            this.#log.warn(`Deleted ${deleteCount} L1 to L2 messages from index ${startIndex} from the store`);
+        });
+    }
+    rollbackL1ToL2MessagesToL2Block(targetBlockNumber) {
+        this.#log.debug(`Deleting L1 to L2 messages up to target L2 block ${targetBlockNumber}`);
+        const startIndex = InboxLeaf.smallestIndexFromL2Block(targetBlockNumber + 1);
+        return this.removeL1ToL2Messages(startIndex);
+    }
+    indexToKey(index) {
+        return Number(index);
+    }
+    leafToIndexKey(leaf) {
+        return leaf.toString();
+    }
+    async increaseTotalMessageCount(count) {
+        if (count === 0) {
+            return;
+        }
+        return await this.db.transactionAsync(async ()=>{
+            const lastTotalMessageCount = await this.getTotalL1ToL2MessageCount();
+            await this.#totalMessageCount.set(lastTotalMessageCount + BigInt(count));
+        });
+    }
 }

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

@@ -24,4 +24,4 @@ export type SingletonDataRetrieval<T> = {
      */
     retrievedData: T;
 };
-//# sourceMappingURL=data_retrieval.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9yZXRyaWV2YWwuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9zdHJ1Y3RzL2RhdGFfcmV0cmlldmFsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGFBQWEsQ0FBQyxDQUFDLElBQUk7SUFDN0I7O09BRUc7SUFDSCwwQkFBMEIsRUFBRSxNQUFNLENBQUM7SUFDbkM7O09BRUc7SUFDSCxhQUFhLEVBQUUsQ0FBQyxFQUFFLENBQUM7Q0FDcEIsQ0FBQztBQUVGOztHQUVHO0FBQ0gsTUFBTSxNQUFNLHNCQUFzQixDQUFDLENBQUMsSUFBSTtJQUN0Qzs7T0FFRztJQUNILDBCQUEwQixFQUFFLE1BQU0sQ0FBQztJQUNuQzs7T0FFRztJQUNILGFBQWEsRUFBRSxDQUFDLENBQUM7Q0FDbEIsQ0FBQyJ9

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

@@ -0,0 +1,15 @@
+import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
+import { Fr } from '@aztec/foundation/fields';
+import type { UInt32 } from '@aztec/stdlib/types';
+export type InboxMessage = {
+    index: bigint;
+    leaf: Fr;
+    l2BlockNumber: UInt32;
+    l1BlockNumber: bigint;
+    l1BlockHash: Buffer32;
+    rollingHash: Buffer16;
+};
+export declare function updateRollingHash(currentRollingHash: Buffer16, leaf: Fr): Buffer16;
+export declare function serializeInboxMessage(message: InboxMessage): Buffer;
+export declare function deserializeInboxMessage(buffer: Buffer): InboxMessage;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5ib3hfbWVzc2FnZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2FyY2hpdmVyL3N0cnVjdHMvaW5ib3hfbWVzc2FnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTlELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU5QyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVsRCxNQUFNLE1BQU0sWUFBWSxHQUFHO0lBQ3pCLEtBQUssRUFBRSxNQUFNLENBQUM7SUFDZCxJQUFJLEVBQUUsRUFBRSxDQUFDO0lBQ1QsYUFBYSxFQUFFLE1BQU0sQ0FBQztJQUN0QixhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLFdBQVcsRUFBRSxRQUFRLENBQUM7SUFDdEIsV0FBVyxFQUFFLFFBQVEsQ0FBQztDQUN2QixDQUFDO0FBRUYsd0JBQWdCLGlCQUFpQixDQUFDLGtCQUFrQixFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsRUFBRSxHQUFHLFFBQVEsQ0FHbEY7QUFFRCx3QkFBZ0IscUJBQXFCLENBQUMsT0FBTyxFQUFFLFlBQVksR0FBRyxNQUFNLENBU25FO0FBRUQsd0JBQWdCLHVCQUF1QixDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxDQVNwRSJ9

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

@@ -0,0 +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"}

package/dest/archiver/structs/inbox_message.js

@@ -0,0 +1,38 @@
+import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
+import { keccak256 } from '@aztec/foundation/crypto';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, bigintToUInt64BE, numToUInt32BE, serializeToBuffer } from '@aztec/foundation/serialize';
+export function updateRollingHash(currentRollingHash, leaf) {
+    const input = Buffer.concat([
+        currentRollingHash.toBuffer(),
+        leaf.toBuffer()
+    ]);
+    return Buffer16.fromBuffer(keccak256(input));
+}
+export function serializeInboxMessage(message) {
+    return serializeToBuffer([
+        bigintToUInt64BE(message.index),
+        message.leaf,
+        message.l1BlockHash,
+        numToUInt32BE(Number(message.l1BlockNumber)),
+        numToUInt32BE(message.l2BlockNumber),
+        message.rollingHash
+    ]);
+}
+export function deserializeInboxMessage(buffer) {
+    const reader = BufferReader.asReader(buffer);
+    const index = reader.readUInt64();
+    const leaf = reader.readObject(Fr);
+    const l1BlockHash = reader.readObject(Buffer32);
+    const l1BlockNumber = BigInt(reader.readNumber());
+    const l2BlockNumber = reader.readNumber();
+    const rollingHash = reader.readObject(Buffer16);
+    return {
+        index,
+        leaf,
+        l1BlockHash,
+        l1BlockNumber,
+        l2BlockNumber,
+        rollingHash
+    };
+}

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

@@ -1,11 +1,3 @@
-/** Extends a type with L1 published info (block number, hash, and timestamp) */
-export type L1Published<T> = {
-    data: T;
-    l1: L1PublishedData;
-};
-export type L1PublishedData = {
-    blockNumber: bigint;
-    timestamp: bigint;
-    blockHash: string;
-};
-//# 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,gFAAgF;AAChF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,IAAI,EAAE,CAAC,CAAC;IACR,EAAE,EAAE,eAAe,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,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/structs/published.js

@@ -1 +1 @@
-/** Extends a type with L1 published info (block number, hash, and timestamp) */ export { };
+export { };

package/dest/archiver/validation.d.ts

@@ -0,0 +1,17 @@
+import type { EpochCache } from '@aztec/epoch-cache';
+import type { Logger } from '@aztec/foundation/log';
+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 };
+/**
+ * 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 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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,98 @@
+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';
+/**
+ * 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 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 = {
+        checkpointNumber: checkpoint.number,
+        slot,
+        epoch,
+        headerHash,
+        archiveRoot
+    };
+    logger?.debug(`Validating attestations for checkpoint ${checkpoint.number} at slot ${slot} in epoch ${epoch}`, {
+        committee: (committee ?? []).map((member)=>member.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 checkpoint without validation.`, logData);
+        return {
+            valid: true
+        };
+    }
+    const requiredAttestationCount = Math.floor(committee.length * 2 / 3) + 1;
+    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
+            });
+            return {
+                ...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
+                };
+            }
+        }
+    }
+    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: validAttestationCount,
+            ...logData
+        });
+        return failedValidationResult('insufficient-attestations');
+    }
+    logger?.debug(`Checkpoint attestations validated successfully for checkpoint ${checkpoint.number} at slot ${slot}`, logData);
+    return {
+        valid: true
+    };
+}

package/dest/factory.d.ts

@@ -1,9 +1,10 @@
-import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
 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 TelemetryClient } from '@aztec/telemetry-client';
+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";
+/** Creates an archiver store. */
+export declare function createArchiverStore(userConfig: Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & DataStoreConfig): Promise<KVArchiverDataStore>;
 /**
  * Creates a local archiver.
  * @param config - The archiver configuration.
@@ -12,13 +13,7 @@ import type { ArchiverConfig } from './archiver/config.js';
  * @param telemetry - The telemetry client.
  * @returns The local archiver.
  */
-export declare function createArchiver(config: ArchiverConfig & DataStoreConfig, blobSinkClient: BlobSinkClientInterface, opts?: {
+export declare function createArchiver(config: ArchiverConfig & DataStoreConfig, deps: ArchiverDeps, opts?: {
     blockUntilSync: boolean;
-}, telemetry?: TelemetryClient): 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFPOUQsT0FBTyxFQUFFLFFBQVEsRUFBRSxLQUFLLFlBQVksRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzNELE9BQU8sRUFBdUIsbUJBQW1CLEVBQUUsTUFBTSxtREFBbUQsQ0FBQztBQUU3RyxlQUFPLE1BQU0sbUJBQW1CLGFBQWEsQ0FBQztBQUU5QyxpQ0FBaUM7QUFDakMsd0JBQXNCLG1CQUFtQixDQUN2QyxVQUFVLEVBQUUsSUFBSSxDQUFDLGNBQWMsRUFBRSx3QkFBd0IsR0FBRyxTQUFTLENBQUMsR0FBRyxlQUFlLGdDQVF6RjtBQUVEOzs7Ozs7O0dBT0c7QUFDSCx3QkFBc0IsY0FBYyxDQUNsQyxNQUFNLEVBQUUsY0FBYyxHQUFHLGVBQWUsRUFDeEMsSUFBSSxFQUFFLFlBQVksRUFDbEIsSUFBSSxHQUFFO0lBQUUsY0FBYyxFQUFFLE9BQU8sQ0FBQTtDQUE2QixHQUMzRCxPQUFPLENBQUMsUUFBUSxDQUFDLENBSW5CIn0=

package/dest/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAEvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAQ9D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAMrE,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAE5E,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAI3D;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,cAAc,EAAE,uBAAuB,EACvC,IAAI,GAAE;IAAE,cAAc,EAAE,OAAO,CAAA;CAA6B,EAC5D,SAAS,GAAE,eAAsC,GAChD,OAAO,CAAC,WAAW,GAAG,OAAO,GAAG,yBAAyB,CAAC,CAW5D;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":"AACA,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,17 +1,20 @@
 import { createLogger } from '@aztec/foundation/log';
 import { createStore } from '@aztec/kv-store/lmdb-v2';
-import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
-import { TokenBridgeContractArtifact } from '@aztec/noir-contracts.js/TokenBridge';
-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, getContractClassFromArtifact } from '@aztec/stdlib/contract';
-import { getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
-import { getTelemetryClient } from '@aztec/telemetry-client';
+import { computePublicBytecodeCommitment } from '@aztec/stdlib/contract';
 import { Archiver } from './archiver/archiver.js';
-import { KVArchiverDataStore } from './archiver/index.js';
-import { createArchiverClient } from './rpc/index.js';
+import { ARCHIVER_DB_VERSION, KVArchiverDataStore } from './archiver/kv_archiver_store/kv_archiver_store.js';
+export const ARCHIVER_STORE_NAME = 'archiver';
+/** Creates an archiver store. */ export async function createArchiverStore(userConfig) {
+    const config = {
+        ...userConfig,
+        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);
+}
 /**
  * Creates a local archiver.
  * @param config - The archiver configuration.
@@ -19,27 +22,12 @@ import { createArchiverClient } from './rpc/index.js';
  * @param opts - The options.
  * @param telemetry - The telemetry client.
  * @returns The local archiver.
- */ export async function createArchiver(config, blobSinkClient, opts = {
+ */ export async function createArchiver(config, deps, opts = {
     blockUntilSync: true
-}, telemetry = getTelemetryClient()) {
-    const store = await createStore('archiver', KVArchiverDataStore.SCHEMA_VERSION, config, createLogger('archiver:lmdb'));
-    const archiverStore = new KVArchiverDataStore(store, config.maxLogs);
+}) {
+    const archiverStore = await createArchiverStore(config);
     await registerProtocolContracts(archiverStore);
-    await registerCommonContracts(archiverStore);
-    return Archiver.createAndSync(config, archiverStore, {
-        telemetry,
-        blobSinkClient
-    }, 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()));
+    return Archiver.createAndSync(config, archiverStore, deps, opts.blockUntilSync);
 }
 async function registerProtocolContracts(store) {
     const blockNumber = 0;
@@ -49,10 +37,10 @@ async function registerProtocolContracts(store) {
         const contractClassPublic = {
             ...contract.contractClass,
             privateFunctions: [],
-            unconstrainedFunctions: []
+            utilityFunctions: []
         };
         const publicFunctionSignatures = contract.artifact.functions.filter((fn)=>fn.functionType === FunctionType.PUBLIC).map((fn)=>decodeFunctionSignature(fn.name, fn.parameters));
-        await store.registerContractFunctionSignatures(contract.address, publicFunctionSignatures);
+        await store.registerContractFunctionSignatures(publicFunctionSignatures);
         const bytecodeCommitment = await computePublicBytecodeCommitment(contractClassPublic.packedBytecode);
         await store.addContractClasses([
             contractClassPublic
@@ -64,22 +52,3 @@ async function registerProtocolContracts(store) {
         ], blockNumber);
     }
 }
-// TODO(#10007): Remove this method. We are explicitly registering these contracts
-// here to ensure they are available to all nodes and all prover nodes, since the PXE
-// was tweaked to automatically push contract classes to the node it is registered,
-// but other nodes in the network may require the contract classes to be registered as well.
-// TODO(#10007): Remove the dependency on noir-contracts.js from this package once we remove this.
-async function registerCommonContracts(store) {
-    const blockNumber = 0;
-    const artifacts = [
-        TokenBridgeContractArtifact,
-        TokenContractArtifact
-    ];
-    const classes = await Promise.all(artifacts.map(async (artifact)=>({
-            ...await getContractClassFromArtifact(artifact),
-            privateFunctions: [],
-            unconstrainedFunctions: []
-        })));
-    const bytecodeCommitments = await Promise.all(classes.map((x)=>computePublicBytecodeCommitment(x.packedBytecode)));
-    await store.addContractClasses(classes, bytecodeCommitments, 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 { retrieveL2ProofVerifiedEvents } from './archiver/data_retrieval.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsZ0JBQWdCLENBQUM7QUFFL0IsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sOEJBQThCLENBQUMifQ==

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,MAAM,8BAA8B,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 { retrieveL2ProofVerifiedEvents } from './archiver/data_retrieval.js';

package/dest/rpc/index.d.ts

@@ -1,10 +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, rpcMethod: string, body: any, useApiEndpoints: boolean, extraHeaders?: Record<string, string> | undefined, noRetry?: boolean | undefined) => 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;
-export declare function createArchiverRpcServer(handler: ArchiverApi): import("@aztec/foundation/json-rpc/server").SafeJsonRpcServer;
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ycGMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssV0FBVyxFQUFxQixNQUFNLGlDQUFpQyxDQUFDO0FBQ3RGLE9BQU8sRUFBRSxLQUFLLGtCQUFrQixFQUFnQyxNQUFNLDBCQUEwQixDQUFDO0FBR2pHLHdCQUFnQixvQkFBb0IsQ0FDbEMsR0FBRyxFQUFFLE1BQU0sRUFDWCxRQUFRLEVBQUUsT0FBTyxDQUFDLGtCQUFrQixDQUFDLEVBQ3JDLEtBQUs7Ozs7O0VBQW1DLEdBQ3ZDLFdBQVcsQ0FNYiJ9