@aztec/cli-wallet 0.0.1-commit.b655e406 → 0.0.1-commit.d1f2d6c

package/src/bin/index.ts

@@ -1,7 +1,9 @@
+#!/usr/bin/env node
 import { computeSecretHash } from '@aztec/aztec.js/crypto';
 import { Fr } from '@aztec/aztec.js/fields';
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
 import { ProtocolContractAddress } from '@aztec/aztec.js/protocol';
+import { BackendType, Barretenberg } from '@aztec/bb.js';
 import { LOCALHOST } from '@aztec/cli/cli-utils';
 import { type LogFn, createConsoleLogger, createLogger } from '@aztec/foundation/log';
 import { openStoreAt } from '@aztec/kv-store/lmdb-v2';
@@ -9,10 +11,8 @@ import type { PXEConfig } from '@aztec/pxe/config';
 import { getPackageVersion } from '@aztec/stdlib/update-checker';
 
 import { Argument, Command, Option } from 'commander';
-import { mkdirSync } from 'fs';
 import { homedir } from 'os';
-import { dirname, join, resolve } from 'path';
-import { fileURLToPath } from 'url';
+import { join } from 'path';
 
 import { injectCommands } from '../cmds/index.js';
 import { Aliases, WalletDB } from '../storage/wallet_db.js';
@@ -95,22 +95,26 @@ async function main() {
         .default(`http://${LOCALHOST}:8080`),
     )
     .hook('preSubcommand', async command => {
+      // Skip initialization if user is just requesting help
+      if (command.args.includes('--help') || command.args.includes('-h')) {
+        return;
+      }
+
       const { dataDir, nodeUrl, prover } = command.optsWithGlobals();
 
       const proverEnabled = prover !== 'none';
 
-      const bbBinaryPath =
-        prover === 'native'
-          ? (process.env.BB_BINARY_PATH ??
-            resolve(dirname(fileURLToPath(import.meta.url)), '../../../../barretenberg/cpp/build/bin/bb'))
-          : undefined;
-      const bbWorkingDirectory = dataDir + '/bb';
-      mkdirSync(bbWorkingDirectory, { recursive: true });
+      switch (prover) {
+        case 'native':
+          await Barretenberg.initSingleton({ backend: BackendType.NativeUnixSocket });
+          break;
+        case 'wasm':
+          await Barretenberg.initSingleton({ backend: BackendType.Wasm });
+          break;
+      }
 
       const overridePXEConfig: Partial<PXEConfig> = {
         proverEnabled,
-        bbBinaryPath: prover === 'native' ? bbBinaryPath : undefined,
-        bbWorkingDirectory: prover === 'native' ? bbWorkingDirectory : undefined,
         dataDirectory: join(dataDir, 'pxe'),
       };
 
@@ -142,6 +146,8 @@ async function main() {
   injectCommands(program, userLog, debugLogger, walletAndNodeWrapper, db);
   injectInternalCommands(program, userLog, db);
   await program.parseAsync(process.argv);
+
+  await Barretenberg.destroySingleton();
 }
 
 main().catch(err => {

package/src/cmds/authorize_action.ts

@@ -30,7 +30,7 @@ export async function authorizeAction(
     );
   }
 
-  const contract = await Contract.at(contractAddress, contractArtifact, wallet);
+  const contract = Contract.at(contractAddress, contractArtifact, wallet);
   const action = contract.methods[functionName](...functionArgs);
 
   const setAuthwitnessInteraction = await SetPublicAuthwitContractInteraction.create(
@@ -39,7 +39,7 @@ export async function authorizeAction(
     { caller, action },
     true,
   );
-  const witness = await setAuthwitnessInteraction.send().wait({ timeout: DEFAULT_TX_TIMEOUT_S });
+  const witness = await setAuthwitnessInteraction.send({ wait: { timeout: DEFAULT_TX_TIMEOUT_S } });
 
   log(`Authorized action ${functionName} on contract ${contractAddress} for caller ${caller}`);
 

package/src/cmds/bridge_fee_juice.ts

@@ -2,8 +2,9 @@ import { L1FeeJuicePortalManager } from '@aztec/aztec.js/ethereum';
 import type { AztecNode } from '@aztec/aztec.js/node';
 import { ProtocolContractAddress } from '@aztec/aztec.js/protocol';
 import { prettyPrintJSON } from '@aztec/cli/utils';
-import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
-import { Fr } from '@aztec/foundation/fields';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { createExtendedL1Client } from '@aztec/ethereum/client';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';

package/src/cmds/check_tx.ts

@@ -6,7 +6,7 @@ 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 { UniqueNote } from '@aztec/stdlib/note';
+import { NoteDao } from '@aztec/stdlib/note';
 
 import type { CLIWallet } from '../utils/wallet.js';
 
@@ -32,7 +32,10 @@ async function inspectTx(wallet: CLIWallet, aztecNode: AztecNode, txHash: TxHash
   const [receipt, effectsInBlock] = await Promise.all([aztecNode.getTxReceipt(txHash), aztecNode.getTxEffect(txHash)]);
   // Base tx data
   log(`Tx ${txHash.toString()}`);
-  log(` Status: ${receipt.status} ${effectsInBlock ? `(${effectsInBlock.data.revertCode.getDescription()})` : ''}`);
+  log(` Status: ${receipt.status}`);
+  if (receipt.executionResult) {
+    log(` Execution result: ${receipt.executionResult}`);
+  }
   if (receipt.error) {
     log(` Error: ${receipt.error}`);
   }
@@ -121,11 +124,10 @@ async function inspectTx(wallet: CLIWallet, aztecNode: AztecNode, txHash: TxHash
   }
 }
 
-function inspectNote(note: UniqueNote, artifactMap: ArtifactMap, log: LogFn, text = 'Note') {
+function inspectNote(note: NoteDao, artifactMap: ArtifactMap, log: LogFn, text = 'Note') {
   const artifact = artifactMap[note.contractAddress.toString()];
   const contract = artifact?.name ?? note.contractAddress.toString();
   log(`  ${text} at ${contract}`);
-  log(`    Recipient: ${toFriendlyAddress(note.recipient, artifactMap)}`);
   for (const field of note.note.items) {
     log(`    ${field.toString()}`);
   }
@@ -165,15 +167,11 @@ async function getKnownArtifacts(wallet: CLIWallet): Promise<ArtifactMap> {
   const knownContractAddresses = await wallet.getContracts();
   const knownContracts = (
     await Promise.all(knownContractAddresses.map(contractAddress => wallet.getContractMetadata(contractAddress)))
-  ).map(contractMetadata => contractMetadata.contractInstance);
+  ).map(contractMetadata => contractMetadata.instance);
   const classIds = [...new Set(knownContracts.map(contract => contract?.currentContractClassId))];
   const knownArtifacts = (
-    await Promise.all(classIds.map(classId => (classId ? wallet.getContractClassMetadata(classId) : undefined)))
-  ).map(contractClassMetadata =>
-    contractClassMetadata
-      ? { ...contractClassMetadata.artifact, classId: contractClassMetadata.contractClass?.id }
-      : undefined,
-  );
+    await Promise.all(classIds.map(classId => (classId ? wallet.getContractArtifact(classId) : undefined)))
+  ).map((artifact, index) => (artifact ? { ...artifact, classId: classIds[index] } : undefined));
   const map: Record<string, ContractArtifactWithClassId> = {};
   for (const instance of knownContracts) {
     if (instance) {

package/src/cmds/create_account.ts

@@ -1,14 +1,17 @@
 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 { DeployAccountOptions } from '@aztec/aztec.js/wallet';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { LogFn, Logger } from '@aztec/foundation/log';
+import type { TxHash, TxReceipt } from '@aztec/stdlib/tx';
 
 import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
+import type { AccountType } from '../utils/constants.js';
 import { CLIFeeArgs } from '../utils/options/fees.js';
 import { printProfileResult } from '../utils/profiling.js';
-import { type AccountType, CLIWallet } from '../utils/wallet.js';
+import { CLIWallet } from '../utils/wallet.js';
 
 export async function createAccount(
   wallet: CLIWallet,
@@ -63,8 +66,8 @@ export async function createAccount(
     log(`Init hash:       ${account.getInstance().initializationHash.toString()}`);
   }
 
-  let tx;
-  let txReceipt;
+  let txHash: TxHash | undefined;
+  let txReceipt: TxReceipt | undefined;
   if (!registerOnly) {
     const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
 
@@ -99,7 +102,14 @@ export async function createAccount(
         };
       }
     } else {
-      tx = deployMethod.send({
+      if (verbose) {
+        printProfileResult(stats, log);
+      }
+
+      if (!json) {
+        log(`\nWaiting for account contract deployment...`);
+      }
+      const result = await deployMethod.send({
         ...deployAccountOpts,
         fee: deployAccountOpts.fee
           ? {
@@ -107,32 +117,29 @@ export async function createAccount(
               gasSettings: estimatedGas,
             }
           : undefined,
+        wait: wait ? { timeout: DEFAULT_TX_TIMEOUT_S, returnReceipt: true } : NO_WAIT,
       });
-      if (verbose) {
-        printProfileResult(stats, log);
-      }
-
-      const txHash = await tx.getTxHash();
-      debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
-      out.txHash = txHash;
-      if (wait) {
-        if (!json) {
-          log(`\nWaiting for account contract deployment...`);
-        }
-        txReceipt = await tx.wait({ timeout: DEFAULT_TX_TIMEOUT_S });
+      const isReceipt = (data: TxReceipt | TxHash): data is TxReceipt => 'txHash' in data;
+      if (isReceipt(result)) {
+        txReceipt = result;
+        txHash = result.txHash;
         out.txReceipt = {
           status: txReceipt.status,
           transactionFee: txReceipt.transactionFee,
         };
+      } else {
+        txHash = result;
       }
+      debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
+      out.txHash = txHash;
     }
   }
 
   if (json) {
     log(prettyPrintJSON(out));
   } else {
-    if (tx) {
-      log(`Deploy tx hash:  ${(await tx.getTxHash()).toString()}`);
+    if (txHash) {
+      log(`Deploy tx hash:  ${txHash.toString()}`);
     }
     if (txReceipt) {
       log(`Deploy tx fee:   ${txReceipt.transactionFee}`);

package/src/cmds/create_authwit.ts

@@ -28,7 +28,7 @@ export async function createAuthwit(
     );
   }
 
-  const contract = await Contract.at(contractAddress, contractArtifact, wallet);
+  const contract = Contract.at(contractAddress, contractArtifact, wallet);
   const call = await contract.methods[functionName](...functionArgs).getFunctionCall();
 
   const witness = await wallet.createAuthWit(from, { caller, call });

package/src/cmds/deploy.ts

@@ -1,5 +1,6 @@
 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';
@@ -89,37 +90,55 @@ export async function deploy(
       };
     }
   } else {
-    const tx = deploy.send(deployOpts);
     if (verbose) {
       printProfileResult(stats, log);
     }
 
-    const txHash = await tx.getTxHash();
-    debugLogger.debug(`Deploy tx sent with hash ${txHash.toString()}`);
-    out.hash = txHash;
     const { address, partialAddress } = deploy;
     const instance = await deploy.getInstance();
-    if (!json) {
-      log(`Contract deployed at ${address?.toString()}`);
-      log(`Contract partial address ${(await 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(),
-        initializationHash: instance.initializationHash.toString(),
-        salt: salt.toString(),
-      };
-    }
+
     if (wait) {
-      const deployed = await tx.wait({ timeout });
+      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;
+
+      if (!json) {
+        log(`Contract deployed at ${address?.toString()}`);
+        log(`Contract partial address ${(await 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()}`);
+      } else {
+        out.contract = {
+          address: address?.toString(),
+          partialAddress: (await 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(`Transaction fee: ${deployed.transactionFee?.toString()}`);
+        log(`Contract deployed at ${address?.toString()}`);
+        log(`Contract partial address ${(await 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.transactionFee = deployed.transactionFee?.toString();
+        out.contract = {
+          address: address?.toString(),
+          partialAddress: (await partialAddress)?.toString(),
+          initializationHash: instance.initializationHash.toString(),
+          salt: salt.toString(),
+        };
       }
     }
   }

package/src/cmds/deploy_account.ts

@@ -1,8 +1,10 @@
 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 { DeployAccountOptions } from '@aztec/aztec.js/wallet';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import type { LogFn, Logger } from '@aztec/foundation/log';
+import type { TxHash, TxReceipt } from '@aztec/stdlib/tx';
 
 import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
 import type { CLIFeeArgs } from '../utils/options/fees.js';
@@ -45,8 +47,8 @@ export async function deployAccount(
     log(`Init hash:       ${initializationHash.toString()}`);
   }
 
-  let tx;
-  let txReceipt;
+  let txHash: TxHash | undefined;
+  let txReceipt: TxReceipt | undefined;
   const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
 
   const delegatedDeployment = deployer && !account.address.equals(deployer);
@@ -80,7 +82,14 @@ export async function deployAccount(
       };
     }
   } else {
-    tx = deployMethod.send({
+    if (verbose) {
+      printProfileResult(stats, log);
+    }
+
+    if (!json) {
+      log(`\nWaiting for account contract deployment...`);
+    }
+    const result = await deployMethod.send({
       ...deployAccountOpts,
       fee: deployAccountOpts.fee
         ? {
@@ -88,31 +97,28 @@ export async function deployAccount(
             gasSettings: estimatedGas,
           }
         : undefined,
+      wait: wait ? { timeout: DEFAULT_TX_TIMEOUT_S, returnReceipt: true } : NO_WAIT,
     });
-    if (verbose) {
-      printProfileResult(stats, log);
-    }
-
-    const txHash = await tx.getTxHash();
-    debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
-    out.txHash = txHash;
-    if (wait) {
-      if (!json) {
-        log(`\nWaiting for account contract deployment...`);
-      }
-      txReceipt = await tx.wait({ timeout: DEFAULT_TX_TIMEOUT_S });
+    const isReceipt = (data: TxReceipt | TxHash): data is TxReceipt => 'txHash' in data;
+    if (isReceipt(result)) {
+      txReceipt = result;
+      txHash = result.txHash;
       out.txReceipt = {
         status: txReceipt.status,
         transactionFee: txReceipt.transactionFee,
       };
+    } else {
+      txHash = result;
     }
+    debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
+    out.txHash = txHash;
   }
 
   if (json) {
     log(prettyPrintJSON(out));
   } else {
-    if (tx) {
-      log(`Deploy tx hash:  ${(await tx.getTxHash()).toString()}`);
+    if (txHash) {
+      log(`Deploy tx hash:  ${txHash.toString()}`);
     }
     if (txReceipt) {
       log(`Deploy tx fee:   ${txReceipt.transactionFee}`);

package/src/cmds/index.ts

@@ -10,7 +10,7 @@ import {
   parseFieldFromHexString,
   parsePublicKey,
 } from '@aztec/cli/utils';
-import { randomBytes } from '@aztec/foundation/crypto';
+import { randomBytes } from '@aztec/foundation/crypto/random';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 
 import { type Command, Option } from 'commander';
@@ -18,6 +18,7 @@ import inquirer from 'inquirer';
 
 import type { WalletDB } from '../storage/wallet_db.js';
 import type { CliWalletAndNodeWrapper } from '../utils/cli_wallet_and_node_wrapper.js';
+import type { AccountType } from '../utils/constants.js';
 import {
   ARTIFACT_DESCRIPTION,
   CLIFeeArgs,
@@ -38,7 +39,6 @@ import {
   createVerboseOption,
   integerArgParser,
 } from '../utils/options/index.js';
-import type { AccountType } from '../utils/wallet.js';
 
 // TODO: This function is only used in 1 place so we could just inline this
 export function injectCommands(
@@ -346,7 +346,7 @@ export function injectCommands(
       log,
     );
     if (db && sentTx) {
-      const txAlias = alias ? alias : `${functionName}-${randomBytes(16).toString()}`;
+      const txAlias = alias ? alias : `${functionName}-${randomBytes(16).toString('hex')}`;
       await db.storeTx(sentTx, log, txAlias);
     }
   });

package/src/cmds/profile.ts

@@ -28,7 +28,7 @@ export async function profile(
 ) {
   const { functionArgs, contractArtifact } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
 
-  const contract = await Contract.at(contractAddress, contractArtifact, wallet);
+  const contract = Contract.at(contractAddress, contractArtifact, wallet);
   const call = contract.methods[functionName](...functionArgs);
 
   const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(node, wallet, from);

package/src/cmds/send.ts

@@ -1,6 +1,6 @@
 import type { AztecAddress } from '@aztec/aztec.js/addresses';
 import { AuthWitness } from '@aztec/aztec.js/authorization';
-import { Contract, type SendInteractionOptions } from '@aztec/aztec.js/contracts';
+import { Contract, NO_WAIT, type SendInteractionOptions } from '@aztec/aztec.js/contracts';
 import type { AztecNode } from '@aztec/aztec.js/node';
 import { prepTx } from '@aztec/cli/utils';
 import type { LogFn } from '@aztec/foundation/log';
@@ -27,7 +27,7 @@ export async function send(
 ) {
   const { functionArgs, contractArtifact } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
 
-  const contract = await Contract.at(contractAddress, contractArtifact, wallet);
+  const contract = Contract.at(contractAddress, contractArtifact, wallet);
   const call = contract.methods[functionName](...functionArgs);
 
   const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(node, wallet, from);
@@ -46,31 +46,43 @@ export async function send(
     return;
   }
 
-  const tx = call.send({ ...sendOptions, fee: { ...sendOptions.fee, gasSettings: estimatedGas } });
   if (verbose) {
     printProfileResult(stats!, log);
   }
 
-  const txHash = await tx.getTxHash();
-  log(`\nTransaction hash: ${txHash.toString()}`);
   if (wait) {
     try {
-      await tx.wait({ timeout: DEFAULT_TX_TIMEOUT_S });
+      const receipt = await call.send({
+        ...sendOptions,
+        fee: { ...sendOptions.fee, gasSettings: estimatedGas },
+        wait: { timeout: DEFAULT_TX_TIMEOUT_S },
+      });
 
+      const txHash = receipt.txHash;
+      log(`\nTransaction hash: ${txHash.toString()}`);
       log('Transaction has been mined');
-
-      const receipt = await tx.getReceipt();
       log(` Tx fee: ${receipt.transactionFee}`);
       log(` Status: ${receipt.status}`);
       log(` Block number: ${receipt.blockNumber}`);
       log(` Block hash: ${receipt.blockHash?.toString()}`);
+
+      return {
+        txHash,
+      };
     } catch (err: any) {
       log(`Transaction failed\n ${err.message}`);
+      throw err;
     }
   } else {
+    const txHash = await call.send({
+      ...sendOptions,
+      fee: { ...sendOptions.fee, gasSettings: estimatedGas },
+      wait: NO_WAIT,
+    });
+    log(`\nTransaction hash: ${txHash.toString()}`);
     log('Transaction pending. Check status with check-tx');
+    return {
+      txHash,
+    };
   }
-  return {
-    txHash,
-  };
 }

package/src/cmds/simulate.ts

@@ -27,7 +27,7 @@ export async function simulate(
 ) {
   const { functionArgs, contractArtifact } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
 
-  const contract = await Contract.at(contractAddress, contractArtifact, wallet);
+  const contract = Contract.at(contractAddress, contractArtifact, wallet);
   const call = contract.methods[functionName](...functionArgs);
   const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(node, wallet, from);
   const simulationResult = await call.simulate({
@@ -41,14 +41,11 @@ export async function simulate(
       simulationResult.offchainEffects!,
       async (address: AztecAddress) => {
         const metadata = await wallet.getContractMetadata(address);
-        if (!metadata.contractInstance) {
+        if (!metadata.instance) {
           return undefined;
         }
-        const classMetadata = await wallet.getContractClassMetadata(
-          metadata.contractInstance.currentContractClassId,
-          true,
-        );
-        return classMetadata.artifact;
+        const artifact = await wallet.getContractArtifact(metadata.instance.currentContractClassId);
+        return artifact;
       },
       log,
     );

package/src/storage/wallet_db.ts

@@ -1,12 +1,12 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { LogFn } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { TxHash } from '@aztec/stdlib/tx';
 
+import type { AccountType } from '../utils/constants.js';
 import { extractECDSAPublicKeyFromBase64String } from '../utils/ecdsa.js';
-import type { AccountType } from '../utils/wallet.js';
 
 export const Aliases = ['accounts', 'contracts', 'artifacts', 'secrets', 'transactions', 'authwits'] as const;
 export type AliasType = (typeof Aliases)[number];

package/src/utils/cli_wallet_and_node_wrapper.ts

@@ -21,7 +21,7 @@ export class CliWalletAndNodeWrapper {
     return this._wallet;
   }
 
-  get node() {
+  get node(): AztecNode {
     if (!this._node) {
       throw new Error('Node not initialized while it should have been initialized in preSubcommand');
     }

package/src/utils/constants.ts

@@ -0,0 +1,4 @@
+export const MIN_FEE_PADDING = 0.5;
+
+export const AccountTypes = ['schnorr', 'ecdsasecp256r1', 'ecdsasecp256r1ssh', 'ecdsasecp256k1'] as const;
+export type AccountType = (typeof AccountTypes)[number];

package/src/utils/options/fees.ts

@@ -1,16 +1,17 @@
 import type { FeePaymentMethod } from '@aztec/aztec.js/fee';
 import type { AztecNode } from '@aztec/aztec.js/node';
-import type { FeeOptions, Wallet } from '@aztec/aztec.js/wallet';
-import { Fr } from '@aztec/foundation/fields';
+import type { Wallet } from '@aztec/aztec.js/wallet';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { LogFn } from '@aztec/foundation/log';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { Gas, GasFees, GasSettings } from '@aztec/stdlib/gas';
+import type { FeeOptions } from '@aztec/wallet-sdk/base-wallet';
 
 import { Option } from 'commander';
 
 import type { WalletDB } from '../../storage/wallet_db.js';
-import { BASE_FEE_PADDING } from '../wallet.js';
+import { MIN_FEE_PADDING } from '../constants.js';
 import { aliasedAddressParser } from './options.js';
 
 export type RawCliFeeArgs = {
@@ -249,7 +250,7 @@ export class CLIFeeArgs {
   ) {}
 
   async toUserFeeOptions(node: AztecNode, wallet: Wallet, from: AztecAddress): Promise<ParsedFeeOptions> {
-    const maxFeesPerGas = (await node.getCurrentBaseFees()).mul(1 + BASE_FEE_PADDING);
+    const maxFeesPerGas = (await node.getCurrentMinFees()).mul(1 + MIN_FEE_PADDING);
     const gasSettings = GasSettings.default({ ...this.gasSettings, maxFeesPerGas });
     const paymentMethod = await this.paymentMethod(wallet, from, gasSettings);
     return {

package/src/utils/options/options.ts

@@ -7,7 +7,7 @@ import { Option } from 'commander';
 import { readdir, stat } from 'fs/promises';
 
 import type { AliasType, WalletDB } from '../../storage/wallet_db.js';
-import { AccountTypes } from '../wallet.js';
+import { AccountTypes } from '../constants.js';
 
 const TARGET_DIR = 'target';
 

package/src/utils/profiling.ts

@@ -95,7 +95,7 @@ export function printProfileResult(
 
   if (stats.nodeRPCCalls) {
     log(format('\nRPC calls:\n'));
-    for (const [method, { times }] of Object.entries(stats.nodeRPCCalls)) {
+    for (const [method, { times }] of Object.entries(stats.nodeRPCCalls.perMethod)) {
       const calls = times.length;
       const total = times.reduce((acc, time) => acc + time, 0);
       const avg = total / calls;
@@ -112,6 +112,20 @@ export function printProfileResult(
         ),
       );
     }
+
+    const { roundTrips } = stats.nodeRPCCalls;
+    log(format('\nRound trips (actual blocking waits):\n'));
+    log(format('Round trips:'.padEnd(25), `${roundTrips.roundTrips}`.padStart(COLUMN_MAX_WIDTH)));
+    log(
+      format(
+        'Total blocking time:'.padEnd(25),
+        `${roundTrips.totalBlockingTime.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH),
+      ),
+    );
+    if (roundTrips.roundTrips > 0) {
+      const avgRoundTrip = roundTrips.totalBlockingTime / roundTrips.roundTrips;
+      log(format('Avg round trip:'.padEnd(25), `${avgRoundTrip.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH)));
+    }
   }
 
   log(format('\nSync time:'.padEnd(25), `${timings.sync?.toFixed(2)}ms`.padStart(16)));