@aztec/pxe 5.0.0-rc.2 → 5.0.0

package/dest/storage/contract_store/contract_store.d.ts

@@ -3,9 +3,9 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { MembershipWitness } from '@aztec/foundation/trees';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import { type ContractArtifact, type FunctionAbi, type FunctionArtifactWithContractName, FunctionCall, type FunctionDebugMetadata, FunctionSelector } from '@aztec/stdlib/abi';
+import { type ContractArtifact, type FunctionArtifactWithContractName, FunctionCall, type FunctionDebugMetadata, FunctionSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { type ContractClassIdPreimage, type ContractClassWithId, type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import { type ContractClassIdPreimage, type ContractClassWithId, type ContractInstancePreimageWithAddress } from '@aztec/stdlib/contract';
 /**
  * All contract class data except the large packedBytecode.
  * The expensive data from the ContractClass is precomputed and stored in this format to avoid redundant hashing.
@@ -44,40 +44,43 @@ export declare class ContractStore {
     constructor(store: AztecAsyncKVStore);
     /**
      * Registers a new contract artifact and its corresponding class data.
-     * IMPORTANT: This method does not verify that the provided artifact matches the class data or that the class id matches the artifact.
-     * It is the caller's responsibility to ensure the consistency and correctness of the provided data.
-     * This is done to avoid redundant, expensive contract class computations
+     *
+     * IMPORTANT: This method does not verify that the provided artifact matches the class data or that the class id
+     * matches the artifact. It is the caller's responsibility to ensure the consistency and correctness of the provided
+     * data. This is done to avoid redundant, expensive contract class computations.
      */
     addContractArtifact(contract: ContractArtifact, contractClassWithIdAndPreimage?: ContractClassWithId & ContractClassIdPreimage): Promise<Fr>;
-    addContractInstance(contract: ContractInstanceWithAddress): Promise<void>;
+    addContractInstance(contract: ContractInstancePreimageWithAddress): Promise<void>;
     getContractsAddresses(): Promise<AztecAddress[]>;
-    /** Returns a contract instance for a given address. */
-    getContractInstance(contractAddress: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
+    /** Returns the address preimage of a given address. */
+    getContractInstance(contractAddress: AztecAddress): Promise<ContractInstancePreimageWithAddress | undefined>;
     /** Returns the raw contract artifact for a given class id. */
     getContractArtifact(contractClassId: Fr): Promise<ContractArtifact | undefined>;
     /** Returns a contract class for a given class id. */
     getContractClassWithPreimage(contractClassId: Fr): Promise<(ContractClassWithId & ContractClassIdPreimage) | undefined>;
-    getContract(address: AztecAddress): Promise<(ContractInstanceWithAddress & ContractArtifact) | undefined>;
     /**
-     * Retrieves the artifact of a specified function within a given contract.
+     * Retrieves the artifact of a specified function within a given contract class.
      *
-     * @param contractAddress - The AztecAddress representing the contract containing the function.
+     * @param contractClassId - The id of the contract class containing the function.
      * @param selector - The function selector.
-     * @returns The corresponding function's artifact as an object.
+     * @returns The corresponding function's artifact as an object, or `undefined` if the class is not registered.
+     */
+    getFunctionArtifact(contractClassId: Fr, selector: FunctionSelector): Promise<FunctionArtifactWithContractName | undefined>;
+    /**
+     * Same as {@link getFunctionArtifact} but with debug metadata attached. Returns `undefined` when the class artifact
+     * is not registered.
      */
-    getFunctionArtifact(contractAddress: AztecAddress, selector: FunctionSelector): Promise<FunctionArtifactWithContractName | undefined>;
-    getFunctionArtifactWithDebugMetadata(contractAddress: AztecAddress, selector: FunctionSelector): Promise<FunctionArtifactWithContractName>;
-    getPublicFunctionArtifact(contractAddress: AztecAddress): Promise<FunctionArtifactWithContractName | undefined>;
-    getFunctionAbi(contractAddress: AztecAddress, selector: FunctionSelector): Promise<FunctionAbi | undefined>;
+    getFunctionArtifactWithDebugMetadata(contractClassId: Fr, selector: FunctionSelector): Promise<FunctionArtifactWithContractName | undefined>;
+    getPublicFunctionArtifact(contractClassId: Fr): Promise<FunctionArtifactWithContractName | undefined>;
     /**
-     * Retrieves the debug metadata of a specified function within a given contract.
+     * Retrieves the debug metadata of a specified function within a given contract class.
      *
-     * @param contractAddress - The AztecAddress representing the contract containing the function.
+     * @param contractClassId - The id of the contract class containing the function.
      * @param selector - The function selector.
      * @returns The corresponding function's debug metadata, or undefined.
      */
-    getFunctionDebugMetadata(contractAddress: AztecAddress, selector: FunctionSelector): Promise<FunctionDebugMetadata | undefined>;
-    getPublicFunctionDebugMetadata(contractAddress: AztecAddress): Promise<FunctionDebugMetadata | undefined>;
+    getFunctionDebugMetadata(contractClassId: Fr, selector: FunctionSelector): Promise<FunctionDebugMetadata | undefined>;
+    getPublicFunctionDebugMetadata(contractClassId: Fr): Promise<FunctionDebugMetadata | undefined>;
     /**
      * Retrieve the function membership witness for the given contract class and function selector.
      *
@@ -86,8 +89,8 @@ export declare class ContractStore {
      * @returns A promise that resolves with the MembershipWitness instance for the specified contract's function.
      */
     getFunctionMembershipWitness(contractClassId: Fr, selector: FunctionSelector): Promise<MembershipWitness<typeof FUNCTION_TREE_HEIGHT> | undefined>;
-    getDebugContractName(contractAddress: AztecAddress): Promise<string | undefined>;
-    getDebugFunctionName(contractAddress: AztecAddress, selector: FunctionSelector): Promise<string>;
-    getFunctionCall(functionName: string, args: any[], to: AztecAddress): Promise<FunctionCall>;
+    getDebugContractName(contractClassId: Fr): Promise<string | undefined>;
+    getDebugFunctionName(contractClassId: Fr, selector: FunctionSelector): Promise<string>;
+    getFunctionCall(functionName: string, args: any[], to: AztecAddress, contractClassId: Fr): Promise<FunctionCall>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3Rfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL2NvbnRyYWN0X3N0b3JlL2NvbnRyYWN0X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDN0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQWlDLE1BQU0sNkJBQTZCLENBQUM7QUFDMUYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN4RSxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxXQUFXLEVBQ2hCLEtBQUssZ0NBQWdDLEVBQ3JDLFlBQVksRUFDWixLQUFLLHFCQUFxQixFQUMxQixnQkFBZ0IsRUFRakIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUNMLEtBQUssdUJBQXVCLEVBQzVCLEtBQUssbUJBQW1CLEVBQ3hCLEtBQUssMkJBQTJCLEVBR2pDLE1BQU0sd0JBQXdCLENBQUM7QUFNaEM7Ozs7O0dBS0c7QUFDSCxxQkFBYSw2QkFBNkI7SUFDeEMsU0FBZ0IsT0FBTyxJQUFXO0lBQ2xDLFNBQWdCLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFDdkIsU0FBZ0IsWUFBWSxFQUFFLEVBQUUsQ0FBQztJQUNqQyxTQUFnQixvQkFBb0IsRUFBRSxFQUFFLENBQUM7SUFDekMsU0FBZ0Isd0JBQXdCLEVBQUUsRUFBRSxDQUFDO0lBQzdDLFNBQWdCLGdCQUFnQixFQUFFO1FBQUUsUUFBUSxFQUFFLGdCQUFnQixDQUFDO1FBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQTtLQUFFLEVBQUUsQ0FBQztJQUUvRSxZQUNFLElBQUksRUFBRSx1QkFBdUIsR0FBRztRQUM5QixFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQ1AsZ0JBQWdCLEVBQUU7WUFBRSxRQUFRLEVBQUUsZ0JBQWdCLENBQUM7WUFBQyxNQUFNLEVBQUUsRUFBRSxDQUFBO1NBQUUsRUFBRSxDQUFDO0tBQ2hFLEVBT0Y7SUFFRCxRQUFRLElBQUksTUFBTSxDQVVqQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsY0FBYyxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsNkJBQTZCLENBa0J0RjtDQUNGO0FBRUQ7Ozs7OztHQU1HO0FBQ0gscUJBQWEsYUFBYTs7SUFxQnhCLFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQUtuQztJQUlEOzs7OztPQUtHO0lBQ1UsbUJBQW1CLENBQzlCLFFBQVEsRUFBRSxnQkFBZ0IsRUFDMUIsOEJBQThCLENBQUMsRUFBRSxtQkFBbUIsR0FBRyx1QkFBdUIsR0FDN0UsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQTRCYjtJQUVLLG1CQUFtQixDQUFDLFFBQVEsRUFBRSwyQkFBMkIsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBUzlFO0lBbUNELHFCQUFxQixJQUFJLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUsvQztJQUVELHVEQUF1RDtJQUNoRCxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQywyQkFBMkIsR0FBRyxTQUFTLENBQUMsQ0FLMUc7SUFFRCw4REFBOEQ7SUFDakQsbUJBQW1CLENBQUMsZUFBZSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLEdBQUcsU0FBUyxDQUFDLENBYzNGO0lBRUQscURBQXFEO0lBQ3hDLDRCQUE0QixDQUN2QyxlQUFlLEVBQUUsRUFBRSxHQUNsQixPQUFPLENBQUMsQ0FBQyxtQkFBbUIsR0FBRyx1QkFBdUIsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxDQWF0RTtJQUVZLFdBQVcsQ0FDdEIsT0FBTyxFQUFFLFlBQVksR0FDcEIsT0FBTyxDQUFDLENBQUMsMkJBQTJCLEdBQUcsZ0JBQWdCLENBQUMsR0FBRyxTQUFTLENBQUMsQ0FVdkU7SUFFRDs7Ozs7O09BTUc7SUFDVSxtQkFBbUIsQ0FDOUIsZUFBZSxFQUFFLFlBQVksRUFDN0IsUUFBUSxFQUFFLGdCQUFnQixHQUN6QixPQUFPLENBQUMsZ0NBQWdDLEdBQUcsU0FBUyxDQUFDLENBT3ZEO0lBRVksb0NBQW9DLENBQy9DLGVBQWUsRUFBRSxZQUFZLEVBQzdCLFFBQVEsRUFBRSxnQkFBZ0IsR0FDekIsT0FBTyxDQUFDLGdDQUFnQyxDQUFDLENBVTNDO0lBRVkseUJBQXlCLENBQ3BDLGVBQWUsRUFBRSxZQUFZLEdBQzVCLE9BQU8sQ0FBQyxnQ0FBZ0MsR0FBRyxTQUFTLENBQUMsQ0FJdkQ7SUFFWSxjQUFjLENBQ3pCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLFFBQVEsRUFBRSxnQkFBZ0IsR0FDekIsT0FBTyxDQUFDLFdBQVcsR0FBRyxTQUFTLENBQUMsQ0FHbEM7SUFFRDs7Ozs7O09BTUc7SUFDVSx3QkFBd0IsQ0FDbkMsZUFBZSxFQUFFLFlBQVksRUFDN0IsUUFBUSxFQUFFLGdCQUFnQixHQUN6QixPQUFPLENBQUMscUJBQXFCLEdBQUcsU0FBUyxDQUFDLENBTzVDO0lBRVksOEJBQThCLENBQ3pDLGVBQWUsRUFBRSxZQUFZLEdBQzVCLE9BQU8sQ0FBQyxxQkFBcUIsR0FBRyxTQUFTLENBQUMsQ0FJNUM7SUFFRDs7Ozs7O09BTUc7SUFDVSw0QkFBNEIsQ0FDdkMsZUFBZSxFQUFFLEVBQUUsRUFDbkIsUUFBUSxFQUFFLGdCQUFnQixHQUN6QixPQUFPLENBQUMsaUJBQWlCLENBQUMsT0FBTyxvQkFBb0IsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxDQUdyRTtJQUVZLG9CQUFvQixDQUFDLGVBQWUsRUFBRSxZQUFZLCtCQUc5RDtJQUVZLG9CQUFvQixDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLGdCQUFnQixtQkFJMUY7SUFFWSxlQUFlLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLENBeUJ2RztDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3Rfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL2NvbnRyYWN0X3N0b3JlL2NvbnRyYWN0X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDN0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQWlDLE1BQU0sNkJBQTZCLENBQUM7QUFDMUYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN4RSxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxnQ0FBZ0MsRUFDckMsWUFBWSxFQUNaLEtBQUsscUJBQXFCLEVBQzFCLGdCQUFnQixFQVFqQixNQUFNLG1CQUFtQixDQUFDO0FBQzNCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQ0wsS0FBSyx1QkFBdUIsRUFDNUIsS0FBSyxtQkFBbUIsRUFDeEIsS0FBSyxtQ0FBbUMsRUFHekMsTUFBTSx3QkFBd0IsQ0FBQztBQU1oQzs7Ozs7R0FLRztBQUNILHFCQUFhLDZCQUE2QjtJQUN4QyxTQUFnQixPQUFPLElBQVc7SUFDbEMsU0FBZ0IsRUFBRSxFQUFFLEVBQUUsQ0FBQztJQUN2QixTQUFnQixZQUFZLEVBQUUsRUFBRSxDQUFDO0lBQ2pDLFNBQWdCLG9CQUFvQixFQUFFLEVBQUUsQ0FBQztJQUN6QyxTQUFnQix3QkFBd0IsRUFBRSxFQUFFLENBQUM7SUFDN0MsU0FBZ0IsZ0JBQWdCLEVBQUU7UUFBRSxRQUFRLEVBQUUsZ0JBQWdCLENBQUM7UUFBQyxNQUFNLEVBQUUsRUFBRSxDQUFBO0tBQUUsRUFBRSxD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

package/dest/storage/contract_store/contract_store.d.ts.map

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

package/dest/storage/contract_store/contract_store.js

@@ -3,7 +3,7 @@ import { toArray } from '@aztec/foundation/iterable';
 import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize';
 import { FunctionCall, FunctionSelector, FunctionType, contractArtifactFromBuffer, contractArtifactToBuffer, encodeArguments, findFunctionAbiBySelector, findFunctionArtifactBySelector, getFunctionDebugMetadata } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { SerializableContractInstance, getContractClassFromArtifact } from '@aztec/stdlib/contract';
+import { SerializableContractInstancePreimage, getContractClassFromArtifact } from '@aztec/stdlib/contract';
 import { PrivateFunctionsTree } from './private_functions_tree.js';
 const VERSION = 1;
 /**
@@ -63,7 +63,6 @@ const VERSION = 1;
    * Artifacts are large but immutable after registration — safe to cache for the lifetime of the store.
    */ // TODO: Update it to be LRU cache so that it doesn't keep all the data all the time.
     #contractArtifactCache = new Map();
-    /** Map from contract address to contract class id (avoids KV round-trip on hot path). */ #contractClassIdMap = new Map();
     #store;
     #contractArtifacts;
     #contractClassData;
@@ -77,9 +76,10 @@ const VERSION = 1;
     // Setters
     /**
    * Registers a new contract artifact and its corresponding class data.
-   * IMPORTANT: This method does not verify that the provided artifact matches the class data or that the class id matches the artifact.
-   * It is the caller's responsibility to ensure the consistency and correctness of the provided data.
-   * This is done to avoid redundant, expensive contract class computations
+   *
+   * IMPORTANT: This method does not verify that the provided artifact matches the class data or that the class id
+   * matches the artifact. It is the caller's responsibility to ensure the consistency and correctness of the provided
+   * data. This is done to avoid redundant, expensive contract class computations.
    */ async addContractArtifact(contract, contractClassWithIdAndPreimage) {
         const contractClass = contractClassWithIdAndPreimage ?? await getContractClassFromArtifact(contract);
         const key = contractClass.id.toString();
@@ -100,22 +100,10 @@ const VERSION = 1;
     }
     async addContractInstance(contract) {
         await this.#store.transactionAsync(async ()=>{
-            await this.#contractInstances.set(contract.address.toString(), new SerializableContractInstance(contract).toBuffer());
+            await this.#contractInstances.set(contract.address.toString(), new SerializableContractInstancePreimage(contract).toBuffer());
         });
-        this.#contractClassIdMap.set(contract.address.toString(), contract.currentContractClassId);
     }
     // Private getters
-    async #getContractClassId(contractAddress) {
-        const key = contractAddress.toString();
-        if (!this.#contractClassIdMap.has(key)) {
-            const instance = await this.getContractInstance(contractAddress);
-            if (!instance) {
-                return;
-            }
-            this.#contractClassIdMap.set(key, instance.currentContractClassId);
-        }
-        return this.#contractClassIdMap.get(key);
-    }
     async #getPrivateFunctionTreeForClassId(classId) {
         if (!this.#privateFunctionTrees.has(classId.toString())) {
             const artifact = await this.getContractArtifact(classId);
@@ -127,10 +115,6 @@ const VERSION = 1;
         }
         return this.#privateFunctionTrees.get(classId.toString());
     }
-    async #getArtifactByAddress(contractAddress) {
-        const classId = await this.#getContractClassId(contractAddress);
-        return classId && this.getContractArtifact(classId);
-    }
     // Public getters
     getContractsAddresses() {
         return this.#store.transactionAsync(async ()=>{
@@ -138,10 +122,10 @@ const VERSION = 1;
             return keys.map(AztecAddress.fromStringUnsafe);
         });
     }
-    /** Returns a contract instance for a given address. */ getContractInstance(contractAddress) {
+    /** Returns the address preimage of a given address. */ getContractInstance(contractAddress) {
         return this.#store.transactionAsync(async ()=>{
             const contract = await this.#contractInstances.getAsync(contractAddress.toString());
-            return contract && SerializableContractInstance.fromBuffer(contract).withAddress(contractAddress);
+            return contract && SerializableContractInstancePreimage.fromBuffer(contract).withAddress(contractAddress);
         });
     }
     /** Returns the raw contract artifact for a given class id. */ async getContractArtifact(contractClassId) {
@@ -176,76 +160,68 @@ const VERSION = 1;
             packedBytecode
         };
     }
-    async getContract(address) {
-        const instance = await this.getContractInstance(address);
-        if (!instance) {
-            return;
-        }
-        const artifact = await this.getContractArtifact(instance.currentContractClassId);
-        if (!artifact) {
-            return;
-        }
-        return {
-            ...instance,
-            ...artifact
-        };
-    }
     /**
-   * Retrieves the artifact of a specified function within a given contract.
+   * Retrieves the artifact of a specified function within a given contract class.
    *
-   * @param contractAddress - The AztecAddress representing the contract containing the function.
+   * @param contractClassId - The id of the contract class containing the function.
    * @param selector - The function selector.
-   * @returns The corresponding function's artifact as an object.
-   */ async getFunctionArtifact(contractAddress, selector) {
-        const artifact = await this.#getArtifactByAddress(contractAddress);
+   * @returns The corresponding function's artifact as an object, or `undefined` if the class is not registered.
+   */ async getFunctionArtifact(contractClassId, selector) {
+        const artifact = await this.getContractArtifact(contractClassId);
         if (!artifact) {
             return undefined;
         }
-        const fn = await findFunctionArtifactBySelector(artifact, selector);
-        return fn && {
+        const fn = assertSelectorInArtifact(artifact, await findFunctionArtifactBySelector(artifact, selector), {
+            contractClassId,
+            selector
+        });
+        return {
             ...fn,
             contractName: artifact.name
         };
     }
-    async getFunctionArtifactWithDebugMetadata(contractAddress, selector) {
-        const artifact = await this.getFunctionArtifact(contractAddress, selector);
+    /**
+   * Same as {@link getFunctionArtifact} but with debug metadata attached. Returns `undefined` when the class artifact
+   * is not registered.
+   */ async getFunctionArtifactWithDebugMetadata(contractClassId, selector) {
+        const artifact = await this.getContractArtifact(contractClassId);
         if (!artifact) {
-            throw new Error(`Function artifact not found for contract ${contractAddress} and selector ${selector}.`);
+            return undefined;
         }
-        const debug = await this.getFunctionDebugMetadata(contractAddress, selector);
+        const fn = assertSelectorInArtifact(artifact, await findFunctionArtifactBySelector(artifact, selector), {
+            contractClassId,
+            selector
+        });
         return {
-            ...artifact,
-            debug
+            ...fn,
+            contractName: artifact.name,
+            debug: getFunctionDebugMetadata(artifact, fn)
         };
     }
-    async getPublicFunctionArtifact(contractAddress) {
-        const artifact = await this.#getArtifactByAddress(contractAddress);
+    async getPublicFunctionArtifact(contractClassId) {
+        const artifact = await this.getContractArtifact(contractClassId);
         const fn = artifact && artifact.functions.find((f)=>f.functionType === FunctionType.PUBLIC);
         return fn && {
             ...fn,
             contractName: artifact.name
         };
     }
-    async getFunctionAbi(contractAddress, selector) {
-        const artifact = await this.#getArtifactByAddress(contractAddress);
-        return artifact && await findFunctionAbiBySelector(artifact, selector);
-    }
     /**
-   * Retrieves the debug metadata of a specified function within a given contract.
+   * Retrieves the debug metadata of a specified function within a given contract class.
    *
-   * @param contractAddress - The AztecAddress representing the contract containing the function.
+   * @param contractClassId - The id of the contract class containing the function.
    * @param selector - The function selector.
    * @returns The corresponding function's debug metadata, or undefined.
-   */ async getFunctionDebugMetadata(contractAddress, selector) {
-        const artifact = await this.#getArtifactByAddress(contractAddress);
+   */ async getFunctionDebugMetadata(contractClassId, selector) {
+        const artifact = await this.getContractArtifact(contractClassId);
         if (!artifact) {
             return undefined;
         }
         const fn = await findFunctionArtifactBySelector(artifact, selector);
         return fn && getFunctionDebugMetadata(artifact, fn);
     }
-    async getPublicFunctionDebugMetadata(contractAddress) {
-        const artifact = await this.#getArtifactByAddress(contractAddress);
+    async getPublicFunctionDebugMetadata(contractClassId) {
+        const artifact = await this.getContractArtifact(contractClassId);
         const fn = artifact && artifact.functions.find((f)=>f.functionType === FunctionType.PUBLIC);
         return fn && getFunctionDebugMetadata(artifact, fn);
     }
@@ -259,23 +235,23 @@ const VERSION = 1;
         const tree = await this.#getPrivateFunctionTreeForClassId(contractClassId);
         return tree?.getFunctionMembershipWitness(selector);
     }
-    async getDebugContractName(contractAddress) {
-        const artifact = await this.#getArtifactByAddress(contractAddress);
+    async getDebugContractName(contractClassId) {
+        const artifact = await this.getContractArtifact(contractClassId);
         return artifact?.name;
     }
-    async getDebugFunctionName(contractAddress, selector) {
-        const artifact = await this.#getArtifactByAddress(contractAddress);
+    async getDebugFunctionName(contractClassId, selector) {
+        const artifact = await this.getContractArtifact(contractClassId);
         const fn = artifact && await findFunctionAbiBySelector(artifact, selector);
-        return `${artifact?.name ?? contractAddress}:${fn?.name ?? selector}`;
+        return `${artifact?.name ?? contractClassId}:${fn?.name ?? selector}`;
     }
-    async getFunctionCall(functionName, args, to) {
-        const contract = await this.getContract(to);
-        if (!contract) {
-            throw new Error(`Unknown contract ${to}: register it by calling wallet.registerContract(...).\nSee docs for context: https://docs.aztec.network/errors/14`);
+    async getFunctionCall(functionName, args, to, contractClassId) {
+        const artifact = await this.getContractArtifact(contractClassId);
+        if (!artifact) {
+            throw new Error(`No artifact registered for contract class ${contractClassId} (contract ${to}): register it by calling ` + `wallet.registerContract(...).\nSee docs for context: https://docs.aztec.network/errors/14`);
         }
-        const functionDao = contract.functions.find((f)=>f.name === functionName);
+        const functionDao = artifact.functions.find((f)=>f.name === functionName);
         if (!functionDao) {
-            throw new Error(`Unknown function ${functionName} in contract ${contract.name}.`);
+            throw new Error(`Unknown function ${functionName} in contract ${artifact.name}.`);
         }
         const selector = await FunctionSelector.fromNameAndParameters(functionDao.name, functionDao.parameters);
         return FunctionCall.from({
@@ -290,3 +266,16 @@ const VERSION = 1;
         });
     }
 }
+/**
+ * Narrows the result of a selector lookup against a registered artifact. A missing class artifact is reported as
+ * `undefined` by the callers (an absence they can handle), but a selector that is absent from an artifact we *do* have
+ * is exceptional and throws rather than returning undefined. We cannot tell from here why the selector is missing: it
+ * may be that no such function exists in the contract (a wrong selector), or that the registered artifact does not
+ * correspond to the resolved class id (registration performs no validation, so a mismatched artifact is possible). The
+ * error names both possibilities.
+ */ function assertSelectorInArtifact(artifact, fn, context) {
+    if (!fn) {
+        throw new Error(`Function with selector ${context.selector} not found in the registered artifact for contract class ` + `${context.contractClassId} (${artifact.name}). Either no function with this selector exists in the ` + `contract, or the registered artifact does not match the class id (re-register it via ` + `wallet.registerContract(...)).`);
+    }
+    return fn;
+}

package/dest/storage/fact_store/fact_service.d.ts

@@ -1,7 +1,8 @@
 import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { FactCollection, FactStore } from './fact_store.js';
+import type { FactStore } from './fact_store.js';
 import type { FactCollectionKey, FactCollectionTypeKey, OriginBlock } from './fact_store_keys.js';
+import { type FactCollectionWithOriginState, type TipBlockNumbers } from './origin_state.js';
 /**
  * Wraps a {@link FactStore} with scope-based access control.
  *
@@ -9,12 +10,13 @@ import type { FactCollectionKey, FactCollectionTypeKey, OriginBlock } from './fa
  * under or read facts from.
  */
 export declare class FactService {
+    #private;
     private readonly factStore;
     private readonly allowedScopes;
     constructor(factStore: FactStore, allowedScopes: AztecAddress[]);
     recordFact(factCollectionKey: FactCollectionKey, factTypeId: Fr, payload: Fr[], originBlock: OriginBlock | undefined, jobId: string): Promise<void>;
     deleteFactCollection(factCollectionKey: FactCollectionKey, jobId: string): Promise<void>;
-    getFactCollection(factCollectionKey: FactCollectionKey, jobId: string): Promise<FactCollection | undefined>;
-    getFactCollectionsByType(factCollectionTypeKey: FactCollectionTypeKey, jobId: string): Promise<FactCollection[]>;
+    getFactCollection(factCollectionKey: FactCollectionKey, tips: TipBlockNumbers, jobId: string): Promise<FactCollectionWithOriginState | undefined>;
+    getFactCollectionsByType(factCollectionTypeKey: FactCollectionTypeKey, tips: TipBlockNumbers, jobId: string): Promise<FactCollectionWithOriginState[]>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdF9zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RvcmFnZS9mYWN0X3N0b3JlL2ZhY3Rfc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUdoRSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsU0FBUyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUscUJBQXFCLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFbEc7Ozs7O0dBS0c7QUFDSCxxQkFBYSxXQUFXO0lBRXBCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGFBQWE7SUFGaEMsWUFDbUIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsYUFBYSxFQUFFLFlBQVksRUFBRSxFQUM1QztJQUVKLFVBQVUsQ0FDUixpQkFBaUIsRUFBRSxpQkFBaUIsRUFDcEMsVUFBVSxFQUFFLEVBQUUsRUFDZCxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQ2IsV0FBVyxFQUFFLFdBQVcsR0FBRyxTQUFTLEVBQ3BDLEtBQUssRUFBRSxNQUFNLEdBQ1osT0FBTyxDQUFDLElBQUksQ0FBQyxDQUdmO0lBRUQsb0JBQW9CLENBQUMsaUJBQWlCLEVBQUUsaUJBQWlCLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBR3ZGO0lBRUQsaUJBQWlCLENBQUMsaUJBQWlCLEVBQUUsaUJBQWlCLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsY0FBYyxHQUFHLFNBQVMsQ0FBQyxDQUcxRztJQUVELHdCQUF3QixDQUFDLHFCQUFxQixFQUFFLHFCQUFxQixFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLGNBQWMsRUFBRSxDQUFDLENBRy9HO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdF9zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RvcmFnZS9mYWN0X3N0b3JlL2ZhY3Rfc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUdoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNqRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxxQkFBcUIsRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRyxPQUFPLEVBQ0wsS0FBSyw2QkFBNkIsRUFFbEMsS0FBSyxlQUFlLEVBRXJCLE1BQU0sbUJBQW1CLENBQUM7QUFHM0I7Ozs7O0dBS0c7QUFDSCxxQkFBYSxXQUFXOztJQUVwQixPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVM7SUFDMUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhO0lBRmhDLFlBQ21CLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGFBQWEsRUFBRSxZQUFZLEVBQUUsRUFDNUM7SUFFSixVQUFVLENBQ1IsaUJBQWlCLEVBQUUsaUJBQWlCLEVBQ3BDLFVBQVUsRUFBRSxFQUFFLEVBQ2QsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUNiLFdBQVcsRUFBRSxXQUFXLEdBQUcsU0FBUyxFQUNwQyxLQUFLLEVBQUUsTUFBTSxHQUNaLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHZjtJQUVELG9CQUFvQixDQUFDLGlCQUFpQixFQUFFLGlCQUFpQixFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUd2RjtJQUVLLGlCQUFpQixDQUNyQixpQkFBaUIsRUFBRSxpQkFBaUIsRUFDcEMsSUFBSSxFQUFFLGVBQWUsRUFDckIsS0FBSyxFQUFFLE1BQU0sR0FDWixPQUFPLENBQUMsNkJBQTZCLEdBQUcsU0FBUyxDQUFDLENBT3BEO0lBRUssd0JBQXdCLENBQzVCLHFCQUFxQixFQUFFLHFCQUFxQixFQUM1QyxJQUFJLEVBQUUsZUFBZSxFQUNyQixLQUFLLEVBQUUsTUFBTSxHQUNaLE9BQU8sQ0FBQyw2QkFBNkIsRUFBRSxDQUFDLENBSTFDO0NBS0YifQ==

package/dest/storage/fact_store/fact_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fact_service.d.ts","sourceRoot":"","sources":["../../../src/storage/fact_store/fact_service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAElG;;;;;GAKG;AACH,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAFhC,YACmB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,YAAY,EAAE,EAC5C;IAEJ,UAAU,CACR,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,EAAE,EACd,OAAO,EAAE,EAAE,EAAE,EACb,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAGf;IAED,oBAAoB,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGvF;IAED,iBAAiB,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAG1G;IAED,wBAAwB,CAAC,qBAAqB,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAG/G;CACF"}
+{"version":3,"file":"fact_service.d.ts","sourceRoot":"","sources":["../../../src/storage/fact_store/fact_service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAClG,OAAO,EACL,KAAK,6BAA6B,EAElC,KAAK,eAAe,EAErB,MAAM,mBAAmB,CAAC;AAG3B;;;;;GAKG;AACH,qBAAa,WAAW;;IAEpB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAFhC,YACmB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,YAAY,EAAE,EAC5C;IAEJ,UAAU,CACR,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,EAAE,EACd,OAAO,EAAE,EAAE,EAAE,EACb,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAGf;IAED,oBAAoB,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGvF;IAEK,iBAAiB,CACrB,iBAAiB,EAAE,iBAAiB,EACpC,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,6BAA6B,GAAG,SAAS,CAAC,CAOpD;IAEK,wBAAwB,CAC5B,qBAAqB,EAAE,qBAAqB,EAC5C,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,6BAA6B,EAAE,CAAC,CAI1C;CAKF"}

package/dest/storage/fact_store/fact_service.js

@@ -1,4 +1,5 @@
 import { assertAllowedScope } from '../allowed_scopes.js';
+import { toFactWithOriginState } from './origin_state.js';
 /**
  * Wraps a {@link FactStore} with scope-based access control.
  *
@@ -19,12 +20,26 @@ import { assertAllowedScope } from '../allowed_scopes.js';
         assertAllowedScope(factCollectionKey.scope, this.allowedScopes);
         return this.factStore.deleteFactCollection(factCollectionKey, jobId);
     }
-    getFactCollection(factCollectionKey, jobId) {
+    async getFactCollection(factCollectionKey, tips, jobId) {
         assertAllowedScope(factCollectionKey.scope, this.allowedScopes);
-        return this.factStore.getFactCollection(factCollectionKey, jobId);
+        const collection = await this.factStore.getFactCollection(factCollectionKey, jobId);
+        if (!collection) {
+            return undefined;
+        }
+        return {
+            key: collection.key,
+            facts: this.#annotate(collection.facts, tips)
+        };
     }
-    getFactCollectionsByType(factCollectionTypeKey, jobId) {
+    async getFactCollectionsByType(factCollectionTypeKey, tips, jobId) {
         assertAllowedScope(factCollectionTypeKey.scope, this.allowedScopes);
-        return this.factStore.getFactCollectionsByType(factCollectionTypeKey, jobId);
+        const collections = await this.factStore.getFactCollectionsByType(factCollectionTypeKey, jobId);
+        return collections.map((collection)=>({
+                key: collection.key,
+                facts: this.#annotate(collection.facts, tips)
+            }));
+    }
+    #annotate(facts, tips) {
+        return facts.map((fact)=>toFactWithOriginState(fact, tips));
     }
 }

package/dest/storage/fact_store/fact_store.d.ts

@@ -42,7 +42,7 @@ export declare class FactStore implements StagedStore {
     logger: import("@aztec/foundation/log").Logger;
     constructor(store: AztecAsyncKVStore);
     /**
-     * Records a fact in a collection.
+     * Records a fact in a collection, visible under the given scope.
      *
      * The collection is created implicitly on the first fact recorded for its key: recording into an existing collection
      * just adds to it.

package/dest/storage/fact_store/fact_store.js

@@ -46,7 +46,7 @@ import { StoredFact, factKeyStrOf } from './stored_fact.js';
         this.#jobLocks = new Map();
     }
     /**
-   * Records a fact in a collection.
+   * Records a fact in a collection, visible under the given scope.
    *
    * The collection is created implicitly on the first fact recorded for its key: recording into an existing collection
    * just adds to it.

package/dest/storage/fact_store/index.d.ts

@@ -2,4 +2,5 @@ export { FactStore, type FactCollection } from './fact_store.js';
 export { FactService } from './fact_service.js';
 export { FactCollectionKey, FactCollectionTypeKey, type OriginBlock } from './fact_store_keys.js';
 export type { Fact } from './stored_fact.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL2ZhY3Rfc3RvcmUvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLGNBQWMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNoRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUscUJBQXFCLEVBQUUsS0FBSyxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRyxZQUFZLEVBQUUsSUFBSSxFQUFFLE1BQU0sa0JBQWtCLENBQUMifQ==
+export { OriginBlockState, classifyOriginBlockState, anchoredTipBlockNumbers, toFactWithOriginState, type TipBlockNumbers, type RetractableFactOrigin, type FactWithOriginState, type FactCollectionWithOriginState, } from './origin_state.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL2ZhY3Rfc3RvcmUvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLGNBQWMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNoRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUscUJBQXFCLEVBQUUsS0FBSyxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRyxZQUFZLEVBQUUsSUFBSSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDN0MsT0FBTyxFQUNMLGdCQUFnQixFQUNoQix3QkFBd0IsRUFDeEIsdUJBQXVCLEVBQ3ZCLHFCQUFxQixFQUNyQixLQUFLLGVBQWUsRUFDcEIsS0FBSyxxQkFBcUIsRUFDMUIsS0FBSyxtQkFBbUIsRUFDeEIsS0FBSyw2QkFBNkIsR0FDbkMsTUFBTSxtQkFBbUIsQ0FBQyJ9

package/dest/storage/fact_store/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/storage/fact_store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAClG,YAAY,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/storage/fact_store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAClG,YAAY,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,uBAAuB,EACvB,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,EACxB,KAAK,6BAA6B,GACnC,MAAM,mBAAmB,CAAC"}

package/dest/storage/fact_store/index.js

@@ -1,3 +1,4 @@
 export { FactStore } from './fact_store.js';
 export { FactService } from './fact_service.js';
 export { FactCollectionKey, FactCollectionTypeKey } from './fact_store_keys.js';
+export { OriginBlockState, classifyOriginBlockState, anchoredTipBlockNumbers, toFactWithOriginState } from './origin_state.js';

package/dest/storage/fact_store/origin_state.d.ts

@@ -0,0 +1,57 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { L2Tips } from '@aztec/stdlib/block';
+import type { FactCollectionKey, OriginBlock } from './fact_store_keys.js';
+import type { Fact } from './stored_fact.js';
+/**
+ * Chain state of a retractable fact's origin block, mirroring the L2 chain tips.
+ *
+ * - `Pending`: above the proven tip.
+ * - `Proven`: proof on L1 but not yet finalized.
+ * - `Finalized`: L1-finalized.
+ *
+ * The numeric discriminants must stay in sync with the Noir `OriginBlockState` in
+ * `noir-projects/aztec-nr/aztec/src/facts/origin_state.nr`: PXE serializes this value into the `Fact` oracle response
+ * and Noir deserializes it via `from_u8`, which rejects any value outside this set.
+ */
+export declare enum OriginBlockState {
+    Pending = 1,
+    Proven = 2,
+    Finalized = 3
+}
+/** The two chain-tip block numbers needed to classify an origin block (`finalized <= proven` always holds). */
+export type TipBlockNumbers = {
+    provenBlockNumber: number;
+    finalizedBlockNumber: number;
+};
+/**
+ * Projects the live chain tips to the block numbers used for classification, capped at the anchor block.
+ *
+ * A utility execution reads against a fixed anchor block, and every other node query in the oracle is bounded by it.
+ * Capping the proven/finalized tips at the anchor keeps origin-state consistent with that view and deterministic
+ * across runs: an origin block at or before the anchor classifies exactly as it would against the live tips, while an
+ * origin block above the anchor is reported `Pending` rather than trusting tips that look past the anchor.
+ */
+export declare function anchoredTipBlockNumbers(tips: L2Tips, anchorBlockNumber: number): TipBlockNumbers;
+/** A retractable fact's origin block annotated with that block's current chain state. */
+export type RetractableFactOrigin = OriginBlock & {
+    blockState: OriginBlockState;
+};
+/** A fact enriched with origin-block state. `originBlock` is undefined for a non-retractable fact. */
+export type FactWithOriginState = {
+    factTypeId: Fr;
+    payload: Fr[];
+    originBlock: RetractableFactOrigin | undefined;
+};
+/** A fact collection whose facts carry origin-block state. */
+export type FactCollectionWithOriginState = {
+    key: FactCollectionKey;
+    facts: FactWithOriginState[];
+};
+/**
+ * Classifies an origin block by number against the chain tips. A surviving retractable fact's origin block is
+ * guaranteed canonical (a reorg would have pruned the fact), so a number comparison is sufficient.
+ */
+export declare function classifyOriginBlockState(blockNumber: number, tips: TipBlockNumbers): OriginBlockState;
+/** Enriches a stored fact with the chain state of its origin block (when retractable). */
+export declare function toFactWithOriginState(fact: Fact, tips: TipBlockNumbers): FactWithOriginState;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JpZ2luX3N0YXRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RvcmFnZS9mYWN0X3N0b3JlL29yaWdpbl9zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVsRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUMzRSxPQUFPLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUU3Qzs7Ozs7Ozs7OztHQVVHO0FBQ0gsb0JBQVksZ0JBQWdCO0lBQzFCLE9BQU8sSUFBSTtJQUNYLE1BQU0sSUFBSTtJQUNWLFNBQVMsSUFBSTtDQUNkO0FBRUQsK0dBQStHO0FBQy9HLE1BQU0sTUFBTSxlQUFlLEdBQUc7SUFBRSxpQkFBaUIsRUFBRSxNQUFNLENBQUM7SUFBQyxvQkFBb0IsRUFBRSxNQUFNLENBQUE7Q0FBRSxDQUFDO0FBRTFGOzs7Ozs7O0dBT0c7QUFDSCx3QkFBZ0IsdUJBQXVCLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLEdBQUcsZUFBZSxDQUtoRztBQUVELHlGQUF5RjtBQUN6RixNQUFNLE1BQU0scUJBQXFCLEdBQUcsV0FBVyxHQUFHO0lBQUUsVUFBVSxFQUFFLGdCQUFnQixDQUFBO0NBQUUsQ0FBQztBQUVuRixzR0FBc0c7QUFDdEcsTUFBTSxNQUFNLG1CQUFtQixHQUFHO0lBQUUsVUFBVSxFQUFFLEVBQUUsQ0FBQztJQUFDLE9BQU8sRUFBRSxFQUFFLEVBQUUsQ0FBQztJQUFDLFdBQVcsRUFBRSxxQkFBcUIsR0FBRyxTQUFTLENBQUE7Q0FBRSxDQUFDO0FBRXBILDhEQUE4RDtBQUM5RCxNQUFNLE1BQU0sNkJBQTZCLEdBQUc7SUFBRSxHQUFHLEVBQUUsaUJBQWlCLENBQUM7SUFBQyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsQ0FBQTtDQUFFLENBQUM7QUFFckc7OztHQUdHO0FBQ0gsd0JBQWdCLHdCQUF3QixDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLGVBQWUsR0FBRyxnQkFBZ0IsQ0FRckc7QUFFRCwwRkFBMEY7QUFDMUYsd0JBQWdCLHFCQUFxQixDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLGVBQWUsR0FBRyxtQkFBbUIsQ0FTNUYifQ==

package/dest/storage/fact_store/origin_state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"origin_state.d.ts","sourceRoot":"","sources":["../../../src/storage/fact_store/origin_state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;;;;GAUG;AACH,oBAAY,gBAAgB;IAC1B,OAAO,IAAI;IACX,MAAM,IAAI;IACV,SAAS,IAAI;CACd;AAED,+GAA+G;AAC/G,MAAM,MAAM,eAAe,GAAG;IAAE,iBAAiB,EAAE,MAAM,CAAC;IAAC,oBAAoB,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1F;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,eAAe,CAKhG;AAED,yFAAyF;AACzF,MAAM,MAAM,qBAAqB,GAAG,WAAW,GAAG;IAAE,UAAU,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAEnF,sGAAsG;AACtG,MAAM,MAAM,mBAAmB,GAAG;IAAE,UAAU,EAAE,EAAE,CAAC;IAAC,OAAO,EAAE,EAAE,EAAE,CAAC;IAAC,WAAW,EAAE,qBAAqB,GAAG,SAAS,CAAA;CAAE,CAAC;AAEpH,8DAA8D;AAC9D,MAAM,MAAM,6BAA6B,GAAG;IAAE,GAAG,EAAE,iBAAiB,CAAC;IAAC,KAAK,EAAE,mBAAmB,EAAE,CAAA;CAAE,CAAC;AAErG;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,GAAG,gBAAgB,CAQrG;AAED,0FAA0F;AAC1F,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,GAAG,mBAAmB,CAS5F"}

package/dest/storage/fact_store/origin_state.js

@@ -0,0 +1,53 @@
+/**
+ * Chain state of a retractable fact's origin block, mirroring the L2 chain tips.
+ *
+ * - `Pending`: above the proven tip.
+ * - `Proven`: proof on L1 but not yet finalized.
+ * - `Finalized`: L1-finalized.
+ *
+ * The numeric discriminants must stay in sync with the Noir `OriginBlockState` in
+ * `noir-projects/aztec-nr/aztec/src/facts/origin_state.nr`: PXE serializes this value into the `Fact` oracle response
+ * and Noir deserializes it via `from_u8`, which rejects any value outside this set.
+ */ export var OriginBlockState = /*#__PURE__*/ function(OriginBlockState) {
+    OriginBlockState[OriginBlockState["Pending"] = 1] = "Pending";
+    OriginBlockState[OriginBlockState["Proven"] = 2] = "Proven";
+    OriginBlockState[OriginBlockState["Finalized"] = 3] = "Finalized";
+    return OriginBlockState;
+}({});
+/**
+ * Projects the live chain tips to the block numbers used for classification, capped at the anchor block.
+ *
+ * A utility execution reads against a fixed anchor block, and every other node query in the oracle is bounded by it.
+ * Capping the proven/finalized tips at the anchor keeps origin-state consistent with that view and deterministic
+ * across runs: an origin block at or before the anchor classifies exactly as it would against the live tips, while an
+ * origin block above the anchor is reported `Pending` rather than trusting tips that look past the anchor.
+ */ export function anchoredTipBlockNumbers(tips, anchorBlockNumber) {
+    return {
+        provenBlockNumber: Math.min(tips.proven.block.number, anchorBlockNumber),
+        finalizedBlockNumber: Math.min(tips.finalized.block.number, anchorBlockNumber)
+    };
+}
+/**
+ * Classifies an origin block by number against the chain tips. A surviving retractable fact's origin block is
+ * guaranteed canonical (a reorg would have pruned the fact), so a number comparison is sufficient.
+ */ export function classifyOriginBlockState(blockNumber, tips) {
+    if (blockNumber <= tips.finalizedBlockNumber) {
+        return 3;
+    }
+    if (blockNumber <= tips.provenBlockNumber) {
+        return 2;
+    }
+    return 1;
+}
+/** Enriches a stored fact with the chain state of its origin block (when retractable). */ export function toFactWithOriginState(fact, tips) {
+    const originBlock = fact.originBlock ? {
+        blockNumber: fact.originBlock.blockNumber,
+        blockHash: fact.originBlock.blockHash,
+        blockState: classifyOriginBlockState(fact.originBlock.blockNumber, tips)
+    } : undefined;
+    return {
+        factTypeId: fact.factTypeId,
+        payload: fact.payload,
+        originBlock
+    };
+}

package/dest/storage/metadata.d.ts

@@ -1,2 +1,2 @@
-export declare const PXE_DATA_SCHEMA_VERSION = 9;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0YWRhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yYWdlL21ldGFkYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGVBQU8sTUFBTSx1QkFBdUIsSUFBSSxDQUFDIn0=
+export declare const PXE_DATA_SCHEMA_VERSION = 13;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0YWRhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yYWdlL21ldGFkYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGVBQU8sTUFBTSx1QkFBdUIsS0FBSyxDQUFDIn0=

package/dest/storage/metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../src/storage/metadata.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,uBAAuB,IAAI,CAAC"}
+{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../src/storage/metadata.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,uBAAuB,KAAK,CAAC"}

package/dest/storage/metadata.js

@@ -1 +1 @@
-export const PXE_DATA_SCHEMA_VERSION = 9;
+export const PXE_DATA_SCHEMA_VERSION = 13;