@aztec/key-store 0.41.0 → 0.43.0

package/dest/key_store.d.ts

@@ -1,5 +1,5 @@
 import { type PublicKey } from '@aztec/circuit-types';
-import { AztecAddress, CompleteAddress, Fq, Fr, type GrumpkinPrivateKey, type KeyGenerator, KeyValidationRequest, type PartialAddress } from '@aztec/circuits.js';
+import { AztecAddress, CompleteAddress, Fq, Fr, type GrumpkinPrivateKey, KeyValidationRequest, type PartialAddress } from '@aztec/circuits.js';
 import { type AztecKVStore } from '@aztec/kv-store';
 /**
  * Used for managing keys. Can hold keys of multiple accounts and allows for key rotation.
@@ -70,22 +70,13 @@ export declare class KeyStore {
      */
     getAppOutgoingViewingSecretKey(account: AztecAddress, app: AztecAddress): Promise<Fr>;
     /**
-     * Retrieves the sk_m for the pk_m and a generator index of the key type.
+     * 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.
      */
-    getMasterSecretKeyAndAppKeyGenerator(pkM: PublicKey): Promise<[GrumpkinPrivateKey, KeyGenerator]>;
-    /**
-     * Retrieves the master incoming viewing secret key (ivsk_m) corresponding to the specified master incoming viewing
-     * public key (Ivpk_m).
-     * @throws If the provided public key is not associated with any of the registered accounts.
-     * @param masterIncomingViewingPublicKey - The master nullifier public key to get secret key for.
-     * @returns A Promise that resolves to the master nullifier secret key.
-     * @dev Used when feeding the master nullifier secret key to the kernel circuit for nullifier keys verification.
-     */
-    getMasterIncomingViewingSecretKeyForPublicKey(masterIncomingViewingPublicKey: PublicKey): Promise<GrumpkinPrivateKey>;
+    getMasterSecretKey(pkM: PublicKey): Promise<GrumpkinPrivateKey>;
     /**
      * Rotates the master nullifier key for the specified account.
      *

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,EACF,EAAE,EAEF,KAAK,kBAAkB,EAGvB,KAAK,YAAY,EAEjB,oBAAoB,EACpB,KAAK,cAAc,EAOpB,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;IA8DzG;;;;;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;IAmBlG;;;;;;OAMG;IACU,8BAA8B,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC;IAmBlG;;;;;;OAMG;IACI,oCAAoC,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;IAkCxG;;;;;;;OAOG;IACI,6CAA6C,CAClD,8BAA8B,EAAE,SAAS,GACxC,OAAO,CAAC,kBAAkB,CAAC;IAoB9B;;;;;;;;;;;OAWG;IACU,wBAAwB,CAAC,OAAO,EAAE,YAAY,EAAE,YAAY,GAAE,EAAgB;CAgD5F"}
+{"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,EACF,EAAE,EAEF,KAAK,kBAAkB,EAIvB,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;IA8DzG;;;;;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;IAmBlG;;;;;;OAMG;IACU,8BAA8B,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC;IAmBlG;;;;;;OAMG;IACI,kBAAkB,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAgCtE;;;;;;;;;;;OAWG;IACU,wBAAwB,CAAC,OAAO,EAAE,YAAY,EAAE,YAAY,GAAE,EAAgB;CAgD5F"}

package/dest/key_store.js

@@ -1,6 +1,6 @@
 var _KeyStore_instances, _KeyStore_keys, _KeyStore_getKeyPrefixAndAccount, _KeyStore_appendValue, _KeyStore_calculateNumKeys;
 import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
-import { AztecAddress, CompleteAddress, Fq, Fr, GeneratorIndex, GrumpkinScalar, KEY_PREFIXES, KeyValidationRequest, Point, computeAddress, computeAppSecretKey, deriveKeys, derivePublicKeyFromSecretKey, getKeyGenerator, } from '@aztec/circuits.js';
+import { AztecAddress, CompleteAddress, Fq, Fr, GeneratorIndex, GrumpkinScalar, KEY_PREFIXES, KeyValidationRequest, Point, computeAddress, computeAppSecretKey, deriveKeys, derivePublicKeyFromSecretKey, } from '@aztec/circuits.js';
 import { poseidon2Hash } from '@aztec/foundation/crypto';
 import { serializeToBuffer } from '@aztec/foundation/serialize';
 /**
@@ -188,16 +188,16 @@ export class KeyStore {
         ]));
     }
     /**
-     * Retrieves the sk_m for the pk_m and a generator index of the key type.
+     * 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.
      */
-    getMasterSecretKeyAndAppKeyGenerator(pkM) {
+    getMasterSecretKey(pkM) {
         const [keyPrefix, account] = __classPrivateFieldGet(this, _KeyStore_instances, "m", _KeyStore_getKeyPrefixAndAccount).call(this, pkM);
         // We get the secret keys buffer and iterate over the values in the buffer to find the one that matches pkM
-        let sk;
+        let skM;
         {
             const secretKeysBuffer = __classPrivateFieldGet(this, _KeyStore_keys, "f").get(`${account.toString()}-${keyPrefix}sk_m`);
             if (!secretKeysBuffer) {
@@ -205,43 +205,17 @@ export class KeyStore {
             }
             const numKeys = __classPrivateFieldGet(this, _KeyStore_instances, "m", _KeyStore_calculateNumKeys).call(this, secretKeysBuffer, GrumpkinScalar);
             for (let i = 0; i < numKeys; i++) {
-                const foundSk = GrumpkinScalar.fromBuffer(secretKeysBuffer.subarray(i * GrumpkinScalar.SIZE_IN_BYTES, (i + 1) * GrumpkinScalar.SIZE_IN_BYTES));
-                if (derivePublicKeyFromSecretKey(foundSk).equals(pkM)) {
-                    sk = foundSk;
+                const foundSkM = GrumpkinScalar.fromBuffer(secretKeysBuffer.subarray(i * GrumpkinScalar.SIZE_IN_BYTES, (i + 1) * GrumpkinScalar.SIZE_IN_BYTES));
+                if (derivePublicKeyFromSecretKey(foundSkM).equals(pkM)) {
+                    skM = foundSkM;
                     break;
                 }
             }
-            if (!sk) {
+            if (!skM) {
                 throw new Error(`Could not find ${keyPrefix}skM for ${keyPrefix}pkM ${pkM.toString()} in secret keys buffer.`);
             }
         }
-        // Now we determine the key type and return generator accordingly
-        const generator = getKeyGenerator(keyPrefix);
-        return Promise.resolve([sk, generator]);
-    }
-    /**
-     * Retrieves the master incoming viewing secret key (ivsk_m) corresponding to the specified master incoming viewing
-     * public key (Ivpk_m).
-     * @throws If the provided public key is not associated with any of the registered accounts.
-     * @param masterIncomingViewingPublicKey - The master nullifier public key to get secret key for.
-     * @returns A Promise that resolves to the master nullifier secret key.
-     * @dev Used when feeding the master nullifier secret key to the kernel circuit for nullifier keys verification.
-     */
-    getMasterIncomingViewingSecretKeyForPublicKey(masterIncomingViewingPublicKey) {
-        // We iterate over the map keys to find the account address that corresponds to the provided public key
-        for (const [key, value] of __classPrivateFieldGet(this, _KeyStore_keys, "f").entries()) {
-            if (value.equals(masterIncomingViewingPublicKey.toBuffer())) {
-                // We extract the account address from the map key
-                const account = key.split('-')[0];
-                // We fetch the secret key and return it
-                const masterIncomingViewingSecretKeyBuffer = __classPrivateFieldGet(this, _KeyStore_keys, "f").get(`${account.toString()}-ivsk_m`);
-                if (!masterIncomingViewingSecretKeyBuffer) {
-                    throw new Error(`Could not find master incoming viewing secret key for account ${account.toString()}`);
-                }
-                return Promise.resolve(GrumpkinScalar.fromBuffer(masterIncomingViewingSecretKeyBuffer));
-            }
-        }
-        throw new Error(`Could not find master incoming viewing secret key for public key ${masterIncomingViewingPublicKey.toString()}`);
+        return Promise.resolve(skM);
     }
     /**
      * Rotates the master nullifier key for the specified account.
@@ -290,4 +264,4 @@ _KeyStore_keys = new WeakMap(), _KeyStore_instances = new WeakSet(), _KeyStore_g
 }, _KeyStore_calculateNumKeys = function _KeyStore_calculateNumKeys(buf, T) {
     return buf.byteLength / T.SIZE_IN_BYTES;
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"key_store.js","sourceRoot":"","sources":["../src/key_store.ts"],"names":[],"mappings":"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"}
+//# 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.41.0",
+  "version": "0.43.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -45,10 +45,10 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.41.0",
-    "@aztec/circuits.js": "0.41.0",
-    "@aztec/foundation": "0.41.0",
-    "@aztec/kv-store": "0.41.0",
+    "@aztec/circuit-types": "0.43.0",
+    "@aztec/circuits.js": "0.43.0",
+    "@aztec/foundation": "0.43.0",
+    "@aztec/kv-store": "0.43.0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

package/src/key_store.ts

@@ -8,7 +8,6 @@ import {
   type GrumpkinPrivateKey,
   GrumpkinScalar,
   KEY_PREFIXES,
-  type KeyGenerator,
   type KeyPrefix,
   KeyValidationRequest,
   type PartialAddress,
@@ -17,7 +16,6 @@ import {
   computeAppSecretKey,
   deriveKeys,
   derivePublicKeyFromSecretKey,
-  getKeyGenerator,
 } from '@aztec/circuits.js';
 import { poseidon2Hash } from '@aztec/foundation/crypto';
 import { type Bufferable, serializeToBuffer } from '@aztec/foundation/serialize';
@@ -270,17 +268,17 @@ export class KeyStore {
   }
 
   /**
-   * Retrieves the sk_m for the pk_m and a generator index of the key type.
+   * 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.
    */
-  public getMasterSecretKeyAndAppKeyGenerator(pkM: PublicKey): Promise<[GrumpkinPrivateKey, KeyGenerator]> {
+  public getMasterSecretKey(pkM: PublicKey): Promise<GrumpkinPrivateKey> {
     const [keyPrefix, account] = this.#getKeyPrefixAndAccount(pkM);
 
     // We get the secret keys buffer and iterate over the values in the buffer to find the one that matches pkM
-    let sk: GrumpkinScalar | undefined;
+    let skM: GrumpkinScalar | undefined;
     {
       const secretKeysBuffer = this.#keys.get(`${account.toString()}-${keyPrefix}sk_m`);
       if (!secretKeysBuffer) {
@@ -291,53 +289,21 @@ export class KeyStore {
 
       const numKeys = this.#calculateNumKeys(secretKeysBuffer, GrumpkinScalar);
       for (let i = 0; i < numKeys; i++) {
-        const foundSk = GrumpkinScalar.fromBuffer(
+        const foundSkM = GrumpkinScalar.fromBuffer(
           secretKeysBuffer.subarray(i * GrumpkinScalar.SIZE_IN_BYTES, (i + 1) * GrumpkinScalar.SIZE_IN_BYTES),
         );
-        if (derivePublicKeyFromSecretKey(foundSk).equals(pkM)) {
-          sk = foundSk;
+        if (derivePublicKeyFromSecretKey(foundSkM).equals(pkM)) {
+          skM = foundSkM;
           break;
         }
       }
 
-      if (!sk) {
+      if (!skM) {
         throw new Error(`Could not find ${keyPrefix}skM for ${keyPrefix}pkM ${pkM.toString()} in secret keys buffer.`);
       }
     }
 
-    // Now we determine the key type and return generator accordingly
-    const generator = getKeyGenerator(keyPrefix);
-    return Promise.resolve([sk, generator]);
-  }
-
-  /**
-   * Retrieves the master incoming viewing secret key (ivsk_m) corresponding to the specified master incoming viewing
-   * public key (Ivpk_m).
-   * @throws If the provided public key is not associated with any of the registered accounts.
-   * @param masterIncomingViewingPublicKey - The master nullifier public key to get secret key for.
-   * @returns A Promise that resolves to the master nullifier secret key.
-   * @dev Used when feeding the master nullifier secret key to the kernel circuit for nullifier keys verification.
-   */
-  public getMasterIncomingViewingSecretKeyForPublicKey(
-    masterIncomingViewingPublicKey: PublicKey,
-  ): Promise<GrumpkinPrivateKey> {
-    // We iterate over the map keys to find the account address that corresponds to the provided public key
-    for (const [key, value] of this.#keys.entries()) {
-      if (value.equals(masterIncomingViewingPublicKey.toBuffer())) {
-        // We extract the account address from the map key
-        const account = key.split('-')[0];
-        // We fetch the secret key and return it
-        const masterIncomingViewingSecretKeyBuffer = this.#keys.get(`${account.toString()}-ivsk_m`);
-        if (!masterIncomingViewingSecretKeyBuffer) {
-          throw new Error(`Could not find master incoming viewing secret key for account ${account.toString()}`);
-        }
-        return Promise.resolve(GrumpkinScalar.fromBuffer(masterIncomingViewingSecretKeyBuffer));
-      }
-    }
-
-    throw new Error(
-      `Could not find master incoming viewing secret key for public key ${masterIncomingViewingPublicKey.toString()}`,
-    );
+    return Promise.resolve(skM);
   }
 
   /**