@aztec/stdlib 0.0.1-commit.e3c1de76 → 0.0.1-commit.e57c76e

package/dest/keys/derivation.js

@@ -1,14 +1,15 @@
-import { GeneratorIndex } from '@aztec/constants';
+import { DEFAULT_FBPK_M_HASH, DEFAULT_MSPK_M_HASH, DomainSeparator } from '@aztec/constants';
 import { Grumpkin } from '@aztec/foundation/crypto/grumpkin';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
 import { sha512ToGrumpkinScalar } from '@aztec/foundation/crypto/sha512';
 import { Fq, Fr } from '@aztec/foundation/curves/bn254';
 import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { AztecAddress } from '../aztec-address/index.js';
+import { hashPublicKey } from './public_key.js';
 import { PublicKeys } from './public_keys.js';
 import { getKeyGenerator } from './utils.js';
-export function computeAppNullifierSecretKey(masterNullifierSecretKey, app) {
-    return computeAppSecretKey(masterNullifierSecretKey, app, 'n'); // 'n' is the key prefix for nullifier secret key
+export function computeAppNullifierHidingKey(masterNullifierHidingKey, app) {
+    return computeAppSecretKey(masterNullifierHidingKey, app, 'n'); // 'n' is the key prefix for nullifier hiding key
 }
 export function computeAppSecretKey(skM, app, keyPrefix) {
     const generator = getKeyGenerator(keyPrefix);
@@ -24,44 +25,44 @@ export async function computeOvskApp(ovsk, app) {
     // P = s * G will not be uniform because 2 * (q - r) / q is small.
     return GrumpkinScalar.fromBuffer(ovskAppFr.toBuffer());
 }
-export function deriveMasterNullifierSecretKey(secretKey) {
+export function deriveMasterNullifierHidingKey(secretKey) {
     return sha512ToGrumpkinScalar([
         secretKey,
-        GeneratorIndex.NSK_M
+        DomainSeparator.NHK_M
     ]);
 }
 export function deriveMasterIncomingViewingSecretKey(secretKey) {
     return sha512ToGrumpkinScalar([
         secretKey,
-        GeneratorIndex.IVSK_M
+        DomainSeparator.IVSK_M
     ]);
 }
 export function deriveMasterOutgoingViewingSecretKey(secretKey) {
     return sha512ToGrumpkinScalar([
         secretKey,
-        GeneratorIndex.OVSK_M
+        DomainSeparator.OVSK_M
     ]);
 }
 export function deriveSigningKey(secretKey) {
     // TODO(#5837): come up with a standard signing key derivation scheme instead of using ivsk_m as signing keys here
     return sha512ToGrumpkinScalar([
         secretKey,
-        GeneratorIndex.IVSK_M
+        DomainSeparator.IVSK_M
     ]);
 }
 export function computePreaddress(publicKeysHash, partialAddress) {
     return poseidon2HashWithSeparator([
         publicKeysHash,
         partialAddress
-    ], GeneratorIndex.CONTRACT_ADDRESS_V1);
+    ], DomainSeparator.CONTRACT_ADDRESS_V2);
 }
 export async function computeAddress(publicKeys, partialAddress) {
     // Given public keys and a partial address, we can compute our address in the following steps.
-    // 1. preaddress = poseidon2([publicKeysHash, partialAddress], GeneratorIndex.CONTRACT_ADDRESS_V1);
+    // 1. preaddress = poseidon2([publicKeysHash, partialAddress], DomainSeparator.CONTRACT_ADDRESS_V2);
     // 2. addressPoint = (preaddress * G) + ivpk_m
     // 3. address = addressPoint.x
     const preaddress = await computePreaddress(await publicKeys.hash(), partialAddress);
-    const address = await Grumpkin.add(await derivePublicKeyFromSecretKey(new Fq(preaddress.toBigInt())), publicKeys.masterIncomingViewingPublicKey);
+    const address = await Grumpkin.add(await derivePublicKeyFromSecretKey(new Fq(preaddress.toBigInt())), publicKeys.ivpkM);
     return new AztecAddress(address.x);
 }
 export async function computeAddressSecret(preaddress, ivsk) {
@@ -91,27 +92,36 @@ export function derivePublicKeyFromSecretKey(secretKey) {
  * @param secretKey - The secret key to derive keys from.
  * @returns The derived keys.
  */ export async function deriveKeys(secretKey) {
-    // First we derive master secret keys -  we use sha512 here because this derivation will never take place
+    // First we derive master secret/hiding keys -  we use sha512 here because this derivation will never take place
     // in a circuit
-    const masterNullifierSecretKey = deriveMasterNullifierSecretKey(secretKey);
+    const masterNullifierHidingKey = deriveMasterNullifierHidingKey(secretKey);
     const masterIncomingViewingSecretKey = deriveMasterIncomingViewingSecretKey(secretKey);
     const masterOutgoingViewingSecretKey = deriveMasterOutgoingViewingSecretKey(secretKey);
     const masterTaggingSecretKey = sha512ToGrumpkinScalar([
         secretKey,
-        GeneratorIndex.TSK_M
+        DomainSeparator.TSK_M
     ]);
     // Then we derive master public keys
-    const masterNullifierPublicKey = await derivePublicKeyFromSecretKey(masterNullifierSecretKey);
+    const masterNullifierPublicKey = await derivePublicKeyFromSecretKey(masterNullifierHidingKey);
     const masterIncomingViewingPublicKey = await derivePublicKeyFromSecretKey(masterIncomingViewingSecretKey);
     const masterOutgoingViewingPublicKey = await derivePublicKeyFromSecretKey(masterOutgoingViewingSecretKey);
     const masterTaggingPublicKey = await derivePublicKeyFromSecretKey(masterTaggingSecretKey);
-    // We hash the public keys to get the public keys hash
-    const publicKeys = new PublicKeys(masterNullifierPublicKey, masterIncomingViewingPublicKey, masterOutgoingViewingPublicKey, masterTaggingPublicKey);
+    // The non-owner-visible PublicKeys carries hashes for npk/ovpk/tpk/mspk/fbpk and the raw
+    // point only for ivpk_m. The npk/ovpk/tpk raw points are also returned alongside so the key
+    // store can persist them under `${account}-{n|ov|t}pk_m` (only their hashes live in publicKeys).
+    // The ivpk_m point isn't returned separately because it already lives in publicKeys.ivpkM.
+    //
+    // TODO: There isn't a derivation path for the message signing(msk) and fallback(fbk) keys yet. So we just use the the
+    // default values for now.
+    const publicKeys = new PublicKeys(await hashPublicKey(masterNullifierPublicKey), masterIncomingViewingPublicKey, await hashPublicKey(masterOutgoingViewingPublicKey), await hashPublicKey(masterTaggingPublicKey), new Fr(DEFAULT_MSPK_M_HASH), new Fr(DEFAULT_FBPK_M_HASH));
     return {
-        masterNullifierSecretKey,
+        masterNullifierHidingKey,
         masterIncomingViewingSecretKey,
         masterOutgoingViewingSecretKey,
         masterTaggingSecretKey,
+        masterNullifierPublicKey,
+        masterOutgoingViewingPublicKey,
+        masterTaggingPublicKey,
         publicKeys
     };
 }

package/dest/keys/key_types.d.ts

@@ -1,5 +1,5 @@
-import type { GeneratorIndex } from '@aztec/constants';
-export type KeyGenerator = GeneratorIndex.NSK_M | GeneratorIndex.IVSK_M | GeneratorIndex.OVSK_M | GeneratorIndex.TSK_M;
+import type { DomainSeparator } from '@aztec/constants';
+export type KeyGenerator = DomainSeparator.NHK_M | DomainSeparator.IVSK_M | DomainSeparator.OVSK_M | DomainSeparator.TSK_M;
 export type KeyPrefix = 'n' | 'iv' | 'ov' | 't';
 export declare const KEY_PREFIXES: KeyPrefix[];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5X3R5cGVzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2V5cy9rZXlfdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFdkQsTUFBTSxNQUFNLFlBQVksR0FBRyxjQUFjLENBQUMsS0FBSyxHQUFHLGNBQWMsQ0FBQyxNQUFNLEdBQUcsY0FBYyxDQUFDLE1BQU0sR0FBRyxjQUFjLENBQUMsS0FBSyxDQUFDO0FBQ3ZILE1BQU0sTUFBTSxTQUFTLEdBQUcsR0FBRyxHQUFHLElBQUksR0FBRyxJQUFJLEdBQUcsR0FBRyxDQUFDO0FBQ2hELGVBQU8sTUFBTSxZQUFZLEVBQUUsU0FBUyxFQUEyQixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5X3R5cGVzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2V5cy9rZXlfdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFeEQsTUFBTSxNQUFNLFlBQVksR0FDcEIsZUFBZSxDQUFDLEtBQUssR0FDckIsZUFBZSxDQUFDLE1BQU0sR0FDdEIsZUFBZSxDQUFDLE1BQU0sR0FDdEIsZUFBZSxDQUFDLEtBQUssQ0FBQztBQUMxQixNQUFNLE1BQU0sU0FBUyxHQUFHLEdBQUcsR0FBRyxJQUFJLEdBQUcsSUFBSSxHQUFHLEdBQUcsQ0FBQztBQUNoRCxlQUFPLE1BQU0sWUFBWSxFQUFFLFNBQVMsRUFBMkIsQ0FBQyJ9

package/dest/keys/key_types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"key_types.d.ts","sourceRoot":"","sources":["../../src/keys/key_types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,MAAM,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,GAAG,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC;AACvH,MAAM,MAAM,SAAS,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,GAAG,GAAG,CAAC;AAChD,eAAO,MAAM,YAAY,EAAE,SAAS,EAA2B,CAAC"}
+{"version":3,"file":"key_types.d.ts","sourceRoot":"","sources":["../../src/keys/key_types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,MAAM,MAAM,YAAY,GACpB,eAAe,CAAC,KAAK,GACrB,eAAe,CAAC,MAAM,GACtB,eAAe,CAAC,MAAM,GACtB,eAAe,CAAC,KAAK,CAAC;AAC1B,MAAM,MAAM,SAAS,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,GAAG,GAAG,CAAC;AAChD,eAAO,MAAM,YAAY,EAAE,SAAS,EAA2B,CAAC"}

package/dest/keys/public_key.d.ts

@@ -1,4 +1,23 @@
-import type { Point } from '@aztec/foundation/curves/grumpkin';
-/** Represents a user public key. */
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { Point } from '@aztec/foundation/curves/grumpkin';
+/**
+ * Hashes a public key.
+ *
+ * Mirrors Noir's `hash_public_key` in `noir-protocol-circuits/crates/types/src/public_keys.nr`:
+ * `Poseidon2(DOM_SEP__SINGLE_PUBLIC_KEY_HASH, [pk.x, pk.y])`.
+ *
+ * This is distinct from Noir's generic `Hash` impl for `EmbeddedCurvePoint` (`noir_stdlib/src/embedded_curve_ops.nr`),
+ * which simply absorbs `x` then `y` into a `Hasher` state with no domain separator. That generic impl is unsuitable
+ * for hashing keys at the protocol boundary, where the domain separator is required to prevent collisions with hashes
+ * of other Grumpkin points (e.g. note commitments, nullifiers).
+ */
+export declare function hashPublicKey(pk: PublicKey): Promise<Fr>;
+/**
+ * Represents a user public key.
+ *
+ * Structurally identical to a Grumpkin `Point`; exposed as a distinct name so call sites read as "public key" where
+ * that's the domain meaning.
+ */
 export type PublicKey = Point;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2tleS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tleXMvcHVibGljX2tleS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUUvRCxvQ0FBb0M7QUFDcEMsTUFBTSxNQUFNLFNBQVMsR0FBRyxLQUFLLENBQUMifQ==
+export declare const PublicKey: typeof Point;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2tleS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tleXMvcHVibGljX2tleS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBRTFEOzs7Ozs7Ozs7O0dBVUc7QUFDSCx3QkFBZ0IsYUFBYSxDQUFDLEVBQUUsRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUV4RDtBQUVEOzs7OztHQUtHO0FBQ0gsTUFBTSxNQUFNLFNBQVMsR0FBRyxLQUFLLENBQUM7QUFDOUIsZUFBTyxNQUFNLFNBQVMsY0FBUSxDQUFDIn0=

package/dest/keys/public_key.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_key.d.ts","sourceRoot":"","sources":["../../src/keys/public_key.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAE/D,oCAAoC;AACpC,MAAM,MAAM,SAAS,GAAG,KAAK,CAAC"}
+{"version":3,"file":"public_key.d.ts","sourceRoot":"","sources":["../../src/keys/public_key.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAE1D;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,CAExD;AAED;;;;;GAKG;AACH,MAAM,MAAM,SAAS,GAAG,KAAK,CAAC;AAC9B,eAAO,MAAM,SAAS,cAAQ,CAAC"}

package/dest/keys/public_key.js

@@ -1 +1,20 @@
-/** Represents a user public key. */ export { };
+import { DomainSeparator } from '@aztec/constants';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
+import { Point } from '@aztec/foundation/curves/grumpkin';
+/**
+ * Hashes a public key.
+ *
+ * Mirrors Noir's `hash_public_key` in `noir-protocol-circuits/crates/types/src/public_keys.nr`:
+ * `Poseidon2(DOM_SEP__SINGLE_PUBLIC_KEY_HASH, [pk.x, pk.y])`.
+ *
+ * This is distinct from Noir's generic `Hash` impl for `EmbeddedCurvePoint` (`noir_stdlib/src/embedded_curve_ops.nr`),
+ * which simply absorbs `x` then `y` into a `Hasher` state with no domain separator. That generic impl is unsuitable
+ * for hashing keys at the protocol boundary, where the domain separator is required to prevent collisions with hashes
+ * of other Grumpkin points (e.g. note commitments, nullifiers).
+ */ export function hashPublicKey(pk) {
+    return poseidon2HashWithSeparator([
+        pk.x,
+        pk.y
+    ], DomainSeparator.SINGLE_PUBLIC_KEY_HASH);
+}
+export const PublicKey = Point;

package/dest/keys/public_keys.d.ts

@@ -1,68 +1,65 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { Point } from '@aztec/foundation/curves/grumpkin';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
-import type { PublicKey } from './public_key.js';
+import { PublicKey } from './public_key.js';
+/**
+ * A non-owner's view of an account's master public keys.
+ *
+ * Only `ivpkM` is exposed as a point (since address derivation needs the curve
+ * point in-circuit); the other five keys are exposed as their `hashPublicKey` digests.
+ */
 export declare class PublicKeys {
-    /** Master nullifier public key */
-    masterNullifierPublicKey: PublicKey;
+    /** Hash of the master nullifier public key */
+    npkMHash: Fr;
     /** Master incoming viewing public key */
-    masterIncomingViewingPublicKey: PublicKey;
-    /** Master outgoing viewing public key */
-    masterOutgoingViewingPublicKey: PublicKey;
-    /** Master tagging viewing public key */
-    masterTaggingPublicKey: PublicKey;
+    ivpkM: PublicKey;
+    /** Hash of the master outgoing viewing public key */
+    ovpkMHash: Fr;
+    /** Hash of the master tagging public key */
+    tpkMHash: Fr;
+    /** Hash of the master message-signing public key */
+    mspkMHash: Fr;
+    /** Hash of the master fallback public key */
+    fbpkMHash: Fr;
     constructor(
-    /** Master nullifier public key */
-    masterNullifierPublicKey: PublicKey, 
+    /** Hash of the master nullifier public key */
+    npkMHash: Fr, 
     /** Master incoming viewing public key */
-    masterIncomingViewingPublicKey: PublicKey, 
-    /** Master outgoing viewing public key */
-    masterOutgoingViewingPublicKey: PublicKey, 
-    /** Master tagging viewing public key */
-    masterTaggingPublicKey: PublicKey);
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        masterNullifierPublicKey: z.ZodType<Point, any, string>;
-        masterIncomingViewingPublicKey: z.ZodType<Point, any, string>;
-        masterOutgoingViewingPublicKey: z.ZodType<Point, any, string>;
-        masterTaggingPublicKey: z.ZodType<Point, any, string>;
-    }, "strip", z.ZodTypeAny, {
-        masterNullifierPublicKey: Point;
-        masterIncomingViewingPublicKey: Point;
-        masterOutgoingViewingPublicKey: Point;
-        masterTaggingPublicKey: Point;
-    }, {
-        masterNullifierPublicKey: string;
-        masterIncomingViewingPublicKey: string;
-        masterOutgoingViewingPublicKey: string;
-        masterTaggingPublicKey: string;
-    }>, PublicKeys, {
-        masterNullifierPublicKey: string;
-        masterIncomingViewingPublicKey: string;
-        masterOutgoingViewingPublicKey: string;
-        masterTaggingPublicKey: string;
-    }>;
+    ivpkM: PublicKey, 
+    /** Hash of the master outgoing viewing public key */
+    ovpkMHash: Fr, 
+    /** Hash of the master tagging public key */
+    tpkMHash: Fr, 
+    /** Hash of the master message-signing public key */
+    mspkMHash: Fr, 
+    /** Hash of the master fallback public key */
+    fbpkMHash: Fr);
+    static get schema(): z.ZodPipe<z.ZodObject<{
+        npkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        ivpkM: z.ZodType<import("@aztec/foundation/schemas").Point, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Point, string>>;
+        ovpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        tpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        mspkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        fbpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+    }, z.core.$strip>, z.ZodTransform<PublicKeys, {
+        npkMHash: Fr;
+        ivpkM: import("@aztec/foundation/schemas").Point;
+        ovpkMHash: Fr;
+        tpkMHash: Fr;
+        mspkMHash: Fr;
+        fbpkMHash: Fr;
+    }>>;
     static from(fields: FieldsOf<PublicKeys>): PublicKeys;
     /**
      * Creates a PublicKeys from a plain object without Zod validation.
-     * This method is optimized for performance and skips validation, making it suitable
-     * for deserializing trusted data (e.g., from C++ via MessagePack).
-     * @param obj - Plain object containing PublicKeys fields
-     * @returns A PublicKeys instance
+     * Suitable for deserializing trusted data (e.g., from C++ via MessagePack).
      */
     static fromPlainObject(obj: any): PublicKeys;
-    hash(): Fr | Promise<Fr>;
+    hash(): Promise<Fr>;
     isEmpty(): boolean;
     static default(): PublicKeys;
     static random(): Promise<PublicKeys>;
-    /**
-     * Determines if this PublicKeys instance is equal to the given PublicKeys instance.
-     * Equality is based on the content of their respective buffers.
-     *
-     * @param other - The PublicKeys instance to compare against.
-     * @returns True if the buffers of both instances are equal, false otherwise.
-     */
     equals(other: PublicKeys): boolean;
     /**
      * Converts the PublicKeys instance into a Buffer.
@@ -71,48 +68,24 @@ export declare class PublicKeys {
      * @returns A Buffer representation of the PublicKeys instance.
      */
     toBuffer(): Buffer;
-    /**
-     * Creates an PublicKeys instance from a given buffer or BufferReader.
-     * If the input is a Buffer, it wraps it in a BufferReader before processing.
-     * Throws an error if the input length is not equal to the expected size.
-     *
-     * @param buffer - The input buffer or BufferReader containing the address data.
-     * @returns - A new PublicKeys instance with the extracted address data.
-     */
     static fromBuffer(buffer: Buffer | BufferReader): PublicKeys;
     toNoirStruct(): {
-        npk_m: {
-            inner: {
-                x: Fr;
-                y: Fr;
-                is_infinite: boolean;
-            };
-        };
+        npk_m_hash: Fr;
         ivpk_m: {
             inner: {
                 x: Fr;
                 y: Fr;
-                is_infinite: boolean;
-            };
-        };
-        ovpk_m: {
-            inner: {
-                x: Fr;
-                y: Fr;
-                is_infinite: boolean;
-            };
-        };
-        tpk_m: {
-            inner: {
-                x: Fr;
-                y: Fr;
-                is_infinite: boolean;
             };
         };
+        ovpk_m_hash: Fr;
+        tpk_m_hash: Fr;
+        mspk_m_hash: Fr;
+        fbpk_m_hash: Fr;
     };
     /**
-     * Serializes the payload to an array of fields
-     * @returns The fields of the payload
+     * Wire-format fields matching Noir's struct flattening of `PublicKeys`:
+     * `[npk_m_hash, ivpk_m.x, ivpk_m.y, ovpk_m_hash, tpk_m_hash, mspk_m_hash, fbpk_m_hash]`
+     * (7 fields).
      */
     toFields(): Fr[];
     encodeToNoir(): Fr[];
@@ -120,4 +93,4 @@ export declare class PublicKeys {
     toString(): `0x${string}`;
     static fromString(keys: string): PublicKeys;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2tleXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXlzL3B1YmxpY19rZXlzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVlBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFMUQsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFM0YsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFeEQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUVqRCxxQkFBYSxVQUFVO0lBRW5CLGtDQUFrQztJQUMzQix3QkFBd0IsRUFBRSxTQUFTO0lBQzFDLHlDQUF5QztJQUNsQyw4QkFBOEIsRUFBRSxTQUFTO0lBQ2hELHlDQUF5QztJQUNsQyw4QkFBOEIsRUFBRSxTQUFTO0lBQ2hELHdDQUF3QztJQUNqQyxzQkFBc0IsRUFBRSxTQUFTO0lBUjFDO0lBQ0Usa0NBQWtDO0lBQzNCLHdCQUF3QixFQUFFLFNBQVM7SUFDMUMseUNBQXlDO0lBQ2xDLDhCQUE4QixFQUFFLFNBQVM7SUFDaEQseUNBQXlDO0lBQ2xDLDhCQUE4QixFQUFFLFNBQVM7SUFDaEQsd0NBQXdDO0lBQ2pDLHNCQUFzQixFQUFFLFNBQVMsRUFDdEM7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FTaEI7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsVUFBVSxDQUFDLGNBT3ZDO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLFVBQVUsQ0FVM0M7SUFFRCxJQUFJLHFCQVlIO0lBRUQsT0FBTyxZQU9OO0lBRUQsTUFBTSxDQUFDLE9BQU8sSUFBSSxVQUFVLENBTzNCO0lBRUQsT0FBYSxNQUFNLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUV6QztJQUVEOzs7Ozs7T0FNRztJQUNILE1BQU0sQ0FBQyxLQUFLLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FPakM7SUFFRDs7Ozs7T0FLRztJQUNILFFBQVEsSUFBSSxNQUFNLENBT2pCO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsVUFBVSxDQVkzRDtJQUVELFlBQVk7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O01BWVg7SUFFRDs7O09BR0c7SUFDSCxRQUFRLElBQUksRUFBRSxFQUFFLENBT2Y7SUFJRCxZQUFZLElBQUksRUFBRSxFQUFFLENBRW5CO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxHQUFHLFVBQVUsQ0FReEQ7SUFFRCxRQUFRLGtCQUVQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxjQUU3QjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2tleXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXlzL3B1YmxpY19rZXlzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVdBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUUzRixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxTQUFTLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFFM0Q7Ozs7O0dBS0c7QUFDSCxxQkFBYSxVQUFVO0lBRW5CLDhDQUE4QztJQUN2QyxRQUFRLEVBQUUsRUFBRTtJQUNuQix5Q0FBeUM7SUFDbEMsS0FBSyxFQUFFLFNBQVM7SUFDdkIscURBQXFEO0lBQzlDLFNBQVMsRUFBRSxFQUFFO0lBQ3BCLDRDQUE0QztJQUNyQyxRQUFRLEVBQUUsRUFBRTtJQUNuQixvREFBb0Q7SUFDN0MsU0FBUyxFQUFFLEVBQUU7SUFDcEIsNkNBQTZDO0lBQ3RDLFNBQVMsRUFBRSxFQUFFO0lBWnRCO0lBQ0UsOENBQThDO0lBQ3ZDLFFBQVEsRUFBRSxFQUFFO0lBQ25CLHlDQUF5QztJQUNsQyxLQUFLLEVBQUUsU0FBUztJQUN2QixxREFBcUQ7SUFDOUMsU0FBUyxFQUFFLEVBQUU7SUFDcEIsNENBQTRDO0lBQ3JDLFFBQVEsRUFBRSxFQUFFO0lBQ25CLG9EQUFvRDtJQUM3QyxTQUFTLEVBQUUsRUFBRTtJQUNwQiw2Q0FBNkM7SUFDdEMsU0FBUyxFQUFFLEVBQUUsRUFDbEI7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7UUFXaEI7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsVUFBVSxDQUFDLGNBU3ZDO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLFVBQVUsQ0FZM0M7SUFFSyxJQUFJLGdCQVlUO0lBRUQsT0FBTyxZQVNOO0lBRUQsTUFBTSxDQUFDLE9BQU8sSUFBSSxVQUFVLENBYzNCO0lBRUQsT0FBYSxNQUFNLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQWN6QztJQUVELE1BQU0sQ0FBQyxLQUFLLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FTakM7SUFFRDs7Ozs7T0FLRztJQUNILFFBQVEsSUFBSSxNQUFNLENBU2pCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxVQUFVLENBUzNEO0lBRUQsWUFBWTs7Ozs7Ozs7Ozs7O01BWVg7SUFFRDs7OztPQUlHO0lBQ0gsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQUVmO0lBR0QsWUFBWSxJQUFJLEVBQUUsRUFBRSxDQUVuQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsR0FBRyxVQUFVLENBU3hEO0lBRUQsUUFBUSxrQkFFUDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLE1BQU0sY0FFN0I7Q0FDRiJ9

package/dest/keys/public_keys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_keys.d.ts","sourceRoot":"","sources":["../../src/keys/public_keys.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,qBAAa,UAAU;IAEnB,kCAAkC;IAC3B,wBAAwB,EAAE,SAAS;IAC1C,yCAAyC;IAClC,8BAA8B,EAAE,SAAS;IAChD,yCAAyC;IAClC,8BAA8B,EAAE,SAAS;IAChD,wCAAwC;IACjC,sBAAsB,EAAE,SAAS;IAR1C;IACE,kCAAkC;IAC3B,wBAAwB,EAAE,SAAS;IAC1C,yCAAyC;IAClC,8BAA8B,EAAE,SAAS;IAChD,yCAAyC;IAClC,8BAA8B,EAAE,SAAS;IAChD,wCAAwC;IACjC,sBAAsB,EAAE,SAAS,EACtC;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;OAShB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,cAOvC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,CAU3C;IAED,IAAI,qBAYH;IAED,OAAO,YAON;IAED,MAAM,CAAC,OAAO,IAAI,UAAU,CAO3B;IAED,OAAa,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,CAEzC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAOjC;IAED;;;;;OAKG;IACH,QAAQ,IAAI,MAAM,CAOjB;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,UAAU,CAY3D;IAED,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAYX;IAED;;;OAGG;IACH,QAAQ,IAAI,EAAE,EAAE,CAOf;IAID,YAAY,IAAI,EAAE,EAAE,CAEnB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,UAAU,CAQxD;IAED,QAAQ,kBAEP;IAED,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,cAE7B;CACF"}
+{"version":3,"file":"public_keys.d.ts","sourceRoot":"","sources":["../../src/keys/public_keys.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,SAAS,EAAiB,MAAM,iBAAiB,CAAC;AAE3D;;;;;GAKG;AACH,qBAAa,UAAU;IAEnB,8CAA8C;IACvC,QAAQ,EAAE,EAAE;IACnB,yCAAyC;IAClC,KAAK,EAAE,SAAS;IACvB,qDAAqD;IAC9C,SAAS,EAAE,EAAE;IACpB,4CAA4C;IACrC,QAAQ,EAAE,EAAE;IACnB,oDAAoD;IAC7C,SAAS,EAAE,EAAE;IACpB,6CAA6C;IACtC,SAAS,EAAE,EAAE;IAZtB;IACE,8CAA8C;IACvC,QAAQ,EAAE,EAAE;IACnB,yCAAyC;IAClC,KAAK,EAAE,SAAS;IACvB,qDAAqD;IAC9C,SAAS,EAAE,EAAE;IACpB,4CAA4C;IACrC,QAAQ,EAAE,EAAE;IACnB,oDAAoD;IAC7C,SAAS,EAAE,EAAE;IACpB,6CAA6C;IACtC,SAAS,EAAE,EAAE,EAClB;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;QAWhB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,cASvC;IAED;;;OAGG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,CAY3C;IAEK,IAAI,gBAYT;IAED,OAAO,YASN;IAED,MAAM,CAAC,OAAO,IAAI,UAAU,CAc3B;IAED,OAAa,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,CAczC;IAED,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CASjC;IAED;;;;;OAKG;IACH,QAAQ,IAAI,MAAM,CASjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,UAAU,CAS3D;IAED,YAAY;;;;;;;;;;;;MAYX;IAED;;;;OAIG;IACH,QAAQ,IAAI,EAAE,EAAE,CAEf;IAGD,YAAY,IAAI,EAAE,EAAE,CAEnB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,UAAU,CASxD;IAED,QAAQ,kBAEP;IAED,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,cAE7B;CACF"}

package/dest/keys/public_keys.js

@@ -1,70 +1,91 @@
-import { DEFAULT_IVPK_M_X, DEFAULT_IVPK_M_Y, DEFAULT_NPK_M_X, DEFAULT_NPK_M_Y, DEFAULT_OVPK_M_X, DEFAULT_OVPK_M_Y, DEFAULT_TPK_M_X, DEFAULT_TPK_M_Y, GeneratorIndex } from '@aztec/constants';
+import { DEFAULT_FBPK_M_HASH, DEFAULT_IVPK_M_X, DEFAULT_IVPK_M_Y, DEFAULT_MSPK_M_HASH, DEFAULT_NPK_M_HASH, DEFAULT_OVPK_M_HASH, DEFAULT_TPK_M_HASH, DomainSeparator } from '@aztec/constants';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { Point } from '@aztec/foundation/curves/grumpkin';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, withoutHexPrefix } from '@aztec/foundation/string';
 import { z } from 'zod';
-export class PublicKeys {
-    masterNullifierPublicKey;
-    masterIncomingViewingPublicKey;
-    masterOutgoingViewingPublicKey;
-    masterTaggingPublicKey;
-    constructor(/** Master nullifier public key */ masterNullifierPublicKey, /** Master incoming viewing public key */ masterIncomingViewingPublicKey, /** Master outgoing viewing public key */ masterOutgoingViewingPublicKey, /** Master tagging viewing public key */ masterTaggingPublicKey){
-        this.masterNullifierPublicKey = masterNullifierPublicKey;
-        this.masterIncomingViewingPublicKey = masterIncomingViewingPublicKey;
-        this.masterOutgoingViewingPublicKey = masterOutgoingViewingPublicKey;
-        this.masterTaggingPublicKey = masterTaggingPublicKey;
+import { PublicKey, hashPublicKey } from './public_key.js';
+/**
+ * A non-owner's view of an account's master public keys.
+ *
+ * Only `ivpkM` is exposed as a point (since address derivation needs the curve
+ * point in-circuit); the other five keys are exposed as their `hashPublicKey` digests.
+ */ export class PublicKeys {
+    npkMHash;
+    ivpkM;
+    ovpkMHash;
+    tpkMHash;
+    mspkMHash;
+    fbpkMHash;
+    constructor(/** Hash of the master nullifier public key */ npkMHash, /** Master incoming viewing public key */ ivpkM, /** Hash of the master outgoing viewing public key */ ovpkMHash, /** Hash of the master tagging public key */ tpkMHash, /** Hash of the master message-signing public key */ mspkMHash, /** Hash of the master fallback public key */ fbpkMHash){
+        this.npkMHash = npkMHash;
+        this.ivpkM = ivpkM;
+        this.ovpkMHash = ovpkMHash;
+        this.tpkMHash = tpkMHash;
+        this.mspkMHash = mspkMHash;
+        this.fbpkMHash = fbpkMHash;
     }
     static get schema() {
         return z.object({
-            masterNullifierPublicKey: schemas.Point,
-            masterIncomingViewingPublicKey: schemas.Point,
-            masterOutgoingViewingPublicKey: schemas.Point,
-            masterTaggingPublicKey: schemas.Point
+            npkMHash: schemas.Fr,
+            ivpkM: schemas.Point,
+            ovpkMHash: schemas.Fr,
+            tpkMHash: schemas.Fr,
+            mspkMHash: schemas.Fr,
+            fbpkMHash: schemas.Fr
         }).transform(PublicKeys.from);
     }
     static from(fields) {
-        return new PublicKeys(fields.masterNullifierPublicKey, fields.masterIncomingViewingPublicKey, fields.masterOutgoingViewingPublicKey, fields.masterTaggingPublicKey);
+        return new PublicKeys(fields.npkMHash, fields.ivpkM, fields.ovpkMHash, fields.tpkMHash, fields.mspkMHash, fields.fbpkMHash);
     }
     /**
    * Creates a PublicKeys from a plain object without Zod validation.
-   * This method is optimized for performance and skips validation, making it suitable
-   * for deserializing trusted data (e.g., from C++ via MessagePack).
-   * @param obj - Plain object containing PublicKeys fields
-   * @returns A PublicKeys instance
+   * Suitable for deserializing trusted data (e.g., from C++ via MessagePack).
    */ static fromPlainObject(obj) {
         if (obj instanceof PublicKeys) {
             return obj;
         }
-        return new PublicKeys(Point.fromPlainObject(obj.masterNullifierPublicKey), Point.fromPlainObject(obj.masterIncomingViewingPublicKey), Point.fromPlainObject(obj.masterOutgoingViewingPublicKey), Point.fromPlainObject(obj.masterTaggingPublicKey));
+        return new PublicKeys(Fr.fromPlainObject(obj.npkMHash), PublicKey.fromPlainObject(obj.ivpkM), Fr.fromPlainObject(obj.ovpkMHash), Fr.fromPlainObject(obj.tpkMHash), Fr.fromPlainObject(obj.mspkMHash), Fr.fromPlainObject(obj.fbpkMHash));
     }
-    hash() {
-        return this.isEmpty() ? Fr.ZERO : poseidon2HashWithSeparator([
-            this.masterNullifierPublicKey,
-            this.masterIncomingViewingPublicKey,
-            this.masterOutgoingViewingPublicKey,
-            this.masterTaggingPublicKey
-        ], GeneratorIndex.PUBLIC_KEYS_HASH);
+    async hash() {
+        if (this.isEmpty()) {
+            return Fr.ZERO;
+        }
+        // Mirror Noir's `PublicKeys::hash`: hash the six single-key digests under
+        // DOM_SEP__PUBLIC_KEYS_HASH. `ivpk_m` must be reduced to its single-key digest first
+        // (Poseidon2 over [x, y]); passing the Point directly would omit the DOM_SEP__SINGLE_PUBLIC_KEY_HASH
+        const ivpkMHash = await hashPublicKey(this.ivpkM);
+        return poseidon2HashWithSeparator([
+            this.npkMHash,
+            ivpkMHash,
+            this.ovpkMHash,
+            this.tpkMHash,
+            this.mspkMHash,
+            this.fbpkMHash
+        ], DomainSeparator.PUBLIC_KEYS_HASH);
     }
     isEmpty() {
-        return this.masterNullifierPublicKey.isZero() && this.masterIncomingViewingPublicKey.isZero() && this.masterOutgoingViewingPublicKey.isZero() && this.masterTaggingPublicKey.isZero();
+        return this.npkMHash.isZero() && this.ivpkM.isZero() && this.ovpkMHash.isZero() && this.tpkMHash.isZero() && this.mspkMHash.isZero() && this.fbpkMHash.isZero();
     }
     static default() {
-        return new PublicKeys(new Point(new Fr(DEFAULT_NPK_M_X), new Fr(DEFAULT_NPK_M_Y), false), new Point(new Fr(DEFAULT_IVPK_M_X), new Fr(DEFAULT_IVPK_M_Y), false), new Point(new Fr(DEFAULT_OVPK_M_X), new Fr(DEFAULT_OVPK_M_Y), false), new Point(new Fr(DEFAULT_TPK_M_X), new Fr(DEFAULT_TPK_M_Y), false));
+        // Precomputed `hash_public_key(PublicKey { DEFAULT_*_X, DEFAULT_*_Y })` for the hash-only keys.
+        // Sourced from constants.gen.ts (originally defined in
+        // noir-protocol-circuits/crates/types/src/constants.nr); a self-test in public_keys.nr
+        // (`default_hashes_match_default_points`) catches drift between the *_HASH constants and
+        // the underlying X/Y points.
+        return new PublicKeys(new Fr(DEFAULT_NPK_M_HASH), new PublicKey(new Fr(DEFAULT_IVPK_M_X), new Fr(DEFAULT_IVPK_M_Y)), new Fr(DEFAULT_OVPK_M_HASH), new Fr(DEFAULT_TPK_M_HASH), new Fr(DEFAULT_MSPK_M_HASH), new Fr(DEFAULT_FBPK_M_HASH));
     }
     static async random() {
-        return new PublicKeys(await Point.random(), await Point.random(), await Point.random(), await Point.random());
+        const npkM = await PublicKey.random();
+        const ovpkM = await PublicKey.random();
+        const tpkM = await PublicKey.random();
+        const mspkM = await PublicKey.random();
+        const fbpkM = await PublicKey.random();
+        return new PublicKeys(await hashPublicKey(npkM), await PublicKey.random(), await hashPublicKey(ovpkM), await hashPublicKey(tpkM), await hashPublicKey(mspkM), await hashPublicKey(fbpkM));
     }
-    /**
-   * Determines if this PublicKeys instance is equal to the given PublicKeys instance.
-   * Equality is based on the content of their respective buffers.
-   *
-   * @param other - The PublicKeys instance to compare against.
-   * @returns True if the buffers of both instances are equal, false otherwise.
-   */ equals(other) {
-        return this.masterNullifierPublicKey.equals(other.masterNullifierPublicKey) && this.masterIncomingViewingPublicKey.equals(other.masterIncomingViewingPublicKey) && this.masterOutgoingViewingPublicKey.equals(other.masterOutgoingViewingPublicKey) && this.masterTaggingPublicKey.equals(other.masterTaggingPublicKey);
+    equals(other) {
+        return this.npkMHash.equals(other.npkMHash) && this.ivpkM.equals(other.ivpkM) && this.ovpkMHash.equals(other.ovpkMHash) && this.tpkMHash.equals(other.tpkMHash) && this.mspkMHash.equals(other.mspkMHash) && this.fbpkMHash.equals(other.fbpkMHash);
     }
     /**
    * Converts the PublicKeys instance into a Buffer.
@@ -73,56 +94,63 @@ export class PublicKeys {
    * @returns A Buffer representation of the PublicKeys instance.
    */ toBuffer() {
         return serializeToBuffer([
-            this.masterNullifierPublicKey,
-            this.masterIncomingViewingPublicKey,
-            this.masterOutgoingViewingPublicKey,
-            this.masterTaggingPublicKey
+            this.npkMHash,
+            this.ivpkM,
+            this.ovpkMHash,
+            this.tpkMHash,
+            this.mspkMHash,
+            this.fbpkMHash
         ]);
     }
-    /**
-   * Creates an PublicKeys instance from a given buffer or BufferReader.
-   * If the input is a Buffer, it wraps it in a BufferReader before processing.
-   * Throws an error if the input length is not equal to the expected size.
-   *
-   * @param buffer - The input buffer or BufferReader containing the address data.
-   * @returns - A new PublicKeys instance with the extracted address data.
-   */ static fromBuffer(buffer) {
+    static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        const masterNullifierPublicKey = reader.readObject(Point);
-        const masterIncomingViewingPublicKey = reader.readObject(Point);
-        const masterOutgoingViewingPublicKey = reader.readObject(Point);
-        const masterTaggingPublicKey = reader.readObject(Point);
-        return new PublicKeys(masterNullifierPublicKey, masterIncomingViewingPublicKey, masterOutgoingViewingPublicKey, masterTaggingPublicKey);
+        const npkMHash = Fr.fromBuffer(reader);
+        const ivpkM = reader.readObject(PublicKey);
+        const ovpkMHash = Fr.fromBuffer(reader);
+        const tpkMHash = Fr.fromBuffer(reader);
+        const mspkMHash = Fr.fromBuffer(reader);
+        const fbpkMHash = Fr.fromBuffer(reader);
+        return new PublicKeys(npkMHash, ivpkM, ovpkMHash, tpkMHash, mspkMHash, fbpkMHash);
     }
     toNoirStruct() {
-        // We need to use lowercase identifiers as those are what the noir interface expects
-        return {
-            // TODO(#6337): Directly dump account.publicKeys here
-            /* eslint-disable camelcase */ npk_m: this.masterNullifierPublicKey.toWrappedNoirStruct(),
-            ivpk_m: this.masterIncomingViewingPublicKey.toWrappedNoirStruct(),
-            ovpk_m: this.masterOutgoingViewingPublicKey.toWrappedNoirStruct(),
-            tpk_m: this.masterTaggingPublicKey.toWrappedNoirStruct()
+        // We need to use lowercase identifiers as those are what the noir interface expects.
+        /* eslint-disable camelcase */ return {
+            npk_m_hash: this.npkMHash,
+            ivpk_m: this.ivpkM.toWrappedNoirStruct(),
+            ovpk_m_hash: this.ovpkMHash,
+            tpk_m_hash: this.tpkMHash,
+            mspk_m_hash: this.mspkMHash,
+            fbpk_m_hash: this.fbpkMHash
         };
-    }
+    /* eslint-enable camelcase */ }
     /**
-   * Serializes the payload to an array of fields
-   * @returns The fields of the payload
+   * Wire-format fields matching Noir's struct flattening of `PublicKeys`:
+   * `[npk_m_hash, ivpk_m.x, ivpk_m.y, ovpk_m_hash, tpk_m_hash, mspk_m_hash, fbpk_m_hash]`
+   * (7 fields).
    */ toFields() {
         return [
-            ...this.masterNullifierPublicKey.toFields(),
-            ...this.masterIncomingViewingPublicKey.toFields(),
-            ...this.masterOutgoingViewingPublicKey.toFields(),
-            ...this.masterTaggingPublicKey.toFields()
+            this.npkMHash,
+            this.ivpkM.x,
+            this.ivpkM.y,
+            this.ovpkMHash,
+            this.tpkMHash,
+            this.mspkMHash,
+            this.fbpkMHash
         ];
     }
-    // TOOD: This is used in foundation/src/abi/encoder. This is probably non-optimal but I did not want
-    // to spend too much time on the encoder now. It probably needs a refactor.
+    // Used in foundation/src/abi/encoder. Probably non-optimal but the encoder needs a refactor.
     encodeToNoir() {
         return this.toFields();
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new PublicKeys(reader.readObject(Point), reader.readObject(Point), reader.readObject(Point), reader.readObject(Point));
+        const npkMHash = reader.readField();
+        const ivpkM = reader.readObject(PublicKey);
+        const ovpkMHash = reader.readField();
+        const tpkMHash = reader.readField();
+        const mspkMHash = reader.readField();
+        const fbpkMHash = reader.readField();
+        return new PublicKeys(npkMHash, ivpkM, ovpkMHash, tpkMHash, mspkMHash, fbpkMHash);
     }
     toString() {
         return bufferToHex(this.toBuffer());

package/dest/keys/utils.d.ts

@@ -1,3 +1,3 @@
 import type { KeyGenerator, KeyPrefix } from './key_types.js';
 export declare function getKeyGenerator(prefix: KeyPrefix): KeyGenerator;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXlzL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUU5RCx3QkFBZ0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxTQUFTLEdBQUcsWUFBWSxDQUkvRCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXlzL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUU5RCx3QkFBZ0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxTQUFTLEdBQUcsWUFBWSxDQVEvRCJ9