@aztec/cli-wallet 0.0.1-commit.42ee6df9b → 0.0.1-commit.431c48d

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.default({ ...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(
@@ -296,7 +320,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();
 }

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);
   }
 }