@aztec/key-store 0.38.0 → 0.40.0

package/dest/test_key_store.d.ts

@@ -1,5 +1,5 @@
 import { type KeyStore, type PublicKey } from '@aztec/circuit-types';
-import { AztecAddress, Fr, type GrumpkinPrivateKey, type PartialAddress, Point } from '@aztec/circuits.js';
+import { AztecAddress, CompleteAddress, Fr, type GrumpkinPrivateKey, type PartialAddress } from '@aztec/circuits.js';
 import { type AztecKVStore } from '@aztec/kv-store';
 /**
  * TestKeyStore is an implementation of the KeyStore interface, used for managing key pairs in a testing environment.
@@ -10,16 +10,16 @@ export declare class TestKeyStore implements KeyStore {
     constructor(database: AztecKVStore);
     /**
      * Creates a new account from a randomly generated secret key.
-     * @returns A promise that resolves to the newly created account's AztecAddress.
+     * @returns A promise that resolves to the newly created account's CompleteAddress.
      */
-    createAccount(): Promise<AztecAddress>;
+    createAccount(): Promise<CompleteAddress>;
     /**
      * 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 address.
+     * @returns The account's complete address.
      */
-    addAccount(sk: Fr, partialAddress: PartialAddress): Promise<AztecAddress>;
+    addAccount(sk: Fr, partialAddress: PartialAddress): Promise<CompleteAddress>;
     /**
      * Retrieves addresses of accounts stored in the key store.
      * @returns A Promise that resolves to an array of account addresses.
@@ -102,6 +102,5 @@ export declare class TestKeyStore implements KeyStore {
      * @returns A Promise that resolves to the public keys hash.
      */
     getPublicKeysHash(account: AztecAddress): Promise<Fr>;
-    addPublicKeysForAccount(accountAddress: AztecAddress, masterNullifierPublicKey: Point, masterIncomingViewingPublicKey: Point, masterOutgoingViewingPublicKey: Point, masterTaggingPublicKey: Point): Promise<void>;
 }
 //# sourceMappingURL=test_key_store.d.ts.map

package/dest/test_key_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test_key_store.d.ts","sourceRoot":"","sources":["../src/test_key_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EACL,YAAY,EACZ,EAAE,EAEF,KAAK,kBAAkB,EAEvB,KAAK,cAAc,EACnB,KAAK,EAGN,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,iBAAiB,CAAC;AAEnE;;;GAGG;AACH,qBAAa,YAAa,YAAW,QAAQ;;gBAG/B,QAAQ,EAAE,YAAY;IAIlC;;;OAGG;IACI,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC;IAM7C;;;;;OAKG;IACU,UAAU,CAAC,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC;IAmCtF;;;OAGG;IACI,WAAW,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAO7C;;;;;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;;;;;;OAMG;IACU,wBAAwB,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC;IAY5F;;;;;;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;;;;;;;OAOG;IACI,uCAAuC,CAAC,wBAAwB,EAAE,SAAS,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAkBhH;;;;;;;OAOG;IACI,6CAA6C,CAClD,8BAA8B,EAAE,SAAS,GACxC,OAAO,CAAC,kBAAkB,CAAC;IAoB9B;;;;;OAKG;IACU,iBAAiB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC;IAWrD,uBAAuB,CAClC,cAAc,EAAE,YAAY,EAC5B,wBAAwB,EAAE,KAAK,EAC/B,8BAA8B,EAAE,KAAK,EACrC,8BAA8B,EAAE,KAAK,EACrC,sBAAsB,EAAE,KAAK,GAC5B,OAAO,CAAC,IAAI,CAAC;CAMjB"}
+{"version":3,"file":"test_key_store.d.ts","sourceRoot":"","sources":["../src/test_key_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EACL,YAAY,EACZ,eAAe,EACf,EAAE,EAEF,KAAK,kBAAkB,EAEvB,KAAK,cAAc,EAKpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,iBAAiB,CAAC;AAEnE;;;GAGG;AACH,qBAAa,YAAa,YAAW,QAAQ;;gBAG/B,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;IA6BzF;;;OAGG;IACI,WAAW,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAO7C;;;;;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;;;;;;OAMG;IACU,wBAAwB,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC;IAY5F;;;;;;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;;;;;;;OAOG;IACI,uCAAuC,CAAC,wBAAwB,EAAE,SAAS,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAkBhH;;;;;;;OAOG;IACI,6CAA6C,CAClD,8BAA8B,EAAE,SAAS,GACxC,OAAO,CAAC,kBAAkB,CAAC;IAoB9B;;;;;OAKG;IACU,iBAAiB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC;CASnE"}

package/dest/test_key_store.js

@@ -1,6 +1,6 @@
 var _TestKeyStore_keys;
 import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
-import { AztecAddress, Fr, GeneratorIndex, GrumpkinScalar, Point, computeAppNullifierSecretKey, deriveKeys, } from '@aztec/circuits.js';
+import { AztecAddress, CompleteAddress, Fr, GeneratorIndex, GrumpkinScalar, Point, computeAddress, computeAppNullifierSecretKey, deriveKeys, } from '@aztec/circuits.js';
 import { poseidon2Hash } from '@aztec/foundation/crypto';
 /**
  * TestKeyStore is an implementation of the KeyStore interface, used for managing key pairs in a testing environment.
@@ -13,7 +13,7 @@ export class TestKeyStore {
     }
     /**
      * Creates a new account from a randomly generated secret key.
-     * @returns A promise that resolves to the newly created account's AztecAddress.
+     * @returns A promise that resolves to the newly created account's CompleteAddress.
      */
     createAccount() {
         const sk = Fr.random();
@@ -24,26 +24,24 @@ export class TestKeyStore {
      * 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 address.
+     * @returns The account's complete address.
      */
     async addAccount(sk, partialAddress) {
-        const { publicKeysHash, masterNullifierSecretKey, masterIncomingViewingSecretKey, masterOutgoingViewingSecretKey, masterTaggingSecretKey, masterNullifierPublicKey, masterIncomingViewingPublicKey, masterOutgoingViewingPublicKey, masterTaggingPublicKey, } = deriveKeys(sk);
-        // We hash the partial address and the public keys hash to get the account address
-        // TODO(#5726): Move the following line to AztecAddress class?
-        const accountAddressFr = poseidon2Hash([publicKeysHash, partialAddress, GeneratorIndex.CONTRACT_ADDRESS_V1]);
-        const accountAddress = AztecAddress.fromField(accountAddressFr);
+        const { masterNullifierSecretKey, masterIncomingViewingSecretKey, masterOutgoingViewingSecretKey, masterTaggingSecretKey, publicKeys, } = deriveKeys(sk);
+        const publicKeysHash = publicKeys.hash();
+        const accountAddress = computeAddress(publicKeysHash, partialAddress);
         // We save the keys to db
         await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-public_keys_hash`, publicKeysHash.toBuffer());
         await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-nsk_m`, masterNullifierSecretKey.toBuffer());
         await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-ivsk_m`, masterIncomingViewingSecretKey.toBuffer());
         await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-ovsk_m`, masterOutgoingViewingSecretKey.toBuffer());
         await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-tsk_m`, masterTaggingSecretKey.toBuffer());
-        await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-npk_m`, masterNullifierPublicKey.toBuffer());
-        await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-ivpk_m`, masterIncomingViewingPublicKey.toBuffer());
-        await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-ovpk_m`, masterOutgoingViewingPublicKey.toBuffer());
-        await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-tpk_m`, masterTaggingPublicKey.toBuffer());
+        await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-npk_m`, publicKeys.masterNullifierPublicKey.toBuffer());
+        await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-ivpk_m`, publicKeys.masterIncomingViewingPublicKey.toBuffer());
+        await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-ovpk_m`, publicKeys.masterOutgoingViewingPublicKey.toBuffer());
+        await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-tpk_m`, publicKeys.masterTaggingPublicKey.toBuffer());
         // At last, we return the newly derived account address
-        return Promise.resolve(accountAddress);
+        return Promise.resolve(new CompleteAddress(accountAddress, publicKeys, partialAddress));
     }
     /**
      * Retrieves addresses of accounts stored in the key store.
@@ -224,13 +222,6 @@ export class TestKeyStore {
         }
         return Promise.resolve(Fr.fromBuffer(publicKeysHashBuffer));
     }
-    // TODO(#5834): Re-add separation between recipients and accounts in keystore.
-    async addPublicKeysForAccount(accountAddress, masterNullifierPublicKey, masterIncomingViewingPublicKey, masterOutgoingViewingPublicKey, masterTaggingPublicKey) {
-        await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-npk_m`, masterNullifierPublicKey.toBuffer());
-        await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-ivpk_m`, masterIncomingViewingPublicKey.toBuffer());
-        await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-ovpk_m`, masterOutgoingViewingPublicKey.toBuffer());
-        await __classPrivateFieldGet(this, _TestKeyStore_keys, "f").set(`${accountAddress.toString()}-tpk_m`, masterTaggingPublicKey.toBuffer());
-    }
 }
 _TestKeyStore_keys = new WeakMap();
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test_key_store.js","sourceRoot":"","sources":["../src/test_key_store.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test_key_store.js","sourceRoot":"","sources":["../src/test_key_store.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/key-store",
-  "version": "0.38.0",
+  "version": "0.40.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -45,10 +45,10 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.38.0",
-    "@aztec/circuits.js": "0.38.0",
-    "@aztec/foundation": "0.38.0",
-    "@aztec/kv-store": "0.38.0",
+    "@aztec/circuit-types": "0.40.0",
+    "@aztec/circuits.js": "0.40.0",
+    "@aztec/foundation": "0.40.0",
+    "@aztec/kv-store": "0.40.0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

package/src/test_key_store.ts

@@ -1,12 +1,14 @@
 import { type KeyStore, type PublicKey } from '@aztec/circuit-types';
 import {
   AztecAddress,
+  CompleteAddress,
   Fr,
   GeneratorIndex,
   type GrumpkinPrivateKey,
   GrumpkinScalar,
   type PartialAddress,
   Point,
+  computeAddress,
   computeAppNullifierSecretKey,
   deriveKeys,
 } from '@aztec/circuits.js';
@@ -26,9 +28,9 @@ export class TestKeyStore implements KeyStore {
 
   /**
    * Creates a new account from a randomly generated secret key.
-   * @returns A promise that resolves to the newly created account's AztecAddress.
+   * @returns A promise that resolves to the newly created account's CompleteAddress.
    */
-  public createAccount(): Promise<AztecAddress> {
+  public createAccount(): Promise<CompleteAddress> {
     const sk = Fr.random();
     const partialAddress = Fr.random();
     return this.addAccount(sk, partialAddress);
@@ -38,25 +40,19 @@ export class TestKeyStore implements KeyStore {
    * 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 address.
+   * @returns The account's complete address.
    */
-  public async addAccount(sk: Fr, partialAddress: PartialAddress): Promise<AztecAddress> {
+  public async addAccount(sk: Fr, partialAddress: PartialAddress): Promise<CompleteAddress> {
     const {
-      publicKeysHash,
       masterNullifierSecretKey,
       masterIncomingViewingSecretKey,
       masterOutgoingViewingSecretKey,
       masterTaggingSecretKey,
-      masterNullifierPublicKey,
-      masterIncomingViewingPublicKey,
-      masterOutgoingViewingPublicKey,
-      masterTaggingPublicKey,
+      publicKeys,
     } = deriveKeys(sk);
 
-    // We hash the partial address and the public keys hash to get the account address
-    // TODO(#5726): Move the following line to AztecAddress class?
-    const accountAddressFr = poseidon2Hash([publicKeysHash, partialAddress, GeneratorIndex.CONTRACT_ADDRESS_V1]);
-    const accountAddress = AztecAddress.fromField(accountAddressFr);
+    const publicKeysHash = publicKeys.hash();
+    const accountAddress = computeAddress(publicKeysHash, partialAddress);
 
     // We save the keys to db
     await this.#keys.set(`${accountAddress.toString()}-public_keys_hash`, publicKeysHash.toBuffer());
@@ -66,13 +62,13 @@ export class TestKeyStore implements KeyStore {
     await this.#keys.set(`${accountAddress.toString()}-ovsk_m`, masterOutgoingViewingSecretKey.toBuffer());
     await this.#keys.set(`${accountAddress.toString()}-tsk_m`, masterTaggingSecretKey.toBuffer());
 
-    await this.#keys.set(`${accountAddress.toString()}-npk_m`, masterNullifierPublicKey.toBuffer());
-    await this.#keys.set(`${accountAddress.toString()}-ivpk_m`, masterIncomingViewingPublicKey.toBuffer());
-    await this.#keys.set(`${accountAddress.toString()}-ovpk_m`, masterOutgoingViewingPublicKey.toBuffer());
-    await this.#keys.set(`${accountAddress.toString()}-tpk_m`, masterTaggingPublicKey.toBuffer());
+    await this.#keys.set(`${accountAddress.toString()}-npk_m`, publicKeys.masterNullifierPublicKey.toBuffer());
+    await this.#keys.set(`${accountAddress.toString()}-ivpk_m`, publicKeys.masterIncomingViewingPublicKey.toBuffer());
+    await this.#keys.set(`${accountAddress.toString()}-ovpk_m`, publicKeys.masterOutgoingViewingPublicKey.toBuffer());
+    await this.#keys.set(`${accountAddress.toString()}-tpk_m`, publicKeys.masterTaggingPublicKey.toBuffer());
 
     // At last, we return the newly derived account address
-    return Promise.resolve(accountAddress);
+    return Promise.resolve(new CompleteAddress(accountAddress, publicKeys, partialAddress));
   }
 
   /**
@@ -292,18 +288,4 @@ export class TestKeyStore implements KeyStore {
     }
     return Promise.resolve(Fr.fromBuffer(publicKeysHashBuffer));
   }
-
-  // TODO(#5834): Re-add separation between recipients and accounts in keystore.
-  public async addPublicKeysForAccount(
-    accountAddress: AztecAddress,
-    masterNullifierPublicKey: Point,
-    masterIncomingViewingPublicKey: Point,
-    masterOutgoingViewingPublicKey: Point,
-    masterTaggingPublicKey: Point,
-  ): Promise<void> {
-    await this.#keys.set(`${accountAddress.toString()}-npk_m`, masterNullifierPublicKey.toBuffer());
-    await this.#keys.set(`${accountAddress.toString()}-ivpk_m`, masterIncomingViewingPublicKey.toBuffer());
-    await this.#keys.set(`${accountAddress.toString()}-ovpk_m`, masterOutgoingViewingPublicKey.toBuffer());
-    await this.#keys.set(`${accountAddress.toString()}-tpk_m`, masterTaggingPublicKey.toBuffer());
-  }
 }