@aztec/key-store 0.55.1 → 0.57.0

package/dest/key_store.d.ts

@@ -1,8 +1,8 @@
 import { type PublicKey } from '@aztec/circuit-types';
-import { AztecAddress, CompleteAddress, Fq, Fr, GrumpkinScalar, KeyValidationRequest, type PartialAddress } from '@aztec/circuits.js';
+import { AztecAddress, CompleteAddress, Fr, GrumpkinScalar, 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.
+ * Used for managing keys. Can hold keys of multiple accounts.
  */
 export declare class KeyStore {
     #private;
@@ -77,18 +77,5 @@ export declare class KeyStore {
      * @dev Used when feeding the sk_m to the kernel circuit for keys verification.
      */
     getMasterSecretKey(pkM: PublicKey): Promise<GrumpkinScalar>;
-    /**
-     * Rotates the master nullifier key for the specified account.
-     *
-     * @dev This function updates the secret and public keys associated with the account.
-     * It appends a new secret key to the existing secret keys, derives the
-     * corresponding public key, and updates the stored keys accordingly.
-     *
-     * @param account - The account address for which the master nullifier key is being rotated.
-     * @param newSecretKey - (Optional) A new secret key of type Fq. If not provided, a random key is generated.
-     * @throws If the account does not have existing nullifier secret keys or public keys.
-     * @returns A Promise that resolves when the key rotation is complete.
-     */
-    rotateMasterNullifierKey(account: AztecAddress, newSecretKey?: Fq): Promise<void>;
 }
 //# 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,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;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;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;IAgClE;;;;;;;;;;;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,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"}

package/dest/key_store.js

@@ -1,10 +1,10 @@
-var _KeyStore_instances, _KeyStore_keys, _KeyStore_getKeyPrefixAndAccount, _KeyStore_appendValue, _KeyStore_calculateNumKeys;
+var _KeyStore_instances, _KeyStore_keys, _KeyStore_getKeyPrefixAndAccount;
 import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
-import { AztecAddress, CompleteAddress, Fq, 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, computeAddress, computeAppSecretKey, deriveKeys, derivePublicKeyFromSecretKey, } from '@aztec/circuits.js';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
 import { serializeToBuffer } from '@aztec/foundation/serialize';
 /**
- * Used for managing keys. Can hold keys of multiple accounts and allows for key rotation.
+ * Used for managing keys. Can hold keys of multiple accounts.
  */
 export class KeyStore {
     constructor(database) {
@@ -69,37 +69,20 @@ export class KeyStore {
     getKeyValidationRequest(pkMHash, contractAddress) {
         const [keyPrefix, account] = __classPrivateFieldGet(this, _KeyStore_instances, "m", _KeyStore_getKeyPrefixAndAccount).call(this, pkMHash);
         // Now we find the master public key for the account
-        // Since each public keys buffer contains multiple public keys, we need to find the one that matches the hash.
-        // Then we store the index of the key in the buffer to be able to quickly obtain the corresponding secret key.
-        let pkM;
-        let keyIndexInBuffer = 0;
-        {
-            const pkMsBuffer = __classPrivateFieldGet(this, _KeyStore_keys, "f").get(`${account.toString()}-${keyPrefix}pk_m`);
-            if (!pkMsBuffer) {
-                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()}.`);
-            }
-            // Now we iterate over the public keys in the buffer to find the one that matches the hash
-            const numKeys = __classPrivateFieldGet(this, _KeyStore_instances, "m", _KeyStore_calculateNumKeys).call(this, pkMsBuffer, Point);
-            for (; keyIndexInBuffer < numKeys; keyIndexInBuffer++) {
-                const foundPkM = Point.fromBuffer(pkMsBuffer.subarray(keyIndexInBuffer * Point.SIZE_IN_BYTES, (keyIndexInBuffer + 1) * Point.SIZE_IN_BYTES));
-                if (foundPkM.hash().equals(pkMHash)) {
-                    pkM = foundPkM;
-                    break;
-                }
-            }
-            if (!pkM) {
-                throw new Error(`Could not find ${keyPrefix}pkM for ${keyPrefix}pk_m_hash ${pkMHash.toString()}.`);
-            }
+        const pkMBuffer = __classPrivateFieldGet(this, _KeyStore_keys, "f").get(`${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()}.`);
+        }
+        const pkM = Point.fromBuffer(pkMBuffer);
+        if (!pkM.hash().equals(pkMHash)) {
+            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
-        let skM;
-        {
-            const skMsBuffer = __classPrivateFieldGet(this, _KeyStore_keys, "f").get(`${account.toString()}-${keyPrefix}sk_m`);
-            if (!skMsBuffer) {
-                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()}.`);
-            }
-            skM = GrumpkinScalar.fromBuffer(skMsBuffer.subarray(keyIndexInBuffer * GrumpkinScalar.SIZE_IN_BYTES, (keyIndexInBuffer + 1) * GrumpkinScalar.SIZE_IN_BYTES));
+        const skMBuffer = __classPrivateFieldGet(this, _KeyStore_keys, "f").get(`${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()}.`);
         }
+        const skM = GrumpkinScalar.fromBuffer(skMBuffer);
         // We sanity check that it's possible to derive the public key from the secret key
         if (!derivePublicKeyFromSecretKey(skM).equals(pkM)) {
             throw new Error(`Could not derive ${keyPrefix}pkM from ${keyPrefix}skM.`);
@@ -186,56 +169,21 @@ export class KeyStore {
      */
     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 skM;
-        {
-            const secretKeysBuffer = __classPrivateFieldGet(this, _KeyStore_keys, "f").get(`${account.toString()}-${keyPrefix}sk_m`);
-            if (!secretKeysBuffer) {
-                throw new Error(`Could not find ${keyPrefix}sk_m for ${keyPrefix}pk_m ${pkM.toString()}. This should not happen.`);
-            }
-            const numKeys = __classPrivateFieldGet(this, _KeyStore_instances, "m", _KeyStore_calculateNumKeys).call(this, secretKeysBuffer, GrumpkinScalar);
-            for (let i = 0; i < numKeys; i++) {
-                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 (!skM) {
-                throw new Error(`Could not find ${keyPrefix}skM for ${keyPrefix}pkM ${pkM.toString()} in secret keys buffer.`);
-            }
+        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.`);
+        }
+        const skM = GrumpkinScalar.fromBuffer(secretKeyBuffer);
+        if (!derivePublicKeyFromSecretKey(skM).equals(pkM)) {
+            throw new Error(`Could not find ${keyPrefix}skM for ${keyPrefix}pkM ${pkM.toString()} in secret keys buffer.`);
         }
         return Promise.resolve(skM);
     }
-    /**
-     * Rotates the master nullifier key for the specified account.
-     *
-     * @dev This function updates the secret and public keys associated with the account.
-     * It appends a new secret key to the existing secret keys, derives the
-     * corresponding public key, and updates the stored keys accordingly.
-     *
-     * @param account - The account address for which the master nullifier key is being rotated.
-     * @param newSecretKey - (Optional) A new secret key of type Fq. If not provided, a random key is generated.
-     * @throws If the account does not have existing nullifier secret keys or public keys.
-     * @returns A Promise that resolves when the key rotation is complete.
-     */
-    async rotateMasterNullifierKey(account, newSecretKey = Fq.random()) {
-        // We append the secret key to the array of secret keys
-        await __classPrivateFieldGet(this, _KeyStore_instances, "m", _KeyStore_appendValue).call(this, `${account.toString()}-nsk_m`, newSecretKey);
-        // Now we derive the public key from the new secret key and append it to the buffer of original public keys
-        const newPublicKey = derivePublicKeyFromSecretKey(newSecretKey);
-        await __classPrivateFieldGet(this, _KeyStore_instances, "m", _KeyStore_appendValue).call(this, `${account.toString()}-npk_m`, newPublicKey);
-        // At last we store npk_m_hash under `account-npk_m_hash` key to be able to obtain address and key prefix
-        // using the #getKeyPrefixAndAccount function later on
-        await __classPrivateFieldGet(this, _KeyStore_instances, "m", _KeyStore_appendValue).call(this, `${account.toString()}-npk_m_hash`, newPublicKey.hash());
-    }
 }
 _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()) {
-        // `val` can contain multiple values due to key rotation so we check if the value is in the buffer instead
-        // of just calling `.equals(...)`
-        if (val.includes(valueBuffer)) {
+        if (val.equals(valueBuffer)) {
             for (const prefix of KEY_PREFIXES) {
                 if (key.includes(`-${prefix}`)) {
                     const account = AztecAddress.fromString(key.split('-')[0]);
@@ -245,13 +193,5 @@ _KeyStore_keys = new WeakMap(), _KeyStore_instances = new WeakSet(), _KeyStore_g
         }
     }
     throw new Error(`Could not find key prefix.`);
-}, _KeyStore_appendValue = async function _KeyStore_appendValue(key, value) {
-    const currentValue = __classPrivateFieldGet(this, _KeyStore_keys, "f").get(key);
-    if (!currentValue) {
-        throw new Error(`Could not find current value for key ${key}`);
-    }
-    await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(key, serializeToBuffer([currentValue, value]));
-}, _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.55.1",
+  "version": "0.57.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -35,6 +35,9 @@
             "parser": {
               "syntax": "typescript",
               "decorators": true
+            },
+            "transform": {
+              "decoratorVersion": "2022-03"
             }
           }
         }
@@ -53,10 +56,10 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.55.1",
-    "@aztec/circuits.js": "0.55.1",
-    "@aztec/foundation": "0.55.1",
-    "@aztec/kv-store": "0.55.1",
+    "@aztec/circuit-types": "0.57.0",
+    "@aztec/circuits.js": "0.57.0",
+    "@aztec/foundation": "0.57.0",
+    "@aztec/kv-store": "0.57.0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

package/src/key_store.ts

@@ -2,7 +2,6 @@ import { type PublicKey } from '@aztec/circuit-types';
 import {
   AztecAddress,
   CompleteAddress,
-  Fq,
   Fr,
   GeneratorIndex,
   GrumpkinScalar,
@@ -21,7 +20,7 @@ import { type Bufferable, serializeToBuffer } from '@aztec/foundation/serialize'
 import { type AztecKVStore, type AztecMap } from '@aztec/kv-store';
 
 /**
- * Used for managing keys. Can hold keys of multiple accounts and allows for key rotation.
+ * Used for managing keys. Can hold keys of multiple accounts.
  */
 export class KeyStore {
   #keys: AztecMap<string, Buffer>;
@@ -108,53 +107,29 @@ export class KeyStore {
     const [keyPrefix, account] = this.#getKeyPrefixAndAccount(pkMHash);
 
     // Now we find the master public key for the account
-    // Since each public keys buffer contains multiple public keys, we need to find the one that matches the hash.
-    // Then we store the index of the key in the buffer to be able to quickly obtain the corresponding secret key.
-    let pkM: PublicKey | undefined;
-    let keyIndexInBuffer = 0;
-    {
-      const pkMsBuffer = this.#keys.get(`${account.toString()}-${keyPrefix}pk_m`);
-      if (!pkMsBuffer) {
-        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()}.`,
-        );
-      }
+    const pkMBuffer = this.#keys.get(`${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()}.`,
+      );
+    }
 
-      // Now we iterate over the public keys in the buffer to find the one that matches the hash
-      const numKeys = this.#calculateNumKeys(pkMsBuffer, Point);
-      for (; keyIndexInBuffer < numKeys; keyIndexInBuffer++) {
-        const foundPkM = Point.fromBuffer(
-          pkMsBuffer.subarray(keyIndexInBuffer * Point.SIZE_IN_BYTES, (keyIndexInBuffer + 1) * Point.SIZE_IN_BYTES),
-        );
-        if (foundPkM.hash().equals(pkMHash)) {
-          pkM = foundPkM;
-          break;
-        }
-      }
+    const pkM = Point.fromBuffer(pkMBuffer);
 
-      if (!pkM) {
-        throw new Error(`Could not find ${keyPrefix}pkM for ${keyPrefix}pk_m_hash ${pkMHash.toString()}.`);
-      }
+    if (!pkM.hash().equals(pkMHash)) {
+      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
-    let skM: GrumpkinScalar | undefined;
-    {
-      const skMsBuffer = this.#keys.get(`${account.toString()}-${keyPrefix}sk_m`);
-      if (!skMsBuffer) {
-        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()}.`,
-        );
-      }
-
-      skM = GrumpkinScalar.fromBuffer(
-        skMsBuffer.subarray(
-          keyIndexInBuffer * GrumpkinScalar.SIZE_IN_BYTES,
-          (keyIndexInBuffer + 1) * GrumpkinScalar.SIZE_IN_BYTES,
-        ),
+    const skMBuffer = this.#keys.get(`${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()}.`,
       );
     }
 
+    const skM = GrumpkinScalar.fromBuffer(skMBuffer);
+
     // We sanity check that it's possible to derive the public key from the secret key
     if (!derivePublicKeyFromSecretKey(skM).equals(pkM)) {
       throw new Error(`Could not derive ${keyPrefix}pkM from ${keyPrefix}skM.`);
@@ -272,60 +247,21 @@ export class KeyStore {
   public getMasterSecretKey(pkM: PublicKey): Promise<GrumpkinScalar> {
     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 skM: GrumpkinScalar | undefined;
-    {
-      const secretKeysBuffer = this.#keys.get(`${account.toString()}-${keyPrefix}sk_m`);
-      if (!secretKeysBuffer) {
-        throw new Error(
-          `Could not find ${keyPrefix}sk_m for ${keyPrefix}pk_m ${pkM.toString()}. This should not happen.`,
-        );
-      }
-
-      const numKeys = this.#calculateNumKeys(secretKeysBuffer, GrumpkinScalar);
-      for (let i = 0; i < numKeys; i++) {
-        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;
-        }
-      }
+    const secretKeyBuffer = this.#keys.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.`,
+      );
+    }
 
-      if (!skM) {
-        throw new Error(`Could not find ${keyPrefix}skM for ${keyPrefix}pkM ${pkM.toString()} in secret keys buffer.`);
-      }
+    const skM = GrumpkinScalar.fromBuffer(secretKeyBuffer);
+    if (!derivePublicKeyFromSecretKey(skM).equals(pkM)) {
+      throw new Error(`Could not find ${keyPrefix}skM for ${keyPrefix}pkM ${pkM.toString()} in secret keys buffer.`);
     }
 
     return Promise.resolve(skM);
   }
 
-  /**
-   * Rotates the master nullifier key for the specified account.
-   *
-   * @dev This function updates the secret and public keys associated with the account.
-   * It appends a new secret key to the existing secret keys, derives the
-   * corresponding public key, and updates the stored keys accordingly.
-   *
-   * @param account - The account address for which the master nullifier key is being rotated.
-   * @param newSecretKey - (Optional) A new secret key of type Fq. If not provided, a random key is generated.
-   * @throws If the account does not have existing nullifier secret keys or public keys.
-   * @returns A Promise that resolves when the key rotation is complete.
-   */
-  public async rotateMasterNullifierKey(account: AztecAddress, newSecretKey: Fq = Fq.random()) {
-    // We append the secret key to the array of secret keys
-    await this.#appendValue(`${account.toString()}-nsk_m`, newSecretKey);
-
-    // Now we derive the public key from the new secret key and append it to the buffer of original public keys
-    const newPublicKey = derivePublicKeyFromSecretKey(newSecretKey);
-    await this.#appendValue(`${account.toString()}-npk_m`, newPublicKey);
-
-    // At last we store npk_m_hash under `account-npk_m_hash` key to be able to obtain address and key prefix
-    // using the #getKeyPrefixAndAccount function later on
-    await this.#appendValue(`${account.toString()}-npk_m_hash`, newPublicKey.hash());
-  }
-
   /**
    * Gets the key prefix and account address for a given value.
    * @returns A tuple containing the key prefix and account address.
@@ -335,9 +271,7 @@ export class KeyStore {
   #getKeyPrefixAndAccount(value: Bufferable): [KeyPrefix, AztecAddress] {
     const valueBuffer = serializeToBuffer(value);
     for (const [key, val] of this.#keys.entries()) {
-      // `val` can contain multiple values due to key rotation so we check if the value is in the buffer instead
-      // of just calling `.equals(...)`
-      if (val.includes(valueBuffer)) {
+      if (val.equals(valueBuffer)) {
         for (const prefix of KEY_PREFIXES) {
           if (key.includes(`-${prefix}`)) {
             const account = AztecAddress.fromString(key.split('-')[0]);
@@ -348,17 +282,4 @@ export class KeyStore {
     }
     throw new Error(`Could not find key prefix.`);
   }
-
-  async #appendValue(key: string, value: Bufferable) {
-    const currentValue = this.#keys.get(key);
-    if (!currentValue) {
-      throw new Error(`Could not find current value for key ${key}`);
-    }
-
-    await this.#keys.set(key, serializeToBuffer([currentValue, value]));
-  }
-
-  #calculateNumKeys(buf: Buffer, T: typeof Point | typeof Fq) {
-    return buf.byteLength / T.SIZE_IN_BYTES;
-  }
 }