@aztec/archiver 0.0.1-commit.f504929 → 0.0.1-commit.f5a9928

package/dest/store/contract_class_store.d.ts

@@ -1,6 +1,6 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import type { ContractClassPublic, ExecutablePrivateFunctionWithMembershipProof, UtilityFunctionWithMembershipProof } from '@aztec/stdlib/contract';
+import type { ContractClassPublic, ContractClassPublicWithCommitment } from '@aztec/stdlib/contract';
 /**
  * LMDB-based contract class storage for the archiver.
  */
@@ -8,11 +8,24 @@ export declare class ContractClassStore {
     #private;
     private db;
     constructor(db: AztecAsyncKVStore);
+    /**
+     * Adds multiple contract classes to the store.
+     * @param data - Contract classes (with bytecode commitments) to add.
+     * @param blockNumber - L2 block number where the classes were registered.
+     * @returns True if every insert succeeded.
+     */
+    addContractClasses(data: ContractClassPublicWithCommitment[], blockNumber: number): Promise<boolean>;
+    /**
+     * Removes multiple contract classes from the store, but only if they were registered at or after the given block.
+     * @param data - Contract classes to delete.
+     * @param blockNumber - Lower bound on the block number at which the classes were registered.
+     * @returns True if every delete succeeded.
+     */
+    deleteContractClasses(data: ContractClassPublic[], blockNumber: number): Promise<boolean>;
     addContractClass(contractClass: ContractClassPublic, bytecodeCommitment: Fr, blockNumber: number): Promise<void>;
-    deleteContractClasses(contractClass: ContractClassPublic, blockNumber: number): Promise<void>;
+    deleteContractClass(contractClass: ContractClassPublic, blockNumber: number): Promise<void>;
     getContractClass(id: Fr): Promise<ContractClassPublic | undefined>;
     getBytecodeCommitment(id: Fr): Promise<Fr | undefined>;
     getContractClassIds(): Promise<Fr[]>;
-    addFunctions(contractClassId: Fr, newPrivateFunctions: ExecutablePrivateFunctionWithMembershipProof[], newUtilityFunctions: UtilityFunctionWithMembershipProof[]): Promise<boolean>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3Nfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZS9jb250cmFjdF9jbGFzc19zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFHcEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFFeEUsT0FBTyxLQUFLLEVBQ1YsbUJBQW1CLEVBRW5CLDRDQUE0QyxFQUM1QyxrQ0FBa0MsRUFDbkMsTUFBTSx3QkFBd0IsQ0FBQztBQUdoQzs7R0FFRztBQUNILHFCQUFhLGtCQUFrQjs7SUFJakIsT0FBTyxDQUFDLEVBQUU7SUFBdEIsWUFBb0IsRUFBRSxFQUFFLGlCQUFpQixFQUd4QztJQUVLLGdCQUFnQixDQUNwQixhQUFhLEVBQUUsbUJBQW1CLEVBQ2xDLGtCQUFrQixFQUFFLEVBQUUsRUFDdEIsV0FBVyxFQUFFLE1BQU0sR0FDbEIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVFmO0lBRUsscUJBQXFCLENBQUMsYUFBYSxFQUFFLG1CQUFtQixFQUFFLFdBQVcsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVFsRztJQUVLLGdCQUFnQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLG1CQUFtQixHQUFHLFNBQVMsQ0FBQyxDQUd2RTtJQUVLLHFCQUFxQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FHM0Q7SUFFSyxtQkFBbUIsSUFBSSxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FFekM7SUFFSyxZQUFZLENBQ2hCLGVBQWUsRUFBRSxFQUFFLEVBQ25CLG1CQUFtQixFQUFFLDRDQUE0QyxFQUFFLEVBQ25FLG1CQUFtQixFQUFFLGtDQUFrQyxFQUFFLEdBQ3hELE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0F5QmxCO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3Nfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZS9jb250cmFjdF9jbGFzc19zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFHcEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFFeEUsT0FBTyxLQUFLLEVBQ1YsbUJBQW1CLEVBRW5CLGlDQUFpQyxFQUNsQyxNQUFNLHdCQUF3QixDQUFDO0FBRWhDOztHQUVHO0FBQ0gscUJBQWEsa0JBQWtCOztJQUlqQixPQUFPLENBQUMsRUFBRTtJQUF0QixZQUFvQixFQUFFLEVBQUUsaUJBQWlCLEVBR3hDO0lBRUQ7Ozs7O09BS0c7SUFDRyxrQkFBa0IsQ0FBQyxJQUFJLEVBQUUsaUNBQWlDLEVBQUUsRUFBRSxXQUFXLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FJekc7SUFFRDs7Ozs7T0FLRztJQUNHLHFCQUFxQixDQUFDLElBQUksRUFBRSxtQkFBbUIsRUFBRSxFQUFFLFdBQVcsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUU5RjtJQUVLLGdCQUFnQixDQUNwQixhQUFhLEVBQUUsbUJBQW1CLEVBQ2xDLGtCQUFrQixFQUFFLEVBQUUsRUFDdEIsV0FBVyxFQUFFLE1BQU0sR0FDbEIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXdCZjtJQUVLLG1CQUFtQixDQUFDLGFBQWEsRUFBRSxtQkFBbUIsRUFBRSxXQUFXLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FhaEc7SUFFSyxnQkFBZ0IsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsR0FBRyxTQUFTLENBQUMsQ0FHdkU7SUFFSyxxQkFBcUIsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLEdBQUcsU0FBUyxDQUFDLENBRzNEO0lBRUssbUJBQW1CLElBQUksT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBRXpDO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"contract_class_store.d.ts","sourceRoot":"","sources":["../../src/store/contract_class_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AAExE,OAAO,KAAK,EACV,mBAAmB,EAEnB,4CAA4C,EAC5C,kCAAkC,EACnC,MAAM,wBAAwB,CAAC;AAGhC;;GAEG;AACH,qBAAa,kBAAkB;;IAIjB,OAAO,CAAC,EAAE;IAAtB,YAAoB,EAAE,EAAE,iBAAiB,EAGxC;IAEK,gBAAgB,CACpB,aAAa,EAAE,mBAAmB,EAClC,kBAAkB,EAAE,EAAE,EACtB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAQf;IAEK,qBAAqB,CAAC,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQlG;IAEK,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAGvE;IAEK,qBAAqB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAG3D;IAEK,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAEzC;IAEK,YAAY,CAChB,eAAe,EAAE,EAAE,EACnB,mBAAmB,EAAE,4CAA4C,EAAE,EACnE,mBAAmB,EAAE,kCAAkC,EAAE,GACxD,OAAO,CAAC,OAAO,CAAC,CAyBlB;CACF"}
+{"version":3,"file":"contract_class_store.d.ts","sourceRoot":"","sources":["../../src/store/contract_class_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AAExE,OAAO,KAAK,EACV,mBAAmB,EAEnB,iCAAiC,EAClC,MAAM,wBAAwB,CAAC;AAEhC;;GAEG;AACH,qBAAa,kBAAkB;;IAIjB,OAAO,CAAC,EAAE;IAAtB,YAAoB,EAAE,EAAE,iBAAiB,EAGxC;IAED;;;;;OAKG;IACG,kBAAkB,CAAC,IAAI,EAAE,iCAAiC,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAIzG;IAED;;;;;OAKG;IACG,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAE9F;IAEK,gBAAgB,CACpB,aAAa,EAAE,mBAAmB,EAClC,kBAAkB,EAAE,EAAE,EACtB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAwBf;IAEK,mBAAmB,CAAC,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAahG;IAEK,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAGvE;IAEK,qBAAqB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAG3D;IAEK,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAEzC;CACF"}

package/dest/store/contract_class_store.js

@@ -1,8 +1,7 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { toArray } from '@aztec/foundation/iterable';
 import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize';
-import { FunctionSelector } from '@aztec/stdlib/abi';
-import { Vector } from '@aztec/stdlib/types';
+import { isProtocolContractClass } from '@aztec/protocol-contracts';
 /**
  * LMDB-based contract class storage for the archiver.
  */ export class ContractClassStore {
@@ -14,16 +13,53 @@ import { Vector } from '@aztec/stdlib/types';
         this.#contractClasses = db.openMap('archiver_contract_classes');
         this.#bytecodeCommitments = db.openMap('archiver_bytecode_commitments');
     }
+    /**
+   * Adds multiple contract classes to the store.
+   * @param data - Contract classes (with bytecode commitments) to add.
+   * @param blockNumber - L2 block number where the classes were registered.
+   * @returns True if every insert succeeded.
+   */ async addContractClasses(data, blockNumber) {
+        return (await Promise.all(data.map((c)=>this.addContractClass(c, c.publicBytecodeCommitment, blockNumber)))).every(Boolean);
+    }
+    /**
+   * Removes multiple contract classes from the store, but only if they were registered at or after the given block.
+   * @param data - Contract classes to delete.
+   * @param blockNumber - Lower bound on the block number at which the classes were registered.
+   * @returns True if every delete succeeded.
+   */ async deleteContractClasses(data, blockNumber) {
+        return (await Promise.all(data.map((c)=>this.deleteContractClass(c, blockNumber)))).every(Boolean);
+    }
     async addContractClass(contractClass, bytecodeCommitment, blockNumber) {
         await this.db.transactionAsync(async ()=>{
-            await this.#contractClasses.setIfNotExists(contractClass.id.toString(), serializeContractClassPublic({
+            const key = contractClass.id.toString();
+            const existing = await this.#contractClasses.getAsync(key);
+            if (existing !== undefined) {
+                // Protocol contracts are preloaded at block 0, so a later on-chain (re-)publish of a bundled
+                // protocol class id is valid and must be a no-op. Keep the existing block-0 entry untouched
+                // (do not bump its block number) so it survives reorgs of the publishing block.
+                if (isProtocolContractClass(contractClass.id)) {
+                    return;
+                }
+                // An L1 reorg can re-present an already-stored checkpoint, replaying this class at the same
+                // block; treat that as a no-op. A duplicate at a different block still signals double-processing.
+                if (deserializeContractClassPublic(existing).l2BlockNumber === blockNumber) {
+                    return;
+                }
+                throw new Error(`Contract class ${key} already exists, cannot add again at block ${blockNumber}`);
+            }
+            await this.#contractClasses.set(key, serializeContractClassPublic({
                 ...contractClass,
                 l2BlockNumber: blockNumber
             }));
-            await this.#bytecodeCommitments.setIfNotExists(contractClass.id.toString(), bytecodeCommitment.toBuffer());
+            await this.#bytecodeCommitments.set(key, bytecodeCommitment.toBuffer());
         });
     }
-    async deleteContractClasses(contractClass, blockNumber) {
+    async deleteContractClass(contractClass, blockNumber) {
+        // Protocol contracts are preloaded at block 0 and must never be deleted, even when the block that
+        // (re-)published them on-chain is unwound by a reorg.
+        if (isProtocolContractClass(contractClass.id)) {
+            return;
+        }
         const restoredContractClass = await this.#contractClasses.getAsync(contractClass.id.toString());
         if (restoredContractClass && deserializeContractClassPublic(restoredContractClass).l2BlockNumber >= blockNumber) {
             await this.db.transactionAsync(async ()=>{
@@ -46,38 +82,9 @@ import { Vector } from '@aztec/stdlib/types';
     async getContractClassIds() {
         return (await toArray(this.#contractClasses.keysAsync())).map((key)=>Fr.fromHexString(key));
     }
-    async addFunctions(contractClassId, newPrivateFunctions, newUtilityFunctions) {
-        await this.db.transactionAsync(async ()=>{
-            const existingClassBuffer = await this.#contractClasses.getAsync(contractClassId.toString());
-            if (!existingClassBuffer) {
-                throw new Error(`Unknown contract class ${contractClassId} when adding private functions to store`);
-            }
-            const existingClass = deserializeContractClassPublic(existingClassBuffer);
-            const { privateFunctions: existingPrivateFns, utilityFunctions: existingUtilityFns } = existingClass;
-            const updatedClass = {
-                ...existingClass,
-                privateFunctions: [
-                    ...existingPrivateFns,
-                    ...newPrivateFunctions.filter((newFn)=>!existingPrivateFns.some((f)=>f.selector.equals(newFn.selector)))
-                ],
-                utilityFunctions: [
-                    ...existingUtilityFns,
-                    ...newUtilityFunctions.filter((newFn)=>!existingUtilityFns.some((f)=>f.selector.equals(newFn.selector)))
-                ]
-            };
-            await this.#contractClasses.set(contractClassId.toString(), serializeContractClassPublic(updatedClass));
-        });
-        return true;
-    }
 }
 function serializeContractClassPublic(contractClass) {
-    return serializeToBuffer(contractClass.l2BlockNumber, numToUInt8(contractClass.version), contractClass.artifactHash, contractClass.privateFunctions.length, contractClass.privateFunctions.map(serializePrivateFunction), contractClass.utilityFunctions.length, contractClass.utilityFunctions.map(serializeUtilityFunction), contractClass.packedBytecode.length, contractClass.packedBytecode, contractClass.privateFunctionsRoot);
-}
-function serializePrivateFunction(fn) {
-    return serializeToBuffer(fn.selector, fn.vkHash, fn.bytecode.length, fn.bytecode, fn.functionMetadataHash, fn.artifactMetadataHash, fn.utilityFunctionsTreeRoot, new Vector(fn.privateFunctionTreeSiblingPath), fn.privateFunctionTreeLeafIndex, new Vector(fn.artifactTreeSiblingPath), fn.artifactTreeLeafIndex);
-}
-function serializeUtilityFunction(fn) {
-    return serializeToBuffer(fn.selector, fn.bytecode.length, fn.bytecode, fn.functionMetadataHash, fn.artifactMetadataHash, fn.privateFunctionsArtifactTreeRoot, new Vector(fn.artifactTreeSiblingPath), fn.artifactTreeLeafIndex);
+    return serializeToBuffer(contractClass.l2BlockNumber, numToUInt8(contractClass.version), contractClass.artifactHash, contractClass.packedBytecode.length, contractClass.packedBytecode, contractClass.privateFunctionsRoot);
 }
 function deserializeContractClassPublic(buffer) {
     const reader = BufferReader.asReader(buffer);
@@ -85,40 +92,7 @@ function deserializeContractClassPublic(buffer) {
         l2BlockNumber: reader.readNumber(),
         version: reader.readUInt8(),
         artifactHash: reader.readObject(Fr),
-        privateFunctions: reader.readVector({
-            fromBuffer: deserializePrivateFunction
-        }),
-        utilityFunctions: reader.readVector({
-            fromBuffer: deserializeUtilityFunction
-        }),
         packedBytecode: reader.readBuffer(),
         privateFunctionsRoot: reader.readObject(Fr)
     };
 }
-function deserializePrivateFunction(buffer) {
-    const reader = BufferReader.asReader(buffer);
-    return {
-        selector: reader.readObject(FunctionSelector),
-        vkHash: reader.readObject(Fr),
-        bytecode: reader.readBuffer(),
-        functionMetadataHash: reader.readObject(Fr),
-        artifactMetadataHash: reader.readObject(Fr),
-        utilityFunctionsTreeRoot: reader.readObject(Fr),
-        privateFunctionTreeSiblingPath: reader.readVector(Fr),
-        privateFunctionTreeLeafIndex: reader.readNumber(),
-        artifactTreeSiblingPath: reader.readVector(Fr),
-        artifactTreeLeafIndex: reader.readNumber()
-    };
-}
-function deserializeUtilityFunction(buffer) {
-    const reader = BufferReader.asReader(buffer);
-    return {
-        selector: reader.readObject(FunctionSelector),
-        bytecode: reader.readBuffer(),
-        functionMetadataHash: reader.readObject(Fr),
-        artifactMetadataHash: reader.readObject(Fr),
-        privateFunctionsArtifactTreeRoot: reader.readObject(Fr),
-        artifactTreeSiblingPath: reader.readVector(Fr),
-        artifactTreeLeafIndex: reader.readNumber()
-    };
-}

package/dest/store/contract_instance_store.d.ts

@@ -11,6 +11,33 @@ export declare class ContractInstanceStore {
     #private;
     private db;
     constructor(db: AztecAsyncKVStore);
+    /**
+     * Adds multiple contract instances to the store.
+     * @param data - Contract instances to add.
+     * @param blockNumber - L2 block number where the instances were deployed.
+     * @returns True if every insert succeeded.
+     */
+    addContractInstances(data: ContractInstanceWithAddress[], blockNumber: number): Promise<boolean>;
+    /**
+     * Removes multiple contract instances from the store.
+     * @param data - Contract instances to delete.
+     * @returns True if every delete succeeded.
+     */
+    deleteContractInstances(data: ContractInstanceWithAddress[]): Promise<boolean>;
+    /**
+     * Adds multiple contract instance updates to the store.
+     * @param data - Contract instance updates to add.
+     * @param timestamp - Timestamp at which the updates were scheduled.
+     * @returns True if every insert succeeded.
+     */
+    addContractInstanceUpdates(data: ContractInstanceUpdateWithAddress[], timestamp: UInt64): Promise<boolean>;
+    /**
+     * Removes multiple contract instance updates from the store.
+     * @param data - Contract instance updates to delete.
+     * @param timestamp - Timestamp at which the updates were scheduled.
+     * @returns True if every delete succeeded.
+     */
+    deleteContractInstanceUpdates(data: ContractInstanceUpdateWithAddress[], timestamp: UInt64): Promise<boolean>;
     addContractInstance(contractInstance: ContractInstanceWithAddress, blockNumber: number): Promise<void>;
     deleteContractInstance(contractInstance: ContractInstanceWithAddress): Promise<void>;
     getUpdateKey(contractAddress: AztecAddress, timestamp: UInt64, logIndex?: number): ContractInstanceUpdateKey;
@@ -21,4 +48,4 @@ export declare class ContractInstanceStore {
     getContractInstanceDeploymentBlockNumber(address: AztecAddress): Promise<number | undefined>;
 }
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfaW5zdGFuY2Vfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZS9jb250cmFjdF9pbnN0YW5jZV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEVBQ0wsS0FBSyxpQ0FBaUMsRUFDdEMsS0FBSywyQkFBMkIsRUFHakMsTUFBTSx3QkFBd0IsQ0FBQztBQUNoQyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVsRCxLQUFLLHlCQUF5QixHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztBQUU3RTs7R0FFRztBQUNILHFCQUFhLHFCQUFxQjs7SUFLcEIsT0FBTyxDQUFDLEVBQUU7SUFBdEIsWUFBb0IsRUFBRSxFQUFFLGlCQUFpQixFQUl4QztJQUVELG1CQUFtQixDQUFDLGdCQUFnQixFQUFFLDJCQUEyQixFQUFFLFdBQVcsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVFyRztJQUVELHNCQUFzQixDQUFDLGdCQUFnQixFQUFFLDJCQUEyQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FLbkY7SUFFRCxZQUFZLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLFFBQVEsQ0FBQyxFQUFFLE1BQU0sR0FBRyx5QkFBeUIsQ0FNM0c7SUFFRCx5QkFBeUIsQ0FDdkIsc0JBQXNCLEVBQUUsaUNBQWlDLEVBQ3pELFNBQVMsRUFBRSxNQUFNLEVBQ2pCLFFBQVEsRUFBRSxNQUFNLEdBQ2YsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUtmO0lBRUQsNEJBQTRCLENBQzFCLHNCQUFzQixFQUFFLGlDQUFpQyxFQUN6RCxTQUFTLEVBQUUsTUFBTSxFQUNqQixRQUFRLEVBQUUsTUFBTSxHQUNmLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFZjtJQUVLLGlDQUFpQyxDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxlQUFlLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FvQmxIO0lBRUssbUJBQW1CLENBQ3ZCLE9BQU8sRUFBRSxZQUFZLEVBQ3JCLFNBQVMsRUFBRSxNQUFNLEdBQ2hCLE9BQU8sQ0FBQywyQkFBMkIsR0FBRyxTQUFTLENBQUMsQ0FhbEQ7SUFFRCx3Q0FBd0MsQ0FBQyxPQUFPLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRTNGO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfaW5zdGFuY2Vfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZS9jb250cmFjdF9pbnN0YW5jZV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUV4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEVBQ0wsS0FBSyxpQ0FBaUMsRUFDdEMsS0FBSywyQkFBMkIsRUFHakMsTUFBTSx3QkFBd0IsQ0FBQztBQUNoQyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVsRCxLQUFLLHlCQUF5QixHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztBQUU3RTs7R0FFRztBQUNILHFCQUFhLHFCQUFxQjs7SUFLcEIsT0FBTyxDQUFDLEVBQUU7SUFBdEIsWUFBb0IsRUFBRSxFQUFFLGlCQUFpQixFQUl4QztJQUVEOzs7OztPQUtHO0lBQ0csb0JBQW9CLENBQUMsSUFBSSxFQUFFLDJCQUEyQixFQUFFLEVBQUUsV0FBVyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBRXJHO0lBRUQ7Ozs7T0FJRztJQUNHLHVCQUF1QixDQUFDLElBQUksRUFBRSwyQkFBMkIsRUFBRSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FFbkY7SUFFRDs7Ozs7T0FLRztJQUNHLDBCQUEwQixDQUFDLElBQUksRUFBRSxpQ0FBaUMsRUFBRSxFQUFFLFNBQVMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUkvRztJQUVEOzs7OztPQUtHO0lBQ0csNkJBQTZCLENBQUMsSUFBSSxFQUFFLGlDQUFpQyxFQUFFLEVBQUUsU0FBUyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBSWxIO0lBRUQsbUJBQW1CLENBQUMsZ0JBQWdCLEVBQUUsMkJBQTJCLEVBQUUsV0FBVyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBc0JyRztJQUVELHNCQUFzQixDQUFDLGdCQUFnQixFQUFFLDJCQUEyQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FVbkY7SUFFRCxZQUFZLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLFFBQVEsQ0FBQyxFQUFFLE1BQU0sR0FBRyx5QkFBeUIsQ0FNM0c7SUFFRCx5QkFBeUIsQ0FDdkIsc0JBQXNCLEVBQUUsaUNBQWlDLEVBQ3pELFNBQVMsRUFBRSxNQUFNLEVBQ2pCLFFBQVEsRUFBRSxNQUFNLEdBQ2YsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUtmO0lBRUQsNEJBQTRCLENBQzFCLHNCQUFzQixFQUFFLGlDQUFpQyxFQUN6RCxTQUFTLEVBQUUsTUFBTSxFQUNqQixRQUFRLEVBQUUsTUFBTSxHQUNmLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFZjtJQUVLLGlDQUFpQyxDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxlQUFlLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FtQmxIO0lBRUssbUJBQW1CLENBQ3ZCLE9BQU8sRUFBRSxZQUFZLEVBQ3JCLFNBQVMsRUFBRSxNQUFNLEdBQ2hCLE9BQU8sQ0FBQywyQkFBMkIsR0FBRyxTQUFTLENBQUMsQ0FhbEQ7SUFFRCx3Q0FBd0MsQ0FBQyxPQUFPLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRTNGO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"contract_instance_store.d.ts","sourceRoot":"","sources":["../../src/store/contract_instance_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EACL,KAAK,iCAAiC,EACtC,KAAK,2BAA2B,EAGjC,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,KAAK,yBAAyB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAE7E;;GAEG;AACH,qBAAa,qBAAqB;;IAKpB,OAAO,CAAC,EAAE;IAAtB,YAAoB,EAAE,EAAE,iBAAiB,EAIxC;IAED,mBAAmB,CAAC,gBAAgB,EAAE,2BAA2B,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQrG;IAED,sBAAsB,CAAC,gBAAgB,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAKnF;IAED,YAAY,CAAC,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,yBAAyB,CAM3G;IAED,yBAAyB,CACvB,sBAAsB,EAAE,iCAAiC,EACzD,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAKf;IAED,4BAA4B,CAC1B,sBAAsB,EAAE,iCAAiC,EACzD,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAEf;IAEK,iCAAiC,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAoBlH;IAEK,mBAAmB,CACvB,OAAO,EAAE,YAAY,EACrB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAalD;IAED,wCAAwC,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE3F;CACF"}
+{"version":3,"file":"contract_instance_store.d.ts","sourceRoot":"","sources":["../../src/store/contract_instance_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AAExE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EACL,KAAK,iCAAiC,EACtC,KAAK,2BAA2B,EAGjC,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,KAAK,yBAAyB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAE7E;;GAEG;AACH,qBAAa,qBAAqB;;IAKpB,OAAO,CAAC,EAAE;IAAtB,YAAoB,EAAE,EAAE,iBAAiB,EAIxC;IAED;;;;;OAKG;IACG,oBAAoB,CAAC,IAAI,EAAE,2BAA2B,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAErG;IAED;;;;OAIG;IACG,uBAAuB,CAAC,IAAI,EAAE,2BAA2B,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAEnF;IAED;;;;;OAKG;IACG,0BAA0B,CAAC,IAAI,EAAE,iCAAiC,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAI/G;IAED;;;;;OAKG;IACG,6BAA6B,CAAC,IAAI,EAAE,iCAAiC,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAIlH;IAED,mBAAmB,CAAC,gBAAgB,EAAE,2BAA2B,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBrG;IAED,sBAAsB,CAAC,gBAAgB,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAUnF;IAED,YAAY,CAAC,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,yBAAyB,CAM3G;IAED,yBAAyB,CACvB,sBAAsB,EAAE,iCAAiC,EACzD,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAKf;IAED,4BAA4B,CAC1B,sBAAsB,EAAE,iCAAiC,EACzD,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAEf;IAEK,iCAAiC,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAmBlH;IAEK,mBAAmB,CACvB,OAAO,EAAE,YAAY,EACrB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAalD;IAED,wCAAwC,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE3F;CACF"}

package/dest/store/contract_instance_store.js

@@ -1,3 +1,5 @@
+import { first } from '@aztec/foundation/iterable';
+import { isProtocolContract } from '@aztec/protocol-contracts';
 import { SerializableContractInstance, SerializableContractInstanceUpdate } from '@aztec/stdlib/contract';
 /**
  * LMDB-based contract instance storage for the archiver.
@@ -12,13 +14,64 @@ import { SerializableContractInstance, SerializableContractInstanceUpdate } from
         this.#contractInstancePublishedAt = db.openMap('archiver_contract_instances_publication_block_number');
         this.#contractInstanceUpdates = db.openMap('archiver_contract_instance_updates');
     }
+    /**
+   * Adds multiple contract instances to the store.
+   * @param data - Contract instances to add.
+   * @param blockNumber - L2 block number where the instances were deployed.
+   * @returns True if every insert succeeded.
+   */ async addContractInstances(data, blockNumber) {
+        return (await Promise.all(data.map((c)=>this.addContractInstance(c, blockNumber)))).every(Boolean);
+    }
+    /**
+   * Removes multiple contract instances from the store.
+   * @param data - Contract instances to delete.
+   * @returns True if every delete succeeded.
+   */ async deleteContractInstances(data) {
+        return (await Promise.all(data.map((c)=>this.deleteContractInstance(c)))).every(Boolean);
+    }
+    /**
+   * Adds multiple contract instance updates to the store.
+   * @param data - Contract instance updates to add.
+   * @param timestamp - Timestamp at which the updates were scheduled.
+   * @returns True if every insert succeeded.
+   */ async addContractInstanceUpdates(data, timestamp) {
+        return (await Promise.all(data.map((update, logIndex)=>this.addContractInstanceUpdate(update, timestamp, logIndex)))).every(Boolean);
+    }
+    /**
+   * Removes multiple contract instance updates from the store.
+   * @param data - Contract instance updates to delete.
+   * @param timestamp - Timestamp at which the updates were scheduled.
+   * @returns True if every delete succeeded.
+   */ async deleteContractInstanceUpdates(data, timestamp) {
+        return (await Promise.all(data.map((update, logIndex)=>this.deleteContractInstanceUpdate(update, timestamp, logIndex)))).every(Boolean);
+    }
     addContractInstance(contractInstance, blockNumber) {
         return this.db.transactionAsync(async ()=>{
-            await this.#contractInstances.set(contractInstance.address.toString(), new SerializableContractInstance(contractInstance).toBuffer());
-            await this.#contractInstancePublishedAt.set(contractInstance.address.toString(), blockNumber);
+            const key = contractInstance.address.toString();
+            if (await this.#contractInstances.hasAsync(key)) {
+                // Protocol contracts are preloaded at block 0, so a later on-chain (re-)publish of a bundled
+                // protocol instance is valid and must be a no-op. Keep the existing block-0 entry untouched.
+                if (isProtocolContract(contractInstance.address)) {
+                    return;
+                }
+                const existingBlockNumber = await this.#contractInstancePublishedAt.getAsync(key);
+                // An L1 reorg can re-present an already-stored checkpoint, replaying this instance at the same
+                // block; treat that as a no-op. A duplicate at a different block still signals double-processing.
+                if (existingBlockNumber === blockNumber) {
+                    return;
+                }
+                throw new Error(`Contract instance at ${key} already exists (deployed at block ${existingBlockNumber}), cannot add again at block ${blockNumber}`);
+            }
+            await this.#contractInstances.set(key, new SerializableContractInstance(contractInstance).toBuffer());
+            await this.#contractInstancePublishedAt.set(key, blockNumber);
         });
     }
     deleteContractInstance(contractInstance) {
+        // Protocol contracts are preloaded at block 0 and must never be deleted, even when the block that
+        // (re-)published them on-chain is unwound by a reorg.
+        if (isProtocolContract(contractInstance.address)) {
+            return Promise.resolve();
+        }
         return this.db.transactionAsync(async ()=>{
             await this.#contractInstances.delete(contractInstance.address.toString());
             await this.#contractInstancePublishedAt.delete(contractInstance.address.toString());
@@ -46,16 +99,15 @@ import { SerializableContractInstance, SerializableContractInstanceUpdate } from
     }
     async getCurrentContractInstanceClassId(address, timestamp, originalClassId) {
         // We need to find the last update before the given timestamp
-        const queryResult = await this.#contractInstanceUpdates.valuesAsync({
+        const serializedUpdate = await first(this.#contractInstanceUpdates.valuesAsync({
             reverse: true,
             start: this.getUpdateKey(address, 0n),
             end: this.getUpdateKey(address, timestamp + 1n),
             limit: 1
-        }).next();
-        if (queryResult.done) {
+        }));
+        if (serializedUpdate === undefined) {
             return originalClassId;
         }
-        const serializedUpdate = queryResult.value;
         const update = SerializableContractInstanceUpdate.fromBuffer(serializedUpdate);
         if (timestamp < update.timestampOfChange) {
             return update.prevContractClassId.isZero() ? originalClassId : update.prevContractClassId;

package/dest/store/data_stores.d.ts

@@ -0,0 +1,68 @@
+import type { L1BlockId } from '@aztec/ethereum/l1-types';
+import type { AztecAsyncKVStore } from '@aztec/kv-store';
+import type { BlockHash } from '@aztec/stdlib/block';
+import type { ContractDataSource } from '@aztec/stdlib/contract';
+import { BlockStore } from './block_store.js';
+import { ContractClassStore } from './contract_class_store.js';
+import { ContractInstanceStore } from './contract_instance_store.js';
+import { FunctionNamesCache } from './function_names_cache.js';
+import { LogStore } from './log_store.js';
+import { MessageStore } from './message_store.js';
+export declare const ARCHIVER_DB_VERSION = 7;
+/**
+ * Represents the latest L1 block processed by the archiver for various objects in L2.
+ */
+export type ArchiverL1SynchPoint = {
+    /** Number of the last L1 block that added a new L2 checkpoint metadata.  */
+    blocksSynchedTo?: bigint;
+    /** Last L1 block checked for L1 to L2 messages. */
+    messagesSynchedTo?: L1BlockId;
+};
+/**
+ * Bundle of archiver-owned LMDB substores plus the in-memory caches that span them.
+ *
+ * Replaces the former `KVArchiverDataStore` pass-through wrapper. Callers reach into
+ * the relevant substore directly (e.g. `stores.blocks.getBlock`) and use
+ * {@link createArchiverDataStores} to wire them up against a shared KV store.
+ */
+export type ArchiverDataStores = {
+    /** The underlying key-value store. Use {@link AztecAsyncKVStore.transactionAsync} to compose updates atomically. */
+    db: AztecAsyncKVStore;
+    /** Blocks, checkpoints, tx effects, proven/finalized state. */
+    blocks: BlockStore;
+    /** Public, private and contract class logs. */
+    logs: LogStore;
+    /** L1 to L2 messages and message sync state. */
+    messages: MessageStore;
+    /** Contract classes (with bytecode commitments). */
+    contractClasses: ContractClassStore;
+    /** Contract instances and contract instance updates. */
+    contractInstances: ContractInstanceStore;
+    /** In-memory cache of public function selectors -> names. */
+    functionNames: FunctionNamesCache;
+};
+/**
+ * Wires up the archiver substores against a shared KV store and returns the
+ * {@link ArchiverDataStores} bundle.
+ *
+ * @param genesisBlockHash - Hash of the synthetic genesis block, forwarded to the {@link LogStore} so it
+ *   can resolve a genesis `referenceBlock` (used by the PXE during early sync) instead of treating it as a
+ *   reorg.
+ */
+export declare function createArchiverDataStores(db: AztecAsyncKVStore, genesisBlockHash: BlockHash): ArchiverDataStores;
+/**
+ * Returns the L1 sync point of the archiver, combining the block sync point from {@link BlockStore}
+ * and the message sync point from {@link MessageStore}.
+ */
+export declare function getArchiverSynchPoint(stores: ArchiverDataStores): Promise<ArchiverL1SynchPoint>;
+/**
+ * Backs up the underlying KV store to the given folder. Returns the path to the resulting db file.
+ */
+export declare function backupArchiverDataStores(stores: ArchiverDataStores, path: string, compress?: boolean): Promise<string>;
+/**
+ * Returns a {@link ContractDataSource} adapter over {@link ArchiverDataStores}.
+ * Used by contexts (e.g. offline epoch re-prover tools) that need a ContractDataSource
+ * but do not need a full archiver instance.
+ */
+export declare function createContractDataSource(stores: ArchiverDataStores): ContractDataSource;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9zdG9yZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZS9kYXRhX3N0b3Jlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFLakUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQy9ELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ3JFLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQy9ELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUMxQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFbEQsZUFBTyxNQUFNLG1CQUFtQixJQUFJLENBQUM7QUFFckM7O0dBRUc7QUFDSCxNQUFNLE1BQU0sb0JBQW9CLEdBQUc7SUFDakMsNEVBQTRFO0lBQzVFLGVBQWUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN6QixtREFBbUQ7SUFDbkQsaUJBQWlCLENBQUMsRUFBRSxTQUFTLENBQUM7Q0FDL0IsQ0FBQztBQUVGOzs7Ozs7R0FNRztBQUNILE1BQU0sTUFBTSxrQkFBa0IsR0FBRztJQUMvQixvSEFBb0g7SUFDcEgsRUFBRSxFQUFFLGlCQUFpQixDQUFDO0lBQ3RCLCtEQUErRDtJQUMvRCxNQUFNLEVBQUUsVUFBVSxDQUFDO0lBQ25CLCtDQUErQztJQUMvQyxJQUFJLEVBQUUsUUFBUSxDQUFDO0lBQ2YsZ0RBQWdEO0lBQ2hELFFBQVEsRUFBRSxZQUFZLENBQUM7SUFDdkIsb0RBQW9EO0lBQ3BELGVBQWUsRUFBRSxrQkFBa0IsQ0FBQztJQUNwQyx3REFBd0Q7SUFDeEQsaUJBQWlCLEVBQUUscUJBQXFCLENBQUM7SUFDekMsNkRBQTZEO0lBQzdELGFBQWEsRUFBRSxrQkFBa0IsQ0FBQztDQUNuQyxDQUFDO0FBRUY7Ozs7Ozs7R0FPRztBQUNILHdCQUFnQix3QkFBd0IsQ0FBQyxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsZ0JBQWdCLEVBQUUsU0FBUyxHQUFHLGtCQUFrQixDQVcvRztBQUVEOzs7R0FHRztBQUNILHdCQUFzQixxQkFBcUIsQ0FBQyxNQUFNLEVBQUUsa0JBQWtCLEdBQUcsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBTXJHO0FBRUQ7O0dBRUc7QUFDSCx3QkFBc0Isd0JBQXdCLENBQzVDLE1BQU0sRUFBRSxrQkFBa0IsRUFDMUIsSUFBSSxFQUFFLE1BQU0sRUFDWixRQUFRLFVBQU8sR0FDZCxPQUFPLENBQUMsTUFBTSxDQUFDLENBR2pCO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFnQix3QkFBd0IsQ0FBQyxNQUFNLEVBQUUsa0JBQWtCLEdBQUcsa0JBQWtCLENBRXZGIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"data_stores.d.ts","sourceRoot":"","sources":["../../src/store/data_stores.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAKjE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,eAAO,MAAM,mBAAmB,IAAI,CAAC;AAErC;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,4EAA4E;IAC5E,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mDAAmD;IACnD,iBAAiB,CAAC,EAAE,SAAS,CAAC;CAC/B,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,oHAAoH;IACpH,EAAE,EAAE,iBAAiB,CAAC;IACtB,+DAA+D;IAC/D,MAAM,EAAE,UAAU,CAAC;IACnB,+CAA+C;IAC/C,IAAI,EAAE,QAAQ,CAAC;IACf,gDAAgD;IAChD,QAAQ,EAAE,YAAY,CAAC;IACvB,oDAAoD;IACpD,eAAe,EAAE,kBAAkB,CAAC;IACpC,wDAAwD;IACxD,iBAAiB,EAAE,qBAAqB,CAAC;IACzC,6DAA6D;IAC7D,aAAa,EAAE,kBAAkB,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,SAAS,GAAG,kBAAkB,CAW/G;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAMrG;AAED;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,kBAAkB,EAC1B,IAAI,EAAE,MAAM,EACZ,QAAQ,UAAO,GACd,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,GAAG,kBAAkB,CAEvF"}

package/dest/store/data_stores.js

@@ -0,0 +1,54 @@
+import { join } from 'path';
+import { ArchiverContractDataSourceAdapter } from '../modules/contract_data_source_adapter.js';
+import { BlockStore } from './block_store.js';
+import { ContractClassStore } from './contract_class_store.js';
+import { ContractInstanceStore } from './contract_instance_store.js';
+import { FunctionNamesCache } from './function_names_cache.js';
+import { LogStore } from './log_store.js';
+import { MessageStore } from './message_store.js';
+export const ARCHIVER_DB_VERSION = 7;
+/**
+ * Wires up the archiver substores against a shared KV store and returns the
+ * {@link ArchiverDataStores} bundle.
+ *
+ * @param genesisBlockHash - Hash of the synthetic genesis block, forwarded to the {@link LogStore} so it
+ *   can resolve a genesis `referenceBlock` (used by the PXE during early sync) instead of treating it as a
+ *   reorg.
+ */ export function createArchiverDataStores(db, genesisBlockHash) {
+    const blocks = new BlockStore(db);
+    return {
+        db,
+        blocks,
+        logs: new LogStore(db, blocks, genesisBlockHash),
+        messages: new MessageStore(db),
+        contractClasses: new ContractClassStore(db),
+        contractInstances: new ContractInstanceStore(db),
+        functionNames: new FunctionNamesCache()
+    };
+}
+/**
+ * Returns the L1 sync point of the archiver, combining the block sync point from {@link BlockStore}
+ * and the message sync point from {@link MessageStore}.
+ */ export async function getArchiverSynchPoint(stores) {
+    const [blocksSynchedTo, messagesSynchedTo] = await Promise.all([
+        stores.blocks.getSynchedL1BlockNumber(),
+        stores.messages.getSynchedL1Block()
+    ]);
+    return {
+        blocksSynchedTo,
+        messagesSynchedTo
+    };
+}
+/**
+ * Backs up the underlying KV store to the given folder. Returns the path to the resulting db file.
+ */ export async function backupArchiverDataStores(stores, path, compress = true) {
+    await stores.db.backupTo(path, compress);
+    return join(path, 'data.mdb');
+}
+/**
+ * Returns a {@link ContractDataSource} adapter over {@link ArchiverDataStores}.
+ * Used by contexts (e.g. offline epoch re-prover tools) that need a ContractDataSource
+ * but do not need a full archiver instance.
+ */ export function createContractDataSource(stores) {
+    return new ArchiverContractDataSourceAdapter(stores);
+}

package/dest/store/function_names_cache.d.ts

@@ -0,0 +1,17 @@
+import { FunctionSelector } from '@aztec/stdlib/abi';
+/**
+ * In-memory cache mapping public function selectors to function names.
+ *
+ * Populated opportunistically (e.g. by PXE registering signatures from artifacts) so the
+ * archiver can attach human-readable names to logs and traces. Bounded by
+ * {@link MAX_FUNCTION_SIGNATURES} to avoid unbounded growth from untrusted callers.
+ */
+export declare class FunctionNamesCache {
+    private readonly log;
+    private readonly names;
+    /** Adds the given public function signatures to the cache. */
+    register(signatures: string[]): Promise<void>;
+    /** Looks up a function name for the given selector, or returns undefined if not registered. */
+    get(selector: FunctionSelector): string | undefined;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25fbmFtZXNfY2FjaGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZS9mdW5jdGlvbl9uYW1lc19jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUtyRDs7Ozs7O0dBTUc7QUFDSCxxQkFBYSxrQkFBa0I7SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQXdDO0lBQzVELE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFrQztJQUV4RCw4REFBOEQ7SUFDakQsUUFBUSxDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBWXpEO0lBRUQsK0ZBQStGO0lBQ3hGLEdBQUcsQ0FBQyxRQUFRLEVBQUUsZ0JBQWdCLEdBQUcsTUFBTSxHQUFHLFNBQVMsQ0FFekQ7Q0FDRiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"function_names_cache.d.ts","sourceRoot":"","sources":["../../src/store/function_names_cache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAKrD;;;;;;GAMG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAwC;IAC5D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkC;IAExD,8DAA8D;IACjD,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAYzD;IAED,+FAA+F;IACxF,GAAG,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,GAAG,SAAS,CAEzD;CACF"}

package/dest/store/function_names_cache.js

@@ -0,0 +1,30 @@
+import { createLogger } from '@aztec/foundation/log';
+import { FunctionSelector } from '@aztec/stdlib/abi';
+const MAX_FUNCTION_SIGNATURES = 1000;
+const MAX_FUNCTION_NAME_LEN = 256;
+/**
+ * In-memory cache mapping public function selectors to function names.
+ *
+ * Populated opportunistically (e.g. by PXE registering signatures from artifacts) so the
+ * archiver can attach human-readable names to logs and traces. Bounded by
+ * {@link MAX_FUNCTION_SIGNATURES} to avoid unbounded growth from untrusted callers.
+ */ export class FunctionNamesCache {
+    log = createLogger('archiver:data-stores');
+    names = new Map();
+    /** Adds the given public function signatures to the cache. */ async register(signatures) {
+        for (const sig of signatures){
+            if (this.names.size > MAX_FUNCTION_SIGNATURES) {
+                return;
+            }
+            try {
+                const selector = await FunctionSelector.fromSignature(sig);
+                this.names.set(selector.toString(), sig.slice(0, sig.indexOf('(')).slice(0, MAX_FUNCTION_NAME_LEN));
+            } catch  {
+                this.log.warn(`Failed to parse signature: ${sig}. Ignoring`);
+            }
+        }
+    }
+    /** Looks up a function name for the given selector, or returns undefined if not registered. */ get(selector) {
+        return this.names.get(selector.toString());
+    }
+}

package/dest/store/l2_tips_cache.d.ts

@@ -1,19 +1,25 @@
-import { type L2Tips } from '@aztec/stdlib/block';
+import type { BlockHash, L2Tips } from '@aztec/stdlib/block';
 import type { BlockStore } from './block_store.js';
 /**
  * In-memory cache for L2 chain tips (proposed, checkpointed, proven, finalized).
  * Populated from the BlockStore on first access, then kept up-to-date by the ArchiverDataStoreUpdater.
- * Refresh calls should happen within the store transaction that mutates block data to ensure consistency.
+ * Refresh calls should happen *after* the store transaction that mutates block data has committed,
+ * so the cache loads from committed state and is never replaced if the writer aborts.
  */
 export declare class L2TipsCache {
     #private;
     private blockStore;
-    constructor(blockStore: BlockStore);
+    private readonly initialBlockHash;
+    /**
+     * The genesis block hash is dynamic — derived from the injected initial header, which depends on
+     * `genesisTimestamp` and any prefilled state — so it is supplied here rather than read from store.
+     * The genesis checkpoint hash, by contrast, is the static protocol constant and is resolved
+     * inside the block store.
+     */
+    constructor(blockStore: BlockStore, initialBlockHash: BlockHash);
     /** Returns the cached L2 tips. Loads from the block store on first call. */
     getL2Tips(): Promise<L2Tips>;
-    /** Reloads the L2 tips from the block store. Should be called within the store transaction that mutates data. */
+    /** Reloads the L2 tips from the block store. Should be called after the writer transaction has committed. */
     refresh(): Promise<void>;
-    private loadFromStore;
-    private getCheckpointIdForBlock;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdGlwc19jYWNoZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0b3JlL2wyX3RpcHNfY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFxRSxLQUFLLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXJILE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRW5EOzs7O0dBSUc7QUFDSCxxQkFBYSxXQUFXOztJQUdWLE9BQU8sQ0FBQyxVQUFVO0lBQTlCLFlBQW9CLFVBQVUsRUFBRSxVQUFVLEVBQUk7SUFFOUMsNEVBQTRFO0lBQ3JFLFNBQVMsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBRWxDO0lBRUQsaUhBQWlIO0lBQ3BHLE9BQU8sSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBR3BDO1lBRWEsYUFBYTtZQWdEYix1QkFBdUI7Q0FhdEMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdGlwc19jYWNoZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0b3JlL2wyX3RpcHNfY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRTdELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRW5EOzs7OztHQUtHO0FBQ0gscUJBQWEsV0FBVzs7SUFVcEIsT0FBTyxDQUFDLFVBQVU7SUFDbEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0I7SUFSbkM7Ozs7O09BS0c7SUFDSCxZQUNVLFVBQVUsRUFBRSxVQUFVLEVBQ2IsZ0JBQWdCLEVBQUUsU0FBUyxFQUMxQztJQUVKLDRFQUE0RTtJQUNyRSxTQUFTLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUVsQztJQUVELDZHQUE2RztJQUNoRyxPQUFPLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUdwQztDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"l2_tips_cache.d.ts","sourceRoot":"","sources":["../../src/store/l2_tips_cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAqE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAErH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;;;GAIG;AACH,qBAAa,WAAW;;IAGV,OAAO,CAAC,UAAU;IAA9B,YAAoB,UAAU,EAAE,UAAU,EAAI;IAE9C,4EAA4E;IACrE,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAElC;IAED,iHAAiH;IACpG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAGpC;YAEa,aAAa;YAgDb,uBAAuB;CAatC"}
+{"version":3,"file":"l2_tips_cache.d.ts","sourceRoot":"","sources":["../../src/store/l2_tips_cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;;;;GAKG;AACH,qBAAa,WAAW;;IAUpB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IARnC;;;;;OAKG;IACH,YACU,UAAU,EAAE,UAAU,EACb,gBAAgB,EAAE,SAAS,EAC1C;IAEJ,4EAA4E;IACrE,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAElC;IAED,6GAA6G;IAChG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAGpC;CACF"}