@aztec/cli-wallet 0.77.0-testnet-ignition.30 → 0.77.0

package/dest/bin/index.js

@@ -4,6 +4,7 @@ import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
 import { openStoreAt } from '@aztec/kv-store/lmdb-v2';
 import { Argument, Command, Option } from 'commander';
 import { mkdirSync, readFileSync } from 'fs';
+import { homedir } from 'os';
 import { dirname, join, resolve } from 'path';
 import { injectCommands } from '../cmds/index.js';
 import { Aliases, WalletDB } from '../storage/wallet_db.js';
@@ -11,7 +12,7 @@ import { createAliasOption } from '../utils/options/index.js';
 import { PXEWrapper } from '../utils/pxe_wrapper.js';
 const userLog = createConsoleLogger();
 const debugLogger = createLogger('wallet');
-const { WALLET_DATA_DIRECTORY = '~/.aztec/wallet', PXE_PROVER = 'none' } = process.env;
+const { WALLET_DATA_DIRECTORY = join(homedir(), '.aztec/wallet'), PXE_PROVER = 'none' } = process.env;
 function injectInternalCommands(program, log, db) {
     program.command('alias').description('Aliases information for easy reference.').addArgument(new Argument('<type>', 'Type of alias to create').choices(Aliases)).argument('<key>', 'Key to alias.').argument('<value>', 'Value to assign to the alias.').action(async (type, key, value)=>{
         value = db.tryRetrieveAlias(value) || value;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cmds/index.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAGjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAsBxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAE1D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,EACnB,EAAE,CAAC,EAAE,QAAQ,EACb,UAAU,CAAC,EAAE,UAAU,WAskBxB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cmds/index.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAGjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAsBxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAE1D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,EACnB,EAAE,CAAC,EAAE,QAAQ,EACb,UAAU,CAAC,EAAE,UAAU,WA6kBxB"}

package/dest/cmds/index.js

@@ -7,7 +7,7 @@ import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 import { Option } from 'commander';
 import inquirer from 'inquirer';
 import { addScopeToWallet, createOrRetrieveAccount, getWalletWithScopes } from '../utils/accounts.js';
-import { FeeOpts } from '../utils/options/fees.js';
+import { FeeOpts, FeeOptsWithFeePayer } from '../utils/options/fees.js';
 import { ARTIFACT_DESCRIPTION, aliasedAddressParser, aliasedAuthWitParser, aliasedSecretKeyParser, aliasedTxHashParser, artifactPathFromPromiseOrAlias, artifactPathParser, createAccountOption, createAliasOption, createArgsOption, createArtifactOption, createContractAddressOption, createProfileOption, createTypeOption, integerArgParser, parseGasFees, parsePaymentMethod } from '../utils/options/index.js';
 export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
     program.command('import-test-accounts').description('Import test accounts from pxe.').addOption(pxeOption).option('--json', 'Emit output as json').action(async (options)=>{
@@ -22,7 +22,7 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
     const createAccountCommand = program.command('create-account').description('Creates an aztec account that can be used for sending transactions. Registers the account on the PXE and deploys an account contract. Uses a Schnorr single-key account which uses the same key for encryption and authentication (not secure for production usage).').summary('Creates an aztec account that can be used for sending transactions.').option('--skip-initialization', 'Skip initializing the account contract. Useful for publicly deploying an existing account.').option('--public-deploy', 'Publicly deploys the account and registers the class if needed.').option('-p, --public-key <string>', 'Public key that identifies a private signing key stored outside of the wallet. Used for ECDSA SSH accounts over the secp256r1 curve.').addOption(pxeOption).addOption(createSecretKeyOption('Secret key for account. Uses random by default.', false, (sk)=>aliasedSecretKeyParser(sk, db)).conflicts('public-key')).addOption(createAliasOption('Alias for the account. Used for easy reference in subsequent commands.', !db)).addOption(createTypeOption(true)).option('--register-only', 'Just register the account on the PXE. Do not deploy or initialize the account contract.').option('--json', 'Emit output as json')// `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');
-    addOptions(createAccountCommand, FeeOpts.getOptions()).action(async (_options, command)=>{
+    addOptions(createAccountCommand, FeeOptsWithFeePayer.getOptions()).action(async (_options, command)=>{
         const { createAccount } = await import('./create_account.js');
         const options = command.optsWithGlobals();
         const { type, secretKey, wait, registerOnly, skipInitialization, publicDeploy, rpcUrl, alias, json } = options;
@@ -40,7 +40,7 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
             publicKey = answers.identity.split(' ')[1];
         }
         const client = pxeWrapper?.getPXE() ?? await createCompatibleClient(rpcUrl, debugLogger);
-        const accountCreationResult = await createAccount(client, type, secretKey, publicKey, alias, registerOnly, skipInitialization, publicDeploy, wait, await FeeOpts.fromCli(options, client, log, db), json, debugLogger, log);
+        const accountCreationResult = await createAccount(client, type, secretKey, publicKey, alias, registerOnly, skipInitialization, publicDeploy, wait, await FeeOptsWithFeePayer.fromCli(options, client, log, db), json, debugLogger, log);
         if (db) {
             const { address, alias, secretKey, salt } = accountCreationResult;
             await db.storeAccount(address, {
@@ -55,13 +55,13 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
     const deployAccountCommand = program.command('deploy-account').description('Deploys an already registered aztec account that can be used for sending transactions.').addOption(createAccountOption('Alias or address of the account to deploy', !db, db)).addOption(pxeOption).option('--json', 'Emit output as json')// `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');
-    addOptions(deployAccountCommand, FeeOpts.getOptions()).action(async (_options, command)=>{
+    addOptions(deployAccountCommand, FeeOptsWithFeePayer.getOptions()).action(async (_options, command)=>{
         const { deployAccount } = await import('./deploy_account.js');
         const options = command.optsWithGlobals();
         const { rpcUrl, wait, from: parsedFromAddress, json } = options;
         const client = pxeWrapper?.getPXE() ?? await createCompatibleClient(rpcUrl, debugLogger);
         const account = await createOrRetrieveAccount(client, parsedFromAddress, db);
-        await deployAccount(account, wait, await FeeOpts.fromCli(options, client, log, db), json, debugLogger, log);
+        await deployAccount(account, wait, await FeeOptsWithFeePayer.fromCli(options, client, log, db), json, debugLogger, log);
     });
     const deployCommand = program.command('deploy').description('Deploys a compiled Aztec.nr contract to Aztec.').argument('[artifact]', ARTIFACT_DESCRIPTION, artifactPathParser).option('--init <string>', 'The contract initializer function to call', 'constructor').option('--no-init', 'Leave the contract uninitialized').option('-k, --public-key <string>', 'Optional encryption public key for this address. Set this value only if this contract is expected to receive private notes, which will be encrypted using this public key.', parsePublicKey).option('-s, --salt <hex string>', 'Optional deployment salt as a hex string for generating the deployment address.', parseFieldFromHexString).option('--universal', 'Do not mix the sender address into the deployment.').addOption(pxeOption).addOption(createArgsOption(true, db)).addOption(createSecretKeyOption("The sender's secret key", !db, (sk)=>aliasedSecretKeyParser(sk, db)).conflicts('account')).addOption(createAccountOption('Alias or address of the account to deploy from', !db, db)).addOption(createAliasOption('Alias for the contract. Used for easy reference subsequent commands.', !db)).option('--json', 'Emit output as json')// `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
@@ -192,7 +192,7 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
         if (!txData) {
             throw new Error('Transaction data not found in the database, cannot reuse nonce');
         }
-        const paymentMethod = await parsePaymentMethod(payment, log, db)(wallet);
+        const paymentMethod = await parsePaymentMethod(payment, false, log, db)(wallet);
         await cancelTx(wallet, txData, paymentMethod, increasedFees, maxFeesPerGas, log);
     });
     program.command('register-sender').description("Registers a sender's address in the wallet, so the note synching process will look for notes sent by them").argument('[address]', 'The address of the sender to register', (address)=>aliasedAddressParser('accounts', address, db)).addOption(pxeOption).addOption(createAccountOption('Alias or address of the account to simulate from', !db, db)).addOption(createAliasOption('Alias for the sender. Used for easy reference in subsequent commands.', !db)).action(async (address, options)=>{

package/dest/utils/options/fees.d.ts

@@ -31,6 +31,11 @@ export declare class FeeOpts implements IFeeOpts {
     static getOptions(): Option[];
     static fromCli(args: CliFeeArgs, pxe: PXE, log: LogFn, db?: WalletDB): Promise<FeeOpts>;
 }
-export declare function parsePaymentMethod(payment: string, log: LogFn, db?: WalletDB): (sender: AccountWallet) => Promise<FeePaymentMethod>;
+export declare class FeeOptsWithFeePayer extends FeeOpts {
+    static paymentMethodOption(): Option;
+    static getOptions(): Option[];
+    static fromCli(args: CliFeeArgs, pxe: PXE, log: LogFn, db?: WalletDB): Promise<FeeOptsWithFeePayer>;
+}
+export declare function parsePaymentMethod(payment: string, allowCustomFeePayer: boolean, log: LogFn, db?: WalletDB): (sender: AccountWallet) => Promise<FeePaymentMethod>;
 export declare function parseGasFees(gasFees: string): GasFees;
 //# sourceMappingURL=fees.d.ts.map

package/dest/utils/options/fees.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fees.d.ts","sourceRoot":"","sources":["../../../src/utils/options/fees.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAEzB,KAAK,gBAAgB,EACrB,KAAK,GAAG,EACR,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAO,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAI3D,MAAM,MAAM,UAAU,GAAG;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC9D,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;CAC3E;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,QAAQ,EACjB,YAAY,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB,CAAC,EAClE,GAAG,EAAE,KAAK,QAIX;AAYD,qBAAa,OAAQ,YAAW,QAAQ;IAE7B,YAAY,EAAE,OAAO;IACrB,WAAW,EAAE,WAAW;IAC/B,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,WAAW;gBAPZ,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,WAAW,EACvB,oBAAoB,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,CAAC,EAC1E,eAAe,EAAE,CACvB,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,gBAAgB,KAC5B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,EAC/B,WAAW,EAAE,OAAO;IAGxB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAU7D,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAa/E,MAAM,CAAC,mBAAmB;IAO1B,MAAM,CAAC,UAAU;WAcJ,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ;CAkC3E;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,KAAK,EACV,EAAE,CAAC,EAAE,QAAQ,GACZ,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAuEtD;AAsBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAerD"}
+{"version":3,"file":"fees.d.ts","sourceRoot":"","sources":["../../../src/utils/options/fees.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAEzB,KAAK,gBAAgB,EACrB,KAAK,GAAG,EACR,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAO,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAI3D,MAAM,MAAM,UAAU,GAAG;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC9D,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;CAC3E;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,QAAQ,EACjB,YAAY,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB,CAAC,EAClE,GAAG,EAAE,KAAK,QAIX;AAuGD,qBAAa,OAAQ,YAAW,QAAQ;IAE7B,YAAY,EAAE,OAAO;IACrB,WAAW,EAAE,WAAW;IAC/B,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,WAAW;gBAPZ,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,WAAW,EACvB,oBAAoB,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,CAAC,EAC1E,eAAe,EAAE,CACvB,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,gBAAgB,KAC5B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,EAC/B,WAAW,EAAE,OAAO;IAGxB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAU7D,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAa/E,MAAM,CAAC,mBAAmB;IAI1B,MAAM,CAAC,UAAU;WAIJ,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ;CAsB3E;AAED,qBAAa,mBAAoB,SAAQ,OAAO;WAC9B,mBAAmB;WAInB,UAAU;WAIJ,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ;CA2BpF;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,mBAAmB,EAAE,OAAO,EAC5B,GAAG,EAAE,KAAK,EACV,EAAE,CAAC,EAAE,QAAQ,GACZ,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAwEtD;AAsBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAerD"}

package/dest/utils/options/fees.js

@@ -18,6 +18,85 @@ function getEstimatedCost(estimate, maxFeesPerGas) {
         maxFeesPerGas
     }).getFeeLimit().toBigInt();
 }
+async function parseGasSettings(args, pxe) {
+    const gasLimits = args.gasLimits ? parseGasLimits(args.gasLimits) : {};
+    const maxFeesPerGas = args.maxFeesPerGas ? parseGasFees(args.maxFeesPerGas) : await pxe.getCurrentBaseFees();
+    const maxPriorityFeesPerGas = args.maxPriorityFeesPerGas ? parseGasFees(args.maxPriorityFeesPerGas) : undefined;
+    return GasSettings.default({
+        ...gasLimits,
+        maxFeesPerGas,
+        maxPriorityFeesPerGas
+    });
+}
+function printOptionParams(params) {
+    const paramsWithDescription = Object.keys(params).filter((name)=>params[name].description);
+    const maxParamWidth = paramsWithDescription.reduce((v, name)=>Math.max(v, name.length), 0);
+    const indent = (size)=>''.padEnd(size, ' ');
+    const descriptionList = paramsWithDescription.map((name)=>[
+            `${indent(5)}${name}${indent(maxParamWidth - name.length)}  ${params[name].description}`,
+            params[name].default ? `Default: ${params[name].default}` : ''
+        ].join(' '));
+    return descriptionList.length ? `\n   Parameters:\n${descriptionList.join('\n')}` : '';
+}
+function getFeePaymentMethodParams(allowCustomFeePayer) {
+    const feePayer = allowCustomFeePayer ? {
+        type: 'address',
+        description: 'The account paying the fee.'
+    } : undefined;
+    return {
+        method: {
+            type: 'name',
+            description: 'Valid values: "fee_juice", "fpc-public", "fpc-private".',
+            default: 'fee_juice'
+        },
+        ...feePayer ? {
+            feePayer
+        } : {},
+        asset: {
+            type: 'address',
+            description: 'The asset used for fee payment. Not required for the "fee_juice" method.'
+        },
+        fpc: {
+            type: 'address',
+            description: 'The FPC contract that pays in fee juice. Not required for the "fee_juice" method.'
+        },
+        claim: {
+            type: 'boolean',
+            description: 'Whether to use a previously stored claim to bridge fee juice.'
+        },
+        claimSecret: {
+            type: 'string',
+            description: 'The secret to claim fee juice on L1.'
+        },
+        claimAmount: {
+            type: 'bigint',
+            description: 'The amount of fee juice to be claimed.'
+        },
+        messageLeafIndex: {
+            type: 'bigint',
+            description: 'The index of the claim in the l1toL2Message tree.'
+        },
+        feeRecipient: {
+            type: 'string',
+            description: 'Recipient of the fee.'
+        }
+    };
+}
+function getPaymentMethodOption(allowCustomFeePayer) {
+    const params = getFeePaymentMethodParams(allowCustomFeePayer);
+    const paramList = Object.keys(params).map((name)=>`${name}=${params[name].type}`);
+    return new Option(`--payment <${paramList.join(',')}>`, `Fee payment method and arguments.${printOptionParams(params)}`);
+}
+function getFeeOptions(allowCustomFeePayer) {
+    return [
+        getPaymentMethodOption(allowCustomFeePayer),
+        new Option('--gas-limits <da=100,l2=100,teardownDA=10,teardownL2=10>', 'Gas limits for the tx.'),
+        new Option('--max-fees-per-gas <da=100,l2=100>', 'Maximum fees per gas unit for DA and L2 computation.'),
+        new Option('--max-priority-fees-per-gas <da=0,l2=0>', 'Maximum priority fees per gas unit for DA and L2 computation.'),
+        new Option('--no-estimate-gas', 'Whether to automatically estimate gas limits for the tx.'),
+        new Option('--estimate-gas-only', 'Only report gas estimation for the tx, do not send it.')
+    ];
+}
 export class FeeOpts {
     estimateOnly;
     gasSettings;
@@ -53,28 +132,35 @@ export class FeeOpts {
         };
     }
     static paymentMethodOption() {
-        return new Option('--payment <method=name,feePayer=string,asset=address,fpc=address,claimSecret=string,claimAmount=string,feeRecipient=string>', 'Fee payment method and arguments. Valid methods are: fee_juice, fpc-public, fpc-private.');
+        return getPaymentMethodOption(false);
     }
     static getOptions() {
-        return [
-            new Option('--gas-limits <da=100,l2=100,teardownDA=10,teardownL2=10>', 'Gas limits for the tx.'),
-            FeeOpts.paymentMethodOption(),
-            new Option('--max-fees-per-gas <da=100,l2=100>', 'Maximum fees per gas unit for DA and L2 computation.'),
-            new Option('--max-priority-fees-per-gas <da=0,l2=0>', 'Maximum priority fees per gas unit for DA and L2 computation.'),
-            new Option('--no-estimate-gas', 'Whether to automatically estimate gas limits for the tx.'),
-            new Option('--estimate-gas-only', 'Only report gas estimation for the tx, do not send it.')
-        ];
+        return getFeeOptions(false);
+    }
+    static async fromCli(args, pxe, log, db) {
+        const estimateOnly = args.estimateGasOnly;
+        const gasSettings = await parseGasSettings(args, pxe);
+        const defaultPaymentMethod = async (sender)=>{
+            const { FeeJuicePaymentMethod } = await import('@aztec/aztec.js/fee');
+            return new FeeJuicePaymentMethod(sender.getAddress());
+        };
+        const getDeployWallet = ()=>{
+            // Returns undefined. The sender's wallet will be used by default.
+            return Promise.resolve(undefined);
+        };
+        return new FeeOpts(estimateOnly, gasSettings, args.payment ? parsePaymentMethod(args.payment, false, log, db) : defaultPaymentMethod, getDeployWallet, !!args.estimateGas);
+    }
+}
+export class FeeOptsWithFeePayer extends FeeOpts {
+    static paymentMethodOption() {
+        return getPaymentMethodOption(true);
+    }
+    static getOptions() {
+        return getFeeOptions(true);
     }
     static async fromCli(args, pxe, log, db) {
         const estimateOnly = args.estimateGasOnly;
-        const gasLimits = args.gasLimits ? parseGasLimits(args.gasLimits) : {};
-        const maxFeesPerGas = args.maxFeesPerGas ? parseGasFees(args.maxFeesPerGas) : await pxe.getCurrentBaseFees();
-        const maxPriorityFeesPerGas = args.maxPriorityFeesPerGas ? parseGasFees(args.maxPriorityFeesPerGas) : undefined;
-        const gasSettings = GasSettings.default({
-            ...gasLimits,
-            maxFeesPerGas,
-            maxPriorityFeesPerGas
-        });
+        const gasSettings = await parseGasSettings(args, pxe);
         const defaultPaymentMethod = async (sender)=>{
             const { FeeJuicePaymentMethod } = await import('@aztec/aztec.js/fee');
             return new FeeJuicePaymentMethod(sender.getAddress());
@@ -88,10 +174,10 @@ export class FeeOpts {
             }
             return undefined;
         };
-        return new FeeOpts(estimateOnly, gasSettings, args.payment ? parsePaymentMethod(args.payment, log, db) : defaultPaymentMethod, getDeployWallet, !!args.estimateGas);
+        return new FeeOptsWithFeePayer(estimateOnly, gasSettings, args.payment ? parsePaymentMethod(args.payment, true, log, db) : defaultPaymentMethod, getDeployWallet, !!args.estimateGas);
     }
 }
-export function parsePaymentMethod(payment, log, db) {
+export function parsePaymentMethod(payment, allowCustomFeePayer, log, db) {
     const parsed = payment.split(',').reduce((acc, item)=>{
         const [dimension, value] = item.split('=');
         acc[dimension] = value ?? 1;
@@ -131,7 +217,7 @@ export function parsePaymentMethod(payment, log, db) {
                     } else {
                         log(`Using Fee Juice for fee payment`);
                         const { FeeJuicePaymentMethod } = await import('@aztec/aztec.js/fee');
-                        const feePayer = parsed.feePayer ? aliasedAddressParser('accounts', parsed.feePayer, db) : sender.getAddress();
+                        const feePayer = parsed.feePayer && allowCustomFeePayer ? aliasedAddressParser('accounts', parsed.feePayer, db) : sender.getAddress();
                         return new FeeJuicePaymentMethod(feePayer);
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli-wallet",
-  "version": "0.77.0-testnet-ignition.30",
+  "version": "0.77.0",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -65,15 +65,15 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.77.0-testnet-ignition.30",
-    "@aztec/aztec.js": "0.77.0-testnet-ignition.30",
-    "@aztec/cli": "0.77.0-testnet-ignition.30",
-    "@aztec/ethereum": "0.77.0-testnet-ignition.30",
-    "@aztec/foundation": "0.77.0-testnet-ignition.30",
-    "@aztec/kv-store": "0.77.0-testnet-ignition.30",
-    "@aztec/noir-contracts.js": "0.77.0-testnet-ignition.30",
-    "@aztec/pxe": "0.77.0-testnet-ignition.30",
-    "@aztec/stdlib": "0.77.0-testnet-ignition.30",
+    "@aztec/accounts": "0.77.0",
+    "@aztec/aztec.js": "0.77.0",
+    "@aztec/cli": "0.77.0",
+    "@aztec/ethereum": "0.77.0",
+    "@aztec/foundation": "0.77.0",
+    "@aztec/kv-store": "0.77.0",
+    "@aztec/noir-contracts.js": "0.77.0",
+    "@aztec/pxe": "0.77.0",
+    "@aztec/stdlib": "0.77.0",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",
     "source-map-support": "^0.5.21",

package/src/bin/index.ts

@@ -5,6 +5,7 @@ import { openStoreAt } from '@aztec/kv-store/lmdb-v2';
 
 import { Argument, Command, Option } from 'commander';
 import { mkdirSync, readFileSync } from 'fs';
+import { homedir } from 'os';
 import { dirname, join, resolve } from 'path';
 
 import { injectCommands } from '../cmds/index.js';
@@ -15,7 +16,7 @@ import { PXEWrapper } from '../utils/pxe_wrapper.js';
 const userLog = createConsoleLogger();
 const debugLogger = createLogger('wallet');
 
-const { WALLET_DATA_DIRECTORY = '~/.aztec/wallet', PXE_PROVER = 'none' } = process.env;
+const { WALLET_DATA_DIRECTORY = join(homedir(), '.aztec/wallet'), PXE_PROVER = 'none' } = process.env;
 
 function injectInternalCommands(program: Command, log: LogFn, db: WalletDB) {
   program

package/src/cmds/index.ts

@@ -22,7 +22,7 @@ import inquirer from 'inquirer';
 
 import type { WalletDB } from '../storage/wallet_db.js';
 import { type AccountType, addScopeToWallet, createOrRetrieveAccount, getWalletWithScopes } from '../utils/accounts.js';
-import { FeeOpts } from '../utils/options/fees.js';
+import { FeeOpts, FeeOptsWithFeePayer } from '../utils/options/fees.js';
 import {
   ARTIFACT_DESCRIPTION,
   aliasedAddressParser,
@@ -100,7 +100,7 @@ export function injectCommands(
     // 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');
 
-  addOptions(createAccountCommand, FeeOpts.getOptions()).action(async (_options, command) => {
+  addOptions(createAccountCommand, FeeOptsWithFeePayer.getOptions()).action(async (_options, command) => {
     const { createAccount } = await import('./create_account.js');
     const options = command.optsWithGlobals();
     const { type, secretKey, wait, registerOnly, skipInitialization, publicDeploy, rpcUrl, alias, json } = options;
@@ -129,7 +129,7 @@ export function injectCommands(
       skipInitialization,
       publicDeploy,
       wait,
-      await FeeOpts.fromCli(options, client, log, db),
+      await FeeOptsWithFeePayer.fromCli(options, client, log, db),
       json,
       debugLogger,
       log,
@@ -150,7 +150,7 @@ export function injectCommands(
     // 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');
 
-  addOptions(deployAccountCommand, FeeOpts.getOptions()).action(async (_options, command) => {
+  addOptions(deployAccountCommand, FeeOptsWithFeePayer.getOptions()).action(async (_options, command) => {
     const { deployAccount } = await import('./deploy_account.js');
     const options = command.optsWithGlobals();
     const { rpcUrl, wait, from: parsedFromAddress, json } = options;
@@ -158,7 +158,14 @@ export function injectCommands(
     const client = pxeWrapper?.getPXE() ?? (await createCompatibleClient(rpcUrl, debugLogger));
     const account = await createOrRetrieveAccount(client, parsedFromAddress, db);
 
-    await deployAccount(account, wait, await FeeOpts.fromCli(options, client, log, db), json, debugLogger, log);
+    await deployAccount(
+      account,
+      wait,
+      await FeeOptsWithFeePayer.fromCli(options, client, log, db),
+      json,
+      debugLogger,
+      log,
+    );
   });
 
   const deployCommand = program
@@ -572,7 +579,7 @@ export function injectCommands(
         throw new Error('Transaction data not found in the database, cannot reuse nonce');
       }
 
-      const paymentMethod = await parsePaymentMethod(payment, log, db)(wallet);
+      const paymentMethod = await parsePaymentMethod(payment, false, log, db)(wallet);
 
       await cancelTx(wallet, txData, paymentMethod, increasedFees, maxFeesPerGas, log);
     });

package/src/utils/options/fees.ts

@@ -52,6 +52,97 @@ function getEstimatedCost(estimate: Pick<GasSettings, 'gasLimits' | 'teardownGas
     .toBigInt();
 }
 
+async function parseGasSettings(args: CliFeeArgs, pxe: PXE) {
+  const gasLimits = args.gasLimits ? parseGasLimits(args.gasLimits) : {};
+  const maxFeesPerGas = args.maxFeesPerGas ? parseGasFees(args.maxFeesPerGas) : await pxe.getCurrentBaseFees();
+  const maxPriorityFeesPerGas = args.maxPriorityFeesPerGas ? parseGasFees(args.maxPriorityFeesPerGas) : undefined;
+  return GasSettings.default({
+    ...gasLimits,
+    maxFeesPerGas,
+    maxPriorityFeesPerGas,
+  });
+}
+
+type OptionParams = {
+  [key: string]: { type: string; description?: string; default?: string };
+};
+
+function printOptionParams(params: OptionParams) {
+  const paramsWithDescription = Object.keys(params).filter(name => params[name].description);
+  const maxParamWidth = paramsWithDescription.reduce((v, name) => Math.max(v, name.length), 0);
+  const indent = (size: number) => ''.padEnd(size, ' ');
+  const descriptionList = paramsWithDescription.map(name =>
+    [
+      `${indent(5)}${name}${indent(maxParamWidth - name.length)}  ${params[name].description}`,
+      params[name].default ? `Default: ${params[name].default}` : '',
+    ].join(' '),
+  );
+  return descriptionList.length ? `\n   Parameters:\n${descriptionList.join('\n')}` : '';
+}
+
+function getFeePaymentMethodParams(allowCustomFeePayer: boolean): OptionParams {
+  const feePayer = allowCustomFeePayer ? { type: 'address', description: 'The account paying the fee.' } : undefined;
+  return {
+    method: {
+      type: 'name',
+      description: 'Valid values: "fee_juice", "fpc-public", "fpc-private".',
+      default: 'fee_juice',
+    },
+    ...(feePayer ? { feePayer } : {}),
+    asset: {
+      type: 'address',
+      description: 'The asset used for fee payment. Not required for the "fee_juice" method.',
+    },
+    fpc: {
+      type: 'address',
+      description: 'The FPC contract that pays in fee juice. Not required for the "fee_juice" method.',
+    },
+    claim: {
+      type: 'boolean',
+      description: 'Whether to use a previously stored claim to bridge fee juice.',
+    },
+    claimSecret: {
+      type: 'string',
+      description: 'The secret to claim fee juice on L1.',
+    },
+    claimAmount: {
+      type: 'bigint',
+      description: 'The amount of fee juice to be claimed.',
+    },
+    messageLeafIndex: {
+      type: 'bigint',
+      description: 'The index of the claim in the l1toL2Message tree.',
+    },
+    feeRecipient: {
+      type: 'string',
+      description: 'Recipient of the fee.',
+    },
+  };
+}
+
+function getPaymentMethodOption(allowCustomFeePayer: boolean) {
+  const params = getFeePaymentMethodParams(allowCustomFeePayer);
+  const paramList = Object.keys(params).map(name => `${name}=${params[name].type}`);
+  return new Option(
+    `--payment <${paramList.join(',')}>`,
+    `Fee payment method and arguments.${printOptionParams(params)}`,
+  );
+}
+
+function getFeeOptions(allowCustomFeePayer: boolean) {
+  return [
+    getPaymentMethodOption(allowCustomFeePayer),
+    new Option('--gas-limits <da=100,l2=100,teardownDA=10,teardownL2=10>', 'Gas limits for the tx.'),
+    new Option('--max-fees-per-gas <da=100,l2=100>', 'Maximum fees per gas unit for DA and L2 computation.'),
+    new Option(
+      '--max-priority-fees-per-gas <da=0,l2=0>',
+      'Maximum priority fees per gas unit for DA and L2 computation.',
+    ),
+    new Option('--no-estimate-gas', 'Whether to automatically estimate gas limits for the tx.'),
+    new Option('--estimate-gas-only', 'Only report gas estimation for the tx, do not send it.'),
+  ];
+}
+
 export class FeeOpts implements IFeeOpts {
   constructor(
     public estimateOnly: boolean,
@@ -88,36 +179,49 @@ export class FeeOpts implements IFeeOpts {
   }
 
   static paymentMethodOption() {
-    return new Option(
-      '--payment <method=name,feePayer=string,asset=address,fpc=address,claimSecret=string,claimAmount=string,feeRecipient=string>',
-      'Fee payment method and arguments. Valid methods are: fee_juice, fpc-public, fpc-private.',
-    );
+    return getPaymentMethodOption(false);
   }
 
   static getOptions() {
-    return [
-      new Option('--gas-limits <da=100,l2=100,teardownDA=10,teardownL2=10>', 'Gas limits for the tx.'),
-      FeeOpts.paymentMethodOption(),
-      new Option('--max-fees-per-gas <da=100,l2=100>', 'Maximum fees per gas unit for DA and L2 computation.'),
-      new Option(
-        '--max-priority-fees-per-gas <da=0,l2=0>',
-        'Maximum priority fees per gas unit for DA and L2 computation.',
-      ),
-      new Option('--no-estimate-gas', 'Whether to automatically estimate gas limits for the tx.'),
-      new Option('--estimate-gas-only', 'Only report gas estimation for the tx, do not send it.'),
-    ];
+    return getFeeOptions(false);
   }
 
   static async fromCli(args: CliFeeArgs, pxe: PXE, log: LogFn, db?: WalletDB) {
     const estimateOnly = args.estimateGasOnly;
-    const gasLimits = args.gasLimits ? parseGasLimits(args.gasLimits) : {};
-    const maxFeesPerGas = args.maxFeesPerGas ? parseGasFees(args.maxFeesPerGas) : await pxe.getCurrentBaseFees();
-    const maxPriorityFeesPerGas = args.maxPriorityFeesPerGas ? parseGasFees(args.maxPriorityFeesPerGas) : undefined;
-    const gasSettings = GasSettings.default({
-      ...gasLimits,
-      maxFeesPerGas,
-      maxPriorityFeesPerGas,
-    });
+    const gasSettings = await parseGasSettings(args, pxe);
+
+    const defaultPaymentMethod = async (sender: AccountWallet) => {
+      const { FeeJuicePaymentMethod } = await import('@aztec/aztec.js/fee');
+      return new FeeJuicePaymentMethod(sender.getAddress());
+    };
+
+    const getDeployWallet = () => {
+      // Returns undefined. The sender's wallet will be used by default.
+      return Promise.resolve(undefined);
+    };
+
+    return new FeeOpts(
+      estimateOnly,
+      gasSettings,
+      args.payment ? parsePaymentMethod(args.payment, false, log, db) : defaultPaymentMethod,
+      getDeployWallet,
+      !!args.estimateGas,
+    );
+  }
+}
+
+export class FeeOptsWithFeePayer extends FeeOpts {
+  static override paymentMethodOption() {
+    return getPaymentMethodOption(true);
+  }
+
+  static override getOptions() {
+    return getFeeOptions(true);
+  }
+
+  static override async fromCli(args: CliFeeArgs, pxe: PXE, log: LogFn, db?: WalletDB) {
+    const estimateOnly = args.estimateGasOnly;
+    const gasSettings = await parseGasSettings(args, pxe);
 
     const defaultPaymentMethod = async (sender: AccountWallet) => {
       const { FeeJuicePaymentMethod } = await import('@aztec/aztec.js/fee');
@@ -134,10 +238,10 @@ export class FeeOpts implements IFeeOpts {
       return undefined;
     };
 
-    return new FeeOpts(
+    return new FeeOptsWithFeePayer(
       estimateOnly,
       gasSettings,
-      args.payment ? parsePaymentMethod(args.payment, log, db) : defaultPaymentMethod,
+      args.payment ? parsePaymentMethod(args.payment, true, log, db) : defaultPaymentMethod,
       getDeployWallet,
       !!args.estimateGas,
     );
@@ -146,6 +250,7 @@ export class FeeOpts implements IFeeOpts {
 
 export function parsePaymentMethod(
   payment: string,
+  allowCustomFeePayer: boolean,
   log: LogFn,
   db?: WalletDB,
 ): (sender: AccountWallet) => Promise<FeePaymentMethod> {
@@ -195,9 +300,10 @@ export function parsePaymentMethod(
         } else {
           log(`Using Fee Juice for fee payment`);
           const { FeeJuicePaymentMethod } = await import('@aztec/aztec.js/fee');
-          const feePayer = parsed.feePayer
-            ? aliasedAddressParser('accounts', parsed.feePayer, db)
-            : sender.getAddress();
+          const feePayer =
+            parsed.feePayer && allowCustomFeePayer
+              ? aliasedAddressParser('accounts', parsed.feePayer, db)
+              : sender.getAddress();
           return new FeeJuicePaymentMethod(feePayer);
         }
       }