WIP

yarn-project/Dockerfile

@@ -8,7 +8,7 @@ COPY . .
 
 # Generate Noir contract TypeScript artifacts.
 COPY --from=noir /usr/src/yarn-project/noir-contracts/target /usr/src/yarn-project/noir-contracts/target
-# Run yarn build to have the json ABIs available for the types generator, generate types, build again.
+# Run yarn build to have the json artifacts available for the types generator, generate types, build again.
 RUN apk add perl
 RUN cd /usr/src/yarn-project/noir-contracts && yarn build && ./scripts/types_all.sh && yarn build
 # Cleanup to reduce final image size.

yarn-project/acir-simulator/src/client/client_execution_context.ts

@@ -306,8 +306,8 @@ export class ClientExecutionContext extends ViewDataOracle {
       `Calling private function ${this.contractAddress}:${functionSelector} from ${this.callContext.storageContractAddress}`,
     );
 
-    const targetAbi = await this.db.getFunctionABI(targetContractAddress, functionSelector);
-    const targetFunctionData = FunctionData.fromAbi(targetAbi);
+    const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
+    const targetFunctionData = FunctionData.fromAbi(targetArtifact);
 
     const derivedTxContext = new TxContext(
       false,
@@ -318,7 +318,7 @@ export class ClientExecutionContext extends ViewDataOracle {
       this.txContext.version,
     );
 
-    const derivedCallContext = await this.deriveCallContext(targetContractAddress, targetAbi, false, false);
+    const derivedCallContext = await this.deriveCallContext(targetContractAddress, targetArtifact, false, false);
 
     const context = new ClientExecutionContext(
       targetContractAddress,
@@ -336,7 +336,7 @@ export class ClientExecutionContext extends ViewDataOracle {
 
     const childExecutionResult = await executePrivateFunction(
       context,
-      targetAbi,
+      targetArtifact,
       targetContractAddress,
       targetFunctionData,
     );
@@ -360,14 +360,14 @@ export class ClientExecutionContext extends ViewDataOracle {
     functionSelector: FunctionSelector,
     argsHash: Fr,
   ): Promise<PublicCallRequest> {
-    const targetAbi = await this.db.getFunctionABI(targetContractAddress, functionSelector);
-    const derivedCallContext = await this.deriveCallContext(targetContractAddress, targetAbi, false, false);
+    const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
+    const derivedCallContext = await this.deriveCallContext(targetContractAddress, targetArtifact, false, false);
     const args = this.packedArgsCache.unpack(argsHash);
     const sideEffectCounter = this.sideEffectCounter.count();
     const enqueuedRequest = PublicCallRequest.from({
       args,
       callContext: derivedCallContext,
-      functionData: FunctionData.fromAbi(targetAbi),
+      functionData: FunctionData.fromAbi(targetArtifact),
       contractAddress: targetContractAddress,
       sideEffectCounter,
     });
@@ -388,14 +388,14 @@ export class ClientExecutionContext extends ViewDataOracle {
   /**
    * Derives the call context for a nested execution.
    * @param targetContractAddress - The address of the contract being called.
-   * @param targetAbi - The ABI of the function being called.
+   * @param targetArtifact - The artifact of the function being called.
    * @param isDelegateCall - Whether the call is a delegate call.
    * @param isStaticCall - Whether the call is a static call.
    * @returns The derived call context.
    */
   private async deriveCallContext(
     targetContractAddress: AztecAddress,
-    targetAbi: FunctionArtifact,
+    targetArtifact: FunctionArtifact,
     isDelegateCall = false,
     isStaticCall = false,
   ) {
@@ -404,7 +404,7 @@ export class ClientExecutionContext extends ViewDataOracle {
       this.contractAddress,
       targetContractAddress,
       portalContractAddress,
-      FunctionSelector.fromNameAndParameters(targetAbi.name, targetAbi.parameters),
+      FunctionSelector.fromNameAndParameters(targetArtifact.name, targetArtifact.parameters),
       isDelegateCall,
       isStaticCall,
       false,

yarn-project/acir-simulator/src/client/db_oracle.ts

@@ -8,9 +8,9 @@ import { NoteData } from '../acvm/index.js';
 import { CommitmentsDB } from '../public/index.js';
 
 /**
- * A function ABI with optional debug metadata
+ * A function artifact with optional debug metadata
  */
-export interface FunctionAbiWithDebugMetadata extends FunctionArtifact {
+export interface FunctionArtifactWithDebugMetadata extends FunctionArtifact {
   /**
    * Debug metadata for the function.
    */
@@ -59,14 +59,17 @@ export interface DBOracle extends CommitmentsDB {
   getNotes(contractAddress: AztecAddress, storageSlot: Fr): Promise<NoteData[]>;
 
   /**
-   * Retrieve the ABI information of a specific function within a contract.
+   * Retrieve the artifact information of a specific function within a contract.
    * The function is identified by its selector, which is a unique identifier generated from the function signature.
    *
    * @param contractAddress - The contract address.
    * @param selector - The corresponding function selector.
-   * @returns A Promise that resolves to a FunctionAbi object containing the ABI information of the target function.
+   * @returns A Promise that resolves to a FunctionArtifact object containing the ARTIFACT information of the target function.
    */
-  getFunctionABI(contractAddress: AztecAddress, selector: FunctionSelector): Promise<FunctionAbiWithDebugMetadata>;
+  getFunctionArtifact(
+    contractAddress: AztecAddress,
+    selector: FunctionSelector,
+  ): Promise<FunctionArtifactWithDebugMetadata>;
 
   /**
    * Retrieves the portal contract address associated with the given contract address.