@aztec/key-store 0.76.4 → 0.77.0-testnet-ignition.17

package/dest/index.js

@@ -1,2 +1 @@
 export * from './key_store.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxnQkFBZ0IsQ0FBQyJ9

package/dest/key_store.d.ts

@@ -1,7 +1,10 @@
-import { type PublicKey } from '@aztec/circuit-types';
-import { AztecAddress, CompleteAddress, Fr, GrumpkinScalar, type KeyPrefix, KeyValidationRequest, type PartialAddress } from '@aztec/circuits.js';
+import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
 import { type Bufferable } from '@aztec/foundation/serialize';
-import { type AztecAsyncKVStore } from '@aztec/kv-store';
+import type { AztecAsyncKVStore } from '@aztec/kv-store';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { CompleteAddress, type PartialAddress } from '@aztec/stdlib/contract';
+import { KeyValidationRequest } from '@aztec/stdlib/kernel';
+import { type KeyPrefix, type PublicKey } from '@aztec/stdlib/keys';
 /**
  * Used for managing keys. Can hold keys of multiple accounts.
  */

package/dest/key_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"key_store.d.ts","sourceRoot":"","sources":["../src/key_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EACL,YAAY,EACZ,eAAe,EACf,EAAE,EAEF,cAAc,EAEd,KAAK,SAAS,EACd,oBAAoB,EACpB,KAAK,cAAc,EAKpB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,UAAU,EAAqB,MAAM,6BAA6B,CAAC;AACjF,OAAO,EAAE,KAAK,iBAAiB,EAAsB,MAAM,iBAAiB,CAAC;AAE7E;;GAEG;AACH,qBAAa,QAAQ;;gBAGP,QAAQ,EAAE,iBAAiB;IAIvC;;;OAGG;IACI,aAAa,IAAI,OAAO,CAAC,eAAe,CAAC;IAMhD;;;;;OAKG;IACU,UAAU,CAAC,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;IAsCzF;;;OAGG;IACU,WAAW,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAOnD;;;;;;OAMG;IACU,uBAAuB,CAAC,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAuC/G;;;;;OAKG;IACU,2BAA2B,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC;IAUnF;;;;;OAKG;IACU,iCAAiC,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC;IAUzF;;;;;OAKG;IACU,iCAAiC,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC;IAUzF;;;;;OAKG;IACU,yBAAyB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC;IAUjF;;;;;OAKG;IACU,iCAAiC,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC;IAU9F;;;;;;OAMG;IACU,8BAA8B,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC;IAelG;;;;;;OAMG;IACU,kBAAkB,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC;IAmBxE;;;;;OAKG;IACU,sBAAsB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;CAe3F"}
+{"version":3,"file":"key_store.d.ts","sourceRoot":"","sources":["../src/key_store.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,cAAc,EAAS,MAAM,0BAA0B,CAAC;AAErE,OAAO,EAAE,KAAK,UAAU,EAAqB,MAAM,6BAA6B,CAAC;AACjF,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,SAAS,EAIf,MAAM,oBAAoB,CAAC;AAE5B;;GAEG;AACH,qBAAa,QAAQ;;gBAGP,QAAQ,EAAE,iBAAiB;IAIvC;;;OAGG;IACI,aAAa,IAAI,OAAO,CAAC,eAAe,CAAC;IAMhD;;;;;OAKG;IACU,UAAU,CAAC,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;IAsCzF;;;OAGG;IACU,WAAW,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAOnD;;;;;;OAMG;IACU,uBAAuB,CAAC,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAuC/G;;;;;OAKG;IACU,2BAA2B,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC;IAUnF;;;;;OAKG;IACU,iCAAiC,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC;IAUzF;;;;;OAKG;IACU,iCAAiC,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC;IAUzF;;;;;OAKG;IACU,yBAAyB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC;IAUjF;;;;;OAKG;IACU,iCAAiC,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC;IAU9F;;;;;;OAMG;IACU,8BAA8B,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC;IAelG;;;;;;OAMG;IACU,kBAAkB,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC;IAmBxE;;;;;OAKG;IACU,sBAAsB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;CAe3F"}

package/dest/key_store.js

@@ -1,79 +1,77 @@
-var _KeyStore_keys;
-import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
-import { AztecAddress, CompleteAddress, Fr, GeneratorIndex, GrumpkinScalar, KEY_PREFIXES, KeyValidationRequest, Point, computeAppSecretKey, deriveKeys, derivePublicKeyFromSecretKey, } from '@aztec/circuits.js';
+import { GeneratorIndex } from '@aztec/constants';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
+import { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields';
 import { toArray } from '@aztec/foundation/iterable';
 import { serializeToBuffer } from '@aztec/foundation/serialize';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { CompleteAddress } from '@aztec/stdlib/contract';
+import { KeyValidationRequest } from '@aztec/stdlib/kernel';
+import { KEY_PREFIXES, computeAppSecretKey, deriveKeys, derivePublicKeyFromSecretKey } from '@aztec/stdlib/keys';
 /**
  * Used for managing keys. Can hold keys of multiple accounts.
- */
-export class KeyStore {
-    constructor(database) {
-        _KeyStore_keys.set(this, void 0);
-        __classPrivateFieldSet(this, _KeyStore_keys, database.openMap('key_store'), "f");
+ */ export class KeyStore {
+    #keys;
+    constructor(database){
+        this.#keys = database.openMap('key_store');
     }
     /**
-     * Creates a new account from a randomly generated secret key.
-     * @returns A promise that resolves to the newly created account's CompleteAddress.
-     */
-    createAccount() {
+   * Creates a new account from a randomly generated secret key.
+   * @returns A promise that resolves to the newly created account's CompleteAddress.
+   */ createAccount() {
         const sk = Fr.random();
         const partialAddress = Fr.random();
         return this.addAccount(sk, partialAddress);
     }
     /**
-     * Adds an account to the key store from the provided secret key.
-     * @param sk - The secret key of the account.
-     * @param partialAddress - The partial address of the account.
-     * @returns The account's complete address.
-     */
-    async addAccount(sk, partialAddress) {
-        const { masterNullifierSecretKey, masterIncomingViewingSecretKey, masterOutgoingViewingSecretKey, masterTaggingSecretKey, publicKeys, } = await deriveKeys(sk);
+   * Adds an account to the key store from the provided secret key.
+   * @param sk - The secret key of the account.
+   * @param partialAddress - The partial address of the account.
+   * @returns The account's complete address.
+   */ async addAccount(sk, partialAddress) {
+        const { masterNullifierSecretKey, masterIncomingViewingSecretKey, masterOutgoingViewingSecretKey, masterTaggingSecretKey, publicKeys } = await deriveKeys(sk);
         const completeAddress = await CompleteAddress.fromSecretKeyAndPartialAddress(sk, partialAddress);
         const { address: account } = completeAddress;
         // Naming of keys is as follows ${account}-${n/iv/ov/t}${sk/pk}_m
-        await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(`${account.toString()}-ivsk_m`, masterIncomingViewingSecretKey.toBuffer());
-        await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(`${account.toString()}-ovsk_m`, masterOutgoingViewingSecretKey.toBuffer());
-        await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(`${account.toString()}-tsk_m`, masterTaggingSecretKey.toBuffer());
-        await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(`${account.toString()}-nsk_m`, masterNullifierSecretKey.toBuffer());
-        await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(`${account.toString()}-npk_m`, publicKeys.masterNullifierPublicKey.toBuffer());
-        await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(`${account.toString()}-ivpk_m`, publicKeys.masterIncomingViewingPublicKey.toBuffer());
-        await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(`${account.toString()}-ovpk_m`, publicKeys.masterOutgoingViewingPublicKey.toBuffer());
-        await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(`${account.toString()}-tpk_m`, publicKeys.masterTaggingPublicKey.toBuffer());
+        await this.#keys.set(`${account.toString()}-ivsk_m`, masterIncomingViewingSecretKey.toBuffer());
+        await this.#keys.set(`${account.toString()}-ovsk_m`, masterOutgoingViewingSecretKey.toBuffer());
+        await this.#keys.set(`${account.toString()}-tsk_m`, masterTaggingSecretKey.toBuffer());
+        await this.#keys.set(`${account.toString()}-nsk_m`, masterNullifierSecretKey.toBuffer());
+        await this.#keys.set(`${account.toString()}-npk_m`, publicKeys.masterNullifierPublicKey.toBuffer());
+        await this.#keys.set(`${account.toString()}-ivpk_m`, publicKeys.masterIncomingViewingPublicKey.toBuffer());
+        await this.#keys.set(`${account.toString()}-ovpk_m`, publicKeys.masterOutgoingViewingPublicKey.toBuffer());
+        await this.#keys.set(`${account.toString()}-tpk_m`, publicKeys.masterTaggingPublicKey.toBuffer());
         // We store pk_m_hash under `account-{n/iv/ov/t}pk_m_hash` key to be able to obtain address and key prefix
         // using the #getKeyPrefixAndAccount function later on
         const masterNullifierPublicKeyHash = await publicKeys.masterNullifierPublicKey.hash();
-        await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(`${account.toString()}-npk_m_hash`, masterNullifierPublicKeyHash.toBuffer());
+        await this.#keys.set(`${account.toString()}-npk_m_hash`, masterNullifierPublicKeyHash.toBuffer());
         const masterIncomingViewingPublicKeyHash = await publicKeys.masterIncomingViewingPublicKey.hash();
-        await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(`${account.toString()}-ivpk_m_hash`, masterIncomingViewingPublicKeyHash.toBuffer());
+        await this.#keys.set(`${account.toString()}-ivpk_m_hash`, masterIncomingViewingPublicKeyHash.toBuffer());
         const masterOutgoingViewingPublicKeyHash = await publicKeys.masterOutgoingViewingPublicKey.hash();
-        await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(`${account.toString()}-ovpk_m_hash`, masterOutgoingViewingPublicKeyHash.toBuffer());
+        await this.#keys.set(`${account.toString()}-ovpk_m_hash`, masterOutgoingViewingPublicKeyHash.toBuffer());
         const masterTaggingPublicKeyHash = await publicKeys.masterTaggingPublicKey.hash();
-        await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(`${account.toString()}-tpk_m_hash`, masterTaggingPublicKeyHash.toBuffer());
+        await this.#keys.set(`${account.toString()}-tpk_m_hash`, masterTaggingPublicKeyHash.toBuffer());
         // At last, we return the newly derived account address
         return completeAddress;
     }
     /**
-     * Retrieves addresses of accounts stored in the key store.
-     * @returns A Promise that resolves to an array of account addresses.
-     */
-    async getAccounts() {
-        const allMapKeys = await toArray(__classPrivateFieldGet(this, _KeyStore_keys, "f").keysAsync());
+   * Retrieves addresses of accounts stored in the key store.
+   * @returns A Promise that resolves to an array of account addresses.
+   */ async getAccounts() {
+        const allMapKeys = await toArray(this.#keys.keysAsync());
         // We return account addresses based on the map keys that end with '-ivsk_m'
-        const accounts = allMapKeys.filter(key => key.endsWith('-ivsk_m')).map(key => key.split('-')[0]);
-        return accounts.map(account => AztecAddress.fromString(account));
+        const accounts = allMapKeys.filter((key)=>key.endsWith('-ivsk_m')).map((key)=>key.split('-')[0]);
+        return accounts.map((account)=>AztecAddress.fromString(account));
     }
     /**
-     * Gets the key validation request for a given master public key hash and contract address.
-     * @throws If the account corresponding to the master public key hash does not exist in the key store.
-     * @param pkMHash - The master public key hash.
-     * @param contractAddress - The contract address to silo the secret key in the key validation request with.
-     * @returns The key validation request.
-     */
-    async getKeyValidationRequest(pkMHash, contractAddress) {
+   * Gets the key validation request for a given master public key hash and contract address.
+   * @throws If the account corresponding to the master public key hash does not exist in the key store.
+   * @param pkMHash - The master public key hash.
+   * @param contractAddress - The contract address to silo the secret key in the key validation request with.
+   * @returns The key validation request.
+   */ async getKeyValidationRequest(pkMHash, contractAddress) {
         const [keyPrefix, account] = await this.getKeyPrefixAndAccount(pkMHash);
         // Now we find the master public key for the account
-        const pkMBuffer = await __classPrivateFieldGet(this, _KeyStore_keys, "f").getAsync(`${account.toString()}-${keyPrefix}pk_m`);
+        const pkMBuffer = await this.#keys.getAsync(`${account.toString()}-${keyPrefix}pk_m`);
         if (!pkMBuffer) {
             throw new Error(`Could not find ${keyPrefix}pk_m for account ${account.toString()} whose address was successfully obtained with ${keyPrefix}pk_m_hash ${pkMHash.toString()}.`);
         }
@@ -83,7 +81,7 @@ export class KeyStore {
             throw new Error(`Could not find ${keyPrefix}pkM for ${keyPrefix}pk_m_hash ${pkMHash.toString()}.`);
         }
         // Now we find the secret key for the public key
-        const skMBuffer = await __classPrivateFieldGet(this, _KeyStore_keys, "f").getAsync(`${account.toString()}-${keyPrefix}sk_m`);
+        const skMBuffer = await this.#keys.getAsync(`${account.toString()}-${keyPrefix}sk_m`);
         if (!skMBuffer) {
             throw new Error(`Could not find ${keyPrefix}sk_m for account ${account.toString()} whose address was successfully obtained with ${keyPrefix}pk_m_hash ${pkMHash.toString()}.`);
         }
@@ -98,95 +96,92 @@ export class KeyStore {
         return new KeyValidationRequest(pkM, skApp);
     }
     /**
-     * Gets the master nullifier public key for a given account.
-     * @throws If the account does not exist in the key store.
-     * @param account - The account address for which to retrieve the master nullifier public key.
-     * @returns The master nullifier public key for the account.
-     */
-    async getMasterNullifierPublicKey(account) {
-        const masterNullifierPublicKeyBuffer = await __classPrivateFieldGet(this, _KeyStore_keys, "f").getAsync(`${account.toString()}-npk_m`);
+   * Gets the master nullifier public key for a given account.
+   * @throws If the account does not exist in the key store.
+   * @param account - The account address for which to retrieve the master nullifier public key.
+   * @returns The master nullifier public key for the account.
+   */ async getMasterNullifierPublicKey(account) {
+        const masterNullifierPublicKeyBuffer = await this.#keys.getAsync(`${account.toString()}-npk_m`);
         if (!masterNullifierPublicKeyBuffer) {
             throw new Error(`Account ${account.toString()} does not exist. Registered accounts: ${await this.getAccounts()}.`);
         }
         return Point.fromBuffer(masterNullifierPublicKeyBuffer);
     }
     /**
-     * Gets the master incoming viewing public key for a given account.
-     * @throws If the account does not exist in the key store.
-     * @param account - The account address for which to retrieve the master incoming viewing public key.
-     * @returns The master incoming viewing public key for the account.
-     */
-    async getMasterIncomingViewingPublicKey(account) {
-        const masterIncomingViewingPublicKeyBuffer = await __classPrivateFieldGet(this, _KeyStore_keys, "f").getAsync(`${account.toString()}-ivpk_m`);
+   * Gets the master incoming viewing public key for a given account.
+   * @throws If the account does not exist in the key store.
+   * @param account - The account address for which to retrieve the master incoming viewing public key.
+   * @returns The master incoming viewing public key for the account.
+   */ async getMasterIncomingViewingPublicKey(account) {
+        const masterIncomingViewingPublicKeyBuffer = await this.#keys.getAsync(`${account.toString()}-ivpk_m`);
         if (!masterIncomingViewingPublicKeyBuffer) {
             throw new Error(`Account ${account.toString()} does not exist. Registered accounts: ${await this.getAccounts()}.`);
         }
         return Point.fromBuffer(masterIncomingViewingPublicKeyBuffer);
     }
     /**
-     * Retrieves the master outgoing viewing public key.
-     * @throws If the account does not exist in the key store.
-     * @param account - The account to retrieve the master outgoing viewing key for.
-     * @returns A Promise that resolves to the master outgoing viewing key.
-     */
-    async getMasterOutgoingViewingPublicKey(account) {
-        const masterOutgoingViewingPublicKeyBuffer = await __classPrivateFieldGet(this, _KeyStore_keys, "f").getAsync(`${account.toString()}-ovpk_m`);
+   * Retrieves the master outgoing viewing public key.
+   * @throws If the account does not exist in the key store.
+   * @param account - The account to retrieve the master outgoing viewing key for.
+   * @returns A Promise that resolves to the master outgoing viewing key.
+   */ async getMasterOutgoingViewingPublicKey(account) {
+        const masterOutgoingViewingPublicKeyBuffer = await this.#keys.getAsync(`${account.toString()}-ovpk_m`);
         if (!masterOutgoingViewingPublicKeyBuffer) {
             throw new Error(`Account ${account.toString()} does not exist. Registered accounts: ${await this.getAccounts()}.`);
         }
         return Point.fromBuffer(masterOutgoingViewingPublicKeyBuffer);
     }
     /**
-     * Retrieves the master tagging public key.
-     * @throws If the account does not exist in the key store.
-     * @param account - The account to retrieve the master tagging key for.
-     * @returns A Promise that resolves to the master tagging key.
-     */
-    async getMasterTaggingPublicKey(account) {
-        const masterTaggingPublicKeyBuffer = await __classPrivateFieldGet(this, _KeyStore_keys, "f").getAsync(`${account.toString()}-tpk_m`);
+   * Retrieves the master tagging public key.
+   * @throws If the account does not exist in the key store.
+   * @param account - The account to retrieve the master tagging key for.
+   * @returns A Promise that resolves to the master tagging key.
+   */ async getMasterTaggingPublicKey(account) {
+        const masterTaggingPublicKeyBuffer = await this.#keys.getAsync(`${account.toString()}-tpk_m`);
         if (!masterTaggingPublicKeyBuffer) {
             throw new Error(`Account ${account.toString()} does not exist. Registered accounts: ${await this.getAccounts()}.`);
         }
         return Point.fromBuffer(masterTaggingPublicKeyBuffer);
     }
     /**
-     * Retrieves master incoming viewing secret key.
-     * @throws If the account does not exist in the key store.
-     * @param account - The account to retrieve the master incoming viewing secret key for.
-     * @returns A Promise that resolves to the master incoming viewing secret key.
-     */
-    async getMasterIncomingViewingSecretKey(account) {
-        const masterIncomingViewingSecretKeyBuffer = await __classPrivateFieldGet(this, _KeyStore_keys, "f").getAsync(`${account.toString()}-ivsk_m`);
+   * Retrieves master incoming viewing secret key.
+   * @throws If the account does not exist in the key store.
+   * @param account - The account to retrieve the master incoming viewing secret key for.
+   * @returns A Promise that resolves to the master incoming viewing secret key.
+   */ async getMasterIncomingViewingSecretKey(account) {
+        const masterIncomingViewingSecretKeyBuffer = await this.#keys.getAsync(`${account.toString()}-ivsk_m`);
         if (!masterIncomingViewingSecretKeyBuffer) {
             throw new Error(`Account ${account.toString()} does not exist. Registered accounts: ${await this.getAccounts()}.`);
         }
         return GrumpkinScalar.fromBuffer(masterIncomingViewingSecretKeyBuffer);
     }
     /**
-     * Retrieves application outgoing viewing secret key.
-     * @throws If the account does not exist in the key store.
-     * @param account - The account to retrieve the application outgoing viewing secret key for.
-     * @param app - The application address to retrieve the outgoing viewing secret key for.
-     * @returns A Promise that resolves to the application outgoing viewing secret key.
-     */
-    async getAppOutgoingViewingSecretKey(account, app) {
-        const masterOutgoingViewingSecretKeyBuffer = await __classPrivateFieldGet(this, _KeyStore_keys, "f").getAsync(`${account.toString()}-ovsk_m`);
+   * Retrieves application outgoing viewing secret key.
+   * @throws If the account does not exist in the key store.
+   * @param account - The account to retrieve the application outgoing viewing secret key for.
+   * @param app - The application address to retrieve the outgoing viewing secret key for.
+   * @returns A Promise that resolves to the application outgoing viewing secret key.
+   */ async getAppOutgoingViewingSecretKey(account, app) {
+        const masterOutgoingViewingSecretKeyBuffer = await this.#keys.getAsync(`${account.toString()}-ovsk_m`);
         if (!masterOutgoingViewingSecretKeyBuffer) {
             throw new Error(`Account ${account.toString()} does not exist. Registered accounts: ${await this.getAccounts()}.`);
         }
         const masterOutgoingViewingSecretKey = GrumpkinScalar.fromBuffer(masterOutgoingViewingSecretKeyBuffer);
-        return poseidon2HashWithSeparator([masterOutgoingViewingSecretKey.hi, masterOutgoingViewingSecretKey.lo, app], GeneratorIndex.OVSK_M);
+        return poseidon2HashWithSeparator([
+            masterOutgoingViewingSecretKey.hi,
+            masterOutgoingViewingSecretKey.lo,
+            app
+        ], GeneratorIndex.OVSK_M);
     }
     /**
-     * Retrieves the sk_m corresponding to the pk_m.
-     * @throws If the provided public key is not associated with any of the registered accounts.
-     * @param pkM - The master public key to get secret key for.
-     * @returns A Promise that resolves to sk_m.
-     * @dev Used when feeding the sk_m to the kernel circuit for keys verification.
-     */
-    async getMasterSecretKey(pkM) {
+   * Retrieves the sk_m corresponding to the pk_m.
+   * @throws If the provided public key is not associated with any of the registered accounts.
+   * @param pkM - The master public key to get secret key for.
+   * @returns A Promise that resolves to sk_m.
+   * @dev Used when feeding the sk_m to the kernel circuit for keys verification.
+   */ async getMasterSecretKey(pkM) {
         const [keyPrefix, account] = await this.getKeyPrefixAndAccount(pkM);
-        const secretKeyBuffer = await __classPrivateFieldGet(this, _KeyStore_keys, "f").getAsync(`${account.toString()}-${keyPrefix}sk_m`);
+        const secretKeyBuffer = await this.#keys.getAsync(`${account.toString()}-${keyPrefix}sk_m`);
         if (!secretKeyBuffer) {
             throw new Error(`Could not find ${keyPrefix}sk_m for ${keyPrefix}pk_m ${pkM.toString()}. This should not happen.`);
         }
@@ -198,20 +193,22 @@ export class KeyStore {
         return Promise.resolve(skM);
     }
     /**
-     * Gets the key prefix and account address for a given value.
-     * @returns A tuple containing the key prefix and account address.
-     * @dev Note that this is quite inefficient but it should not matter because there should never be too many keys
-     * in the key store.
-     */
-    async getKeyPrefixAndAccount(value) {
+   * Gets the key prefix and account address for a given value.
+   * @returns A tuple containing the key prefix and account address.
+   * @dev Note that this is quite inefficient but it should not matter because there should never be too many keys
+   * in the key store.
+   */ async getKeyPrefixAndAccount(value) {
         const valueBuffer = serializeToBuffer(value);
-        for await (const [key, val] of __classPrivateFieldGet(this, _KeyStore_keys, "f").entriesAsync()) {
+        for await (const [key, val] of this.#keys.entriesAsync()){
             // Browser returns Uint8Array, Node.js returns Buffer
             if (Buffer.from(val).equals(valueBuffer)) {
-                for (const prefix of KEY_PREFIXES) {
+                for (const prefix of KEY_PREFIXES){
                     if (key.includes(`-${prefix}`)) {
                         const account = AztecAddress.fromString(key.split('-')[0]);
-                        return [prefix, account];
+                        return [
+                            prefix,
+                            account
+                        ];
                     }
                 }
             }
@@ -219,5 +216,3 @@ export class KeyStore {
         throw new Error(`Could not find key prefix.`);
     }
 }
-_KeyStore_keys = new WeakMap();
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"key_store.js","sourceRoot":"","sources":["../src/key_store.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/key-store",
-  "version": "0.76.4",
+  "version": "0.77.0-testnet-ignition.17",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -16,7 +16,7 @@
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
-    "test": "HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16} RAYON_NUM_THREADS=${RAYON_NUM_THREADS:-4} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
     "../package.common.json"
@@ -49,16 +49,16 @@
     "reporters": [
       "default"
     ],
-    "testTimeout": 30000,
+    "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.76.4",
-    "@aztec/circuits.js": "0.76.4",
-    "@aztec/foundation": "0.76.4",
-    "@aztec/kv-store": "0.76.4",
+    "@aztec/constants": "0.77.0-testnet-ignition.17",
+    "@aztec/foundation": "0.77.0-testnet-ignition.17",
+    "@aztec/kv-store": "0.77.0-testnet-ignition.17",
+    "@aztec/stdlib": "0.77.0-testnet-ignition.17",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

package/src/key_store.ts

@@ -1,23 +1,20 @@
-import { type PublicKey } from '@aztec/circuit-types';
+import { GeneratorIndex } from '@aztec/constants';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
+import { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields';
+import { toArray } from '@aztec/foundation/iterable';
+import { type Bufferable, serializeToBuffer } from '@aztec/foundation/serialize';
+import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { CompleteAddress, type PartialAddress } from '@aztec/stdlib/contract';
+import { KeyValidationRequest } from '@aztec/stdlib/kernel';
 import {
-  AztecAddress,
-  CompleteAddress,
-  Fr,
-  GeneratorIndex,
-  GrumpkinScalar,
   KEY_PREFIXES,
   type KeyPrefix,
-  KeyValidationRequest,
-  type PartialAddress,
-  Point,
+  type PublicKey,
   computeAppSecretKey,
   deriveKeys,
   derivePublicKeyFromSecretKey,
-} from '@aztec/circuits.js';
-import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
-import { toArray } from '@aztec/foundation/iterable';
-import { type Bufferable, serializeToBuffer } from '@aztec/foundation/serialize';
-import { type AztecAsyncKVStore, type AztecAsyncMap } from '@aztec/kv-store';
+} from '@aztec/stdlib/keys';
 
 /**
  * Used for managing keys. Can hold keys of multiple accounts.