@aztec/cli-wallet 0.0.1-commit.a89ec08 → 0.0.1-commit.aa0c64f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli-wallet",
-  "version": "0.0.1-commit.a89ec08",
+  "version": "0.0.1-commit.aa0c64f",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -19,7 +19,7 @@
   "scripts": {
     "start": "node --no-warnings ./dest/bin",
     "start:debug": "node --inspect=0.0.0.0:9221 --no-warnings ./dest/bin",
-    "dev": "LOG_LEVEL=debug && node ./dest/bin",
+    "dev": "LOG_LEVEL=\"debug; info: json-rpc, simulator\" node ./dest/bin",
     "build": "yarn clean && ../scripts/tsc.sh",
     "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
@@ -67,19 +67,20 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.a89ec08",
-    "@aztec/aztec.js": "0.0.1-commit.a89ec08",
-    "@aztec/bb.js": "0.0.1-commit.a89ec08",
-    "@aztec/cli": "0.0.1-commit.a89ec08",
-    "@aztec/entrypoints": "0.0.1-commit.a89ec08",
-    "@aztec/ethereum": "0.0.1-commit.a89ec08",
-    "@aztec/foundation": "0.0.1-commit.a89ec08",
-    "@aztec/kv-store": "0.0.1-commit.a89ec08",
-    "@aztec/noir-contracts.js": "0.0.1-commit.a89ec08",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.a89ec08",
-    "@aztec/pxe": "0.0.1-commit.a89ec08",
-    "@aztec/stdlib": "0.0.1-commit.a89ec08",
-    "@aztec/wallet-sdk": "0.0.1-commit.a89ec08",
+    "@aztec/accounts": "0.0.1-commit.aa0c64f",
+    "@aztec/aztec.js": "0.0.1-commit.aa0c64f",
+    "@aztec/bb.js": "0.0.1-commit.aa0c64f",
+    "@aztec/cli": "0.0.1-commit.aa0c64f",
+    "@aztec/entrypoints": "0.0.1-commit.aa0c64f",
+    "@aztec/ethereum": "0.0.1-commit.aa0c64f",
+    "@aztec/foundation": "0.0.1-commit.aa0c64f",
+    "@aztec/kv-store": "0.0.1-commit.aa0c64f",
+    "@aztec/noir-contracts.js": "0.0.1-commit.aa0c64f",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.aa0c64f",
+    "@aztec/pxe": "0.0.1-commit.aa0c64f",
+    "@aztec/standard-contracts": "0.0.1-commit.aa0c64f",
+    "@aztec/stdlib": "0.0.1-commit.aa0c64f",
+    "@aztec/wallet-sdk": "0.0.1-commit.aa0c64f",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",
     "source-map-support": "^0.5.21",

package/src/bin/index.ts

@@ -73,7 +73,7 @@ function injectInternalCommands(program: Command, log: LogFn, db: WalletDB) {
 
 /** CLI wallet main entrypoint */
 async function main() {
-  const walletVersion = getPackageVersion() ?? '0.0.0';
+  const walletVersion = getPackageVersion();
 
   const db = WalletDB.getInstance();
   const walletAndNodeWrapper = new CliWalletAndNodeWrapper();

package/src/cmds/check_tx.ts

@@ -33,7 +33,7 @@ export async function checkTx(
 // dependency when dropping PXE JSON RPC Server.
 
 async function inspectTx(wallet: CLIWallet, aztecNode: AztecNode, txHash: TxHash, log: LogFn) {
-  const [receipt, effectsInBlock] = await Promise.all([aztecNode.getTxReceipt(txHash), aztecNode.getTxEffect(txHash)]);
+  const receipt = await aztecNode.getTxReceipt(txHash, { includeTxEffect: true });
   // Base tx data
   log(`Tx ${txHash.toString()}`);
   log(` Status: ${receipt.status}`);
@@ -44,11 +44,11 @@ async function inspectTx(wallet: CLIWallet, aztecNode: AztecNode, txHash: TxHash
     log(` Error: ${receipt.error}`);
   }
 
-  if (!effectsInBlock) {
+  if (!receipt.isMined() || !receipt.txEffect) {
     return;
   }
 
-  const effects = effectsInBlock.data;
+  const effects = receipt.txEffect;
   const artifactMap = await getKnownArtifacts(wallet);
 
   log(` Block: ${receipt.blockNumber} (${receipt.blockHash?.toString()})`);
@@ -197,21 +197,22 @@ type ContractArtifactWithClassId = ContractArtifact & { classId: Fr };
 
 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.instance);
-  const classIds = [...new Set(knownContracts.map(contract => contract?.currentContractClassId))];
+  const knownContracts = await Promise.all(
+    knownContractAddresses.map(contractAddress => wallet.getContractMetadata(contractAddress)),
+  );
+  const classIdFor = (metadata: (typeof knownContracts)[number]): Fr | undefined =>
+    metadata.updatedContractClassId ?? metadata.instance?.originalContractClassId;
+  const classIds = [...new Set(knownContracts.map(classIdFor))];
   const knownArtifacts = (
     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) {
-      const artifact = knownArtifacts.find(a =>
-        a?.classId?.equals(instance.currentContractClassId),
-      ) as ContractArtifactWithClassId;
+  for (const metadata of knownContracts) {
+    const classId = classIdFor(metadata);
+    if (metadata.instance && classId) {
+      const artifact = knownArtifacts.find(a => a?.classId?.equals(classId)) as ContractArtifactWithClassId;
       if (artifact) {
-        map[instance.address.toString()] = artifact;
+        map[metadata.instance.address.toString()] = artifact;
       }
     }
   }

package/src/cmds/create_account.ts

@@ -1,3 +1,4 @@
+import { deriveSecretKeyFromSigningKey } from '@aztec/accounts/utils';
 import { NO_FROM } from '@aztec/aztec.js/account';
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { NO_WAIT } from '@aztec/aztec.js/contracts';
@@ -5,6 +6,7 @@ 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';
 
@@ -18,7 +20,7 @@ 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,
@@ -35,15 +37,17 @@ export async function createAccount(
   debugLogger: Logger,
   log: LogFn,
 ) {
-  secretKey ??= Fr.random();
-
-  const account = await wallet.createOrRetrieveAccount(
-    undefined /* address, we don't have it yet */,
-    secretKey,
-    accountType,
-    salt,
-    publicKey,
-  );
+  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();
 
@@ -51,6 +55,9 @@ export async function createAccount(
   if (json) {
     out.address = address;
     out.publicKey = publicKeys;
+    if (signingKey) {
+      out.signingKey = signingKey;
+    }
     if (secretKey) {
       out.secretKey = secretKey;
     }
@@ -61,6 +68,9 @@ export async function createAccount(
     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()}`);
     }
@@ -71,7 +81,9 @@ export async function createAccount(
 
   let txHash: TxHash | undefined;
   let txReceipt: TxReceipt | undefined;
-  if (!registerOnly) {
+  // 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);
@@ -89,10 +101,10 @@ export async function createAccount(
     const deployMethod = await account.getDeployMethod();
     const sim = await deployMethod.simulate({
       ...deployAccountOpts,
-      fee: { ...deployAccountOpts.fee, estimateGas: true },
+      includeMetadata: true,
     });
-    // estimateGas: true guarantees these fields are present
-    const estimatedGas = sim.estimatedGas!;
+    // includeMetadata: true guarantees these fields are present
+    const estimatedGas = await wallet.estimateGasLimits(sim.gasUsed!);
     const stats = sim.stats!;
 
     if (feeOpts.estimateOnly) {
@@ -160,5 +172,5 @@ export async function createAccount(
     }
   }
 
-  return { alias, address, secretKey, salt: instanceSalt };
+  return { alias, address, signingKey, secretKey, salt: instanceSalt };
 }

package/src/cmds/deploy.ts

@@ -1,5 +1,5 @@
 import { NO_FROM } from '@aztec/aztec.js/account';
-import { AztecAddress } from '@aztec/aztec.js/addresses';
+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';
@@ -36,6 +36,7 @@ export async function deploy(
   timeout: number = DEFAULT_TX_TIMEOUT_S,
   debugLogger: Logger,
   log: LogFn,
+  universal?: boolean,
 ) {
   const out: Record<string, any> = {};
   salt ??= Fr.random();
@@ -45,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) {
@@ -62,13 +58,15 @@ export async function deploy(
     debugLogger.debug(`Encoded arguments: ${args.join(', ')}`);
   }
 
-  const deployInteraction = 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 ?? NO_FROM,
-    contractAddressSalt: salt,
-    universalDeploy: !deployer,
     skipClassPublication,
     skipInitialization,
     skipInstancePublication,
@@ -77,10 +75,10 @@ export async function deploy(
   const localStart = performance.now();
   const sim = await deployInteraction.simulate({
     ...deployOpts,
-    fee: { ...deployOpts.fee, estimateGas: true },
+    includeMetadata: true,
   });
-  // estimateGas: true guarantees these fields are present
-  const estimatedGas = sim.estimatedGas!;
+  // includeMetadata: true guarantees these fields are present
+  const estimatedGas = await wallet.estimateGasLimits(sim.gasUsed!);
   const stats = sim.stats!;
 
   if (feeOpts.estimateOnly) {
@@ -101,8 +99,9 @@ export async function deploy(
       printProfileResult(stats, log);
     }
 
-    const { address, partialAddress } = deployInteraction;
     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;
@@ -115,8 +114,8 @@ export async function deploy(
       const nodeTimeMs = performance.now() - nodeStart;
 
       if (!json) {
-        log(`Contract deployed at ${address?.toString()}`);
-        log(`Contract partial address ${(await partialAddress)?.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()}`);
@@ -126,8 +125,8 @@ export async function deploy(
         log(` Node inclusion time: ${(nodeTimeMs / 1000).toFixed(1)}s`);
       } else {
         out.contract = {
-          address: address?.toString(),
-          partialAddress: (await partialAddress)?.toString(),
+          address: address.toString(),
+          partialAddress: partialAddress.toString(),
           initializationHash: instance.initializationHash.toString(),
           salt: salt.toString(),
           transactionFee: receipt.transactionFee?.toString(),
@@ -135,16 +134,16 @@ export async function deploy(
       }
     } else {
       if (!json) {
-        log(`Contract deployed at ${address?.toString()}`);
-        log(`Contract partial address ${(await partialAddress)?.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 = {
-          address: address?.toString(),
-          partialAddress: (await partialAddress)?.toString(),
+          address: address.toString(),
+          partialAddress: partialAddress.toString(),
           initializationHash: instance.initializationHash.toString(),
           salt: salt.toString(),
         };
@@ -154,5 +153,5 @@ export async function deploy(
   if (json) {
     log(prettyPrintJSON(out));
   }
-  return deployInteraction.address;
+  return await deployInteraction.getAddress();
 }

package/src/cmds/deploy_account.ts

@@ -30,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();
 
@@ -68,10 +68,10 @@ export async function deployAccount(
   const deployMethod = await account.getDeployMethod();
   const sim = await deployMethod.simulate({
     ...deployAccountOpts,
-    fee: { ...deployAccountOpts.fee, estimateGas: true },
+    includeMetadata: true,
   });
-  // estimateGas: true guarantees these fields are present
-  const estimatedGas = sim.estimatedGas!;
+  // includeMetadata: true guarantees these fields are present
+  const estimatedGas = await wallet.estimateGasLimits(sim.gasUsed!);
   const stats = sim.stats!;
 
   if (feeOpts.estimateOnly) {

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] = {

package/src/cmds/index.ts

@@ -4,7 +4,7 @@ import {
   ETHEREUM_HOSTS,
   PRIVATE_KEY,
   addOptions,
-  createSecretKeyOption,
+  createSigningKeyOption,
   l1ChainIdOption,
   parseBigint,
   parseFieldFromHexString,
@@ -24,7 +24,7 @@ import {
   ARTIFACT_DESCRIPTION,
   CLIFeeArgs,
   aliasedAddressParser,
-  aliasedSecretKeyParser,
+  aliasedSigningKeyParser,
   aliasedTxHashParser,
   artifactPathFromPromiseOrAlias,
   artifactPathParser,
@@ -96,8 +96,8 @@ export function injectCommands(
       'Public key that identifies a private signing key stored outside of the wallet. Used for ECDSA SSH accounts over the secp256r1 curve.',
     )
     .addOption(
-      createSecretKeyOption('Secret key for account. Uses random by default.', false, sk =>
-        aliasedSecretKeyParser(sk, db),
+      createSigningKeyOption('Signing key for account. Uses random by default.', false, sk =>
+        aliasedSigningKeyParser(sk, db),
       ).conflicts('public-key'),
     )
     .addOption(createAliasOption('Alias for the account. Used for easy reference in subsequent commands.', !db))
@@ -124,7 +124,7 @@ export function injectCommands(
     const {
       type,
       from: parsedFromAddress,
-      secretKey,
+      signingKey,
       salt,
       wait,
       waitForStatus: waitForStatusStr,
@@ -156,7 +156,7 @@ export function injectCommands(
       wallet,
       node,
       type,
-      secretKey,
+      signingKey,
       salt,
       publicKey,
       alias,
@@ -174,8 +174,8 @@ export function injectCommands(
       log,
     );
     if (db) {
-      const { address, alias, secretKey, salt } = accountCreationResult;
-      await db.storeAccount(address, { type, secretKey, salt, alias, publicKey }, log);
+      const { address, alias, signingKey, secretKey, salt } = accountCreationResult;
+      await db.storeAccount(address, { type, signingKey, secretKey, salt, alias, publicKey }, log);
     }
   });
 
@@ -297,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,
@@ -319,6 +319,7 @@ export function injectCommands(
       timeout,
       debugLogger,
       log,
+      universal,
     );
     if (db && address) {
       await db.storeContract(address, artifactPath, log, alias);
@@ -398,7 +399,9 @@ export function injectCommands(
     .addOption(createContractAddressOption(db))
     .addOption(createArtifactOption(db))
     .addOption(
-      createSecretKeyOption("The sender's secret key", !db, sk => aliasedSecretKeyParser(sk, db)).conflicts('account'),
+      createSigningKeyOption("The sender's signing key", !db, sk => aliasedSigningKeyParser(sk, db)).conflicts(
+        'account',
+      ),
     )
     .addOption(createAuthwitnessOption('Authorization witness to use for the simulation', !db, db))
     .addOption(createAccountOption('Alias or address of the account to simulate from', !db, db))

package/src/cmds/send.ts

@@ -42,10 +42,10 @@ export async function send(
   const localStart = performance.now();
   const sim = await call.simulate({
     ...sendOptions,
-    fee: { ...sendOptions.fee, estimateGas: true },
+    includeMetadata: true,
   });
-  // estimateGas: true guarantees these fields are present
-  const estimatedGas = sim.estimatedGas!;
+  // includeMetadata: true guarantees these fields are present
+  const estimatedGas = await wallet.estimateGasLimits(sim.gasUsed!);
   const stats = sim.stats!;
 
   if (feeOpts.estimateOnly) {

package/src/cmds/simulate.ts

@@ -44,7 +44,8 @@ export async function simulate(
         if (!metadata.instance) {
           return undefined;
         }
-        const artifact = await wallet.getContractArtifact(metadata.instance.currentContractClassId);
+        const classId = metadata.updatedContractClassId ?? metadata.instance.originalContractClassId;
+        const artifact = await wallet.getContractArtifact(classId);
         return artifact;
       },
       log,

package/src/storage/wallet_db.ts

@@ -1,4 +1,5 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import type { LogFn } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
@@ -88,13 +89,28 @@ export class WalletDB {
     address: AztecAddress,
     {
       type,
+      signingKey,
       secretKey,
       salt,
       alias,
       publicKey,
-    }: { type: AccountType; secretKey: Fr; salt: Fr; alias: string | undefined; publicKey: string | undefined },
+    }: {
+      type: AccountType;
+      signingKey?: GrumpkinScalar;
+      secretKey?: Fr;
+      salt: Fr;
+      alias: string | undefined;
+      publicKey: string | undefined;
+    },
     log: LogFn,
   ) {
+    // Even though the privacy secret key is sometimes derived from the signing key, we store it in the database
+    // regardless as that is not always the case. Local-key accounts also store their signing key, while external-key
+    // accounts such as SSH store only the privacy secret.
+    if (!secretKey) {
+      throw new Error('Cannot store account without a secret key');
+    }
+
     let publicSigningKey: Buffer | undefined;
     if (type === 'ecdsasecp256r1ssh' && publicKey) {
       publicSigningKey = extractECDSAPublicKeyFromBase64String(publicKey);
@@ -106,6 +122,9 @@ export class WalletDB {
       }
       await this.#accounts.set(`${address.toString()}:type`, Buffer.from(type));
       await this.#accounts.set(`${address.toString()}:sk`, secretKey.toBuffer());
+      if (signingKey) {
+        await this.#accounts.set(`${address.toString()}:signing`, signingKey.toBuffer());
+      }
       await this.#accounts.set(`${address.toString()}:salt`, salt.toBuffer());
       if (publicSigningKey) {
         await this.#accounts.set(`${address.toString()}:publicSigningKey`, publicSigningKey);
@@ -226,10 +245,13 @@ export class WalletDB {
     if (!secretKeyBuffer) {
       throw new Error(`Could not find ${address}:sk. Account "${address.toString}" does not exist on this wallet.`);
     }
+    const signingKeyBuffer = await this.#accounts.getAsync(`${address.toString()}:signing`);
     const secretKey = Fr.fromBuffer(secretKeyBuffer);
+    // External-key accounts (e.g. SSH) store no signing key.
+    const signingKey = signingKeyBuffer ? GrumpkinScalar.fromBuffer(signingKeyBuffer) : undefined;
     const salt = Fr.fromBuffer((await this.#accounts.getAsync(`${address.toString()}:salt`))!);
     const type = (await this.#accounts.getAsync(`${address.toString()}:type`))!.toString('utf8') as AccountType;
-    return { address, secretKey, salt, type };
+    return { address, signingKey, secretKey, salt, type };
   }
 
   async storeAlias(type: AliasType, key: string, value: Buffer, log: LogFn) {

package/src/utils/constants.ts

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

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';
@@ -137,7 +137,7 @@ export function parsePaymentMethod(
     if (!parsed.asset) {
       throw new Error('Missing "asset" in payment option');
     }
-    return AztecAddress.fromString(parsed.asset);
+    return AztecAddress.fromStringUnsafe(parsed.asset);
   };
 
   return async (wallet: Wallet, from: AztecAddress, gasSettings: GasSettings) => {
@@ -257,8 +257,11 @@ 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.fallback({ ...this.gasSettings, maxFeesPerGas });
+    const minFees = await this.getMinFees(node);
+    const maxFeesPerGas = minFees.mul(1 + MIN_FEE_PADDING);
+    const { txsLimits } = await node.getNodeInfo();
+    const gasLimits = this.gasSettings.gasLimits ?? Gas.from(txsLimits.gas);
+    const gasSettings = GasSettings.fallback({ ...this.gasSettings, gasLimits, maxFeesPerGas });
     const paymentMethod = await this.paymentMethod(wallet, from, gasSettings);
     return {
       paymentMethod,
@@ -266,6 +269,27 @@ 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(

package/src/utils/options/options.ts

@@ -1,5 +1,5 @@
 import { TxHash } from '@aztec/aztec.js/tx';
-import { parseAztecAddress, parseSecretKey, parseTxHash } from '@aztec/cli/utils';
+import { parseAztecAddress, parseSigningKey, parseTxHash } from '@aztec/cli/utils';
 import { AuthWitness } from '@aztec/stdlib/auth-witness';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 
@@ -64,13 +64,13 @@ export function aliasedAddressParser(defaultPrefix: AliasType, address: string,
   }
 }
 
-export function aliasedSecretKeyParser(sk: string, db?: WalletDB) {
+export function aliasedSigningKeyParser(sk: string, db?: WalletDB) {
   if (sk.startsWith('0x')) {
-    return parseSecretKey(sk);
+    return parseSigningKey(sk);
   } else {
-    const prefixed = `${sk.startsWith('accounts') ? '' : 'accounts'}:${sk.endsWith(':sk') ? sk : `${sk}:sk`}`;
+    const prefixed = `${sk.startsWith('accounts') ? '' : 'accounts'}:${sk.endsWith(':signing') ? sk : `${sk}:signing`}`;
     const rawSk = db ? db.tryRetrieveAlias(prefixed) : sk;
-    return parseSecretKey(rawSk);
+    return parseSigningKey(rawSk);
   }
 }