@aztec/wallets 0.0.1-commit.967fc6998 → 0.0.1-commit.9badcec54

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 (28) hide show
  1. package/dest/embedded/account-contract-providers/bundle.d.ts +4 -3
  2. package/dest/embedded/account-contract-providers/bundle.d.ts.map +1 -1
  3. package/dest/embedded/account-contract-providers/bundle.js +6 -5
  4. package/dest/embedded/account-contract-providers/lazy.d.ts +4 -3
  5. package/dest/embedded/account-contract-providers/lazy.d.ts.map +1 -1
  6. package/dest/embedded/account-contract-providers/lazy.js +16 -6
  7. package/dest/embedded/account-contract-providers/types.d.ts +4 -3
  8. package/dest/embedded/account-contract-providers/types.d.ts.map +1 -1
  9. package/dest/embedded/embedded_wallet.d.ts +46 -10
  10. package/dest/embedded/embedded_wallet.d.ts.map +1 -1
  11. package/dest/embedded/embedded_wallet.js +159 -62
  12. package/dest/embedded/entrypoints/browser.d.ts +2 -2
  13. package/dest/embedded/entrypoints/browser.d.ts.map +1 -1
  14. package/dest/embedded/entrypoints/browser.js +17 -7
  15. package/dest/embedded/entrypoints/node.d.ts +2 -2
  16. package/dest/embedded/entrypoints/node.d.ts.map +1 -1
  17. package/dest/embedded/entrypoints/node.js +17 -7
  18. package/dest/testing.d.ts +1 -1
  19. package/dest/testing.d.ts.map +1 -1
  20. package/dest/testing.js +2 -2
  21. package/package.json +11 -10
  22. package/src/embedded/account-contract-providers/bundle.ts +7 -5
  23. package/src/embedded/account-contract-providers/lazy.ts +17 -6
  24. package/src/embedded/account-contract-providers/types.ts +4 -2
  25. package/src/embedded/embedded_wallet.ts +207 -70
  26. package/src/embedded/entrypoints/browser.ts +25 -18
  27. package/src/embedded/entrypoints/node.ts +31 -24
  28. package/src/testing.ts +2 -1
@@ -4,36 +4,46 @@ import { createStore, openTmpStore } from '@aztec/kv-store/indexeddb';
4
4
  import { createPXE } from '@aztec/pxe/client/lazy';
5
5
  import { getPXEConfig } from '@aztec/pxe/config';
6
6
  import { LazyAccountContractsProvider } from '../account-contract-providers/lazy.js';
7
- import { EmbeddedWallet } from '../embedded_wallet.js';
7
+ import { EmbeddedWallet, splitPxeOptions } from '../embedded_wallet.js';
8
8
  import { WalletDB } from '../wallet_db.js';
9
9
  export class BrowserEmbeddedWallet extends EmbeddedWallet {
10
10
  static async create(nodeOrUrl, options = {}) {
11
11
  const rootLogger = options.logger ?? createLogger('embedded-wallet');
12
12
  const aztecNode = typeof nodeOrUrl === 'string' ? createAztecNodeClient(nodeOrUrl) : nodeOrUrl;
13
13
  const l1Contracts = await aztecNode.getL1ContractAddresses();
14
+ // Support both the new unified `pxe` option and the deprecated `pxeConfig`/`pxeOptions`.
15
+ const { config: pxeConfigFromPxe, creation: pxeCreationFromPxe } = splitPxeOptions(options.pxe);
16
+ const mergedConfigOverrides = {
17
+ ...options.pxeConfig,
18
+ ...pxeConfigFromPxe
19
+ };
20
+ const mergedCreationOverrides = {
21
+ ...options.pxeOptions,
22
+ ...pxeCreationFromPxe
23
+ };
14
24
  const pxeConfig = Object.assign(getPXEConfig(), {
15
- proverEnabled: options.pxeConfig?.proverEnabled ?? false,
25
+ proverEnabled: mergedConfigOverrides.proverEnabled ?? false,
16
26
  dataDirectory: `pxe_data_${l1Contracts.rollupAddress}`,
17
- ...options.pxeConfig
27
+ ...mergedConfigOverrides
18
28
  });
19
29
  if (options.ephemeral) {
20
30
  delete pxeConfig.dataDirectory;
21
31
  }
22
32
  const pxeOptions = {
23
- ...options.pxeOptions,
33
+ ...mergedCreationOverrides,
24
34
  loggers: {
25
35
  store: rootLogger.createChild('pxe:data'),
26
36
  pxe: rootLogger.createChild('pxe:service'),
27
37
  prover: rootLogger.createChild('pxe:prover'),
28
- ...options.pxeOptions?.loggers
38
+ ...mergedCreationOverrides.loggers
29
39
  }
30
40
  };
31
41
  const pxe = await createPXE(aztecNode, pxeConfig, pxeOptions);
32
- const walletDBStore = options.ephemeral ? await openTmpStore(true) : await createStore('wallet_data', {
42
+ const walletDBStore = options.walletDb?.store ?? (options.ephemeral ? await openTmpStore(true) : await createStore('wallet_data', {
33
43
  dataDirectory: `wallet_data_${l1Contracts.rollupAddress}`,
34
44
  dataStoreMapSizeKb: pxeConfig.dataStoreMapSizeKb,
35
45
  l1Contracts
36
- }, 1, rootLogger.createChild('wallet:data'));
46
+ }, 1, rootLogger.createChild('wallet:data')));
37
47
  const walletDB = WalletDB.init(walletDBStore, rootLogger.createChild('wallet:db').info);
38
48
  return new this(pxe, aztecNode, walletDB, new LazyAccountContractsProvider(), rootLogger);
39
49
  }
@@ -8,7 +8,7 @@ export declare class NodeEmbeddedWallet extends EmbeddedWallet {
8
8
  static create<T extends NodeEmbeddedWallet = NodeEmbeddedWallet>(this: new (pxe: PXE, aztecNode: AztecNode, walletDB: WalletDB, accountContracts: AccountContractsProvider, log?: Logger) => T, nodeOrUrl: string | AztecNode, options?: EmbeddedWalletOptions): Promise<T>;
9
9
  }
10
10
  export { NodeEmbeddedWallet as EmbeddedWallet };
11
- export type { EmbeddedWalletOptions } from '../embedded_wallet.js';
11
+ export type { EmbeddedWalletOptions, EmbeddedWalletPXEOptions } from '../embedded_wallet.js';
12
12
  export { WalletDB } from '../wallet_db.js';
13
13
  export type { AccountType } from '../wallet_db.js';
14
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VtYmVkZGVkL2VudHJ5cG9pbnRzL25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBR2xFLE9BQU8sRUFBRSxLQUFLLEdBQUcsRUFBc0MsTUFBTSxtQkFBbUIsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUdqRSxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHdDQUF3QyxDQUFDO0FBQ3ZGLE9BQU8sRUFBRSxjQUFjLEVBQUUsS0FBSyxxQkFBcUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25GLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUUzQyxxQkFBYSxrQkFBbUIsU0FBUSxjQUFjO0lBQ3BELE9BQWEsTUFBTSxDQUFDLENBQUMsU0FBUyxrQkFBa0IsR0FBRyxrQkFBa0IsRUFDbkUsSUFBSSxFQUFFLEtBQ0osR0FBRyxFQUFFLEdBQUcsRUFDUixTQUFTLEVBQUUsU0FBUyxFQUNwQixRQUFRLEVBQUUsUUFBUSxFQUNsQixnQkFBZ0IsRUFBRSx3QkFBd0IsRUFDMUMsR0FBRyxDQUFDLEVBQUUsTUFBTSxLQUNULENBQUMsRUFDTixTQUFTLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDN0IsT0FBTyxHQUFFLHFCQUEwQixHQUNsQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBaURaO0NBQ0Y7QUFFRCxPQUFPLEVBQUUsa0JBQWtCLElBQUksY0FBYyxFQUFFLENBQUM7QUFDaEQsWUFBWSxFQUFFLHFCQUFxQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkUsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzNDLFlBQVksRUFBRSxXQUFXLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQyJ9
14
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VtYmVkZGVkL2VudHJ5cG9pbnRzL25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBR2xFLE9BQU8sRUFBRSxLQUFLLEdBQUcsRUFBc0MsTUFBTSxtQkFBbUIsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUdqRSxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHdDQUF3QyxDQUFDO0FBQ3ZGLE9BQU8sRUFBRSxjQUFjLEVBQUUsS0FBSyxxQkFBcUIsRUFBbUIsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFM0MscUJBQWEsa0JBQW1CLFNBQVEsY0FBYztJQUNwRCxPQUFhLE1BQU0sQ0FBQyxDQUFDLFNBQVMsa0JBQWtCLEdBQUcsa0JBQWtCLEVBQ25FLElBQUksRUFBRSxLQUNKLEdBQUcsRUFBRSxHQUFHLEVBQ1IsU0FBUyxFQUFFLFNBQVMsRUFDcEIsUUFBUSxFQUFFLFFBQVEsRUFDbEIsZ0JBQWdCLEVBQUUsd0JBQXdCLEVBQzFDLEdBQUcsQ0FBQyxFQUFFLE1BQU0sS0FDVCxDQUFDLEVBQ04sU0FBUyxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQzdCLE9BQU8sR0FBRSxxQkFBMEIsR0FDbEMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQXdEWjtDQUNGO0FBRUQsT0FBTyxFQUFFLGtCQUFrQixJQUFJLGNBQWMsRUFBRSxDQUFDO0FBQ2hELFlBQVksRUFBRSxxQkFBcUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzdGLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMzQyxZQUFZLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBQWlCLENBQUMifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/embedded/entrypoints/node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,EAAE,KAAK,GAAG,EAAsC,MAAM,mBAAmB,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAa,MAAM,CAAC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,EACnE,IAAI,EAAE,KACJ,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,wBAAwB,EAC1C,GAAG,CAAC,EAAE,MAAM,KACT,CAAC,EACN,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,CAAC,CAAC,CAiDZ;CACF;AAED,OAAO,EAAE,kBAAkB,IAAI,cAAc,EAAE,CAAC;AAChD,YAAY,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC"}
1
+ {"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/embedded/entrypoints/node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,EAAE,KAAK,GAAG,EAAsC,MAAM,mBAAmB,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAmB,MAAM,uBAAuB,CAAC;AACpG,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAa,MAAM,CAAC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,EACnE,IAAI,EAAE,KACJ,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,wBAAwB,EAC1C,GAAG,CAAC,EAAE,MAAM,KACT,CAAC,EACN,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,CAAC,CAAC,CAwDZ;CACF;AAED,OAAO,EAAE,kBAAkB,IAAI,cAAc,EAAE,CAAC;AAChD,YAAY,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAC7F,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC"}
@@ -4,36 +4,46 @@ import { createStore, openTmpStore } from '@aztec/kv-store/lmdb-v2';
4
4
  import { getPXEConfig } from '@aztec/pxe/config';
5
5
  import { createPXE } from '@aztec/pxe/server';
6
6
  import { BundleAccountContractsProvider } from '../account-contract-providers/bundle.js';
7
- import { EmbeddedWallet } from '../embedded_wallet.js';
7
+ import { EmbeddedWallet, splitPxeOptions } from '../embedded_wallet.js';
8
8
  import { WalletDB } from '../wallet_db.js';
9
9
  export class NodeEmbeddedWallet extends EmbeddedWallet {
10
10
  static async create(nodeOrUrl, options = {}) {
11
11
  const rootLogger = options.logger ?? createLogger('embedded-wallet');
12
12
  const aztecNode = typeof nodeOrUrl === 'string' ? createAztecNodeClient(nodeOrUrl) : nodeOrUrl;
13
13
  const l1Contracts = await aztecNode.getL1ContractAddresses();
14
+ // Support both the new unified `pxe` option and the deprecated `pxeConfig`/`pxeOptions`.
15
+ const { config: pxeConfigFromPxe, creation: pxeCreationFromPxe } = splitPxeOptions(options.pxe);
16
+ const mergedConfigOverrides = {
17
+ ...options.pxeConfig,
18
+ ...pxeConfigFromPxe
19
+ };
20
+ const mergedCreationOverrides = {
21
+ ...options.pxeOptions,
22
+ ...pxeCreationFromPxe
23
+ };
14
24
  const pxeConfig = Object.assign(getPXEConfig(), {
15
- proverEnabled: options.pxeConfig?.proverEnabled ?? false,
25
+ proverEnabled: mergedConfigOverrides.proverEnabled ?? false,
16
26
  dataDirectory: `pxe_data_${l1Contracts.rollupAddress}`,
17
- ...options.pxeConfig
27
+ ...mergedConfigOverrides
18
28
  });
19
29
  if (options.ephemeral) {
20
30
  delete pxeConfig.dataDirectory;
21
31
  }
22
32
  const pxeOptions = {
23
- ...options.pxeOptions,
33
+ ...mergedCreationOverrides,
24
34
  loggers: {
25
35
  store: rootLogger.createChild('pxe:data'),
26
36
  pxe: rootLogger.createChild('pxe:service'),
27
37
  prover: rootLogger.createChild('pxe:prover'),
28
- ...options.pxeOptions?.loggers
38
+ ...mergedCreationOverrides.loggers
29
39
  }
30
40
  };
31
41
  const pxe = await createPXE(aztecNode, pxeConfig, pxeOptions);
32
- const walletDBStore = options.ephemeral ? await openTmpStore(`wallet_data_${l1Contracts.rollupAddress}`, true, undefined, undefined, rootLogger.createChild('wallet:data').getBindings()) : await createStore('wallet_data', 1, {
42
+ const walletDBStore = options.walletDb?.store ?? (options.ephemeral ? await openTmpStore(`wallet_data_${l1Contracts.rollupAddress}`, true, undefined, undefined, rootLogger.createChild('wallet:data').getBindings()) : await createStore('wallet_data', 1, {
33
43
  dataDirectory: `wallet_data_${l1Contracts.rollupAddress}`,
34
44
  dataStoreMapSizeKb: pxeConfig.dataStoreMapSizeKb,
35
45
  l1Contracts
36
- }, rootLogger.createChild('wallet:data').getBindings());
46
+ }, rootLogger.createChild('wallet:data').getBindings()));
37
47
  const walletDB = WalletDB.init(walletDBStore, rootLogger.createChild('wallet:db').info);
38
48
  return new this(pxe, aztecNode, walletDB, new BundleAccountContractsProvider(), rootLogger);
39
49
  }
package/dest/testing.d.ts CHANGED
@@ -9,4 +9,4 @@ interface WalletWithSchnorrAccounts {
9
9
  export declare function deployFundedSchnorrAccounts(wallet: WalletWithSchnorrAccounts, accountsData: InitialAccountData[], waitOptions?: WaitOpts): Promise<AccountManager[]>;
10
10
  export declare function registerInitialLocalNetworkAccountsInWallet(wallet: WalletWithSchnorrAccounts): Promise<AztecAddress[]>;
11
11
  export {};
12
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdGluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3Rlc3RpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVsRSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDN0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTNELFVBQVUseUJBQXlCO0lBQ2pDLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxVQUFVLENBQUMsRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FBQztDQUN0RztBQUVELHdCQUFzQiwyQkFBMkIsQ0FDL0MsTUFBTSxFQUFFLHlCQUF5QixFQUNqQyxZQUFZLEVBQUUsa0JBQWtCLEVBQUUsRUFDbEMsV0FBVyxDQUFDLEVBQUUsUUFBUSw2QkFnQnZCO0FBRUQsd0JBQXNCLDJDQUEyQyxDQUMvRCxNQUFNLEVBQUUseUJBQXlCLEdBQ2hDLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQU96QiJ9
12
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdGluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3Rlc3RpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUdsRSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDN0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTNELFVBQVUseUJBQXlCO0lBQ2pDLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxVQUFVLENBQUMsRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FBQztDQUN0RztBQUVELHdCQUFzQiwyQkFBMkIsQ0FDL0MsTUFBTSxFQUFFLHlCQUF5QixFQUNqQyxZQUFZLEVBQUUsa0JBQWtCLEVBQUUsRUFDbEMsV0FBVyxDQUFDLEVBQUUsUUFBUSw2QkFnQnZCO0FBRUQsd0JBQXNCLDJDQUEyQyxDQUMvRCxNQUFNLEVBQUUseUJBQXlCLEdBQ2hDLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQU96QiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,UAAU,yBAAyB;IACjC,oBAAoB,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACtG;AAED,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,yBAAyB,EACjC,YAAY,EAAE,kBAAkB,EAAE,EAClC,WAAW,CAAC,EAAE,QAAQ,6BAgBvB;AAED,wBAAsB,2CAA2C,CAC/D,MAAM,EAAE,yBAAyB,GAChC,OAAO,CAAC,YAAY,EAAE,CAAC,CAOzB"}
1
+ {"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAGlE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,UAAU,yBAAyB;IACjC,oBAAoB,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACtG;AAED,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,yBAAyB,EACjC,YAAY,EAAE,kBAAkB,EAAE,EAClC,WAAW,CAAC,EAAE,QAAQ,6BAgBvB;AAED,wBAAsB,2CAA2C,CAC/D,MAAM,EAAE,yBAAyB,GAChC,OAAO,CAAC,YAAY,EAAE,CAAC,CAOzB"}
package/dest/testing.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { getInitialTestAccountsData } from '@aztec/accounts/testing/lazy';
2
- import { AztecAddress } from '@aztec/stdlib/aztec-address';
2
+ import { NO_FROM } from '@aztec/aztec.js/account';
3
3
  export async function deployFundedSchnorrAccounts(wallet, accountsData, waitOptions) {
4
4
  const accountManagers = [];
5
5
  // Serial due to https://github.com/AztecProtocol/aztec-packages/issues/12045
@@ -8,7 +8,7 @@ export async function deployFundedSchnorrAccounts(wallet, accountsData, waitOpti
8
8
  const accountManager = await wallet.createSchnorrAccount(secret, salt, signingKey);
9
9
  const deployMethod = await accountManager.getDeployMethod();
10
10
  await deployMethod.send({
11
- from: AztecAddress.ZERO,
11
+ from: NO_FROM,
12
12
  skipClassPublication: i !== 0,
13
13
  wait: waitOptions
14
14
  });
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@aztec/wallets",
3
3
  "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/wallets",
4
- "version": "0.0.1-commit.967fc6998",
4
+ "version": "0.0.1-commit.9badcec54",
5
5
  "type": "module",
6
6
  "exports": {
7
7
  "./embedded": {
@@ -27,15 +27,15 @@
27
27
  "../package.common.json"
28
28
  ],
29
29
  "dependencies": {
30
- "@aztec/accounts": "0.0.1-commit.967fc6998",
31
- "@aztec/aztec.js": "0.0.1-commit.967fc6998",
32
- "@aztec/entrypoints": "0.0.1-commit.967fc6998",
33
- "@aztec/foundation": "0.0.1-commit.967fc6998",
34
- "@aztec/kv-store": "0.0.1-commit.967fc6998",
35
- "@aztec/protocol-contracts": "0.0.1-commit.967fc6998",
36
- "@aztec/pxe": "0.0.1-commit.967fc6998",
37
- "@aztec/stdlib": "0.0.1-commit.967fc6998",
38
- "@aztec/wallet-sdk": "0.0.1-commit.967fc6998"
30
+ "@aztec/accounts": "0.0.1-commit.9badcec54",
31
+ "@aztec/aztec.js": "0.0.1-commit.9badcec54",
32
+ "@aztec/entrypoints": "0.0.1-commit.9badcec54",
33
+ "@aztec/foundation": "0.0.1-commit.9badcec54",
34
+ "@aztec/kv-store": "0.0.1-commit.9badcec54",
35
+ "@aztec/protocol-contracts": "0.0.1-commit.9badcec54",
36
+ "@aztec/pxe": "0.0.1-commit.9badcec54",
37
+ "@aztec/stdlib": "0.0.1-commit.9badcec54",
38
+ "@aztec/wallet-sdk": "0.0.1-commit.9badcec54"
39
39
  },
40
40
  "devDependencies": {
41
41
  "@jest/globals": "^30.0.0",
@@ -46,6 +46,7 @@
46
46
  },
47
47
  "typedocOptions": {
48
48
  "entryPoints": [
49
+ "./src/embedded/entrypoints/browser.ts",
49
50
  "./src/embedded/entrypoints/node.ts",
50
51
  "./src/testing.ts"
51
52
  ],
@@ -1,12 +1,14 @@
1
1
  import { EcdsaKAccountContract, EcdsaRAccountContract } from '@aztec/accounts/ecdsa';
2
2
  import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
3
- import { StubAccountContractArtifact, createStubAccount } from '@aztec/accounts/stub';
3
+ import { StubEcdsaAccountContractArtifact, createStubEcdsaAccount } from '@aztec/accounts/stub/ecdsa';
4
+ import { StubSchnorrAccountContractArtifact, createStubSchnorrAccount } from '@aztec/accounts/stub/schnorr';
4
5
  import type { Account, AccountContract } from '@aztec/aztec.js/account';
5
6
  import type { Fq } from '@aztec/foundation/curves/bn254';
6
7
  import { getCanonicalMultiCallEntrypoint } from '@aztec/protocol-contracts/multi-call-entrypoint';
7
8
  import type { ContractArtifact } from '@aztec/stdlib/abi';
8
9
  import type { CompleteAddress, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
9
10
 
11
+ import type { AccountType } from '../wallet_db.js';
10
12
  import type { AccountContractsProvider } from './types.js';
11
13
 
12
14
  /**
@@ -26,12 +28,12 @@ export class BundleAccountContractsProvider implements AccountContractsProvider
26
28
  return Promise.resolve(new EcdsaKAccountContract(signingKey));
27
29
  }
28
30
 
29
- getStubAccountContractArtifact(): Promise<ContractArtifact> {
30
- return Promise.resolve(StubAccountContractArtifact);
31
+ getStubAccountContractArtifact(type: AccountType): Promise<ContractArtifact> {
32
+ return Promise.resolve(type === 'schnorr' ? StubSchnorrAccountContractArtifact : StubEcdsaAccountContractArtifact);
31
33
  }
32
34
 
33
- createStubAccount(address: CompleteAddress): Promise<Account> {
34
- return Promise.resolve(createStubAccount(address));
35
+ createStubAccount(address: CompleteAddress, type: AccountType): Promise<Account> {
36
+ return Promise.resolve(type === 'schnorr' ? createStubSchnorrAccount(address) : createStubEcdsaAccount(address));
35
37
  }
36
38
 
37
39
  getMulticallContract(): Promise<{ instance: ContractInstanceWithAddress; artifact: ContractArtifact }> {
@@ -4,6 +4,7 @@ import { getCanonicalMultiCallEntrypoint } from '@aztec/protocol-contracts/multi
4
4
  import type { ContractArtifact } from '@aztec/stdlib/abi';
5
5
  import type { CompleteAddress, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
6
6
 
7
+ import type { AccountType } from '../wallet_db.js';
7
8
  import type { AccountContractsProvider } from './types.js';
8
9
 
9
10
  /**
@@ -26,14 +27,24 @@ export class LazyAccountContractsProvider implements AccountContractsProvider {
26
27
  return new EcdsaKAccountContract(signingKey);
27
28
  }
28
29
 
29
- async getStubAccountContractArtifact(): Promise<ContractArtifact> {
30
- const { getStubAccountContractArtifact } = await import('@aztec/accounts/stub/lazy');
31
- return getStubAccountContractArtifact();
30
+ async getStubAccountContractArtifact(type: AccountType): Promise<ContractArtifact> {
31
+ if (type === 'schnorr') {
32
+ const { getStubSchnorrAccountContractArtifact } = await import('@aztec/accounts/stub/schnorr/lazy');
33
+ return getStubSchnorrAccountContractArtifact();
34
+ } else {
35
+ const { getStubEcdsaAccountContractArtifact } = await import('@aztec/accounts/stub/ecdsa/lazy');
36
+ return getStubEcdsaAccountContractArtifact();
37
+ }
32
38
  }
33
39
 
34
- async createStubAccount(address: CompleteAddress): Promise<Account> {
35
- const { createStubAccount } = await import('@aztec/accounts/stub/lazy');
36
- return createStubAccount(address);
40
+ async createStubAccount(address: CompleteAddress, type: AccountType): Promise<Account> {
41
+ if (type === 'schnorr') {
42
+ const { createStubSchnorrAccount } = await import('@aztec/accounts/stub/schnorr/lazy');
43
+ return createStubSchnorrAccount(address);
44
+ } else {
45
+ const { createStubEcdsaAccount } = await import('@aztec/accounts/stub/ecdsa/lazy');
46
+ return createStubEcdsaAccount(address);
47
+ }
37
48
  }
38
49
 
39
50
  getMulticallContract(): Promise<{ instance: ContractInstanceWithAddress; artifact: ContractArtifact }> {
@@ -3,6 +3,8 @@ import type { Fq } from '@aztec/foundation/curves/bn254';
3
3
  import type { ContractArtifact } from '@aztec/stdlib/abi';
4
4
  import type { CompleteAddress, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
5
5
 
6
+ import type { AccountType } from '../wallet_db.js';
7
+
6
8
  /**
7
9
  * Provides account contract implementations and stub accounts for the EmbeddedWallet.
8
10
  * Two implementations exist:
@@ -13,7 +15,7 @@ export interface AccountContractsProvider {
13
15
  getSchnorrAccountContract(signingKey: Fq): Promise<AccountContract>;
14
16
  getEcdsaRAccountContract(signingKey: Buffer): Promise<AccountContract>;
15
17
  getEcdsaKAccountContract(signingKey: Buffer): Promise<AccountContract>;
16
- getStubAccountContractArtifact(): Promise<ContractArtifact>;
18
+ getStubAccountContractArtifact(type: AccountType): Promise<ContractArtifact>;
17
19
  getMulticallContract(): Promise<{ instance: ContractInstanceWithAddress; artifact: ContractArtifact }>;
18
- createStubAccount(address: CompleteAddress): Promise<Account>;
20
+ createStubAccount(address: CompleteAddress, type: AccountType): Promise<Account>;
19
21
  }
@@ -1,33 +1,81 @@
1
- import { type Account, SignerlessAccount } from '@aztec/aztec.js/account';
2
- import type { Aliased } from '@aztec/aztec.js/wallet';
3
- import { AccountManager } from '@aztec/aztec.js/wallet';
1
+ import { type Account, NO_FROM } from '@aztec/aztec.js/account';
2
+ import { CallAuthorizationRequest } from '@aztec/aztec.js/authorization';
3
+ import { type InteractionWaitOptions, type SendReturn, type WaitOpts, getGasLimits } from '@aztec/aztec.js/contracts';
4
+ import type { Aliased, SendOptions } from '@aztec/aztec.js/wallet';
5
+ import { AccountManager, TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
4
6
  import type { DefaultAccountEntrypointOptions } from '@aztec/entrypoints/account';
7
+ import { DefaultEntrypoint } from '@aztec/entrypoints/default';
5
8
  import { Fq, Fr } from '@aztec/foundation/curves/bn254';
6
9
  import type { Logger } from '@aztec/foundation/log';
7
- import type { AccessScopes, PXEConfig, PXECreationOptions } from '@aztec/pxe/client/lazy';
10
+ import type { AztecAsyncKVStore } from '@aztec/kv-store';
11
+ import type { PXEConfig, PXECreationOptions } from '@aztec/pxe/client/lazy';
8
12
  import type { PXE } from '@aztec/pxe/server';
9
13
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
10
14
  import { getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
15
+ import { GasSettings } from '@aztec/stdlib/gas';
11
16
  import type { AztecNode } from '@aztec/stdlib/interfaces/client';
12
17
  import { deriveSigningKey } from '@aztec/stdlib/keys';
13
- import { ExecutionPayload, type TxSimulationResult, mergeExecutionPayloads } from '@aztec/stdlib/tx';
14
- import { BaseWallet, type FeeOptions } from '@aztec/wallet-sdk/base-wallet';
18
+ import {
19
+ type ContractOverrides,
20
+ ExecutionPayload,
21
+ SimulationOverrides,
22
+ type TxExecutionRequest,
23
+ TxStatus,
24
+ collectOffchainEffects,
25
+ mergeExecutionPayloads,
26
+ } from '@aztec/stdlib/tx';
27
+ import { BaseWallet, type SimulateViaEntrypointOptions } from '@aztec/wallet-sdk/base-wallet';
15
28
 
16
29
  import type { AccountContractsProvider } from './account-contract-providers/types.js';
17
30
  import { type AccountType, WalletDB } from './wallet_db.js';
18
31
 
32
+ /** Options for the PXE instance created by the EmbeddedWallet. */
33
+ export type EmbeddedWalletPXEOptions = Partial<PXEConfig> & PXECreationOptions;
34
+
35
+ /** Splits a unified EmbeddedWalletPXEOptions into PXEConfig overrides and PXECreationOptions. */
36
+ export function splitPxeOptions(pxe?: EmbeddedWalletPXEOptions): {
37
+ config: Partial<PXEConfig>;
38
+ creation: PXECreationOptions;
39
+ } {
40
+ if (!pxe) {
41
+ return { config: {}, creation: {} };
42
+ }
43
+ const { loggers, loggerActorLabel, proverOrOptions, store, simulator, ...config } = pxe;
44
+ return { config, creation: { loggers, loggerActorLabel, proverOrOptions, store, simulator } };
45
+ }
46
+
47
+ /** Options for the EmbeddedWallet's own DB (accounts, senders — distinct from PXE state). */
48
+ export type EmbeddedWalletDBOptions = {
49
+ /** Override the wallet DB backend. If omitted, an IndexedDB (browser) / LMDB (node) store is created. */
50
+ store?: AztecAsyncKVStore;
51
+ };
52
+
19
53
  export type EmbeddedWalletOptions = {
20
54
  /** Parent logger. Child loggers are derived via createChild() for each subsystem. */
21
55
  logger?: Logger;
22
56
  /** Use ephemeral (in-memory) stores. Data will not persist across sessions. */
23
57
  ephemeral?: boolean;
24
- /** Override PXE configuration. */
58
+ /** PXE configuration and dependency overrides (custom store, prover, simulator). */
59
+ pxe?: EmbeddedWalletPXEOptions;
60
+ /** Wallet DB dependency overrides (custom store). */
61
+ walletDb?: EmbeddedWalletDBOptions;
62
+ /**
63
+ * Override PXE configuration.
64
+ * @deprecated Use `pxe` instead.
65
+ */
25
66
  pxeConfig?: Partial<PXEConfig>;
26
- /** Advanced PXE creation options (custom store, prover, simulator). */
67
+ /**
68
+ * Advanced PXE creation options (custom store, prover, simulator).
69
+ * @deprecated Use `pxe` instead.
70
+ */
27
71
  pxeOptions?: PXECreationOptions;
28
72
  };
29
73
 
74
+ const DEFAULT_ESTIMATED_GAS_PADDING = 0.1;
75
+
30
76
  export class EmbeddedWallet extends BaseWallet {
77
+ protected estimatedGasPadding = DEFAULT_ESTIMATED_GAS_PADDING;
78
+
31
79
  constructor(
32
80
  pxe: PXE,
33
81
  aztecNode: AztecNode,
@@ -39,10 +87,6 @@ export class EmbeddedWallet extends BaseWallet {
39
87
  }
40
88
 
41
89
  protected async getAccountFromAddress(address: AztecAddress): Promise<Account> {
42
- if (address.equals(AztecAddress.ZERO)) {
43
- return new SignerlessAccount();
44
- }
45
-
46
90
  const { secretKey, salt, signingKey, type } = await this.walletDB.retrieveAccount(address);
47
91
  const accountManager = await this.createAccountInternal(type, secretKey, salt, signingKey);
48
92
  const account = await accountManager.getAccount();
@@ -75,81 +119,170 @@ export class EmbeddedWallet extends BaseWallet {
75
119
  }
76
120
 
77
121
  /**
78
- * Simulates calls via a stub account entrypoint, bypassing real account authorization.
79
- * This allows kernelless simulation with contract overrides, skipping expensive
80
- * private kernel circuit execution.
122
+ * Overrides the base sendTx to add a pre-simulation step before the actual send. The simulation
123
+ * estimates actual gas usage and captures call authorization requests to generate
124
+ * the necessary authwitnesses.
81
125
  */
82
- protected override async simulateViaEntrypoint(
126
+ public override async sendTx<W extends InteractionWaitOptions = undefined>(
83
127
  executionPayload: ExecutionPayload,
84
- from: AztecAddress,
85
- feeOptions: FeeOptions,
86
- scopes: AccessScopes,
87
- _skipTxValidation?: boolean,
88
- _skipFeeEnforcement?: boolean,
89
- ): Promise<TxSimulationResult> {
90
- const { account: fromAccount, instance, artifact } = await this.getFakeAccountDataFor(from);
128
+ opts: SendOptions<W>,
129
+ ): Promise<SendReturn<W>> {
130
+ const feeOptions = await this.completeFeeOptions({
131
+ from: opts.from,
132
+ feePayer: executionPayload.feePayer,
133
+ gasSettings: opts.fee?.gasSettings,
134
+ forEstimation: true,
135
+ });
91
136
 
92
- const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
93
- const executionOptions: DefaultAccountEntrypointOptions = {
94
- txNonce: Fr.random(),
95
- cancellable: this.cancellableTransactions,
96
- feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions,
97
- };
98
- const finalExecutionPayload = feeExecutionPayload
99
- ? mergeExecutionPayloads([feeExecutionPayload, executionPayload])
100
- : executionPayload;
101
- const chainInfo = await this.getChainInfo();
102
- const txRequest = await fromAccount.createTxExecutionRequest(
103
- finalExecutionPayload,
104
- feeOptions.gasSettings,
105
- chainInfo,
106
- executionOptions,
107
- );
108
- return this.pxe.simulateTx(txRequest, {
109
- simulatePublic: true,
110
- skipFeeEnforcement: true,
137
+ // Simulate the transaction first to estimate gas and capture required
138
+ // private authwitnesses based on offchain effects.
139
+ const simulationResult = await this.simulateViaEntrypoint(executionPayload, {
140
+ from: opts.from,
141
+ feeOptions,
142
+ additionalScopes: opts.additionalScopes,
111
143
  skipTxValidation: true,
112
- overrides: {
113
- contracts: { [from.toString()]: { instance, artifact } },
114
- },
115
- scopes,
144
+ });
145
+
146
+ const offchainEffects = collectOffchainEffects(simulationResult.privateExecutionResult);
147
+ const authWitnesses = await Promise.all(
148
+ offchainEffects.map(async effect => {
149
+ try {
150
+ const authRequest = await CallAuthorizationRequest.fromFields(effect.data);
151
+ return this.createAuthWit(authRequest.onBehalfOf, {
152
+ consumer: effect.contractAddress,
153
+ innerHash: authRequest.innerHash,
154
+ });
155
+ } catch {
156
+ return undefined;
157
+ }
158
+ }),
159
+ );
160
+ for (const authwit of authWitnesses) {
161
+ if (authwit) {
162
+ executionPayload.authWitnesses.push(authwit);
163
+ }
164
+ }
165
+ const estimated = getGasLimits(simulationResult, this.estimatedGasPadding);
166
+ this.log.verbose(
167
+ `Estimated gas limits for tx: DA=${estimated.gasLimits.daGas} L2=${estimated.gasLimits.l2Gas} teardownDA=${estimated.teardownGasLimits.daGas} teardownL2=${estimated.teardownGasLimits.l2Gas}`,
168
+ );
169
+ const gasSettings = GasSettings.from({
170
+ ...opts.fee?.gasSettings,
171
+ maxFeesPerGas: feeOptions.gasSettings.maxFeesPerGas,
172
+ maxPriorityFeesPerGas: feeOptions.gasSettings.maxPriorityFeesPerGas,
173
+ gasLimits: opts.fee?.gasSettings?.gasLimits ?? estimated.gasLimits,
174
+ teardownGasLimits: opts.fee?.gasSettings?.teardownGasLimits ?? estimated.teardownGasLimits,
175
+ });
176
+ const waitOpts: WaitOpts = typeof opts.wait === 'object' ? opts.wait : {};
177
+
178
+ if (!waitOpts?.waitForStatus) {
179
+ // Default to PROPOSED so the wait returns as soon as the tx lands in a proposed L2 block,
180
+ // rather than waiting until the end of the slot for the checkpoint to be published to L1.
181
+ // This is what makes MBPS (Multiple Blocks Per Slot) actually improve UX: with CHECKPOINTED
182
+ // we'd block until L1 inclusion regardless of how early in the slot the tx was sequenced.
183
+ // The tradeoff is a weaker guarantee — a proposed block only becomes canonical once it (or
184
+ // a later block in the same slot) is checkpointed, so a tx could be re-orged out if the
185
+ // proposer fails to publish to L1 (which should be rare, since they'd get slashed for it).
186
+ waitOpts!.waitForStatus = TxStatus.PROPOSED;
187
+ }
188
+ return super.sendTx(executionPayload, {
189
+ ...opts,
190
+ fee: { ...opts.fee, gasSettings },
116
191
  });
117
192
  }
118
193
 
119
- private async getFakeAccountDataFor(address: AztecAddress) {
120
- // While we have the convention of "Zero address means no auth", and also
121
- // we don't have a way to trigger kernelless simulations without overrides,
122
- // we need to explicitly handle the zero address case here by
123
- // returning the actual multicall contract instead of trying to create a stub account for it.
124
- if (!address.equals(AztecAddress.ZERO)) {
194
+ /**
195
+ * Builds contract overrides for all provided addresses by replacing their account contracts with stub implementations.
196
+ * Uses a type-specific stub artifact so that the stub's constructor selector matches the real account's constructor.
197
+ */
198
+ protected async buildAccountOverrides(addresses: AztecAddress[]): Promise<ContractOverrides> {
199
+ const accounts = await this.getAccounts();
200
+ const contracts: ContractOverrides = {};
201
+
202
+ const filtered = accounts.filter(acc => addresses.some(addr => addr.equals(acc.item)));
203
+
204
+ for (const account of filtered) {
205
+ const address = account.item;
206
+ const { type } = await this.walletDB.retrieveAccount(address);
207
+ const stubArtifact = await this.accountContracts.getStubAccountContractArtifact(type);
208
+
125
209
  const originalAccount = await this.getAccountFromAddress(address);
126
- if (originalAccount instanceof SignerlessAccount) {
127
- throw new Error(`Cannot create fake account data for SignerlessAccount at address: ${address}`);
128
- }
129
- const originalAddress = (originalAccount as Account).getCompleteAddress();
130
- const contractInstance = await this.pxe.getContractInstance(originalAddress.address);
210
+ const completeAddress = originalAccount.getCompleteAddress();
211
+ const contractInstance = await this.pxe.getContractInstance(completeAddress.address);
131
212
  if (!contractInstance) {
132
- throw new Error(`No contract instance found for address: ${originalAddress.address}`);
213
+ throw new Error(
214
+ `No contract instance found for address: ${completeAddress.address} during account override building. This is a bug!`,
215
+ );
133
216
  }
134
- const stubAccount = await this.accountContracts.createStubAccount(originalAddress);
135
- const stubArtifact = await this.accountContracts.getStubAccountContractArtifact();
136
- const instance = await getContractInstanceFromInstantiationParams(stubArtifact, {
217
+
218
+ const stubConstructorArgs = type === 'schnorr' ? [Fr.ZERO, Fr.ZERO] : [Buffer.alloc(32), Buffer.alloc(32)];
219
+ const stubInstance = await getContractInstanceFromInstantiationParams(stubArtifact, {
137
220
  salt: Fr.random(),
221
+ constructorArgs: stubConstructorArgs,
138
222
  });
139
- return {
140
- account: stubAccount,
141
- instance,
223
+
224
+ contracts[address.toString()] = {
225
+ instance: stubInstance,
142
226
  artifact: stubArtifact,
143
227
  };
228
+ }
229
+
230
+ return contracts;
231
+ }
232
+
233
+ /**
234
+ * Simulates calls via a stub account entrypoint, bypassing real account authorization.
235
+ * This allows kernelless simulation with contract overrides, skipping expensive
236
+ * private kernel circuit execution.
237
+ */
238
+ protected override async simulateViaEntrypoint(
239
+ executionPayload: ExecutionPayload,
240
+ opts: SimulateViaEntrypointOptions,
241
+ ): Promise<TxSimulationResultWithAppOffset> {
242
+ const { from, feeOptions, additionalScopes, skipTxValidation, skipFeeEnforcement } = opts;
243
+ const scopes = this.scopesFrom(from, additionalScopes);
244
+
245
+ const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
246
+ const finalExecutionPayload = feeExecutionPayload
247
+ ? mergeExecutionPayloads([feeExecutionPayload, executionPayload])
248
+ : executionPayload;
249
+ const chainInfo = await this.getChainInfo();
250
+
251
+ const accountOverrides = await this.buildAccountOverrides(scopes);
252
+ const overrides = new SimulationOverrides(accountOverrides);
253
+
254
+ let txRequest: TxExecutionRequest;
255
+ if (from === NO_FROM) {
256
+ const entrypoint = new DefaultEntrypoint();
257
+ txRequest = await entrypoint.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo);
144
258
  } else {
145
- const { instance, artifact } = await this.accountContracts.getMulticallContract();
146
- const account = new SignerlessAccount();
147
- return {
148
- instance,
149
- account,
150
- artifact,
259
+ const { type } = await this.walletDB.retrieveAccount(from);
260
+ const originalAccount = await this.getAccountFromAddress(from);
261
+ const completeAddress = originalAccount.getCompleteAddress();
262
+ const account = await this.accountContracts.createStubAccount(completeAddress, type);
263
+ const executionOptions: DefaultAccountEntrypointOptions = {
264
+ txNonce: Fr.random(),
265
+ cancellable: this.cancellableTransactions,
266
+ // If from is an address, feeOptions include the way the account contract should handle the fee payment
267
+ feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions!,
151
268
  };
269
+ txRequest = await account.createTxExecutionRequest(
270
+ finalExecutionPayload,
271
+ feeOptions.gasSettings,
272
+ chainInfo,
273
+ executionOptions,
274
+ );
152
275
  }
276
+
277
+ const result = await this.pxe.simulateTx(txRequest, {
278
+ simulatePublic: true,
279
+ skipFeeEnforcement,
280
+ skipTxValidation,
281
+ overrides,
282
+ scopes,
283
+ });
284
+ const appCallOffset = await this.computeAppCallOffset(from, feeOptions);
285
+ return TxSimulationResultWithAppOffset.fromResultAndOffset(result, appCallOffset);
153
286
  }
154
287
 
155
288
  protected async createAccountInternal(
@@ -221,6 +354,10 @@ export class EmbeddedWallet extends BaseWallet {
221
354
  this.minFeePadding = value ?? 0.5;
222
355
  }
223
356
 
357
+ setEstimatedGasPadding(value?: number) {
358
+ this.estimatedGasPadding = value ?? DEFAULT_ESTIMATED_GAS_PADDING;
359
+ }
360
+
224
361
  stop() {
225
362
  return this.pxe.stop();
226
363
  }