@aztec/key-store 0.71.0 → 0.73.0

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;IAwCzF;;;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;IAsC/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;IAkBxE;;;;;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":"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"}

package/dest/key_store.js

@@ -28,8 +28,8 @@ export class KeyStore {
      * @returns The account's complete address.
      */
     async addAccount(sk, partialAddress) {
-        const { masterNullifierSecretKey, masterIncomingViewingSecretKey, masterOutgoingViewingSecretKey, masterTaggingSecretKey, publicKeys, } = deriveKeys(sk);
-        const completeAddress = CompleteAddress.fromSecretKeyAndPartialAddress(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());
@@ -42,10 +42,14 @@ export class KeyStore {
         await __classPrivateFieldGet(this, _KeyStore_keys, "f").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
-        await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(`${account.toString()}-npk_m_hash`, publicKeys.masterNullifierPublicKey.hash().toBuffer());
-        await __classPrivateFieldGet(this, _KeyStore_keys, "f").set(`${account.toString()}-ivpk_m_hash`, publicKeys.masterIncomingViewingPublicKey.hash().toBuffer());
-        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());
+        const masterNullifierPublicKeyHash = await publicKeys.masterNullifierPublicKey.hash();
+        await __classPrivateFieldGet(this, _KeyStore_keys, "f").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());
+        const masterOutgoingViewingPublicKeyHash = await publicKeys.masterOutgoingViewingPublicKey.hash();
+        await __classPrivateFieldGet(this, _KeyStore_keys, "f").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());
         // At last, we return the newly derived account address
         return completeAddress;
     }
@@ -74,7 +78,8 @@ export class KeyStore {
             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)) {
+        const computedPkMHash = await pkM.hash();
+        if (!computedPkMHash.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
@@ -84,11 +89,12 @@ export class KeyStore {
         }
         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)) {
+        const derivedPkM = await derivePublicKeyFromSecretKey(skM);
+        if (!derivedPkM.equals(pkM)) {
             throw new Error(`Could not derive ${keyPrefix}pkM from ${keyPrefix}skM.`);
         }
         // At last we silo the secret key and return the key validation request
-        const skApp = computeAppSecretKey(skM, contractAddress, keyPrefix);
+        const skApp = await computeAppSecretKey(skM, contractAddress, keyPrefix);
         return new KeyValidationRequest(pkM, skApp);
     }
     /**
@@ -185,7 +191,8 @@ export class KeyStore {
             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)) {
+        const derivedpkM = await derivePublicKeyFromSecretKey(skM);
+        if (!derivedpkM.equals(pkM)) {
             throw new Error(`Could not find ${keyPrefix}skM for ${keyPrefix}pkM ${pkM.toString()} in secret keys buffer.`);
         }
         return Promise.resolve(skM);
@@ -213,4 +220,4 @@ export class KeyStore {
     }
 }
 _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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"}
+//# 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.71.0",
+  "version": "0.73.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -55,10 +55,10 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.71.0",
-    "@aztec/circuits.js": "0.71.0",
-    "@aztec/foundation": "0.71.0",
-    "@aztec/kv-store": "0.71.0",
+    "@aztec/circuit-types": "0.73.0",
+    "@aztec/circuits.js": "0.73.0",
+    "@aztec/foundation": "0.73.0",
+    "@aztec/kv-store": "0.73.0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

package/src/key_store.ts

@@ -52,9 +52,9 @@ export class KeyStore {
       masterOutgoingViewingSecretKey,
       masterTaggingSecretKey,
       publicKeys,
-    } = deriveKeys(sk);
+    } = await deriveKeys(sk);
 
-    const completeAddress = CompleteAddress.fromSecretKeyAndPartialAddress(sk, partialAddress);
+    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
@@ -70,16 +70,14 @@ export class KeyStore {
 
     // 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
-    await this.#keys.set(`${account.toString()}-npk_m_hash`, publicKeys.masterNullifierPublicKey.hash().toBuffer());
-    await this.#keys.set(
-      `${account.toString()}-ivpk_m_hash`,
-      publicKeys.masterIncomingViewingPublicKey.hash().toBuffer(),
-    );
-    await this.#keys.set(
-      `${account.toString()}-ovpk_m_hash`,
-      publicKeys.masterOutgoingViewingPublicKey.hash().toBuffer(),
-    );
-    await this.#keys.set(`${account.toString()}-tpk_m_hash`, publicKeys.masterTaggingPublicKey.hash().toBuffer());
+    const masterNullifierPublicKeyHash = await publicKeys.masterNullifierPublicKey.hash();
+    await this.#keys.set(`${account.toString()}-npk_m_hash`, masterNullifierPublicKeyHash.toBuffer());
+    const masterIncomingViewingPublicKeyHash = await publicKeys.masterIncomingViewingPublicKey.hash();
+    await this.#keys.set(`${account.toString()}-ivpk_m_hash`, masterIncomingViewingPublicKeyHash.toBuffer());
+    const masterOutgoingViewingPublicKeyHash = await publicKeys.masterOutgoingViewingPublicKey.hash();
+    await this.#keys.set(`${account.toString()}-ovpk_m_hash`, masterOutgoingViewingPublicKeyHash.toBuffer());
+    const masterTaggingPublicKeyHash = await publicKeys.masterTaggingPublicKey.hash();
+    await this.#keys.set(`${account.toString()}-tpk_m_hash`, masterTaggingPublicKeyHash.toBuffer());
 
     // At last, we return the newly derived account address
     return completeAddress;
@@ -115,8 +113,8 @@ export class KeyStore {
     }
 
     const pkM = Point.fromBuffer(pkMBuffer);
-
-    if (!pkM.hash().equals(pkMHash)) {
+    const computedPkMHash = await pkM.hash();
+    if (!computedPkMHash.equals(pkMHash)) {
       throw new Error(`Could not find ${keyPrefix}pkM for ${keyPrefix}pk_m_hash ${pkMHash.toString()}.`);
     }
 
@@ -131,12 +129,13 @@ export class KeyStore {
     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)) {
+    const derivedPkM = await derivePublicKeyFromSecretKey(skM);
+    if (!derivedPkM.equals(pkM)) {
       throw new Error(`Could not derive ${keyPrefix}pkM from ${keyPrefix}skM.`);
     }
 
     // At last we silo the secret key and return the key validation request
-    const skApp = computeAppSecretKey(skM, contractAddress, keyPrefix!);
+    const skApp = await computeAppSecretKey(skM, contractAddress, keyPrefix!);
 
     return new KeyValidationRequest(pkM, skApp);
   }
@@ -261,7 +260,8 @@ export class KeyStore {
     }
 
     const skM = GrumpkinScalar.fromBuffer(secretKeyBuffer);
-    if (!derivePublicKeyFromSecretKey(skM).equals(pkM)) {
+    const derivedpkM = await derivePublicKeyFromSecretKey(skM);
+    if (!derivedpkM.equals(pkM)) {
       throw new Error(`Could not find ${keyPrefix}skM for ${keyPrefix}pkM ${pkM.toString()} in secret keys buffer.`);
     }