WIP

AztecProtocol · May 3, 2024 · aa6aa1b · aa6aa1b
1 parent 18c66c0
commit aa6aa1b
Show file tree

Hide file tree

Showing 3 changed files with 117 additions and 292 deletions.
diff --git a/noir-projects/noir-contracts/contracts/test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test_contract/src/main.nr
@@ -435,7 +435,7 @@ contract Test {
         address: AztecAddress,
         public_nullifying_key: GrumpkinPoint,
     ) {
-        assert_eq(get_npk_m(&mut context, address), poseidon2_hash(public_nullifying_key.serialize()));
+        assert_eq(get_npk_m(&mut context, address), public_nullifying_key);
     }
 
     #[aztec(public)]

diff --git a/yarn-project/circuits.js/src/keys/index.ts b/yarn-project/circuits.js/src/keys/index.ts
@@ -5,6 +5,7 @@ import { type Fr, type GrumpkinScalar } from '@aztec/foundation/fields';
 import { Grumpkin } from '../barretenberg/crypto/grumpkin/index.js';
 import { GeneratorIndex } from '../constants.gen.js';
 import { type GrumpkinPrivateKey } from '../types/grumpkin_private_key.js';
+import { type PublicKey } from '../types/public_key.js';
 
 export function computeAppNullifierSecretKey(masterNullifierSecretKey: GrumpkinPrivateKey, app: AztecAddress): Fr {
   return poseidon2Hash([masterNullifierSecretKey.high, masterNullifierSecretKey.low, app, GeneratorIndex.NSK_M]);
@@ -23,6 +24,21 @@ export function deriveSigningKey(secretKey: Fr): GrumpkinScalar {
   return sha512ToGrumpkinScalar([secretKey, GeneratorIndex.IVSK_M]);
 }
 
+export function computePublicKeysHash(
+  masterNullifierPublicKey: PublicKey,
+  masterIncomingViewingPublicKey: PublicKey,
+  masterOutgoingViewingPublicKey: PublicKey,
+  masterTaggingPublicKey: PublicKey,
+): Fr {
+  return poseidon2Hash([
+    masterNullifierPublicKey,
+    masterIncomingViewingPublicKey,
+    masterOutgoingViewingPublicKey,
+    masterTaggingPublicKey,
+    GeneratorIndex.PUBLIC_KEYS_HASH,
+  ]);
+}
+
 /**
  * Computes secret and public keys and public keys hash from a secret key.
  * @param secretKey - The secret key to derive keys from.
@@ -44,13 +60,12 @@ export function deriveKeys(secretKey: Fr) {
   const masterTaggingPublicKey = curve.mul(curve.generator(), masterTaggingSecretKey);
 
   // We hash the public keys to get the public keys hash
-  const publicKeysHash = poseidon2Hash([
+  const publicKeysHash = computePublicKeysHash(
     masterNullifierPublicKey,
     masterIncomingViewingPublicKey,
     masterOutgoingViewingPublicKey,
     masterTaggingPublicKey,
-    GeneratorIndex.PUBLIC_KEYS_HASH,
-  ]);
+  );
 
   return {
     masterNullifierSecretKey,