@aztec/cli-wallet 0.0.1-commit.d431d1c → 0.0.1-commit.d58ff9d0

package/src/cmds/create_account.ts

@@ -1,9 +1,14 @@
+import { deriveSecretKeyFromSigningKey } from '@aztec/accounts/utils';
+import { NO_FROM } from '@aztec/aztec.js/account';
 import { AztecAddress } from '@aztec/aztec.js/addresses';
-import type { AztecNode } from '@aztec/aztec.js/node';
+import { NO_WAIT } from '@aztec/aztec.js/contracts';
+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 { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import type { LogFn, Logger } from '@aztec/foundation/log';
+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';
@@ -15,7 +20,8 @@ export async function createAccount(
   wallet: CLIWallet,
   aztecNode: AztecNode,
   accountType: AccountType,
-  secretKey: Fr | undefined,
+  signingKey: GrumpkinScalar | undefined,
+  salt: Fr | undefined,
   publicKey: string | undefined,
   alias: string | undefined,
   deployer: AztecAddress | undefined,
@@ -25,52 +31,63 @@ export async function createAccount(
   registerClass: boolean,
   wait: boolean,
   feeOpts: CLIFeeArgs,
+  waitForStatus: TxStatus,
   json: boolean,
   verbose: boolean,
   debugLogger: Logger,
   log: LogFn,
 ) {
-  secretKey ??= Fr.random();
-
-  const account = await wallet.createOrRetrieveAccount(
-    undefined /* address, we don't have it yet */,
-    secretKey,
-    accountType,
-    Fr.ZERO,
-    publicKey,
-  );
-  const { salt } = account.getInstance();
+  let secretKey: Fr;
+  if (accountType === 'ecdsasecp256r1ssh') {
+    // SSH accounts sign with a key held in the agent, and so we cannot derive their privacy secret key from it. Instead
+    // we pick a random value.
+    secretKey = Fr.random();
+  } else {
+    signingKey ??= GrumpkinScalar.random();
+    secretKey = await deriveSecretKeyFromSigningKey(signingKey);
+  }
+
+  const account = await wallet.createAccount(accountType, signingKey, secretKey, salt, publicKey);
+  const instanceSalt = account.getInstance().salt;
   const { address, publicKeys, partialAddress } = await account.getCompleteAddress();
 
   const out: Record<string, any> = {};
   if (json) {
     out.address = address;
     out.publicKey = publicKeys;
+    if (signingKey) {
+      out.signingKey = signingKey;
+    }
     if (secretKey) {
       out.secretKey = secretKey;
     }
     out.partialAddress = partialAddress;
-    out.salt = salt;
+    out.salt = instanceSalt;
     out.initHash = account.getInstance().initializationHash;
   } else {
     log(`\nNew account:\n`);
     log(`Address:         ${address.toString()}`);
     log(`Public key:      ${publicKeys.toString()}`);
+    if (signingKey) {
+      log(`Signing key:     ${signingKey.toString()}`);
+    }
     if (secretKey) {
       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()}`);
   }
 
-  let tx;
-  let txReceipt;
-  if (!registerOnly) {
+  let txHash: TxHash | undefined;
+  let txReceipt: TxReceipt | undefined;
+  // Initializerless accounts have no deployment tx — creating one only registers it locally — so there is
+  // nothing to deploy on-chain.
+  if (!registerOnly && accountType !== 'schnorr_initializerless') {
     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,
@@ -80,11 +97,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 },
+      includeMetadata: true,
     });
+    // includeMetadata: true guarantees these fields are present
+    const estimatedGas = await wallet.estimateGasLimits(sim.gasUsed!);
+    const stats = sim.stats!;
 
     if (feeOpts.estimateOnly) {
       if (json) {
@@ -100,7 +121,14 @@ export async function createAccount(
         };
       }
     } else {
-      tx = deployMethod.send({
+      if (verbose) {
+        printProfileResult(stats, log);
+      }
+
+      if (!json) {
+        log(`\nWaiting for account contract deployment...`);
+      }
+      const sendOpts = {
         ...deployAccountOpts,
         fee: deployAccountOpts.fee
           ? {
@@ -108,37 +136,41 @@ export async function createAccount(
               gasSettings: estimatedGas,
             }
           : undefined,
-      });
-      if (verbose) {
-        printProfileResult(stats, log);
-      }
+      };
+
+      ({ txHash } = await deployMethod.send({ ...sendOpts, wait: NO_WAIT }));
+      const localTimeMs = performance.now() - localStart;
 
-      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 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,
         };
+
+        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;
     }
   }
 
   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}`);
     }
   }
 
-  return { alias, address, secretKey, salt };
+  return { alias, address, signingKey, secretKey, salt: instanceSalt };
 }

package/src/cmds/deploy.ts

@@ -1,12 +1,15 @@
-import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { NO_FROM } from '@aztec/aztec.js/account';
+import type { 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';
@@ -28,10 +31,12 @@ export async function deploy(
   skipInitialization: boolean | undefined,
   wait: boolean,
   feeOpts: CLIFeeArgs,
+  waitForStatus: TxStatus,
   verbose: boolean,
   timeout: number = DEFAULT_TX_TIMEOUT_S,
   debugLogger: Logger,
   log: LogFn,
+  universal?: boolean,
 ) {
   const out: Record<string, any> = {};
   salt ??= Fr.random();
@@ -41,12 +46,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) {
@@ -58,22 +58,28 @@ 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(),
+    ...(universal ? { universalDeploy: true as const } : {}),
+  });
   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 },
+    includeMetadata: true,
   });
+  // includeMetadata: true guarantees these fields are present
+  const estimatedGas = await wallet.estimateGasLimits(sim.gasUsed!);
+  const stats = sim.stats!;
 
   if (feeOpts.estimateOnly) {
     if (json) {
@@ -89,42 +95,63 @@ export async function deploy(
       };
     }
   } else {
-    const tx = deploy.send(deployOpts);
     if (verbose) {
       printProfileResult(stats, log);
     }
 
-    const txHash = await tx.getTxHash();
+    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;
-    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 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 ${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: partialAddress.toString(),
+          initializationHash: instance.initializationHash.toString(),
+          salt: salt.toString(),
+          transactionFee: receipt.transactionFee?.toString(),
+        };
+      }
+    } else {
       if (!json) {
-        log(`Transaction fee: ${deployed.transactionFee?.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.transactionFee = deployed.transactionFee?.toString();
+        out.contract = {
+          address: address.toString(),
+          partialAddress: partialAddress.toString(),
+          initializationHash: instance.initializationHash.toString(),
+          salt: salt.toString(),
+        };
       }
     }
   }
   if (json) {
     log(prettyPrintJSON(out));
   }
-  return deploy.address;
+  return await deployInteraction.getAddress();
 }

package/src/cmds/deploy_account.ts

@@ -1,8 +1,11 @@
+import { NO_FROM } from '@aztec/aztec.js/account';
 import { AztecAddress } from '@aztec/aztec.js/addresses';
-import type { AztecNode } from '@aztec/aztec.js/node';
+import { NO_WAIT } from '@aztec/aztec.js/contracts';
+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, 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';
@@ -19,6 +22,7 @@ export async function deployAccount(
   publicDeploy: boolean,
   skipInitialization: boolean,
   feeOpts: CLIFeeArgs,
+  waitForStatus: TxStatus,
   json: boolean,
   verbose: boolean,
   debugLogger: Logger,
@@ -26,7 +30,7 @@ export async function deployAccount(
 ) {
   const out: Record<string, any> = {};
 
-  const account = await wallet.createOrRetrieveAccount(address);
+  const account = await wallet.retrieveAccount(address);
   const { partialAddress, publicKeys } = await account.getCompleteAddress();
   const { initializationHash, salt } = account.getInstance();
 
@@ -45,12 +49,12 @@ 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);
-  const from = delegatedDeployment ? deployer : AztecAddress.ZERO;
+  const from = delegatedDeployment ? deployer : NO_FROM;
 
   const deployAccountOpts: DeployAccountOptions = {
     skipClassPublication: !registerClass,
@@ -60,11 +64,15 @@ export async function deployAccount(
     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 },
+    includeMetadata: true,
   });
+  // includeMetadata: true guarantees these fields are present
+  const estimatedGas = await wallet.estimateGasLimits(sim.gasUsed!);
+  const stats = sim.stats!;
 
   if (feeOpts.estimateOnly) {
     if (json) {
@@ -80,7 +88,14 @@ export async function deployAccount(
       };
     }
   } else {
-    tx = deployMethod.send({
+    if (verbose) {
+      printProfileResult(stats, log);
+    }
+
+    if (!json) {
+      log(`\nWaiting for account contract deployment...`);
+    }
+    const sendOpts = {
       ...deployAccountOpts,
       fee: deployAccountOpts.fee
         ? {
@@ -88,31 +103,35 @@ export async function deployAccount(
             gasSettings: estimatedGas,
           }
         : undefined,
-    });
-    if (verbose) {
-      printProfileResult(stats, log);
-    }
+    };
+
+    ({ txHash } = await deployMethod.send({ ...sendOpts, wait: NO_WAIT }));
+    const localTimeMs = performance.now() - localStart;
 
-    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 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,
       };
+
+      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;
   }
 
   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/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/import_test_accounts.ts

@@ -16,7 +16,18 @@ export async function importTestAccounts(wallet: CLIWallet, db: WalletDB, json:
       const secret = testAccounts[i].secret;
       const salt = new Fr(account.salt);
       const address = account.address;
-      await db.storeAccount(address, { type: 'schnorr', secretKey: secret, salt, alias, publicKey: undefined }, log);
+      await db.storeAccount(
+        address,
+        {
+          type: 'schnorr_initializerless',
+          signingKey: account.signingKey,
+          secretKey: secret,
+          salt,
+          alias,
+          publicKey: undefined,
+        },
+        log,
+      );
 
       if (json) {
         out[alias] = {