@aztec/pxe 0.0.0-test.1 → 0.0.1-commit.b655e406

package/src/storage/address_data_provider/address_data_provider.ts

@@ -3,9 +3,7 @@ import type { AztecAsyncArray, AztecAsyncKVStore, AztecAsyncMap } from '@aztec/k
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { CompleteAddress } from '@aztec/stdlib/contract';
 
-import type { DataProvider } from '../data_provider.js';
-
-export class AddressDataProvider implements DataProvider {
+export class AddressDataProvider {
   #store: AztecAsyncKVStore;
   #completeAddresses: AztecAsyncArray<Buffer>;
   #completeAddressIndex: AztecAsyncMap<string, number>;
@@ -64,8 +62,4 @@ export class AddressDataProvider implements DataProvider {
       (await toArray(this.#completeAddresses.valuesAsync())).map(v => CompleteAddress.fromBuffer(v)),
     );
   }
-
-  async getSize(): Promise<number> {
-    return (await this.#completeAddresses.lengthAsync()) * CompleteAddress.SIZE_IN_BYTES;
-  }
 }

package/src/storage/capsule_data_provider/capsule_data_provider.ts

@@ -1,25 +1,22 @@
 import { Fr } from '@aztec/foundation/fields';
-import { toArray } from '@aztec/foundation/iterable';
-import { type LogFn, createDebugOnlyLogger } from '@aztec/foundation/log';
+import { type Logger, createLogger } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 
-import type { DataProvider } from '../data_provider.js';
-
-export class CapsuleDataProvider implements DataProvider {
+export class CapsuleDataProvider {
   #store: AztecAsyncKVStore;
 
   // Arbitrary data stored by contracts. Key is computed as `${contractAddress}:${key}`
   #capsules: AztecAsyncMap<string, Buffer>;
 
-  debug: LogFn;
+  logger: Logger;
 
   constructor(store: AztecAsyncKVStore) {
     this.#store = store;
 
     this.#capsules = this.#store.openMap('capsules');
 
-    this.debug = createDebugOnlyLogger('pxe:capsule-data-provider');
+    this.logger = createLogger('pxe:capsule-data-provider');
   }
 
   async storeCapsule(contractAddress: AztecAddress, slot: Fr, capsule: Fr[]): Promise<void> {
@@ -29,7 +26,7 @@ export class CapsuleDataProvider implements DataProvider {
   async loadCapsule(contractAddress: AztecAddress, slot: Fr): Promise<Fr[] | null> {
     const dataBuffer = await this.#capsules.getAsync(dbSlotToKey(contractAddress, slot));
     if (!dataBuffer) {
-      this.debug(`Data not found for contract ${contractAddress.toString()} and slot ${slot.toString()}`);
+      this.logger.trace(`Data not found for contract ${contractAddress.toString()} and slot ${slot.toString()}`);
       return null;
     }
     const capsule: Fr[] = [];
@@ -43,38 +40,108 @@ export class CapsuleDataProvider implements DataProvider {
     await this.#capsules.delete(dbSlotToKey(contractAddress, slot));
   }
 
-  async copyCapsule(contractAddress: AztecAddress, srcSlot: Fr, dstSlot: Fr, numEntries: number): Promise<void> {
-    // In order to support overlapping source and destination regions, we need to check the relative positions of source
-    // and destination. If destination is ahead of source, then by the time we overwrite source elements using forward
-    // indexes we'll have already read those. On the contrary, if source is ahead of destination we need to use backward
-    // indexes to avoid reading elements that've been overwritten.
+  copyCapsule(contractAddress: AztecAddress, srcSlot: Fr, dstSlot: Fr, numEntries: number): Promise<void> {
+    return this.#store.transactionAsync(async () => {
+      // In order to support overlapping source and destination regions, we need to check the relative positions of source
+      // and destination. If destination is ahead of source, then by the time we overwrite source elements using forward
+      // indexes we'll have already read those. On the contrary, if source is ahead of destination we need to use backward
+      // indexes to avoid reading elements that've been overwritten.
 
-    const indexes = Array.from(Array(numEntries).keys());
-    if (srcSlot.lt(dstSlot)) {
-      indexes.reverse();
-    }
+      const indexes = Array.from(Array(numEntries).keys());
+      if (srcSlot.lt(dstSlot)) {
+        indexes.reverse();
+      }
 
-    for (const i of indexes) {
-      const currentSrcSlot = dbSlotToKey(contractAddress, srcSlot.add(new Fr(i)));
-      const currentDstSlot = dbSlotToKey(contractAddress, dstSlot.add(new Fr(i)));
+      for (const i of indexes) {
+        const currentSrcSlot = dbSlotToKey(contractAddress, srcSlot.add(new Fr(i)));
+        const currentDstSlot = dbSlotToKey(contractAddress, dstSlot.add(new Fr(i)));
 
-      const toCopy = await this.#capsules.getAsync(currentSrcSlot);
-      if (!toCopy) {
-        throw new Error(`Attempted to copy empty slot ${currentSrcSlot} for contract ${contractAddress.toString()}`);
+        const toCopy = await this.#capsules.getAsync(currentSrcSlot);
+        if (!toCopy) {
+          throw new Error(`Attempted to copy empty slot ${currentSrcSlot} for contract ${contractAddress.toString()}`);
+        }
+
+        await this.#capsules.set(currentDstSlot, toCopy);
       }
+    });
+  }
 
-      await this.#capsules.set(currentDstSlot, toCopy);
-    }
+  /**
+   * Appends multiple capsules to a capsule array stored at the base slot.
+   * The array length is stored at the base slot, and elements are stored in consecutive slots after it.
+   * All operations are performed in a single transaction.
+   * @param contractAddress - The contract address that owns the capsule array
+   * @param baseSlot - The slot where the array length is stored
+   * @param content - Array of capsule data to append
+   */
+  appendToCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr, content: Fr[][]): Promise<void> {
+    return this.#store.transactionAsync(async () => {
+      // Load current length, defaulting to 0 if not found
+      const lengthData = await this.loadCapsule(contractAddress, baseSlot);
+      const currentLength = lengthData ? lengthData[0].toNumber() : 0;
+
+      // Store each capsule at consecutive slots after baseSlot + 1 + currentLength
+      for (let i = 0; i < content.length; i++) {
+        const nextSlot = arraySlot(baseSlot, currentLength + i);
+        await this.storeCapsule(contractAddress, nextSlot, content[i]);
+      }
+
+      // Update length to include all new capsules
+      const newLength = currentLength + content.length;
+      await this.storeCapsule(contractAddress, baseSlot, [new Fr(newLength)]);
+    });
+  }
+
+  readCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr): Promise<Fr[][]> {
+    return this.#store.transactionAsync(async () => {
+      // Load length, defaulting to 0 if not found
+      const maybeLength = await this.loadCapsule(contractAddress, baseSlot);
+      const length = maybeLength ? maybeLength[0].toBigInt() : 0n;
+
+      const values: Fr[][] = [];
+
+      // Read each capsule at consecutive slots after baseSlot
+      for (let i = 0; i < length; i++) {
+        const currentValue = await this.loadCapsule(contractAddress, arraySlot(baseSlot, i));
+        if (currentValue == undefined) {
+          throw new Error(
+            `Expected non-empty value at capsule array in base slot ${baseSlot} at index ${i} for contract ${contractAddress}`,
+          );
+        }
+
+        values.push(currentValue);
+      }
+
+      return values;
+    });
   }
 
-  public async getSize() {
-    return (await toArray(this.#capsules.valuesAsync())).reduce(
-      (sum, value) => sum + value.length * Fr.SIZE_IN_BYTES,
-      0,
-    );
+  setCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr, content: Fr[][]) {
+    return this.#store.transactionAsync(async () => {
+      // Load current length, defaulting to 0 if not found
+      const maybeLength = await this.loadCapsule(contractAddress, baseSlot);
+      const originalLength = maybeLength ? maybeLength[0].toNumber() : 0;
+
+      // Set the new length
+      await this.storeCapsule(contractAddress, baseSlot, [new Fr(content.length)]);
+
+      // Store the new content, possibly overwriting existing values
+      for (let i = 0; i < content.length; i++) {
+        await this.storeCapsule(contractAddress, arraySlot(baseSlot, i), content[i]);
+      }
+
+      // Clear any stragglers
+      for (let i = content.length; i < originalLength; i++) {
+        await this.deleteCapsule(contractAddress, arraySlot(baseSlot, i));
+      }
+    });
   }
 }
 
 function dbSlotToKey(contractAddress: AztecAddress, slot: Fr): string {
   return `${contractAddress.toString()}:${slot.toString()}`;
 }
+
+function arraySlot(baseSlot: Fr, index: number) {
+  return baseSlot.add(new Fr(1)).add(new Fr(index));
+}

package/src/storage/contract_data_provider/contract_data_provider.ts

@@ -1,11 +1,13 @@
+import type { FUNCTION_TREE_HEIGHT } from '@aztec/constants';
 import type { Fr } from '@aztec/foundation/fields';
 import { toArray } from '@aztec/foundation/iterable';
 import type { MembershipWitness } from '@aztec/foundation/trees';
 import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
-import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator/client';
 import {
   type ContractArtifact,
+  type FunctionAbi,
   type FunctionArtifact,
+  type FunctionArtifactWithContractName,
   type FunctionDebugMetadata,
   FunctionSelector,
   FunctionType,
@@ -18,9 +20,9 @@ import {
   type ContractClass,
   type ContractInstanceWithAddress,
   SerializableContractInstance,
+  getContractClassFromArtifact,
 } from '@aztec/stdlib/contract';
 
-import type { DataProvider } from '../data_provider.js';
 import { PrivateFunctionsTree } from './private_functions_tree.js';
 
 /**
@@ -30,9 +32,13 @@ 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 implements DataProvider {
+export class ContractDataProvider {
   /** Map from contract class id to private function tree. */
-  private contractClassesCache: Map<string, PrivateFunctionsTree> = new Map();
+  // TODO: Update it to be LRU cache so that it doesn't keep all the data all the time.
+  #privateFunctionTrees: Map<string, PrivateFunctionsTree> = new Map();
+
+  /** Map from contract address to contract class id */
+  #contractClassIdMap: Map<string, Fr> = new Map();
 
   #contractArtifacts: AztecAsyncMap<string, Buffer>;
   #contractInstances: AztecAsyncMap<string, Buffer>;
@@ -65,6 +71,8 @@ export class ContractDataProvider implements DataProvider {
   }
 
   async addContractInstance(contract: ContractInstanceWithAddress): Promise<void> {
+    this.#contractClassIdMap.set(contract.address.toString(), contract.currentContractClassId);
+
     await this.#contractInstances.set(
       contract.address.toString(),
       new SerializableContractInstance(contract).toBuffer(),
@@ -73,15 +81,15 @@ export class ContractDataProvider implements DataProvider {
 
   // Private getters
 
-  async #getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined> {
-    const contract = await this.#contractInstances.getAsync(address.toString());
-    return contract && SerializableContractInstance.fromBuffer(contract).withAddress(address);
-  }
-
-  async #getContractArtifact(id: Fr): Promise<ContractArtifact | undefined> {
-    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: AztecAddress): Promise<Fr | undefined> {
+    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());
   }
 
   /**
@@ -94,31 +102,21 @@ export class ContractDataProvider implements DataProvider {
    * @returns A ContractTree instance associated with the specified contract address.
    * @throws An Error if the contract is not found in the ContractDatabase.
    */
-  private async getTreeForClassId(classId: Fr): Promise<PrivateFunctionsTree> {
-    if (!this.contractClassesCache.has(classId.toString())) {
-      const artifact = await this.#getContractArtifact(classId);
+  async #getPrivateFunctionTreeForClassId(classId: Fr): Promise<PrivateFunctionsTree | undefined> {
+    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.
-   */
-  private async getTreeForAddress(contractAddress: AztecAddress): Promise<PrivateFunctionsTree> {
-    const instance = await this.getContractInstance(contractAddress);
-    return this.getTreeForClassId(instance.currentContractClassId);
+  async #getContractArtifactByAddress(contractAddress: AztecAddress): Promise<ContractArtifact | undefined> {
+    const contractClassId = await this.#getContractClassId(contractAddress);
+    return contractClassId && this.getContractArtifact(contractClassId);
   }
 
   // Public getters
@@ -129,32 +127,33 @@ export class ContractDataProvider implements DataProvider {
   }
 
   /** Returns a contract instance for a given address. Throws if not found. */
-  public async getContractInstance(contractAddress: AztecAddress): Promise<ContractInstanceWithAddress> {
-    const instance = await this.#getContractInstance(contractAddress);
-    if (!instance) {
-      throw new ContractNotFoundError(contractAddress.toString());
-    }
-    return instance;
+  public async getContractInstance(contractAddress: AztecAddress): Promise<ContractInstanceWithAddress | undefined> {
+    const contract = await this.#contractInstances.getAsync(contractAddress.toString());
+    return contract && SerializableContractInstance.fromBuffer(contract).withAddress(contractAddress);
   }
 
-  public async getContractArtifact(contractClassId: Fr): Promise<ContractArtifact> {
-    const tree = await this.getTreeForClassId(contractClassId);
-    return tree.getArtifact();
+  public async getContractArtifact(contractClassId: Fr): Promise<ContractArtifact | undefined> {
+    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. */
-  public async getContractClass(contractClassId: Fr): Promise<ContractClass> {
-    const tree = await this.getTreeForClassId(contractClassId);
-    return tree.getContractClass();
+  public async getContractClass(contractClassId: Fr): Promise<ContractClass | undefined> {
+    const artifact = await this.getContractArtifact(contractClassId);
+    return artifact && getContractClassFromArtifact(artifact);
   }
 
   public async getContract(
     address: AztecAddress,
   ): Promise<(ContractInstanceWithAddress & ContractArtifact) | undefined> {
     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, ...artifact };
   }
@@ -168,9 +167,21 @@ export class ContractDataProvider implements DataProvider {
    * @param selector - The function selector.
    * @returns The corresponding function's artifact as an object.
    */
-  public async getFunctionArtifact(contractAddress: AztecAddress, selector: FunctionSelector) {
-    const tree = await this.getTreeForAddress(contractAddress);
-    return tree.getFunctionArtifact(selector);
+  public async getFunctionArtifact(
+    contractAddress: AztecAddress,
+    selector: FunctionSelector,
+  ): Promise<FunctionArtifactWithContractName | undefined> {
+    const artifact = await this.#getContractArtifactByAddress(contractAddress);
+    const fnArtifact = artifact && (await this.#findFunctionArtifactBySelector(artifact, selector));
+    return fnArtifact && { ...fnArtifact, contractName: artifact.name };
+  }
+
+  public async getPublicFunctionArtifact(
+    contractAddress: AztecAddress,
+  ): Promise<FunctionArtifactWithContractName | undefined> {
+    const artifact = await this.#getContractArtifactByAddress(contractAddress);
+    const fnArtifact = artifact && artifact.functions.find(fn => fn.functionType === FunctionType.PUBLIC);
+    return fnArtifact && { ...fnArtifact, contractName: artifact.name };
   }
 
   /**
@@ -186,8 +197,16 @@ export class ContractDataProvider implements DataProvider {
     contractAddress: AztecAddress,
     functionName: string,
   ): Promise<FunctionArtifact | undefined> {
-    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);
+  }
+
+  public async getFunctionAbi(
+    contractAddress: AztecAddress,
+    selector: FunctionSelector,
+  ): Promise<FunctionAbi | undefined> {
+    const artifact = await this.#getContractArtifactByAddress(contractAddress);
+    return artifact && (await this.#findFunctionAbiBySelector(artifact, selector));
   }
 
   /**
@@ -204,24 +223,17 @@ export class ContractDataProvider implements DataProvider {
     contractAddress: AztecAddress,
     selector: FunctionSelector,
   ): Promise<FunctionDebugMetadata | undefined> {
-    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.
-   */
-  public async getBytecode(contractAddress: AztecAddress, selector: FunctionSelector) {
-    const tree = await this.getTreeForAddress(contractAddress);
-    return tree.getBytecode(selector);
+  public async getPublicFunctionDebugMetadata(
+    contractAddress: AztecAddress,
+  ): Promise<FunctionDebugMetadata | undefined> {
+    const artifact = await this.#getContractArtifactByAddress(contractAddress);
+    const fnArtifact = artifact && artifact.functions.find(fn => fn.functionType === FunctionType.PUBLIC);
+    return fnArtifact && getFunctionDebugMetadata(artifact, fnArtifact);
   }
 
   /**
@@ -236,26 +248,47 @@ export class ContractDataProvider implements DataProvider {
   public async getFunctionMembershipWitness(
     contractClassId: Fr,
     selector: FunctionSelector,
-  ): Promise<MembershipWitness<5>> {
-    const tree = await this.getTreeForClassId(contractClassId);
-    return tree.getFunctionMembershipWitness(selector);
+  ): Promise<MembershipWitness<typeof FUNCTION_TREE_HEIGHT> | undefined> {
+    const tree = await this.#getPrivateFunctionTreeForClassId(contractClassId);
+    return tree?.getFunctionMembershipWitness(selector);
   }
 
   public async getDebugContractName(contractAddress: AztecAddress) {
-    const tree = await this.getTreeForAddress(contractAddress);
-    return tree.getArtifact().name;
+    const artifact = await this.#getContractArtifactByAddress(contractAddress);
+    return artifact?.name;
   }
 
   public async getDebugFunctionName(contractAddress: AztecAddress, selector: FunctionSelector) {
-    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}`;
   }
 
-  public async getSize() {
-    return (await toArray(this.#contractInstances.valuesAsync()))
-      .concat(await toArray(this.#contractArtifacts.valuesAsync()))
-      .reduce((sum, value) => sum + value.length, 0);
+  async #findFunctionArtifactBySelector(
+    artifact: ContractArtifact,
+    selector: FunctionSelector,
+  ): Promise<FunctionArtifact | undefined> {
+    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: ContractArtifact,
+    selector: FunctionSelector,
+  ): Promise<FunctionAbi | undefined> {
+    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/src/storage/contract_data_provider/index.ts

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

package/src/storage/contract_data_provider/private_functions_tree.ts

@@ -2,12 +2,12 @@ import { FUNCTION_TREE_HEIGHT } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { assertLength } from '@aztec/foundation/serialize';
 import { MembershipWitness, type MerkleTree } from '@aztec/foundation/trees';
-import { type ContractArtifact, FunctionSelector } from '@aztec/stdlib/abi';
+import { type ContractArtifact, FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
 import {
-  type ContractClassWithId,
+  type PrivateFunction,
   computePrivateFunctionLeaf,
   computePrivateFunctionsTree,
-  getContractClassFromArtifact,
+  getContractClassPrivateFunctionFromArtifact,
 } from '@aztec/stdlib/contract';
 
 /**
@@ -19,78 +19,15 @@ import {
 export class PrivateFunctionsTree {
   private tree?: MerkleTree;
 
-  private constructor(private readonly artifact: ContractArtifact, private contractClass: ContractClassWithId) {}
+  private constructor(private readonly privateFunctions: PrivateFunction[]) {}
 
   static async create(artifact: ContractArtifact) {
-    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.
-   */
-  public async getFunctionArtifact(selector: FunctionSelector) {
-    const functionsAndSelectors = await Promise.all(
-      this.artifact.functions.map(async f => ({
-        f,
-        selector: await FunctionSelector.fromNameAndParameters(f.name, f.parameters),
-      })),
+    const privateFunctions = await Promise.all(
+      artifact.functions
+        .filter(fn => fn.functionType === FunctionType.PRIVATE)
+        .map(getContractClassPrivateFunctionFromArtifact),
     );
-    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.
-   */
-  public async getBytecode(selector: FunctionSelector) {
-    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.
-   */
-  public getFunctionTreeRoot() {
-    return this.getTree();
-  }
-
-  /** Returns the contract class object. */
-  public getContractClass() {
-    return this.contractClass;
-  }
-
-  /** Returns the contract artifact. */
-  public getArtifact() {
-    return this.artifact;
-  }
-
-  /**
-   * Returns the contract class identifier for the given artifact.
-   */
-  public getContractClassId() {
-    return this.getContractClass().id;
+    return new PrivateFunctionsTree(privateFunctions);
   }
 
   /**
@@ -105,7 +42,7 @@ export class PrivateFunctionsTree {
   public async getFunctionMembershipWitness(
     selector: FunctionSelector,
   ): Promise<MembershipWitness<typeof FUNCTION_TREE_HEIGHT>> {
-    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.`);
     }
@@ -123,8 +60,7 @@ export class PrivateFunctionsTree {
 
   private 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/src/storage/index.ts

@@ -1,10 +1,8 @@
 export * from './address_data_provider/index.js';
-export * from './auth_witness_data_provider/index.js';
 export * from './capsule_data_provider/index.js';
 export * from './contract_data_provider/index.js';
 export * from './note_data_provider/index.js';
 export * from './sync_data_provider/index.js';
 export * from './tagging_data_provider/index.js';
-export * from './data_provider.js';
-
-export const PXE_DATA_SCHEMA_VERSION = 2;
+export * from './metadata.js';
+export * from './private_event_data_provider/private_event_data_provider.js';

package/src/storage/metadata.ts

@@ -0,0 +1 @@
+export const PXE_DATA_SCHEMA_VERSION = 2;