@aztec/stdlib 0.0.1-commit.b655e406 → 0.0.1-commit.b8a057fa

package/dest/kernel/private_validation_requests.js

@@ -1,39 +1,34 @@
+var _computedKey;
 import { MAX_KEY_VALIDATION_REQUESTS_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX } from '@aztec/constants';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { inspect } from 'util';
-import { ScopedKeyValidationRequestAndGenerator } from '../kernel/hints/scoped_key_validation_request_and_generator.js';
+import { ScopedKeyValidationRequestAndSeparator } from '../kernel/hints/scoped_key_validation_request_and_separator.js';
 import { ClaimedLengthArray, ClaimedLengthArrayFromBuffer } from './claimed_length_array.js';
 import { ScopedReadRequest } from './hints/read_request.js';
-import { OptionalNumber } from './utils/optional_number.js';
+_computedKey = inspect.custom;
 /**
  * Validation requests accumulated during the execution of the transaction.
  */ export class PrivateValidationRequests {
     noteHashReadRequests;
     nullifierReadRequests;
-    scopedKeyValidationRequestsAndGenerators;
-    splitCounter;
+    scopedKeyValidationRequestsAndSeparators;
     constructor(/**
      * All the read requests made in this transaction.
      */ noteHashReadRequests, /**
      * All the nullifier read requests made in this transaction.
      */ nullifierReadRequests, /**
      * All the key validation requests made in this transaction.
-     */ scopedKeyValidationRequestsAndGenerators, /**
-     * The counter to split the data for squashing.
-     * A revertible nullifier and a non-revertible note hash will not be squashed.
-     * It should be the "final" minRevertibleSideEffectCounter of a tx.
-     */ splitCounter){
+     */ scopedKeyValidationRequestsAndSeparators){
         this.noteHashReadRequests = noteHashReadRequests;
         this.nullifierReadRequests = nullifierReadRequests;
-        this.scopedKeyValidationRequestsAndGenerators = scopedKeyValidationRequestsAndGenerators;
-        this.splitCounter = splitCounter;
+        this.scopedKeyValidationRequestsAndSeparators = scopedKeyValidationRequestsAndSeparators;
     }
     getSize() {
-        return this.noteHashReadRequests.getSize() + this.nullifierReadRequests.getSize() + this.scopedKeyValidationRequestsAndGenerators.getSize() + this.splitCounter.getSize();
+        return this.noteHashReadRequests.getSize() + this.nullifierReadRequests.getSize() + this.scopedKeyValidationRequestsAndSeparators.getSize();
     }
     toBuffer() {
-        return serializeToBuffer(this.noteHashReadRequests, this.nullifierReadRequests, this.scopedKeyValidationRequestsAndGenerators, this.splitCounter);
+        return serializeToBuffer(this.noteHashReadRequests, this.nullifierReadRequests, this.scopedKeyValidationRequestsAndSeparators);
     }
     toString() {
         return bufferToHex(this.toBuffer());
@@ -44,7 +39,7 @@ import { OptionalNumber } from './utils/optional_number.js';
    * @returns Deserialized object.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PrivateValidationRequests(reader.readObject(ClaimedLengthArrayFromBuffer(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_TX)), reader.readObject(ClaimedLengthArrayFromBuffer(ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_TX)), reader.readObject(ClaimedLengthArrayFromBuffer(ScopedKeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_TX)), reader.readObject(OptionalNumber));
+        return new PrivateValidationRequests(reader.readObject(ClaimedLengthArrayFromBuffer(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_TX)), reader.readObject(ClaimedLengthArrayFromBuffer(ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_TX)), reader.readObject(ClaimedLengthArrayFromBuffer(ScopedKeyValidationRequestAndSeparator, MAX_KEY_VALIDATION_REQUESTS_PER_TX)));
     }
     /**
    * Deserializes from a string, corresponding to a write in cpp.
@@ -54,14 +49,13 @@ import { OptionalNumber } from './utils/optional_number.js';
         return PrivateValidationRequests.fromBuffer(hexToBuffer(str));
     }
     static empty() {
-        return new PrivateValidationRequests(ClaimedLengthArray.empty(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_TX), ClaimedLengthArray.empty(ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_TX), ClaimedLengthArray.empty(ScopedKeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_TX), OptionalNumber.empty());
+        return new PrivateValidationRequests(ClaimedLengthArray.empty(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_TX), ClaimedLengthArray.empty(ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_TX), ClaimedLengthArray.empty(ScopedKeyValidationRequestAndSeparator, MAX_KEY_VALIDATION_REQUESTS_PER_TX));
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `PrivateValidationRequests {
   noteHashReadRequests: ${inspect(this.noteHashReadRequests)},
   nullifierReadRequests: ${inspect(this.nullifierReadRequests)},
-  scopedKeyValidationRequestsAndGenerators: ${inspect(this.scopedKeyValidationRequestsAndGenerators)},
-  splitCounter: ${this.splitCounter.getSize()}
+  scopedKeyValidationRequestsAndSeparators: ${inspect(this.scopedKeyValidationRequestsAndSeparators)},
   `;
     }
 }

package/dest/kernel/public_call_request.d.ts

@@ -1,5 +1,5 @@
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { BufferReader, BufferSink, FieldReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { inspect } from 'util';
 import { z } from 'zod';
@@ -42,35 +42,34 @@ export declare class PublicCallRequest {
      * Hash of the calldata of the function being called.
      */
     calldataHash: Fr);
-    static get schema(): z.ZodEffects<z.ZodObject<{
+    static get schema(): z.ZodPipe<z.ZodObject<{
         msgSender: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
         contractAddress: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
         isStaticCall: z.ZodBoolean;
-        calldataHash: z.ZodType<Fr, any, string>;
-    }, "strip", z.ZodTypeAny, {
-        contractAddress: AztecAddress;
+        calldataHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+    }, z.core.$strip>, z.ZodTransform<PublicCallRequest, {
         msgSender: AztecAddress;
+        contractAddress: AztecAddress;
         isStaticCall: boolean;
         calldataHash: Fr;
-    }, {
-        isStaticCall: boolean;
-        calldataHash: string;
-        contractAddress?: any;
-        msgSender?: any;
-    }>, PublicCallRequest, {
-        isStaticCall: boolean;
-        calldataHash: string;
-        contractAddress?: any;
-        msgSender?: any;
-    }>;
+    }>>;
     getSize(): number;
     static from(fields: FieldsOf<PublicCallRequest>): PublicCallRequest;
     static getFields(fields: FieldsOf<PublicCallRequest>): readonly [AztecAddress, AztecAddress, boolean, Fr];
     static fromFields(fields: Fr[] | FieldReader): PublicCallRequest;
     toFields(): Fr[];
     static fromBuffer(buffer: Buffer | BufferReader): PublicCallRequest;
-    toBuffer(): Buffer<ArrayBufferLike>;
+    toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     static empty(): PublicCallRequest;
+    /**
+     * Creates a PublicCallRequest instance 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 PublicCallRequest fields
+     * @returns A PublicCallRequest instance
+     */
+    static fromPlainObject(obj: any): PublicCallRequest;
     isEmpty(): boolean;
     [inspect.custom](): string;
     static fromCalldata(msgSender: AztecAddress, contractAddress: AztecAddress, isStaticCall: boolean, calldata: Fr[]): Promise<PublicCallRequest>;
@@ -104,29 +103,30 @@ export declare class PublicCallRequestArrayLengths {
      * Whether there is a teardown call request
      */
     teardownCall: boolean);
-    static get schema(): z.ZodEffects<z.ZodObject<{
+    static get schema(): z.ZodPipe<z.ZodObject<{
         setupCalls: z.ZodNumber;
         appLogicCalls: z.ZodNumber;
         teardownCall: z.ZodBoolean;
-    }, "strip", z.ZodTypeAny, {
-        setupCalls: number;
-        appLogicCalls: number;
-        teardownCall: boolean;
-    }, {
+    }, z.core.$strip>, z.ZodTransform<PublicCallRequestArrayLengths, {
         setupCalls: number;
         appLogicCalls: number;
         teardownCall: boolean;
-    }>, PublicCallRequestArrayLengths, {
-        setupCalls: number;
-        appLogicCalls: number;
-        teardownCall: boolean;
-    }>;
+    }>>;
     static getFields(fields: FieldsOf<PublicCallRequestArrayLengths>): readonly [number, number, boolean];
     static fromFields(fields: Fr[] | FieldReader): PublicCallRequestArrayLengths;
     toFields(): Fr[];
     static fromBuffer(buffer: Buffer | BufferReader): PublicCallRequestArrayLengths;
-    toBuffer(): Buffer<ArrayBufferLike>;
+    toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     static empty(): PublicCallRequestArrayLengths;
+    /**
+     * Creates a PublicCallRequestArrayLengths instance 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 PublicCallRequestArrayLengths fields
+     * @returns A PublicCallRequestArrayLengths instance
+     */
+    static fromPlainObject(obj: any): PublicCallRequestArrayLengths;
     [inspect.custom](): string;
 }
 export declare class CountedPublicCallRequest {
@@ -138,8 +138,9 @@ export declare class CountedPublicCallRequest {
     static fromFields(fields: Fr[] | FieldReader): CountedPublicCallRequest;
     toFields(): Fr[];
     static fromBuffer(buffer: Buffer | BufferReader): CountedPublicCallRequest;
-    toBuffer(): Buffer<ArrayBufferLike>;
+    toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     static empty(): CountedPublicCallRequest;
     isEmpty(): boolean;
 }
-//# sourceMappingURL=public_call_request.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2NhbGxfcmVxdWVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wdWJsaWNfY2FsbF9yZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLFVBQVUsRUFBRSxXQUFXLEVBQXNDLE1BQU0sNkJBQTZCLENBQUM7QUFDeEgsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFeEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUMvQixPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVqRDs7R0FFRztBQUNILHFCQUFhLGlCQUFpQjtJQUUxQjs7T0FFRztJQUNJLFNBQVMsRUFBRSxZQUFZO0lBQzlCOztPQUVHO0lBQ0ksZUFBZSxFQUFFLFlBQVk7SUFDcEM7O09BRUc7SUFDSSxZQUFZLEVBQUUsT0FBTztJQUM1Qjs7T0FFRztJQUNJLFlBQVksRUFBRSxFQUFFO0lBaEJ6QjtJQUNFOztPQUVHO0lBQ0ksU0FBUyxFQUFFLFlBQVk7SUFDOUI7O09BRUc7SUFDSSxlQUFlLEVBQUUsWUFBWTtJQUNwQzs7T0FFRztJQUNJLFlBQVksRUFBRSxPQUFPO0lBQzVCOztPQUVHO0lBQ0ksWUFBWSxFQUFFLEVBQUUsRUFDckI7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7OztRQVdoQjtJQUVELE9BQU8sV0FFTjtJQUVELE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLGlCQUFpQixDQUVsRTtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxzREFFbkQ7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLEdBQUcsaUJBQWlCLENBUS9EO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVkscUJBUTlDO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FBQztJQUNuQixRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxJQUFJLENBQUM7SUFRakMsTUFBTSxDQUFDLEtBQUssc0JBRVg7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsZUFBZSxDQUFDLEdBQUcsRUFBRSxHQUFHLEdBQUcsaUJBQWlCLENBT2xEO0lBRUQsT0FBTyxJQUFJLE9BQU8sQ0FJakI7SUFFRCxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsV0FPZjtJQUVELE9BQWEsWUFBWSxDQUN2QixTQUFTLEVBQUUsWUFBWSxFQUN2QixlQUFlLEVBQUUsWUFBWSxFQUM3QixZQUFZLEVBQUUsT0FBTyxFQUNyQixRQUFRLEVBQUUsRUFBRSxFQUFFLDhCQUlmO0NBQ0Y7QUFFRDs7R0FFRztBQUNILHFCQUFhLDZCQUE2QjtJQUV0Qzs7T0FFRztJQUNJLFVBQVUsRUFBRSxNQUFNO0lBQ3pCOztPQUVHO0lBQ0ksYUFBYSxFQUFFLE1BQU07SUFDNUI7O09BRUc7SUFDSSxZQUFZLEVBQUUsT0FBTztJQVo5QjtJQUNFOztPQUVHO0lBQ0ksVUFBVSxFQUFFLE1BQU07SUFDekI7O09BRUc7SUFDSSxhQUFhLEVBQUUsTUFBTTtJQUM1Qjs7T0FFRztJQUNJLFlBQVksRUFBRSxPQUFPLEVBQzFCO0lBRUosTUFBTSxLQUFLLE1BQU07Ozs7Ozs7O1FBVWhCO0lBRUQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLDZCQUE2QixDQUFDLHNDQUUvRDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsR0FBRyw2QkFBNkIsQ0FHM0U7SUFFRCxRQUFRLElBQUksRUFBRSxFQUFFLENBRWY7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxpQ0FHOUM7SUFFRCxRQUFRLElBQUksTUFBTSxDQUFDO0lBQ25CLFFBQVEsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLElBQUksQ0FBQztJQVFqQyxNQUFNLENBQUMsS0FBSyxrQ0FFWDtJQUVEOzs7Ozs7T0FNRztJQUNILE1BQU0sQ0FBQyxlQUFlLENBQUMsR0FBRyxFQUFFLEdBQUcsR0FBRyw2QkFBNkIsQ0FFOUQ7SUFFRCxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsV0FNZjtDQUNGO0FBRUQscUJBQWEsd0JBQXdCO0lBRTFCLEtBQUssRUFBRSxpQkFBaUI7SUFDeEIsT0FBTyxFQUFFLE1BQU07SUFGeEIsWUFDUyxLQUFLLEVBQUUsaUJBQWlCLEVBQ3hCLE9BQU8sRUFBRSxNQUFNLEVBQ3BCO0lBRUosT0FBTyxXQUVOO0lBRUQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLHdCQUF3QixDQUFDLHdDQUUxRDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsNEJBRzNDO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksNEJBRzlDO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FBQztJQUNuQixRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxJQUFJLENBQUM7SUFRakMsTUFBTSxDQUFDLEtBQUssNkJBRVg7SUFFRCxPQUFPLElBQUksT0FBTyxDQUVqQjtDQUNGIn0=

package/dest/kernel/public_call_request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_call_request.d.ts","sourceRoot":"","sources":["../../src/kernel/public_call_request.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"public_call_request.d.ts","sourceRoot":"","sources":["../../src/kernel/public_call_request.ts"],"names":[],"mappings":"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"}

package/dest/kernel/public_call_request.js

@@ -1,11 +1,13 @@
+var _computedKey, _computedKey1;
 import { COUNTED_PUBLIC_CALL_REQUEST_LENGTH, PUBLIC_CALL_REQUEST_LENGTH } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { schemas } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { BufferReader, BufferSink, FieldReader, serializeToFields, serializeToSink } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
 import { computeCalldataHash } from '../hash/index.js';
+_computedKey = inspect.custom;
 /**
  * Represents a request to call a public function.
  */ export class PublicCallRequest {
@@ -66,16 +68,28 @@ import { computeCalldataHash } from '../hash/index.js';
         const reader = BufferReader.asReader(buffer);
         return new PublicCallRequest(reader.readObject(AztecAddress), reader.readObject(AztecAddress), reader.readBoolean(), reader.readObject(Fr));
     }
-    toBuffer() {
-        return serializeToBuffer(...PublicCallRequest.getFields(this));
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, ...PublicCallRequest.getFields(this));
     }
     static empty() {
         return new PublicCallRequest(AztecAddress.ZERO, AztecAddress.ZERO, false, Fr.ZERO);
     }
+    /**
+   * Creates a PublicCallRequest instance 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 PublicCallRequest fields
+   * @returns A PublicCallRequest instance
+   */ static fromPlainObject(obj) {
+        return new PublicCallRequest(AztecAddress.fromPlainObject(obj.msgSender), AztecAddress.fromPlainObject(obj.contractAddress), obj.isStaticCall, Fr.fromPlainObject(obj.calldataHash));
+    }
     isEmpty() {
         return this.msgSender.isZero() && this.contractAddress.isZero() && !this.isStaticCall && this.calldataHash.isEmpty();
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `PublicCallRequest {
       msgSender: ${this.msgSender}
       contractAddress: ${this.contractAddress}
@@ -88,6 +102,7 @@ import { computeCalldataHash } from '../hash/index.js';
         return new PublicCallRequest(msgSender, contractAddress, isStaticCall, calldataHash);
     }
 }
+_computedKey1 = inspect.custom;
 /**
  * Represents lengths of arrays of public call requests.
  */ export class PublicCallRequestArrayLengths {
@@ -132,13 +147,25 @@ import { computeCalldataHash } from '../hash/index.js';
         const reader = BufferReader.asReader(buffer);
         return new PublicCallRequestArrayLengths(reader.readNumber(), reader.readNumber(), reader.readBoolean());
     }
-    toBuffer() {
-        return serializeToBuffer(...PublicCallRequestArrayLengths.getFields(this));
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, ...PublicCallRequestArrayLengths.getFields(this));
     }
     static empty() {
         return new PublicCallRequestArrayLengths(0, 0, false);
     }
-    [inspect.custom]() {
+    /**
+   * Creates a PublicCallRequestArrayLengths instance 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 PublicCallRequestArrayLengths fields
+   * @returns A PublicCallRequestArrayLengths instance
+   */ static fromPlainObject(obj) {
+        return new PublicCallRequestArrayLengths(obj.setupCalls, obj.appLogicCalls, obj.teardownCall);
+    }
+    [_computedKey1]() {
         return `PublicCallRequestArrayLengths {
       setupCalls: ${this.setupCalls}
       appLogicCalls: ${this.appLogicCalls}
@@ -177,8 +204,11 @@ export class CountedPublicCallRequest {
         const reader = BufferReader.asReader(buffer);
         return new CountedPublicCallRequest(reader.readObject(PublicCallRequest), reader.readNumber());
     }
-    toBuffer() {
-        return serializeToBuffer(...CountedPublicCallRequest.getFields(this));
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, ...CountedPublicCallRequest.getFields(this));
     }
     static empty() {
         return new CountedPublicCallRequest(PublicCallRequest.empty(), 0);

package/dest/kernel/utils/index.d.ts

@@ -1,4 +1,3 @@
 export * from './interfaces.js';
-export * from './optional_number.js';
 export * from './order_and_comparison.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9rZXJuZWwvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLDJCQUEyQixDQUFDIn0=

package/dest/kernel/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/kernel/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/kernel/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC"}

package/dest/kernel/utils/index.js

@@ -1,3 +1,2 @@
 export * from './interfaces.js';
-export * from './optional_number.js';
 export * from './order_and_comparison.js';

package/dest/kernel/utils/interfaces.d.ts

@@ -4,4 +4,4 @@ export interface IsEmpty {
 export interface Ordered {
     counter: number;
 }
-//# sourceMappingURL=interfaces.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2tlcm5lbC91dGlscy9pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE1BQU0sV0FBVyxPQUFPO0lBQ3RCLE9BQU8sRUFBRSxNQUFNLE9BQU8sQ0FBQztDQUN4QjtBQUVELE1BQU0sV0FBVyxPQUFPO0lBQ3RCLE9BQU8sRUFBRSxNQUFNLENBQUM7Q0FDakIifQ==

package/dest/kernel/utils/order_and_comparison.d.ts

@@ -2,4 +2,4 @@ import type { Tuple } from '@aztec/foundation/serialize';
 import type { IsEmpty, Ordered } from './interfaces.js';
 export declare function countAccumulatedItems<T extends IsEmpty>(arr: T[]): number;
 export declare function sortByCounter<T extends Ordered & IsEmpty, N extends number>(arr: Tuple<T, N>, ascending?: boolean): Tuple<T, N>;
-//# sourceMappingURL=order_and_comparison.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JkZXJfYW5kX2NvbXBhcmlzb24uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9rZXJuZWwvdXRpbHMvb3JkZXJfYW5kX2NvbXBhcmlzb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFekQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBS3hELHdCQUFnQixxQkFBcUIsQ0FBQyxDQUFDLFNBQVMsT0FBTyxFQUFFLEdBQUcsRUFBRSxDQUFDLEVBQUUsVUFVaEU7QUF1QkQsd0JBQWdCLGFBQWEsQ0FBQyxDQUFDLFNBQVMsT0FBTyxHQUFHLE9BQU8sRUFBRSxDQUFDLFNBQVMsTUFBTSxFQUN6RSxHQUFHLEVBQUUsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFDaEIsU0FBUyxHQUFFLE9BQWMsR0FDeEIsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FFYiJ9

package/dest/keys/derivation.d.ts

@@ -1,28 +1,69 @@
-import { Fq, Fr, GrumpkinScalar } from '@aztec/foundation/fields';
+import { Fq, Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { AztecAddress } from '../aztec-address/index.js';
 import type { KeyPrefix } from './key_types.js';
+import { PublicKey } from './public_key.js';
 import { PublicKeys } from './public_keys.js';
-export declare function computeAppNullifierSecretKey(masterNullifierSecretKey: GrumpkinScalar, app: AztecAddress): Promise<Fr>;
+export declare function computeAppNullifierHidingKey(masterNullifierHidingSecretKey: GrumpkinScalar, app: AztecAddress): Promise<Fr>;
 export declare function computeAppSecretKey(skM: GrumpkinScalar, app: AztecAddress, keyPrefix: KeyPrefix): Promise<Fr>;
 export declare function computeOvskApp(ovsk: GrumpkinScalar, app: AztecAddress): Promise<Fq>;
-export declare function deriveMasterNullifierSecretKey(secretKey: Fr): GrumpkinScalar;
+export declare function deriveMasterNullifierHidingSecretKey(secretKey: Fr): GrumpkinScalar;
 export declare function deriveMasterIncomingViewingSecretKey(secretKey: Fr): GrumpkinScalar;
 export declare function deriveMasterOutgoingViewingSecretKey(secretKey: Fr): GrumpkinScalar;
+export declare function deriveMasterMessageSigningSecretKey(secretKey: Fr): GrumpkinScalar;
+export declare function deriveMasterFallbackSecretKey(secretKey: Fr): GrumpkinScalar;
 export declare function deriveSigningKey(secretKey: Fr): GrumpkinScalar;
 export declare function computePreaddress(publicKeysHash: Fr, partialAddress: Fr): Promise<Fr>;
 export declare function computeAddress(publicKeys: PublicKeys, partialAddress: Fr): Promise<AztecAddress>;
 export declare function computeAddressSecret(preaddress: Fr, ivsk: Fq): Promise<Fq>;
-export declare function derivePublicKeyFromSecretKey(secretKey: Fq): Promise<import("@aztec/foundation/fields").Point>;
+export declare function derivePublicKeyFromSecretKey(secretKey: Fq): Promise<PublicKey>;
+/**
+ * The six master secret keys that fully define an account's privacy keys.
+ */
+export type MasterSecretKeys = {
+    masterNullifierHidingSecretKey: GrumpkinScalar;
+    masterIncomingViewingSecretKey: GrumpkinScalar;
+    masterOutgoingViewingSecretKey: GrumpkinScalar;
+    masterTaggingSecretKey: GrumpkinScalar;
+    masterMessageSigningSecretKey: GrumpkinScalar;
+    masterFallbackSecretKey: GrumpkinScalar;
+};
 /**
  * Computes secret and public keys and public keys hash from a secret key.
  * @param secretKey - The secret key to derive keys from.
  * @returns The derived keys.
  */
 export declare function deriveKeys(secretKey: Fr): Promise<{
-    masterNullifierSecretKey: Fq;
+    masterNullifierHidingSecretKey: Fq;
+    masterIncomingViewingSecretKey: Fq;
+    masterOutgoingViewingSecretKey: Fq;
+    masterTaggingSecretKey: Fq;
+    masterMessageSigningSecretKey: Fq;
+    masterFallbackSecretKey: Fq;
+    masterNullifierHidingPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    masterOutgoingViewingPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    masterTaggingPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    masterMessageSigningPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    masterFallbackPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    publicKeys: PublicKeys;
+}>;
+/**
+ * Derives the master public keys and the {@link PublicKeys} struct from a set of master secret keys.
+ * @param secretKeys - The master secret keys to derive public keys from.
+ * @returns The provided secret keys alongside the derived public keys.
+ */
+export declare function deriveKeysFromMasterSecretKeys(secretKeys: MasterSecretKeys): Promise<{
+    masterNullifierHidingSecretKey: Fq;
     masterIncomingViewingSecretKey: Fq;
     masterOutgoingViewingSecretKey: Fq;
     masterTaggingSecretKey: Fq;
+    masterMessageSigningSecretKey: Fq;
+    masterFallbackSecretKey: Fq;
+    masterNullifierHidingPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    masterOutgoingViewingPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    masterTaggingPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    masterMessageSigningPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    masterFallbackPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
     publicKeys: PublicKeys;
 }>;
-//# sourceMappingURL=derivation.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVyaXZhdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tleXMvZGVyaXZhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3hELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUVuRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDaEQsT0FBTyxFQUFFLFNBQVMsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFHOUMsd0JBQWdCLDRCQUE0QixDQUMxQyw4QkFBOEIsRUFBRSxjQUFjLEVBQzlDLEdBQUcsRUFBRSxZQUFZLEdBQ2hCLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FFYjtBQUVELHdCQUFnQixtQkFBbUIsQ0FBQyxHQUFHLEVBQUUsY0FBYyxFQUFFLEdBQUcsRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsRUFBRSxDQUFDLENBRzdHO0FBRUQsd0JBQXNCLGNBQWMsQ0FBQyxJQUFJLEVBQUUsY0FBYyxFQUFFLEdBQUcsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUt6RjtBQUVELHdCQUFnQixvQ0FBb0MsQ0FBQyxTQUFTLEVBQUUsRUFBRSxHQUFHLGNBQWMsQ0FFbEY7QUFFRCx3QkFBZ0Isb0NBQW9DLENBQUMsU0FBUyxFQUFFLEVBQUUsR0FBRyxjQUFjLENBRWxGO0FBRUQsd0JBQWdCLG9DQUFvQyxDQUFDLFNBQVMsRUFBRSxFQUFFLEdBQUcsY0FBYyxDQUVsRjtBQUVELHdCQUFnQixtQ0FBbUMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxHQUFHLGNBQWMsQ0FFakY7QUFFRCx3QkFBZ0IsNkJBQTZCLENBQUMsU0FBUyxFQUFFLEVBQUUsR0FBRyxjQUFjLENBRTNFO0FBRUQsd0JBQWdCLGdCQUFnQixDQUFDLFNBQVMsRUFBRSxFQUFFLEdBQUcsY0FBYyxDQUc5RDtBQUVELHdCQUFnQixpQkFBaUIsQ0FBQyxjQUFjLEVBQUUsRUFBRSxFQUFFLGNBQWMsRUFBRSxFQUFFLGVBRXZFO0FBRUQsd0JBQXNCLGNBQWMsQ0FBQyxVQUFVLEVBQUUsVUFBVSxFQUFFLGNBQWMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQVl0RztBQUVELHdCQUFzQixvQkFBb0IsQ0FBQyxVQUFVLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLGVBb0JsRTtBQUVELHdCQUFnQiw0QkFBNEIsQ0FBQyxTQUFTLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FPOUU7QUFFRDs7R0FFRztBQUNILE1BQU0sTUFBTSxnQkFBZ0IsR0FBRztJQUM3Qiw4QkFBOEIsRUFBRSxjQUFjLENBQUM7SUFDL0MsOEJBQThCLEVBQUUsY0FBYyxDQUFDO0lBQy9DLDhCQUE4QixFQUFFLGNBQWMsQ0FBQztJQUMvQyxzQkFBc0IsRUFBRSxjQUFjLENBQUM7SUFDdkMsNkJBQTZCLEVBQUUsY0FBYyxDQUFDO0lBQzlDLHVCQUF1QixFQUFFLGNBQWMsQ0FBQztDQUN6QyxDQUFDO0FBRUY7Ozs7R0FJRztBQUNILHdCQUFnQixVQUFVLENBQUMsU0FBUyxFQUFFLEVBQUU7Ozs7Ozs7Ozs7Ozs7R0FXdkM7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQXNCLDhCQUE4QixDQUFDLFVBQVUsRUFBRSxnQkFBZ0I7Ozs7Ozs7Ozs7Ozs7R0E0Q2hGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"derivation.d.ts","sourceRoot":"","sources":["../../src/keys/derivation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,wBAAgB,4BAA4B,CAAC,wBAAwB,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC,CAErH;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,CAG7G;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC,CAKzF;AAED,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAE5E;AAED,wBAAgB,oCAAoC,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAElF;AAED,wBAAgB,oCAAoC,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAElF;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAG9D;AAED,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,eAEvE;AAED,wBAAsB,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAYtG;AAED,wBAAsB,oBAAoB,CAAC,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,eAoBlE;AAED,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,EAAE,qDAEzD;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,SAAS,EAAE,EAAE;;;;;;GA6B7C"}
+{"version":3,"file":"derivation.d.ts","sourceRoot":"","sources":["../../src/keys/derivation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAiB,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,wBAAgB,4BAA4B,CAC1C,8BAA8B,EAAE,cAAc,EAC9C,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,EAAE,CAAC,CAEb;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,CAG7G;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC,CAKzF;AAED,wBAAgB,oCAAoC,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAElF;AAED,wBAAgB,oCAAoC,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAElF;AAED,wBAAgB,oCAAoC,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAElF;AAED,wBAAgB,mCAAmC,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAEjF;AAED,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAE3E;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAG9D;AAED,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,eAEvE;AAED,wBAAsB,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAYtG;AAED,wBAAsB,oBAAoB,CAAC,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,eAoBlE;AAED,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAO9E;AAED;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,8BAA8B,EAAE,cAAc,CAAC;IAC/C,8BAA8B,EAAE,cAAc,CAAC;IAC/C,8BAA8B,EAAE,cAAc,CAAC;IAC/C,sBAAsB,EAAE,cAAc,CAAC;IACvC,6BAA6B,EAAE,cAAc,CAAC;IAC9C,uBAAuB,EAAE,cAAc,CAAC;CACzC,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,EAAE;;;;;;;;;;;;;GAWvC;AAED;;;;GAIG;AACH,wBAAsB,8BAA8B,CAAC,UAAU,EAAE,gBAAgB;;;;;;;;;;;;;GA4ChF"}

package/dest/keys/derivation.js

@@ -1,11 +1,15 @@
-import { GeneratorIndex } from '@aztec/constants';
-import { Grumpkin, poseidon2HashWithSeparator, sha512ToGrumpkinScalar } from '@aztec/foundation/crypto';
-import { Fq, Fr, GrumpkinScalar } from '@aztec/foundation/fields';
+import { 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 { PublicKey, 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(masterNullifierHidingSecretKey, app) {
+    return computeAppSecretKey(masterNullifierHidingSecretKey, app, 'n'); // 'n' is the key prefix for nullifier hiding key
 }
 export function computeAppSecretKey(skM, app, keyPrefix) {
     const generator = getKeyGenerator(keyPrefix);
@@ -21,44 +25,56 @@ 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 deriveMasterNullifierHidingSecretKey(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 deriveMasterMessageSigningSecretKey(secretKey) {
+    return sha512ToGrumpkinScalar([
+        secretKey,
+        DomainSeparator.MSSK_M
+    ]);
+}
+export function deriveMasterFallbackSecretKey(secretKey) {
+    return sha512ToGrumpkinScalar([
+        secretKey,
+        DomainSeparator.FBSK_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) {
@@ -81,34 +97,61 @@ export async function computeAddressSecret(preaddress, ivsk) {
     return addressSecretCandidate;
 }
 export function derivePublicKeyFromSecretKey(secretKey) {
+    // 0 * G is the point at infinity. The WASM encodes infinity with an out-of-field x coordinate that Point cannot
+    // deserialize, so return the point directly instead of calling into it.
+    if (secretKey.isZero()) {
+        return Promise.resolve(PublicKey.INFINITY);
+    }
     return Grumpkin.mul(Grumpkin.generator, secretKey);
 }
 /**
  * Computes secret and public keys and public keys hash from a secret key.
  * @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
+ */ export function deriveKeys(secretKey) {
+    // 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 masterIncomingViewingSecretKey = deriveMasterIncomingViewingSecretKey(secretKey);
-    const masterOutgoingViewingSecretKey = deriveMasterOutgoingViewingSecretKey(secretKey);
-    const masterTaggingSecretKey = sha512ToGrumpkinScalar([
-        secretKey,
-        GeneratorIndex.TSK_M
-    ]);
-    // Then we derive master public keys
-    const masterNullifierPublicKey = await derivePublicKeyFromSecretKey(masterNullifierSecretKey);
+    return deriveKeysFromMasterSecretKeys({
+        masterNullifierHidingSecretKey: deriveMasterNullifierHidingSecretKey(secretKey),
+        masterIncomingViewingSecretKey: deriveMasterIncomingViewingSecretKey(secretKey),
+        masterOutgoingViewingSecretKey: deriveMasterOutgoingViewingSecretKey(secretKey),
+        masterTaggingSecretKey: sha512ToGrumpkinScalar([
+            secretKey,
+            DomainSeparator.TSK_M
+        ]),
+        masterMessageSigningSecretKey: deriveMasterMessageSigningSecretKey(secretKey),
+        masterFallbackSecretKey: deriveMasterFallbackSecretKey(secretKey)
+    });
+}
+/**
+ * Derives the master public keys and the {@link PublicKeys} struct from a set of master secret keys.
+ * @param secretKeys - The master secret keys to derive public keys from.
+ * @returns The provided secret keys alongside the derived public keys.
+ */ export async function deriveKeysFromMasterSecretKeys(secretKeys) {
+    const { masterNullifierHidingSecretKey, masterIncomingViewingSecretKey, masterOutgoingViewingSecretKey, masterTaggingSecretKey, masterMessageSigningSecretKey, masterFallbackSecretKey } = secretKeys;
+    const masterNullifierHidingPublicKey = await derivePublicKeyFromSecretKey(masterNullifierHidingSecretKey);
     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);
+    const masterMessageSigningPublicKey = await derivePublicKeyFromSecretKey(masterMessageSigningSecretKey);
+    const masterFallbackPublicKey = await derivePublicKeyFromSecretKey(masterFallbackSecretKey);
+    // 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/mspk/fbpk raw points are also returned alongside so the key
+    // store can persist them under `${account}-{n|ov|t|ms|fb}pk_m` (only their hashes live in publicKeys).
+    // The ivpk_m point isn't returned separately because it already lives in publicKeys.ivpkM.
+    const publicKeys = new PublicKeys(await hashPublicKey(masterNullifierHidingPublicKey), masterIncomingViewingPublicKey, await hashPublicKey(masterOutgoingViewingPublicKey), await hashPublicKey(masterTaggingPublicKey), await hashPublicKey(masterMessageSigningPublicKey), await hashPublicKey(masterFallbackPublicKey));
     return {
-        masterNullifierSecretKey,
+        masterNullifierHidingSecretKey,
         masterIncomingViewingSecretKey,
         masterOutgoingViewingSecretKey,
         masterTaggingSecretKey,
+        masterMessageSigningSecretKey,
+        masterFallbackSecretKey,
+        masterNullifierHidingPublicKey,
+        masterOutgoingViewingPublicKey,
+        masterTaggingPublicKey,
+        masterMessageSigningPublicKey,
+        masterFallbackPublicKey,
         publicKeys
     };
 }

package/dest/keys/index.d.ts

@@ -3,4 +3,4 @@ export * from './key_types.js';
 export * from './utils.js';
 export * from './public_key.js';
 export * from './public_keys.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXlzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsa0JBQWtCLENBQUMifQ==

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=key_types.d.ts.map
+//# 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"}