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

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';
@@ -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

@@ -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

@@ -5,8 +5,8 @@ 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/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

@@ -11,7 +11,7 @@ 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 = {
@@ -250,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)));

package/src/utils/wallet.ts

@@ -25,14 +25,10 @@ import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/stdlib/tx';
 import { BaseWallet } from '@aztec/wallet-sdk/base-wallet';
 
 import type { WalletDB } from '../storage/wallet_db.js';
+import type { AccountType } from './constants.js';
 import { extractECDSAPublicKeyFromBase64String } from './ecdsa.js';
 import { printGasEstimates } from './options/fees.js';
 
-export const AccountTypes = ['schnorr', 'ecdsasecp256r1', 'ecdsasecp256r1ssh', 'ecdsasecp256k1'] as const;
-export type AccountType = (typeof AccountTypes)[number];
-
-export const BASE_FEE_PADDING = 0.5;
-
 export class CLIWallet extends BaseWallet {
   private accountCache = new Map<string, Account>();
 
@@ -71,6 +67,7 @@ export class CLIWallet extends BaseWallet {
     const feeOptions = await this.completeFeeOptions(from, executionPayload.feePayer, increasedFee.gasSettings);
     const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
     const fromAccount = await this.getAccountFromAddress(from);
+    const chainInfo = await this.getChainInfo();
     const executionOptions: DefaultAccountEntrypointOptions = {
       txNonce,
       cancellable: this.cancellableTransactions,
@@ -79,6 +76,7 @@ export class CLIWallet extends BaseWallet {
     return await fromAccount.createTxExecutionRequest(
       feeExecutionPayload ?? executionPayload,
       feeOptions.gasSettings,
+      chainInfo,
       executionOptions,
     );
   }
@@ -95,8 +93,7 @@ export class CLIWallet extends BaseWallet {
   override async getAccountFromAddress(address: AztecAddress) {
     let account: Account | undefined;
     if (address.equals(AztecAddress.ZERO)) {
-      const chainInfo = await this.getChainInfo();
-      account = new SignerlessAccount(chainInfo);
+      account = new SignerlessAccount();
     } else if (this.accountCache.has(address.toString())) {
       return this.accountCache.get(address.toString())!;
     } else {
@@ -180,15 +177,26 @@ export class CLIWallet extends BaseWallet {
     return account;
   }
 
+  /**
+   * Creates a stub account that impersonates the given address, allowing kernelless simulations
+   * to bypass the account's authorization mechanisms via contract overrides.
+   * @param address - The address of the account to impersonate
+   * @returns The stub account, contract instance, and artifact for simulation
+   */
   private async getFakeAccountDataFor(address: AztecAddress) {
-    const chainInfo = await this.getChainInfo();
     const originalAccount = await this.getAccountFromAddress(address);
-    const originalAddress = originalAccount.getCompleteAddress();
-    const { contractInstance } = await this.pxe.getContractMetadata(originalAddress.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 as Account).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, chainInfo);
+    const stubAccount = createStubAccount(originalAddress);
     const instance = await getContractInstanceFromInstantiationParams(StubAccountContractArtifact, {
       salt: Fr.random(),
     });
@@ -205,6 +213,7 @@ export class CLIWallet extends BaseWallet {
       ? await this.completeFeeOptionsForEstimation(opts.from, executionPayload.feePayer, opts.fee?.gasSettings)
       : await this.completeFeeOptions(opts.from, executionPayload.feePayer, opts.fee?.gasSettings);
     const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
+    const chainInfo = await this.getChainInfo();
     const executionOptions: DefaultAccountEntrypointOptions = {
       txNonce: Fr.random(),
       cancellable: this.cancellableTransactions,
@@ -222,6 +231,7 @@ export class CLIWallet extends BaseWallet {
       const txRequest = await fromAccount.createTxExecutionRequest(
         finalExecutionPayload,
         feeOptions.gasSettings,
+        chainInfo,
         executionOptions,
       );
       simulationResults = await this.pxe.simulateTx(
@@ -235,6 +245,7 @@ export class CLIWallet extends BaseWallet {
       const txRequest = await fromAccount.createTxExecutionRequest(
         finalExecutionPayload,
         feeOptions.gasSettings,
+        chainInfo,
         executionOptions,
       );
       const contractOverrides = {
@@ -263,4 +274,10 @@ export class CLIWallet extends BaseWallet {
   getNotes(filter: NotesFilter): Promise<NoteDao[]> {
     return this.pxe.debug.getNotes(filter);
   }
+
+  // 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.
+  getContractArtifact(id: Fr) {
+    return this.pxe.getContractArtifact(id);
+  }
 }