@aztec/cli-wallet 3.0.0-nightly.20251112 → 3.0.0-nightly.20251114

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dest/utils/wallet.d.ts +1 -1
  2. package/dest/utils/wallet.d.ts.map +1 -1
  3. package/dest/utils/wallet.js +5 -4
  4. package/package.json +12 -12
  5. package/src/utils/wallet.ts +6 -5
package/dest/utils/wallet.d.ts CHANGED
@@ -3,7 +3,6 @@ import { type InteractionFeeOptions } from '@aztec/aztec.js/contracts';
3
3
  import type { AztecNode } from '@aztec/aztec.js/node';
4
4
  import { UniqueNote } from '@aztec/aztec.js/note';
5
5
  import { AccountManager, type Aliased, BaseWallet, type SimulateOptions } from '@aztec/aztec.js/wallet';
6
- import { ExecutionPayload } from '@aztec/entrypoints/payload';
7
6
  import { Fr } from '@aztec/foundation/fields';
8
7
  import type { LogFn } from '@aztec/foundation/log';
9
8
  import type { PXEConfig } from '@aztec/pxe/config';
@@ -11,6 +10,7 @@ import type { PXE } from '@aztec/pxe/server';
11
10
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
12
11
  import type { NotesFilter } from '@aztec/stdlib/note';
13
12
  import type { TxProvingResult, TxSimulationResult } from '@aztec/stdlib/tx';
13
+ import { ExecutionPayload } from '@aztec/stdlib/tx';
14
14
  import type { WalletDB } from '../storage/wallet_db.js';
15
15
  export declare const AccountTypes: readonly ["schnorr", "ecdsasecp256r1", "ecdsasecp256r1ssh", "ecdsasecp256k1"];
16
16
  export type AccountType = (typeof AccountTypes)[number];
package/dest/utils/wallet.d.ts.map CHANGED
@@ -1 +1 @@
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"}
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,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;AAC5E,OAAO,EAAE,gBAAgB,EAA0B,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;IAqB5C,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"}
package/dest/utils/wallet.js CHANGED
@@ -5,11 +5,11 @@ import { getIdentities } from '@aztec/accounts/utils';
5
5
  import { SignerlessAccount } from '@aztec/aztec.js/account';
6
6
  import { getContractInstanceFromInstantiationParams, getGasLimits } from '@aztec/aztec.js/contracts';
7
7
  import { AccountManager, BaseWallet } from '@aztec/aztec.js/wallet';
8
- import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/entrypoints/payload';
9
8
  import { Fr } from '@aztec/foundation/fields';
10
9
  import { createPXE, getPXEConfig } from '@aztec/pxe/server';
11
10
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
12
11
  import { deriveSigningKey } from '@aztec/stdlib/keys';
12
+ import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/stdlib/tx';
13
13
  import { extractECDSAPublicKeyFromBase64String } from './ecdsa.js';
14
14
  import { printGasEstimates } from './options/fees.js';
15
15
  export const AccountTypes = [
@@ -40,7 +40,8 @@ export class CLIWallet extends BaseWallet {
40
40
  })));
41
41
  }
42
42
  async createCancellationTxExecutionRequest(from, txNonce, increasedFee) {
43
- const feeOptions = await this.getDefaultFeeOptions(from, increasedFee);
43
+ const executionPayload = ExecutionPayload.empty();
44
+ const feeOptions = await this.completeFeeOptions(from, executionPayload.feePayer, increasedFee.gasSettings);
44
45
  const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
45
46
  const fromAccount = await this.getAccountFromAddress(from);
46
47
  const executionOptions = {
@@ -48,7 +49,7 @@ export class CLIWallet extends BaseWallet {
48
49
  cancellable: this.cancellableTransactions,
49
50
  feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
50
51
  };
51
- return await fromAccount.createTxExecutionRequest(feeExecutionPayload ?? ExecutionPayload.empty(), feeOptions.gasSettings, executionOptions);
52
+ return await fromAccount.createTxExecutionRequest(feeExecutionPayload ?? executionPayload, feeOptions.gasSettings, executionOptions);
52
53
  }
53
54
  async proveCancellationTx(from, txNonce, increasedFee) {
54
55
  const cancellationTxRequest = await this.createCancellationTxExecutionRequest(from, txNonce, increasedFee);
@@ -143,7 +144,7 @@ export class CLIWallet extends BaseWallet {
143
144
  }
144
145
  async simulateTx(executionPayload, opts) {
145
146
  let simulationResults;
146
- const feeOptions = opts.fee?.estimateGas ? await this.getFeeOptionsForGasEstimation(opts.from, opts.fee) : await this.getDefaultFeeOptions(opts.from, opts.fee);
147
+ const feeOptions = opts.fee?.estimateGas ? await this.completeFeeOptionsForEstimation(opts.from, executionPayload.feePayer, opts.fee?.gasSettings) : await this.completeFeeOptions(opts.from, executionPayload.feePayer, opts.fee?.gasSettings);
147
148
  const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
148
149
  const executionOptions = {
149
150
  txNonce: Fr.random(),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/cli-wallet",
3
- "version": "3.0.0-nightly.20251112",
3
+ "version": "3.0.0-nightly.20251114",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/cmds/index.js",
@@ -67,17 +67,17 @@
67
67
  ]
68
68
  },
69
69
  "dependencies": {
70
- "@aztec/accounts": "3.0.0-nightly.20251112",
71
- "@aztec/aztec.js": "3.0.0-nightly.20251112",
72
- "@aztec/cli": "3.0.0-nightly.20251112",
73
- "@aztec/entrypoints": "3.0.0-nightly.20251112",
74
- "@aztec/ethereum": "3.0.0-nightly.20251112",
75
- "@aztec/foundation": "3.0.0-nightly.20251112",
76
- "@aztec/kv-store": "3.0.0-nightly.20251112",
77
- "@aztec/noir-contracts.js": "3.0.0-nightly.20251112",
78
- "@aztec/noir-noirc_abi": "3.0.0-nightly.20251112",
79
- "@aztec/pxe": "3.0.0-nightly.20251112",
80
- "@aztec/stdlib": "3.0.0-nightly.20251112",
70
+ "@aztec/accounts": "3.0.0-nightly.20251114",
71
+ "@aztec/aztec.js": "3.0.0-nightly.20251114",
72
+ "@aztec/cli": "3.0.0-nightly.20251114",
73
+ "@aztec/entrypoints": "3.0.0-nightly.20251114",
74
+ "@aztec/ethereum": "3.0.0-nightly.20251114",
75
+ "@aztec/foundation": "3.0.0-nightly.20251114",
76
+ "@aztec/kv-store": "3.0.0-nightly.20251114",
77
+ "@aztec/noir-contracts.js": "3.0.0-nightly.20251114",
78
+ "@aztec/noir-noirc_abi": "3.0.0-nightly.20251114",
79
+ "@aztec/pxe": "3.0.0-nightly.20251114",
80
+ "@aztec/stdlib": "3.0.0-nightly.20251114",
81
81
  "commander": "^12.1.0",
82
82
  "inquirer": "^10.1.8",
83
83
  "source-map-support": "^0.5.21",
package/src/utils/wallet.ts CHANGED
@@ -12,7 +12,6 @@ import type { AztecNode } from '@aztec/aztec.js/node';
12
12
  import { UniqueNote } from '@aztec/aztec.js/note';
13
13
  import { AccountManager, type Aliased, BaseWallet, type SimulateOptions } from '@aztec/aztec.js/wallet';
14
14
  import type { DefaultAccountEntrypointOptions } from '@aztec/entrypoints/account';
15
- import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/entrypoints/payload';
16
15
  import { Fr } from '@aztec/foundation/fields';
17
16
  import type { LogFn } from '@aztec/foundation/log';
18
17
  import type { PXEConfig } from '@aztec/pxe/config';
@@ -22,6 +21,7 @@ import { AztecAddress } from '@aztec/stdlib/aztec-address';
22
21
  import { deriveSigningKey } from '@aztec/stdlib/keys';
23
22
  import type { NotesFilter } from '@aztec/stdlib/note';
24
23
  import type { TxProvingResult, TxSimulationResult } from '@aztec/stdlib/tx';
24
+ import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/stdlib/tx';
25
25
 
26
26
  import type { WalletDB } from '../storage/wallet_db.js';
27
27
  import { extractECDSAPublicKeyFromBase64String } from './ecdsa.js';
@@ -66,7 +66,8 @@ export class CLIWallet extends BaseWallet {
66
66
  txNonce: Fr,
67
67
  increasedFee: InteractionFeeOptions,
68
68
  ) {
69
- const feeOptions = await this.getDefaultFeeOptions(from, increasedFee);
69
+ const executionPayload = ExecutionPayload.empty();
70
+ const feeOptions = await this.completeFeeOptions(from, executionPayload.feePayer, increasedFee.gasSettings);
70
71
  const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
71
72
  const fromAccount = await this.getAccountFromAddress(from);
72
73
  const executionOptions: DefaultAccountEntrypointOptions = {
@@ -75,7 +76,7 @@ export class CLIWallet extends BaseWallet {
75
76
  feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions,
76
77
  };
77
78
  return await fromAccount.createTxExecutionRequest(
78
- feeExecutionPayload ?? ExecutionPayload.empty(),
79
+ feeExecutionPayload ?? executionPayload,
79
80
  feeOptions.gasSettings,
80
81
  executionOptions,
81
82
  );
@@ -200,8 +201,8 @@ export class CLIWallet extends BaseWallet {
200
201
  override async simulateTx(executionPayload: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResult> {
201
202
  let simulationResults;
202
203
  const feeOptions = opts.fee?.estimateGas
203
- ? await this.getFeeOptionsForGasEstimation(opts.from, opts.fee)
204
- : await this.getDefaultFeeOptions(opts.from, opts.fee);
204
+ ? await this.completeFeeOptionsForEstimation(opts.from, executionPayload.feePayer, opts.fee?.gasSettings)
205
+ : await this.completeFeeOptions(opts.from, executionPayload.feePayer, opts.fee?.gasSettings);
205
206
  const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
206
207
  const executionOptions: DefaultAccountEntrypointOptions = {
207
208
  txNonce: Fr.random(),