@aztec/pxe 0.82.0 → 0.82.1

package/dest/storage/contract_data_provider/contract_data_provider.js

@@ -1,8 +1,7 @@
 import { toArray } from '@aztec/foundation/iterable';
-import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator/client';
 import { FunctionSelector, FunctionType, contractArtifactFromBuffer, contractArtifactToBuffer, getFunctionDebugMetadata } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { SerializableContractInstance } from '@aztec/stdlib/contract';
+import { SerializableContractInstance, getContractClassFromArtifact } from '@aztec/stdlib/contract';
 import { PrivateFunctionsTree } from './private_functions_tree.js';
 /**
  * ContractDataProvider serves as a data manager and retriever for Aztec.nr contracts.
@@ -11,7 +10,9 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
  * to efficiently serve the requested data. It interacts with the ContractDatabase and AztecNode to fetch
  * the required information and facilitate cryptographic proof generation.
  */ export class ContractDataProvider {
-    /** Map from contract class id to private function tree. */ contractClassesCache = new Map();
+    /** Map from contract class id to private function tree. */ // TODO: Update it to be LRU cache so that it doesn't keep all the data all the time.
+    #privateFunctionTrees = new Map();
+    /** Map from contract address to contract class id */ #contractClassIdMap = new Map();
     #contractArtifacts;
     #contractInstances;
     constructor(store){
@@ -28,17 +29,19 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
         await this.#contractArtifacts.set(id.toString(), contractArtifactToBuffer(contract));
     }
     async addContractInstance(contract) {
+        this.#contractClassIdMap.set(contract.address.toString(), contract.currentContractClassId);
         await this.#contractInstances.set(contract.address.toString(), new SerializableContractInstance(contract).toBuffer());
     }
     // Private getters
-    async #getContractInstance(address) {
-        const contract = await this.#contractInstances.getAsync(address.toString());
-        return contract && SerializableContractInstance.fromBuffer(contract).withAddress(address);
-    }
-    async #getContractArtifact(id) {
-        const contract = await this.#contractArtifacts.getAsync(id.toString());
-        // TODO(@spalladino): AztecAsyncMap lies and returns Uint8Arrays instead of Buffers, hence the extra Buffer.from.
-        return contract && contractArtifactFromBuffer(Buffer.from(contract));
+    async #getContractClassId(contractAddress) {
+        if (!this.#contractClassIdMap.has(contractAddress.toString())) {
+            const instance = await this.getContractInstance(contractAddress);
+            if (!instance) {
+                return;
+            }
+            this.#contractClassIdMap.set(contractAddress.toString(), instance.currentContractClassId);
+        }
+        return this.#contractClassIdMap.get(contractAddress.toString());
     }
     /**
    * Retrieve or create a ContractTree instance based on the provided class id.
@@ -49,29 +52,20 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
    * @param classId - The class id of the contract for which the ContractTree is required.
    * @returns A ContractTree instance associated with the specified contract address.
    * @throws An Error if the contract is not found in the ContractDatabase.
-   */ async getTreeForClassId(classId) {
-        if (!this.contractClassesCache.has(classId.toString())) {
-            const artifact = await this.#getContractArtifact(classId);
+   */ async #getPrivateFunctionTreeForClassId(classId) {
+        if (!this.#privateFunctionTrees.has(classId.toString())) {
+            const artifact = await this.getContractArtifact(classId);
             if (!artifact) {
-                throw new ContractClassNotFoundError(classId.toString());
+                return;
             }
             const tree = await PrivateFunctionsTree.create(artifact);
-            this.contractClassesCache.set(classId.toString(), tree);
+            this.#privateFunctionTrees.set(classId.toString(), tree);
         }
-        return this.contractClassesCache.get(classId.toString());
+        return this.#privateFunctionTrees.get(classId.toString());
     }
-    /**
-   * Retrieve or create a ContractTree instance based on the provided AztecAddress.
-   * If an existing tree with the same contract address is found in the cache, it will be returned.
-   * Otherwise, a new ContractTree instance will be created using the contract data from the database
-   * and added to the cache before returning.
-   *
-   * @param contractAddress - The AztecAddress of the contract for which the ContractTree is required.
-   * @returns A ContractTree instance associated with the specified contract address.
-   * @throws An Error if the contract is not found in the ContractDatabase.
-   */ async getTreeForAddress(contractAddress) {
-        const instance = await this.getContractInstance(contractAddress);
-        return this.getTreeForClassId(instance.currentContractClassId);
+    async #getContractArtifactByAddress(contractAddress) {
+        const contractClassId = await this.#getContractClassId(contractAddress);
+        return contractClassId && this.getContractArtifact(contractClassId);
     }
     // Public getters
     async getContractsAddresses() {
@@ -79,25 +73,26 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
         return keys.map(AztecAddress.fromString);
     }
     /** Returns a contract instance for a given address. Throws if not found. */ async getContractInstance(contractAddress) {
-        const instance = await this.#getContractInstance(contractAddress);
-        if (!instance) {
-            throw new ContractNotFoundError(contractAddress.toString());
-        }
-        return instance;
+        const contract = await this.#contractInstances.getAsync(contractAddress.toString());
+        return contract && SerializableContractInstance.fromBuffer(contract).withAddress(contractAddress);
     }
     async getContractArtifact(contractClassId) {
-        const tree = await this.getTreeForClassId(contractClassId);
-        return tree.getArtifact();
+        const contract = await this.#contractArtifacts.getAsync(contractClassId.toString());
+        // TODO(@spalladino): AztecAsyncMap lies and returns Uint8Arrays instead of Buffers, hence the extra Buffer.from.
+        return contract && contractArtifactFromBuffer(Buffer.from(contract));
     }
     /** Returns a contract class for a given class id. Throws if not found. */ async getContractClass(contractClassId) {
-        const tree = await this.getTreeForClassId(contractClassId);
-        return tree.getContractClass();
+        const artifact = await this.getContractArtifact(contractClassId);
+        return artifact && getContractClassFromArtifact(artifact);
     }
     async getContract(address) {
         const instance = await this.getContractInstance(address);
-        const artifact = instance && await this.getContractArtifact(instance?.currentContractClassId);
-        if (!instance || !artifact) {
-            return undefined;
+        if (!instance) {
+            return;
+        }
+        const artifact = await this.getContractArtifact(instance.currentContractClassId);
+        if (!artifact) {
+            return;
         }
         return {
             ...instance,
@@ -113,12 +108,19 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
    * @param selector - The function selector.
    * @returns The corresponding function's artifact as an object.
    */ async getFunctionArtifact(contractAddress, selector) {
-        const tree = await this.getTreeForAddress(contractAddress);
-        const contractArtifact = tree.getArtifact();
-        const functionArtifact = await tree.getFunctionArtifact(selector);
-        return {
-            ...functionArtifact,
-            contractName: contractArtifact.name
+        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        const fnArtifact = artifact && await this.#findFunctionArtifactBySelector(artifact, selector);
+        return fnArtifact && {
+            ...fnArtifact,
+            contractName: artifact.name
+        };
+    }
+    async getPublicFunctionArtifact(contractAddress) {
+        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        const fnArtifact = artifact && artifact.functions.find((fn)=>fn.functionType === FunctionType.PUBLIC);
+        return fnArtifact && {
+            ...fnArtifact,
+            contractName: artifact.name
         };
     }
     /**
@@ -130,8 +132,12 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
    * @param functionName - The name of the function.
    * @returns The corresponding function's artifact as an object
    */ async getFunctionArtifactByName(contractAddress, functionName) {
-        const tree = await this.getTreeForAddress(contractAddress);
-        return tree.getArtifact().functions.find((f)=>f.name === functionName);
+        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        return artifact?.functions.find((fn)=>fn.name === functionName);
+    }
+    async getFunctionAbi(contractAddress, selector) {
+        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        return artifact && await this.#findFunctionAbiBySelector(artifact, selector);
     }
     /**
    * Retrieves the debug metadata of a specified function within a given contract.
@@ -143,22 +149,14 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
    * @param selector - The function selector.
    * @returns The corresponding function's artifact as an object.
    */ async getFunctionDebugMetadata(contractAddress, selector) {
-        const tree = await this.getTreeForAddress(contractAddress);
-        const artifact = await tree.getFunctionArtifact(selector);
-        return getFunctionDebugMetadata(tree.getArtifact(), artifact);
+        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        const fnArtifact = artifact && await this.#findFunctionArtifactBySelector(artifact, selector);
+        return fnArtifact && getFunctionDebugMetadata(artifact, fnArtifact);
     }
-    /**
-   * Retrieve the bytecode of a specific function in a contract at the given address.
-   * The returned bytecode is required for executing and verifying the function's behavior
-   * in the Aztec network. Throws an error if the contract or function cannot be found.
-   *
-   * @param contractAddress - The contract's address.
-   * @param selector - The function selector.
-   * @returns A Promise that resolves to a Buffer containing the bytecode of the specified function.
-   * @throws Error if the contract address is unknown or not found.
-   */ async getBytecode(contractAddress, selector) {
-        const tree = await this.getTreeForAddress(contractAddress);
-        return tree.getBytecode(selector);
+    async getPublicFunctionDebugMetadata(contractAddress) {
+        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        const fnArtifact = artifact && artifact.functions.find((fn)=>fn.functionType === FunctionType.PUBLIC);
+        return fnArtifact && getFunctionDebugMetadata(artifact, fnArtifact);
     }
     /**
    * Retrieve the function membership witness for the given contract class and function selector.
@@ -169,20 +167,42 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
    * @param selector - The function selector.
    * @returns A promise that resolves with the MembershipWitness instance for the specified contract's function.
    */ async getFunctionMembershipWitness(contractClassId, selector) {
-        const tree = await this.getTreeForClassId(contractClassId);
-        return tree.getFunctionMembershipWitness(selector);
+        const tree = await this.#getPrivateFunctionTreeForClassId(contractClassId);
+        return tree?.getFunctionMembershipWitness(selector);
     }
     async getDebugContractName(contractAddress) {
-        const tree = await this.getTreeForAddress(contractAddress);
-        return tree.getArtifact().name;
+        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        return artifact?.name;
     }
     async getDebugFunctionName(contractAddress, selector) {
-        const tree = await this.getTreeForAddress(contractAddress);
-        const { name: contractName } = tree.getArtifact();
-        const { name: functionName } = await tree.getFunctionArtifact(selector);
-        return `${contractName}:${functionName}`;
+        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        const fnArtifact = artifact && await this.#findFunctionAbiBySelector(artifact, selector);
+        return `${artifact?.name ?? contractAddress}:${fnArtifact?.name ?? selector}`;
     }
     async getSize() {
         return (await toArray(this.#contractInstances.valuesAsync())).concat(await toArray(this.#contractArtifacts.valuesAsync())).reduce((sum, value)=>sum + value.length, 0);
     }
+    async #findFunctionArtifactBySelector(artifact, selector) {
+        const functions = artifact.functions;
+        for(let i = 0; i < functions.length; i++){
+            const fn = functions[i];
+            const fnSelector = await FunctionSelector.fromNameAndParameters(fn.name, fn.parameters);
+            if (fnSelector.equals(selector)) {
+                return fn;
+            }
+        }
+    }
+    async #findFunctionAbiBySelector(artifact, selector) {
+        const functions = [
+            ...artifact.functions,
+            ...artifact.nonDispatchPublicFunctions ?? []
+        ];
+        for(let i = 0; i < functions.length; i++){
+            const fn = functions[i];
+            const fnSelector = await FunctionSelector.fromNameAndParameters(fn.name, fn.parameters);
+            if (fnSelector.equals(selector)) {
+                return fn;
+            }
+        }
+    }
 }

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

@@ -1,3 +1,2 @@
 export { ContractDataProvider } from './contract_data_provider.js';
-export { PrivateFunctionsTree } from './private_functions_tree.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/storage/contract_data_provider/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/storage/contract_data_provider/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC"}

package/dest/storage/contract_data_provider/index.js

@@ -1,2 +1 @@
 export { ContractDataProvider } from './contract_data_provider.js';
-export { PrivateFunctionsTree } from './private_functions_tree.js';

package/dest/storage/contract_data_provider/private_functions_tree.d.ts

@@ -1,10 +1,6 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { FUNCTION_TREE_HEIGHT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
-import { MembershipWitness, type MerkleTree } from '@aztec/foundation/trees';
-import { type ContractArtifact, type FunctionArtifact, FunctionSelector } from '@aztec/stdlib/abi';
-import { type ContractClassWithId } from '@aztec/stdlib/contract';
+import { MembershipWitness } from '@aztec/foundation/trees';
+import { type ContractArtifact, FunctionSelector } from '@aztec/stdlib/abi';
 /**
  * Represents a Merkle tree of functions for a particular Contract Class.
  * It manages the construction of the function tree, computes its root, and generates membership witnesses
@@ -12,45 +8,10 @@ import { type ContractClassWithId } from '@aztec/stdlib/contract';
  * It is used in combination with the AztecNode to compute various data for executing private transactions.
  */
 export declare class PrivateFunctionsTree {
-    private readonly artifact;
-    private contractClass;
+    private readonly privateFunctions;
     private tree?;
     private constructor();
     static create(artifact: ContractArtifact): Promise<PrivateFunctionsTree>;
-    /**
-     * Retrieve the artifact of a given function.
-     * The function is identified by its selector, which represents a unique identifier for the function's signature.
-     * Throws an error if the function with the provided selector is not found in the contract.
-     *
-     * @param selector - The function selector.
-     * @returns The artifact object containing relevant information about the targeted function.
-     */
-    getFunctionArtifact(selector: FunctionSelector): Promise<FunctionArtifact>;
-    /**
-     * Retrieve the bytecode of a function in the contract by its function selector.
-     * The function selector is a unique identifier for each function in a contract.
-     * Throws an error if the function with the given selector is not found in the contract.
-     *
-     * @param selector - The selector of a function to get bytecode for.
-     * @returns The bytecode of the function as a string.
-     */
-    getBytecode(selector: FunctionSelector): Promise<Buffer>;
-    /**
-     * Calculate and return the root of the function tree for the current contract.
-     * This root is a cryptographic commitment to the set of constrained functions within the contract,
-     * which is used in the Aztec node's proof system. The root will be cached after the first call.
-     *
-     * @returns A promise that resolves to the Fr (finite field element) representation of the function tree root.
-     */
-    getFunctionTreeRoot(): Promise<MerkleTree>;
-    /** Returns the contract class object. */
-    getContractClass(): ContractClassWithId;
-    /** Returns the contract artifact. */
-    getArtifact(): ContractArtifact;
-    /**
-     * Returns the contract class identifier for the given artifact.
-     */
-    getContractClassId(): Fr;
     /**
      * Retrieve the membership witness of a function within a contract's function tree.
      * A membership witness represents the position and authentication path of a target function

package/dest/storage/contract_data_provider/private_functions_tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private_functions_tree.d.ts","sourceRoot":"","sources":["../../../src/storage/contract_data_provider/private_functions_tree.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,KAAK,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACnG,OAAO,EACL,KAAK,mBAAmB,EAIzB,MAAM,wBAAwB,CAAC;AAEhC;;;;;GAKG;AACH,qBAAa,oBAAoB;IAGX,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAAoB,OAAO,CAAC,aAAa;IAFtF,OAAO,CAAC,IAAI,CAAC,CAAa;IAE1B,OAAO;WAEM,MAAM,CAAC,QAAQ,EAAE,gBAAgB;IAK9C;;;;;;;OAOG;IACU,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAkBvF;;;;;;;OAOG;IACU,WAAW,CAAC,QAAQ,EAAE,gBAAgB;IAKnD;;;;;;OAMG;IACI,mBAAmB;IAI1B,yCAAyC;IAClC,gBAAgB;IAIvB,qCAAqC;IAC9B,WAAW;IAIlB;;OAEG;IACI,kBAAkB;IAIzB;;;;;;;;OAQG;IACU,4BAA4B,CACvC,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,iBAAiB,CAAC,OAAO,oBAAoB,CAAC,CAAC;YAiB5C,OAAO;CAOtB"}
+{"version":3,"file":"private_functions_tree.d.ts","sourceRoot":"","sources":["../../../src/storage/contract_data_provider/private_functions_tree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAGxD,OAAO,EAAE,iBAAiB,EAAmB,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EAAE,KAAK,gBAAgB,EAAE,gBAAgB,EAAgB,MAAM,mBAAmB,CAAC;AAQ1F;;;;;GAKG;AACH,qBAAa,oBAAoB;IAGX,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAFrD,OAAO,CAAC,IAAI,CAAC,CAAa;IAE1B,OAAO;WAEM,MAAM,CAAC,QAAQ,EAAE,gBAAgB;IAS9C;;;;;;;;OAQG;IACU,4BAA4B,CACvC,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,iBAAiB,CAAC,OAAO,oBAAoB,CAAC,CAAC;YAiB5C,OAAO;CAMtB"}

package/dest/storage/contract_data_provider/private_functions_tree.js

@@ -2,73 +2,22 @@ import { FUNCTION_TREE_HEIGHT } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { assertLength } from '@aztec/foundation/serialize';
 import { MembershipWitness } from '@aztec/foundation/trees';
-import { FunctionSelector } from '@aztec/stdlib/abi';
-import { computePrivateFunctionLeaf, computePrivateFunctionsTree, getContractClassFromArtifact } from '@aztec/stdlib/contract';
+import { FunctionType } from '@aztec/stdlib/abi';
+import { computePrivateFunctionLeaf, computePrivateFunctionsTree, getContractClassPrivateFunctionFromArtifact } from '@aztec/stdlib/contract';
 /**
  * Represents a Merkle tree of functions for a particular Contract Class.
  * It manages the construction of the function tree, computes its root, and generates membership witnesses
  * for constrained functions. This class also enables lookup of specific function artifact using selectors.
  * It is used in combination with the AztecNode to compute various data for executing private transactions.
  */ export class PrivateFunctionsTree {
-    artifact;
-    contractClass;
+    privateFunctions;
     tree;
-    constructor(artifact, contractClass){
-        this.artifact = artifact;
-        this.contractClass = contractClass;
+    constructor(privateFunctions){
+        this.privateFunctions = privateFunctions;
     }
     static async create(artifact) {
-        const contractClass = await getContractClassFromArtifact(artifact);
-        return new PrivateFunctionsTree(artifact, contractClass);
-    }
-    /**
-   * Retrieve the artifact of a given function.
-   * The function is identified by its selector, which represents a unique identifier for the function's signature.
-   * Throws an error if the function with the provided selector is not found in the contract.
-   *
-   * @param selector - The function selector.
-   * @returns The artifact object containing relevant information about the targeted function.
-   */ async getFunctionArtifact(selector) {
-        const functionsAndSelectors = await Promise.all(this.artifact.functions.map(async (f)=>({
-                f,
-                selector: await FunctionSelector.fromNameAndParameters(f.name, f.parameters)
-            })));
-        const artifact = functionsAndSelectors.find((f)=>selector.equals(f.selector))?.f;
-        if (!artifact) {
-            throw new Error(`Unknown function. Selector ${selector.toString()} not found in the artifact ${this.artifact.name} with class ${this.getContractClassId().toString()}.`);
-        }
-        return artifact;
-    }
-    /**
-   * Retrieve the bytecode of a function in the contract by its function selector.
-   * The function selector is a unique identifier for each function in a contract.
-   * Throws an error if the function with the given selector is not found in the contract.
-   *
-   * @param selector - The selector of a function to get bytecode for.
-   * @returns The bytecode of the function as a string.
-   */ async getBytecode(selector) {
-        const artifact = await this.getFunctionArtifact(selector);
-        return artifact.bytecode;
-    }
-    /**
-   * Calculate and return the root of the function tree for the current contract.
-   * This root is a cryptographic commitment to the set of constrained functions within the contract,
-   * which is used in the Aztec node's proof system. The root will be cached after the first call.
-   *
-   * @returns A promise that resolves to the Fr (finite field element) representation of the function tree root.
-   */ getFunctionTreeRoot() {
-        return this.getTree();
-    }
-    /** Returns the contract class object. */ getContractClass() {
-        return this.contractClass;
-    }
-    /** Returns the contract artifact. */ getArtifact() {
-        return this.artifact;
-    }
-    /**
-   * Returns the contract class identifier for the given artifact.
-   */ getContractClassId() {
-        return this.getContractClass().id;
+        const privateFunctions = await Promise.all(artifact.functions.filter((fn)=>fn.functionType === FunctionType.PRIVATE).map(getContractClassPrivateFunctionFromArtifact));
+        return new PrivateFunctionsTree(privateFunctions);
     }
     /**
    * Retrieve the membership witness of a function within a contract's function tree.
@@ -79,7 +28,7 @@ import { computePrivateFunctionLeaf, computePrivateFunctionsTree, getContractCla
    * @param selector - The function selector.
    * @returns A MembershipWitness instance representing the position and authentication path of the function in the function tree.
    */ async getFunctionMembershipWitness(selector) {
-        const fn = this.getContractClass().privateFunctions.find((f)=>f.selector.equals(selector));
+        const fn = this.privateFunctions.find((f)=>f.selector.equals(selector));
         if (!fn) {
             throw new Error(`Private function with selector ${selector.toString()} not found in contract class.`);
         }
@@ -91,8 +40,7 @@ import { computePrivateFunctionLeaf, computePrivateFunctionsTree, getContractCla
     }
     async getTree() {
         if (!this.tree) {
-            const fns = this.getContractClass().privateFunctions;
-            this.tree = await computePrivateFunctionsTree(fns);
+            this.tree = await computePrivateFunctionsTree(this.privateFunctions);
         }
         return this.tree;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"pxe_test_suite.d.ts","sourceRoot":"","sources":["../../src/test/pxe_test_suite.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAS3D,eAAO,MAAM,YAAY,aAAc,MAAM,YAAY,MAAM,QAAQ,GAAG,CAAC,SAiG1E,CAAC"}
+{"version":3,"file":"pxe_test_suite.d.ts","sourceRoot":"","sources":["../../src/test/pxe_test_suite.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAS3D,eAAO,MAAM,YAAY,aAAc,MAAM,YAAY,MAAM,QAAQ,GAAG,CAAC,SAmG1E,CAAC"}

package/dest/test/pxe_test_suite.js

@@ -69,7 +69,7 @@ export const pxeTestSuite = (testName, pxeSetup)=>{
             const instance = await randomContractInstanceWithAddress();
             await expect(pxe.registerContract({
                 instance
-            })).rejects.toThrow(/DB has no contract class with id/i);
+            })).rejects.toThrow(/Artifact not found when registering an instance/);
         });
         it('refuses to register a contract with an artifact with mismatching class id', async ()=>{
             const artifact = randomContractArtifact();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.82.0",
+  "version": "0.82.1",
   "type": "module",
   "exports": {
     "./server": "./dest/entrypoints/server/index.js",
@@ -59,19 +59,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.82.0",
-    "@aztec/bb.js": "0.82.0",
-    "@aztec/builder": "0.82.0",
-    "@aztec/constants": "0.82.0",
-    "@aztec/ethereum": "0.82.0",
-    "@aztec/foundation": "0.82.0",
-    "@aztec/key-store": "0.82.0",
-    "@aztec/kv-store": "0.82.0",
-    "@aztec/noir-protocol-circuits-types": "0.82.0",
-    "@aztec/noir-types": "0.82.0",
-    "@aztec/protocol-contracts": "0.82.0",
-    "@aztec/simulator": "0.82.0",
-    "@aztec/stdlib": "0.82.0",
+    "@aztec/bb-prover": "0.82.1",
+    "@aztec/bb.js": "0.82.1",
+    "@aztec/builder": "0.82.1",
+    "@aztec/constants": "0.82.1",
+    "@aztec/ethereum": "0.82.1",
+    "@aztec/foundation": "0.82.1",
+    "@aztec/key-store": "0.82.1",
+    "@aztec/kv-store": "0.82.1",
+    "@aztec/noir-protocol-circuits-types": "0.82.1",
+    "@aztec/noir-types": "0.82.1",
+    "@aztec/protocol-contracts": "0.82.1",
+    "@aztec/simulator": "0.82.1",
+    "@aztec/stdlib": "0.82.1",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "koa": "^2.14.2",
     "koa-router": "^12.0.0",
@@ -81,7 +81,7 @@
     "viem": "2.23.7"
   },
   "devDependencies": {
-    "@aztec/noir-contracts.js": "0.82.0",
+    "@aztec/noir-contracts.js": "0.82.1",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/lodash.omit": "^4.5.7",

package/src/config/index.ts

@@ -71,7 +71,7 @@ export const pxeConfigMappings: ConfigMappingsType<PXEServiceConfig> = {
   proverEnabled: {
     env: 'PXE_PROVER_ENABLED',
     description: 'Enable real proofs',
-    ...booleanConfigHelper(),
+    ...booleanConfigHelper(true),
   },
 };
 

package/src/private_kernel/private_kernel_execution_prover.ts

@@ -29,10 +29,8 @@ import {
   type PrivateCallExecutionResult,
   type PrivateExecutionResult,
   TxRequest,
-  collectEnqueuedPublicFunctionCalls,
   collectNoteHashLeafIndexMap,
   collectNoteHashNullifierCounterMap,
-  collectPublicTeardownFunctionCall,
   getFinalMinRevertibleSideEffectCounter,
 } from '@aztec/stdlib/tx';
 import { VerificationKeyAsFields } from '@aztec/stdlib/vks';
@@ -93,7 +91,7 @@ export class PrivateKernelExecutionProver {
 
     const timer = new Timer();
 
-    const isPrivateOnlyTx = this.isPrivateOnly(executionResult);
+    const isPrivateOnlyTx = executionResult.publicFunctionCalldata.length === 0;
 
     const executionStack = [executionResult.entrypoint];
     let firstIteration = true;
@@ -104,10 +102,9 @@ export class PrivateKernelExecutionProver {
 
     const noteHashLeafIndexMap = collectNoteHashLeafIndexMap(executionResult);
     const noteHashNullifierCounterMap = collectNoteHashNullifierCounterMap(executionResult);
-    const enqueuedPublicFunctions = collectEnqueuedPublicFunctionCalls(executionResult);
-    const hasPublicCalls =
-      enqueuedPublicFunctions.length > 0 || !collectPublicTeardownFunctionCall(executionResult).isEmpty();
-    const validationRequestsSplitCounter = hasPublicCalls ? getFinalMinRevertibleSideEffectCounter(executionResult) : 0;
+    const validationRequestsSplitCounter = isPrivateOnlyTx
+      ? 0
+      : getFinalMinRevertibleSideEffectCounter(executionResult);
 
     while (executionStack.length) {
       if (!firstIteration) {
@@ -339,17 +336,4 @@ export class PrivateKernelExecutionProver {
       }),
     });
   }
-
-  private isPrivateOnly(executionResult: PrivateExecutionResult): boolean {
-    const isPrivateOnlyRecursive = (callResult: PrivateCallExecutionResult): boolean => {
-      const makesPublicCalls =
-        callResult.enqueuedPublicFunctionCalls.some(enqueuedCall => !enqueuedCall.isEmpty()) ||
-        !callResult.publicTeardownFunctionCall.isEmpty();
-      return (
-        !makesPublicCalls &&
-        callResult.nestedExecutions.every(nestedExecution => isPrivateOnlyRecursive(nestedExecution))
-      );
-    };
-    return isPrivateOnlyRecursive(executionResult.entrypoint);
-  }
 }

package/src/private_kernel/private_kernel_oracle_impl.ts

@@ -37,6 +37,9 @@ export class PrivateKernelOracleImpl implements PrivateKernelOracle {
 
   public async getContractAddressPreimage(address: AztecAddress) {
     const instance = await this.contractDataProvider.getContractInstance(address);
+    if (!instance) {
+      throw new Error(`Contract instance not found when getting address preimage. Contract address: ${address}.`);
+    }
     return {
       saltedInitializationHash: await computeSaltedInitializationHash(instance),
       ...instance,
@@ -45,11 +48,20 @@ export class PrivateKernelOracleImpl implements PrivateKernelOracle {
 
   public async getContractClassIdPreimage(contractClassId: Fr) {
     const contractClass = await this.contractDataProvider.getContractClass(contractClassId);
+    if (!contractClass) {
+      throw new Error(`Contract class not found when getting class id preimage. Class id: ${contractClassId}.`);
+    }
     return computeContractClassIdPreimage(contractClass);
   }
 
   public async getFunctionMembershipWitness(contractClassId: Fr, selector: FunctionSelector) {
-    return await this.contractDataProvider.getFunctionMembershipWitness(contractClassId, selector);
+    const membershipWitness = await this.contractDataProvider.getFunctionMembershipWitness(contractClassId, selector);
+    if (!membershipWitness) {
+      throw new Error(
+        `Membership witness not found for contract class id ${contractClassId} and selector ${selector}.`,
+      );
+    }
+    return membershipWitness;
   }
 
   public getVkMembershipWitness(vk: VerificationKeyAsFields) {

package/src/pxe_oracle_interface/pxe_oracle_interface.ts

@@ -106,6 +106,9 @@ export class PXEOracleInterface implements ExecutionDataProvider {
     selector: FunctionSelector,
   ): Promise<FunctionArtifactWithContractName> {
     const artifact = await this.contractDataProvider.getFunctionArtifact(contractAddress, selector);
+    if (!artifact) {
+      throw new Error(`Function artifact not found for contract ${contractAddress} and selector ${selector}.`);
+    }
     const debug = await this.contractDataProvider.getFunctionDebugMetadata(contractAddress, selector);
     return {
       ...artifact,
@@ -118,6 +121,9 @@ export class PXEOracleInterface implements ExecutionDataProvider {
     functionName: string,
   ): Promise<FunctionArtifactWithContractName | undefined> {
     const instance = await this.contractDataProvider.getContractInstance(contractAddress);
+    if (!instance) {
+      return;
+    }
     const artifact = await this.contractDataProvider.getContractArtifact(instance.currentContractClassId);
     return artifact && getFunctionArtifact(artifact, functionName);
   }