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

package/dest/cmds/cancel_tx.d.ts

@@ -1,4 +1,4 @@
-import { type AppConfigurableFeePaymentMethod, AztecAddress, type TxHash } from '@aztec/aztec.js';
+import { AztecAddress, type FeePaymentMethod, 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: AppConfigurableFeePaymentMethod | undefined, increasedFees: GasFees, maxFeesPerGas: GasFees | undefined, log: LogFn): Promise<void>;
+}, paymentMethod: FeePaymentMethod | 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,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"}
+{"version":3,"file":"cancel_tx.d.ts","sourceRoot":"","sources":["../../src/cmds/cancel_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,KAAK,gBAAgB,EAGrB,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;IACD,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,EAAE,CAAC;IACZ,WAAW,EAAE,OAAO,CAAC;CACtB,EACD,aAAa,EAAE,gBAAgB,GAAG,SAAS,EAC3C,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,GAAG,SAAS,EAClC,GAAG,EAAE,KAAK,iBAwCX"}

package/dest/cmds/cancel_tx.js

@@ -14,9 +14,7 @@ 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/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,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"}
+{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/cmds/send.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,KAAK,YAAY,EACjB,KAAK,SAAS,EAEd,EAAE,EAEH,MAAM,iBAAiB,CAAC;AAEzB,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/utils/options/fees.d.ts

@@ -1,4 +1,4 @@
-import type { AppConfigurableFeePaymentMethod, AztecNode, FeeOptions, FieldsOf, Wallet } from '@aztec/aztec.js';
+import type { AztecNode, FeeOptions, FeePaymentMethod, FieldsOf, Wallet } from '@aztec/aztec.js';
 import type { LogFn } from '@aztec/foundation/log';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { GasFees, GasSettings } from '@aztec/stdlib/gas';
@@ -12,17 +12,17 @@ export type RawCliFeeArgs = {
     maxPriorityFeesPerGas?: string;
 };
 export type ParsedFeeOptions = {
-    paymentMethod?: AppConfigurableFeePaymentMethod;
+    paymentMethod?: FeePaymentMethod;
     gasSettings?: Partial<FieldsOf<GasSettings>>;
 };
 export declare function getPaymentMethodOption(): Option;
-export declare function parsePaymentMethod(payment: string, log: LogFn, db?: WalletDB): (wallet: Wallet, from: AztecAddress, gasSettings: GasSettings) => Promise<AppConfigurableFeePaymentMethod | undefined>;
+export declare function parsePaymentMethod(payment: string, log: LogFn, db?: WalletDB): (wallet: Wallet, from: AztecAddress, gasSettings: GasSettings) => Promise<FeePaymentMethod | undefined>;
 export declare function parseGasFees(gasFees: string): GasFees;
 export declare class CLIFeeArgs {
     estimateOnly: boolean;
     private paymentMethod;
     private gasSettings;
-    constructor(estimateOnly: boolean, paymentMethod: (wallet: Wallet, feePayer: AztecAddress, gasSettings: GasSettings) => Promise<AppConfigurableFeePaymentMethod | undefined>, gasSettings: Partial<FieldsOf<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>;
     static parse(args: RawCliFeeArgs, log: LogFn, db?: WalletDB): CLIFeeArgs;
     static getOptions(): Option[];

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,KAAK,EAAE,+BAA+B,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEhH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,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,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,+BAA+B,CAAC;IAChD,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,GACZ,CACD,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,YAAY,EAClB,WAAW,EAAE,WAAW,KACrB,OAAO,CAAC,+BAA+B,GAAG,SAAS,CAAC,CA+ExD;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;gBANZ,YAAY,EAAE,OAAO,EACpB,aAAa,EAAE,CACrB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,EACtB,WAAW,EAAE,WAAW,KACrB,OAAO,CAAC,+BAA+B,GAAG,SAAS,CAAC,EACjD,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAG/C,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAUtG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,UAAU;IAQxE,MAAM,CAAC,UAAU;CAGlB;AAID,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,UAAU,EACnB,YAAY,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB,CAAC,EAClE,GAAG,EAAE,KAAK,QAIX"}
+{"version":3,"file":"fees.d.ts","sourceRoot":"","sources":["../../../src/utils/options/fees.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEjG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,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,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,GACZ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CA+EzG;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;gBANZ,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;IAG/C,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAUtG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,UAAU;IAQxE,MAAM,CAAC,UAAU;CAGlB;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/wallet.d.ts

@@ -1,4 +1,4 @@
-import { type Account, AccountManager, type Aliased, type AztecNode, BaseWallet, type FeeOptions, type SimulateOptions, UniqueNote } from '@aztec/aztec.js';
+import { type Account, AccountManager, type Aliased, type AztecNode, BaseWallet, type InteractionFeeOptions, type SimulateOptions, UniqueNote } from '@aztec/aztec.js';
 import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { Fr } from '@aztec/foundation/fields';
 import type { LogFn } from '@aztec/foundation/log';
@@ -19,7 +19,7 @@ export declare class CLIWallet extends BaseWallet {
     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: FeeOptions): Promise<TxProvingResult>;
+    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>;

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

@@ -1 +1 @@
-{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src/utils/wallet.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,OAAO,EAEZ,cAAc,EACd,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,UAAU,EACV,KAAK,UAAU,EAEf,KAAK,eAAe,EACpB,UAAU,EAGX,MAAM,iBAAiB,CAAC;AAEzB,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;IAgB5C,mBAAmB,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC;IAK/F,qBAAqB,CAAC,OAAO,EAAE,YAAY;YAoB5C,aAAa;IAYrB,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;IAsDjH,YAAY,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAMvC,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CAGrD"}
+{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src/utils/wallet.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,OAAO,EAEZ,cAAc,EACd,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,UAAU,EACV,KAAK,qBAAqB,EAE1B,KAAK,eAAe,EACpB,UAAU,EAGX,MAAM,iBAAiB,CAAC;AAEzB,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;IAqDjH,YAAY,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAMvC,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CAGrD"}

package/dest/utils/wallet.js

@@ -3,7 +3,6 @@ import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
 import { StubAccountContractArtifact, createStubAccount } from '@aztec/accounts/stub';
 import { getIdentities } from '@aztec/accounts/utils';
 import { AccountManager, BaseWallet, SignerlessAccount, getContractInstanceFromInstantiationParams, getGasLimits } from '@aztec/aztec.js';
-import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multicall';
 import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/entrypoints/payload';
 import { Fr } from '@aztec/foundation/fields';
 import { createPXE, getPXEConfig } from '@aztec/pxe/server';
@@ -39,15 +38,15 @@ export class CLIWallet extends BaseWallet {
             })));
     }
     async createCancellationTxExecutionRequest(from, txNonce, increasedFee) {
-        const feeExecutionPayload = await increasedFee.paymentMethod?.getExecutionPayload();
+        const feeOptions = await this.getDefaultFeeOptions(from, increasedFee);
+        const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
         const fromAccount = await this.getAccountFromAddress(from);
         const executionOptions = {
             txNonce,
             cancellable: this.cancellableTransactions,
-            isFeePayer: increasedFee.isFeePayer,
-            endSetup: increasedFee.endSetup
+            feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
         };
-        return await fromAccount.createTxExecutionRequest(feeExecutionPayload ?? ExecutionPayload.empty(), increasedFee.gasSettings, executionOptions);
+        return await fromAccount.createTxExecutionRequest(feeExecutionPayload ?? ExecutionPayload.empty(), feeOptions.gasSettings, executionOptions);
     }
     async proveCancellationTx(from, txNonce, increasedFee) {
         const cancellationTxRequest = await this.createCancellationTxExecutionRequest(from, txNonce, increasedFee);
@@ -57,7 +56,7 @@ export class CLIWallet extends BaseWallet {
         let account;
         if (address.equals(AztecAddress.ZERO)) {
             const chainInfo = await this.getChainInfo();
-            account = new SignerlessAccount(new DefaultMultiCallEntrypoint(chainInfo.chainId.toNumber(), chainInfo.version.toNumber()));
+            account = new SignerlessAccount(chainInfo);
         } else if (this.accountCache.has(address.toString())) {
             return this.accountCache.get(address.toString());
         } else {
@@ -73,11 +72,7 @@ export class CLIWallet extends BaseWallet {
         const accountManager = await AccountManager.create(this, secret, contract, salt);
         const instance = accountManager.getInstance();
         const artifact = await contract.getContractArtifact();
-        await this.pxe.registerContract({
-            artifact,
-            instance
-        });
-        await this.pxe.registerAccount(secret, (await accountManager.getCompleteAddress()).partialAddress);
+        await this.registerContract(instance, artifact, secret);
         this.accountCache.set(accountManager.address.toString(), await accountManager.getAccount());
         return accountManager;
     }
@@ -147,12 +142,11 @@ export class CLIWallet extends BaseWallet {
     async simulateTx(executionPayload, opts) {
         let simulationResults;
         const feeOptions = opts.fee?.estimateGas ? await this.getFeeOptionsForGasEstimation(opts.from, opts.fee) : await this.getDefaultFeeOptions(opts.from, opts.fee);
-        const feeExecutionPayload = await feeOptions.paymentMethod?.getExecutionPayload();
+        const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
         const executionOptions = {
             txNonce: Fr.random(),
             cancellable: this.cancellableTransactions,
-            isFeePayer: feeOptions.isFeePayer,
-            endSetup: feeOptions.endSetup
+            feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
         };
         const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
             feeExecutionPayload,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli-wallet",
-  "version": "3.0.0-nightly.20251002",
+  "version": "3.0.0-nightly.20251004",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -67,17 +67,17 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20251002",
-    "@aztec/aztec.js": "3.0.0-nightly.20251002",
-    "@aztec/cli": "3.0.0-nightly.20251002",
-    "@aztec/entrypoints": "3.0.0-nightly.20251002",
-    "@aztec/ethereum": "3.0.0-nightly.20251002",
-    "@aztec/foundation": "3.0.0-nightly.20251002",
-    "@aztec/kv-store": "3.0.0-nightly.20251002",
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20251002",
-    "@aztec/noir-noirc_abi": "3.0.0-nightly.20251002",
-    "@aztec/pxe": "3.0.0-nightly.20251002",
-    "@aztec/stdlib": "3.0.0-nightly.20251002",
+    "@aztec/accounts": "3.0.0-nightly.20251004",
+    "@aztec/aztec.js": "3.0.0-nightly.20251004",
+    "@aztec/cli": "3.0.0-nightly.20251004",
+    "@aztec/entrypoints": "3.0.0-nightly.20251004",
+    "@aztec/ethereum": "3.0.0-nightly.20251004",
+    "@aztec/foundation": "3.0.0-nightly.20251004",
+    "@aztec/kv-store": "3.0.0-nightly.20251004",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20251004",
+    "@aztec/noir-noirc_abi": "3.0.0-nightly.20251004",
+    "@aztec/pxe": "3.0.0-nightly.20251004",
+    "@aztec/stdlib": "3.0.0-nightly.20251004",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",
     "source-map-support": "^0.5.21",

package/src/cmds/cancel_tx.ts

@@ -1,7 +1,7 @@
 import {
-  type AppConfigurableFeePaymentMethod,
   AztecAddress,
-  type FeeOptions,
+  type FeePaymentMethod,
+  type InteractionFeeOptions,
   SentTx,
   type TxHash,
   TxStatus,
@@ -21,8 +21,13 @@ export async function cancelTx(
     gasSettings: prevTxGasSettings,
     txNonce,
     cancellable,
-  }: { txHash: TxHash; gasSettings: GasSettings; txNonce: Fr; cancellable: boolean },
-  paymentMethod: AppConfigurableFeePaymentMethod | undefined,
+  }: {
+    txHash: TxHash;
+    gasSettings: GasSettings;
+    txNonce: Fr;
+    cancellable: boolean;
+  },
+  paymentMethod: FeePaymentMethod | undefined,
   increasedFees: GasFees,
   maxFeesPerGas: GasFees | undefined,
   log: LogFn,
@@ -38,15 +43,13 @@ export async function cancelTx(
     prevTxGasSettings.maxPriorityFeesPerGas.feePerL2Gas + increasedFees.feePerL2Gas,
   );
 
-  const feeOptions: FeeOptions = {
+  const feeOptions: InteractionFeeOptions = {
     paymentMethod,
     gasSettings: GasSettings.from({
       ...prevTxGasSettings,
       maxPriorityFeesPerGas,
       maxFeesPerGas: maxFeesPerGas ?? prevTxGasSettings.maxFeesPerGas,
     }),
-    endSetup: false,
-    isFeePayer: false,
   };
 
   const txProvingResult = await wallet.proveCancellationTx(from, txNonce, feeOptions);

package/src/cmds/send.ts

@@ -1,4 +1,11 @@
-import { AuthWitness, type AztecAddress, type AztecNode, Contract, Fr, type SendMethodOptions } from '@aztec/aztec.js';
+import {
+  AuthWitness,
+  type AztecAddress,
+  type AztecNode,
+  Contract,
+  Fr,
+  type SendInteractionOptions,
+} from '@aztec/aztec.js';
 import { prepTx } from '@aztec/cli/utils';
 import type { LogFn } from '@aztec/foundation/log';
 import { GasSettings } from '@aztec/stdlib/gas';
@@ -31,7 +38,7 @@ export async function send(
   const txNonce = Fr.random();
 
   const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(node, wallet, from);
-  const sendOptions: SendMethodOptions = {
+  const sendOptions: SendInteractionOptions = {
     fee: { paymentMethod, gasSettings },
     from,
     authWitnesses,

package/src/utils/options/fees.ts

@@ -1,4 +1,4 @@
-import type { AppConfigurableFeePaymentMethod, AztecNode, FeeOptions, FieldsOf, Wallet } from '@aztec/aztec.js';
+import type { AztecNode, FeeOptions, FeePaymentMethod, FieldsOf, Wallet } from '@aztec/aztec.js';
 import { Fr } from '@aztec/foundation/fields';
 import type { LogFn } from '@aztec/foundation/log';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -19,7 +19,7 @@ export type RawCliFeeArgs = {
 };
 
 export type ParsedFeeOptions = {
-  paymentMethod?: AppConfigurableFeePaymentMethod;
+  paymentMethod?: FeePaymentMethod;
   gasSettings?: Partial<FieldsOf<GasSettings>>;
 };
 
@@ -111,11 +111,7 @@ export function parsePaymentMethod(
   payment: string,
   log: LogFn,
   db?: WalletDB,
-): (
-  wallet: Wallet,
-  from: AztecAddress,
-  gasSettings: GasSettings,
-) => Promise<AppConfigurableFeePaymentMethod | undefined> {
+): (wallet: Wallet, from: AztecAddress, gasSettings: GasSettings) => Promise<FeePaymentMethod | undefined> {
   const parsed = payment.split(',').reduce(
     (acc, item) => {
       const [dimension, value] = item.split('=');
@@ -245,7 +241,7 @@ export class CLIFeeArgs {
       wallet: Wallet,
       feePayer: AztecAddress,
       gasSettings: GasSettings,
-    ) => Promise<AppConfigurableFeePaymentMethod | undefined>,
+    ) => Promise<FeePaymentMethod | undefined>,
     private gasSettings: Partial<FieldsOf<GasSettings>>,
   ) {}
 

package/src/utils/wallet.ts

@@ -9,14 +9,14 @@ import {
   type Aliased,
   type AztecNode,
   BaseWallet,
-  type FeeOptions,
+  type InteractionFeeOptions,
   SignerlessAccount,
   type SimulateOptions,
   UniqueNote,
   getContractInstanceFromInstantiationParams,
   getGasLimits,
 } from '@aztec/aztec.js';
-import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multicall';
+import type { DefaultAccountEntrypointOptions } from '@aztec/entrypoints/account';
 import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/entrypoints/payload';
 import { Fr } from '@aztec/foundation/fields';
 import type { LogFn } from '@aztec/foundation/log';
@@ -66,23 +66,31 @@ export class CLIWallet extends BaseWallet {
     return Promise.resolve(accounts.map(({ key, value }) => ({ alias: value, item: AztecAddress.fromString(key) })));
   }
 
-  private async createCancellationTxExecutionRequest(from: AztecAddress, txNonce: Fr, increasedFee: FeeOptions) {
-    const feeExecutionPayload = await increasedFee.paymentMethod?.getExecutionPayload();
+  private async createCancellationTxExecutionRequest(
+    from: AztecAddress,
+    txNonce: Fr,
+    increasedFee: InteractionFeeOptions,
+  ) {
+    const feeOptions = await this.getDefaultFeeOptions(from, increasedFee);
+    const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
     const fromAccount = await this.getAccountFromAddress(from);
-    const executionOptions = {
+    const executionOptions: DefaultAccountEntrypointOptions = {
       txNonce,
       cancellable: this.cancellableTransactions,
-      isFeePayer: increasedFee.isFeePayer,
-      endSetup: increasedFee.endSetup,
+      feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions,
     };
     return await fromAccount.createTxExecutionRequest(
       feeExecutionPayload ?? ExecutionPayload.empty(),
-      increasedFee.gasSettings,
+      feeOptions.gasSettings,
       executionOptions,
     );
   }
 
-  async proveCancellationTx(from: AztecAddress, txNonce: Fr, increasedFee: FeeOptions): Promise<TxProvingResult> {
+  async proveCancellationTx(
+    from: AztecAddress,
+    txNonce: Fr,
+    increasedFee: InteractionFeeOptions,
+  ): Promise<TxProvingResult> {
     const cancellationTxRequest = await this.createCancellationTxExecutionRequest(from, txNonce, increasedFee);
     return await this.pxe.proveTx(cancellationTxRequest);
   }
@@ -91,9 +99,7 @@ export class CLIWallet extends BaseWallet {
     let account: Account | undefined;
     if (address.equals(AztecAddress.ZERO)) {
       const chainInfo = await this.getChainInfo();
-      account = new SignerlessAccount(
-        new DefaultMultiCallEntrypoint(chainInfo.chainId.toNumber(), chainInfo.version.toNumber()),
-      );
+      account = new SignerlessAccount(chainInfo);
     } else if (this.accountCache.has(address.toString())) {
       return this.accountCache.get(address.toString())!;
     } else {
@@ -113,8 +119,7 @@ export class CLIWallet extends BaseWallet {
     const instance = accountManager.getInstance();
     const artifact = await contract.getContractArtifact();
 
-    await this.pxe.registerContract({ artifact, instance });
-    await this.pxe.registerAccount(secret, (await accountManager.getCompleteAddress()).partialAddress);
+    await this.registerContract(instance, artifact, secret);
     this.accountCache.set(accountManager.address.toString(), await accountManager.getAccount());
     return accountManager;
   }
@@ -202,12 +207,11 @@ export class CLIWallet extends BaseWallet {
     const feeOptions = opts.fee?.estimateGas
       ? await this.getFeeOptionsForGasEstimation(opts.from, opts.fee)
       : await this.getDefaultFeeOptions(opts.from, opts.fee);
-    const feeExecutionPayload = await feeOptions.paymentMethod?.getExecutionPayload();
-    const executionOptions = {
+    const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
+    const executionOptions: DefaultAccountEntrypointOptions = {
       txNonce: Fr.random(),
       cancellable: this.cancellableTransactions,
-      isFeePayer: feeOptions.isFeePayer,
-      endSetup: feeOptions.endSetup,
+      feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions,
     };
     const finalExecutionPayload = feeExecutionPayload
       ? mergeExecutionPayloads([feeExecutionPayload, executionPayload])