@aztec/cli-wallet 0.0.1-commit.fffb133c → 0.0.1-dev

package/dest/utils/wallet.js

@@ -1,10 +1,13 @@
 import { EcdsaRAccountContract, EcdsaRSSHAccountContract } from '@aztec/accounts/ecdsa';
 import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
-import { StubAccountContractArtifact, createStubAccount } from '@aztec/accounts/stub';
+import { StubEcdsaAccountContractArtifact, createStubEcdsaAccount } from '@aztec/accounts/stub/ecdsa';
+import { StubSchnorrAccountContractArtifact, createStubSchnorrAccount } from '@aztec/accounts/stub/schnorr';
 import { getIdentities } from '@aztec/accounts/utils';
-import { SignerlessAccount } from '@aztec/aztec.js/account';
+import { NO_FROM } from '@aztec/aztec.js/account';
 import { getContractInstanceFromInstantiationParams, getGasLimits } from '@aztec/aztec.js/contracts';
 import { AccountManager } from '@aztec/aztec.js/wallet';
+import { TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
+import { DefaultEntrypoint } from '@aztec/entrypoints/default';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { createPXE, getPXEConfig } from '@aztec/pxe/server';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -28,33 +31,42 @@ export class CLIWallet extends BaseWallet {
     }
     async getAccounts() {
         const accounts = await this.db?.listAliases('accounts') ?? [];
-        return Promise.resolve(accounts.map(({ key, value })=>({
-                alias: value,
-                item: AztecAddress.fromString(key)
-            })));
+        return Promise.resolve(accounts.map(({ key, value })=>{
+            const alias = key.includes(':') ? key.slice(key.indexOf(':') + 1) : key;
+            return {
+                alias,
+                item: AztecAddress.fromString(value)
+            };
+        }));
     }
     async createCancellationTxExecutionRequest(from, txNonce, increasedFee) {
         const executionPayload = ExecutionPayload.empty();
-        const feeOptions = await this.completeFeeOptions(from, executionPayload.feePayer, increasedFee.gasSettings);
+        const feeOptions = await this.completeFeeOptions({
+            from,
+            feePayer: executionPayload.feePayer,
+            gasSettings: increasedFee.gasSettings
+        });
         const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
         const fromAccount = await this.getAccountFromAddress(from);
         const chainInfo = await this.getChainInfo();
         const executionOptions = {
             txNonce,
             cancellable: this.cancellableTransactions,
+            // If from is an address, feeOptions include the way the account contract should handle the fee payment
             feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
         };
         return await fromAccount.createTxExecutionRequest(feeExecutionPayload ?? executionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
     }
     async proveCancellationTx(from, txNonce, increasedFee) {
         const cancellationTxRequest = await this.createCancellationTxExecutionRequest(from, txNonce, increasedFee);
-        return await this.pxe.proveTx(cancellationTxRequest);
+        return await this.pxe.proveTx(cancellationTxRequest, {
+            scopes: this.scopesFrom(from),
+            senderForTags: from
+        });
     }
     async getAccountFromAddress(address) {
         let account;
-        if (address.equals(AztecAddress.ZERO)) {
-            account = new SignerlessAccount();
-        } else if (this.accountCache.has(address.toString())) {
+        if (this.accountCache.has(address.toString())) {
             return this.accountCache.get(address.toString());
         } else {
             const accountManager = await this.createOrRetrieveAccount(address);
@@ -125,66 +137,82 @@ export class CLIWallet extends BaseWallet {
    * @returns The stub account, contract instance, and artifact for simulation
    */ async getFakeAccountDataFor(address) {
         const originalAccount = await this.getAccountFromAddress(address);
-        // Account contracts can only be overridden if they have an associated address
-        // Overwriting SignerlessAccount is not supported, and does not really make sense
-        // since it has no authorization mechanism.
-        if (originalAccount instanceof SignerlessAccount) {
-            throw new Error(`Cannot create fake account data for SignerlessAccount at address: ${address}`);
-        }
         const originalAddress = originalAccount.getCompleteAddress();
         const contractInstance = await this.pxe.getContractInstance(originalAddress.address);
         if (!contractInstance) {
             throw new Error(`No contract instance found for address: ${originalAddress.address}`);
         }
-        const stubAccount = createStubAccount(originalAddress);
-        const instance = await getContractInstanceFromInstantiationParams(StubAccountContractArtifact, {
+        const { type } = await this.db.retrieveAccount(address);
+        const isSchnorr = type === 'schnorr';
+        const artifact = isSchnorr ? StubSchnorrAccountContractArtifact : StubEcdsaAccountContractArtifact;
+        const stubAccount = isSchnorr ? createStubSchnorrAccount(originalAddress) : createStubEcdsaAccount(originalAddress);
+        const instance = await getContractInstanceFromInstantiationParams(artifact, {
             salt: Fr.random()
         });
         return {
             account: stubAccount,
             instance,
-            artifact: StubAccountContractArtifact
+            artifact
         };
     }
     async simulateTx(executionPayload, opts) {
-        let simulationResults;
-        const feeOptions = opts.fee?.estimateGas ? await this.completeFeeOptionsForEstimation(opts.from, executionPayload.feePayer, opts.fee?.gasSettings) : await this.completeFeeOptions(opts.from, executionPayload.feePayer, opts.fee?.gasSettings);
+        const simulationResults = await super.simulateTx(executionPayload, opts);
+        if (opts.fee?.estimateGas) {
+            const feeOptions = await this.completeFeeOptions({
+                from: opts.from,
+                feePayer: executionPayload.feePayer,
+                gasSettings: opts.fee?.gasSettings
+            });
+            const limits = getGasLimits(simulationResults, opts.fee?.estimatedGasPadding);
+            printGasEstimates(feeOptions, limits, this.userLog);
+        }
+        return simulationResults;
+    }
+    /**
+   * Uses a stub account for kernelless simulation, bypassing real account authorization.
+   * Uses DefaultEntrypoint directly for NO_FROM transactions.
+   */ async simulateViaEntrypoint(executionPayload, opts) {
+        const { from, feeOptions, additionalScopes, sendMessagesAs } = opts;
+        const scopes = this.scopesFrom(from, additionalScopes);
         const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
-        const chainInfo = await this.getChainInfo();
-        const executionOptions = {
-            txNonce: Fr.random(),
-            cancellable: this.cancellableTransactions,
-            feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
-        };
         const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
             feeExecutionPayload,
             executionPayload
         ]) : executionPayload;
-        // Kernelless simulations using the multicall entrypoints are not currently supported,
-        // since we only override proper account contracts.
-        // TODO: allow disabling kernels even when no overrides are necessary
-        if (opts.from.equals(AztecAddress.ZERO)) {
-            const fromAccount = await this.getAccountFromAddress(opts.from);
-            const txRequest = await fromAccount.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
-            simulationResults = await this.pxe.simulateTx(txRequest, true, opts?.skipTxValidation, opts?.skipFeeEnforcement ?? true);
+        const chainInfo = await this.getChainInfo();
+        let overrides;
+        let txRequest;
+        if (from === NO_FROM) {
+            const entrypoint = new DefaultEntrypoint();
+            txRequest = await entrypoint.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo);
         } else {
-            const { account: fromAccount, instance, artifact } = await this.getFakeAccountDataFor(opts.from);
-            const txRequest = await fromAccount.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
-            const contractOverrides = {
-                [opts.from.toString()]: {
-                    instance,
-                    artifact
+            const { account, instance, artifact } = await this.getFakeAccountDataFor(from);
+            overrides = {
+                contracts: {
+                    [from.toString()]: {
+                        instance,
+                        artifact
+                    }
                 }
             };
-            simulationResults = await this.pxe.simulateTx(txRequest, true, true, true, {
-                contracts: contractOverrides
-            });
-        }
-        if (opts.fee?.estimateGas) {
-            const limits = getGasLimits(simulationResults, opts.fee?.estimatedGasPadding);
-            printGasEstimates(feeOptions, limits, this.userLog);
+            const executionOptions = {
+                txNonce: Fr.random(),
+                cancellable: this.cancellableTransactions,
+                // If from is an address, feeOptions include the way the account contract should handle the fee payment
+                feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
+            };
+            txRequest = await account.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
         }
-        return simulationResults;
+        const result = await this.pxe.simulateTx(txRequest, {
+            simulatePublic: true,
+            skipFeeEnforcement: true,
+            skipTxValidation: true,
+            overrides,
+            scopes,
+            senderForTags: this.senderForTagsFrom(from, sendMessagesAs)
+        });
+        const appCallOffset = await this.computeAppCallOffset(from, feeOptions);
+        return TxSimulationResultWithAppOffset.fromResultAndOffset(result, appCallOffset);
     }
     // Exposed because of the `aztec-wallet get-tx` command. It has been decided that it's fine to keep around because
     // this is just a CLI wallet.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli-wallet",
-  "version": "0.0.1-commit.fffb133c",
+  "version": "0.0.1-dev",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -67,19 +67,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.fffb133c",
-    "@aztec/aztec.js": "0.0.1-commit.fffb133c",
-    "@aztec/bb.js": "0.0.1-commit.fffb133c",
-    "@aztec/cli": "0.0.1-commit.fffb133c",
-    "@aztec/entrypoints": "0.0.1-commit.fffb133c",
-    "@aztec/ethereum": "0.0.1-commit.fffb133c",
-    "@aztec/foundation": "0.0.1-commit.fffb133c",
-    "@aztec/kv-store": "0.0.1-commit.fffb133c",
-    "@aztec/noir-contracts.js": "0.0.1-commit.fffb133c",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.fffb133c",
-    "@aztec/pxe": "0.0.1-commit.fffb133c",
-    "@aztec/stdlib": "0.0.1-commit.fffb133c",
-    "@aztec/wallet-sdk": "0.0.1-commit.fffb133c",
+    "@aztec/accounts": "0.0.1-dev",
+    "@aztec/aztec.js": "0.0.1-dev",
+    "@aztec/bb.js": "0.0.1-dev",
+    "@aztec/cli": "0.0.1-dev",
+    "@aztec/entrypoints": "0.0.1-dev",
+    "@aztec/ethereum": "0.0.1-dev",
+    "@aztec/foundation": "0.0.1-dev",
+    "@aztec/kv-store": "0.0.1-dev",
+    "@aztec/noir-contracts.js": "0.0.1-dev",
+    "@aztec/noir-noirc_abi": "0.0.1-dev",
+    "@aztec/pxe": "0.0.1-dev",
+    "@aztec/stdlib": "0.0.1-dev",
+    "@aztec/wallet-sdk": "0.0.1-dev",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",
     "source-map-support": "^0.5.21",

package/src/bin/index.ts

@@ -73,7 +73,7 @@ function injectInternalCommands(program: Command, log: LogFn, db: WalletDB) {
 
 /** CLI wallet main entrypoint */
 async function main() {
-  const walletVersion = getPackageVersion() ?? '0.0.0';
+  const walletVersion = getPackageVersion();
 
   const db = WalletDB.getInstance();
   const walletAndNodeWrapper = new CliWalletAndNodeWrapper();

package/src/cmds/check_tx.ts

@@ -1,11 +1,15 @@
 import type { ContractArtifact } from '@aztec/aztec.js/abi';
-import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { Fr } from '@aztec/aztec.js/fields';
 import type { AztecNode } from '@aztec/aztec.js/node';
 import { ProtocolContractAddress } from '@aztec/aztec.js/protocol';
 import type { TxHash } from '@aztec/aztec.js/tx';
 import type { LogFn } from '@aztec/foundation/log';
-import { siloNullifier } from '@aztec/stdlib/hash';
+import {
+  computeSiloedPrivateInitializationNullifier,
+  computeSiloedPublicInitializationNullifier,
+  siloNullifier,
+} from '@aztec/stdlib/hash';
 import { NoteDao } from '@aztec/stdlib/note';
 
 import type { CLIWallet } from '../utils/wallet.js';
@@ -83,12 +87,13 @@ async function inspectTx(wallet: CLIWallet, aztecNode: AztecNode, txHash: TxHash
   // Nullifiers
   const nullifierCount = effects.nullifiers.length;
   const { deployNullifiers, initNullifiers, classNullifiers } = await getKnownNullifiers(wallet, artifactMap);
+  const accounts = (await wallet.getAccounts()).map(a => a.item);
   if (nullifierCount > 0) {
     log(' Nullifiers:');
     for (const nullifier of effects.nullifiers) {
       const deployed = deployNullifiers[nullifier.toString()];
       const note = deployed
-        ? (await wallet.getNotes({ siloedNullifier: nullifier, contractAddress: deployed }))[0]
+        ? (await wallet.getNotes({ siloedNullifier: nullifier, contractAddress: deployed, scopes: accounts }))[0]
         : undefined;
       const initialized = initNullifiers[nullifier.toString()];
       const registered = classNullifiers[nullifier.toString()];
@@ -144,22 +149,49 @@ function toFriendlyAddress(address: AztecAddress, artifactMap: ArtifactMap) {
 
 async function getKnownNullifiers(wallet: CLIWallet, artifactMap: ArtifactMap) {
   const knownContracts = await wallet.getContracts();
-  const deployerAddress = ProtocolContractAddress.ContractInstanceRegistry;
-  const classRegistryAddress = ProtocolContractAddress.ContractClassRegistry;
+
+  const [contractResults, classResults] = await Promise.all([
+    Promise.all(knownContracts.map(contract => getContractNullifiers(wallet, contract))),
+    Promise.all(Object.values(artifactMap).map(artifact => getClassNullifier(artifact))),
+  ]);
+
   const initNullifiers: Record<string, AztecAddress> = {};
   const deployNullifiers: Record<string, AztecAddress> = {};
   const classNullifiers: Record<string, string> = {};
-  for (const contract of knownContracts) {
-    initNullifiers[(await siloNullifier(contract, contract.toField())).toString()] = contract;
-    deployNullifiers[(await siloNullifier(deployerAddress, contract.toField())).toString()] = contract;
+
+  for (const { contract, deployNullifier, privateInitNullifier, publicInitNullifier } of contractResults) {
+    deployNullifiers[deployNullifier.toString()] = contract;
+    if (privateInitNullifier) {
+      initNullifiers[privateInitNullifier.toString()] = contract;
+    }
+    initNullifiers[publicInitNullifier.toString()] = contract;
   }
-  for (const artifact of Object.values(artifactMap)) {
-    classNullifiers[(await siloNullifier(classRegistryAddress, artifact.classId)).toString()] =
-      `${artifact.name}Class<${artifact.classId}>`;
+  for (const { nullifier, label } of classResults) {
+    classNullifiers[nullifier.toString()] = label;
   }
+
   return { initNullifiers, deployNullifiers, classNullifiers };
 }
 
+async function getContractNullifiers(wallet: CLIWallet, contract: AztecAddress) {
+  const deployerAddress = ProtocolContractAddress.ContractInstanceRegistry;
+  const deployNullifier = await siloNullifier(deployerAddress, contract.toField());
+
+  const metadata = await wallet.getContractMetadata(contract);
+  const privateInitNullifier = metadata.instance
+    ? await computeSiloedPrivateInitializationNullifier(contract, metadata.instance.initializationHash)
+    : undefined;
+  const publicInitNullifier = await computeSiloedPublicInitializationNullifier(contract);
+
+  return { contract, deployNullifier, privateInitNullifier, publicInitNullifier };
+}
+
+async function getClassNullifier(artifact: ContractArtifactWithClassId) {
+  const classRegistryAddress = ProtocolContractAddress.ContractClassRegistry;
+  const nullifier = await siloNullifier(classRegistryAddress, artifact.classId);
+  return { nullifier, label: `${artifact.name}Class<${artifact.classId}>` };
+}
+
 type ArtifactMap = Record<string, ContractArtifactWithClassId>;
 type ContractArtifactWithClassId = ContractArtifact & { classId: Fr };
 

package/src/cmds/create_account.ts

@@ -1,11 +1,12 @@
+import { NO_FROM } from '@aztec/aztec.js/account';
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { NO_WAIT } from '@aztec/aztec.js/contracts';
-import type { AztecNode } from '@aztec/aztec.js/node';
+import { type AztecNode, waitForTx } from '@aztec/aztec.js/node';
 import type { DeployAccountOptions } from '@aztec/aztec.js/wallet';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { LogFn, Logger } from '@aztec/foundation/log';
-import type { TxHash, TxReceipt } from '@aztec/stdlib/tx';
+import { type TxHash, type TxReceipt, TxStatus } from '@aztec/stdlib/tx';
 
 import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
 import type { AccountType } from '../utils/constants.js';
@@ -18,6 +19,7 @@ export async function createAccount(
   aztecNode: AztecNode,
   accountType: AccountType,
   secretKey: Fr | undefined,
+  salt: Fr | undefined,
   publicKey: string | undefined,
   alias: string | undefined,
   deployer: AztecAddress | undefined,
@@ -27,6 +29,7 @@ export async function createAccount(
   registerClass: boolean,
   wait: boolean,
   feeOpts: CLIFeeArgs,
+  waitForStatus: TxStatus,
   json: boolean,
   verbose: boolean,
   debugLogger: Logger,
@@ -38,10 +41,10 @@ export async function createAccount(
     undefined /* address, we don't have it yet */,
     secretKey,
     accountType,
-    Fr.ZERO,
+    salt,
     publicKey,
   );
-  const { salt } = account.getInstance();
+  const instanceSalt = account.getInstance().salt;
   const { address, publicKeys, partialAddress } = await account.getCompleteAddress();
 
   const out: Record<string, any> = {};
@@ -52,7 +55,7 @@ export async function createAccount(
       out.secretKey = secretKey;
     }
     out.partialAddress = partialAddress;
-    out.salt = salt;
+    out.salt = instanceSalt;
     out.initHash = account.getInstance().initializationHash;
   } else {
     log(`\nNew account:\n`);
@@ -62,7 +65,7 @@ export async function createAccount(
       log(`Secret key:     ${secretKey.toString()}`);
     }
     log(`Partial address: ${partialAddress.toString()}`);
-    log(`Salt:            ${salt.toString()}`);
+    log(`Salt:            ${instanceSalt.toString()}`);
     log(`Init hash:       ${account.getInstance().initializationHash.toString()}`);
   }
 
@@ -72,7 +75,7 @@ export async function createAccount(
     const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
 
     const delegatedDeployment = deployer && !account.address.equals(deployer);
-    const from = delegatedDeployment ? deployer : AztecAddress.ZERO;
+    const from = delegatedDeployment ? deployer : NO_FROM;
 
     const deployAccountOpts: DeployAccountOptions = {
       skipClassPublication: !registerClass,
@@ -82,11 +85,15 @@ export async function createAccount(
       fee: { paymentMethod, gasSettings },
     };
 
+    const localStart = performance.now();
     const deployMethod = await account.getDeployMethod();
-    const { estimatedGas, stats } = await deployMethod.simulate({
+    const sim = await deployMethod.simulate({
       ...deployAccountOpts,
       fee: { ...deployAccountOpts.fee, estimateGas: true },
     });
+    // estimateGas: true guarantees these fields are present
+    const estimatedGas = sim.estimatedGas!;
+    const stats = sim.stats!;
 
     if (feeOpts.estimateOnly) {
       if (json) {
@@ -109,7 +116,7 @@ export async function createAccount(
       if (!json) {
         log(`\nWaiting for account contract deployment...`);
       }
-      const result = await deployMethod.send({
+      const sendOpts = {
         ...deployAccountOpts,
         fee: deployAccountOpts.fee
           ? {
@@ -117,18 +124,25 @@ export async function createAccount(
               gasSettings: estimatedGas,
             }
           : undefined,
-        wait: wait ? { timeout: DEFAULT_TX_TIMEOUT_S, returnReceipt: true } : NO_WAIT,
-      });
-      const isReceipt = (data: TxReceipt | TxHash): data is TxReceipt => 'txHash' in data;
-      if (isReceipt(result)) {
-        txReceipt = result;
-        txHash = result.txHash;
+      };
+
+      ({ txHash } = await deployMethod.send({ ...sendOpts, wait: NO_WAIT }));
+      const localTimeMs = performance.now() - localStart;
+
+      if (wait) {
+        const nodeStart = performance.now();
+        txReceipt = await waitForTx(aztecNode, txHash, { timeout: DEFAULT_TX_TIMEOUT_S, waitForStatus });
+        const nodeTimeMs = performance.now() - nodeStart;
+
         out.txReceipt = {
           status: txReceipt.status,
           transactionFee: txReceipt.transactionFee,
         };
-      } else {
-        txHash = result;
+
+        if (!json) {
+          log(` Local processing time: ${(localTimeMs / 1000).toFixed(1)}s`);
+          log(` Node inclusion time: ${(nodeTimeMs / 1000).toFixed(1)}s`);
+        }
       }
       debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
       out.txHash = txHash;
@@ -146,5 +160,5 @@ export async function createAccount(
     }
   }
 
-  return { alias, address, secretKey, salt };
+  return { alias, address, secretKey, salt: instanceSalt };
 }

package/src/cmds/deploy.ts

@@ -1,13 +1,15 @@
+import { NO_FROM } from '@aztec/aztec.js/account';
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import type { DeployOptions } from '@aztec/aztec.js/contracts';
 import { NO_WAIT } from '@aztec/aztec.js/contracts';
 import { ContractDeployer } from '@aztec/aztec.js/deployment';
 import { Fr } from '@aztec/aztec.js/fields';
-import type { AztecNode } from '@aztec/aztec.js/node';
+import { type AztecNode, waitForTx } from '@aztec/aztec.js/node';
 import { encodeArgs, getContractArtifact, prettyPrintJSON } from '@aztec/cli/utils';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { getAllFunctionAbis, getInitializer } from '@aztec/stdlib/abi';
 import { PublicKeys } from '@aztec/stdlib/keys';
+import type { TxStatus } from '@aztec/stdlib/tx';
 
 import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
 import { CLIFeeArgs } from '../utils/options/fees.js';
@@ -29,6 +31,7 @@ export async function deploy(
   skipInitialization: boolean | undefined,
   wait: boolean,
   feeOpts: CLIFeeArgs,
+  waitForStatus: TxStatus,
   verbose: boolean,
   timeout: number = DEFAULT_TX_TIMEOUT_S,
   debugLogger: Logger,
@@ -42,12 +45,7 @@ export async function deploy(
 
   // TODO(#12081): Add contractArtifact.noirVersion and check here (via Noir.lock)?
 
-  const contractDeployer = new ContractDeployer(
-    contractArtifact,
-    wallet,
-    publicKeys ?? PublicKeys.default(),
-    initializer,
-  );
+  const contractDeployer = new ContractDeployer(contractArtifact, wallet, initializer);
 
   let args = [];
   if (rawArgs.length > 0) {
@@ -59,22 +57,24 @@ export async function deploy(
     debugLogger.debug(`Encoded arguments: ${args.join(', ')}`);
   }
 
-  const deploy = contractDeployer.deploy(...args);
+  const deployInteraction = contractDeployer.deploy(args, { salt, publicKeys: publicKeys ?? PublicKeys.default() });
   const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(node, wallet, deployer);
   const deployOpts: DeployOptions = {
     fee: { gasSettings, paymentMethod },
-    from: deployer ?? AztecAddress.ZERO,
-    contractAddressSalt: salt,
-    universalDeploy: !deployer,
+    from: deployer ?? NO_FROM,
     skipClassPublication,
     skipInitialization,
     skipInstancePublication,
   };
 
-  const { estimatedGas, stats } = await deploy.simulate({
+  const localStart = performance.now();
+  const sim = await deployInteraction.simulate({
     ...deployOpts,
     fee: { ...deployOpts.fee, estimateGas: true },
   });
+  // estimateGas: true guarantees these fields are present
+  const estimatedGas = sim.estimatedGas!;
+  const stats = sim.stats!;
 
   if (feeOpts.estimateOnly) {
     if (json) {
@@ -94,48 +94,51 @@ export async function deploy(
       printProfileResult(stats, log);
     }
 
-    const { address, partialAddress } = deploy;
-    const instance = await deploy.getInstance();
+    const instance = await deployInteraction.getInstance();
+    const address = instance.address;
+    const partialAddress = await deployInteraction.getPartialAddress();
+
+    const { txHash } = await deployInteraction.send({ ...deployOpts, wait: NO_WAIT });
+    const localTimeMs = performance.now() - localStart;
+    debugLogger.debug(`Deploy tx sent with hash ${txHash.toString()}`);
+    out.hash = txHash;
 
     if (wait) {
-      const receipt = await deploy.send({ ...deployOpts, wait: { timeout, returnReceipt: true } });
-      const txHash = receipt.txHash;
-      debugLogger.debug(`Deploy tx sent with hash ${txHash.toString()}`);
-      out.hash = txHash;
+      const nodeStart = performance.now();
+      const receipt = await waitForTx(node, txHash, { timeout, waitForStatus });
+      const nodeTimeMs = performance.now() - nodeStart;
 
       if (!json) {
-        log(`Contract deployed at ${address?.toString()}`);
-        log(`Contract partial address ${(await partialAddress)?.toString()}`);
+        log(`Contract deployed at ${address.toString()}`);
+        log(`Contract partial address ${partialAddress.toString()}`);
         log(`Contract init hash ${instance.initializationHash.toString()}`);
         log(`Deployment tx hash: ${txHash.toString()}`);
         log(`Deployment salt: ${salt.toString()}`);
         log(`Deployer: ${instance.deployer.toString()}`);
         log(`Transaction fee: ${receipt.transactionFee?.toString()}`);
+        log(` Local processing time: ${(localTimeMs / 1000).toFixed(1)}s`);
+        log(` Node inclusion time: ${(nodeTimeMs / 1000).toFixed(1)}s`);
       } else {
         out.contract = {
-          address: address?.toString(),
-          partialAddress: (await partialAddress)?.toString(),
+          address: address.toString(),
+          partialAddress: partialAddress.toString(),
           initializationHash: instance.initializationHash.toString(),
           salt: salt.toString(),
           transactionFee: receipt.transactionFee?.toString(),
         };
       }
     } else {
-      const txHash = await deploy.send({ ...deployOpts, wait: NO_WAIT });
-      debugLogger.debug(`Deploy tx sent with hash ${txHash.toString()}`);
-      out.hash = txHash;
-
       if (!json) {
-        log(`Contract deployed at ${address?.toString()}`);
-        log(`Contract partial address ${(await partialAddress)?.toString()}`);
+        log(`Contract deployed at ${address.toString()}`);
+        log(`Contract partial address ${partialAddress.toString()}`);
         log(`Contract init hash ${instance.initializationHash.toString()}`);
         log(`Deployment tx hash: ${txHash.toString()}`);
         log(`Deployment salt: ${salt.toString()}`);
         log(`Deployer: ${instance.deployer.toString()}`);
       } else {
         out.contract = {
-          address: address?.toString(),
-          partialAddress: (await partialAddress)?.toString(),
+          address: address.toString(),
+          partialAddress: partialAddress.toString(),
           initializationHash: instance.initializationHash.toString(),
           salt: salt.toString(),
         };
@@ -145,5 +148,5 @@ export async function deploy(
   if (json) {
     log(prettyPrintJSON(out));
   }
-  return deploy.address;
+  return await deployInteraction.getAddress();
 }