@aztec/aztec.js 0.0.1-commit.24de95ac → 0.0.1-commit.3469e52

package/src/api/account.ts

@@ -1,6 +1,13 @@
-export { type AccountContract, type AccountInterface, type Salt, getAccountContractAddress } from '../account/index.js';
+export {
+  type Account,
+  type AccountContract,
+  AccountWithSecretKey,
+  BaseAccount,
+  type AuthorizationProvider,
+  getAccountContractAddress,
+  type Salt,
+} from '../account/index.js';
 export type { AuthWitnessProvider, ChainInfo } from '@aztec/entrypoints/interfaces';
+export { ChainInfoSchema } from '@aztec/entrypoints/interfaces';
 
-export { AccountWithSecretKey } from '../account/account_with_secret_key.js';
-export { type Account, BaseAccount } from '../account/account.js';
 export { SignerlessAccount } from '../account/signerless_account.js';

package/src/api/authorization.ts

@@ -2,6 +2,7 @@ export { AuthWitness } from '@aztec/stdlib/auth-witness';
 export {
   SetPublicAuthwitContractInteraction,
   type ContractFunctionInteractionCallIntent,
+  isContractFunctionInteractionCallIntent,
   getMessageHashFromIntent,
   computeAuthWitMessageHash,
   computeInnerAuthWitHashFromAction,

package/src/api/block.ts

@@ -1,2 +1,2 @@
-export { Body, L2Block } from '@aztec/stdlib/block';
+export { Body, L2BlockNew } from '@aztec/stdlib/block';
 export { getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';

package/src/api/contract.ts

@@ -15,7 +15,7 @@
  * ```
  *
  * ```ts
- * const contract = await Contract.at(address, MyContractArtifact, wallet);
+ * const contract = Contract.at(address, MyContractArtifact, wallet);
  * await contract.methods.mint(1000, owner).send().wait();
  * console.log(`Total supply is now ${await contract.methods.totalSupply().simulate()}`);
  * ```
@@ -44,6 +44,7 @@ export {
   type ProfileInteractionOptions,
   type SimulateInteractionOptions,
   type InteractionFeeOptions,
+  type GasSettingsOption,
   toProfileOptions,
   toSendOptions,
   toSimulateOptions,

package/src/api/fields.ts

@@ -1 +1,2 @@
-export { Point, Fr, Fq, GrumpkinScalar } from '@aztec/foundation/fields';
+export { Fr, Fq } from '@aztec/foundation/curves/bn254';
+export { GrumpkinScalar, Point } from '@aztec/foundation/curves/grumpkin';

package/src/api/note.ts

@@ -1 +1 @@
-export { UniqueNote, Comparator, Note } from '@aztec/stdlib/note';
+export { Comparator, Note } from '@aztec/stdlib/note';

package/src/api/protocol.ts

@@ -1,2 +1,9 @@
 export { ProtocolContractAddress } from '@aztec/protocol-contracts';
 export { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+
+export { AuthRegistryContract } from '../contract/protocol_contracts/auth-registry.js';
+export { ContractClassRegistryContract } from '../contract/protocol_contracts/contract-class-registry.js';
+export { ContractInstanceRegistryContract } from '../contract/protocol_contracts/contract-instance-registry.js';
+export { FeeJuiceContract } from '../contract/protocol_contracts/fee-juice.js';
+export { MultiCallEntrypointContract } from '../contract/protocol_contracts/multi-call-entrypoint.js';
+export { PublicChecksContract } from '../contract/protocol_contracts/public-checks.js';

package/src/api/tx.ts

@@ -8,4 +8,6 @@ export {
   HashedValues,
   GlobalVariables,
   TxProfileResult,
+  ExecutionPayload,
+  mergeExecutionPayloads,
 } from '@aztec/stdlib/tx';

package/src/api/wallet.ts

@@ -1,7 +1,5 @@
 export {
   type Aliased,
-  type ContractInstanceAndArtifact,
-  type UserFeeOptions,
   type SimulateOptions,
   type ProfileOptions,
   type SendOptions,
@@ -11,25 +9,23 @@ export {
   type BatchedMethodResultWrapper,
   type BatchResults,
   type Wallet,
-  ContractInstantiationDataSchema,
+  type PrivateEvent,
+  type PrivateEventFilter,
   FunctionCallSchema,
   ExecutionPayloadSchema,
-  UserFeeOptionsSchema,
+  GasSettingsOptionSchema,
   WalletSimulationFeeOptionSchema,
   SendOptionsSchema,
   SimulateOptionsSchema,
   ProfileOptionsSchema,
-  InstanceDataSchema,
   MessageHashOrIntentSchema,
   BatchedMethodSchema,
-  ContractMetadataSchema,
-  ContractClassMetadataSchema,
   EventMetadataDefinitionSchema,
+  PrivateEventSchema,
+  PrivateEventFilterSchema,
   WalletSchema,
 } from '../wallet/wallet.js';
 
-export { type FeeOptions, BaseWallet } from '../wallet/base_wallet.js';
-
 export { AccountManager } from '../wallet/account_manager.js';
 
 export { type DeployAccountOptions, DeployAccountMethod } from '../wallet/deploy_account_method.js';

package/src/authorization/call_authorization_request.ts

@@ -1,4 +1,4 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { FieldReader } from '@aztec/foundation/serialize';
 import { AuthorizationSelector, FunctionSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';

package/src/contract/base_contract_interaction.ts

@@ -1,7 +1,6 @@
-import type { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { createLogger } from '@aztec/foundation/log';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
-import type { Capsule } from '@aztec/stdlib/tx';
+import type { Capsule, ExecutionPayload } from '@aztec/stdlib/tx';
 
 import type { Wallet } from '../wallet/wallet.js';
 import { type RequestInteractionOptions, type SendInteractionOptions, toSendOptions } from './interaction_options.js';
@@ -42,7 +41,7 @@ export abstract class BaseContractInteraction {
     // docs:end:send
     const sendTx = async () => {
       const executionPayload = await this.request(options);
-      const sendOptions = await toSendOptions(options);
+      const sendOptions = toSendOptions(options);
       return this.wallet.sendTx(executionPayload, sendOptions);
     };
     return new SentTx(this.wallet, sendTx);

package/src/contract/batch_call.ts

@@ -1,7 +1,12 @@
-import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/entrypoints/payload';
 import { type FunctionCall, FunctionType, decodeFromAbi } from '@aztec/stdlib/abi';
+import {
+  ExecutionPayload,
+  TxSimulationResult,
+  UtilitySimulationResult,
+  mergeExecutionPayloads,
+} from '@aztec/stdlib/tx';
 
-import type { Wallet } from '../wallet/wallet.js';
+import type { BatchedMethod, Wallet } from '../wallet/wallet.js';
 import { BaseContractInteraction } from './base_contract_interaction.js';
 import {
   type RequestInteractionOptions,
@@ -10,6 +15,7 @@ import {
 } from './interaction_options.js';
 
 /** A batch of function calls to be sent as a single transaction through a wallet. */
+// docs:start:batch_call_class
 export class BatchCall extends BaseContractInteraction {
   constructor(
     wallet: Wallet,
@@ -17,6 +23,7 @@ export class BatchCall extends BaseContractInteraction {
   ) {
     super(wallet);
   }
+  // docs:end:batch_call_class
 
   /**
    * Returns an execution request that represents this operation.
@@ -35,13 +42,12 @@ export class BatchCall extends BaseContractInteraction {
   }
 
   /**
-   * Simulate a transaction and get its return values
-   * Differs from prove in a few important ways:
-   * 1. It returns the values of the function execution
-   * 2. It supports `utility`, `private` and `public` functions
-   *
-   * @param options - An optional object containing additional configuration for the transaction.
-   * @returns The result of the transaction as returned by the contract function.
+   * Simulates the batch, supporting private, public and utility functions. Although this is a single
+   * interaction with the wallet, private and public functions will be grouped into a single ExecutionPayload
+   * that the wallet will simulate as a single transaction. Utility function calls will simply be executed
+   * one by one.
+   * @param options - An optional object containing additional configuration for the interaction.
+   * @returns The results of all the interactions that make up the batch
    */
   public async simulate(options: SimulateInteractionOptions): Promise<any> {
     const { indexedExecutionPayloads, utility } = (await this.getExecutionPayloads()).reduce<{
@@ -70,52 +76,65 @@ export class BatchCall extends BaseContractInteraction {
       { indexedExecutionPayloads: [], utility: [], publicIndex: 0, privateIndex: 0 },
     );
 
-    const payloads = indexedExecutionPayloads.map(([request]) => request);
-    const combinedPayload = mergeExecutionPayloads(payloads);
-    const executionPayload = new ExecutionPayload(
-      combinedPayload.calls,
-      combinedPayload.authWitnesses.concat(options.authWitnesses ?? []),
-      combinedPayload.capsules.concat(options.capsules ?? []),
-      combinedPayload.extraHashedArgs,
-    );
+    const batchRequests: BatchedMethod[] = [];
+
+    // Add utility calls to batch
+    for (const [call] of utility) {
+      batchRequests.push({
+        name: 'simulateUtility' as const,
+        args: [call, options?.authWitnesses],
+      });
+    }
 
-    const utilityBatchPromise =
-      utility.length > 0
-        ? this.wallet.batch(
-            utility.map(([call]) => ({
-              name: 'simulateUtility' as const,
-              args: [call.name, call.args, call.to, options?.authWitnesses] as const,
-            })),
-          )
-        : Promise.resolve([]);
+    // Add tx simulation to batch if there are any private/public calls
+    if (indexedExecutionPayloads.length > 0) {
+      const payloads = indexedExecutionPayloads.map(([request]) => request);
+      const combinedPayload = mergeExecutionPayloads(payloads);
+      const executionPayload = new ExecutionPayload(
+        combinedPayload.calls,
+        combinedPayload.authWitnesses.concat(options.authWitnesses ?? []),
+        combinedPayload.capsules.concat(options.capsules ?? []),
+        combinedPayload.extraHashedArgs,
+      );
 
-    const [utilityBatchResults, simulatedTx] = await Promise.all([
-      utilityBatchPromise,
-      indexedExecutionPayloads.length > 0
-        ? this.wallet.simulateTx(executionPayload, await toSimulateOptions(options))
-        : Promise.resolve(),
-    ]);
+      batchRequests.push({
+        name: 'simulateTx' as const,
+        args: [executionPayload, toSimulateOptions(options)],
+      });
+    }
+
+    const batchResults = batchRequests.length > 0 ? await this.wallet.batch(batchRequests) : [];
 
     const results: any[] = [];
 
-    utilityBatchResults.forEach((wrappedResult, utilityIndex) => {
-      const [, originalIndex] = utility[utilityIndex];
-      results[originalIndex] = wrappedResult.result.result;
-    });
+    // Process utility results (they come first in batch results)
+    for (let i = 0; i < utility.length; i++) {
+      const [call, resultIndex] = utility[i];
+      const wrappedResult = batchResults[i];
+      if (wrappedResult.name === 'simulateUtility') {
+        const rawReturnValues = (wrappedResult.result as UtilitySimulationResult).result;
+        results[resultIndex] = rawReturnValues ? decodeFromAbi(call.returnTypes, rawReturnValues) : [];
+      }
+    }
 
-    if (simulatedTx) {
-      indexedExecutionPayloads.forEach(([request, callIndex, resultIndex]) => {
-        const call = request.calls[0];
-        // As account entrypoints are private, for private functions we retrieve the return values from the first nested call
-        // since we're interested in the first set of values AFTER the account entrypoint
-        // For public functions we retrieve the first values directly from the public output.
-        const rawReturnValues =
-          call.type == FunctionType.PRIVATE
-            ? simulatedTx.getPrivateReturnValues()?.nested?.[resultIndex].values
-            : simulatedTx.getPublicReturnValues()?.[resultIndex].values;
+    // Process tx simulation result (it comes last if present)
+    if (indexedExecutionPayloads.length > 0) {
+      const txResultWrapper = batchResults[utility.length];
+      if (txResultWrapper.name === 'simulateTx') {
+        const simulatedTx = txResultWrapper.result as TxSimulationResult;
+        indexedExecutionPayloads.forEach(([request, callIndex, resultIndex]) => {
+          const call = request.calls[0];
+          // As account entrypoints are private, for private functions we retrieve the return values from the first nested call
+          // since we're interested in the first set of values AFTER the account entrypoint
+          // For public functions we retrieve the first values directly from the public output.
+          const rawReturnValues =
+            call.type == FunctionType.PRIVATE
+              ? simulatedTx.getPrivateReturnValues()?.nested?.[resultIndex].values
+              : simulatedTx.getPublicReturnValues()?.[resultIndex].values;
 
-        results[callIndex] = rawReturnValues ? decodeFromAbi(call.returnTypes, rawReturnValues) : [];
-      });
+          results[callIndex] = rawReturnValues ? decodeFromAbi(call.returnTypes, rawReturnValues) : [];
+        });
+      }
     }
 
     return results;

package/src/contract/contract.ts

@@ -1,5 +1,6 @@
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import { PublicKeys } from '@aztec/stdlib/keys';
 
 import type { Wallet } from '../wallet/wallet.js';
@@ -21,9 +22,8 @@ export class Contract extends ContractBase {
    * @param wallet - The wallet to use when interacting with the contract.
    * @returns A promise that resolves to a new Contract instance.
    */
-  public static async at(address: AztecAddress, artifact: ContractArtifact, wallet: Wallet): Promise<Contract> {
-    const instance = await wallet.registerContract(address, artifact);
-    return new Contract(instance, artifact, wallet);
+  public static at(address: AztecAddress, artifact: ContractArtifact, wallet: Wallet): Contract {
+    return new Contract(address, artifact, wallet);
   }
 
   /**
@@ -34,7 +34,8 @@ export class Contract extends ContractBase {
    * @param constructorName - The name of the constructor function to call.
    */
   public static deploy(wallet: Wallet, artifact: ContractArtifact, args: any[], constructorName?: string) {
-    const postDeployCtor = (address: AztecAddress, wallet: Wallet) => Contract.at(address, artifact, wallet);
+    const postDeployCtor = (instance: ContractInstanceWithAddress, wallet: Wallet) =>
+      Contract.at(instance.address, artifact, wallet);
     return new DeployMethod(PublicKeys.default(), wallet, artifact, postDeployCtor, args, constructorName);
   }
 
@@ -54,7 +55,8 @@ export class Contract extends ContractBase {
     args: any[],
     constructorName?: string,
   ) {
-    const postDeployCtor = (address: AztecAddress, wallet: Wallet) => Contract.at(address, artifact, wallet);
+    const postDeployCtor = (instance: ContractInstanceWithAddress, wallet: Wallet) =>
+      Contract.at(instance.address, artifact, wallet);
     return new DeployMethod(publicKeys, wallet, artifact, postDeployCtor, args, constructorName);
   }
 }

package/src/contract/contract_base.ts

@@ -5,7 +5,7 @@ import {
   FunctionSelector,
   getAllFunctionAbis,
 } from '@aztec/stdlib/abi';
-import { type ContractInstanceWithAddress, computePartialAddress } from '@aztec/stdlib/contract';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 
 import type { Wallet } from '../wallet/wallet.js';
 import { ContractFunctionInteraction } from './contract_function_interaction.js';
@@ -38,8 +38,8 @@ export class ContractBase {
   public methods: { [name: string]: ContractMethod } = {};
 
   protected constructor(
-    /** The deployed contract instance definition. */
-    public readonly instance: ContractInstanceWithAddress,
+    /** The contract's address. */
+    public readonly address: AztecAddress,
     /** The Application Binary Interface for the contract. */
     public readonly artifact: ContractArtifact,
     /** The wallet used for interacting with this contract. */
@@ -47,7 +47,7 @@ export class ContractBase {
   ) {
     getAllFunctionAbis(artifact).forEach((f: FunctionAbi) => {
       const interactionFunction = (...args: any[]) => {
-        return new ContractFunctionInteraction(this.wallet, this.instance.address, f, args);
+        return new ContractFunctionInteraction(this.wallet, this.address, f, args);
       };
 
       this.methods[f.name] = Object.assign(interactionFunction, {
@@ -62,22 +62,12 @@ export class ContractBase {
     });
   }
 
-  /** Address of the contract. */
-  public get address() {
-    return this.instance.address;
-  }
-
-  /** Partial address of the contract. */
-  public get partialAddress() {
-    return computePartialAddress(this.instance);
-  }
-
   /**
    * Creates a new instance of the contract wrapper attached to a different wallet.
    * @param wallet - Wallet to use for sending txs.
    * @returns A new contract instance.
    */
   public withWallet(wallet: Wallet): this {
-    return new ContractBase(this.instance, this.artifact, wallet) as this;
+    return new ContractBase(this.address, this.artifact, wallet) as this;
   }
 }

package/src/contract/contract_function_interaction.ts

@@ -1,8 +1,8 @@
-import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/entrypoints/payload';
 import { type FunctionAbi, FunctionSelector, FunctionType, decodeFromAbi, encodeArguments } from '@aztec/stdlib/abi';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type Capsule, type HashedValues, type TxProfileResult, collectOffchainEffects } from '@aztec/stdlib/tx';
+import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/stdlib/tx';
 
 import type { Wallet } from '../wallet/wallet.js';
 import { BaseContractInteraction } from './base_contract_interaction.js';
@@ -103,25 +103,24 @@ export class ContractFunctionInteraction extends BaseContractInteraction {
   ): Promise<SimulationReturn<typeof options.includeMetadata>> {
     // docs:end:simulate
     if (this.functionDao.functionType == FunctionType.UTILITY) {
-      const utilityResult = await this.wallet.simulateUtility(
-        this.functionDao.name,
-        this.args,
-        this.contractAddress,
-        options.authWitnesses ?? [],
-      );
+      const call = await this.getFunctionCall();
+      const utilityResult = await this.wallet.simulateUtility(call, options.authWitnesses ?? []);
+
+      // Decode the raw field elements to the actual return type
+      const returnValue = utilityResult.result ? decodeFromAbi(this.functionDao.returnTypes, utilityResult.result) : [];
 
       if (options.includeMetadata) {
         return {
           stats: utilityResult.stats,
-          result: utilityResult.result,
+          result: returnValue,
         };
       } else {
-        return utilityResult.result;
+        return returnValue;
       }
     }
 
     const executionPayload = await this.request(options);
-    const simulatedTx = await this.wallet.simulateTx(executionPayload, await toSimulateOptions(options));
+    const simulatedTx = await this.wallet.simulateTx(executionPayload, toSimulateOptions(options));
 
     let rawReturnValues;
     if (this.functionDao.functionType == FunctionType.PRIVATE) {
@@ -168,7 +167,7 @@ export class ContractFunctionInteraction extends BaseContractInteraction {
     }
 
     const executionPayload = await this.request(options);
-    return await this.wallet.profileTx(executionPayload, await toProfileOptions(options));
+    return await this.wallet.profileTx(executionPayload, toProfileOptions(options));
   }
 
   /**

package/src/contract/deploy_method.ts

@@ -1,5 +1,4 @@
-import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/entrypoints/payload';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { type ContractArtifact, type FunctionAbi, type FunctionArtifact, getInitializer } from '@aztec/stdlib/abi';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -11,12 +10,12 @@ import {
 } from '@aztec/stdlib/contract';
 import type { PublicKeys } from '@aztec/stdlib/keys';
 import { type Capsule, type TxProfileResult, collectOffchainEffects } from '@aztec/stdlib/tx';
+import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/stdlib/tx';
 
 import { publishContractClass } from '../deployment/publish_class.js';
 import { publishInstance } from '../deployment/publish_instance.js';
 import type { Wallet } from '../wallet/wallet.js';
 import { BaseContractInteraction } from './base_contract_interaction.js';
-import type { Contract } from './contract.js';
 import type { ContractBase } from './contract_base.js';
 import { ContractFunctionInteraction } from './contract_function_interaction.js';
 import { DeploySentTx } from './deploy_sent_tx.js';
@@ -51,6 +50,8 @@ export type RequestDeployOptions = RequestInteractionOptions & {
   skipInstancePublication?: boolean;
   /** Skip contract initialization. */
   skipInitialization?: boolean;
+  /** Skip contract registration in the wallet */
+  skipRegistration?: boolean;
 };
 
 /**
@@ -63,8 +64,6 @@ export type DeployOptions = Omit<RequestDeployOptions, 'deployer'> & {
    */
   universalDeploy?: boolean;
 } & Pick<SendInteractionOptions, 'from' | 'fee'>;
-// docs:end:deploy_options
-// TODO(@spalladino): Add unit tests for this class!
 
 /**
  * Options for simulating the deployment of a contract
@@ -96,7 +95,7 @@ export type SimulateDeployOptions = Omit<DeployOptions, 'fee'> & {
  *
  * Extends the BaseContractInteraction class.
  */
-export class DeployMethod<TContract extends ContractBase = Contract> extends BaseContractInteraction {
+export class DeployMethod<TContract extends ContractBase = ContractBase> extends BaseContractInteraction {
   /** The contract instance to be deployed. */
   private instance?: ContractInstanceWithAddress = undefined;
 
@@ -107,7 +106,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
     private publicKeys: PublicKeys,
     wallet: Wallet,
     protected artifact: ContractArtifact,
-    protected postDeployCtor: (address: AztecAddress, wallet: Wallet) => Promise<TContract>,
+    protected postDeployCtor: (instance: ContractInstanceWithAddress, wallet: Wallet) => TContract,
     private args: any[] = [],
     constructorNameOrArtifact?: string | FunctionArtifact,
     authWitnesses: AuthWitness[] = [],
@@ -125,7 +124,9 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
   public async request(options?: RequestDeployOptions): Promise<ExecutionPayload> {
     const publication = await this.getPublicationExecutionPayload(options);
 
-    await this.wallet.registerContract(await this.getInstance(options), this.artifact);
+    if (!options?.skipRegistration) {
+      await this.wallet.registerContract(await this.getInstance(options), this.artifact);
+    }
 
     const initialization = await this.getInitializationExecutionPayload(options);
     const feeExecutionPayload = options?.fee?.paymentMethod
@@ -155,7 +156,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
   public async register(options?: RequestDeployOptions): Promise<TContract> {
     const instance = await this.getInstance(options);
     await this.wallet.registerContract(instance, this.artifact);
-    return this.postDeployCtor(instance.address, this.wallet);
+    return this.postDeployCtor(instance, this.wallet);
   }
 
   /**
@@ -183,16 +184,17 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
 
     // Publish the contract class if it hasn't been published already.
     if (!options?.skipClassPublication) {
-      if ((await this.wallet.getContractClassMetadata(contractClass.id)).isContractClassPubliclyRegistered) {
-        this.log.debug(
-          `Skipping publication of already-registered contract class ${contractClass.id.toString()} for ${instance.address.toString()}`,
-        );
-      } else {
+      const classMetadata = await this.wallet.getContractClassMetadata(contractClass.id);
+      if (!classMetadata.isContractClassPubliclyRegistered) {
         this.log.info(
           `Creating request for publishing contract class ${contractClass.id.toString()} as part of deployment for ${instance.address.toString()}`,
         );
         const registerContractClassInteraction = await publishContractClass(this.wallet, this.artifact);
         calls.push(await registerContractClassInteraction.request());
+      } else {
+        this.log.debug(
+          `Skipping contract class publication for ${contractClass.id.toString()} as it is already registered`,
+        );
       }
     }
 
@@ -201,7 +203,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
       // TODO(https://github.com/AztecProtocol/aztec-packages/issues/15596):
       // Read the artifact, and if there are no public functions, warn the caller that publication of the
       // contract instance is not necessary (until such time as they wish to update the instance (i.e. change its class_id)).
-      const deploymentInteraction = await publishInstance(this.wallet, instance);
+      const deploymentInteraction = publishInstance(this.wallet, instance);
       calls.push(await deploymentInteraction.request());
     }
 
@@ -239,7 +241,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
   public override send(options: DeployOptions): DeploySentTx<TContract> {
     const sendTx = async () => {
       const executionPayload = await this.request(this.convertDeployOptionsToRequestOptions(options));
-      const sendOptions = await toSendOptions(options);
+      const sendOptions = toSendOptions(options);
       return this.wallet.sendTx(executionPayload, sendOptions);
     };
     this.log.debug(`Sent deployment tx of ${this.artifact.name} contract`);
@@ -274,7 +276,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
    */
   public async simulate(options: SimulateDeployOptions): Promise<SimulationReturn<true>> {
     const executionPayload = await this.request(this.convertDeployOptionsToRequestOptions(options));
-    const simulatedTx = await this.wallet.simulateTx(executionPayload, await toSimulateOptions(options));
+    const simulatedTx = await this.wallet.simulateTx(executionPayload, toSimulateOptions(options));
 
     const { gasLimits, teardownGasLimits } = getGasLimits(simulatedTx, options.fee?.estimatedGasPadding);
     this.log.verbose(
@@ -297,7 +299,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
   public async profile(options: DeployOptions & ProfileInteractionOptions): Promise<TxProfileResult> {
     const executionPayload = await this.request(this.convertDeployOptionsToRequestOptions(options));
     return await this.wallet.profileTx(executionPayload, {
-      ...(await toProfileOptions(options)),
+      ...toProfileOptions(options),
       profileMode: options.profileMode,
       skipProofGeneration: options.skipProofGeneration,
     });