@aztec/key-store 0.59.0 → 0.61.0

package/dest/key_store.d.ts

@@ -1,5 +1,6 @@
 import { type PublicKey } from '@aztec/circuit-types';
-import { AztecAddress, CompleteAddress, Fr, GrumpkinScalar, KeyValidationRequest, type PartialAddress } from '@aztec/circuits.js';
+import { AztecAddress, CompleteAddress, Fr, GrumpkinScalar, type KeyPrefix, KeyValidationRequest, type PartialAddress } from '@aztec/circuits.js';
+import { type Bufferable } from '@aztec/foundation/serialize';
 import { type AztecKVStore } from '@aztec/kv-store';
 /**
  * Used for managing keys. Can hold keys of multiple accounts.
@@ -32,6 +33,13 @@ export declare class KeyStore {
      * @returns The key validation request.
      */
     getKeyValidationRequest(pkMHash: Fr, contractAddress: AztecAddress): Promise<KeyValidationRequest>;
+    /**
+     * 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.
+     */
+    getMasterNullifierPublicKey(account: AztecAddress): Promise<PublicKey>;
     /**
      * Gets the master incoming viewing public key for a given account.
      * @throws If the account does not exist in the key store.
@@ -54,13 +62,12 @@ export declare class KeyStore {
      */
     getMasterTaggingPublicKey(account: AztecAddress): Promise<PublicKey>;
     /**
-     * Retrieves application incoming viewing secret key.
+     * Retrieves master incoming viewing secret key.
      * @throws If the account does not exist in the key store.
-     * @param account - The account to retrieve the application incoming viewing secret key for.
-     * @param app - The application address to retrieve the incoming viewing secret key for.
-     * @returns A Promise that resolves to the application incoming viewing secret key.
+     * @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.
      */
-    getAppIncomingViewingSecretKey(account: AztecAddress, app: AztecAddress): Promise<Fr>;
+    getMasterIncomingViewingSecretKey(account: AztecAddress): Promise<GrumpkinScalar>;
     /**
      * Retrieves application outgoing viewing secret key.
      * @throws If the account does not exist in the key store.
@@ -77,5 +84,12 @@ export declare class KeyStore {
      * @dev Used when feeding the sk_m to the kernel circuit for keys verification.
      */
     getMasterSecretKey(pkM: PublicKey): Promise<GrumpkinScalar>;
+    /**
+     * 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.
+     */
+    getKeyPrefixAndAccount(value: Bufferable): [KeyPrefix, AztecAddress];
 }
 //# sourceMappingURL=key_store.d.ts.map

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,EAGd,oBAAoB,EACpB,KAAK,cAAc,EAMpB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,iBAAiB,CAAC;AAEnE;;GAEG;AACH,qBAAa,QAAQ;;gBAGP,QAAQ,EAAE,YAAY;IAIlC;;;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;IAwCzF;;;OAGG;IACI,WAAW,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAO7C;;;;;;OAMG;IACI,uBAAuB,CAAC,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAsCzG;;;;;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;;;;;;OAMG;IACU,8BAA8B,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC;IAiBlG;;;;;;OAMG;IACU,8BAA8B,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC;IAiBlG;;;;;;OAMG;IACI,kBAAkB,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC;CAsCnE"}
+{"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;AAE5B,OAAO,EAAE,KAAK,UAAU,EAAqB,MAAM,6BAA6B,CAAC;AACjF,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,iBAAiB,CAAC;AAEnE;;GAEG;AACH,qBAAa,QAAQ;;gBAGP,QAAQ,EAAE,YAAY;IAIlC;;;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;IAwCzF;;;OAGG;IACI,WAAW,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAO7C;;;;;;OAMG;IACI,uBAAuB,CAAC,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAsCzG;;;;;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;IAY9F;;;;;;OAMG;IACU,8BAA8B,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC;IAiBlG;;;;;;OAMG;IACI,kBAAkB,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC;IAkBlE;;;;;OAKG;IACI,sBAAsB,CAAC,KAAK,EAAE,UAAU,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC;CAc5E"}

package/dest/key_store.js

@@ -1,6 +1,6 @@
-var _KeyStore_instances, _KeyStore_keys, _KeyStore_getKeyPrefixAndAccount;
+var _KeyStore_keys;
 import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
-import { AztecAddress, CompleteAddress, Fr, GeneratorIndex, GrumpkinScalar, KEY_PREFIXES, KeyValidationRequest, Point, computeAddress, computeAppSecretKey, deriveKeys, derivePublicKeyFromSecretKey, } from '@aztec/circuits.js';
+import { AztecAddress, CompleteAddress, Fr, GeneratorIndex, GrumpkinScalar, KEY_PREFIXES, KeyValidationRequest, Point, computeAppSecretKey, deriveKeys, derivePublicKeyFromSecretKey, } from '@aztec/circuits.js';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
 import { serializeToBuffer } from '@aztec/foundation/serialize';
 /**
@@ -8,7 +8,6 @@ import { serializeToBuffer } from '@aztec/foundation/serialize';
  */
 export class KeyStore {
     constructor(database) {
-        _KeyStore_instances.add(this);
         _KeyStore_keys.set(this, void 0);
         __classPrivateFieldSet(this, _KeyStore_keys, database.openMap('key_store'), "f");
     }
@@ -29,8 +28,8 @@ export class KeyStore {
      */
     async addAccount(sk, partialAddress) {
         const { masterNullifierSecretKey, masterIncomingViewingSecretKey, masterOutgoingViewingSecretKey, masterTaggingSecretKey, publicKeys, } = deriveKeys(sk);
-        const publicKeysHash = publicKeys.hash();
-        const account = computeAddress(publicKeysHash, partialAddress);
+        const completeAddress = 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());
@@ -47,7 +46,7 @@ export class KeyStore {
         await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(`${account.toString()}-ovpk_m_hash`, publicKeys.masterOutgoingViewingPublicKey.hash().toBuffer());
         await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(`${account.toString()}-tpk_m_hash`, publicKeys.masterTaggingPublicKey.hash().toBuffer());
         // At last, we return the newly derived account address
-        return Promise.resolve(new CompleteAddress(account, publicKeys, partialAddress));
+        return Promise.resolve(completeAddress);
     }
     /**
      * Retrieves addresses of accounts stored in the key store.
@@ -67,7 +66,7 @@ export class KeyStore {
      * @returns The key validation request.
      */
     getKeyValidationRequest(pkMHash, contractAddress) {
-        const [keyPrefix, account] = __classPrivateFieldGet(this, _KeyStore_instances, "m", _KeyStore_getKeyPrefixAndAccount).call(this, pkMHash);
+        const [keyPrefix, account] = this.getKeyPrefixAndAccount(pkMHash);
         // Now we find the master public key for the account
         const pkMBuffer = __classPrivateFieldGet(this, _KeyStore_keys, "f").get(`${account.toString()}-${keyPrefix}pk_m`);
         if (!pkMBuffer) {
@@ -91,6 +90,19 @@ export class KeyStore {
         const skApp = computeAppSecretKey(skM, contractAddress, keyPrefix);
         return Promise.resolve(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 = __classPrivateFieldGet(this, _KeyStore_keys, "f").get(`${account.toString()}-npk_m`);
+        if (!masterNullifierPublicKeyBuffer) {
+            throw new Error(`Account ${account.toString()} does not exist. Registered accounts: ${await this.getAccounts()}.`);
+        }
+        return Promise.resolve(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.
@@ -131,19 +143,18 @@ export class KeyStore {
         return Promise.resolve(Point.fromBuffer(masterTaggingPublicKeyBuffer));
     }
     /**
-     * Retrieves application incoming viewing secret key.
+     * Retrieves master incoming viewing secret key.
      * @throws If the account does not exist in the key store.
-     * @param account - The account to retrieve the application incoming viewing secret key for.
-     * @param app - The application address to retrieve the incoming viewing secret key for.
-     * @returns A Promise that resolves to the application incoming viewing secret key.
+     * @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 getAppIncomingViewingSecretKey(account, app) {
+    async getMasterIncomingViewingSecretKey(account) {
         const masterIncomingViewingSecretKeyBuffer = __classPrivateFieldGet(this, _KeyStore_keys, "f").get(`${account.toString()}-ivsk_m`);
         if (!masterIncomingViewingSecretKeyBuffer) {
             throw new Error(`Account ${account.toString()} does not exist. Registered accounts: ${await this.getAccounts()}.`);
         }
         const masterIncomingViewingSecretKey = GrumpkinScalar.fromBuffer(masterIncomingViewingSecretKeyBuffer);
-        return Promise.resolve(poseidon2HashWithSeparator([masterIncomingViewingSecretKey.hi, masterIncomingViewingSecretKey.lo, app], GeneratorIndex.IVSK_M));
+        return Promise.resolve(masterIncomingViewingSecretKey);
     }
     /**
      * Retrieves application outgoing viewing secret key.
@@ -168,7 +179,7 @@ export class KeyStore {
      * @dev Used when feeding the sk_m to the kernel circuit for keys verification.
      */
     getMasterSecretKey(pkM) {
-        const [keyPrefix, account] = __classPrivateFieldGet(this, _KeyStore_instances, "m", _KeyStore_getKeyPrefixAndAccount).call(this, pkM);
+        const [keyPrefix, account] = this.getKeyPrefixAndAccount(pkM);
         const secretKeyBuffer = __classPrivateFieldGet(this, _KeyStore_keys, "f").get(`${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.`);
@@ -179,19 +190,26 @@ export class KeyStore {
         }
         return Promise.resolve(skM);
     }
-}
-_KeyStore_keys = new WeakMap(), _KeyStore_instances = new WeakSet(), _KeyStore_getKeyPrefixAndAccount = function _KeyStore_getKeyPrefixAndAccount(value) {
-    const valueBuffer = serializeToBuffer(value);
-    for (const [key, val] of __classPrivateFieldGet(this, _KeyStore_keys, "f").entries()) {
-        if (val.equals(valueBuffer)) {
-            for (const prefix of KEY_PREFIXES) {
-                if (key.includes(`-${prefix}`)) {
-                    const account = AztecAddress.fromString(key.split('-')[0]);
-                    return [prefix, account];
+    /**
+     * 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.
+     */
+    getKeyPrefixAndAccount(value) {
+        const valueBuffer = serializeToBuffer(value);
+        for (const [key, val] of __classPrivateFieldGet(this, _KeyStore_keys, "f").entries()) {
+            if (val.equals(valueBuffer)) {
+                for (const prefix of KEY_PREFIXES) {
+                    if (key.includes(`-${prefix}`)) {
+                        const account = AztecAddress.fromString(key.split('-')[0]);
+                        return [prefix, account];
+                    }
                 }
             }
         }
+        throw new Error(`Could not find key prefix.`);
     }
-    throw new Error(`Could not find key prefix.`);
-};
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"key_store.js","sourceRoot":"","sources":["../src/key_store.ts"],"names":[],"mappings":"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"}
+}
+_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.59.0",
+  "version": "0.61.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -56,10 +56,10 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.59.0",
-    "@aztec/circuits.js": "0.59.0",
-    "@aztec/foundation": "0.59.0",
-    "@aztec/kv-store": "0.59.0",
+    "@aztec/circuit-types": "0.61.0",
+    "@aztec/circuits.js": "0.61.0",
+    "@aztec/foundation": "0.61.0",
+    "@aztec/kv-store": "0.61.0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

package/src/key_store.ts

@@ -10,7 +10,6 @@ import {
   KeyValidationRequest,
   type PartialAddress,
   Point,
-  computeAddress,
   computeAppSecretKey,
   deriveKeys,
   derivePublicKeyFromSecretKey,
@@ -54,8 +53,8 @@ export class KeyStore {
       publicKeys,
     } = deriveKeys(sk);
 
-    const publicKeysHash = publicKeys.hash();
-    const account = computeAddress(publicKeysHash, partialAddress);
+    const completeAddress = CompleteAddress.fromSecretKeyAndPartialAddress(sk, partialAddress);
+    const { address: account } = completeAddress;
 
     // Naming of keys is as follows ${account}-${n/iv/ov/t}${sk/pk}_m
     await this.#keys.set(`${account.toString()}-ivsk_m`, masterIncomingViewingSecretKey.toBuffer());
@@ -82,7 +81,7 @@ export class KeyStore {
     await this.#keys.set(`${account.toString()}-tpk_m_hash`, publicKeys.masterTaggingPublicKey.hash().toBuffer());
 
     // At last, we return the newly derived account address
-    return Promise.resolve(new CompleteAddress(account, publicKeys, partialAddress));
+    return Promise.resolve(completeAddress);
   }
 
   /**
@@ -104,7 +103,7 @@ export class KeyStore {
    * @returns The key validation request.
    */
   public getKeyValidationRequest(pkMHash: Fr, contractAddress: AztecAddress): Promise<KeyValidationRequest> {
-    const [keyPrefix, account] = this.#getKeyPrefixAndAccount(pkMHash);
+    const [keyPrefix, account] = this.getKeyPrefixAndAccount(pkMHash);
 
     // Now we find the master public key for the account
     const pkMBuffer = this.#keys.get(`${account.toString()}-${keyPrefix}pk_m`);
@@ -141,6 +140,22 @@ export class KeyStore {
     return Promise.resolve(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.
+   */
+  public async getMasterNullifierPublicKey(account: AztecAddress): Promise<PublicKey> {
+    const masterNullifierPublicKeyBuffer = this.#keys.get(`${account.toString()}-npk_m`);
+    if (!masterNullifierPublicKeyBuffer) {
+      throw new Error(
+        `Account ${account.toString()} does not exist. Registered accounts: ${await this.getAccounts()}.`,
+      );
+    }
+    return Promise.resolve(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.
@@ -190,13 +205,12 @@ export class KeyStore {
   }
 
   /**
-   * Retrieves application incoming viewing secret key.
+   * Retrieves master incoming viewing secret key.
    * @throws If the account does not exist in the key store.
-   * @param account - The account to retrieve the application incoming viewing secret key for.
-   * @param app - The application address to retrieve the incoming viewing secret key for.
-   * @returns A Promise that resolves to the application incoming viewing secret key.
+   * @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.
    */
-  public async getAppIncomingViewingSecretKey(account: AztecAddress, app: AztecAddress): Promise<Fr> {
+  public async getMasterIncomingViewingSecretKey(account: AztecAddress): Promise<GrumpkinScalar> {
     const masterIncomingViewingSecretKeyBuffer = this.#keys.get(`${account.toString()}-ivsk_m`);
     if (!masterIncomingViewingSecretKeyBuffer) {
       throw new Error(
@@ -205,12 +219,7 @@ export class KeyStore {
     }
     const masterIncomingViewingSecretKey = GrumpkinScalar.fromBuffer(masterIncomingViewingSecretKeyBuffer);
 
-    return Promise.resolve(
-      poseidon2HashWithSeparator(
-        [masterIncomingViewingSecretKey.hi, masterIncomingViewingSecretKey.lo, app],
-        GeneratorIndex.IVSK_M,
-      ),
-    );
+    return Promise.resolve(masterIncomingViewingSecretKey);
   }
 
   /**
@@ -245,7 +254,7 @@ export class KeyStore {
    * @dev Used when feeding the sk_m to the kernel circuit for keys verification.
    */
   public getMasterSecretKey(pkM: PublicKey): Promise<GrumpkinScalar> {
-    const [keyPrefix, account] = this.#getKeyPrefixAndAccount(pkM);
+    const [keyPrefix, account] = this.getKeyPrefixAndAccount(pkM);
 
     const secretKeyBuffer = this.#keys.get(`${account.toString()}-${keyPrefix}sk_m`);
     if (!secretKeyBuffer) {
@@ -268,7 +277,7 @@ export class KeyStore {
    * @dev Note that this is quite inefficient but it should not matter because there should never be too many keys
    * in the key store.
    */
-  #getKeyPrefixAndAccount(value: Bufferable): [KeyPrefix, AztecAddress] {
+  public getKeyPrefixAndAccount(value: Bufferable): [KeyPrefix, AztecAddress] {
     const valueBuffer = serializeToBuffer(value);
     for (const [key, val] of this.#keys.entries()) {
       if (val.equals(valueBuffer)) {