@aztec/cli-wallet 0.0.0-test.1 → 0.0.1-commit.017a351

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

@@ -1,41 +1,36 @@
-import { type AccountWallet, type DeployAccountOptions, type FeePaymentMethod, type PXE, type SendMethodOptions } from '@aztec/aztec.js';
+import type { FeePaymentMethod } from '@aztec/aztec.js/fee';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import type { Wallet } from '@aztec/aztec.js/wallet';
 import type { LogFn } from '@aztec/foundation/log';
+import type { FieldsOf } from '@aztec/foundation/types';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { GasFees, GasSettings } from '@aztec/stdlib/gas';
+import type { FeeOptions } from '@aztec/wallet-sdk/base-wallet';
 import { Option } from 'commander';
 import type { WalletDB } from '../../storage/wallet_db.js';
-export type CliFeeArgs = {
+export type RawCliFeeArgs = {
     estimateGasOnly: boolean;
     gasLimits?: string;
     payment?: string;
     maxFeesPerGas?: string;
     maxPriorityFeesPerGas?: string;
-    estimateGas?: boolean;
 };
-export interface IFeeOpts {
-    estimateOnly: boolean;
-    gasSettings: GasSettings;
-    toSendOpts(sender: AccountWallet): Promise<SendMethodOptions>;
-    toDeployAccountOpts(sender: AccountWallet): Promise<DeployAccountOptions>;
-}
-export declare function printGasEstimates(feeOpts: IFeeOpts, gasEstimates: Pick<GasSettings, 'gasLimits' | 'teardownGasLimits'>, log: LogFn): void;
-export declare class FeeOpts implements IFeeOpts {
+export type ParsedFeeOptions = {
+    paymentMethod?: FeePaymentMethod;
+    gasSettings?: Partial<FieldsOf<GasSettings>>;
+};
+export declare function getPaymentMethodOption(): Option;
+export declare function parsePaymentMethod(payment: string, log: LogFn, db?: WalletDB, estimateOnly?: boolean): (wallet: Wallet, from: AztecAddress, gasSettings: GasSettings) => Promise<FeePaymentMethod | undefined>;
+export declare function parseGasFees(gasFees: string): GasFees;
+export declare class CLIFeeArgs {
     estimateOnly: boolean;
-    gasSettings: GasSettings;
-    private paymentMethodFactory;
-    private getDeployWallet;
-    private estimateGas;
-    constructor(estimateOnly: boolean, gasSettings: GasSettings, paymentMethodFactory: (sender: AccountWallet) => Promise<FeePaymentMethod>, getDeployWallet: (sender: AccountWallet, paymentMethod: FeePaymentMethod) => Promise<AccountWallet | undefined>, estimateGas: boolean);
-    toSendOpts(sender: AccountWallet): Promise<SendMethodOptions>;
-    toDeployAccountOpts(sender: AccountWallet): Promise<DeployAccountOptions>;
-    static paymentMethodOption(): Option;
+    private paymentMethod;
+    private gasSettings;
+    constructor(estimateOnly: boolean, paymentMethod: (wallet: Wallet, feePayer: AztecAddress, gasSettings: GasSettings) => Promise<FeePaymentMethod | undefined>, gasSettings: Partial<FieldsOf<GasSettings>>);
+    toUserFeeOptions(node: AztecNode, wallet: Wallet, from: AztecAddress): Promise<ParsedFeeOptions>;
+    private getMinFees;
+    static parse(args: RawCliFeeArgs, log: LogFn, db?: WalletDB): CLIFeeArgs;
     static getOptions(): Option[];
-    static fromCli(args: CliFeeArgs, pxe: PXE, log: LogFn, db?: WalletDB): Promise<FeeOpts>;
 }
-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
+export declare function printGasEstimates(feeOpts: FeeOptions, gasEstimates: Pick<GasSettings, 'gasLimits' | 'teardownGasLimits'>, log: LogFn): void;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3V0aWxzL29wdGlvbnMvZmVlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRXJELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3hELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQU8sT0FBTyxFQUFFLFdBQVcsRUFBcUIsTUFBTSxtQkFBbUIsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVoRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBRW5DLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBSTNELE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsZUFBZSxFQUFFLE9BQU8sQ0FBQztJQUN6QixTQUFTLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbkIsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLGFBQWEsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN2QixxQkFBcUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNoQyxDQUFDO0FBRUYsTUFBTSxNQUFNLGdCQUFnQixHQUFHO0lBQzdCLGFBQWEsQ0FBQyxFQUFFLGdCQUFnQixDQUFDO0lBQ2pDLFdBQVcsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQztDQUM5QyxDQUFDO0FBeURGLHdCQUFnQixzQkFBc0IsV0FHckM7QUEwQkQsd0JBQWdCLGtCQUFrQixDQUNoQyxPQUFPLEVBQUUsTUFBTSxFQUNmLEdBQUcsRUFBRSxLQUFLLEVBQ1YsRUFBRSxDQUFDLEVBQUUsUUFBUSxFQUNiLFlBQVksQ0FBQyxFQUFFLE9BQU8sR0FDckIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFFLFdBQVcsS0FBSyxPQUFPLENBQUMsZ0JBQWdCLEdBQUcsU0FBUyxDQUFDLENBcUZ6RztBQXlCRCx3QkFBZ0IsWUFBWSxDQUFDLE9BQU8sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQWtCckQ7QUFDRCxxQkFBYSxVQUFVO0lBRVosWUFBWSxFQUFFLE9BQU87SUFDNUIsT0FBTyxDQUFDLGFBQWE7SUFLckIsT0FBTyxDQUFDLFdBQVc7SUFQckIsWUFDUyxZQUFZLEVBQUUsT0FBTyxFQUNwQixhQUFhLEVBQUUsQ0FDckIsTUFBTSxFQUFFLE1BQU0sRUFDZCxRQUFRLEVBQUUsWUFBWSxFQUN0QixXQUFXLEVBQUUsV0FBVyxLQUNyQixPQUFPLENBQUMsZ0JBQWdCLEdBQUcsU0FBUyxDQUFDLEVBQ2xDLFdBQVcsRUFBRSxPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDLEVBQ2pEO0lBRUUsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBU3JHO1lBTWEsVUFBVTtJQWlCeEIsTUFBTSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsYUFBYSxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFDLEVBQUUsUUFBUSxHQUFHLFVBQVUsQ0FPdkU7SUFFRCxNQUFNLENBQUMsVUFBVSxhQUVoQjtDQUNGO0FBSUQsd0JBQWdCLGlCQUFpQixDQUMvQixPQUFPLEVBQUUsVUFBVSxFQUNuQixZQUFZLEVBQUUsSUFBSSxDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsbUJBQW1CLENBQUMsRUFDbEUsR0FBRyxFQUFFLEtBQUssUUFJWCJ9

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;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"}
+{"version":3,"file":"fees.d.ts","sourceRoot":"","sources":["../../../src/utils/options/fees.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAO,OAAO,EAAE,WAAW,EAAqB,MAAM,mBAAmB,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAI3D,MAAM,MAAM,aAAa,GAAG;IAC1B,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;CAChC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;CAC9C,CAAC;AAyDF,wBAAgB,sBAAsB,WAGrC;AA0BD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,KAAK,EACV,EAAE,CAAC,EAAE,QAAQ,EACb,YAAY,CAAC,EAAE,OAAO,GACrB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAqFzG;AAyBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAkBrD;AACD,qBAAa,UAAU;IAEZ,YAAY,EAAE,OAAO;IAC5B,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,WAAW;IAPrB,YACS,YAAY,EAAE,OAAO,EACpB,aAAa,EAAE,CACrB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,EACtB,WAAW,EAAE,WAAW,KACrB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,EAClC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,EACjD;IAEE,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,CASrG;YAMa,UAAU;IAiBxB,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,UAAU,CAOvE;IAED,MAAM,CAAC,UAAU,aAEhB;CACF;AAID,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,UAAU,EACnB,YAAY,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB,CAAC,EAClE,GAAG,EAAE,KAAK,QAIX"}

package/dest/utils/options/fees.js

@@ -1,33 +1,9 @@
-import { FeeJuicePaymentMethod } from '@aztec/aztec.js';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 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 { Option } from 'commander';
-import { createOrRetrieveAccount } from '../accounts.js';
+import { MIN_FEE_PADDING } from '../constants.js';
 import { aliasedAddressParser } from './options.js';
-export function printGasEstimates(feeOpts, gasEstimates, log) {
-    log(`Estimated gas usage:    ${formatGasEstimate(gasEstimates)}`);
-    log(`Maximum total tx fee:   ${getEstimatedCost(gasEstimates, feeOpts.gasSettings.maxFeesPerGas)}`);
-}
-function formatGasEstimate(estimate) {
-    return `da=${estimate.gasLimits.daGas},l2=${estimate.gasLimits.l2Gas},teardownDA=${estimate.teardownGasLimits.daGas},teardownL2=${estimate.teardownGasLimits.l2Gas}`;
-}
-function getEstimatedCost(estimate, maxFeesPerGas) {
-    return GasSettings.default({
-        ...estimate,
-        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);
@@ -36,25 +12,18 @@ function printOptionParams(params) {
             `${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')}` : '';
+    return descriptionList.length ? `\n   Parameters:\n${descriptionList.join('\n')}\nFormat: --payment ${Object.keys(params).slice(0, 3).map((name)=>`${name}=${params[name].type}`)} ${Object.keys(params).length > 3 ? '...' : ''}` : '';
 }
-function getFeePaymentMethodParams(allowCustomFeePayer) {
-    const feePayer = allowCustomFeePayer ? {
-        type: 'address',
-        description: 'The account paying the fee.'
-    } : undefined;
+function getFeePaymentMethodParams() {
     return {
         method: {
             type: 'name',
-            description: 'Valid values: "fee_juice", "fpc-public", "fpc-private".',
+            description: 'Valid values: "fee_juice", "fpc-public", "fpc-private", "fpc-sponsored"',
             default: 'fee_juice'
         },
-        ...feePayer ? {
-            feePayer
-        } : {},
         asset: {
             type: 'address',
-            description: 'The asset used for fee payment. Not required for the "fee_juice" method.'
+            description: 'The asset used for fee payment. Required for "fpc-public" and "fpc-private".'
         },
         fpc: {
             type: 'address',
@@ -75,165 +44,97 @@ function getFeePaymentMethodParams(allowCustomFeePayer) {
         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)}`);
+export function getPaymentMethodOption() {
+    const params = getFeePaymentMethodParams();
+    return new Option(`--payment <options>`, `Fee payment method and arguments.${printOptionParams(params)}`);
 }
-function getFeeOptions(allowCustomFeePayer) {
+function getFeeOptions() {
     return [
-        getPaymentMethodOption(allowCustomFeePayer),
+        getPaymentMethodOption(),
         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;
-    paymentMethodFactory;
-    getDeployWallet;
-    estimateGas;
-    constructor(estimateOnly, gasSettings, paymentMethodFactory, getDeployWallet, estimateGas){
-        this.estimateOnly = estimateOnly;
-        this.gasSettings = gasSettings;
-        this.paymentMethodFactory = paymentMethodFactory;
-        this.getDeployWallet = getDeployWallet;
-        this.estimateGas = estimateGas;
-    }
-    async toSendOpts(sender) {
-        return {
-            fee: {
-                estimateGas: this.estimateGas,
-                gasSettings: this.gasSettings,
-                paymentMethod: await this.paymentMethodFactory(sender)
-            }
-        };
-    }
-    async toDeployAccountOpts(sender) {
-        const paymentMethod = await this.paymentMethodFactory(sender);
-        const deployWallet = await this.getDeployWallet(sender, paymentMethod);
-        return {
-            deployWallet,
-            fee: {
-                estimateGas: this.estimateGas,
-                gasSettings: this.gasSettings,
-                paymentMethod
-            }
-        };
-    }
-    static paymentMethodOption() {
-        return getPaymentMethodOption(false);
-    }
-    static getOptions() {
-        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 gasSettings = await parseGasSettings(args, pxe);
-        const defaultPaymentMethod = async (sender)=>{
-            const { FeeJuicePaymentMethod } = await import('@aztec/aztec.js/fee');
-            return new FeeJuicePaymentMethod(sender.getAddress());
-        };
-        const getDeployWallet = async (sender, paymentMethod)=>{
-            if (paymentMethod instanceof FeeJuicePaymentMethod) {
-                const feePayer = await paymentMethod.getFeePayer();
-                if (!sender.getAddress().equals(feePayer)) {
-                    return (await createOrRetrieveAccount(pxe, feePayer, db)).getWallet();
-                }
-            }
-            return undefined;
-        };
-        return new FeeOptsWithFeePayer(estimateOnly, gasSettings, args.payment ? parsePaymentMethod(args.payment, true, log, db) : defaultPaymentMethod, getDeployWallet, !!args.estimateGas);
-    }
+function parseGasSettings(args) {
+    const gasLimits = args.gasLimits ? parseGasLimits(args.gasLimits) : {};
+    const maxFeesPerGas = args.maxFeesPerGas ? parseGasFees(args.maxFeesPerGas) : undefined;
+    const maxPriorityFeesPerGas = args.maxPriorityFeesPerGas ? parseGasFees(args.maxPriorityFeesPerGas) : undefined;
+    return {
+        ...gasLimits,
+        maxFeesPerGas,
+        maxPriorityFeesPerGas
+    };
 }
-export function parsePaymentMethod(payment, allowCustomFeePayer, log, db) {
+export function parsePaymentMethod(payment, log, db, estimateOnly) {
     const parsed = payment.split(',').reduce((acc, item)=>{
         const [dimension, value] = item.split('=');
         acc[dimension] = value ?? 1;
         return acc;
     }, {});
-    const getFpcOpts = (parsed, db)=>{
+    const getFpc = ()=>{
         if (!parsed.fpc) {
             throw new Error('Missing "fpc" in payment option');
         }
+        return aliasedAddressParser('contracts', parsed.fpc, db);
+    };
+    const getAsset = ()=>{
         if (!parsed.asset) {
             throw new Error('Missing "asset" in payment option');
         }
-        const fpc = aliasedAddressParser('contracts', parsed.fpc, db);
-        return [
-            AztecAddress.fromString(parsed.asset),
-            fpc
-        ];
+        return AztecAddress.fromString(parsed.asset);
     };
-    return async (sender)=>{
+    return async (wallet, from, gasSettings)=>{
         switch(parsed.method){
             case 'fee_juice':
                 {
                     if (parsed.claim || parsed.claimSecret && parsed.claimAmount && parsed.messageLeafIndex) {
                         let claimAmount, claimSecret, messageLeafIndex;
                         if (parsed.claim && db) {
-                            ({ amount: claimAmount, secret: claimSecret, leafIndex: messageLeafIndex } = await db.popBridgedFeeJuice(sender.getAddress(), log));
+                            ({ amount: claimAmount, secret: claimSecret, leafIndex: messageLeafIndex } = estimateOnly ? await db.peekBridgedFeeJuice(from, log) : await db.popBridgedFeeJuice(from, log));
                         } else {
                             ({ claimAmount, claimSecret, messageLeafIndex } = parsed);
                         }
                         log(`Using Fee Juice for fee payments with claim for ${claimAmount} tokens`);
                         const { FeeJuicePaymentMethodWithClaim } = await import('@aztec/aztec.js/fee');
-                        return new FeeJuicePaymentMethodWithClaim(sender, {
-                            claimAmount: (typeof claimAmount === 'string' ? Fr.fromHexString(claimAmount) : new Fr(claimAmount)).toBigInt(),
-                            claimSecret: Fr.fromHexString(claimSecret),
+                        return new FeeJuicePaymentMethodWithClaim(from, {
+                            claimAmount: (typeof claimAmount === 'string' ? Fr.fromString(claimAmount) : new Fr(claimAmount)).toBigInt(),
+                            claimSecret: typeof claimSecret === 'string' ? Fr.fromString(claimSecret) : claimSecret,
                             messageLeafIndex: BigInt(messageLeafIndex)
                         });
                     } else {
-                        log(`Using Fee Juice for fee payment`);
-                        const { FeeJuicePaymentMethod } = await import('@aztec/aztec.js/fee');
-                        const feePayer = parsed.feePayer && allowCustomFeePayer ? aliasedAddressParser('accounts', parsed.feePayer, db) : sender.getAddress();
-                        return new FeeJuicePaymentMethod(feePayer);
+                        log(`Using Fee Juice for fee payment with the balance of account ${from}`);
+                        return;
                     }
                 }
             case 'fpc-public':
                 {
-                    const [asset, fpc] = getFpcOpts(parsed, db);
+                    const fpc = getFpc();
+                    const asset = getAsset();
+                    log(`WARNING: fpc-public is deprecated and will not work on mainnet alpha. Use fee_juice or fpc-sponsored instead.`);
                     log(`Using public fee payment with asset ${asset} via paymaster ${fpc}`);
                     const { PublicFeePaymentMethod } = await import('@aztec/aztec.js/fee');
-                    return new PublicFeePaymentMethod(fpc, sender);
+                    return new PublicFeePaymentMethod(fpc, from, wallet, gasSettings);
                 }
             case 'fpc-private':
                 {
-                    const [asset, fpc] = getFpcOpts(parsed, db);
+                    const fpc = getFpc();
+                    const asset = getAsset();
+                    log(`WARNING: fpc-private is deprecated and will not work on mainnet alpha. Use fee_juice or fpc-sponsored instead.`);
                     log(`Using private fee payment with asset ${asset} via paymaster ${fpc}`);
                     const { PrivateFeePaymentMethod } = await import('@aztec/aztec.js/fee');
-                    return new PrivateFeePaymentMethod(fpc, sender);
+                    return new PrivateFeePaymentMethod(fpc, from, wallet, gasSettings);
+                }
+            case 'fpc-sponsored':
+                {
+                    const sponsor = getFpc();
+                    log(`Using sponsored fee payment with sponsor ${sponsor}`);
+                    const { SponsoredFeePaymentMethod } = await import('@aztec/aztec.js/fee/testing');
+                    return new SponsoredFeePaymentMethod(sponsor);
                 }
             case undefined:
                 throw new Error('Missing "method" in payment option');
@@ -281,3 +182,66 @@ export function parseGasFees(gasFees) {
     }
     return new GasFees(parsed.da, parsed.l2);
 }
+export class CLIFeeArgs {
+    estimateOnly;
+    paymentMethod;
+    gasSettings;
+    constructor(estimateOnly, paymentMethod, gasSettings){
+        this.estimateOnly = estimateOnly;
+        this.paymentMethod = paymentMethod;
+        this.gasSettings = gasSettings;
+    }
+    async toUserFeeOptions(node, wallet, from) {
+        const minFees = await this.getMinFees(node);
+        const maxFeesPerGas = minFees.mul(1 + MIN_FEE_PADDING);
+        const gasSettings = GasSettings.fallback({
+            ...this.gasSettings,
+            maxFeesPerGas
+        });
+        const paymentMethod = await this.paymentMethod(wallet, from, gasSettings);
+        return {
+            paymentMethod,
+            gasSettings
+        };
+    }
+    /**
+   * Returns the worst-case min fee across predicted future slots.
+   * Falls back to getCurrentMinFees if the node doesn't support getPredictedMinFees.
+   */ async getMinFees(node) {
+        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) {
+            // 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, log, db) {
+        const estimateOnly = !!args.estimateGasOnly;
+        return new CLIFeeArgs(estimateOnly, parsePaymentMethod(args.payment ?? 'method=fee_juice', log, db, estimateOnly), parseGasSettings(args));
+    }
+    static getOptions() {
+        return getFeeOptions();
+    }
+}
+// Printing
+export function printGasEstimates(feeOpts, gasEstimates, log) {
+    log(`Estimated gas usage:    ${formatGasEstimate(gasEstimates)}`);
+    log(`Maximum total tx fee:   ${getEstimatedCost(gasEstimates, feeOpts.gasSettings.maxFeesPerGas)}`);
+}
+function formatGasEstimate(estimate) {
+    return `da=${estimate.gasLimits.daGas},l2=${estimate.gasLimits.l2Gas},teardownDA=${estimate.teardownGasLimits.daGas},teardownL2=${estimate.teardownGasLimits.l2Gas}`;
+}
+function getEstimatedCost(estimate, maxFeesPerGas) {
+    return GasSettings.fallback({
+        ...estimate,
+        maxFeesPerGas
+    }).getFeeLimit().toBigInt();
+}

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

@@ -1,3 +1,3 @@
 export * from './fees.js';
 export * from './options.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy91dGlscy9vcHRpb25zL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsV0FBVyxDQUFDO0FBQzFCLGNBQWMsY0FBYyxDQUFDIn0=

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

@@ -1,20 +1,24 @@
+import { TxHash } from '@aztec/aztec.js/tx';
 import { AuthWitness } from '@aztec/stdlib/auth-witness';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { Option } from 'commander';
 import type { AliasType, WalletDB } from '../../storage/wallet_db.js';
 export declare const ARTIFACT_DESCRIPTION = "Path to a compiled Aztec contract's artifact in JSON format. If executed inside a nargo workspace, a package and contract name can be specified as package@contract";
 export declare function integerArgParser(value: string, argName: string, min?: number, max?: number): number;
-export declare function aliasedTxHashParser(txHash: string, db?: WalletDB): import("@aztec/aztec.js").TxHash;
-export declare function aliasedAuthWitParser(witness: string, db?: WalletDB): AuthWitness;
+export declare function aliasedTxHashParser(txHash: string, db?: WalletDB): TxHash;
+export declare function aliasedAuthWitParser(witnesses: string, db?: WalletDB): AuthWitness[];
 export declare function aliasedAddressParser(defaultPrefix: AliasType, address: string, db?: WalletDB): AztecAddress;
-export declare function aliasedSecretKeyParser(sk: string, db?: WalletDB): import("@aztec/aztec.js").Fr;
+export declare function aliasedSecretKeyParser(sk: string, db?: WalletDB): import("@aztec/foundation/schemas").Fr;
 export declare function createAliasOption(description: string, hide: boolean): Option;
 export declare function createAccountOption(description: string, hide: boolean, db?: WalletDB): Option;
+export declare function createAuthwitnessOption(description: string, hide: boolean, db?: WalletDB): Option;
 export declare function createTypeOption(mandatory: boolean): Option;
 export declare function createArgsOption(isConstructor: boolean, db?: WalletDB): Option;
 export declare function createContractAddressOption(db?: WalletDB): Option;
+export declare function createDebugExecutionStepsDirOption(): Option;
+export declare function createVerboseOption(): Option;
 export declare function artifactPathParser(filePath: string, db?: WalletDB): Promise<string>;
 export declare function artifactPathFromPromiseOrAlias(artifactPathPromise: Promise<string>, contractAddress: AztecAddress, db?: WalletDB): Promise<string>;
 export declare function createArtifactOption(db?: WalletDB): Option;
-export declare function createProfileOption(): Option;
-//# sourceMappingURL=options.d.ts.map
+export declare function cleanupAuthWitnesses(authWitnesses: AuthWitness[] | undefined): AuthWitness[];
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3V0aWxzL29wdGlvbnMvb3B0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFNUMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRWhFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFHbkMsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLFFBQVEsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBS3RFLGVBQU8sTUFBTSxvQkFBb0Isd0tBQ3NJLENBQUM7QUFFeEssd0JBQWdCLGdCQUFnQixDQUM5QixLQUFLLEVBQUUsTUFBTSxFQUNiLE9BQU8sRUFBRSxNQUFNLEVBQ2YsR0FBRyxTQUEwQixFQUM3QixHQUFHLFNBQTBCLFVBVTlCO0FBRUQsd0JBQWdCLG1CQUFtQixDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsRUFBRSxDQUFDLEVBQUUsUUFBUSxHQUFHLE1BQU0sQ0FRekU7QUFFRCx3QkFBZ0Isb0JBQW9CLENBQUMsU0FBUyxFQUFFLE1BQU0sRUFBRSxFQUFFLENBQUMsRUFBRSxRQUFRLGlCQVlwRTtBQUVELHdCQUFnQixvQkFBb0IsQ0FBQyxhQUFhLEVBQUUsU0FBUyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRSxDQUFDLEVBQUUsUUFBUSxnQkFRNUY7QUFFRCx3QkFBZ0Isc0JBQXNCLENBQUMsRUFBRSxFQUFFLE1BQU0sRUFBRSxFQUFFLENBQUMsRUFBRSxRQUFRLDBDQVEvRDtBQUVELHdCQUFnQixpQkFBaUIsQ0FBQyxXQUFXLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxPQUFPLFVBRW5FO0FBRUQsd0JBQWdCLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUFFLENBQUMsRUFBRSxRQUFRLFVBSXBGO0FBRUQsd0JBQWdCLHVCQUF1QixDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUFFLENBQUMsRUFBRSxRQUFRLFVBSXhGO0FBRUQsd0JBQWdCLGdCQUFnQixDQUFDLFNBQVMsRUFBRSxPQUFPLFVBTWxEO0FBRUQsd0JBQWdCLGdCQUFnQixDQUFDLGFBQWEsRUFBRSxPQUFPLEVBQUUsRUFBRSxDQUFDLEVBQUUsUUFBUSxVQVFyRTtBQUVELHdCQUFnQiwyQkFBMkIsQ0FBQyxFQUFFLENBQUMsRUFBRSxRQUFRLFVBSXhEO0FBRUQsd0JBQWdCLGtDQUFrQyxXQUtqRDtBQUVELHdCQUFnQixtQkFBbUIsV0FLbEM7QUFFRCx3QkFBZ0Isa0JBQWtCLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxFQUFFLENBQUMsRUFBRSxRQUFRLG1CQWFqRTtBQUVELHdCQUFzQiw4QkFBOEIsQ0FDbEQsbUJBQW1CLEVBQUUsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUNwQyxlQUFlLEVBQUUsWUFBWSxFQUM3QixFQUFFLENBQUMsRUFBRSxRQUFRLG1CQVdkO0FBRUQsd0JBQWdCLG9CQUFvQixDQUFDLEVBQUUsQ0FBQyxFQUFFLFFBQVEsVUFJakQ7QUE2QkQsd0JBQWdCLG9CQUFvQixDQUFDLGFBQWEsRUFBRSxXQUFXLEVBQUUsR0FBRyxTQUFTLEdBQUcsV0FBVyxFQUFFLENBRTVGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/utils/options/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGnC,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAKtE,eAAO,MAAM,oBAAoB,wKACsI,CAAC;AAExK,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,GAAG,SAA0B,EAC7B,GAAG,SAA0B,UAU9B;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,oCAQhE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,eAQlE;AAED,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,gBAQ5F;AAED,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,gCAQ/D;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,UAEnE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,QAAQ,UAIpF;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,OAAO,UAMlD;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,QAAQ,UAQrE;AAED,wBAAgB,2BAA2B,CAAC,EAAE,CAAC,EAAE,QAAQ,UAIxD;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,mBAajE;AAED,wBAAsB,8BAA8B,CAClD,mBAAmB,EAAE,OAAO,CAAC,MAAM,CAAC,EACpC,eAAe,EAAE,YAAY,EAC7B,EAAE,CAAC,EAAE,QAAQ,mBAWd;AAED,wBAAgB,oBAAoB,CAAC,EAAE,CAAC,EAAE,QAAQ,UAIjD;AAED,wBAAgB,mBAAmB,WAKlC"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/utils/options/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGnC,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAKtE,eAAO,MAAM,oBAAoB,wKACsI,CAAC;AAExK,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,GAAG,SAA0B,EAC7B,GAAG,SAA0B,UAU9B;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,MAAM,CAQzE;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,iBAYpE;AAED,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,gBAQ5F;AAED,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,0CAQ/D;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,UAEnE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,QAAQ,UAIpF;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,QAAQ,UAIxF;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,OAAO,UAMlD;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,QAAQ,UAQrE;AAED,wBAAgB,2BAA2B,CAAC,EAAE,CAAC,EAAE,QAAQ,UAIxD;AAED,wBAAgB,kCAAkC,WAKjD;AAED,wBAAgB,mBAAmB,WAKlC;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,mBAajE;AAED,wBAAsB,8BAA8B,CAClD,mBAAmB,EAAE,OAAO,CAAC,MAAM,CAAC,EACpC,eAAe,EAAE,YAAY,EAC7B,EAAE,CAAC,EAAE,QAAQ,mBAWd;AAED,wBAAgB,oBAAoB,CAAC,EAAE,CAAC,EAAE,QAAQ,UAIjD;AA6BD,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,WAAW,EAAE,GAAG,SAAS,GAAG,WAAW,EAAE,CAE5F"}

package/dest/utils/options/options.js

@@ -2,7 +2,7 @@ import { parseAztecAddress, parseSecretKey, parseTxHash } from '@aztec/cli/utils
 import { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { Option } from 'commander';
 import { readdir, stat } from 'fs/promises';
-import { AccountTypes } from '../accounts.js';
+import { AccountTypes } from '../constants.js';
 const TARGET_DIR = 'target';
 export const ARTIFACT_DESCRIPTION = "Path to a compiled Aztec contract's artifact in JSON format. If executed inside a nargo workspace, a package and contract name can be specified as package@contract";
 export function integerArgParser(value, argName, min = Number.MIN_SAFE_INTEGER, max = Number.MAX_SAFE_INTEGER) {
@@ -18,20 +18,23 @@ export function integerArgParser(value, argName, min = Number.MIN_SAFE_INTEGER,
 export function aliasedTxHashParser(txHash, db) {
     try {
         return parseTxHash(txHash);
-    } catch (err) {
+    } catch  {
         const prefixed = txHash.includes(':') ? txHash : `transactions:${txHash}`;
         const rawTxHash = db ? db.tryRetrieveAlias(prefixed) : txHash;
         return parseTxHash(rawTxHash);
     }
 }
-export function aliasedAuthWitParser(witness, db) {
-    try {
-        return AuthWitness.fromString(witness);
-    } catch (err) {
-        const prefixed = witness.includes(':') ? witness : `authwits:${witness}`;
-        const rawAuthWitness = db ? db.tryRetrieveAlias(prefixed) : witness;
-        return AuthWitness.fromString(rawAuthWitness);
-    }
+export function aliasedAuthWitParser(witnesses, db) {
+    const parsedWitnesses = witnesses.split(',').map((witness)=>{
+        try {
+            return AuthWitness.fromString(witness);
+        } catch  {
+            const prefixed = witness.includes(':') ? witness : `authwits:${witness}`;
+            const rawAuthWitness = db ? db.tryRetrieveAlias(prefixed) : witness;
+            return AuthWitness.fromString(rawAuthWitness);
+        }
+    });
+    return parsedWitnesses;
 }
 export function aliasedAddressParser(defaultPrefix, address, db) {
     if (address.startsWith('0x')) {
@@ -57,6 +60,9 @@ export function createAliasOption(description, hide) {
 export function createAccountOption(description, hide, db) {
     return new Option(`-f, --from <string>`, description).hideHelp(hide).argParser((address)=>aliasedAddressParser('accounts', address, db));
 }
+export function createAuthwitnessOption(description, hide, db) {
+    return new Option('-aw, --auth-witness <string,...>', description).hideHelp(hide).argParser((witness)=>aliasedAuthWitParser(witness, db));
+}
 export function createTypeOption(mandatory) {
     return new Option('-t, --type <string>', 'Type of account to create').choices(AccountTypes).default('schnorr').conflicts('account-or-address').makeOptionMandatory(mandatory);
 }
@@ -70,6 +76,12 @@ export function createArgsOption(isConstructor, db) {
 export function createContractAddressOption(db) {
     return new Option('-ca, --contract-address <address>', 'Aztec address of the contract.').argParser((address)=>aliasedAddressParser('contracts', address, db)).makeOptionMandatory(true);
 }
+export function createDebugExecutionStepsDirOption() {
+    return new Option('--debug-execution-steps-dir <address>', 'Directory to write execution step artifacts for bb profiling/debugging.').makeOptionMandatory(false);
+}
+export function createVerboseOption() {
+    return new Option('-v, --verbose', 'Provide timings on all executed operations (synching, simulating, proving)').default(false);
+}
 export function artifactPathParser(filePath, db) {
     if (filePath.includes('@')) {
         const [pkg, contractName] = filePath.split('@');
@@ -95,14 +107,11 @@ export async function artifactPathFromPromiseOrAlias(artifactPathPromise, contra
 export function createArtifactOption(db) {
     return new Option('-c, --contract-artifact <fileLocation>', ARTIFACT_DESCRIPTION).argParser((filePath)=>artifactPathParser(filePath, db)).makeOptionMandatory(false);
 }
-export function createProfileOption() {
-    return new Option('-p, --profile', 'Run the real prover and get the gate count for each function in the transaction.').default(false);
-}
 async function contractArtifactFromWorkspace(pkg, contractName) {
     const cwd = process.cwd();
     try {
         await stat(`${cwd}/Nargo.toml`);
-    } catch (e) {
+    } catch  {
         throw new Error('Invalid contract artifact argument provided. To use this option, command should be called from a nargo workspace');
     }
     const filesInTarget = await readdir(`${cwd}/${TARGET_DIR}`);
@@ -120,3 +129,6 @@ async function contractArtifactFromWorkspace(pkg, contractName) {
     }
     return `${cwd}/${TARGET_DIR}/${bestMatch[0]}`;
 }
+export function cleanupAuthWitnesses(authWitnesses) {
+    return authWitnesses?.filter((w)=>w !== undefined) ?? [];
+}

package/dest/utils/profiling.d.ts

@@ -0,0 +1,5 @@
+import type { LogFn } from '@aztec/foundation/log';
+import type { PrivateExecutionStep } from '@aztec/stdlib/kernel';
+import type { ProvingStats, SimulationStats } from '@aztec/stdlib/tx';
+export declare function printProfileResult(stats: ProvingStats | SimulationStats, log: LogFn, printOracles?: boolean, executionSteps?: PrivateExecutionStep[]): void;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZmlsaW5nLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvcHJvZmlsaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFrQixlQUFlLEVBQXFCLE1BQU0sa0JBQWtCLENBQUM7QUFVekcsd0JBQWdCLGtCQUFrQixDQUNoQyxLQUFLLEVBQUUsWUFBWSxHQUFHLGVBQWUsRUFDckMsR0FBRyxFQUFFLEtBQUssRUFDVixZQUFZLEdBQUUsT0FBZSxFQUM3QixjQUFjLENBQUMsRUFBRSxvQkFBb0IsRUFBRSxRQTJKeEMifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"profiling.d.ts","sourceRoot":"","sources":["../../src/utils/profiling.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAkB,eAAe,EAAqB,MAAM,kBAAkB,CAAC;AAUzG,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,YAAY,GAAG,eAAe,EACrC,GAAG,EAAE,KAAK,EACV,YAAY,GAAE,OAAe,EAC7B,cAAc,CAAC,EAAE,oBAAoB,EAAE,QA2JxC"}