@aztec/cli-wallet 0.82.2 → 0.82.3-nightly.20250330

package/dest/cmds/create_account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create_account.d.ts","sourceRoot":"","sources":["../../src/cmds/create_account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAwB,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,WAAW,EAA2B,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAE5E,wBAAsB,aAAa,CACjC,MAAM,EAAE,GAAG,EACX,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,EAAE,GAAG,SAAS,EACzB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,kBAAkB,EAAE,OAAO,EAC3B,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;;GAkGX"}
+{"version":3,"file":"create_account.d.ts","sourceRoot":"","sources":["../../src/cmds/create_account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAwB,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,WAAW,EAA2B,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAE5E,wBAAsB,aAAa,CACjC,MAAM,EAAE,GAAG,EACX,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,EAAE,GAAG,SAAS,EACzB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,kBAAkB,EAAE,OAAO,EAC3B,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;;GA8GX"}

package/dest/cmds/create_account.js

@@ -43,7 +43,22 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
             ...await feeOpts.toDeployAccountOpts(wallet)
         };
         if (feeOpts.estimateOnly) {
-            const gas = await account.estimateDeploymentGas(deployOpts);
+            /*
+       * This is usually handled by accountManager.deploy(), but we're accessing the lower
+       * level method to get the gas estimates. That means we have to replicate some of the logic here.
+       * In case we're deploying our own account, we need to hijack the payment method for the fee,
+       * wrapping it in the one that will make use of the freshly deployed account's
+       * entrypoint. For reference, see aztec.js/src/account_manager.ts:deploy()
+       */ const fee = !deployOpts?.deployWallet && deployOpts?.fee ? {
+                ...deployOpts.fee,
+                paymentMethod: await account.getSelfPaymentMethod(deployOpts.fee.paymentMethod)
+            } : deployOpts?.fee;
+            const deployMethod = await account.getDeployMethod(deployOpts.deployWallet);
+            const gas = await deployMethod.estimateGas({
+                ...deployOpts,
+                fee,
+                universalDeploy: true
+            });
             if (json) {
                 out.fee = {
                     gasLimits: {

package/dest/cmds/deploy_account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy_account.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy_account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAwB,MAAM,iBAAiB,CAAC;AAE5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAE5E,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;GAgFX"}
+{"version":3,"file":"deploy_account.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy_account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAwB,MAAM,iBAAiB,CAAC;AAE5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAE5E,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;GA6FX"}

package/dest/cmds/deploy_account.js

@@ -28,10 +28,26 @@ export async function deployAccount(account, wait, feeOpts, json, debugLogger, l
     let txReceipt;
     const deployOpts = {
         skipInitialization: false,
+        skipPublicDeployment: false,
         ...await feeOpts.toDeployAccountOpts(wallet)
     };
     if (feeOpts.estimateOnly) {
-        const gas = await account.estimateDeploymentGas(deployOpts);
+        /*
+     * This is usually handled by accountManager.deploy(), but we're accessing the lower
+     * level method to get the gas estimates. That means we have to replicate some of the logic here.
+     * In case we're deploying our own account, we need to hijack the payment method for the fee,
+     * wrapping it in the one that will make use of the freshly deployed account's
+     * entrypoint. For reference, see aztec.js/src/account_manager.ts:deploy()
+     */ const fee = !deployOpts?.deployWallet && deployOpts?.fee ? {
+            ...deployOpts.fee,
+            paymentMethod: await account.getSelfPaymentMethod(deployOpts.fee.paymentMethod)
+        } : deployOpts?.fee;
+        const deployMethod = await account.getDeployMethod(deployOpts.deployWallet);
+        const gas = await deployMethod.estimateGas({
+            ...deployOpts,
+            fee,
+            universalDeploy: true
+        });
         if (json) {
             out.fee = {
                 gasLimits: {

package/dest/storage/wallet_db.d.ts

@@ -58,7 +58,7 @@ export declare class WalletDB {
         address: string | AztecAddress;
         secretKey: Fr;
         salt: Fr;
-        type: "schnorr" | "ecdsasecp256r1ssh" | "ecdsasecp256k1";
+        type: "schnorr" | "ecdsasecp256r1" | "ecdsasecp256r1ssh" | "ecdsasecp256k1";
     }>;
     storeAlias(type: AliasType, key: string, value: Buffer, log: LogFn): Promise<void>;
 }

package/dest/utils/accounts.d.ts

@@ -3,7 +3,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { PXE } from '@aztec/stdlib/interfaces/client';
 import type { WalletDB } from '../storage/wallet_db.js';
-export declare const AccountTypes: readonly ["schnorr", "ecdsasecp256r1ssh", "ecdsasecp256k1"];
+export declare const AccountTypes: readonly ["schnorr", "ecdsasecp256r1", "ecdsasecp256r1ssh", "ecdsasecp256k1"];
 export type AccountType = (typeof AccountTypes)[number];
 export declare function createOrRetrieveAccount(pxe: PXE, address?: AztecAddress, db?: WalletDB, secretKey?: Fr, type?: AccountType, salt?: Fr, publicKey?: string | undefined): Promise<AccountManager>;
 //# sourceMappingURL=accounts.d.ts.map

package/dest/utils/accounts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/utils/accounts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAG3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGxD,eAAO,MAAM,YAAY,6DAA8D,CAAC;AACxF,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAExD,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE,YAAY,EACtB,EAAE,CAAC,EAAE,QAAQ,EACb,SAAS,CAAC,EAAE,EAAE,EACd,IAAI,GAAE,WAAuB,EAC7B,IAAI,CAAC,EAAE,EAAE,EACT,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,GAC7B,OAAO,CAAC,cAAc,CAAC,CAkDzB"}
+{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/utils/accounts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAG3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGxD,eAAO,MAAM,YAAY,+EAAgF,CAAC;AAC1G,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAExD,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE,YAAY,EACtB,EAAE,CAAC,EAAE,QAAQ,EACb,SAAS,CAAC,EAAE,EAAE,EACd,IAAI,GAAE,WAAuB,EAC7B,IAAI,CAAC,EAAE,EAAE,EACT,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,GAC7B,OAAO,CAAC,cAAc,CAAC,CAuDzB"}

package/dest/utils/accounts.js

@@ -4,6 +4,7 @@ import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { extractECDSAPublicKeyFromBase64String } from './ecdsa.js';
 export const AccountTypes = [
     'schnorr',
+    'ecdsasecp256r1',
     'ecdsasecp256r1ssh',
     'ecdsasecp256k1'
 ];
@@ -26,6 +27,12 @@ export async function createOrRetrieveAccount(pxe, address, db, secretKey, type
                 account = getSchnorrAccount(pxe, secretKey, deriveSigningKey(secretKey), salt);
                 break;
             }
+        case 'ecdsasecp256r1':
+            {
+                const { getEcdsaRAccount } = await import('@aztec/accounts/ecdsa');
+                account = getEcdsaRAccount(pxe, secretKey, deriveSigningKey(secretKey).toBuffer(), salt);
+                break;
+            }
         case 'ecdsasecp256r1ssh':
             {
                 let publicSigningKey;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli-wallet",
-  "version": "0.82.2",
+  "version": "0.82.3-nightly.20250330",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -65,17 +65,17 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.82.2",
-    "@aztec/aztec.js": "0.82.2",
-    "@aztec/cli": "0.82.2",
-    "@aztec/entrypoints": "0.82.2",
-    "@aztec/ethereum": "0.82.2",
-    "@aztec/foundation": "0.82.2",
-    "@aztec/kv-store": "0.82.2",
-    "@aztec/noir-contracts.js": "0.82.2",
-    "@aztec/noir-noirc_abi": "0.82.2",
-    "@aztec/pxe": "0.82.2",
-    "@aztec/stdlib": "0.82.2",
+    "@aztec/accounts": "0.82.3-nightly.20250330",
+    "@aztec/aztec.js": "0.82.3-nightly.20250330",
+    "@aztec/cli": "0.82.3-nightly.20250330",
+    "@aztec/entrypoints": "0.82.3-nightly.20250330",
+    "@aztec/ethereum": "0.82.3-nightly.20250330",
+    "@aztec/foundation": "0.82.3-nightly.20250330",
+    "@aztec/kv-store": "0.82.3-nightly.20250330",
+    "@aztec/noir-contracts.js": "0.82.3-nightly.20250330",
+    "@aztec/noir-noirc_abi": "0.82.3-nightly.20250330",
+    "@aztec/pxe": "0.82.3-nightly.20250330",
+    "@aztec/stdlib": "0.82.3-nightly.20250330",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",

package/src/cmds/create_account.ts

@@ -72,7 +72,19 @@ export async function createAccount(
       ...(await feeOpts.toDeployAccountOpts(wallet)),
     };
     if (feeOpts.estimateOnly) {
-      const gas = await account.estimateDeploymentGas(deployOpts);
+      /*
+       * This is usually handled by accountManager.deploy(), but we're accessing the lower
+       * level method to get the gas estimates. That means we have to replicate some of the logic here.
+       * In case we're deploying our own account, we need to hijack the payment method for the fee,
+       * wrapping it in the one that will make use of the freshly deployed account's
+       * entrypoint. For reference, see aztec.js/src/account_manager.ts:deploy()
+       */
+      const fee =
+        !deployOpts?.deployWallet && deployOpts?.fee
+          ? { ...deployOpts.fee, paymentMethod: await account.getSelfPaymentMethod(deployOpts.fee.paymentMethod) }
+          : deployOpts?.fee;
+      const deployMethod = await account.getDeployMethod(deployOpts.deployWallet);
+      const gas = await deployMethod.estimateGas({ ...deployOpts, fee, universalDeploy: true });
       if (json) {
         out.fee = {
           gasLimits: {

package/src/cmds/deploy_account.ts

@@ -42,11 +42,24 @@ export async function deployAccount(
 
   const deployOpts: DeployAccountOptions = {
     skipInitialization: false,
+    skipPublicDeployment: false,
     ...(await feeOpts.toDeployAccountOpts(wallet)),
   };
 
   if (feeOpts.estimateOnly) {
-    const gas = await account.estimateDeploymentGas(deployOpts);
+    /*
+     * This is usually handled by accountManager.deploy(), but we're accessing the lower
+     * level method to get the gas estimates. That means we have to replicate some of the logic here.
+     * In case we're deploying our own account, we need to hijack the payment method for the fee,
+     * wrapping it in the one that will make use of the freshly deployed account's
+     * entrypoint. For reference, see aztec.js/src/account_manager.ts:deploy()
+     */
+    const fee =
+      !deployOpts?.deployWallet && deployOpts?.fee
+        ? { ...deployOpts.fee, paymentMethod: await account.getSelfPaymentMethod(deployOpts.fee.paymentMethod) }
+        : deployOpts?.fee;
+    const deployMethod = await account.getDeployMethod(deployOpts.deployWallet);
+    const gas = await deployMethod.estimateGas({ ...deployOpts, fee, universalDeploy: true });
     if (json) {
       out.fee = {
         gasLimits: {

package/src/utils/accounts.ts

@@ -8,7 +8,7 @@ import { deriveSigningKey } from '@aztec/stdlib/keys';
 import type { WalletDB } from '../storage/wallet_db.js';
 import { extractECDSAPublicKeyFromBase64String } from './ecdsa.js';
 
-export const AccountTypes = ['schnorr', 'ecdsasecp256r1ssh', 'ecdsasecp256k1'] as const;
+export const AccountTypes = ['schnorr', 'ecdsasecp256r1', 'ecdsasecp256r1ssh', 'ecdsasecp256k1'] as const;
 export type AccountType = (typeof AccountTypes)[number];
 
 export async function createOrRetrieveAccount(
@@ -42,6 +42,11 @@ export async function createOrRetrieveAccount(
       account = getSchnorrAccount(pxe, secretKey, deriveSigningKey(secretKey), salt);
       break;
     }
+    case 'ecdsasecp256r1': {
+      const { getEcdsaRAccount } = await import('@aztec/accounts/ecdsa');
+      account = getEcdsaRAccount(pxe, secretKey, deriveSigningKey(secretKey).toBuffer(), salt);
+      break;
+    }
     case 'ecdsasecp256r1ssh': {
       let publicSigningKey;
       if (db && address) {