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

package/dest/utils/options/fees.js

@@ -1,33 +1,9 @@
-import { FeeJuicePaymentMethod } from '@aztec/aztec.js';
 import { Fr } from '@aztec/foundation/fields';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { Gas, GasFees, GasSettings } from '@aztec/stdlib/gas';
 import { Option } from 'commander';
-import { createOrRetrieveAccount } from '../accounts.js';
+import { BASE_FEE_PADDING } from '../wallet.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,95 @@ 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) {
     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 } = 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, {
+                        return new FeeJuicePaymentMethodWithClaim(from, {
                             claimAmount: (typeof claimAmount === 'string' ? Fr.fromHexString(claimAmount) : new Fr(claimAmount)).toBigInt(),
                             claimSecret: Fr.fromHexString(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(`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(`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 +180,45 @@ 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 maxFeesPerGas = (await node.getCurrentBaseFees()).mul(1 + BASE_FEE_PADDING);
+        const gasSettings = GasSettings.default({
+            ...this.gasSettings,
+            maxFeesPerGas
+        });
+        const paymentMethod = await this.paymentMethod(wallet, from, gasSettings);
+        return {
+            paymentMethod,
+            gasSettings
+        };
+    }
+    static parse(args, log, db) {
+        return new CLIFeeArgs(!!args.estimateGasOnly, parsePaymentMethod(args.payment ?? 'method=fee_juice', log, db), 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.default({
+        ...estimate,
+        maxFeesPerGas
+    }).getFeeLimit().toBigInt();
+}

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;
+export declare function cleanupAuthWitnesses(authWitnesses: AuthWitness[] | undefined): AuthWitness[];
 //# sourceMappingURL=options.d.ts.map

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 '../wallet.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=profiling.d.ts.map

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,QA6IxC"}

package/dest/utils/profiling.js

@@ -0,0 +1,60 @@
+import { format } from 'util';
+const FN_NAME_PADDING = 60;
+const COLUMN_MIN_WIDTH = 13;
+const COLUMN_MAX_WIDTH = 15;
+const ORACLE_NAME_PADDING = 50;
+export function printProfileResult(stats, log, printOracles = false, executionSteps) {
+    log(format('\nPer circuit breakdown:\n'));
+    log(format('  ', 'Function name'.padEnd(FN_NAME_PADDING), 'Time'.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), executionSteps ? 'Gates'.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH) : '', executionSteps ? 'Subtotal'.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH) : ''));
+    log(format(''.padEnd(FN_NAME_PADDING + COLUMN_MAX_WIDTH + COLUMN_MAX_WIDTH + (executionSteps ? COLUMN_MAX_WIDTH + COLUMN_MAX_WIDTH : 0), '-')));
+    let acc = 0;
+    let biggest = executionSteps?.[0];
+    const timings = stats.timings;
+    timings.perFunction.forEach((fn, i)=>{
+        const currentExecutionStep = executionSteps?.[i];
+        if (currentExecutionStep && biggest && currentExecutionStep.gateCount > biggest.gateCount) {
+            biggest = currentExecutionStep;
+        }
+        acc += currentExecutionStep ? currentExecutionStep.gateCount : 0;
+        log(format(' - ', fn.functionName.padEnd(FN_NAME_PADDING), `${fn.time.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), currentExecutionStep ? currentExecutionStep.gateCount.toLocaleString().padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH) : '', currentExecutionStep ? acc.toLocaleString().padStart(COLUMN_MAX_WIDTH) : ''));
+        if (printOracles && fn.oracles) {
+            log('');
+            for (const [oracleName, { times }] of Object.entries(fn.oracles)){
+                const calls = times.length;
+                const min = Math.min(...times);
+                const max = Math.max(...times);
+                const total = times.reduce((acc, time)=>acc + time, 0);
+                const avg = total / calls;
+                log(format('    ', oracleName.padEnd(ORACLE_NAME_PADDING), `${calls} calls`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `${total.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `min: ${min.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `avg: ${avg.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `max: ${max.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH)));
+            }
+        }
+        log('');
+    });
+    if (biggest) {
+        log(format('\nTotal gates:', acc.toLocaleString(), `(Biggest circuit: ${biggest.functionName} -> ${biggest.gateCount.toLocaleString()})`));
+    }
+    if (stats.nodeRPCCalls) {
+        log(format('\nRPC calls:\n'));
+        for (const [method, { times }] of Object.entries(stats.nodeRPCCalls)){
+            const calls = times.length;
+            const total = times.reduce((acc, time)=>acc + time, 0);
+            const avg = total / calls;
+            const min = Math.min(...times);
+            const max = Math.max(...times);
+            log(format(method.padEnd(ORACLE_NAME_PADDING), `${calls} calls`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `${total.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `min: ${min.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `avg: ${avg.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `max: ${max.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH)));
+        }
+    }
+    log(format('\nSync time:'.padEnd(25), `${timings.sync?.toFixed(2)}ms`.padStart(16)));
+    log(format('Private simulation time:'.padEnd(25), `${timings.perFunction.reduce((acc, { time })=>acc + time, 0).toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH)));
+    if (timings.proving) {
+        log(format('Proving time:'.padEnd(25), `${timings.proving?.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH)));
+    }
+    if (timings.publicSimulation) {
+        log(format('Public simulation time:'.padEnd(25), `${timings.publicSimulation?.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH)));
+    }
+    if (timings.validation) {
+        log(format('Validation time:'.padEnd(25), `${timings.validation?.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH)));
+    }
+    log(format('Total time:'.padEnd(25), `${timings.total.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH), `(${timings.unaccounted.toFixed(2)}ms unaccounted)`));
+    log('\n');
+}

package/dest/utils/wallet.d.ts

@@ -0,0 +1,35 @@
+import { type Account } from '@aztec/aztec.js/account';
+import { type InteractionFeeOptions } from '@aztec/aztec.js/contracts';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import { UniqueNote } from '@aztec/aztec.js/note';
+import { AccountManager, type Aliased, BaseWallet, type SimulateOptions } from '@aztec/aztec.js/wallet';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
+import { Fr } from '@aztec/foundation/fields';
+import type { LogFn } from '@aztec/foundation/log';
+import type { PXEConfig } from '@aztec/pxe/config';
+import type { PXE } from '@aztec/pxe/server';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { NotesFilter } from '@aztec/stdlib/note';
+import type { TxProvingResult, TxSimulationResult } from '@aztec/stdlib/tx';
+import type { WalletDB } from '../storage/wallet_db.js';
+export declare const AccountTypes: readonly ["schnorr", "ecdsasecp256r1", "ecdsasecp256r1ssh", "ecdsasecp256k1"];
+export type AccountType = (typeof AccountTypes)[number];
+export declare const BASE_FEE_PADDING = 0.5;
+export declare class CLIWallet extends BaseWallet {
+    private userLog;
+    private db?;
+    private accountCache;
+    constructor(pxe: PXE, node: AztecNode, userLog: LogFn, db?: WalletDB | undefined);
+    static create(node: AztecNode, log: LogFn, db?: WalletDB, overridePXEConfig?: Partial<PXEConfig>): Promise<CLIWallet>;
+    getAccounts(): Promise<Aliased<AztecAddress>[]>;
+    private createCancellationTxExecutionRequest;
+    proveCancellationTx(from: AztecAddress, txNonce: Fr, increasedFee: InteractionFeeOptions): Promise<TxProvingResult>;
+    getAccountFromAddress(address: AztecAddress): Promise<Account>;
+    private createAccount;
+    createOrRetrieveAccount(address?: AztecAddress, secretKey?: Fr, type?: AccountType, salt?: Fr, publicKey?: string): Promise<AccountManager>;
+    private getFakeAccountDataFor;
+    simulateTx(executionPayload: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResult>;
+    getContracts(): Promise<AztecAddress[]>;
+    getNotes(filter: NotesFilter): Promise<UniqueNote[]>;
+}
+//# sourceMappingURL=wallet.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src/utils/wallet.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,OAAO,EAA2C,MAAM,yBAAyB,CAAC;AAChG,OAAO,EACL,KAAK,qBAAqB,EAG3B,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,KAAK,OAAO,EAAE,UAAU,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAExG,OAAO,EAAE,gBAAgB,EAA0B,MAAM,4BAA4B,CAAC;AACtF,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE5E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,eAAO,MAAM,YAAY,+EAAgF,CAAC;AAC1G,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAExD,eAAO,MAAM,gBAAgB,MAAM,CAAC;AAEpC,qBAAa,SAAU,SAAQ,UAAU;IAMrC,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,EAAE,CAAC;IANb,OAAO,CAAC,YAAY,CAA8B;gBAGhD,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,SAAS,EACP,OAAO,EAAE,KAAK,EACd,EAAE,CAAC,EAAE,QAAQ,YAAA;WAMV,MAAM,CACjB,IAAI,EAAE,SAAS,EACf,GAAG,EAAE,KAAK,EACV,EAAE,CAAC,EAAE,QAAQ,EACb,iBAAiB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GACrC,OAAO,CAAC,SAAS,CAAC;IAMN,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YAKhD,oCAAoC;IAoB5C,mBAAmB,CACvB,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,EAAE,EACX,YAAY,EAAE,qBAAqB,GAClC,OAAO,CAAC,eAAe,CAAC;IAKZ,qBAAqB,CAAC,OAAO,EAAE,YAAY;YAkB5C,aAAa;IAWrB,uBAAuB,CAC3B,OAAO,CAAC,EAAE,YAAY,EACtB,SAAS,CAAC,EAAE,EAAE,EACd,IAAI,GAAE,WAAuB,EAC7B,IAAI,CAAC,EAAE,EAAE,EACT,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,cAAc,CAAC;YAqDZ,qBAAqB;IAmBpB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAuDjH,YAAY,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAMvC,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CAGrD"}