@aztec/cli-wallet 3.0.0-nightly.20250930 → 3.0.0-nightly.20251002

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

@@ -1 +1 @@
-{"version":3,"file":"bridge_fee_juice.d.ts","sourceRoot":"","sources":["../../src/cmds/bridge_fee_juice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAA2B,MAAM,iBAAiB,CAAC;AAG1E,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY,EACvB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,EACb,QAAQ,oBAAS,EACjB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,kCAkEpB"}
+{"version":3,"file":"bridge_fee_juice.d.ts","sourceRoot":"","sources":["../../src/cmds/bridge_fee_juice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAoD,MAAM,iBAAiB,CAAC;AAGnG,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY,EACvB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,EACb,QAAQ,oBAAS,EACjB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,kCAmEpB"}

package/dest/cmds/bridge_fee_juice.js

@@ -1,4 +1,4 @@
-import { L1FeeJuicePortalManager } from '@aztec/aztec.js';
+import { L1FeeJuicePortalManager, ProtocolContractAddress } from '@aztec/aztec.js';
 import { prettyPrintJSON } from '@aztec/cli/utils';
 import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
@@ -7,7 +7,6 @@ export async function bridgeL1FeeJuice(amount, recipient, node, l1RpcUrls, chain
     // Prepare L1 client
     const chain = createEthereumChain(l1RpcUrls, chainId);
     const client = createExtendedL1Client(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
-    const { protocolContractAddresses: { feeJuice: feeJuiceAddress } } = await node.getNodeInfo();
     // Setup portal manager
     const portal = await L1FeeJuicePortalManager.new(node, client, debugLogger);
     const { claimAmount, claimSecret, messageHash, messageLeafIndex } = await portal.bridgeTokensPublic(recipient, amount, mint);
@@ -34,7 +33,7 @@ export async function bridgeL1FeeJuice(amount, recipient, node, l1RpcUrls, chain
         const delayedCheck = (delay)=>{
             return new Promise((resolve, reject)=>{
                 setTimeout(()=>{
-                    void getNonNullifiedL1ToL2MessageWitness(node, feeJuiceAddress, Fr.fromHexString(messageHash), claimSecret).then((witness)=>resolve(witness)).catch((err)=>reject(err));
+                    void getNonNullifiedL1ToL2MessageWitness(node, ProtocolContractAddress.FeeJuice, Fr.fromHexString(messageHash), claimSecret).then((witness)=>resolve(witness)).catch((err)=>reject(err));
                 }, delay);
             });
         };

package/dest/cmds/cancel_tx.d.ts

@@ -1,4 +1,4 @@
-import { AztecAddress, type FeePaymentMethod, type TxHash } from '@aztec/aztec.js';
+import { type AppConfigurableFeePaymentMethod, AztecAddress, type TxHash } from '@aztec/aztec.js';
 import { Fr } from '@aztec/foundation/fields';
 import type { LogFn } from '@aztec/foundation/log';
 import { GasFees, GasSettings } from '@aztec/stdlib/gas';
@@ -8,5 +8,5 @@ export declare function cancelTx(wallet: CLIWallet, from: AztecAddress, { txHash
     gasSettings: GasSettings;
     txNonce: Fr;
     cancellable: boolean;
-}, paymentMethod: FeePaymentMethod, increasedFees: GasFees, maxFeesPerGas: GasFees | undefined, log: LogFn): Promise<void>;
+}, paymentMethod: AppConfigurableFeePaymentMethod | undefined, increasedFees: GasFees, maxFeesPerGas: GasFees | undefined, log: LogFn): Promise<void>;
 //# sourceMappingURL=cancel_tx.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"cancel_tx.d.ts","sourceRoot":"","sources":["../../src/cmds/cancel_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,gBAAgB,EAAU,KAAK,MAAM,EAAY,MAAM,iBAAiB,CAAC;AAErG,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,YAAY,EAClB,EACE,MAAM,EACN,WAAW,EAAE,iBAAiB,EAC9B,OAAO,EACP,WAAW,GACZ,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,EAClF,aAAa,EAAE,gBAAgB,EAC/B,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,GAAG,SAAS,EAClC,GAAG,EAAE,KAAK,iBAwCX"}
+{"version":3,"file":"cancel_tx.d.ts","sourceRoot":"","sources":["../../src/cmds/cancel_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,+BAA+B,EACpC,YAAY,EAGZ,KAAK,MAAM,EAEZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,YAAY,EAClB,EACE,MAAM,EACN,WAAW,EAAE,iBAAiB,EAC9B,OAAO,EACP,WAAW,GACZ,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,EAClF,aAAa,EAAE,+BAA+B,GAAG,SAAS,EAC1D,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,GAAG,SAAS,EAClC,GAAG,EAAE,KAAK,iBA0CX"}

package/dest/cmds/cancel_tx.js

@@ -14,7 +14,9 @@ export async function cancelTx(wallet, from, { txHash, gasSettings: prevTxGasSet
             ...prevTxGasSettings,
             maxPriorityFeesPerGas,
             maxFeesPerGas: maxFeesPerGas ?? prevTxGasSettings.maxFeesPerGas
-        })
+        }),
+        endSetup: false,
+        isFeePayer: false
     };
     const txProvingResult = await wallet.proveCancellationTx(from, txNonce, feeOptions);
     const sentTx = new SentTx(wallet, async ()=>{

package/dest/cmds/create_account.d.ts

@@ -1,9 +1,9 @@
-import { AztecAddress } from '@aztec/aztec.js';
+import { AztecAddress, type AztecNode } from '@aztec/aztec.js';
 import { Fr } from '@aztec/foundation/fields';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { CLIFeeArgs } from '../utils/options/fees.js';
 import { type AccountType, CLIWallet } from '../utils/wallet.js';
-export declare function createAccount(wallet: CLIWallet, accountType: AccountType, secretKey: Fr | undefined, publicKey: string | undefined, alias: string | undefined, registerOnly: boolean, publicDeploy: boolean, skipInitialization: boolean, wait: boolean, feeOpts: CLIFeeArgs, json: boolean, verbose: boolean, debugLogger: Logger, log: LogFn): Promise<{
+export declare function createAccount(wallet: CLIWallet, aztecNode: AztecNode, accountType: AccountType, secretKey: Fr | undefined, publicKey: string | undefined, alias: string | undefined, deployer: AztecAddress | undefined, registerOnly: boolean, skipInitialization: boolean, publicDeploy: boolean, registerClass: boolean, wait: boolean, feeOpts: CLIFeeArgs, json: boolean, verbose: boolean, debugLogger: Logger, log: LogFn): Promise<{
     alias: string | undefined;
     address: AztecAddress;
     secretKey: Fr;

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

@@ -1 +1 @@
-{"version":3,"file":"create_account.d.ts","sourceRoot":"","sources":["../../src/cmds/create_account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA+C,MAAM,iBAAiB,CAAC;AAE5F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,EAAE,KAAK,WAAW,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEjE,wBAAsB,aAAa,CACjC,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,EAAE,GAAG,SAAS,EACzB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,kBAAkB,EAAE,OAAO,EAC3B,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;;GA+IX"}
+{"version":3,"file":"create_account.d.ts","sourceRoot":"","sources":["../../src/cmds/create_account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,SAAS,EAA6B,MAAM,iBAAiB,CAAC;AAE1F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,EAAE,KAAK,WAAW,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEjE,wBAAsB,aAAa,CACjC,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,EAAE,GAAG,SAAS,EACzB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,EAAE,YAAY,GAAG,SAAS,EAClC,YAAY,EAAE,OAAO,EACrB,kBAAkB,EAAE,OAAO,EAC3B,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,OAAO,EACtB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;;GAkHX"}

package/dest/cmds/create_account.js

@@ -1,9 +1,9 @@
-import { AztecAddress, ProtocolContractAddress } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import { Fr } from '@aztec/foundation/fields';
 import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
 import { printProfileResult } from '../utils/profiling.js';
-export async function createAccount(wallet, accountType, secretKey, publicKey, alias, registerOnly, publicDeploy, skipInitialization, wait, feeOpts, json, verbose, debugLogger, log) {
+export async function createAccount(wallet, aztecNode, accountType, secretKey, publicKey, alias, deployer, registerOnly, skipInitialization, publicDeploy, registerClass, wait, feeOpts, json, verbose, debugLogger, log) {
     secretKey ??= Fr.random();
     const account = await wallet.createOrRetrieveAccount(undefined /* address, we don't have it yet */ , secretKey, accountType, Fr.ZERO, publicKey);
     const { salt } = account.getInstance();
@@ -18,7 +18,6 @@ export async function createAccount(wallet, accountType, secretKey, publicKey, a
         out.partialAddress = partialAddress;
         out.salt = salt;
         out.initHash = account.getInstance().initializationHash;
-        out.deployer = account.getInstance().deployer;
     } else {
         log(`\nNew account:\n`);
         log(`Address:         ${address.toString()}`);
@@ -29,54 +28,31 @@ export async function createAccount(wallet, accountType, secretKey, publicKey, a
         log(`Partial address: ${partialAddress.toString()}`);
         log(`Salt:            ${salt.toString()}`);
         log(`Init hash:       ${account.getInstance().initializationHash.toString()}`);
-        log(`Deployer:        ${account.getInstance().deployer.toString()}`);
     }
     let tx;
     let txReceipt;
     if (!registerOnly) {
-        const userFeeOptions = await feeOpts.toUserFeeOptions(wallet, address);
-        const feePayer = await userFeeOptions.paymentMethod?.getFeePayer();
-        let paymentAsset;
-        try {
-            paymentAsset = await userFeeOptions.paymentMethod?.getAsset();
-        // eslint-disable-next-line no-empty
-        } catch  {}
-        // If someone else is paying the fee, set them as the deployment account.
-        // What we're trying to identify here is that the fee payment method is
-        // FeeJuicePaymentMethod(anAddressThatsNotTheAccountBeingDeployed)
-        const delegatedDeployment = paymentAsset?.equals(ProtocolContractAddress.FeeJuice) && !feePayer?.equals(account.getAddress());
-        const from = delegatedDeployment ? feePayer : AztecAddress.ZERO;
-        const deployOpts = {
-            skipClassPublication: !publicDeploy,
+        const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
+        const delegatedDeployment = deployer && !account.address.equals(deployer);
+        const from = delegatedDeployment ? deployer : AztecAddress.ZERO;
+        const deployAccountOpts = {
+            skipClassPublication: !registerClass,
             skipInstancePublication: !publicDeploy,
             skipInitialization,
             from,
-            fee: userFeeOptions,
-            // Do not mix the deployer in the address, since the account
-            // was created (and thus its address was fixed) like this
-            universalDeploy: true,
-            contractAddressSalt: salt
+            fee: {
+                paymentMethod,
+                gasSettings
+            }
         };
-        /*
-     * This is usually handled by accountManager.create(), but we're accessing the lower
-     * level method to get gas and timings. That means we have to replicate some of the logic here.
-     * In case we're initializing and/or publishing our own account, we need to hijack the payment method for the fee,
-     * wrapping it in the one that will make use of the freshly deployed account's
-     * entrypoint. For reference, see aztec.js/src/account_manager.ts:sendAccountContractSetupTx()
-     * Also, salt and universalDeploy have to be explicitly provided
-     */ deployOpts.fee = !delegatedDeployment && deployOpts.fee ? {
-            ...deployOpts.fee,
-            paymentMethod: await account.getSelfPaymentMethod(deployOpts.fee.paymentMethod)
-        } : deployOpts.fee;
         const deployMethod = await account.getDeployMethod();
-        const { stats, estimatedGas } = await deployMethod.simulate({
-            ...deployOpts,
+        const { estimatedGas } = await deployMethod.simulate({
+            ...deployAccountOpts,
             fee: {
-                ...deployOpts.fee,
+                ...deployAccountOpts.fee,
                 estimateGas: true
             }
         });
-        printProfileResult(stats, log);
         if (feeOpts.estimateOnly) {
             if (json) {
                 out.fee = {
@@ -92,11 +68,11 @@ export async function createAccount(wallet, accountType, secretKey, publicKey, a
             }
         } else {
             const provenTx = await deployMethod.prove({
-                ...deployOpts,
-                fee: {
-                    ...deployOpts.fee,
+                ...deployAccountOpts,
+                fee: deployAccountOpts.fee ? {
+                    ...deployAccountOpts.fee,
                     gasSettings: estimatedGas
-                }
+                } : undefined
             });
             if (verbose) {
                 printProfileResult(provenTx.stats, log);

package/dest/cmds/deploy.d.ts

@@ -1,6 +1,7 @@
-import { AztecAddress, Fr, type Wallet } from '@aztec/aztec.js';
+import { AztecAddress, type AztecNode, Fr } from '@aztec/aztec.js';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { PublicKeys } from '@aztec/stdlib/keys';
 import { CLIFeeArgs } from '../utils/options/fees.js';
-export declare function deploy(wallet: Wallet, deployer: AztecAddress, artifactPath: string, json: boolean, publicKeys: PublicKeys | undefined, rawArgs: any[], salt: Fr | undefined, initializer: string | undefined, skipInstancePublication: boolean, skipClassPublication: boolean, skipInitialization: boolean | undefined, wait: boolean, feeOpts: CLIFeeArgs, verbose: boolean, timeout: number | undefined, debugLogger: Logger, log: LogFn): Promise<AztecAddress | undefined>;
+import type { CLIWallet } from '../utils/wallet.js';
+export declare function deploy(wallet: CLIWallet, node: AztecNode, deployer: AztecAddress, artifactPath: string, json: boolean, publicKeys: PublicKeys | undefined, rawArgs: any[], salt: Fr | undefined, initializer: string | undefined, skipInstancePublication: boolean, skipClassPublication: boolean, skipInitialization: boolean | undefined, wait: boolean, feeOpts: CLIFeeArgs, verbose: boolean, timeout: number | undefined, debugLogger: Logger, log: LogFn): Promise<AztecAddress | undefined>;
 //# sourceMappingURL=deploy.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAwC,EAAE,EAAE,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEtG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAGtD,wBAAsB,MAAM,CAC1B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,EACtB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,OAAO,EAAE,GAAG,EAAE,EACd,IAAI,EAAE,EAAE,GAAG,SAAS,EACpB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,uBAAuB,EAAE,OAAO,EAChC,oBAAoB,EAAE,OAAO,EAC7B,kBAAkB,EAAE,OAAO,GAAG,SAAS,EACvC,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,YAAuB,EACtC,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,qCA+FX"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,SAAS,EAAwC,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAEzG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,wBAAsB,MAAM,CAC1B,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,YAAY,EACtB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,OAAO,EAAE,GAAG,EAAE,EACd,IAAI,EAAE,EAAE,GAAG,SAAS,EACpB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,uBAAuB,EAAE,OAAO,EAChC,oBAAoB,EAAE,OAAO,EAC7B,kBAAkB,EAAE,OAAO,GAAG,SAAS,EACvC,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,YAAuB,EACtC,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,qCA+FX"}

package/dest/cmds/deploy.js

@@ -4,7 +4,7 @@ import { getAllFunctionAbis, getInitializer } from '@aztec/stdlib/abi';
 import { PublicKeys } from '@aztec/stdlib/keys';
 import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
 import { printProfileResult } from '../utils/profiling.js';
-export async function deploy(wallet, deployer, artifactPath, json, publicKeys, rawArgs, salt, initializer, skipInstancePublication, skipClassPublication, skipInitialization, wait, feeOpts, verbose, timeout = DEFAULT_TX_TIMEOUT_S, debugLogger, log) {
+export async function deploy(wallet, node, deployer, artifactPath, json, publicKeys, rawArgs, salt, initializer, skipInstancePublication, skipClassPublication, skipInitialization, wait, feeOpts, verbose, timeout = DEFAULT_TX_TIMEOUT_S, debugLogger, log) {
     const out = {};
     salt ??= Fr.random();
     const contractArtifact = await getContractArtifact(artifactPath, log);
@@ -22,9 +22,12 @@ export async function deploy(wallet, deployer, artifactPath, json, publicKeys, r
         debugLogger.debug(`Encoded arguments: ${args.join(', ')}`);
     }
     const deploy1 = contractDeployer.deploy(...args);
-    const userFeeOptions = await feeOpts.toUserFeeOptions(wallet, deployer);
+    const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(node, wallet, deployer);
     const deployOpts = {
-        fee: userFeeOptions,
+        fee: {
+            gasSettings,
+            paymentMethod
+        },
         from: deployer ?? AztecAddress.ZERO,
         contractAddressSalt: salt,
         universalDeploy: !deployer,

package/dest/cmds/deploy_account.d.ts

@@ -1,6 +1,6 @@
-import { AztecAddress } from '@aztec/aztec.js';
+import { AztecAddress, type AztecNode } from '@aztec/aztec.js';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import type { CLIFeeArgs } from '../utils/options/fees.js';
 import type { CLIWallet } from '../utils/wallet.js';
-export declare function deployAccount(wallet: CLIWallet, address: AztecAddress, wait: boolean, registerClass: boolean, publicDeploy: boolean, feeOpts: CLIFeeArgs, json: boolean, verbose: boolean, debugLogger: Logger, log: LogFn): Promise<void>;
+export declare function deployAccount(wallet: CLIWallet, aztecNode: AztecNode, address: AztecAddress, wait: boolean, deployer: AztecAddress | undefined, registerClass: boolean, publicDeploy: boolean, skipInitialization: boolean, feeOpts: CLIFeeArgs, json: boolean, verbose: boolean, debugLogger: Logger, log: LogFn): Promise<void>;
 //# sourceMappingURL=deploy_account.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"deploy_account.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy_account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA+C,MAAM,iBAAiB,CAAC;AAE5F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,wBAAsB,aAAa,CACjC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,YAAY,EACrB,IAAI,EAAE,OAAO,EACb,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,OAAO,EACrB,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,iBA2HX"}
+{"version":3,"file":"deploy_account.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy_account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,SAAS,EAA6B,MAAM,iBAAiB,CAAC;AAE1F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,wBAAsB,aAAa,CACjC,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,YAAY,EACrB,IAAI,EAAE,OAAO,EACb,QAAQ,EAAE,YAAY,GAAG,SAAS,EAClC,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,OAAO,EACrB,kBAAkB,EAAE,OAAO,EAC3B,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,iBAiGX"}

package/dest/cmds/deploy_account.js

@@ -1,12 +1,12 @@
-import { AztecAddress, ProtocolContractAddress } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
 import { printProfileResult } from '../utils/profiling.js';
-export async function deployAccount(wallet, address, wait, registerClass, publicDeploy, feeOpts, json, verbose, debugLogger, log) {
+export async function deployAccount(wallet, aztecNode, address, wait, deployer, registerClass, publicDeploy, skipInitialization, feeOpts, json, verbose, debugLogger, log) {
     const out = {};
     const account = await wallet.createOrRetrieveAccount(address);
     const { partialAddress, publicKeys } = await account.getCompleteAddress();
-    const { initializationHash, deployer, salt } = account.getInstance();
+    const { initializationHash, salt } = account.getInstance();
     if (json) {
         out.address = address;
         out.partialAddress = partialAddress;
@@ -20,48 +20,27 @@ export async function deployAccount(wallet, address, wait, registerClass, public
         log(`Partial address: ${partialAddress.toString()}`);
         log(`Salt:            ${salt.toString()}`);
         log(`Init hash:       ${initializationHash.toString()}`);
-        log(`Deployer:        ${deployer.toString()}`);
     }
     let tx;
     let txReceipt;
-    const userFeeOptions = await feeOpts.toUserFeeOptions(wallet, address);
-    const feePayer = await userFeeOptions.paymentMethod?.getFeePayer();
-    let paymentAsset;
-    try {
-        paymentAsset = await userFeeOptions.paymentMethod?.getAsset();
-    // eslint-disable-next-line no-empty
-    } catch  {}
-    // If someone else is paying the fee, set them as the deployment account.
-    // What we're trying to identify here is that the fee payment method is
-    // FeeJuicePaymentMethod(anAddressThatsNotTheAccountBeingDeployed)
-    const delegatedDeployment = paymentAsset?.equals(ProtocolContractAddress.FeeJuice) && !feePayer?.equals(account.getAddress());
-    const from = delegatedDeployment ? feePayer : AztecAddress.ZERO;
-    const deployOpts = {
-        skipInstancePublication: !publicDeploy,
+    const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
+    const delegatedDeployment = deployer && !account.address.equals(deployer);
+    const from = delegatedDeployment ? deployer : AztecAddress.ZERO;
+    const deployAccountOpts = {
         skipClassPublication: !registerClass,
+        skipInstancePublication: !publicDeploy,
+        skipInitialization,
         from,
-        fee: userFeeOptions,
-        // Do not mix the deployer in the address, since the account
-        // was created (and thus its address was fixed) like this
-        universalDeploy: true,
-        contractAddressSalt: salt
+        fee: {
+            paymentMethod,
+            gasSettings
+        }
     };
-    /*
-   * This is usually handled by accountManager.deploy(), but we're accessing the lower
-   * level method to get gas and timings. That means we have to replicate some of the logic here.
-   * In case we're deploying our own account, we need to hijack the payment method for the fee,
-   * wrapping it in the one that will make use of the freshly deployed account's
-   * entrypoint. For reference, see aztec.js/src/account_manager.ts:deploy()
-   * Also, salt and universalDeploy have to be explicitly provided
-   */ deployOpts.fee = !delegatedDeployment && deployOpts?.fee ? {
-        ...deployOpts.fee,
-        paymentMethod: await account.getSelfPaymentMethod(deployOpts.fee.paymentMethod)
-    } : deployOpts?.fee;
     const deployMethod = await account.getDeployMethod();
     const { estimatedGas } = await deployMethod.simulate({
-        ...deployOpts,
+        ...deployAccountOpts,
         fee: {
-            ...deployOpts.fee,
+            ...deployAccountOpts.fee,
             estimateGas: true
         }
     });
@@ -80,11 +59,11 @@ export async function deployAccount(wallet, address, wait, registerClass, public
         }
     } else {
         const provenTx = await deployMethod.prove({
-            ...deployOpts,
-            fee: {
-                ...deployOpts.fee,
+            ...deployAccountOpts,
+            fee: deployAccountOpts.fee ? {
+                ...deployAccountOpts.fee,
                 gasSettings: estimatedGas
-            }
+            } : undefined
         });
         if (verbose) {
             printProfileResult(provenTx.stats, log);

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cmds/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAGjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AA4BvF,wBAAgB,cAAc,CAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,uBAAuB,EAC7C,EAAE,EAAE,QAAQ,WAonBb"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cmds/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAGjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AA2BvF,wBAAgB,cAAc,CAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,uBAAuB,EAC7C,EAAE,EAAE,QAAQ,WAspBb"}

package/dest/cmds/index.js

@@ -1,10 +1,10 @@
 import { getIdentities } from '@aztec/accounts/utils';
 import { TxHash } from '@aztec/aztec.js/tx_hash';
 import { ETHEREUM_HOSTS, PRIVATE_KEY, addOptions, createSecretKeyOption, l1ChainIdOption, parseBigint, parseFieldFromHexString, parsePublicKey } from '@aztec/cli/utils';
-import { GasFees } from '@aztec/stdlib/gas';
+import { GasFees, GasSettings } from '@aztec/stdlib/gas';
 import { Option } from 'commander';
 import inquirer from 'inquirer';
-import { ARTIFACT_DESCRIPTION, CLIFeeArgs, CLIFeeArgsWithFeePayer, aliasedAddressParser, aliasedSecretKeyParser, aliasedTxHashParser, artifactPathFromPromiseOrAlias, artifactPathParser, cleanupAuthWitnesses, createAccountOption, createAliasOption, createArgsOption, createArtifactOption, createAuthwitnessOption, createContractAddressOption, createDebugExecutionStepsDirOption, createTypeOption, createVerboseOption, getPaymentMethodOption, integerArgParser, parseGasFees, parsePaymentMethod } from '../utils/options/index.js';
+import { ARTIFACT_DESCRIPTION, CLIFeeArgs, aliasedAddressParser, aliasedSecretKeyParser, aliasedTxHashParser, artifactPathFromPromiseOrAlias, artifactPathParser, cleanupAuthWitnesses, createAccountOption, createAliasOption, createArgsOption, createArtifactOption, createAuthwitnessOption, createContractAddressOption, createDebugExecutionStepsDirOption, createTypeOption, createVerboseOption, getPaymentMethodOption, integerArgParser, parseGasFees, parsePaymentMethod } from '../utils/options/index.js';
 // TODO: This function is only used in 1 place so we could just inline this
 export function injectCommands(program, log, debugLogger, walletAndNodeWrapper, db) {
     program.command('import-test-accounts').description('Import test accounts from pxe.').option('--json', 'Emit output as json').action(async (options)=>{
@@ -13,13 +13,13 @@ export function injectCommands(program, log, debugLogger, walletAndNodeWrapper,
         const { importTestAccounts } = await import('./import_test_accounts.js');
         await importTestAccounts(wallet, db, json, log);
     });
-    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', 'Publishes the account contract instance (and the class, if needed). Needed if the contract contains public functions.').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(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 Wallet. 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.
+    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.').addOption(createAccountOption('Alias or address of the account performing the deployment', !db, db)).option('--skip-initialization', 'Skip initializing the account contract. Useful for publicly deploying an existing account.').option('--public-deploy', 'Publishes the account contract instance (and the class, if needed). Needed if the contract contains public functions.').option('--register-class', 'Register the contract class (useful for when the contract class has not been deployed yet).').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(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 Wallet. 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').addOption(createVerboseOption());
-    addOptions(createAccountCommand, CLIFeeArgsWithFeePayer.getOptions()).action(async (_options, command)=>{
+    addOptions(createAccountCommand, CLIFeeArgs.getOptions()).action(async (_options, command)=>{
         const { createAccount } = await import('./create_account.js');
         const options = command.optsWithGlobals();
-        const { type, secretKey, wait, registerOnly, skipInitialization, publicDeploy, alias, json, verbose } = options;
+        const { type, from: parsedFromAddress, secretKey, wait, registerOnly, skipInitialization, publicDeploy, registerClass, alias, json, verbose } = options;
         let { publicKey } = options;
         if (type === 'ecdsasecp256r1ssh' && !publicKey) {
             const identities = await getIdentities();
@@ -33,8 +33,8 @@ export function injectCommands(program, log, debugLogger, walletAndNodeWrapper,
             ]);
             publicKey = answers.identity.split(' ')[1];
         }
-        const wallet = walletAndNodeWrapper.wallet;
-        const accountCreationResult = await createAccount(wallet, type, secretKey, publicKey, alias, registerOnly, skipInitialization, publicDeploy, wait, CLIFeeArgsWithFeePayer.parse(options, log, db), json, verbose, debugLogger, log);
+        const { wallet, node } = walletAndNodeWrapper;
+        const accountCreationResult = await createAccount(wallet, node, type, secretKey, publicKey, alias, parsedFromAddress, registerOnly, skipInitialization, publicDeploy, registerClass, wait, CLIFeeArgs.parse(options, log, db), json, verbose, debugLogger, log);
         if (db) {
             const { address, alias, secretKey, salt } = accountCreationResult;
             await db.storeAccount(address, {
@@ -46,15 +46,15 @@ export function injectCommands(program, log, debugLogger, walletAndNodeWrapper,
             }, log);
         }
     });
-    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)).option('--json', 'Emit output as json')// `options.wait` is default true. Passing `--no-wait` will set it to false.
+    const deployAccountCommand = program.command('deploy-account').description('Deploys an already registered aztec account that can be used for sending transactions.').argument('<address>', 'The address of the contract to register', (address)=>aliasedAddressParser('accounts', address, db)).addOption(createAccountOption('Alias or address of the account performing the deployment', !db, 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
-    .option('--no-wait', 'Skip waiting for the contract to be deployed. Print the hash of deployment transaction').option('--register-class', 'Register the contract class (useful for when the contract class has not been deployed yet).').option('--public-deploy', 'Publishes the account contract instance (and the class, if needed). Needed if the contract contains public functions.').addOption(createVerboseOption());
-    addOptions(deployAccountCommand, CLIFeeArgsWithFeePayer.getOptions()).action(async (_options, command)=>{
+    .option('--no-wait', 'Skip waiting for the contract to be deployed. Print the hash of deployment transaction').option('--register-class', 'Register the contract class (useful for when the contract class has not been deployed yet).').option('--public-deploy', 'Publishes the account contract instance (and the class, if needed). Needed if the contract contains public functions.').option('--skip-initialization', 'Skip initializing the account contract. Useful for publicly deploying an existing account.').addOption(createVerboseOption());
+    addOptions(deployAccountCommand, CLIFeeArgs.getOptions()).action(async (parsedAccount, _options, command)=>{
         const { deployAccount } = await import('./deploy_account.js');
         const options = command.optsWithGlobals();
-        const { wait, from: parsedFromAddress, json, registerClass, publicDeploy, verbose } = options;
-        const wallet = walletAndNodeWrapper.wallet;
-        await deployAccount(wallet, parsedFromAddress, wait, registerClass, publicDeploy, CLIFeeArgsWithFeePayer.parse(options, log, db), json, verbose, debugLogger, log);
+        const { wait, from: parsedFromAddress, json, registerClass, skipInitialization, publicDeploy, verbose } = options;
+        const { wallet, node } = walletAndNodeWrapper;
+        await deployAccount(wallet, node, parsedAccount, wait, parsedFromAddress, registerClass, publicDeploy, skipInitialization, CLIFeeArgs.parse(options, log, db), json, verbose, 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(createArgsOption(true, db)).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
@@ -63,10 +63,10 @@ export function injectCommands(program, log, debugLogger, walletAndNodeWrapper,
         const { deploy } = await import('./deploy.js');
         const options = command.optsWithGlobals();
         const { json, publicKey, args, salt, wait, classRegistration, init, publicDeployment, universal, from: parsedFromAddress, alias, timeout, verbose } = options;
-        const wallet = walletAndNodeWrapper.wallet;
+        const { wallet, node } = walletAndNodeWrapper;
         const artifactPath = await artifactPathPromise;
         debugLogger.info(`Using wallet with address ${parsedFromAddress.toString()}`);
-        const address = await deploy(wallet, universal ? undefined : parsedFromAddress, artifactPath, json, publicKey, args, salt, typeof init === 'string' ? init : undefined, !publicDeployment, !classRegistration, typeof init === 'string' ? false : init, wait, CLIFeeArgs.parse(options, log, db), timeout, verbose, debugLogger, log);
+        const address = await deploy(wallet, node, universal ? undefined : parsedFromAddress, artifactPath, json, publicKey, args, salt, typeof init === 'string' ? init : undefined, !publicDeployment, !classRegistration, typeof init === 'string' ? false : init, wait, CLIFeeArgs.parse(options, log, db), timeout, verbose, debugLogger, log);
         if (db && address) {
             await db.storeContract(address, artifactPath, log, alias);
         }
@@ -76,11 +76,11 @@ export function injectCommands(program, log, debugLogger, walletAndNodeWrapper,
         const { send } = await import('./send.js');
         const options = command.optsWithGlobals();
         const { args, contractArtifact: artifactPathPromise, contractAddress, from: parsedFromAddress, wait, alias, cancel, authWitness: authWitnessArray, verbose } = options;
-        const wallet = walletAndNodeWrapper.wallet;
+        const { wallet, node } = walletAndNodeWrapper;
         const artifactPath = await artifactPathFromPromiseOrAlias(artifactPathPromise, contractAddress, db);
         debugLogger.info(`Using wallet with address ${parsedFromAddress.toString()}`);
         const authWitnesses = cleanupAuthWitnesses(authWitnessArray);
-        const sentTx = await send(wallet, parsedFromAddress, functionName, args, artifactPath, contractAddress, wait, cancel, CLIFeeArgs.parse(options, log, db), authWitnesses, verbose, log);
+        const sentTx = await send(wallet, node, parsedFromAddress, functionName, args, artifactPath, contractAddress, wait, cancel, CLIFeeArgs.parse(options, log, db), authWitnesses, verbose, log);
         if (db && sentTx) {
             const txAlias = alias ? alias : `${functionName}-${sentTx.txNonce.toString().slice(-4)}`;
             await db.storeTx(sentTx, log, txAlias);
@@ -91,20 +91,20 @@ export function injectCommands(program, log, debugLogger, walletAndNodeWrapper,
         const { simulate } = await import('./simulate.js');
         const options = command.optsWithGlobals();
         const { args, contractArtifact: artifactPathPromise, contractAddress, from: parsedFromAddress, verbose, authWitness } = options;
-        const wallet = walletAndNodeWrapper.wallet;
+        const { wallet, node } = walletAndNodeWrapper;
         const artifactPath = await artifactPathFromPromiseOrAlias(artifactPathPromise, contractAddress, db);
         const authWitnesses = cleanupAuthWitnesses(authWitness);
-        await simulate(wallet, parsedFromAddress, functionName, args, artifactPath, contractAddress, CLIFeeArgs.parse(options, log, db), authWitnesses, verbose, log);
+        await simulate(wallet, node, parsedFromAddress, functionName, args, artifactPath, contractAddress, CLIFeeArgs.parse(options, log, db), authWitnesses, verbose, log);
     });
     const profileCommand = program.command('profile').description('Profiles a private function by counting the unconditional operations in its execution steps').argument('<functionName>', 'Name of function to simulate').addOption(createArgsOption(false, db)).addOption(createContractAddressOption(db)).addOption(createArtifactOption(db)).addOption(createDebugExecutionStepsDirOption()).addOption(createAuthwitnessOption('Authorization witness to use for the simulation', !db, db)).addOption(createAccountOption('Alias or address of the account to simulate from', !db, db));
     addOptions(profileCommand, CLIFeeArgs.getOptions()).action(async (functionName, _options, command)=>{
         const { profile } = await import('./profile.js');
         const options = command.optsWithGlobals();
         const { args, contractArtifact: artifactPathPromise, contractAddress, from: parsedFromAddress, debugExecutionStepsDir, authWitness } = options;
-        const wallet = walletAndNodeWrapper.wallet;
+        const { wallet, node } = walletAndNodeWrapper;
         const artifactPath = await artifactPathFromPromiseOrAlias(artifactPathPromise, contractAddress, db);
         const authWitnesses = cleanupAuthWitnesses(authWitness);
-        await profile(wallet, parsedFromAddress, functionName, args, artifactPath, contractAddress, debugExecutionStepsDir, CLIFeeArgs.parse(options, log, db), authWitnesses, log);
+        await profile(wallet, node, parsedFromAddress, functionName, args, artifactPath, contractAddress, debugExecutionStepsDir, CLIFeeArgs.parse(options, log, db), authWitnesses, log);
     });
     program.command('bridge-fee-juice').description('Mints L1 Fee Juice and pushes them to L2.').argument('<amount>', 'The amount of Fee Juice to mint and bridge.', parseBigint).argument('<recipient>', 'Aztec address of the recipient.', (address)=>aliasedAddressParser('accounts', address, db)).requiredOption('--l1-rpc-urls <string>', 'List of Ethereum host URLs. Chain identifiers localhost and testnet can be used (comma separated)', (arg)=>arg.split(','), [
         ETHEREUM_HOSTS
@@ -171,12 +171,15 @@ export function injectCommands(program, log, debugLogger, walletAndNodeWrapper,
     program.command('cancel-tx').description('Cancels a pending tx by reusing its nonce with a higher fee and an empty payload').argument('<txHash>', 'A transaction hash to cancel.', (txHash)=>aliasedTxHashParser(txHash, db)).addOption(createAccountOption('Alias or address of the account to simulate from', !db, db)).addOption(getPaymentMethodOption().default('method=fee_juice')).option('-i --increased-fees <da=1,l2=1>', 'The amounts by which the fees are increased', (value)=>parseGasFees(value), new GasFees(1, 1)).option('--max-fees-per-gas <da=100,l2=100>', 'Maximum fees per gas unit for DA and L2 computation.', (value)=>parseGasFees(value)).action(async (txHash, options)=>{
         const { cancelTx } = await import('./cancel_tx.js');
         const { from: parsedFromAddress, payment, increasedFees, maxFeesPerGas } = options;
-        const wallet = walletAndNodeWrapper.wallet;
+        const { wallet } = walletAndNodeWrapper;
         const txData = await db?.retrieveTxData(txHash);
         if (!txData) {
             throw new Error('Transaction data not found in the database, cannot reuse nonce');
         }
-        const paymentMethod = await parsePaymentMethod(payment, false, log, db)(wallet, parsedFromAddress);
+        const gasSettings = GasSettings.default({
+            maxFeesPerGas
+        });
+        const paymentMethod = await parsePaymentMethod(payment, log, db)(wallet, parsedFromAddress, gasSettings);
         await cancelTx(wallet, parsedFromAddress, 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(createAliasOption('Alias for the sender. Used for easy reference in subsequent commands.', !db)).action(async (address, options)=>{

package/dest/cmds/profile.d.ts

@@ -1,5 +1,6 @@
-import { AuthWitness, type AztecAddress, type Wallet } from '@aztec/aztec.js';
+import { AuthWitness, type AztecAddress, type AztecNode } from '@aztec/aztec.js';
 import type { LogFn } from '@aztec/foundation/log';
 import type { CLIFeeArgs } from '../utils/options/fees.js';
-export declare function profile(wallet: Wallet, from: AztecAddress, functionName: string, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, debugOutputPath: string | undefined, feeOpts: CLIFeeArgs, authWitnesses: AuthWitness[], log: LogFn): Promise<void>;
+import type { CLIWallet } from '../utils/wallet.js';
+export declare function profile(wallet: CLIWallet, node: AztecNode, from: AztecAddress, functionName: string, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, debugOutputPath: string | undefined, feeOpts: CLIFeeArgs, authWitnesses: AuthWitness[], log: LogFn): Promise<void>;
 //# sourceMappingURL=profile.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/cmds/profile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,YAAY,EAAY,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAExF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAMnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAG3D,wBAAsB,OAAO,CAC3B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,YAAY,EAClB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,OAAO,EAAE,UAAU,EACnB,aAAa,EAAE,WAAW,EAAE,EAC5B,GAAG,EAAE,KAAK,iBAoBX"}
+{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/cmds/profile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,YAAY,EAAE,KAAK,SAAS,EAAY,MAAM,iBAAiB,CAAC;AAE3F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAMnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,YAAY,EAClB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,OAAO,EAAE,UAAU,EACnB,aAAa,EAAE,WAAW,EAAE,EAC5B,GAAG,EAAE,KAAK,iBAqBX"}

package/dest/cmds/profile.js

@@ -4,12 +4,16 @@ import { serializePrivateExecutionSteps } from '@aztec/stdlib/kernel';
 import { promises as fs } from 'fs';
 import path from 'path';
 import { printProfileResult } from '../utils/profiling.js';
-export async function profile(wallet, from, functionName, functionArgsIn, contractArtifactPath, contractAddress, debugOutputPath, feeOpts, authWitnesses, log) {
+export async function profile(wallet, node, from, functionName, functionArgsIn, contractArtifactPath, contractAddress, debugOutputPath, feeOpts, authWitnesses, log) {
     const { functionArgs, contractArtifact } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
     const contract = await Contract.at(contractAddress, contractArtifact, wallet);
     const call = contract.methods[functionName](...functionArgs);
+    const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(node, wallet, from);
     const result = await call.profile({
-        fee: await feeOpts.toUserFeeOptions(wallet, from),
+        fee: {
+            gasSettings,
+            paymentMethod
+        },
         from,
         profileMode: 'full',
         authWitnesses,

package/dest/cmds/send.d.ts

@@ -1,8 +1,9 @@
-import { AuthWitness, type AztecAddress, Fr, type Wallet } from '@aztec/aztec.js';
+import { AuthWitness, type AztecAddress, type AztecNode, Fr } from '@aztec/aztec.js';
 import type { LogFn } from '@aztec/foundation/log';
 import { GasSettings } from '@aztec/stdlib/gas';
 import { CLIFeeArgs } from '../utils/options/fees.js';
-export declare function send(wallet: Wallet, from: AztecAddress, functionName: string, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, wait: boolean, cancellable: boolean, feeOpts: CLIFeeArgs, authWitnesses: AuthWitness[], verbose: boolean, log: LogFn): Promise<{
+import type { CLIWallet } from '../utils/wallet.js';
+export declare function send(wallet: CLIWallet, node: AztecNode, from: AztecAddress, functionName: string, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, wait: boolean, cancellable: boolean, feeOpts: CLIFeeArgs, authWitnesses: AuthWitness[], verbose: boolean, log: LogFn): Promise<{
     txHash: import("@aztec/aztec.js").TxHash;
     txNonce: Fr;
     cancellable: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/cmds/send.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,YAAY,EAAY,EAAE,EAA0B,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEpH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAGtD,wBAAsB,IAAI,CACxB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,YAAY,EAClB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,UAAU,EACnB,aAAa,EAAE,WAAW,EAAE,EAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK;;;;;eAyDX"}
+{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/cmds/send.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,YAAY,EAAE,KAAK,SAAS,EAAY,EAAE,EAA0B,MAAM,iBAAiB,CAAC;AAEvH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,wBAAsB,IAAI,CACxB,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,YAAY,EAClB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,UAAU,EACnB,aAAa,EAAE,WAAW,EAAE,EAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK;;;;;eA4DX"}

package/dest/cmds/send.js

@@ -3,14 +3,17 @@ import { prepTx } from '@aztec/cli/utils';
 import { GasSettings } from '@aztec/stdlib/gas';
 import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
 import { printProfileResult } from '../utils/profiling.js';
-export async function send(wallet, from, functionName, functionArgsIn, contractArtifactPath, contractAddress, wait, cancellable, feeOpts, authWitnesses, verbose, log) {
+export async function send(wallet, node, from, functionName, functionArgsIn, contractArtifactPath, contractAddress, wait, cancellable, feeOpts, authWitnesses, verbose, log) {
     const { functionArgs, contractArtifact } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
     const contract = await Contract.at(contractAddress, contractArtifact, wallet);
     const call = contract.methods[functionName](...functionArgs);
     const txNonce = Fr.random();
-    const userFeeOptions = await feeOpts.toUserFeeOptions(wallet, from);
+    const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(node, wallet, from);
     const sendOptions = {
-        fee: userFeeOptions,
+        fee: {
+            paymentMethod,
+            gasSettings
+        },
         from,
         authWitnesses
     };
@@ -24,7 +27,13 @@ export async function send(wallet, from, functionName, functionArgsIn, contractA
     if (feeOpts.estimateOnly) {
         return;
     }
-    const provenTx = await call.prove(sendOptions);
+    const provenTx = await call.prove({
+        ...sendOptions,
+        fee: {
+            ...sendOptions.fee,
+            gasSettings: estimatedGas
+        }
+    });
     if (verbose) {
         printProfileResult(provenTx.stats, log);
     }
@@ -48,7 +57,7 @@ export async function send(wallet, from, functionName, functionArgsIn, contractA
     } else {
         log('Transaction pending. Check status with check-tx');
     }
-    const gasSettings = GasSettings.from({
+    const finalGasSettings = GasSettings.from({
         ...provenTx.data.constants.txContext.gasSettings,
         ...estimatedGas
     });
@@ -56,6 +65,6 @@ export async function send(wallet, from, functionName, functionArgsIn, contractA
         txHash,
         txNonce,
         cancellable,
-        gasSettings
+        gasSettings: finalGasSettings
     };
 }