@aztec/pxe 0.28.0 → 0.29.0

package/src/contract_data_oracle/index.ts

@@ -1,12 +1,11 @@
-import { ContractDatabase } from '@aztec/circuit-types';
+import { AztecAddress, MembershipWitness, VK_TREE_HEIGHT } from '@aztec/circuits.js';
 import {
-  AztecAddress,
-  ContractFunctionDao,
-  MembershipWitness,
-  VK_TREE_HEIGHT,
-  getContractClassFromArtifact,
-} from '@aztec/circuits.js';
-import { FunctionDebugMetadata, FunctionSelector } from '@aztec/foundation/abi';
+  ContractArtifact,
+  FunctionArtifact,
+  FunctionDebugMetadata,
+  FunctionSelector,
+  getFunctionDebugMetadata,
+} from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
 import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator';
 import { ContractClass, ContractInstance } from '@aztec/types/contracts';
@@ -23,27 +22,34 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
  * the required information and facilitate cryptographic proof generation.
  */
 export class ContractDataOracle {
-  private trees: PrivateFunctionsTree[] = [];
+  /** Map from contract class id to private function tree. */
+  private contractClasses: Map<string, PrivateFunctionsTree> = new Map();
+  /** Map from address to contract instance. */
+  private contractInstances: Map<string, ContractInstance> = new Map();
 
-  constructor(private db: ContractDatabase & ContractArtifactDatabase & ContractInstanceDatabase) {}
+  constructor(private db: ContractArtifactDatabase & ContractInstanceDatabase) {}
 
   /** Returns a contract instance for a given address. Throws if not found. */
   public async getContractInstance(contractAddress: AztecAddress): Promise<ContractInstance> {
-    const instance = await this.db.getContractInstance(contractAddress);
-    if (!instance) {
-      throw new ContractNotFoundError(contractAddress.toString());
+    if (!this.contractInstances.has(contractAddress.toString())) {
+      const instance = await this.db.getContractInstance(contractAddress);
+      if (!instance) {
+        throw new ContractNotFoundError(contractAddress.toString());
+      }
+      this.contractInstances.set(contractAddress.toString(), instance);
     }
-    return instance;
+    return this.contractInstances.get(contractAddress.toString())!;
   }
 
-  /** Returns a contract class for a given id. Throws if not found. */
+  /** Returns a contract class for a given class id. Throws if not found. */
   public async getContractClass(contractClassId: Fr): Promise<ContractClass> {
-    const contractArtifact = await this.db.getContractArtifact(contractClassId);
-    if (!contractArtifact) {
-      throw new ContractClassNotFoundError(contractClassId.toString());
-    }
-    // TODO(@spalladino): Cache this computation using the trees.
-    return getContractClassFromArtifact(contractArtifact);
+    const tree = await this.getTreeForClassId(contractClassId);
+    return tree.getContractClass();
+  }
+
+  public async getContractArtifact(contractClassId: Fr): Promise<ContractArtifact> {
+    const tree = await this.getTreeForClassId(contractClassId);
+    return tree.getArtifact();
   }
 
   /**
@@ -56,8 +62,8 @@ export class ContractDataOracle {
    * @returns A Promise that resolves to the portal contract address.
    */
   public async getPortalContractAddress(contractAddress: AztecAddress) {
-    const tree = await this.getTree(contractAddress);
-    return tree.contract.instance.portalContractAddress;
+    const instance = await this.getContractInstance(contractAddress);
+    return instance.portalContractAddress;
   }
 
   /**
@@ -70,7 +76,7 @@ export class ContractDataOracle {
    * @returns The corresponding function's artifact as an object.
    */
   public async getFunctionArtifact(contractAddress: AztecAddress, selector: FunctionSelector) {
-    const tree = await this.getTree(contractAddress);
+    const tree = await this.getTreeForAddress(contractAddress);
     return tree.getFunctionArtifact(selector);
   }
 
@@ -86,9 +92,9 @@ export class ContractDataOracle {
   public async getFunctionArtifactByName(
     contractAddress: AztecAddress,
     functionName: string,
-  ): Promise<ContractFunctionDao | undefined> {
-    const tree = await this.getTree(contractAddress);
-    return tree.contract.getFunctionArtifactByName(functionName);
+  ): Promise<FunctionArtifact | undefined> {
+    const tree = await this.getTreeForAddress(contractAddress);
+    return tree.getArtifact().functions.find(f => f.name === functionName);
   }
 
   /**
@@ -105,14 +111,9 @@ export class ContractDataOracle {
     contractAddress: AztecAddress,
     selector: FunctionSelector,
   ): Promise<FunctionDebugMetadata | undefined> {
-    const tree = await this.getTree(contractAddress);
-    const functionArtifact = tree.contract.getFunctionArtifact(selector);
-
-    if (!functionArtifact) {
-      return undefined;
-    }
-
-    return tree.contract.getFunctionDebugMetadataByName(functionArtifact.name);
+    const tree = await this.getTreeForAddress(contractAddress);
+    const artifact = tree.getFunctionArtifact(selector);
+    return getFunctionDebugMetadata(tree.getArtifact(), artifact);
   }
 
   /**
@@ -126,7 +127,7 @@ export class ContractDataOracle {
    * @throws Error if the contract address is unknown or not found.
    */
   public async getBytecode(contractAddress: AztecAddress, selector: FunctionSelector) {
-    const tree = await this.getTree(contractAddress);
+    const tree = await this.getTreeForAddress(contractAddress);
     return tree.getBytecode(selector);
   }
 
@@ -140,7 +141,7 @@ export class ContractDataOracle {
    * @returns A promise that resolves with the MembershipWitness instance for the specified contract's function.
    */
   public async getFunctionMembershipWitness(contractAddress: AztecAddress, selector: FunctionSelector) {
-    const tree = await this.getTree(contractAddress);
+    const tree = await this.getTreeForAddress(contractAddress);
     return tree.getFunctionMembershipWitness(selector);
   }
 
@@ -158,6 +159,28 @@ export class ContractDataOracle {
     return await Promise.resolve(MembershipWitness.random(VK_TREE_HEIGHT));
   }
 
+  /**
+   * Retrieve or create a ContractTree instance based on the provided class id.
+   * If an existing tree with the same class id 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 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.
+   */
+  private async getTreeForClassId(classId: Fr): Promise<PrivateFunctionsTree> {
+    if (!this.contractClasses.has(classId.toString())) {
+      const artifact = await this.db.getContractArtifact(classId);
+      if (!artifact) {
+        throw new ContractClassNotFoundError(classId.toString());
+      }
+      const tree = new PrivateFunctionsTree(artifact);
+      this.contractClasses.set(classId.toString(), tree);
+    }
+    return this.contractClasses.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.
@@ -168,18 +191,8 @@ export class ContractDataOracle {
    * @returns A ContractTree instance associated with the specified contract address.
    * @throws An Error if the contract is not found in the ContractDatabase.
    */
-  private async getTree(contractAddress: AztecAddress): Promise<PrivateFunctionsTree> {
-    // TODO(@spalladino): ContractTree should refer to a class, not an instance!
-    let tree = this.trees.find(t => t.contract.instance.address.equals(contractAddress));
-    if (!tree) {
-      const contract = await this.db.getContract(contractAddress);
-      if (!contract) {
-        throw new ContractNotFoundError(contractAddress.toString());
-      }
-
-      tree = new PrivateFunctionsTree(contract);
-      this.trees.push(tree);
-    }
-    return tree;
+  private async getTreeForAddress(contractAddress: AztecAddress): Promise<PrivateFunctionsTree> {
+    const instance = await this.getContractInstance(contractAddress);
+    return this.getTreeForClassId(instance.contractClassId);
   }
 }

package/src/contract_data_oracle/private_functions_tree.ts

@@ -1,4 +1,3 @@
-import { ContractDao } from '@aztec/circuit-types';
 import {
   FUNCTION_TREE_HEIGHT,
   MembershipWitness,
@@ -7,7 +6,7 @@ import {
   getContractClassFromArtifact,
 } from '@aztec/circuits.js';
 import { MerkleTree } from '@aztec/circuits.js/merkle';
-import { FunctionSelector } from '@aztec/foundation/abi';
+import { ContractArtifact, FunctionSelector } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
 import { assertLength } from '@aztec/foundation/serialize';
 import { ContractClassWithId } from '@aztec/types/contracts';
@@ -20,15 +19,11 @@ import { ContractClassWithId } from '@aztec/types/contracts';
  */
 export class PrivateFunctionsTree {
   private tree?: MerkleTree;
-  private contractClass?: ContractClassWithId;
+  private contractClass: ContractClassWithId;
 
-  constructor(
-    /**
-     * The contract data object containing the artifact and contract address.
-     * TODO(@spalladino) Replace with contract class sourced from db.
-     */
-    public readonly contract: ContractDao,
-  ) {}
+  constructor(private readonly artifact: ContractArtifact) {
+    this.contractClass = getContractClassFromArtifact(artifact);
+  }
 
   /**
    * Retrieve the artifact of a given function.
@@ -39,12 +34,10 @@ export class PrivateFunctionsTree {
    * @returns The artifact object containing relevant information about the targeted function.
    */
   public getFunctionArtifact(selector: FunctionSelector) {
-    const artifact = this.contract.functions.find(f => f.selector.equals(selector));
+    const artifact = this.artifact.functions.find(f => selector.equals(f.name, f.parameters));
     if (!artifact) {
       throw new Error(
-        `Unknown function. Selector ${selector.toString()} not found in the artifact of contract ${this.contract.instance.address.toString()}. Expected one of: ${this.contract.functions
-          .map(f => `${f.name} (${f.selector.toString()})`)
-          .join(', ')}`,
+        `Unknown function. Selector ${selector.toString()} not found in the artifact with class ${this.getContractClassId().toString()}.`,
       );
     }
     return artifact;
@@ -75,12 +68,14 @@ export class PrivateFunctionsTree {
 
   /** Returns the contract class object. */
   public getContractClass() {
-    if (!this.contractClass) {
-      this.contractClass = getContractClassFromArtifact(this.contract);
-    }
     return this.contractClass;
   }
 
+  /** Returns the contract artifact. */
+  public getArtifact() {
+    return this.artifact;
+  }
+
   /**
    * Returns the contract class identifier for the given artifact.
    */

package/src/database/contracts/contract_instance_db.ts

@@ -15,4 +15,7 @@ export interface ContractInstanceDatabase {
    * @param address - Address of the contract.
    */
   getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
+
+  /** Returns the addresses all contract instances registered in the DB. */
+  getContractsAddresses(): Promise<AztecAddress[]>;
 }

package/src/database/kv_pxe_database.ts

@@ -1,4 +1,4 @@
-import { ContractDao, MerkleTreeId, NoteFilter, NoteStatus, PublicKey } from '@aztec/circuit-types';
+import { MerkleTreeId, NoteFilter, NoteStatus, PublicKey } from '@aztec/circuit-types';
 import { AztecAddress, CompleteAddress, Header } from '@aztec/circuits.js';
 import { ContractArtifact } from '@aztec/foundation/abi';
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
@@ -20,7 +20,6 @@ export class KVPxeDatabase implements PxeDatabase {
   #addressIndex: AztecMap<string, number>;
   #authWitnesses: AztecMap<string, Buffer[]>;
   #capsules: AztecArray<Buffer[]>;
-  #contracts: AztecMap<string, Buffer>;
   #notes: AztecMap<string, Buffer>;
   #nullifiedNotes: AztecMap<string, Buffer>;
   #nullifierToNoteId: AztecMap<string, string>;
@@ -47,7 +46,6 @@ export class KVPxeDatabase implements PxeDatabase {
 
     this.#authWitnesses = db.openMap('auth_witnesses');
     this.#capsules = db.openArray('capsules');
-    this.#contracts = db.openMap('contracts');
 
     this.#contractArtifacts = db.openMap('contract_artifacts');
     this.#contractInstances = db.openMap('contracts_instances');
@@ -73,11 +71,22 @@ export class KVPxeDatabase implements PxeDatabase {
     this.#deferredNotesByContract = db.openMultiMap('deferred_notes_by_contract');
   }
 
+  public async getContract(
+    address: AztecAddress,
+  ): Promise<(ContractInstanceWithAddress & ContractArtifact) | undefined> {
+    const instance = await this.getContractInstance(address);
+    const artifact = instance && (await this.getContractArtifact(instance?.contractClassId));
+    if (!instance || !artifact) {
+      return undefined;
+    }
+    return { ...instance, ...artifact };
+  }
+
   public async addContractArtifact(id: Fr, contract: ContractArtifact): Promise<void> {
     await this.#contractArtifacts.set(id.toString(), contractArtifactToBuffer(contract));
   }
 
-  getContractArtifact(id: Fr): Promise<ContractArtifact | undefined> {
+  public getContractArtifact(id: Fr): Promise<ContractArtifact | undefined> {
     const contract = this.#contractArtifacts.get(id.toString());
     // TODO(@spalladino): AztecMap lies and returns Uint8Arrays instead of Buffers, hence the extra Buffer.from.
     return Promise.resolve(contract && contractArtifactFromBuffer(Buffer.from(contract)));
@@ -95,6 +104,10 @@ export class KVPxeDatabase implements PxeDatabase {
     return Promise.resolve(contract && SerializableContractInstance.fromBuffer(contract).withAddress(address));
   }
 
+  getContractsAddresses(): Promise<AztecAddress[]> {
+    return Promise.resolve(Array.from(this.#contractInstances.keys()).map(AztecAddress.fromString));
+  }
+
   async addAuthWitness(messageHash: Fr, witness: Fr[]): Promise<void> {
     await this.#authWitnesses.set(
       messageHash.toString(),
@@ -393,17 +406,4 @@ export class KVPxeDatabase implements PxeDatabase {
 
     return notesSize + treeRootsSize + authWitsSize + addressesSize;
   }
-
-  async addContract(contract: ContractDao): Promise<void> {
-    await this.#contracts.set(contract.instance.address.toString(), contract.toBuffer());
-  }
-
-  getContract(address: AztecAddress): Promise<ContractDao | undefined> {
-    const contract = this.#contracts.get(address.toString());
-    return Promise.resolve(contract ? ContractDao.fromBuffer(contract) : undefined);
-  }
-
-  getContracts(): Promise<ContractDao[]> {
-    return Promise.resolve(Array.from(this.#contracts.values()).map(c => ContractDao.fromBuffer(c)));
-  }
 }

package/src/database/pxe_database.ts

@@ -1,7 +1,9 @@
-import { ContractDatabase, NoteFilter } from '@aztec/circuit-types';
+import { NoteFilter } from '@aztec/circuit-types';
 import { CompleteAddress, Header, PublicKey } from '@aztec/circuits.js';
+import { ContractArtifact } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
+import { ContractInstanceWithAddress } from '@aztec/types/contracts';
 
 import { ContractArtifactDatabase } from './contracts/contract_artifact_db.js';
 import { ContractInstanceDatabase } from './contracts/contract_instance_db.js';
@@ -12,7 +14,9 @@ import { NoteDao } from './note_dao.js';
  * A database interface that provides methods for retrieving, adding, and removing transactional data related to Aztec
  * addresses, storage slots, and nullifiers.
  */
-export interface PxeDatabase extends ContractDatabase, ContractArtifactDatabase, ContractInstanceDatabase {
+export interface PxeDatabase extends ContractArtifactDatabase, ContractInstanceDatabase {
+  getContract(address: AztecAddress): Promise<(ContractInstanceWithAddress & ContractArtifact) | undefined>;
+
   /**
    * Add a auth witness to the database.
    * @param messageHash - The message hash.

package/src/kernel_prover/kernel_prover.ts

@@ -185,12 +185,12 @@ export class KernelProver {
     >(output.publicInputs.end.newNullifiers);
 
     const readNoteHashHints = this.hintsBuilder.getNoteHashReadRequestHints(
-      output.publicInputs.end.noteHashReadRequests,
+      output.publicInputs.validationRequests.noteHashReadRequests,
       sortedNoteHashes,
     );
 
     const nullifierReadRequestHints = await this.hintsBuilder.getNullifierReadRequestHints(
-      output.publicInputs.end.nullifierReadRequests,
+      output.publicInputs.validationRequests.nullifierReadRequests,
       output.publicInputs.end.newNullifiers,
     );
 
@@ -200,7 +200,7 @@ export class KernelProver {
     );
 
     const masterNullifierSecretKeys = await this.hintsBuilder.getMasterNullifierSecretKeys(
-      output.publicInputs.end.nullifierKeyValidationRequests,
+      output.publicInputs.validationRequests.nullifierKeyValidationRequests,
     );
 
     this.log.debug(

package/src/pxe_http/pxe_http_server.ts

@@ -1,8 +1,6 @@
 import {
   AuthWitness,
   CompleteAddress,
-  ContractData,
-  ExtendedContractData,
   ExtendedNote,
   ExtendedUnencryptedL2Log,
   L2Block,
@@ -36,8 +34,6 @@ export function createPXERpcServer(pxeService: PXE): JsonRpcServer {
       CompleteAddress,
       AztecAddress,
       TxExecutionRequest,
-      ContractData,
-      ExtendedContractData,
       ExtendedUnencryptedL2Log,
       FunctionSelector,
       TxHash,

package/src/pxe_service/pxe_service.ts

@@ -1,10 +1,7 @@
 import {
   AuthWitness,
   AztecNode,
-  ContractDao,
-  ContractData,
   DeployedContract,
-  ExtendedContractData,
   ExtendedNote,
   FunctionCall,
   GetUnencryptedLogsResponse,
@@ -40,7 +37,7 @@ import {
   getContractClassFromArtifact,
 } from '@aztec/circuits.js';
 import { computeCommitmentNonce, siloNullifier } from '@aztec/circuits.js/hash';
-import { DecodedReturn, encodeArguments } from '@aztec/foundation/abi';
+import { DecodedReturn, FunctionSelector, encodeArguments } from '@aztec/foundation/abi';
 import { arrayNonEmptyLength, padArrayEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { SerialQueue } from '@aztec/foundation/fifo';
@@ -219,35 +216,25 @@ export class PXEService implements PXE {
   }
 
   public async addContracts(contracts: DeployedContract[]) {
-    const contractDaos = contracts.map(c => new ContractDao(c.artifact, c.instance));
-    await Promise.all(contractDaos.map(c => this.db.addContract(c)));
-    await this.addArtifactsAndInstancesFromDeployedContracts(contracts);
-    for (const contract of contractDaos) {
-      const instance = contract.instance;
-      const contractAztecAddress = instance.address;
-      const hasPortal = instance.portalContractAddress && !instance.portalContractAddress.isZero();
-      const portalInfo = hasPortal ? ` with portal ${instance.portalContractAddress.toChecksumString()}` : '';
-      this.log.info(`Added contract ${contract.name} at ${contractAztecAddress}${portalInfo}`);
-      await this.synchronizer.reprocessDeferredNotesForContract(contractAztecAddress);
-    }
-  }
-
-  private async addArtifactsAndInstancesFromDeployedContracts(contracts: DeployedContract[]) {
     for (const contract of contracts) {
-      const artifact = contract.artifact;
+      const { instance, artifact } = contract;
       const artifactHash = computeArtifactHash(artifact);
       const contractClassId = computeContractClassId(getContractClassFromArtifact({ ...artifact, artifactHash }));
       await this.db.addContractArtifact(contractClassId, artifact);
-      await this.db.addContractInstance(contract.instance);
+      await this.db.addContractInstance(instance);
+      const hasPortal = instance.portalContractAddress && !instance.portalContractAddress.isZero();
+      const portalInfo = hasPortal ? ` with portal ${instance.portalContractAddress.toChecksumString()}` : '';
+      this.log.info(`Added contract ${artifact.name} at ${instance.address.toString()}${portalInfo}`);
+      await this.synchronizer.reprocessDeferredNotesForContract(instance.address);
     }
   }
 
-  public async getContracts(): Promise<AztecAddress[]> {
-    return (await this.db.getContracts()).map(c => c.instance.address);
+  public getContracts(): Promise<AztecAddress[]> {
+    return this.db.getContractsAddresses();
   }
 
   public async getPublicStorageAt(contract: AztecAddress, slot: Fr) {
-    if ((await this.getContractData(contract)) === undefined) {
+    if (!(await this.getContractInstance(contract))) {
       throw new Error(`Contract ${contract.toString()} is not deployed`);
     }
     return await this.node.getPublicStorageAt(contract, slot);
@@ -382,9 +369,6 @@ export class PXEService implements PXE {
     if (!txRequest.functionData.isPrivate) {
       throw new Error(`Public entrypoints are not allowed`);
     }
-    if (txRequest.functionData.isInternal === undefined) {
-      throw new Error(`Unspecified internal are not allowed`);
-    }
 
     // all simulations must be serialized w.r.t. the synchronizer
     return await this.jobQueue.put(async () => {
@@ -443,14 +427,6 @@ export class PXEService implements PXE {
     return await this.node.getBlockNumber();
   }
 
-  public async getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined> {
-    return await this.node.getExtendedContractData(contractAddress);
-  }
-
-  public async getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
-    return await this.node.getContractData(contractAddress);
-  }
-
   /**
    * Gets unencrypted logs based on the provided filter.
    * @param filter - The filter to apply to the logs.
@@ -657,9 +633,13 @@ export class PXEService implements PXE {
         if (contract) {
           err.enrichWithContractName(parsedContractAddress, contract.name);
           selectors.forEach(selector => {
-            const functionArtifact = contract.functions.find(f => f.selector.toString() === selector);
+            const functionArtifact = contract.functions.find(f => FunctionSelector.fromString(selector).equals(f));
             if (functionArtifact) {
-              err.enrichWithFunctionName(parsedContractAddress, functionArtifact.selector, functionArtifact.name);
+              err.enrichWithFunctionName(
+                parsedContractAddress,
+                FunctionSelector.fromNameAndParameters(functionArtifact),
+                functionArtifact.name,
+              );
             }
           });
         }
@@ -749,4 +729,8 @@ export class PXEService implements PXE {
   public async isContractClassPubliclyRegistered(id: Fr): Promise<boolean> {
     return !!(await this.node.getContractClass(id));
   }
+
+  public async isContractPubliclyDeployed(address: AztecAddress): Promise<boolean> {
+    return !!(await this.node.getContract(address));
+  }
 }

package/src/pxe_service/test/pxe_test_suite.ts

@@ -119,7 +119,7 @@ export const pxeTestSuite = (testName: string, pxeSetup: () => Promise<PXE>) =>
       );
     });
 
-    // Note: Not testing `getExtendedContractData`, `getContractData` and `getUnencryptedLogs` here as these
+    // Note: Not testing `getContractData` and `getUnencryptedLogs` here as these
     //       functions only call AztecNode and these methods are frequently used by the e2e tests.
 
     it('successfully gets a block number', async () => {

package/src/simulator_oracle/index.ts

@@ -16,7 +16,7 @@ import {
   Header,
   L1_TO_L2_MSG_TREE_HEIGHT,
 } from '@aztec/circuits.js';
-import { FunctionArtifactWithDebugMetadata } from '@aztec/foundation/abi';
+import { FunctionArtifactWithDebugMetadata, getFunctionArtifactWithDebugMetadata } from '@aztec/foundation/abi';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { DBOracle, KeyPair, MessageLoadOracleInputs } from '@aztec/simulator';
 import { ContractInstance } from '@aztec/types/contracts';
@@ -111,16 +111,9 @@ export class SimulatorOracle implements DBOracle {
     contractAddress: AztecAddress,
     functionName: string,
   ): Promise<FunctionArtifactWithDebugMetadata | undefined> {
-    const artifact = await this.contractDataOracle.getFunctionArtifactByName(contractAddress, functionName);
-    if (!artifact) {
-      return;
-    }
-
-    const debug = await this.contractDataOracle.getFunctionDebugMetadata(contractAddress, artifact.selector);
-    return {
-      ...artifact,
-      debug,
-    };
+    const instance = await this.contractDataOracle.getContractInstance(contractAddress);
+    const artifact = await this.contractDataOracle.getContractArtifact(instance.contractClassId);
+    return artifact && getFunctionArtifactWithDebugMetadata(artifact, functionName);
   }
 
   async getPortalContractAddress(contractAddress: AztecAddress): Promise<EthAddress> {
@@ -136,9 +129,7 @@ export class SimulatorOracle implements DBOracle {
    *          index of the message in the l1ToL2MessageTree
    */
   async getL1ToL2MembershipWitness(entryKey: Fr): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>> {
-    const messageAndIndex = await this.aztecNode.getL1ToL2MessageAndIndex(entryKey);
-    const index = messageAndIndex.index;
-    const siblingPath = await this.aztecNode.getL1ToL2MessageSiblingPath('latest', index);
+    const [index, siblingPath] = await this.aztecNode.getL1ToL2MessageIndexAndSiblingPath('latest', entryKey);
     return new MessageLoadOracleInputs(index, siblingPath);
   }
 

package/dest/contract_database/index.d.ts

@@ -1,2 +0,0 @@
-export * from './memory_contract_database.js';
-//# sourceMappingURL=index.d.ts.map

package/dest/contract_database/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contract_database/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC"}

package/dest/contract_database/index.js

@@ -1,2 +0,0 @@
-export * from './memory_contract_database.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RfZGF0YWJhc2UvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYywrQkFBK0IsQ0FBQyJ9

package/dest/contract_database/memory_contract_database.d.ts

@@ -1,43 +0,0 @@
-import { ContractDao, ContractDatabase } from '@aztec/circuit-types';
-import { FunctionSelector } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { DebugLogger } from '@aztec/foundation/log';
-/**
- * The MemoryContractDatabase class serves as an in-memory implementation of the ContractDatabase interface.
- * It allows for storing and retrieving contract data, such as ContractDao objects and associated function bytecodes,
- * within a contracts array. This class is particularly useful for testing and development purposes where a
- * persistent storage may not be required.
- */
-export declare class MemoryContractDatabase implements ContractDatabase {
-    protected log: DebugLogger;
-    private contracts;
-    constructor(log: DebugLogger);
-    /**
-     * Adds a new ContractDao instance to the memory-based contract database.
-     * The function stores the contract in an array and returns a resolved promise indicating successful addition.
-     *
-     * @param contract - The ContractDao instance to be added to the memory database.
-     * @returns A Promise that resolves when the contract is successfully added.
-     */
-    addContract(contract: ContractDao): Promise<void>;
-    /**
-     * Retrieve a ContractDao instance with the specified AztecAddress from the in-memory contracts list.
-     * Returns the first match found or undefined if no contract with the given address is found.
-     *
-     * @param address - The AztecAddress to search for in the stored contracts.
-     * @returns A Promise resolving to the ContractDao instance matching the given address or undefined.
-     */
-    getContract(address: AztecAddress): Promise<ContractDao | undefined>;
-    getContracts(): Promise<ContractDao[]>;
-    /**
-     * Retrieve the bytecode associated with a given contract address and function selector.
-     * This function searches through the stored contracts to find a matching contract and function,
-     * then returns the corresponding bytecode. If no match is found, it returns undefined.
-     *
-     * @param contractAddress - The AztecAddress representing the contract address to look for.
-     * @param selector - The function selector.
-     * @returns A Promise that resolves to the bytecode of the matching function or undefined if not found.
-     */
-    getCode(contractAddress: AztecAddress, selector: FunctionSelector): Promise<string | undefined>;
-}
-//# sourceMappingURL=memory_contract_database.d.ts.map

package/dest/contract_database/memory_contract_database.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"memory_contract_database.d.ts","sourceRoot":"","sources":["../../src/contract_database/memory_contract_database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD;;;;;GAKG;AACH,qBAAa,sBAAuB,YAAW,gBAAgB;IAGjD,SAAS,CAAC,GAAG,EAAE,WAAW;IAFtC,OAAO,CAAC,SAAS,CAAqB;gBAEhB,GAAG,EAAE,WAAW;IAEtC;;;;;;OAMG;IACI,WAAW,CAAC,QAAQ,EAAE,WAAW;IAMxC;;;;;;OAMG;IACI,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAIpE,YAAY,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAI7C;;;;;;;;OAQG;IACU,OAAO,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB;CAI/E"}