@aztec/cli-wallet 0.86.0-starknet.1 → 0.87.0

package/dest/utils/options/options.js

@@ -18,7 +18,7 @@ export function integerArgParser(value, argName, min = Number.MIN_SAFE_INTEGER,
 export function aliasedTxHashParser(txHash, db) {
     try {
         return parseTxHash(txHash);
-    } catch (err) {
+    } catch  {
         const prefixed = txHash.includes(':') ? txHash : `transactions:${txHash}`;
         const rawTxHash = db ? db.tryRetrieveAlias(prefixed) : txHash;
         return parseTxHash(rawTxHash);
@@ -28,7 +28,7 @@ export function aliasedAuthWitParser(witnesses, db) {
     const parsedWitnesses = witnesses.split(',').map((witness)=>{
         try {
             return AuthWitness.fromString(witness);
-        } catch (err) {
+        } catch  {
             const prefixed = witness.includes(':') ? witness : `authwits:${witness}`;
             const rawAuthWitness = db ? db.tryRetrieveAlias(prefixed) : witness;
             return AuthWitness.fromString(rawAuthWitness);
@@ -79,6 +79,9 @@ export function createContractAddressOption(db) {
 export function createDebugExecutionStepsDirOption() {
     return new Option('--debug-execution-steps-dir <address>', 'Directory to write execution step artifacts for bb profiling/debugging.').makeOptionMandatory(false);
 }
+export function createVerboseOption() {
+    return new Option('-v, --verbose', 'Provide timings on all executed operations (synching, simulating, proving)').default(false);
+}
 export function artifactPathParser(filePath, db) {
     if (filePath.includes('@')) {
         const [pkg, contractName] = filePath.split('@');
@@ -108,7 +111,7 @@ async function contractArtifactFromWorkspace(pkg, contractName) {
     const cwd = process.cwd();
     try {
         await stat(`${cwd}/Nargo.toml`);
-    } catch (e) {
+    } catch  {
         throw new Error('Invalid contract artifact argument provided. To use this option, command should be called from a nargo workspace');
     }
     const filesInTarget = await readdir(`${cwd}/${TARGET_DIR}`);

package/dest/utils/profiling.d.ts

@@ -0,0 +1,5 @@
+import type { LogFn } from '@aztec/foundation/log';
+import type { PrivateExecutionStep } from '@aztec/stdlib/kernel';
+import type { ProvingTimings, SimulationTimings } from '@aztec/stdlib/tx';
+export declare function printProfileResult(timings: ProvingTimings | SimulationTimings, log: LogFn, executionSteps?: PrivateExecutionStep[]): void;
+//# sourceMappingURL=profiling.d.ts.map

package/dest/utils/profiling.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"profiling.d.ts","sourceRoot":"","sources":["../../src/utils/profiling.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAI1E,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,cAAc,GAAG,iBAAiB,EAC3C,GAAG,EAAE,KAAK,EACV,cAAc,CAAC,EAAE,oBAAoB,EAAE,QA6ExC"}

package/dest/utils/profiling.js

@@ -0,0 +1,32 @@
+import { format } from 'util';
+export function printProfileResult(timings, log, executionSteps) {
+    log(format('\nPer circuit breakdown:\n'));
+    log(format('  ', 'Function name'.padEnd(50), 'Time'.padStart(13).padEnd(15), executionSteps ? 'Gates'.padStart(13).padEnd(15) : '', executionSteps ? 'Subtotal'.padStart(13).padEnd(15) : ''));
+    log(format(''.padEnd(50 + 15 + 15 + (executionSteps ? 15 + 15 : 0), '-')));
+    let acc = 0;
+    let biggest = executionSteps?.[0];
+    timings.perFunction.forEach((fn, i)=>{
+        const currentExecutionStep = executionSteps?.[i];
+        if (currentExecutionStep && biggest && currentExecutionStep.gateCount > biggest.gateCount) {
+            biggest = currentExecutionStep;
+        }
+        acc += currentExecutionStep ? currentExecutionStep.gateCount : 0;
+        log(format('  ', fn.functionName.padEnd(50), `${fn.time.toFixed(2)}ms`.padStart(13).padEnd(15), currentExecutionStep ? currentExecutionStep.gateCount.toLocaleString().padStart(13).padEnd(15) : '', currentExecutionStep ? acc.toLocaleString().padStart(15) : ''));
+    });
+    if (biggest) {
+        log(format('\nTotal gates:', acc.toLocaleString(), `(Biggest circuit: ${biggest.functionName} -> ${biggest.gateCount.toLocaleString()})`));
+    }
+    log(format('\nSync time:'.padEnd(25), `${timings.sync?.toFixed(2)}ms`.padStart(16)));
+    log(format('Private simulation time:'.padEnd(25), `${timings.perFunction.reduce((acc, { time })=>acc + time, 0).toFixed(2)}ms`.padStart(15)));
+    if (timings.proving) {
+        log(format('Proving time:'.padEnd(25), `${timings.proving?.toFixed(2)}ms`.padStart(15)));
+    }
+    if (timings.publicSimulation) {
+        log(format('Public simulation time:'.padEnd(25), `${timings.publicSimulation?.toFixed(2)}ms`.padStart(15)));
+    }
+    if (timings.validation) {
+        log(format('Validation time:'.padEnd(25), `${timings.validation?.toFixed(2)}ms`.padStart(15)));
+    }
+    log(format('Total time:'.padEnd(25), `${timings.total.toFixed(2)}ms`.padStart(15), `(${timings.unaccounted.toFixed(2)}ms unaccounted)`));
+    log('\n');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli-wallet",
-  "version": "0.86.0-starknet.1",
+  "version": "0.87.0",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -63,17 +63,17 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.86.0-starknet.1",
-    "@aztec/aztec.js": "0.86.0-starknet.1",
-    "@aztec/cli": "0.86.0-starknet.1",
-    "@aztec/entrypoints": "0.86.0-starknet.1",
-    "@aztec/ethereum": "0.86.0-starknet.1",
-    "@aztec/foundation": "0.86.0-starknet.1",
-    "@aztec/kv-store": "0.86.0-starknet.1",
-    "@aztec/noir-contracts.js": "0.86.0-starknet.1",
-    "@aztec/noir-noirc_abi": "0.86.0-starknet.1",
-    "@aztec/pxe": "0.86.0-starknet.1",
-    "@aztec/stdlib": "0.86.0-starknet.1",
+    "@aztec/accounts": "0.87.0",
+    "@aztec/aztec.js": "0.87.0",
+    "@aztec/cli": "0.87.0",
+    "@aztec/entrypoints": "0.87.0",
+    "@aztec/ethereum": "0.87.0",
+    "@aztec/foundation": "0.87.0",
+    "@aztec/kv-store": "0.87.0",
+    "@aztec/noir-contracts.js": "0.87.0",
+    "@aztec/noir-noirc_abi": "0.87.0",
+    "@aztec/pxe": "0.87.0",
+    "@aztec/stdlib": "0.87.0",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",
     "source-map-support": "^0.5.21",
@@ -82,13 +82,13 @@
   "devDependencies": {
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
-    "@types/node": "^18.7.23",
+    "@types/node": "^22.15.17",
     "@types/source-map-support": "^0.5.10",
     "jest": "^29.5.0",
     "jest-mock-extended": "^3.0.5",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "files": [
     "dest",
@@ -97,6 +97,6 @@
   ],
   "types": "./dest/index.d.ts",
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   }
 }

package/src/bin/index.ts

@@ -55,7 +55,7 @@ function injectInternalCommands(program: Command, log: LogFn, db: WalletDB) {
       const options = command.optsWithGlobals();
       const { alias } = options;
       const value = Fr.random();
-      const hash = computeSecretHash(value);
+      const hash = await computeSecretHash(value);
 
       await db.storeAlias('secrets', alias, Buffer.from(value.toString()), log);
       await db.storeAlias('secrets', `${alias}:hash`, Buffer.from(hash.toString()), log);

package/src/cmds/create_account.ts

@@ -5,6 +5,7 @@ import type { LogFn, Logger } from '@aztec/foundation/log';
 
 import { type AccountType, createOrRetrieveAccount } from '../utils/accounts.js';
 import { type IFeeOpts, printGasEstimates } from '../utils/options/fees.js';
+import { printProfileResult } from '../utils/profiling.js';
 
 export async function createAccount(
   client: PXE,
@@ -18,6 +19,7 @@ export async function createAccount(
   wait: boolean,
   feeOpts: IFeeOpts,
   json: boolean,
+  verbose: boolean,
   debugLogger: Logger,
   log: LogFn,
 ) {
@@ -71,20 +73,23 @@ export async function createAccount(
       skipInitialization: skipInitialization,
       ...(await feeOpts.toDeployAccountOpts(wallet)),
     };
+    /*
+     * This is usually handled by accountManager.deploy(), but we're accessing the lower
+     * level method to get gas and timings. That means we have to replicate some of the logic here.
+     * In case we're deploying our own account, we need to hijack the payment method for the fee,
+     * wrapping it in the one that will make use of the freshly deployed account's
+     * entrypoint. For reference, see aztec.js/src/account_manager.ts:deploy()
+     * Also, salt and universalDeploy have to be explicitly provided
+     */
+    deployOpts.fee =
+      !deployOpts?.deployWallet && deployOpts?.fee
+        ? { ...deployOpts.fee, paymentMethod: await account.getSelfPaymentMethod(deployOpts.fee.paymentMethod) }
+        : deployOpts?.fee;
+
+    const deployMethod = await account.getDeployMethod(deployOpts.deployWallet);
+
     if (feeOpts.estimateOnly) {
-      /*
-       * This is usually handled by accountManager.deploy(), but we're accessing the lower
-       * level method to get the gas estimates. That means we have to replicate some of the logic here.
-       * In case we're deploying our own account, we need to hijack the payment method for the fee,
-       * wrapping it in the one that will make use of the freshly deployed account's
-       * entrypoint. For reference, see aztec.js/src/account_manager.ts:deploy()
-       */
-      const fee =
-        !deployOpts?.deployWallet && deployOpts?.fee
-          ? { ...deployOpts.fee, paymentMethod: await account.getSelfPaymentMethod(deployOpts.fee.paymentMethod) }
-          : deployOpts?.fee;
-      const deployMethod = await account.getDeployMethod(deployOpts.deployWallet);
-      const gas = await deployMethod.estimateGas({ ...deployOpts, fee, universalDeploy: true });
+      const gas = await deployMethod.estimateGas({ ...deployOpts, universalDeploy: true, contractAddressSalt: salt });
       if (json) {
         out.fee = {
           gasLimits: {
@@ -100,7 +105,12 @@ export async function createAccount(
         printGasEstimates(feeOpts, gas, log);
       }
     } else {
-      tx = account.deploy(deployOpts);
+      const provenTx = await deployMethod.prove({ ...deployOpts, universalDeploy: true, contractAddressSalt: salt });
+      if (verbose) {
+        printProfileResult(provenTx.timings!, log);
+      }
+      tx = provenTx.send();
+
       const txHash = await tx.getTxHash();
       debugLogger.debug(`Account contract tx sent with hash ${txHash}`);
       out.txHash = txHash;

package/src/cmds/deploy.ts

@@ -5,6 +5,7 @@ import { getAllFunctionAbis, getInitializer } from '@aztec/stdlib/abi';
 import { PublicKeys } from '@aztec/stdlib/keys';
 
 import { type IFeeOpts, printGasEstimates } from '../utils/options/fees.js';
+import { printProfileResult } from '../utils/profiling.js';
 
 export async function deploy(
   wallet: AccountWalletWithSecretKey,
@@ -20,6 +21,7 @@ export async function deploy(
   universalDeploy: boolean | undefined,
   wait: boolean,
   feeOpts: IFeeOpts,
+  verbose: boolean,
   debugLogger: Logger,
   log: LogFn,
   logJson: (output: any) => void,
@@ -59,7 +61,12 @@ export async function deploy(
     return;
   }
 
-  const tx = deploy.send(deployOpts);
+  const provenTx = await deploy.prove(deployOpts);
+  if (verbose) {
+    printProfileResult(provenTx.timings!, log);
+  }
+
+  const tx = provenTx.send();
 
   const txHash = await tx.getTxHash();
   debugLogger.debug(`Deploy tx sent with hash ${txHash}`);

package/src/cmds/deploy_account.ts

@@ -3,6 +3,7 @@ import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 
 import { type IFeeOpts, printGasEstimates } from '../utils/options/fees.js';
+import { printProfileResult } from '../utils/profiling.js';
 
 export async function deployAccount(
   account: AccountManager,
@@ -11,6 +12,7 @@ export async function deployAccount(
   publicDeploy: boolean,
   feeOpts: IFeeOpts,
   json: boolean,
+  verbose: boolean,
   debugLogger: Logger,
   log: LogFn,
 ) {
@@ -43,26 +45,28 @@ export async function deployAccount(
   let txReceipt;
 
   const deployOpts: DeployAccountOptions = {
-    skipInitialization: false,
     skipPublicDeployment: !publicDeploy,
     skipClassRegistration: !registerClass,
     ...(await feeOpts.toDeployAccountOpts(wallet)),
   };
 
+  /*
+   * This is usually handled by accountManager.deploy(), but we're accessing the lower
+   * level method to get gas and timings. That means we have to replicate some of the logic here.
+   * In case we're deploying our own account, we need to hijack the payment method for the fee,
+   * wrapping it in the one that will make use of the freshly deployed account's
+   * entrypoint. For reference, see aztec.js/src/account_manager.ts:deploy()
+   * Also, salt and universalDeploy have to be explicitly provided
+   */
+  deployOpts.fee =
+    !deployOpts?.deployWallet && deployOpts?.fee
+      ? { ...deployOpts.fee, paymentMethod: await account.getSelfPaymentMethod(deployOpts.fee.paymentMethod) }
+      : deployOpts?.fee;
+
+  const deployMethod = await account.getDeployMethod(deployOpts.deployWallet);
+
   if (feeOpts.estimateOnly) {
-    /*
-     * This is usually handled by accountManager.deploy(), but we're accessing the lower
-     * level method to get the gas estimates. That means we have to replicate some of the logic here.
-     * In case we're deploying our own account, we need to hijack the payment method for the fee,
-     * wrapping it in the one that will make use of the freshly deployed account's
-     * entrypoint. For reference, see aztec.js/src/account_manager.ts:deploy()
-     */
-    const fee =
-      !deployOpts?.deployWallet && deployOpts?.fee
-        ? { ...deployOpts.fee, paymentMethod: await account.getSelfPaymentMethod(deployOpts.fee.paymentMethod) }
-        : deployOpts?.fee;
-    const deployMethod = await account.getDeployMethod(deployOpts.deployWallet);
-    const gas = await deployMethod.estimateGas({ ...deployOpts, fee, universalDeploy: true });
+    const gas = await deployMethod.estimateGas({ ...deployOpts, universalDeploy: true, contractAddressSalt: salt });
     if (json) {
       out.fee = {
         gasLimits: {
@@ -78,7 +82,12 @@ export async function deployAccount(
       printGasEstimates(feeOpts, gas, log);
     }
   } else {
-    tx = account.deploy(deployOpts);
+    const provenTx = await deployMethod.prove({ ...deployOpts, universalDeploy: true, contractAddressSalt: salt });
+    if (verbose) {
+      printProfileResult(provenTx.timings!, log);
+    }
+    tx = provenTx.send();
+
     const txHash = await tx.getTxHash();
     debugLogger.debug(`Account contract tx sent with hash ${txHash}`);
     out.txHash = txHash;

package/src/cmds/index.ts

@@ -39,6 +39,7 @@ import {
   createContractAddressOption,
   createDebugExecutionStepsDirOption,
   createTypeOption,
+  createVerboseOption,
   integerArgParser,
   parseGasFees,
   parsePaymentMethod,
@@ -99,12 +100,14 @@ export function injectCommands(
     .option('--json', 'Emit output as json')
     // `options.wait` is default true. Passing `--no-wait` will set it to false.
     // https://github.com/tj/commander.js#other-option-types-negatable-boolean-and-booleanvalue
-    .option('--no-wait', 'Skip waiting for the contract to be deployed. Print the hash of deployment transaction');
+    .option('--no-wait', 'Skip waiting for the contract to be deployed. Print the hash of deployment transaction')
+    .addOption(createVerboseOption());
 
   addOptions(createAccountCommand, FeeOptsWithFeePayer.getOptions()).action(async (_options, command) => {
     const { createAccount } = await import('./create_account.js');
     const options = command.optsWithGlobals();
-    const { type, secretKey, wait, registerOnly, skipInitialization, publicDeploy, rpcUrl, alias, json } = options;
+    const { type, secretKey, wait, registerOnly, skipInitialization, publicDeploy, rpcUrl, alias, json, verbose } =
+      options;
     let { publicKey } = options;
     if ((type as AccountType) === 'ecdsasecp256r1ssh' && !publicKey) {
       const identities = await getIdentities();
@@ -132,6 +135,7 @@ export function injectCommands(
       wait,
       await FeeOptsWithFeePayer.fromCli(options, client, log, db),
       json,
+      verbose,
       debugLogger,
       log,
     );
@@ -154,12 +158,13 @@ export function injectCommands(
       '--register-class',
       'Register the contract class (useful for when the contract class has not been deployed yet).',
     )
-    .option('--public-deploy', 'Publicly deploy this account contract (only useful if it contains public functions');
+    .option('--public-deploy', 'Publicly deploy this account contract (only useful if it contains public functions')
+    .addOption(createVerboseOption());
 
   addOptions(deployAccountCommand, FeeOptsWithFeePayer.getOptions()).action(async (_options, command) => {
     const { deployAccount } = await import('./deploy_account.js');
     const options = command.optsWithGlobals();
-    const { rpcUrl, wait, from: parsedFromAddress, json, registerClass, publicDeploy } = options;
+    const { rpcUrl, wait, from: parsedFromAddress, json, registerClass, publicDeploy, verbose } = options;
 
     const client = (await pxeWrapper?.getPXE()) ?? (await createCompatibleClient(rpcUrl, debugLogger));
     const account = await createOrRetrieveAccount(client, parsedFromAddress, db);
@@ -171,6 +176,7 @@ export function injectCommands(
       publicDeploy,
       await FeeOptsWithFeePayer.fromCli(options, client, log, db),
       json,
+      verbose,
       debugLogger,
       log,
     );
@@ -205,7 +211,8 @@ export function injectCommands(
     // https://github.com/tj/commander.js#other-option-types-negatable-boolean-and-booleanvalue
     .option('--no-wait', 'Skip waiting for the contract to be deployed. Print the hash of deployment transaction')
     .option('--no-class-registration', "Don't register this contract class")
-    .option('--no-public-deployment', "Don't emit this contract's public bytecode");
+    .option('--no-public-deployment', "Don't emit this contract's public bytecode")
+    .addOption(createVerboseOption());
 
   addOptions(deployCommand, FeeOpts.getOptions()).action(async (artifactPathPromise, _options, command) => {
     const { deploy } = await import('./deploy.js');
@@ -224,6 +231,7 @@ export function injectCommands(
       rpcUrl,
       from: parsedFromAddress,
       alias,
+      verbose,
     } = options;
     const client = (await pxeWrapper?.getPXE()) ?? (await createCompatibleClient(rpcUrl, debugLogger));
     const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
@@ -246,6 +254,7 @@ export function injectCommands(
       universal,
       wait,
       await FeeOpts.fromCli(options, client, log, db),
+      verbose,
       debugLogger,
       log,
       logJson(log),
@@ -278,7 +287,8 @@ export function injectCommands(
     )
     .addOption(createAccountOption('Alias or address of the account to send the transaction from', !db, db))
     .option('--no-wait', 'Print transaction hash without waiting for it to be mined')
-    .option('--no-cancel', 'Do not allow the transaction to be cancelled. This makes for cheaper transactions.');
+    .option('--no-cancel', 'Do not allow the transaction to be cancelled. This makes for cheaper transactions.')
+    .addOption(createVerboseOption());
 
   addOptions(sendCommand, FeeOpts.getOptions()).action(async (functionName, _options, command) => {
     const { send } = await import('./send.js');
@@ -294,6 +304,7 @@ export function injectCommands(
       alias,
       cancel,
       authWitness: authWitnessArray,
+      verbose,
     } = options;
     const client = (await pxeWrapper?.getPXE()) ?? (await createCompatibleClient(rpcUrl, debugLogger));
     const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
@@ -313,6 +324,7 @@ export function injectCommands(
       cancel,
       await FeeOpts.fromCli(options, client, log, db),
       authWitnesses,
+      verbose,
       log,
     );
     if (db && sentTx) {
@@ -321,7 +333,7 @@ export function injectCommands(
     }
   });
 
-  program
+  const simulateCommand = program
     .command('simulate')
     .description('Simulates the execution of a function on an Aztec contract.')
     .argument('<functionName>', 'Name of function to simulate')
@@ -334,26 +346,39 @@ export function injectCommands(
     )
     .addOption(createAuthwitnessOption('Authorization witness to use for the simulation', !db, db))
     .addOption(createAccountOption('Alias or address of the account to simulate from', !db, db))
-    .action(async (functionName, _options, command) => {
-      const { simulate } = await import('./simulate.js');
-      const options = command.optsWithGlobals();
-      const {
-        args,
-        contractArtifact: artifactPathPromise,
-        contractAddress,
-        from: parsedFromAddress,
-        rpcUrl,
-        secretKey,
-        authWitness,
-      } = options;
+    .addOption(createVerboseOption());
 
-      const client = (await pxeWrapper?.getPXE()) ?? (await createCompatibleClient(rpcUrl, debugLogger));
-      const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
-      const wallet = await account.getWallet();
-      const artifactPath = await artifactPathFromPromiseOrAlias(artifactPathPromise, contractAddress, db);
-      const authWitnesses = cleanupAuthWitnesses(authWitness);
-      await simulate(wallet, functionName, args, artifactPath, contractAddress, authWitnesses, log);
-    });
+  addOptions(simulateCommand, FeeOpts.getOptions()).action(async (functionName, _options, command) => {
+    const { simulate } = await import('./simulate.js');
+    const options = command.optsWithGlobals();
+    const {
+      args,
+      contractArtifact: artifactPathPromise,
+      contractAddress,
+      from: parsedFromAddress,
+      rpcUrl,
+      secretKey,
+      verbose,
+      authWitness,
+    } = options;
+
+    const client = (await pxeWrapper?.getPXE()) ?? (await createCompatibleClient(rpcUrl, debugLogger));
+    const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
+    const wallet = await account.getWallet();
+    const artifactPath = await artifactPathFromPromiseOrAlias(artifactPathPromise, contractAddress, db);
+    const authWitnesses = cleanupAuthWitnesses(authWitness);
+    await simulate(
+      wallet,
+      functionName,
+      args,
+      artifactPath,
+      contractAddress,
+      await FeeOpts.fromCli(options, client, log, db),
+      authWitnesses,
+      verbose,
+      log,
+    );
+  });
 
   const profileCommand = program
     .command('profile')

package/src/cmds/profile.ts

@@ -1,70 +1,13 @@
 import { type AccountWalletWithSecretKey, AuthWitness, type AztecAddress, Contract } from '@aztec/aztec.js';
 import { prepTx } from '@aztec/cli/utils';
 import type { LogFn } from '@aztec/foundation/log';
-import { type PrivateExecutionStep, serializePrivateExecutionSteps } from '@aztec/stdlib/kernel';
-import type { TxProfileResult } from '@aztec/stdlib/tx';
+import { serializePrivateExecutionSteps } from '@aztec/stdlib/kernel';
 
 import { promises as fs } from 'fs';
 import path from 'path';
-import { format } from 'util';
 
 import type { IFeeOpts } from '../utils/options/fees.js';
-
-function printProfileResult(result: TxProfileResult, log: LogFn) {
-  log(format('\nPer circuit breakdown:\n'));
-  log(
-    format(
-      '  ',
-      'Function name'.padEnd(50),
-      'Time'.padStart(13).padEnd(15),
-      'Gates'.padStart(13).padEnd(15),
-      'Subtotal'.padStart(13).padEnd(15),
-    ),
-  );
-  log(format(''.padEnd(50 + 15 + 15 + 15 + 15, '-')));
-  let acc = 0;
-  let biggest: PrivateExecutionStep = result.executionSteps[0] ?? 0;
-
-  result.executionSteps.forEach(r => {
-    if (r.gateCount! > biggest.gateCount!) {
-      biggest = r;
-    }
-    acc += r.gateCount!;
-    log(
-      format(
-        '  ',
-        r.functionName.padEnd(50),
-        `${r.timings.witgen.toFixed(2)}ms`.padStart(13).padEnd(15),
-        r.gateCount!.toLocaleString().padStart(13).padEnd(15),
-        acc.toLocaleString().padStart(15),
-      ),
-    );
-  });
-  log(
-    format(
-      '\nTotal gates:',
-      acc.toLocaleString(),
-      `(Biggest circuit: ${biggest.functionName} -> ${biggest.gateCount!.toLocaleString()})`,
-    ),
-  );
-
-  log(format('\nSync time:'.padEnd(25), `${result.timings.sync?.toFixed(2)}ms`.padStart(16)));
-  log(
-    format(
-      'Total simulation time:'.padEnd(25),
-      `${result.timings.perFunction.reduce((acc, { time }) => acc + time, 0).toFixed(2)}ms`.padStart(15),
-    ),
-  );
-  log(format('Proving time:'.padEnd(25), `${result.timings.proving?.toFixed(2)}ms`.padStart(15)));
-  log(
-    format(
-      'Total time:'.padEnd(25),
-      `${result.timings.total.toFixed(2)}ms`.padStart(15),
-      `(${result.timings.unaccounted.toFixed(2)}ms unaccounted)`,
-    ),
-  );
-  log('\n');
-}
+import { printProfileResult } from '../utils/profiling.js';
 
 export async function profile(
   wallet: AccountWalletWithSecretKey,
@@ -88,7 +31,7 @@ export async function profile(
     authWitnesses,
     skipProofGeneration: false,
   });
-  printProfileResult(result, log);
+  printProfileResult(result.timings, log, result.executionSteps);
   if (debugOutputPath) {
     const ivcInputsPath = path.join(debugOutputPath, 'ivc-inputs.msgpack');
     log(`Debug output written to ${ivcInputsPath}.`);

package/src/cmds/register_contract.ts

@@ -20,7 +20,7 @@ export async function registerContract(
   publicKeys?: PublicKeys,
   rawArgs?: any[],
   salt?: Fr,
-  deployer?: AztecAddress | undefined,
+  deployer?: AztecAddress,
 ) {
   const contractArtifact = await getContractArtifact(artifactPath, log);
   const hasInitializer = getAllFunctionAbis(contractArtifact).some(fn => fn.isInitializer);

package/src/cmds/send.ts

@@ -11,6 +11,7 @@ import type { LogFn } from '@aztec/foundation/log';
 import { GasSettings } from '@aztec/stdlib/gas';
 
 import { type IFeeOpts, printGasEstimates } from '../utils/options/fees.js';
+import { printProfileResult } from '../utils/profiling.js';
 
 export async function send(
   wallet: AccountWalletWithSecretKey,
@@ -22,6 +23,7 @@ export async function send(
   cancellable: boolean,
   feeOpts: IFeeOpts,
   authWitnesses: AuthWitness[],
+  verbose: boolean,
   log: LogFn,
 ) {
   const { functionArgs, contractArtifact } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
@@ -45,7 +47,12 @@ export async function send(
     return;
   }
 
-  const tx = call.send(sendOptions);
+  const provenTx = await call.prove(sendOptions);
+  if (verbose) {
+    printProfileResult(provenTx.timings!, log);
+  }
+
+  const tx = provenTx.send();
   const txHash = await tx.getTxHash();
   log(`\nTransaction hash: ${txHash.toString()}`);
   if (wait) {

package/src/cmds/simulate.ts

@@ -4,19 +4,31 @@ import type { LogFn } from '@aztec/foundation/log';
 
 import { format } from 'util';
 
+import type { IFeeOpts } from '../utils/options/fees.js';
+import { printProfileResult } from '../utils/profiling.js';
+
 export async function simulate(
   wallet: AccountWalletWithSecretKey,
   functionName: string,
   functionArgsIn: any[],
   contractArtifactPath: string,
   contractAddress: AztecAddress,
+  feeOpts: IFeeOpts,
   authWitnesses: AuthWitness[],
+  verbose: boolean,
   log: LogFn,
 ) {
   const { functionArgs, contractArtifact } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
 
   const contract = await Contract.at(contractAddress, contractArtifact, wallet);
   const call = contract.methods[functionName](...functionArgs);
-  const result = await call.simulate({ authWitnesses });
-  log(format('\nSimulation result: ', result, '\n'));
+  const simulationResult = await call.simulate({
+    ...(await feeOpts.toSendOpts(wallet)),
+    authWitnesses,
+    includeMetadata: true,
+  });
+  if (verbose) {
+    printProfileResult(simulationResult.meta.timings!, log);
+  }
+  log(format('\nSimulation result: ', simulationResult.result, '\n'));
 }

package/src/storage/wallet_db.ts

@@ -163,7 +163,7 @@ export class WalletDB {
   tryRetrieveAlias(arg: string) {
     try {
       return this.retrieveAliasFromCache(arg);
-    } catch (e) {
+    } catch {
       return arg;
     }
   }