@aztec/cli-wallet 0.0.1-commit.b6e433891 → 0.0.1-commit.b9865e97

package/src/cmds/deploy_account.ts

@@ -1,10 +1,11 @@
+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 type { LogFn, Logger } from '@aztec/foundation/log';
-import type { TxHash, TxReceipt } from '@aztec/stdlib/tx';
+import type { TxHash, TxReceipt, TxStatus } 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';
@@ -21,6 +22,7 @@ export async function deployAccount(
   publicDeploy: boolean,
   skipInitialization: boolean,
   feeOpts: CLIFeeArgs,
+  waitForStatus: TxStatus,
   json: boolean,
   verbose: boolean,
   debugLogger: Logger,
@@ -52,7 +54,7 @@ export async function deployAccount(
   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,
@@ -62,6 +64,7 @@ export async function deployAccount(
     fee: { paymentMethod, gasSettings },
   };
 
+  const localStart = performance.now();
   const deployMethod = await account.getDeployMethod();
   const sim = await deployMethod.simulate({
     ...deployAccountOpts,
@@ -101,19 +104,24 @@ export async function deployAccount(
           }
         : undefined,
     };
+
+    ({ txHash } = await deployMethod.send({ ...sendOpts, wait: NO_WAIT }));
+    const localTimeMs = performance.now() - localStart;
+
     if (wait) {
-      const { receipt } = await deployMethod.send({
-        ...sendOpts,
-        wait: { timeout: DEFAULT_TX_TIMEOUT_S, returnReceipt: true },
-      });
-      txReceipt = receipt;
-      txHash = receipt.txHash;
+      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 } = await deployMethod.send({ ...sendOpts, wait: NO_WAIT }));
+
+      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;

package/src/cmds/get_fee_juice_balance.ts

@@ -0,0 +1,37 @@
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import { getFeeJuiceBalance } from '@aztec/aztec.js/utils';
+import { prettyPrintJSON } from '@aztec/cli/cli-utils';
+import type { LogFn } from '@aztec/foundation/log';
+
+const FEE_JUICE_DECIMALS = 18;
+const FEE_JUICE_UNIT = 10n ** BigInt(FEE_JUICE_DECIMALS);
+
+/** Formats a raw FeeJuice balance (18 decimals) for human-readable display. */
+function formatFeeJuice(raw: bigint, exact: boolean): string {
+  const whole = raw / FEE_JUICE_UNIT;
+  const fractional = raw % FEE_JUICE_UNIT;
+  const fracStr = fractional.toString().padStart(FEE_JUICE_DECIMALS, '0');
+  if (exact) {
+    return `${whole}.${fracStr} FJ`;
+  }
+  if (fractional === 0n) {
+    return `${whole} FJ`;
+  }
+  return `${whole}.${fracStr.replace(/0+$/, '')} FJ`;
+}
+
+export async function getFeeJuiceBalanceCmd(
+  node: AztecNode,
+  address: AztecAddress,
+  json: boolean,
+  exact: boolean,
+  log: LogFn,
+) {
+  const balance = await getFeeJuiceBalance(address, node);
+  if (json) {
+    log(prettyPrintJSON({ address: address.toString(), balance: balance.toString() }));
+  } else {
+    log(`Fee Juice balance for ${address.toString()}: ${formatFeeJuice(balance, exact)}`);
+  }
+}

package/src/cmds/index.ts

@@ -12,6 +12,7 @@ import {
 } from '@aztec/cli/utils';
 import { randomBytes } from '@aztec/foundation/crypto/random';
 import type { LogFn, Logger } from '@aztec/foundation/log';
+import { TxStatus } from '@aztec/stdlib/tx';
 
 import { type Command, Option } from 'commander';
 import inquirer from 'inquirer';
@@ -40,6 +41,17 @@ import {
   integerArgParser,
 } from '../utils/options/index.js';
 
+function parseWaitForStatus(status: string): TxStatus {
+  switch (status) {
+    case 'proposed':
+      return TxStatus.PROPOSED;
+    case 'checkpointed':
+      return TxStatus.CHECKPOINTED;
+    default:
+      throw new Error(`Invalid wait-for-status: ${status}. Use 'proposed' or 'checkpointed'.`);
+  }
+}
+
 // TODO: This function is only used in 1 place so we could just inline this
 export function injectCommands(
   program: Command,
@@ -90,6 +102,11 @@ export function injectCommands(
     )
     .addOption(createAliasOption('Alias for the account. Used for easy reference in subsequent commands.', !db))
     .addOption(createTypeOption(true))
+    .option(
+      '-s, --salt <hex string>',
+      'Optional deployment salt as a hex string for generating the deployment address. Defaults to 0.',
+      parseFieldFromHexString,
+    )
     .option(
       '--register-only',
       'Just register the account on the Wallet. Do not deploy or initialize the account contract.',
@@ -98,6 +115,7 @@ export function injectCommands(
     // `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('--wait-for-status <status>', "Tx status to wait for: 'proposed' or 'checkpointed'", 'proposed')
     .addOption(createVerboseOption());
 
   addOptions(createAccountCommand, CLIFeeArgs.getOptions()).action(async (_options, command) => {
@@ -107,7 +125,9 @@ export function injectCommands(
       type,
       from: parsedFromAddress,
       secretKey,
+      salt,
       wait,
+      waitForStatus: waitForStatusStr,
       registerOnly,
       skipInitialization,
       publicDeploy,
@@ -137,6 +157,7 @@ export function injectCommands(
       node,
       type,
       secretKey,
+      salt,
       publicKey,
       alias,
       parsedFromAddress,
@@ -146,6 +167,7 @@ export function injectCommands(
       registerClass,
       wait,
       CLIFeeArgs.parse(options, log, db),
+      parseWaitForStatus(waitForStatusStr),
       json,
       verbose,
       debugLogger,
@@ -180,12 +202,22 @@ export function injectCommands(
       '--skip-initialization',
       'Skip initializing the account contract. Useful for publicly deploying an existing account.',
     )
+    .option('--wait-for-status <status>', "Tx status to wait for: 'proposed' or 'checkpointed'", 'proposed')
     .addOption(createVerboseOption());
 
   addOptions(deployAccountCommand, CLIFeeArgs.getOptions()).action(async (parsedAccount, _options, command) => {
     const { deployAccount } = await import('./deploy_account.js');
     const options = command.optsWithGlobals();
-    const { wait, from: parsedFromAddress, json, registerClass, skipInitialization, publicDeploy, verbose } = options;
+    const {
+      wait,
+      waitForStatus: waitForStatusStr,
+      from: parsedFromAddress,
+      json,
+      registerClass,
+      skipInitialization,
+      publicDeploy,
+      verbose,
+    } = options;
 
     const { wallet, node } = walletAndNodeWrapper;
 
@@ -199,6 +231,7 @@ export function injectCommands(
       publicDeploy,
       skipInitialization,
       CLIFeeArgs.parse(options, log, db),
+      parseWaitForStatus(waitForStatusStr),
       json,
       verbose,
       debugLogger,
@@ -219,7 +252,7 @@ export function injectCommands(
     )
     .option(
       '-s, --salt <hex string>',
-      'Optional deployment salt as a hex string for generating the deployment address.',
+      'Optional deployment salt as a hex string for generating the deployment address. Defaults to random.',
       parseFieldFromHexString,
     )
     .option('--universal', 'Do not mix the sender address into the deployment.')
@@ -238,6 +271,7 @@ export function injectCommands(
         'The amount of time in seconds to wait for the deployment to post to L2',
       ).conflicts('wait'),
     )
+    .option('--wait-for-status <status>', "Tx status to wait for: 'proposed' or 'checkpointed'", 'proposed')
     .addOption(createVerboseOption());
 
   addOptions(deployCommand, CLIFeeArgs.getOptions()).action(async (artifactPathPromise, _options, command) => {
@@ -249,6 +283,7 @@ export function injectCommands(
       args,
       salt,
       wait,
+      waitForStatus: waitForStatusStr,
       classRegistration,
       init,
       publicDeployment,
@@ -262,12 +297,12 @@ export function injectCommands(
     const { wallet, node } = walletAndNodeWrapper;
     const artifactPath = await artifactPathPromise;
 
-    debugLogger.info(`Using wallet with address ${parsedFromAddress.toString()}`);
+    debugLogger.info(`Using wallet with address ${parsedFromAddress?.toString() ?? '<none>'}`);
 
     const address = await deploy(
       wallet,
       node,
-      universal ? undefined : parsedFromAddress,
+      parsedFromAddress,
       artifactPath,
       json,
       publicKey,
@@ -279,10 +314,12 @@ export function injectCommands(
       typeof init === 'string' ? false : init,
       wait,
       CLIFeeArgs.parse(options, log, db),
-      timeout,
+      parseWaitForStatus(waitForStatusStr),
       verbose,
+      timeout,
       debugLogger,
       log,
+      universal,
     );
     if (db && address) {
       await db.storeContract(address, artifactPath, log, alias);
@@ -308,6 +345,7 @@ 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('--wait-for-status <status>', "Tx status to wait for: 'proposed' or 'checkpointed'", 'proposed')
     .addOption(createVerboseOption());
 
   addOptions(sendCommand, CLIFeeArgs.getOptions()).action(async (functionName, _options, command) => {
@@ -319,6 +357,7 @@ export function injectCommands(
       contractAddress,
       from: parsedFromAddress,
       wait,
+      waitForStatus: waitForStatusStr,
       alias,
       authWitness: authWitnessArray,
       verbose,
@@ -342,6 +381,7 @@ export function injectCommands(
       alias,
       CLIFeeArgs.parse(options, log, db),
       authWitnesses,
+      parseWaitForStatus(waitForStatusStr),
       verbose,
       log,
     );
@@ -492,6 +532,20 @@ export function injectCommands(
       }
     });
 
+  program
+    .command('get-fee-juice-balance')
+    .description('Checks the Fee Juice balance for a given address.')
+    .argument('<address>', 'Aztec address or alias to check balance for', address =>
+      aliasedAddressParser('accounts', address, db),
+    )
+    .option('--json', 'Emit output as json')
+    .option('--exact', 'Show exact balance with all 18 decimal places')
+    .action(async (address, options) => {
+      const { getFeeJuiceBalanceCmd } = await import('./get_fee_juice_balance.js');
+      const { json, exact } = options;
+      await getFeeJuiceBalanceCmd(walletAndNodeWrapper.node, address, json, exact, log);
+    });
+
   program
     .command('create-authwit')
     .description(

package/src/cmds/send.ts

@@ -1,9 +1,10 @@
 import type { AztecAddress } from '@aztec/aztec.js/addresses';
 import { AuthWitness } from '@aztec/aztec.js/authorization';
 import { Contract, NO_WAIT, type SendInteractionOptions } from '@aztec/aztec.js/contracts';
-import type { AztecNode } from '@aztec/aztec.js/node';
+import { type AztecNode, waitForTx } from '@aztec/aztec.js/node';
 import { prepTx } from '@aztec/cli/utils';
 import type { LogFn } from '@aztec/foundation/log';
+import { 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';
@@ -22,6 +23,7 @@ export async function send(
   cancellable: boolean,
   feeOpts: CLIFeeArgs,
   authWitnesses: AuthWitness[],
+  waitForStatus: TxStatus,
   verbose: boolean,
   log: LogFn,
 ) {
@@ -37,6 +39,7 @@ export async function send(
     authWitnesses,
   };
 
+  const localStart = performance.now();
   const sim = await call.simulate({
     ...sendOptions,
     fee: { ...sendOptions.fee, estimateGas: true },
@@ -53,21 +56,29 @@ export async function send(
     printProfileResult(stats!, log);
   }
 
+  const { txHash } = await call.send({
+    ...sendOptions,
+    fee: { ...sendOptions.fee, gasSettings: estimatedGas },
+    wait: NO_WAIT,
+  });
+  const localTimeMs = performance.now() - localStart;
+
+  log(`\nTransaction hash: ${txHash.toString()}`);
+
   if (wait) {
     try {
-      const { receipt } = await call.send({
-        ...sendOptions,
-        fee: { ...sendOptions.fee, gasSettings: estimatedGas },
-        wait: { timeout: DEFAULT_TX_TIMEOUT_S },
-      });
+      const nodeStart = performance.now();
+      const receipt = await waitForTx(node, txHash, { timeout: DEFAULT_TX_TIMEOUT_S, waitForStatus });
+      const nodeTimeMs = performance.now() - nodeStart;
 
-      const txHash = receipt.txHash;
-      log(`\nTransaction hash: ${txHash.toString()}`);
-      log('Transaction has been mined');
+      const statusLabel = waitForStatus === TxStatus.PROPOSED ? 'proposed' : 'checkpointed';
+      log(`Transaction has been ${statusLabel}`);
       log(` Tx fee: ${receipt.transactionFee}`);
       log(` Status: ${receipt.status}`);
       log(` Block number: ${receipt.blockNumber}`);
       log(` Block hash: ${receipt.blockHash?.toString()}`);
+      log(` Local processing time: ${(localTimeMs / 1000).toFixed(1)}s`);
+      log(` Node inclusion time: ${(nodeTimeMs / 1000).toFixed(1)}s`);
 
       return {
         txHash,
@@ -77,12 +88,6 @@ export async function send(
       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,

package/src/storage/wallet_db.ts

@@ -70,6 +70,20 @@ export class WalletDB {
     return { amount: BigInt(amountStr), secret: secretStr, leafIndex: BigInt(leafIndexStr) };
   }
 
+  async peekBridgedFeeJuice(recipient: AztecAddress, log: LogFn) {
+    const stackPointer =
+      (await this.#bridgedFeeJuice.getAsync(`${recipient.toString()}:stackPointer`))?.readInt8() || 0;
+    const result = await this.#bridgedFeeJuice.getAsync(`${recipient.toString()}:${stackPointer}`);
+    if (!result) {
+      throw new Error(
+        `No stored fee juice available for recipient ${recipient.toString()}. Please provide claim amount and secret. Stack pointer ${stackPointer}`,
+      );
+    }
+    const [amountStr, secretStr, leafIndexStr] = result.toString().split(':');
+    log(`Peeked ${amountStr} fee juice for recipient ${recipient.toString()}. Stack pointer ${stackPointer}`);
+    return { amount: BigInt(amountStr), secret: secretStr, leafIndex: BigInt(leafIndexStr) };
+  }
+
   async storeAccount(
     address: AztecAddress,
     {

package/src/utils/options/fees.ts

@@ -5,7 +5,7 @@ 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 { Gas, GasFees, GasSettings, ManaUsageEstimate } from '@aztec/stdlib/gas';
 import type { FeeOptions } from '@aztec/wallet-sdk/base-wallet';
 
 import { Option } from 'commander';
@@ -115,6 +115,7 @@ export function parsePaymentMethod(
   payment: string,
   log: LogFn,
   db?: WalletDB,
+  estimateOnly?: boolean,
 ): (wallet: Wallet, from: AztecAddress, gasSettings: GasSettings) => Promise<FeePaymentMethod | undefined> {
   const parsed = payment.split(',').reduce(
     (acc, item) => {
@@ -149,7 +150,7 @@ export function parsePaymentMethod(
               amount: claimAmount,
               secret: claimSecret,
               leafIndex: messageLeafIndex,
-            } = await db.popBridgedFeeJuice(from, log));
+            } = estimateOnly ? await db.peekBridgedFeeJuice(from, log) : await db.popBridgedFeeJuice(from, log));
           } else {
             ({ claimAmount, claimSecret, messageLeafIndex } = parsed);
           }
@@ -157,10 +158,10 @@ export function parsePaymentMethod(
           const { FeeJuicePaymentMethodWithClaim } = await import('@aztec/aztec.js/fee');
           return new FeeJuicePaymentMethodWithClaim(from, {
             claimAmount: (typeof claimAmount === 'string'
-              ? Fr.fromHexString(claimAmount)
+              ? Fr.fromString(claimAmount)
               : new Fr(claimAmount)
             ).toBigInt(),
-            claimSecret: Fr.fromHexString(claimSecret),
+            claimSecret: typeof claimSecret === 'string' ? Fr.fromString(claimSecret) : claimSecret,
             messageLeafIndex: BigInt(messageLeafIndex),
           });
         } else {
@@ -256,8 +257,9 @@ export class CLIFeeArgs {
   ) {}
 
   async toUserFeeOptions(node: AztecNode, wallet: Wallet, from: AztecAddress): Promise<ParsedFeeOptions> {
-    const maxFeesPerGas = (await node.getCurrentMinFees()).mul(1 + MIN_FEE_PADDING);
-    const gasSettings = GasSettings.default({ ...this.gasSettings, maxFeesPerGas });
+    const minFees = await this.getMinFees(node);
+    const maxFeesPerGas = minFees.mul(1 + MIN_FEE_PADDING);
+    const gasSettings = GasSettings.fallback({ ...this.gasSettings, maxFeesPerGas });
     const paymentMethod = await this.paymentMethod(wallet, from, gasSettings);
     return {
       paymentMethod,
@@ -265,10 +267,32 @@ export class CLIFeeArgs {
     };
   }
 
+  /**
+   * Returns the worst-case min fee across predicted future slots.
+   * Falls back to getCurrentMinFees if the node doesn't support getPredictedMinFees.
+   */
+  private async getMinFees(node: AztecNode): Promise<GasFees> {
+    try {
+      const predicted = await node.getPredictedMinFees(ManaUsageEstimate.Limit);
+      if (predicted.length === 0) {
+        return node.getCurrentMinFees();
+      }
+      return predicted.reduce((worst, fees) => (fees.feePerL2Gas > worst.feePerL2Gas ? fees : worst));
+    } catch (err: any) {
+      // Fallback for old nodes that don't support getPredictedMinFees.
+      // Only fall back on method-not-found errors (JSON-RPC code -32601); rethrow others.
+      if (err?.cause?.code === -32601 || err?.message?.includes('Method not found')) {
+        return node.getCurrentMinFees();
+      }
+      throw err;
+    }
+  }
+
   static parse(args: RawCliFeeArgs, log: LogFn, db?: WalletDB): CLIFeeArgs {
+    const estimateOnly = !!args.estimateGasOnly;
     return new CLIFeeArgs(
-      !!args.estimateGasOnly,
-      parsePaymentMethod(args.payment ?? 'method=fee_juice', log, db),
+      estimateOnly,
+      parsePaymentMethod(args.payment ?? 'method=fee_juice', log, db, estimateOnly),
       parseGasSettings(args),
     );
   }
@@ -294,7 +318,7 @@ function formatGasEstimate(estimate: Pick<GasSettings, 'gasLimits' | 'teardownGa
 }
 
 function getEstimatedCost(estimate: Pick<GasSettings, 'gasLimits' | 'teardownGasLimits'>, maxFeesPerGas: GasFees) {
-  return GasSettings.default({ ...estimate, maxFeesPerGas })
+  return GasSettings.fallback({ ...estimate, maxFeesPerGas })
     .getFeeLimit()
     .toBigInt();
 }