@aztec/wallets 0.0.1-commit.21ecf947b → 0.0.1-commit.2448fdb

package/dest/embedded/entrypoints/browser.js

@@ -4,31 +4,48 @@ import { createStore, openTmpStore } from '@aztec/kv-store/indexeddb';
 import { createPXE } from '@aztec/pxe/client/lazy';
 import { getPXEConfig } from '@aztec/pxe/config';
 import { LazyAccountContractsProvider } from '../account-contract-providers/lazy.js';
-import { EmbeddedWallet } from '../embedded_wallet.js';
+import { EmbeddedWallet, splitPxeOptions } from '../embedded_wallet.js';
 import { WalletDB } from '../wallet_db.js';
 export class BrowserEmbeddedWallet extends EmbeddedWallet {
-    static async create(nodeUrl, options = {}) {
+    static async create(nodeOrUrl, options = {}) {
         const rootLogger = options.logger ?? createLogger('embedded-wallet');
-        const aztecNode = createAztecNodeClient(nodeUrl);
+        const aztecNode = typeof nodeOrUrl === 'string' ? createAztecNodeClient(nodeOrUrl) : nodeOrUrl;
         const l1Contracts = await aztecNode.getL1ContractAddresses();
-        const rollupAddress = l1Contracts.rollupAddress;
-        const config = getPXEConfig();
-        if (!options.ephemeral) {
-            config.dataDirectory = `pxe-${rollupAddress}`;
+        // Support both the new unified `pxe` option and the deprecated `pxeConfig`/`pxeOptions`.
+        const { config: pxeConfigFromPxe, creation: pxeCreationFromPxe } = splitPxeOptions(options.pxe);
+        const mergedConfigOverrides = {
+            ...options.pxeConfig,
+            ...pxeConfigFromPxe
+        };
+        const mergedCreationOverrides = {
+            ...options.pxeOptions,
+            ...pxeCreationFromPxe
+        };
+        const pxeConfig = Object.assign(getPXEConfig(), {
+            proverEnabled: mergedConfigOverrides.proverEnabled ?? false,
+            dataDirectory: `pxe_data_${l1Contracts.rollupAddress}`,
+            ...mergedConfigOverrides
+        });
+        if (options.ephemeral) {
+            delete pxeConfig.dataDirectory;
         }
-        const pxe = await createPXE(aztecNode, config, {
+        const pxeOptions = {
+            ...mergedCreationOverrides,
             loggers: {
                 store: rootLogger.createChild('pxe:data'),
                 pxe: rootLogger.createChild('pxe:service'),
-                prover: rootLogger.createChild('pxe:prover')
+                prover: rootLogger.createChild('pxe:prover'),
+                ...mergedCreationOverrides.loggers
             }
-        });
-        const walletDBStore = options.ephemeral ? await openTmpStore(true) : await createStore(`wallet-${rollupAddress}`, {
-            dataDirectory: 'wallet',
-            dataStoreMapSizeKb: 2e10
-        }, undefined, rootLogger.createChild('wallet:data'));
+        };
+        const pxe = await createPXE(aztecNode, pxeConfig, pxeOptions);
+        const walletDBStore = options.ephemeral ? await openTmpStore(true) : await createStore('wallet_data', {
+            dataDirectory: `wallet_data_${l1Contracts.rollupAddress}`,
+            dataStoreMapSizeKb: pxeConfig.dataStoreMapSizeKb,
+            l1Contracts
+        }, 1, rootLogger.createChild('wallet:data'));
         const walletDB = WalletDB.init(walletDBStore, rootLogger.createChild('wallet:db').info);
-        return new BrowserEmbeddedWallet(pxe, aztecNode, walletDB, new LazyAccountContractsProvider(), rootLogger);
+        return new this(pxe, aztecNode, walletDB, new LazyAccountContractsProvider(), rootLogger);
     }
 }
 export { BrowserEmbeddedWallet as EmbeddedWallet };

package/dest/embedded/entrypoints/node.d.ts

@@ -1,18 +1,14 @@
-import type { PXEConfig } from '@aztec/pxe/config';
-import { type PXECreationOptions } from '@aztec/pxe/server';
+import { type Logger } from '@aztec/foundation/log';
+import { type PXE } from '@aztec/pxe/server';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import type { AccountContractsProvider } from '../account-contract-providers/types.js';
 import { EmbeddedWallet, type EmbeddedWalletOptions } from '../embedded_wallet.js';
-export type NodeEmbeddedWalletOptions = EmbeddedWalletOptions & {
-    /** Override PXE configuration. */
-    pxeConfig?: Partial<PXEConfig>;
-    /** Advanced PXE creation options (custom store, prover, simulator). */
-    pxeOptions?: PXECreationOptions;
-};
+import { WalletDB } from '../wallet_db.js';
 export declare class NodeEmbeddedWallet extends EmbeddedWallet {
-    static create(nodeOrUrl: string | AztecNode, options?: NodeEmbeddedWalletOptions): Promise<NodeEmbeddedWallet>;
+    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>;
 }
 export { NodeEmbeddedWallet as EmbeddedWallet };
-export type { EmbeddedWalletOptions } from '../embedded_wallet.js';
+export type { EmbeddedWalletOptions, EmbeddedWalletPXEOptions } from '../embedded_wallet.js';
 export { WalletDB } from '../wallet_db.js';
 export type { AccountType } from '../wallet_db.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VtYmVkZGVkL2VudHJ5cG9pbnRzL25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFbkQsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQWEsTUFBTSxtQkFBbUIsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUdqRSxPQUFPLEVBQUUsY0FBYyxFQUFFLEtBQUsscUJBQXFCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUduRixNQUFNLE1BQU0seUJBQXlCLEdBQUcscUJBQXFCLEdBQUc7SUFDOUQsa0NBQWtDO0lBQ2xDLFNBQVMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUMvQix1RUFBdUU7SUFDdkUsVUFBVSxDQUFDLEVBQUUsa0JBQWtCLENBQUM7Q0FDakMsQ0FBQztBQUVGLHFCQUFhLGtCQUFtQixTQUFRLGNBQWM7SUFDcEQsT0FBYSxNQUFNLENBQ2pCLFNBQVMsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQUM3QixPQUFPLEdBQUUseUJBQThCLEdBQ3RDLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQWtEN0I7Q0FDRjtBQUVELE9BQU8sRUFBRSxrQkFBa0IsSUFBSSxjQUFjLEVBQUUsQ0FBQztBQUNoRCxZQUFZLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDM0MsWUFBWSxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VtYmVkZGVkL2VudHJ5cG9pbnRzL25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBR2xFLE9BQU8sRUFBRSxLQUFLLEdBQUcsRUFBc0MsTUFBTSxtQkFBbUIsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUdqRSxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHdDQUF3QyxDQUFDO0FBQ3ZGLE9BQU8sRUFBRSxjQUFjLEVBQUUsS0FBSyxxQkFBcUIsRUFBbUIsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFM0MscUJBQWEsa0JBQW1CLFNBQVEsY0FBYztJQUNwRCxPQUFhLE1BQU0sQ0FBQyxDQUFDLFNBQVMsa0JBQWtCLEdBQUcsa0JBQWtCLEVBQ25FLElBQUksRUFBRSxLQUNKLEdBQUcsRUFBRSxHQUFHLEVBQ1IsU0FBUyxFQUFFLFNBQVMsRUFDcEIsUUFBUSxFQUFFLFFBQVEsRUFDbEIsZ0JBQWdCLEVBQUUsd0JBQXdCLEVBQzFDLEdBQUcsQ0FBQyxFQUFFLE1BQU0sS0FDVCxDQUFDLEVBQ04sU0FBUyxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQzdCLE9BQU8sR0FBRSxxQkFBMEIsR0FDbEMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQXNEWjtDQUNGO0FBRUQsT0FBTyxFQUFFLGtCQUFrQixJQUFJLGNBQWMsRUFBRSxDQUFDO0FBQ2hELFlBQVksRUFBRSxxQkFBcUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzdGLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMzQyxZQUFZLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBQWlCLENBQUMifQ==

package/dest/embedded/entrypoints/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/embedded/entrypoints/node.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,KAAK,kBAAkB,EAAa,MAAM,mBAAmB,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAGnF,MAAM,MAAM,yBAAyB,GAAG,qBAAqB,GAAG;IAC9D,kCAAkC;IAClC,SAAS,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC/B,uEAAuE;IACvE,UAAU,CAAC,EAAE,kBAAkB,CAAC;CACjC,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAa,MAAM,CACjB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,kBAAkB,CAAC,CAkD7B;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"}
+{"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,CAsDZ;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"}

package/dest/embedded/entrypoints/node.js

@@ -1,43 +1,51 @@
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
 import { createLogger } from '@aztec/foundation/log';
-import { createStore as createWalletStore, openTmpStore } from '@aztec/kv-store/lmdb-v2';
+import { createStore, openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import { getPXEConfig } from '@aztec/pxe/config';
 import { createPXE } from '@aztec/pxe/server';
 import { BundleAccountContractsProvider } from '../account-contract-providers/bundle.js';
-import { EmbeddedWallet } from '../embedded_wallet.js';
+import { EmbeddedWallet, splitPxeOptions } from '../embedded_wallet.js';
 import { WalletDB } from '../wallet_db.js';
 export class NodeEmbeddedWallet extends EmbeddedWallet {
     static async create(nodeOrUrl, options = {}) {
         const rootLogger = options.logger ?? createLogger('embedded-wallet');
         const aztecNode = typeof nodeOrUrl === 'string' ? createAztecNodeClient(nodeOrUrl) : nodeOrUrl;
+        const l1Contracts = await aztecNode.getL1ContractAddresses();
+        // Support both the new unified `pxe` option and the deprecated `pxeConfig`/`pxeOptions`.
+        const { config: pxeConfigFromPxe, creation: pxeCreationFromPxe } = splitPxeOptions(options.pxe);
+        const mergedConfigOverrides = {
+            ...options.pxeConfig,
+            ...pxeConfigFromPxe
+        };
+        const mergedCreationOverrides = {
+            ...options.pxeOptions,
+            ...pxeCreationFromPxe
+        };
         const pxeConfig = Object.assign(getPXEConfig(), {
-            proverEnabled: options.pxeConfig?.proverEnabled ?? false,
-            ...options.pxeConfig
+            proverEnabled: mergedConfigOverrides.proverEnabled ?? false,
+            dataDirectory: `pxe_data_${l1Contracts.rollupAddress}`,
+            ...mergedConfigOverrides
         });
         if (options.ephemeral) {
             delete pxeConfig.dataDirectory;
         }
         const pxeOptions = {
-            ...options.pxeOptions,
+            ...mergedCreationOverrides,
             loggers: {
                 store: rootLogger.createChild('pxe:data'),
                 pxe: rootLogger.createChild('pxe:service'),
                 prover: rootLogger.createChild('pxe:prover'),
-                ...options.pxeOptions?.loggers
+                ...mergedCreationOverrides.loggers
             }
         };
         const pxe = await createPXE(aztecNode, pxeConfig, pxeOptions);
-        const l1Contracts = await aztecNode.getL1ContractAddresses();
-        const rollupAddress = l1Contracts.rollupAddress;
-        const walletDBStore = options.ephemeral ? await openTmpStore('wallet_data', true, undefined, undefined, rootLogger.createChild('wallet:data').getBindings()) : await createWalletStore('wallet_data', 1, {
-            dataDirectory: pxeConfig.dataDirectory,
+        const walletDBStore = options.ephemeral ? await openTmpStore(`wallet_data_${l1Contracts.rollupAddress}`, true, undefined, undefined, rootLogger.createChild('wallet:data').getBindings()) : await createStore('wallet_data', 1, {
+            dataDirectory: `wallet_data_${l1Contracts.rollupAddress}`,
             dataStoreMapSizeKb: pxeConfig.dataStoreMapSizeKb,
-            l1Contracts: {
-                rollupAddress
-            }
+            l1Contracts
         }, rootLogger.createChild('wallet:data').getBindings());
         const walletDB = WalletDB.init(walletDBStore, rootLogger.createChild('wallet:db').info);
-        return new NodeEmbeddedWallet(pxe, aztecNode, walletDB, new BundleAccountContractsProvider(), rootLogger);
+        return new this(pxe, aztecNode, walletDB, new BundleAccountContractsProvider(), rootLogger);
     }
 }
 export { NodeEmbeddedWallet as EmbeddedWallet };

package/dest/testing.d.ts

@@ -9,4 +9,4 @@ interface WalletWithSchnorrAccounts {
 export declare function deployFundedSchnorrAccounts(wallet: WalletWithSchnorrAccounts, accountsData: InitialAccountData[], waitOptions?: WaitOpts): Promise<AccountManager[]>;
 export declare function registerInitialLocalNetworkAccountsInWallet(wallet: WalletWithSchnorrAccounts): Promise<AztecAddress[]>;
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdGluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3Rlc3RpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVsRSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDN0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTNELFVBQVUseUJBQXlCO0lBQ2pDLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxVQUFVLENBQUMsRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FBQztDQUN0RztBQUVELHdCQUFzQiwyQkFBMkIsQ0FDL0MsTUFBTSxFQUFFLHlCQUF5QixFQUNqQyxZQUFZLEVBQUUsa0JBQWtCLEVBQUUsRUFDbEMsV0FBVyxDQUFDLEVBQUUsUUFBUSw2QkFnQnZCO0FBRUQsd0JBQXNCLDJDQUEyQyxDQUMvRCxNQUFNLEVBQUUseUJBQXlCLEdBQ2hDLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQU96QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdGluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3Rlc3RpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUdsRSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDN0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTNELFVBQVUseUJBQXlCO0lBQ2pDLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxVQUFVLENBQUMsRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FBQztDQUN0RztBQUVELHdCQUFzQiwyQkFBMkIsQ0FDL0MsTUFBTSxFQUFFLHlCQUF5QixFQUNqQyxZQUFZLEVBQUUsa0JBQWtCLEVBQUUsRUFDbEMsV0FBVyxDQUFDLEVBQUUsUUFBUSw2QkFnQnZCO0FBRUQsd0JBQXNCLDJDQUEyQyxDQUMvRCxNQUFNLEVBQUUseUJBQXlCLEdBQ2hDLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQU96QiJ9

package/dest/testing.d.ts.map

@@ -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"}
+{"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

@@ -1,5 +1,5 @@
 import { getInitialTestAccountsData } from '@aztec/accounts/testing/lazy';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { NO_FROM } from '@aztec/aztec.js/account';
 export async function deployFundedSchnorrAccounts(wallet, accountsData, waitOptions) {
     const accountManagers = [];
     // Serial due to https://github.com/AztecProtocol/aztec-packages/issues/12045
@@ -8,7 +8,7 @@ export async function deployFundedSchnorrAccounts(wallet, accountsData, waitOpti
         const accountManager = await wallet.createSchnorrAccount(secret, salt, signingKey);
         const deployMethod = await accountManager.getDeployMethod();
         await deployMethod.send({
-            from: AztecAddress.ZERO,
+            from: NO_FROM,
             skipClassPublication: i !== 0,
             wait: waitOptions
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aztec/wallets",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/wallets",
-  "version": "0.0.1-commit.21ecf947b",
+  "version": "0.0.1-commit.2448fdb",
   "type": "module",
   "exports": {
     "./embedded": {
@@ -27,14 +27,15 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.21ecf947b",
-    "@aztec/aztec.js": "0.0.1-commit.21ecf947b",
-    "@aztec/entrypoints": "0.0.1-commit.21ecf947b",
-    "@aztec/foundation": "0.0.1-commit.21ecf947b",
-    "@aztec/kv-store": "0.0.1-commit.21ecf947b",
-    "@aztec/pxe": "0.0.1-commit.21ecf947b",
-    "@aztec/stdlib": "0.0.1-commit.21ecf947b",
-    "@aztec/wallet-sdk": "0.0.1-commit.21ecf947b"
+    "@aztec/accounts": "0.0.1-commit.2448fdb",
+    "@aztec/aztec.js": "0.0.1-commit.2448fdb",
+    "@aztec/entrypoints": "0.0.1-commit.2448fdb",
+    "@aztec/foundation": "0.0.1-commit.2448fdb",
+    "@aztec/kv-store": "0.0.1-commit.2448fdb",
+    "@aztec/protocol-contracts": "0.0.1-commit.2448fdb",
+    "@aztec/pxe": "0.0.1-commit.2448fdb",
+    "@aztec/stdlib": "0.0.1-commit.2448fdb",
+    "@aztec/wallet-sdk": "0.0.1-commit.2448fdb"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
@@ -48,6 +49,15 @@
     "src",
     "!*.test.*"
   ],
+  "typedocOptions": {
+    "entryPoints": [
+      "./src/embedded/entrypoints/browser.ts",
+      "./src/embedded/entrypoints/node.ts",
+      "./src/testing.ts"
+    ],
+    "name": "Wallets",
+    "tsconfig": "./tsconfig.json"
+  },
   "engines": {
     "node": ">=20.10"
   },

package/src/embedded/account-contract-providers/bundle.ts

@@ -1,11 +1,14 @@
 import { EcdsaKAccountContract, EcdsaRAccountContract } from '@aztec/accounts/ecdsa';
 import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
-import { StubAccountContractArtifact, createStubAccount } from '@aztec/accounts/stub';
+import { StubEcdsaAccountContractArtifact, createStubEcdsaAccount } from '@aztec/accounts/stub/ecdsa';
+import { StubSchnorrAccountContractArtifact, createStubSchnorrAccount } from '@aztec/accounts/stub/schnorr';
 import type { Account, AccountContract } from '@aztec/aztec.js/account';
 import type { Fq } from '@aztec/foundation/curves/bn254';
+import { getCanonicalMultiCallEntrypoint } from '@aztec/protocol-contracts/multi-call-entrypoint';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
-import type { CompleteAddress } from '@aztec/stdlib/contract';
+import type { CompleteAddress, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 
+import type { AccountType } from '../wallet_db.js';
 import type { AccountContractsProvider } from './types.js';
 
 /**
@@ -25,11 +28,15 @@ export class BundleAccountContractsProvider implements AccountContractsProvider
     return Promise.resolve(new EcdsaKAccountContract(signingKey));
   }
 
-  getStubAccountContractArtifact(): Promise<ContractArtifact> {
-    return Promise.resolve(StubAccountContractArtifact);
+  getStubAccountContractArtifact(type: AccountType): Promise<ContractArtifact> {
+    return Promise.resolve(type === 'schnorr' ? StubSchnorrAccountContractArtifact : StubEcdsaAccountContractArtifact);
   }
 
-  createStubAccount(address: CompleteAddress): Promise<Account> {
-    return Promise.resolve(createStubAccount(address));
+  createStubAccount(address: CompleteAddress, type: AccountType): Promise<Account> {
+    return Promise.resolve(type === 'schnorr' ? createStubSchnorrAccount(address) : createStubEcdsaAccount(address));
+  }
+
+  getMulticallContract(): Promise<{ instance: ContractInstanceWithAddress; artifact: ContractArtifact }> {
+    return getCanonicalMultiCallEntrypoint();
   }
 }

package/src/embedded/account-contract-providers/lazy.ts

@@ -1,8 +1,10 @@
 import type { Account, AccountContract } from '@aztec/aztec.js/account';
 import type { Fq } from '@aztec/foundation/curves/bn254';
+import { getCanonicalMultiCallEntrypoint } from '@aztec/protocol-contracts/multi-call-entrypoint/lazy';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
-import type { CompleteAddress } from '@aztec/stdlib/contract';
+import type { CompleteAddress, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 
+import type { AccountType } from '../wallet_db.js';
 import type { AccountContractsProvider } from './types.js';
 
 /**
@@ -25,13 +27,27 @@ export class LazyAccountContractsProvider implements AccountContractsProvider {
     return new EcdsaKAccountContract(signingKey);
   }
 
-  async getStubAccountContractArtifact(): Promise<ContractArtifact> {
-    const { getStubAccountContractArtifact } = await import('@aztec/accounts/stub/lazy');
-    return getStubAccountContractArtifact();
+  async getStubAccountContractArtifact(type: AccountType): Promise<ContractArtifact> {
+    if (type === 'schnorr') {
+      const { getStubSchnorrAccountContractArtifact } = await import('@aztec/accounts/stub/schnorr/lazy');
+      return getStubSchnorrAccountContractArtifact();
+    } else {
+      const { getStubEcdsaAccountContractArtifact } = await import('@aztec/accounts/stub/ecdsa/lazy');
+      return getStubEcdsaAccountContractArtifact();
+    }
   }
 
-  async createStubAccount(address: CompleteAddress): Promise<Account> {
-    const { createStubAccount } = await import('@aztec/accounts/stub/lazy');
-    return createStubAccount(address);
+  async createStubAccount(address: CompleteAddress, type: AccountType): Promise<Account> {
+    if (type === 'schnorr') {
+      const { createStubSchnorrAccount } = await import('@aztec/accounts/stub/schnorr/lazy');
+      return createStubSchnorrAccount(address);
+    } else {
+      const { createStubEcdsaAccount } = await import('@aztec/accounts/stub/ecdsa/lazy');
+      return createStubEcdsaAccount(address);
+    }
+  }
+
+  getMulticallContract(): Promise<{ instance: ContractInstanceWithAddress; artifact: ContractArtifact }> {
+    return getCanonicalMultiCallEntrypoint();
   }
 }

package/src/embedded/account-contract-providers/types.ts

@@ -1,7 +1,9 @@
 import type { Account, AccountContract } from '@aztec/aztec.js/account';
 import type { Fq } from '@aztec/foundation/curves/bn254';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
-import type { CompleteAddress } from '@aztec/stdlib/contract';
+import type { CompleteAddress, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+
+import type { AccountType } from '../wallet_db.js';
 
 /**
  * Provides account contract implementations and stub accounts for the EmbeddedWallet.
@@ -13,6 +15,7 @@ export interface AccountContractsProvider {
   getSchnorrAccountContract(signingKey: Fq): Promise<AccountContract>;
   getEcdsaRAccountContract(signingKey: Buffer): Promise<AccountContract>;
   getEcdsaKAccountContract(signingKey: Buffer): Promise<AccountContract>;
-  getStubAccountContractArtifact(): Promise<ContractArtifact>;
-  createStubAccount(address: CompleteAddress): Promise<Account>;
+  getStubAccountContractArtifact(type: AccountType): Promise<ContractArtifact>;
+  getMulticallContract(): Promise<{ instance: ContractInstanceWithAddress; artifact: ContractArtifact }>;
+  createStubAccount(address: CompleteAddress, type: AccountType): Promise<Account>;
 }