@aztec/wallets 0.0.1-commit.ffe5b04ea → 0.0.1-private.3d175340d2

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 (36) hide show
  1. package/dest/embedded/account-contract-providers/bundle.d.ts +5 -8
  2. package/dest/embedded/account-contract-providers/bundle.d.ts.map +1 -1
  3. package/dest/embedded/account-contract-providers/bundle.js +6 -9
  4. package/dest/embedded/account-contract-providers/lazy.d.ts +5 -8
  5. package/dest/embedded/account-contract-providers/lazy.d.ts.map +1 -1
  6. package/dest/embedded/account-contract-providers/lazy.js +16 -10
  7. package/dest/embedded/account-contract-providers/types.d.ts +5 -8
  8. package/dest/embedded/account-contract-providers/types.d.ts.map +1 -1
  9. package/dest/embedded/embedded_wallet.d.ts +64 -10
  10. package/dest/embedded/embedded_wallet.d.ts.map +1 -1
  11. package/dest/embedded/embedded_wallet.js +212 -65
  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 +37 -10
  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 +31 -10
  18. package/dest/embedded/store_encryption.d.ts +67 -0
  19. package/dest/embedded/store_encryption.d.ts.map +1 -0
  20. package/dest/embedded/store_encryption.js +71 -0
  21. package/dest/embedded/wallet_db.d.ts +5 -4
  22. package/dest/embedded/wallet_db.d.ts.map +1 -1
  23. package/dest/embedded/wallet_db.js +9 -9
  24. package/dest/testing.d.ts +1 -1
  25. package/dest/testing.d.ts.map +1 -1
  26. package/dest/testing.js +2 -2
  27. package/package.json +13 -10
  28. package/src/embedded/account-contract-providers/bundle.ts +8 -11
  29. package/src/embedded/account-contract-providers/lazy.ts +18 -12
  30. package/src/embedded/account-contract-providers/types.ts +5 -4
  31. package/src/embedded/embedded_wallet.ts +299 -75
  32. package/src/embedded/entrypoints/browser.ts +42 -20
  33. package/src/embedded/entrypoints/node.ts +41 -26
  34. package/src/embedded/store_encryption.ts +107 -0
  35. package/src/embedded/wallet_db.ts +12 -9
  36. package/src/testing.ts +2 -1
@@ -0,0 +1,71 @@
1
+ /**
2
+ * Wallet-layer helpers for opening the embedded wallet's two encrypted stores (PXE + walletDB) as a cohesive unit.
3
+ *
4
+ * Sits on top of `@aztec/kv-store/sqlite-opfs`'s typed `SqliteEncryptionError` and adds:
5
+ *
6
+ * - `storeName: 'pxe' | 'wallet'`, telling callers WHICH store failed.
7
+ * - Cleanup: when the wallet store fails to open, ensures the already-opened PXE store is closed before the error
8
+ * surfaces, so callers don't leak the SAH Pool's OPFS lock.
9
+ */ import { AztecSQLiteOPFSStore, SqliteEncryptionError } from '@aztec/kv-store/sqlite-opfs';
10
+ /**
11
+ * Thrown by {@link openEncryptedEmbeddedStores} when one of the two stores cannot be decrypted with the supplied
12
+ * key. The original {@link SqliteEncryptionError} is preserved as `cause`.
13
+ */ export class EmbeddedWalletEncryptionError extends Error {
14
+ storeName;
15
+ constructor(storeName, opts){
16
+ super(`Embedded wallet '${storeName}' store could not be decrypted with the provided key`, {
17
+ cause: opts.cause
18
+ });
19
+ this.name = 'EmbeddedWalletEncryptionError';
20
+ this.storeName = storeName;
21
+ }
22
+ }
23
+ const defaultOpenStore = (log, name, poolDirectory, encryptionKey)=>AztecSQLiteOPFSStore.open(log, name, false, poolDirectory, encryptionKey);
24
+ /**
25
+ * Opens the PXE and wallet stores in sequence, both encrypted with keys obtained from `getEncryptionKey`.
26
+ *
27
+ * The callback is invoked once per store (twice total per call) because `AztecSQLiteOPFSStore.open` *transfers*
28
+ * the key buffer to its worker. A single buffer would detach between the two opens.
29
+ *
30
+ * Failure modes:
31
+ *
32
+ * - PXE store fails to decrypt → throws `EmbeddedWalletEncryptionError({ storeName: 'pxe', cause })`. No cleanup
33
+ * needed (nothing was opened).
34
+ * - Wallet store fails to decrypt → closes the already-opened PXE store then throws
35
+ * `EmbeddedWalletEncryptionError({ storeName: 'wallet', cause })`.
36
+ * - Any non-decrypt error during the wallet open → still closes PXE, then re-throws the original error unwrapped
37
+ * (preserves callers' existing untyped error handling for non-encryption faults).
38
+ *
39
+ * @param config - Per-store name/poolDirectory.
40
+ * @param getEncryptionKey - Returns a fresh 32-byte key per call (the buffer
41
+ * detaches on transfer, so each call must allocate).
42
+ * @param log - Logger for both stores.
43
+ * @param openStore - Internal test seam. Do not pass in production code.
44
+ */ export async function openEncryptedEmbeddedStores(config, getEncryptionKey, log, openStore = defaultOpenStore) {
45
+ const pxeStore = await openOneStore('pxe', config.pxe, getEncryptionKey, log, openStore);
46
+ try {
47
+ const walletStore = await openOneStore('wallet', config.wallet, getEncryptionKey, log, openStore);
48
+ return {
49
+ pxeStore,
50
+ walletStore
51
+ };
52
+ } catch (err) {
53
+ // Cleanup is best-effort — if close() itself throws (e.g. worker already dead), swallow it so the original error
54
+ // surfaces unobstructed.
55
+ await pxeStore.close().catch(()=>{});
56
+ throw err;
57
+ }
58
+ }
59
+ async function openOneStore(storeName, { name, poolDirectory }, getEncryptionKey, log, openStore) {
60
+ const key = await getEncryptionKey();
61
+ try {
62
+ return await openStore(log, name, poolDirectory, key);
63
+ } catch (err) {
64
+ if (err instanceof SqliteEncryptionError && err.code === 'decrypt_failed') {
65
+ throw new EmbeddedWalletEncryptionError(storeName, {
66
+ cause: err
67
+ });
68
+ }
69
+ throw err;
70
+ }
71
+ }
@@ -7,11 +7,11 @@ export declare const AccountTypes: readonly ["schnorr", "ecdsasecp256r1", "ecdsa
7
7
  export type AccountType = (typeof AccountTypes)[number];
8
8
  export declare class WalletDB {
9
9
  #private;
10
+ private store;
11
+ private userLog;
10
12
  private accounts;
11
13
  private aliases;
12
- private userLog;
13
- private constructor();
14
- static init(store: AztecAsyncKVStore, userLog: LogFn): WalletDB;
14
+ constructor(store: AztecAsyncKVStore, userLog: LogFn);
15
15
  storeAccount(address: AztecAddress, { type, secretKey, salt, alias, signingKey }: {
16
16
  type: AccountType;
17
17
  secretKey: Fr;
@@ -30,5 +30,6 @@ export declare class WalletDB {
30
30
  listAccounts(): Promise<Aliased<AztecAddress>[]>;
31
31
  listSenders(): Promise<Aliased<AztecAddress>[]>;
32
32
  deleteAccount(address: AztecAddress): Promise<void>;
33
+ close(): Promise<void>;
33
34
  }
34
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2FsbGV0X2RiLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZW1iZWRkZWQvd2FsbGV0X2RiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3RELE9BQU8sRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFDeEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTNELGVBQU8sTUFBTSxZQUFZLDBEQUEyRCxDQUFDO0FBQ3JGLE1BQU0sTUFBTSxXQUFXLEdBQUcsQ0FBQyxPQUFPLFlBQVksQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBTXhELHFCQUFhLFFBQVE7O0lBRWpCLE9BQU8sQ0FBQyxRQUFRO0lBQ2hCLE9BQU8sQ0FBQyxPQUFPO0lBQ2YsT0FBTyxDQUFDLE9BQU87SUFIakIsT0FBTyxlQUlIO0lBRUosTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsT0FBTyxFQUFFLEtBQUssWUFJbkQ7SUFFSyxZQUFZLENBQ2hCLE9BQU8sRUFBRSxZQUFZLEVBQ3JCLEVBQ0UsSUFBSSxFQUNKLFNBQVMsRUFDVCxJQUFJLEVBQ0osS0FBSyxFQUNMLFVBQVUsRUFDWCxFQUFFO1FBQ0QsSUFBSSxFQUFFLFdBQVcsQ0FBQztRQUNsQixTQUFTLEVBQUUsRUFBRSxDQUFDO1FBQ2QsSUFBSSxFQUFFLEVBQUUsQ0FBQztRQUNULFVBQVUsRUFBRSxFQUFFLEdBQUcsTUFBTSxDQUFDO1FBQ3hCLEtBQUssRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0tBQzNCLEVBQ0QsR0FBRyxHQUFFLEtBQW9CLGlCQWExQjtJQUVLLFdBQVcsQ0FBQyxPQUFPLEVBQUUsWUFBWSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsR0FBRyxHQUFFLEtBQW9CLGlCQUdoRjtJQUVLLGVBQWUsQ0FBQyxPQUFPLEVBQUUsWUFBWSxHQUFHLE1BQU07Ozs7OztPQWNuRDtJQUVLLFlBQVksSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUMsQ0FXckQ7SUFFSyxXQUFXLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDLENBU3BEO0lBb0JLLGFBQWEsQ0FBQyxPQUFPLEVBQUUsWUFBWSxpQkFheEM7Q0FDRiJ9
35
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2FsbGV0X2RiLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZW1iZWRkZWQvd2FsbGV0X2RiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3RELE9BQU8sRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFDeEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTNELGVBQU8sTUFBTSxZQUFZLDBEQUEyRCxDQUFDO0FBQ3JGLE1BQU0sTUFBTSxXQUFXLEdBQUcsQ0FBQyxPQUFPLFlBQVksQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBTXhELHFCQUFhLFFBQVE7O0lBS2pCLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLE9BQU87SUFMakIsT0FBTyxDQUFDLFFBQVEsQ0FBZ0M7SUFDaEQsT0FBTyxDQUFDLE9BQU8sQ0FBZ0M7SUFFL0MsWUFDVSxLQUFLLEVBQUUsaUJBQWlCLEVBQ3hCLE9BQU8sRUFBRSxLQUFLLEVBSXZCO0lBRUssWUFBWSxDQUNoQixPQUFPLEVBQUUsWUFBWSxFQUNyQixFQUNFLElBQUksRUFDSixTQUFTLEVBQ1QsSUFBSSxFQUNKLEtBQUssRUFDTCxVQUFVLEVBQ1gsRUFBRTtRQUNELElBQUksRUFBRSxXQUFXLENBQUM7UUFDbEIsU0FBUyxFQUFFLEVBQUUsQ0FBQztRQUNkLElBQUksRUFBRSxFQUFFLENBQUM7UUFDVCxVQUFVLEVBQUUsRUFBRSxHQUFHLE1BQU0sQ0FBQztRQUN4QixLQUFLLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztLQUMzQixFQUNELEdBQUcsR0FBRSxLQUFvQixpQkFhMUI7SUFFSyxXQUFXLENBQUMsT0FBTyxFQUFFLFlBQVksRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEdBQUcsR0FBRSxLQUFvQixpQkFHaEY7SUFFSyxlQUFlLENBQUMsT0FBTyxFQUFFLFlBQVksR0FBRyxNQUFNOzs7Ozs7T0FjbkQ7SUFFSyxZQUFZLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDLENBV3JEO0lBRUssV0FBVyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLEVBQUUsQ0FBQyxDQVNwRDtJQW9CSyxhQUFhLENBQUMsT0FBTyxFQUFFLFlBQVksaUJBYXhDO0lBRUssS0FBSyxrQkFFVjtDQUNGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"wallet_db.d.ts","sourceRoot":"","sources":["../../src/embedded/wallet_db.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,eAAO,MAAM,YAAY,0DAA2D,CAAC;AACrF,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAMxD,qBAAa,QAAQ;;IAEjB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IAHjB,OAAO,eAIH;IAEJ,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,KAAK,YAInD;IAEK,YAAY,CAChB,OAAO,EAAE,YAAY,EACrB,EACE,IAAI,EACJ,SAAS,EACT,IAAI,EACJ,KAAK,EACL,UAAU,EACX,EAAE;QACD,IAAI,EAAE,WAAW,CAAC;QAClB,SAAS,EAAE,EAAE,CAAC;QACd,IAAI,EAAE,EAAE,CAAC;QACT,UAAU,EAAE,EAAE,GAAG,MAAM,CAAC;QACxB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;KAC3B,EACD,GAAG,GAAE,KAAoB,iBAa1B;IAEK,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,GAAE,KAAoB,iBAGhF;IAEK,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM;;;;;;OAcnD;IAEK,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAWrD;IAEK,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CASpD;IAoBK,aAAa,CAAC,OAAO,EAAE,YAAY,iBAaxC;CACF"}
1
+ {"version":3,"file":"wallet_db.d.ts","sourceRoot":"","sources":["../../src/embedded/wallet_db.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,eAAO,MAAM,YAAY,0DAA2D,CAAC;AACrF,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAMxD,qBAAa,QAAQ;;IAKjB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,OAAO;IALjB,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,OAAO,CAAgC;IAE/C,YACU,KAAK,EAAE,iBAAiB,EACxB,OAAO,EAAE,KAAK,EAIvB;IAEK,YAAY,CAChB,OAAO,EAAE,YAAY,EACrB,EACE,IAAI,EACJ,SAAS,EACT,IAAI,EACJ,KAAK,EACL,UAAU,EACX,EAAE;QACD,IAAI,EAAE,WAAW,CAAC;QAClB,SAAS,EAAE,EAAE,CAAC;QACd,IAAI,EAAE,EAAE,CAAC;QACT,UAAU,EAAE,EAAE,GAAG,MAAM,CAAC;QACxB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;KAC3B,EACD,GAAG,GAAE,KAAoB,iBAa1B;IAEK,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,GAAE,KAAoB,iBAGhF;IAEK,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM;;;;;;OAcnD;IAEK,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAWrD;IAEK,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CASpD;IAoBK,aAAa,CAAC,OAAO,EAAE,YAAY,iBAaxC;IAEK,KAAK,kBAEV;CACF"}
@@ -9,18 +9,15 @@ function accountKey(field, address) {
9
9
  return `${field}:${address.toString()}`;
10
10
  }
11
11
  export class WalletDB {
12
+ store;
13
+ userLog;
12
14
  accounts;
13
15
  aliases;
14
- userLog;
15
- constructor(accounts, aliases, userLog){
16
- this.accounts = accounts;
17
- this.aliases = aliases;
16
+ constructor(store, userLog){
17
+ this.store = store;
18
18
  this.userLog = userLog;
19
- }
20
- static init(store, userLog) {
21
- const accounts = store.openMap('accounts');
22
- const aliases = store.openMap('aliases');
23
- return new WalletDB(accounts, aliases, userLog);
19
+ this.accounts = store.openMap('accounts');
20
+ this.aliases = store.openMap('aliases');
24
21
  }
25
22
  async storeAccount(address, { type, secretKey, salt, alias, signingKey }, log = this.userLog) {
26
23
  if (alias) {
@@ -117,4 +114,7 @@ export class WalletDB {
117
114
  await this.aliases.delete(`accounts:${alias}`);
118
115
  }
119
116
  }
117
+ async close() {
118
+ await this.store.close();
119
+ }
120
120
  }
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.ffe5b04ea",
4
+ "version": "0.0.1-private.3d175340d2",
5
5
  "type": "module",
6
6
  "exports": {
7
7
  "./embedded": {
@@ -14,6 +14,7 @@
14
14
  "default": "./dest/embedded/entrypoints/node.js"
15
15
  }
16
16
  },
17
+ "./embedded/store-encryption": "./dest/embedded/store_encryption.js",
17
18
  "./testing": "./dest/testing.js"
18
19
  },
19
20
  "scripts": {
@@ -27,15 +28,16 @@
27
28
  "../package.common.json"
28
29
  ],
29
30
  "dependencies": {
30
- "@aztec/accounts": "0.0.1-commit.ffe5b04ea",
31
- "@aztec/aztec.js": "0.0.1-commit.ffe5b04ea",
32
- "@aztec/entrypoints": "0.0.1-commit.ffe5b04ea",
33
- "@aztec/foundation": "0.0.1-commit.ffe5b04ea",
34
- "@aztec/kv-store": "0.0.1-commit.ffe5b04ea",
35
- "@aztec/protocol-contracts": "0.0.1-commit.ffe5b04ea",
36
- "@aztec/pxe": "0.0.1-commit.ffe5b04ea",
37
- "@aztec/stdlib": "0.0.1-commit.ffe5b04ea",
38
- "@aztec/wallet-sdk": "0.0.1-commit.ffe5b04ea"
31
+ "@aztec/accounts": "0.0.1-private.3d175340d2",
32
+ "@aztec/aztec.js": "0.0.1-private.3d175340d2",
33
+ "@aztec/entrypoints": "0.0.1-private.3d175340d2",
34
+ "@aztec/foundation": "0.0.1-private.3d175340d2",
35
+ "@aztec/kv-store": "0.0.1-private.3d175340d2",
36
+ "@aztec/protocol-contracts": "0.0.1-private.3d175340d2",
37
+ "@aztec/pxe": "0.0.1-private.3d175340d2",
38
+ "@aztec/standard-contracts": "0.0.1-private.3d175340d2",
39
+ "@aztec/stdlib": "0.0.1-private.3d175340d2",
40
+ "@aztec/wallet-sdk": "0.0.1-private.3d175340d2"
39
41
  },
40
42
  "devDependencies": {
41
43
  "@jest/globals": "^30.0.0",
@@ -46,6 +48,7 @@
46
48
  },
47
49
  "typedocOptions": {
48
50
  "entryPoints": [
51
+ "./src/embedded/entrypoints/browser.ts",
49
52
  "./src/embedded/entrypoints/node.ts",
50
53
  "./src/testing.ts"
51
54
  ],
@@ -1,12 +1,13 @@
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
- import { getCanonicalMultiCallEntrypoint } from '@aztec/protocol-contracts/multi-call-entrypoint';
7
7
  import type { ContractArtifact } from '@aztec/stdlib/abi';
8
- import type { CompleteAddress, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
8
+ import type { CompleteAddress } from '@aztec/stdlib/contract';
9
9
 
10
+ import type { AccountType } from '../wallet_db.js';
10
11
  import type { AccountContractsProvider } from './types.js';
11
12
 
12
13
  /**
@@ -26,15 +27,11 @@ export class BundleAccountContractsProvider implements AccountContractsProvider
26
27
  return Promise.resolve(new EcdsaKAccountContract(signingKey));
27
28
  }
28
29
 
29
- getStubAccountContractArtifact(): Promise<ContractArtifact> {
30
- return Promise.resolve(StubAccountContractArtifact);
30
+ getStubAccountContractArtifact(type: AccountType): Promise<ContractArtifact> {
31
+ return Promise.resolve(type === 'schnorr' ? StubSchnorrAccountContractArtifact : StubEcdsaAccountContractArtifact);
31
32
  }
32
33
 
33
- createStubAccount(address: CompleteAddress): Promise<Account> {
34
- return Promise.resolve(createStubAccount(address));
35
- }
36
-
37
- getMulticallContract(): Promise<{ instance: ContractInstanceWithAddress; artifact: ContractArtifact }> {
38
- return getCanonicalMultiCallEntrypoint();
34
+ createStubAccount(address: CompleteAddress, type: AccountType): Promise<Account> {
35
+ return Promise.resolve(type === 'schnorr' ? createStubSchnorrAccount(address) : createStubEcdsaAccount(address));
39
36
  }
40
37
  }
@@ -1,9 +1,9 @@
1
1
  import type { Account, AccountContract } from '@aztec/aztec.js/account';
2
2
  import type { Fq } from '@aztec/foundation/curves/bn254';
3
- import { getCanonicalMultiCallEntrypoint } from '@aztec/protocol-contracts/multi-call-entrypoint/lazy';
4
3
  import type { ContractArtifact } from '@aztec/stdlib/abi';
5
- import type { CompleteAddress, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
4
+ import type { CompleteAddress } from '@aztec/stdlib/contract';
6
5
 
6
+ import type { AccountType } from '../wallet_db.js';
7
7
  import type { AccountContractsProvider } from './types.js';
8
8
 
9
9
  /**
@@ -26,17 +26,23 @@ export class LazyAccountContractsProvider implements AccountContractsProvider {
26
26
  return new EcdsaKAccountContract(signingKey);
27
27
  }
28
28
 
29
- async getStubAccountContractArtifact(): Promise<ContractArtifact> {
30
- const { getStubAccountContractArtifact } = await import('@aztec/accounts/stub/lazy');
31
- return getStubAccountContractArtifact();
29
+ async getStubAccountContractArtifact(type: AccountType): Promise<ContractArtifact> {
30
+ if (type === 'schnorr') {
31
+ const { getStubSchnorrAccountContractArtifact } = await import('@aztec/accounts/stub/schnorr/lazy');
32
+ return getStubSchnorrAccountContractArtifact();
33
+ } else {
34
+ const { getStubEcdsaAccountContractArtifact } = await import('@aztec/accounts/stub/ecdsa/lazy');
35
+ return getStubEcdsaAccountContractArtifact();
36
+ }
32
37
  }
33
38
 
34
- async createStubAccount(address: CompleteAddress): Promise<Account> {
35
- const { createStubAccount } = await import('@aztec/accounts/stub/lazy');
36
- return createStubAccount(address);
37
- }
38
-
39
- getMulticallContract(): Promise<{ instance: ContractInstanceWithAddress; artifact: ContractArtifact }> {
40
- return getCanonicalMultiCallEntrypoint();
39
+ async createStubAccount(address: CompleteAddress, type: AccountType): Promise<Account> {
40
+ if (type === 'schnorr') {
41
+ const { createStubSchnorrAccount } = await import('@aztec/accounts/stub/schnorr/lazy');
42
+ return createStubSchnorrAccount(address);
43
+ } else {
44
+ const { createStubEcdsaAccount } = await import('@aztec/accounts/stub/ecdsa/lazy');
45
+ return createStubEcdsaAccount(address);
46
+ }
41
47
  }
42
48
  }
@@ -1,7 +1,9 @@
1
1
  import type { Account, AccountContract } from '@aztec/aztec.js/account';
2
2
  import type { Fq } from '@aztec/foundation/curves/bn254';
3
3
  import type { ContractArtifact } from '@aztec/stdlib/abi';
4
- import type { CompleteAddress, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
4
+ import type { CompleteAddress } from '@aztec/stdlib/contract';
5
+
6
+ import type { AccountType } from '../wallet_db.js';
5
7
 
6
8
  /**
7
9
  * Provides account contract implementations and stub accounts for the EmbeddedWallet.
@@ -13,7 +15,6 @@ 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>;
17
- getMulticallContract(): Promise<{ instance: ContractInstanceWithAddress; artifact: ContractArtifact }>;
18
- createStubAccount(address: CompleteAddress): Promise<Account>;
18
+ getStubAccountContractArtifact(type: AccountType): Promise<ContractArtifact>;
19
+ createStubAccount(address: CompleteAddress, type: AccountType): Promise<Account>;
19
20
  }