@aztec/stdlib 6.0.0-nightly.20260604 → 6.0.0-nightly.20260721

package/dest/kernel/private_kernel_inner_4_circuit_private_inputs.js

@@ -0,0 +1,27 @@
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { PrivateCallData } from './private_call_data.js';
+import { PrivateKernelData } from './private_kernel_data.js';
+/**
+ * Input to the batched private kernel inner circuit, which processes four app calls in a single
+ * iteration following a previous kernel.
+ */ export class PrivateKernelInner4CircuitPrivateInputs {
+    previousKernel;
+    privateCall0;
+    privateCall1;
+    privateCall2;
+    privateCall3;
+    constructor(previousKernel, privateCall0, privateCall1, privateCall2, privateCall3){
+        this.previousKernel = previousKernel;
+        this.privateCall0 = privateCall0;
+        this.privateCall1 = privateCall1;
+        this.privateCall2 = privateCall2;
+        this.privateCall3 = privateCall3;
+    }
+    toBuffer() {
+        return serializeToBuffer(this.previousKernel, this.privateCall0, this.privateCall1, this.privateCall2, this.privateCall3);
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new PrivateKernelInner4CircuitPrivateInputs(reader.readObject(PrivateKernelData), reader.readObject(PrivateCallData), reader.readObject(PrivateCallData), reader.readObject(PrivateCallData), reader.readObject(PrivateCallData));
+    }
+}

package/dest/kernel/private_kernel_inner_5_circuit_private_inputs.d.ts

@@ -0,0 +1,19 @@
+import { BufferReader } from '@aztec/foundation/serialize';
+import { PrivateCallData } from './private_call_data.js';
+import { PrivateKernelData } from './private_kernel_data.js';
+/**
+ * Input to the batched private kernel inner circuit, which processes five app calls in a single
+ * iteration following a previous kernel.
+ */
+export declare class PrivateKernelInner5CircuitPrivateInputs {
+    previousKernel: PrivateKernelData;
+    privateCall0: PrivateCallData;
+    privateCall1: PrivateCallData;
+    privateCall2: PrivateCallData;
+    privateCall3: PrivateCallData;
+    privateCall4: PrivateCallData;
+    constructor(previousKernel: PrivateKernelData, privateCall0: PrivateCallData, privateCall1: PrivateCallData, privateCall2: PrivateCallData, privateCall3: PrivateCallData, privateCall4: PrivateCallData);
+    toBuffer(): Buffer<ArrayBufferLike>;
+    static fromBuffer(buffer: Buffer | BufferReader): PrivateKernelInner5CircuitPrivateInputs;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfaW5uZXJfNV9jaXJjdWl0X3ByaXZhdGVfaW5wdXRzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2VybmVsL3ByaXZhdGVfa2VybmVsX2lubmVyXzVfY2lyY3VpdF9wcml2YXRlX2lucHV0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTlFLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN6RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU3RDs7O0dBR0c7QUFDSCxxQkFBYSx1Q0FBdUM7SUFFekMsY0FBYyxFQUFFLGlCQUFpQjtJQUNqQyxZQUFZLEVBQUUsZUFBZTtJQUM3QixZQUFZLEVBQUUsZUFBZTtJQUM3QixZQUFZLEVBQUUsZUFBZTtJQUM3QixZQUFZLEVBQUUsZUFBZTtJQUM3QixZQUFZLEVBQUUsZUFBZTtJQU50QyxZQUNTLGNBQWMsRUFBRSxpQkFBaUIsRUFDakMsWUFBWSxFQUFFLGVBQWUsRUFDN0IsWUFBWSxFQUFFLGVBQWUsRUFDN0IsWUFBWSxFQUFFLGVBQWUsRUFDN0IsWUFBWSxFQUFFLGVBQWUsRUFDN0IsWUFBWSxFQUFFLGVBQWUsRUFDbEM7SUFFSixRQUFRLDRCQVNQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyx1Q0FBdUMsQ0FVeEY7Q0FDRiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"private_kernel_inner_5_circuit_private_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_kernel_inner_5_circuit_private_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;;GAGG;AACH,qBAAa,uCAAuC;IAEzC,cAAc,EAAE,iBAAiB;IACjC,YAAY,EAAE,eAAe;IAC7B,YAAY,EAAE,eAAe;IAC7B,YAAY,EAAE,eAAe;IAC7B,YAAY,EAAE,eAAe;IAC7B,YAAY,EAAE,eAAe;IANtC,YACS,cAAc,EAAE,iBAAiB,EACjC,YAAY,EAAE,eAAe,EAC7B,YAAY,EAAE,eAAe,EAC7B,YAAY,EAAE,eAAe,EAC7B,YAAY,EAAE,eAAe,EAC7B,YAAY,EAAE,eAAe,EAClC;IAEJ,QAAQ,4BASP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,uCAAuC,CAUxF;CACF"}

package/dest/kernel/private_kernel_inner_5_circuit_private_inputs.js

@@ -0,0 +1,29 @@
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { PrivateCallData } from './private_call_data.js';
+import { PrivateKernelData } from './private_kernel_data.js';
+/**
+ * Input to the batched private kernel inner circuit, which processes five app calls in a single
+ * iteration following a previous kernel.
+ */ export class PrivateKernelInner5CircuitPrivateInputs {
+    previousKernel;
+    privateCall0;
+    privateCall1;
+    privateCall2;
+    privateCall3;
+    privateCall4;
+    constructor(previousKernel, privateCall0, privateCall1, privateCall2, privateCall3, privateCall4){
+        this.previousKernel = previousKernel;
+        this.privateCall0 = privateCall0;
+        this.privateCall1 = privateCall1;
+        this.privateCall2 = privateCall2;
+        this.privateCall3 = privateCall3;
+        this.privateCall4 = privateCall4;
+    }
+    toBuffer() {
+        return serializeToBuffer(this.previousKernel, this.privateCall0, this.privateCall1, this.privateCall2, this.privateCall3, this.privateCall4);
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new PrivateKernelInner5CircuitPrivateInputs(reader.readObject(PrivateKernelData), reader.readObject(PrivateCallData), reader.readObject(PrivateCallData), reader.readObject(PrivateCallData), reader.readObject(PrivateCallData), reader.readObject(PrivateCallData));
+    }
+}

package/dest/kernel/private_kernel_prover_output.d.ts

@@ -1,3 +1,4 @@
+import { CircuitKind } from '@aztec/bb.js';
 import type { WitnessMap } from '@aztec/noir-acvm_js';
 import { z } from 'zod';
 import type { ChonkProof } from '../proofs/chonk_proof.js';
@@ -9,6 +10,7 @@ export declare const PrivateExecutionStepSchema: z.ZodObject<{
     bytecode: import("@aztec/foundation/schemas").ZodFor<Buffer<ArrayBufferLike>>;
     witness: import("@aztec/foundation/schemas").ZodFor<Map<number, string>>;
     vk: import("@aztec/foundation/schemas").ZodFor<Buffer<ArrayBufferLike>>;
+    kind: z.ZodEnum<typeof CircuitKind>;
     timings: z.ZodObject<{
         witgen: z.ZodNumber;
         gateCount: z.ZodOptional<z.ZodNumber>;
@@ -23,6 +25,7 @@ export interface PrivateExecutionStep {
     bytecode: Buffer;
     witness: WitnessMap;
     vk: Buffer;
+    kind: CircuitKind;
     timings: {
         witgen: number;
         gateCount?: number;
@@ -50,4 +53,4 @@ export interface PrivateKernelExecutionProofOutput<PublicInputsType extends Priv
     };
 }
 export declare function serializePrivateExecutionSteps(steps: PrivateExecutionStep[]): Buffer<ArrayBufferLike>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfcHJvdmVyX291dHB1dC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wcml2YXRlX2tlcm5lbF9wcm92ZXJfb3V0cHV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBSXRELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUNsRyxPQUFPLEtBQUssRUFBRSxvQ0FBb0MsRUFBRSxNQUFNLGdEQUFnRCxDQUFDO0FBRTNHLGVBQU8sTUFBTSwwQkFBMEI7Ozs7Ozs7Ozs7aUJBVXJDLENBQUM7QUFFSDs7R0FFRztBQUNILE1BQU0sV0FBVyxvQkFBb0I7SUFDbkMsWUFBWSxFQUFFLE1BQU0sQ0FBQztJQUNyQixTQUFTLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbkIsUUFBUSxFQUFFLE1BQU0sQ0FBQztJQUNqQixPQUFPLEVBQUUsVUFBVSxDQUFDO0lBRXBCLEVBQUUsRUFBRSxNQUFNLENBQUM7SUFDWCxPQUFPLEVBQUU7UUFDUCxNQUFNLEVBQUUsTUFBTSxDQUFDO1FBQ2YsU0FBUyxDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQ25CLE9BQU8sQ0FBQyxFQUFFLE1BQU0sQ0FBQyxNQUFNLEVBQUU7WUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLENBQUE7U0FBRSxDQUFDLENBQUM7S0FDL0MsQ0FBQztDQUNIO0FBRUQsa0VBQWtFO0FBQ2xFLE1BQU0sV0FBVyxpQ0FBaUMsQ0FDaEQsZ0JBQWdCLFNBQVMsZ0NBQWdDLEdBQUcsb0NBQW9DO0lBRWhHLDhEQUE4RDtJQUM5RCxZQUFZLEVBQUUsZ0JBQWdCLENBQUM7SUFDL0I7NEdBQ3dHO0lBQ3hHLFVBQVUsRUFBRSxVQUFVLENBQUM7SUFDdkI7Ozs7T0FJRztJQUNILGNBQWMsRUFBRSxvQkFBb0IsRUFBRSxDQUFDO0lBQ3ZDLDBCQUEwQjtJQUMxQixPQUFPLENBQUMsRUFBRTtRQUFFLE9BQU8sRUFBRSxNQUFNLENBQUE7S0FBRSxDQUFDO0NBQy9CO0FBRUQsd0JBQWdCLDhCQUE4QixDQUFDLEtBQUssRUFBRSxvQkFBb0IsRUFBRSwyQkFVM0UifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfcHJvdmVyX291dHB1dC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wcml2YXRlX2tlcm5lbF9wcm92ZXJfb3V0cHV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFM0MsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFJdEQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxnQ0FBZ0MsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBQ2xHLE9BQU8sS0FBSyxFQUFFLG9DQUFvQyxFQUFFLE1BQU0sZ0RBQWdELENBQUM7QUFFM0csZUFBTyxNQUFNLDBCQUEwQjs7Ozs7Ozs7Ozs7aUJBV3JDLENBQUM7QUFFSDs7R0FFRztBQUNILE1BQU0sV0FBVyxvQkFBb0I7SUFDbkMsWUFBWSxFQUFFLE1BQU0sQ0FBQztJQUNyQixTQUFTLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbkIsUUFBUSxFQUFFLE1BQU0sQ0FBQztJQUNqQixPQUFPLEVBQUUsVUFBVSxDQUFDO0lBRXBCLEVBQUUsRUFBRSxNQUFNLENBQUM7SUFDWCxJQUFJLEVBQUUsV0FBVyxDQUFDO0lBQ2xCLE9BQU8sRUFBRTtRQUNQLE1BQU0sRUFBRSxNQUFNLENBQUM7UUFDZixTQUFTLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDbkIsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDLE1BQU0sRUFBRTtZQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsQ0FBQTtTQUFFLENBQUMsQ0FBQztLQUMvQyxDQUFDO0NBQ0g7QUFFRCxrRUFBa0U7QUFDbEUsTUFBTSxXQUFXLGlDQUFpQyxDQUNoRCxnQkFBZ0IsU0FBUyxnQ0FBZ0MsR0FBRyxvQ0FBb0M7SUFFaEcsOERBQThEO0lBQzlELFlBQVksRUFBRSxnQkFBZ0IsQ0FBQztJQUMvQjs0R0FDd0c7SUFDeEcsVUFBVSxFQUFFLFVBQVUsQ0FBQztJQUN2Qjs7OztPQUlHO0lBQ0gsY0FBYyxFQUFFLG9CQUFvQixFQUFFLENBQUM7SUFDdkMsMEJBQTBCO0lBQzFCLE9BQU8sQ0FBQyxFQUFFO1FBQUUsT0FBTyxFQUFFLE1BQU0sQ0FBQTtLQUFFLENBQUM7Q0FDL0I7QUFFRCx3QkFBZ0IsOEJBQThCLENBQUMsS0FBSyxFQUFFLG9CQUFvQixFQUFFLDJCQVczRSJ9

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

@@ -1 +1 @@
-{"version":3,"file":"private_kernel_prover_output.d.ts","sourceRoot":"","sources":["../../src/kernel/private_kernel_prover_output.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAItD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAClG,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,gDAAgD,CAAC;AAE3G,eAAO,MAAM,0BAA0B;;;;;;;;;;iBAUrC,CAAC;AAEH;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,UAAU,CAAC;IAEpB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,KAAK,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC,CAAC;KAC/C,CAAC;CACH;AAED,kEAAkE;AAClE,MAAM,WAAW,iCAAiC,CAChD,gBAAgB,SAAS,gCAAgC,GAAG,oCAAoC;IAEhG,8DAA8D;IAC9D,YAAY,EAAE,gBAAgB,CAAC;IAC/B;4GACwG;IACxG,UAAU,EAAE,UAAU,CAAC;IACvB;;;;OAIG;IACH,cAAc,EAAE,oBAAoB,EAAE,CAAC;IACvC,0BAA0B;IAC1B,OAAO,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/B;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,oBAAoB,EAAE,2BAU3E"}
+{"version":3,"file":"private_kernel_prover_output.d.ts","sourceRoot":"","sources":["../../src/kernel/private_kernel_prover_output.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAItD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAClG,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,gDAAgD,CAAC;AAE3G,eAAO,MAAM,0BAA0B;;;;;;;;;;;iBAWrC,CAAC;AAEH;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,UAAU,CAAC;IAEpB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,KAAK,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC,CAAC;KAC/C,CAAC;CACH;AAED,kEAAkE;AAClE,MAAM,WAAW,iCAAiC,CAChD,gBAAgB,SAAS,gCAAgC,GAAG,oCAAoC;IAEhG,8DAA8D;IAC9D,YAAY,EAAE,gBAAgB,CAAC;IAC/B;4GACwG;IACxG,UAAU,EAAE,UAAU,CAAC;IACvB;;;;OAIG;IACH,cAAc,EAAE,oBAAoB,EAAE,CAAC;IACvC,0BAA0B;IAC1B,OAAO,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/B;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,oBAAoB,EAAE,2BAW3E"}

package/dest/kernel/private_kernel_prover_output.js

@@ -1,3 +1,4 @@
+import { CircuitKind } from '@aztec/bb.js';
 import { bufferSchema, mapSchema } from '@aztec/foundation/schemas';
 import { serializeWitness } from '@aztec/noir-noirc_abi';
 import { Encoder } from 'msgpackr';
@@ -8,6 +9,7 @@ export const PrivateExecutionStepSchema = z.object({
     bytecode: bufferSchema,
     witness: mapSchema(z.number(), z.string()),
     vk: bufferSchema,
+    kind: z.nativeEnum(CircuitKind),
     timings: z.object({
         witgen: z.number(),
         gateCount: z.number().optional()
@@ -19,7 +21,8 @@ export function serializePrivateExecutionSteps(steps) {
             bytecode: step.bytecode,
             witness: serializeWitness(step.witness),
             vk: step.vk,
-            functionName: step.functionName
+            functionName: step.functionName,
+            kind: step.kind
         };
     };
     return new Encoder({

package/dest/kernel/private_kernel_reset_dimensions.d.ts

@@ -18,15 +18,14 @@ export declare class PrivateKernelResetDimensions {
 }
 export type DimensionName = keyof FieldsOf<PrivateKernelResetDimensions>;
 export declare const privateKernelResetDimensionNames: DimensionName[];
-export interface DimensionConfig {
-    variants: number[];
-    standalone: number[];
+export interface ResetCatalogEntry {
+    name: string;
+    dimensions: number[];
     cost: number;
 }
 export interface PrivateKernelResetDimensionsConfig {
-    dimensions: {
-        [K in DimensionName]: DimensionConfig;
-    };
-    specialCases: number[][];
+    inner: ResetCatalogEntry[];
+    finalTail: ResetCatalogEntry[];
+    finalTailToPublic: ResetCatalogEntry[];
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfcmVzZXRfZGltZW5zaW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wcml2YXRlX2tlcm5lbF9yZXNldF9kaW1lbnNpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELHFCQUFhLDRCQUE0QjtJQUU5QixzQkFBc0IsRUFBRSxNQUFNO0lBQzlCLHNCQUFzQixFQUFFLE1BQU07SUFDOUIsc0JBQXNCLEVBQUUsTUFBTTtJQUM5QixzQkFBc0IsRUFBRSxNQUFNO0lBQzlCLGNBQWMsRUFBRSxNQUFNO0lBQ3RCLHdCQUF3QixFQUFFLE1BQU07SUFDaEMsaUJBQWlCLEVBQUUsTUFBTTtJQUN6QixpQkFBaUIsRUFBRSxNQUFNO0lBQ3pCLG1CQUFtQixFQUFFLE1BQU07SUFUcEMsWUFDUyxzQkFBc0IsRUFBRSxNQUFNLEVBQzlCLHNCQUFzQixFQUFFLE1BQU0sRUFDOUIsc0JBQXNCLEVBQUUsTUFBTSxFQUM5QixzQkFBc0IsRUFBRSxNQUFNLEVBQzlCLGNBQWMsRUFBRSxNQUFNLEVBQ3RCLHdCQUF3QixFQUFFLE1BQU0sRUFDaEMsaUJBQWlCLEVBQUUsTUFBTSxFQUN6QixpQkFBaUIsRUFBRSxNQUFNLEVBQ3pCLG1CQUFtQixFQUFFLE1BQU0sRUFDaEM7SUFFSixRQUFRLDRCQVlQO0lBRUQsTUFBTSxDQUFDLEtBQUssaUNBRVg7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsUUFBUSxDQUFDLDRCQUE0QixDQUFDLENBQUMsZ0NBSWxFO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLGdDQVNqQztJQUVELFFBQVEsYUFFUDtDQUNGO0FBRUQsTUFBTSxNQUFNLGFBQWEsR0FBRyxNQUFNLFFBQVEsQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO0FBRXpFLGVBQU8sTUFBTSxnQ0FBZ0MsRUFBRSxhQUFhLEVBVTNELENBQUM7QUFFRixNQUFNLFdBQVcsZUFBZTtJQUM5QixRQUFRLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDbkIsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3JCLElBQUksRUFBRSxNQUFNLENBQUM7Q0FDZDtBQUdELE1BQU0sV0FBVyxrQ0FBa0M7SUFDakQsVUFBVSxFQUFFO1NBQUcsQ0FBQyxJQUFJLGFBQWEsR0FBRyxlQUFlO0tBQUUsQ0FBQztJQUN0RCxZQUFZLEVBQUUsTUFBTSxFQUFFLEVBQUUsQ0FBQztDQUMxQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfcmVzZXRfZGltZW5zaW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wcml2YXRlX2tlcm5lbF9yZXNldF9kaW1lbnNpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELHFCQUFhLDRCQUE0QjtJQUU5QixzQkFBc0IsRUFBRSxNQUFNO0lBQzlCLHNCQUFzQixFQUFFLE1BQU07SUFDOUIsc0JBQXNCLEVBQUUsTUFBTTtJQUM5QixzQkFBc0IsRUFBRSxNQUFNO0lBQzlCLGNBQWMsRUFBRSxNQUFNO0lBQ3RCLHdCQUF3QixFQUFFLE1BQU07SUFDaEMsaUJBQWlCLEVBQUUsTUFBTTtJQUN6QixpQkFBaUIsRUFBRSxNQUFNO0lBQ3pCLG1CQUFtQixFQUFFLE1BQU07SUFUcEMsWUFDUyxzQkFBc0IsRUFBRSxNQUFNLEVBQzlCLHNCQUFzQixFQUFFLE1BQU0sRUFDOUIsc0JBQXNCLEVBQUUsTUFBTSxFQUM5QixzQkFBc0IsRUFBRSxNQUFNLEVBQzlCLGNBQWMsRUFBRSxNQUFNLEVBQ3RCLHdCQUF3QixFQUFFLE1BQU0sRUFDaEMsaUJBQWlCLEVBQUUsTUFBTSxFQUN6QixpQkFBaUIsRUFBRSxNQUFNLEVBQ3pCLG1CQUFtQixFQUFFLE1BQU0sRUFDaEM7SUFFSixRQUFRLDRCQVlQO0lBRUQsTUFBTSxDQUFDLEtBQUssaUNBRVg7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsUUFBUSxDQUFDLDRCQUE0QixDQUFDLENBQUMsZ0NBSWxFO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLGdDQVNqQztJQUVELFFBQVEsYUFFUDtDQUNGO0FBRUQsTUFBTSxNQUFNLGFBQWEsR0FBRyxNQUFNLFFBQVEsQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO0FBRXpFLGVBQU8sTUFBTSxnQ0FBZ0MsRUFBRSxhQUFhLEVBVTNELENBQUM7QUFFRixNQUFNLFdBQVcsaUJBQWlCO0lBQ2hDLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixVQUFVLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFLckIsSUFBSSxFQUFFLE1BQU0sQ0FBQztDQUNkO0FBR0QsTUFBTSxXQUFXLGtDQUFrQztJQUVqRCxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsQ0FBQztJQUczQixTQUFTLEVBQUUsaUJBQWlCLEVBQUUsQ0FBQztJQUcvQixpQkFBaUIsRUFBRSxpQkFBaUIsRUFBRSxDQUFDO0NBQ3hDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"private_kernel_reset_dimensions.d.ts","sourceRoot":"","sources":["../../src/kernel/private_kernel_reset_dimensions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,qBAAa,4BAA4B;IAE9B,sBAAsB,EAAE,MAAM;IAC9B,sBAAsB,EAAE,MAAM;IAC9B,sBAAsB,EAAE,MAAM;IAC9B,sBAAsB,EAAE,MAAM;IAC9B,cAAc,EAAE,MAAM;IACtB,wBAAwB,EAAE,MAAM;IAChC,iBAAiB,EAAE,MAAM;IACzB,iBAAiB,EAAE,MAAM;IACzB,mBAAmB,EAAE,MAAM;IATpC,YACS,sBAAsB,EAAE,MAAM,EAC9B,sBAAsB,EAAE,MAAM,EAC9B,sBAAsB,EAAE,MAAM,EAC9B,sBAAsB,EAAE,MAAM,EAC9B,cAAc,EAAE,MAAM,EACtB,wBAAwB,EAAE,MAAM,EAChC,iBAAiB,EAAE,MAAM,EACzB,iBAAiB,EAAE,MAAM,EACzB,mBAAmB,EAAE,MAAM,EAChC;IAEJ,QAAQ,4BAYP;IAED,MAAM,CAAC,KAAK,iCAEX;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC,gCAIlE;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,gCASjC;IAED,QAAQ,aAEP;CACF;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,4BAA4B,CAAC,CAAC;AAEzE,eAAO,MAAM,gCAAgC,EAAE,aAAa,EAU3D,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAGD,MAAM,WAAW,kCAAkC;IACjD,UAAU,EAAE;SAAG,CAAC,IAAI,aAAa,GAAG,eAAe;KAAE,CAAC;IACtD,YAAY,EAAE,MAAM,EAAE,EAAE,CAAC;CAC1B"}
+{"version":3,"file":"private_kernel_reset_dimensions.d.ts","sourceRoot":"","sources":["../../src/kernel/private_kernel_reset_dimensions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,qBAAa,4BAA4B;IAE9B,sBAAsB,EAAE,MAAM;IAC9B,sBAAsB,EAAE,MAAM;IAC9B,sBAAsB,EAAE,MAAM;IAC9B,sBAAsB,EAAE,MAAM;IAC9B,cAAc,EAAE,MAAM;IACtB,wBAAwB,EAAE,MAAM;IAChC,iBAAiB,EAAE,MAAM;IACzB,iBAAiB,EAAE,MAAM;IACzB,mBAAmB,EAAE,MAAM;IATpC,YACS,sBAAsB,EAAE,MAAM,EAC9B,sBAAsB,EAAE,MAAM,EAC9B,sBAAsB,EAAE,MAAM,EAC9B,sBAAsB,EAAE,MAAM,EAC9B,cAAc,EAAE,MAAM,EACtB,wBAAwB,EAAE,MAAM,EAChC,iBAAiB,EAAE,MAAM,EACzB,iBAAiB,EAAE,MAAM,EACzB,mBAAmB,EAAE,MAAM,EAChC;IAEJ,QAAQ,4BAYP;IAED,MAAM,CAAC,KAAK,iCAEX;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC,gCAIlE;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,gCASjC;IAED,QAAQ,aAEP;CACF;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,4BAA4B,CAAC,CAAC;AAEzE,eAAO,MAAM,gCAAgC,EAAE,aAAa,EAU3D,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,EAAE,CAAC;IAKrB,IAAI,EAAE,MAAM,CAAC;CACd;AAGD,MAAM,WAAW,kCAAkC;IAEjD,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAG3B,SAAS,EAAE,iBAAiB,EAAE,CAAC;IAG/B,iBAAiB,EAAE,iBAAiB,EAAE,CAAC;CACxC"}

package/dest/kernel/private_kernel_reset_tail_circuit_private_inputs.d.ts

@@ -0,0 +1,29 @@
+import type { MAX_KEY_VALIDATION_REQUESTS_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX } from '@aztec/constants';
+import type { UInt64 } from '../types/shared.js';
+import type { PrivateKernelResetHints } from './hints/private_kernel_reset_hints.js';
+import type { PaddedSideEffectAmounts, PaddedSideEffects } from './padded_side_effects.js';
+import type { PrivateKernelData } from './private_kernel_data.js';
+import { PrivateKernelResetCircuitPrivateInputsVariants } from './private_kernel_reset_circuit_private_inputs.js';
+import type { PrivateKernelResetDimensions } from './private_kernel_reset_dimensions.js';
+/**
+ * Input to a terminal reset+tail circuit. `isForPublic()` selects the rollup-bound (`reset_tail`)
+ * or public-bound (`reset_tail_to_public`) family.
+ */
+export declare class PrivateKernelResetTailCircuitPrivateInputs {
+    previousKernel: PrivateKernelData;
+    paddedSideEffects: PaddedSideEffects;
+    hints: PrivateKernelResetHints<typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX, typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX, typeof MAX_NULLIFIERS_PER_TX>;
+    dimensions: PrivateKernelResetDimensions;
+    paddedSideEffectAmounts: PaddedSideEffectAmounts;
+    expirationTimestampUpperBound: UInt64;
+    constructor(previousKernel: PrivateKernelData, paddedSideEffects: PaddedSideEffects, hints: PrivateKernelResetHints<typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX, typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX, typeof MAX_NULLIFIERS_PER_TX>, dimensions: PrivateKernelResetDimensions, paddedSideEffectAmounts: PaddedSideEffectAmounts, expirationTimestampUpperBound: UInt64);
+    isForPublic(): boolean;
+    /**
+     * Returns a dimension-trimmed view of the reset portion of these inputs (without the tail
+     * fields). The prover uses this to feed witness generation of the variant matching the chosen
+     * dimensions.
+     */
+    trimResetToSizes(): PrivateKernelResetCircuitPrivateInputsVariants<number, number, number, number, number, number>;
+    toBuffer(): Buffer<ArrayBufferLike>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfcmVzZXRfdGFpbF9jaXJjdWl0X3ByaXZhdGVfaW5wdXRzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2VybmVsL3ByaXZhdGVfa2VybmVsX3Jlc2V0X3RhaWxfY2lyY3VpdF9wcml2YXRlX2lucHV0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFDVixrQ0FBa0MsRUFDbEMsa0NBQWtDLEVBQ2xDLHFCQUFxQixFQUNyQixrQ0FBa0MsRUFDbkMsTUFBTSxrQkFBa0IsQ0FBQztBQUcxQixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQ3JGLE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFM0YsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsOENBQThDLEVBQUUsTUFBTSxrREFBa0QsQ0FBQztBQUNsSCxPQUFPLEtBQUssRUFBRSw0QkFBNEIsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBRXpGOzs7R0FHRztBQUNILHFCQUFhLDBDQUEwQztJQUU1QyxjQUFjLEVBQUUsaUJBQWlCO0lBQ2pDLGlCQUFpQixFQUFFLGlCQUFpQjtJQUNwQyxLQUFLLEVBQUUsdUJBQXVCLENBQ25DLE9BQU8sa0NBQWtDLEVBQ3pDLE9BQU8sa0NBQWtDLEVBQ3pDLE9BQU8sa0NBQWtDLEVBQ3pDLE9BQU8sa0NBQWtDLEVBQ3pDLE9BQU8sa0NBQWtDLEVBQ3pDLE9BQU8scUJBQXFCLENBQzdCO0lBQ00sVUFBVSxFQUFFLDRCQUE0QjtJQUN4Qyx1QkFBdUIsRUFBRSx1QkFBdUI7SUFDaEQsNkJBQTZCLEVBQUUsTUFBTTtJQWI5QyxZQUNTLGNBQWMsRUFBRSxpQkFBaUIsRUFDakMsaUJBQWlCLEVBQUUsaUJBQWlCLEVBQ3BDLEtBQUssRUFBRSx1QkFBdUIsQ0FDbkMsT0FBTyxrQ0FBa0MsRUFDekMsT0FBTyxrQ0FBa0MsRUFDekMsT0FBTyxrQ0FBa0MsRUFDekMsT0FBTyxrQ0FBa0MsRUFDekMsT0FBTyxrQ0FBa0MsRUFDekMsT0FBTyxxQkFBcUIsQ0FDN0IsRUFDTSxVQUFVLEVBQUUsNEJBQTRCLEVBQ3hDLHVCQUF1QixFQUFFLHVCQUF1QixFQUNoRCw2QkFBNkIsRUFBRSxNQUFNLEVBQzFDO0lBRUosV0FBVyxZQUVWO0lBRUQ7Ozs7T0FJRztJQUNILGdCQUFnQixtR0FVZjtJQUVELFFBQVEsNEJBU1A7Q0FDRiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"private_kernel_reset_tail_circuit_private_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_kernel_reset_tail_circuit_private_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kCAAkC,EAClC,kCAAkC,EAClC,qBAAqB,EACrB,kCAAkC,EACnC,MAAM,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,KAAK,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE3F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,8CAA8C,EAAE,MAAM,kDAAkD,CAAC;AAClH,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAEzF;;;GAGG;AACH,qBAAa,0CAA0C;IAE5C,cAAc,EAAE,iBAAiB;IACjC,iBAAiB,EAAE,iBAAiB;IACpC,KAAK,EAAE,uBAAuB,CACnC,OAAO,kCAAkC,EACzC,OAAO,kCAAkC,EACzC,OAAO,kCAAkC,EACzC,OAAO,kCAAkC,EACzC,OAAO,kCAAkC,EACzC,OAAO,qBAAqB,CAC7B;IACM,UAAU,EAAE,4BAA4B;IACxC,uBAAuB,EAAE,uBAAuB;IAChD,6BAA6B,EAAE,MAAM;IAb9C,YACS,cAAc,EAAE,iBAAiB,EACjC,iBAAiB,EAAE,iBAAiB,EACpC,KAAK,EAAE,uBAAuB,CACnC,OAAO,kCAAkC,EACzC,OAAO,kCAAkC,EACzC,OAAO,kCAAkC,EACzC,OAAO,kCAAkC,EACzC,OAAO,kCAAkC,EACzC,OAAO,qBAAqB,CAC7B,EACM,UAAU,EAAE,4BAA4B,EACxC,uBAAuB,EAAE,uBAAuB,EAChD,6BAA6B,EAAE,MAAM,EAC1C;IAEJ,WAAW,YAEV;IAED;;;;OAIG;IACH,gBAAgB,mGAUf;IAED,QAAQ,4BASP;CACF"}

package/dest/kernel/private_kernel_reset_tail_circuit_private_inputs.js

@@ -0,0 +1,36 @@
+import { bigintToUInt64BE, serializeToBuffer } from '@aztec/foundation/serialize';
+import { kernelStateIsForPublic } from './private_kernel_circuit_public_inputs.js';
+import { PrivateKernelResetCircuitPrivateInputsVariants } from './private_kernel_reset_circuit_private_inputs.js';
+/**
+ * Input to a terminal reset+tail circuit. `isForPublic()` selects the rollup-bound (`reset_tail`)
+ * or public-bound (`reset_tail_to_public`) family.
+ */ export class PrivateKernelResetTailCircuitPrivateInputs {
+    previousKernel;
+    paddedSideEffects;
+    hints;
+    dimensions;
+    paddedSideEffectAmounts;
+    expirationTimestampUpperBound;
+    constructor(previousKernel, paddedSideEffects, hints, dimensions, paddedSideEffectAmounts, expirationTimestampUpperBound){
+        this.previousKernel = previousKernel;
+        this.paddedSideEffects = paddedSideEffects;
+        this.hints = hints;
+        this.dimensions = dimensions;
+        this.paddedSideEffectAmounts = paddedSideEffectAmounts;
+        this.expirationTimestampUpperBound = expirationTimestampUpperBound;
+    }
+    isForPublic() {
+        return kernelStateIsForPublic(this.previousKernel.publicInputs);
+    }
+    /**
+   * Returns a dimension-trimmed view of the reset portion of these inputs (without the tail
+   * fields). The prover uses this to feed witness generation of the variant matching the chosen
+   * dimensions.
+   */ trimResetToSizes() {
+        const hints = this.hints.trimToSizes(this.dimensions.NOTE_HASH_PENDING_READ, this.dimensions.NOTE_HASH_SETTLED_READ, this.dimensions.NULLIFIER_PENDING_READ, this.dimensions.NULLIFIER_SETTLED_READ, this.dimensions.KEY_VALIDATION, this.dimensions.TRANSIENT_DATA_SQUASHING);
+        return new PrivateKernelResetCircuitPrivateInputsVariants(this.previousKernel, this.paddedSideEffects, hints);
+    }
+    toBuffer() {
+        return serializeToBuffer(this.previousKernel, this.paddedSideEffects, this.hints, this.dimensions, this.paddedSideEffectAmounts, bigintToUInt64BE(this.expirationTimestampUpperBound));
+    }
+}

package/dest/kernel/private_kernel_simulated_output.d.ts

@@ -13,10 +13,4 @@ export interface PrivateKernelSimulateOutput<PublicInputsType extends PrivateKer
     verificationKey: VerificationKeyData;
     bytecode: Buffer;
 }
-/**
- * Represents the output of the circuit simulation process for init and inner private kernel circuit.
- */
-export type AppCircuitSimulateOutput = {
-    verificationKey: VerificationKeyData;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfc2ltdWxhdGVkX291dHB1dC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wcml2YXRlX2tlcm5lbF9zaW11bGF0ZWRfb3V0cHV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXRELE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDdEUsT0FBTyxLQUFLLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUNsRyxPQUFPLEtBQUssRUFBRSxvQ0FBb0MsRUFBRSxNQUFNLGdEQUFnRCxDQUFDO0FBRTNHOzs7R0FHRztBQUNILE1BQU0sV0FBVywyQkFBMkIsQ0FDMUMsZ0JBQWdCLFNBQVMsZ0NBQWdDLEdBQUcsb0NBQW9DO0lBRWhHLG1FQUFtRTtJQUNuRSxZQUFZLEVBQUUsZ0JBQWdCLENBQUM7SUFDL0IsYUFBYSxFQUFFLFVBQVUsQ0FBQztJQUMxQixlQUFlLEVBQUUsbUJBQW1CLENBQUM7SUFDckMsUUFBUSxFQUFFLE1BQU0sQ0FBQztDQUNsQjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxNQUFNLHdCQUF3QixHQUFHO0lBQ3JDLGVBQWUsRUFBRSxtQkFBbUIsQ0FBQztDQUN0QyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfc2ltdWxhdGVkX291dHB1dC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wcml2YXRlX2tlcm5lbF9zaW11bGF0ZWRfb3V0cHV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXRELE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDdEUsT0FBTyxLQUFLLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUNsRyxPQUFPLEtBQUssRUFBRSxvQ0FBb0MsRUFBRSxNQUFNLGdEQUFnRCxDQUFDO0FBRTNHOzs7R0FHRztBQUNILE1BQU0sV0FBVywyQkFBMkIsQ0FDMUMsZ0JBQWdCLFNBQVMsZ0NBQWdDLEdBQUcsb0NBQW9DO0lBRWhHLG1FQUFtRTtJQUNuRSxZQUFZLEVBQUUsZ0JBQWdCLENBQUM7SUFDL0IsYUFBYSxFQUFFLFVBQVUsQ0FBQztJQUMxQixlQUFlLEVBQUUsbUJBQW1CLENBQUM7SUFDckMsUUFBUSxFQUFFLE1BQU0sQ0FBQztDQUNsQiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"private_kernel_simulated_output.d.ts","sourceRoot":"","sources":["../../src/kernel/private_kernel_simulated_output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAClG,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,gDAAgD,CAAC;AAE3G;;;GAGG;AACH,MAAM,WAAW,2BAA2B,CAC1C,gBAAgB,SAAS,gCAAgC,GAAG,oCAAoC;IAEhG,mEAAmE;IACnE,YAAY,EAAE,gBAAgB,CAAC;IAC/B,aAAa,EAAE,UAAU,CAAC;IAC1B,eAAe,EAAE,mBAAmB,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACrC,eAAe,EAAE,mBAAmB,CAAC;CACtC,CAAC"}
+{"version":3,"file":"private_kernel_simulated_output.d.ts","sourceRoot":"","sources":["../../src/kernel/private_kernel_simulated_output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAClG,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,gDAAgD,CAAC;AAE3G;;;GAGG;AACH,MAAM,WAAW,2BAA2B,CAC1C,gBAAgB,SAAS,gCAAgC,GAAG,oCAAoC;IAEhG,mEAAmE;IACnE,YAAY,EAAE,gBAAgB,CAAC;IAC/B,aAAa,EAAE,UAAU,CAAC;IAC1B,eAAe,EAAE,mBAAmB,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;CAClB"}

package/dest/kernel/private_kernel_simulated_output.js

@@ -1,3 +1,4 @@
 /**
- * Represents the output of the circuit simulation process for init and inner private kernel circuit.
+ * Represents the output of the proof creation process for init and inner private kernel circuit.
+ * Contains the public inputs required for the init and inner private kernel circuit and the generated proof.
  */ export { };

package/dest/kernel/private_log_data.d.ts

@@ -34,4 +34,4 @@ export declare class ScopedPrivateLogData {
     static fromBuffer(buffer: Buffer | BufferReader): ScopedPrivateLogData;
     [inspect.custom](): string;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9sb2dfZGF0YS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wcml2YXRlX2xvZ19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUF3QyxNQUFNLDZCQUE2QixDQUFDO0FBQzlHLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFL0IsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVqRCxxQkFBYSxjQUFjO0lBRWhCLEdBQUcsRUFBRSxVQUFVO0lBQ2YsZUFBZSxFQUFFLE1BQU07SUFDdkIsT0FBTyxFQUFFLE1BQU07SUFIeEIsWUFDUyxHQUFHLEVBQUUsVUFBVSxFQUNmLGVBQWUsRUFBRSxNQUFNLEVBQ3ZCLE9BQU8sRUFBRSxNQUFNLEVBQ3BCO0lBRUosTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLGNBQWMsQ0FBQyxHQUFHLGNBQWMsQ0FFNUQ7SUFFRCxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsY0FBYyxDQUFDLHlDQUVoRDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsR0FBRyxjQUFjLENBRzVEO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksa0JBRzlDO0lBRUQsUUFBUSw0QkFFUDtJQUVELE1BQU0sQ0FBQyxLQUFLLG1CQUVYO0lBRUQsT0FBTyxJQUFJLE9BQU8sQ0FFakI7SUFFRCxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsV0FNZjtDQUNGO0FBRUQscUJBQWEsb0JBQW9CO0lBRXRCLEtBQUssRUFBRSxjQUFjO0lBQ3JCLGVBQWUsRUFBRSxZQUFZO0lBRnRDLFlBQ1MsS0FBSyxFQUFFLGNBQWMsRUFDckIsZUFBZSxFQUFFLFlBQVksRUFDbEM7SUFFSixNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsb0JBQW9CLENBQUMsR0FBRyxvQkFBb0IsQ0FFeEU7SUFFRCxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsb0JBQW9CLENBQUMsMkNBRXREO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQUVmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyx3QkFHM0M7SUFFRCxPQUFPLFlBRU47SUFFRCxNQUFNLENBQUMsS0FBSyx5QkFFWDtJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksd0JBRzlDO0lBRUQsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLFdBT2Y7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9sb2dfZGF0YS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wcml2YXRlX2xvZ19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUF3QyxNQUFNLDZCQUE2QixDQUFDO0FBQzlHLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFL0IsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVqRCxxQkFBYSxjQUFjO0lBRWhCLEdBQUcsRUFBRSxVQUFVO0lBQ2YsZUFBZSxFQUFFLE1BQU07SUFDdkIsT0FBTyxFQUFFLE1BQU07SUFIeEIsWUFDUyxHQUFHLEVBQUUsVUFBVSxFQUNmLGVBQWUsRUFBRSxNQUFNLEVBQ3ZCLE9BQU8sRUFBRSxNQUFNLEVBQ3BCO0lBRUosTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLGNBQWMsQ0FBQyxHQUFHLGNBQWMsQ0FFNUQ7SUFFRCxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsY0FBYyxDQUFDLHlDQUVoRDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsR0FBRyxjQUFjLENBRzVEO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksa0JBRzlDO0lBRUQsUUFBUSw0QkFFUDtJQUVELE1BQU0sQ0FBQyxLQUFLLG1CQUVYO0lBRUQsT0FBTyxJQUFJLE9BQU8sQ0FFakI7SUFFRCxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsV0FNZjtDQUNGO0FBRUQscUJBQWEsb0JBQW9CO0lBRXRCLEtBQUssRUFBRSxjQUFjO0lBQ3JCLGVBQWUsRUFBRSxZQUFZO0lBRnRDLFlBQ1MsS0FBSyxFQUFFLGNBQWMsRUFDckIsZUFBZSxFQUFFLFlBQVksRUFDbEM7SUFFSixNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsb0JBQW9CLENBQUMsR0FBRyxvQkFBb0IsQ0FFeEU7SUFFRCxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsb0JBQW9CLENBQUMsMkNBRXREO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQUVmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyx3QkFNM0M7SUFFRCxPQUFPLFlBRU47SUFFRCxNQUFNLENBQUMsS0FBSyx5QkFFWDtJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksd0JBRzlDO0lBRUQsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLFdBT2Y7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"private_log_data.d.ts","sourceRoot":"","sources":["../../src/kernel/private_log_data.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,qBAAa,cAAc;IAEhB,GAAG,EAAE,UAAU;IACf,eAAe,EAAE,MAAM;IACvB,OAAO,EAAE,MAAM;IAHxB,YACS,GAAG,EAAE,UAAU,EACf,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,MAAM,EACpB;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC,GAAG,cAAc,CAE5D;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC,yCAEhD;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,cAAc,CAG5D;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,kBAG9C;IAED,QAAQ,4BAEP;IAED,MAAM,CAAC,KAAK,mBAEX;IAED,OAAO,IAAI,OAAO,CAEjB;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAMf;CACF;AAED,qBAAa,oBAAoB;IAEtB,KAAK,EAAE,cAAc;IACrB,eAAe,EAAE,YAAY;IAFtC,YACS,KAAK,EAAE,cAAc,EACrB,eAAe,EAAE,YAAY,EAClC;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,oBAAoB,CAAC,GAAG,oBAAoB,CAExE;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,oBAAoB,CAAC,2CAEtD;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,wBAG3C;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,yBAEX;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,wBAG9C;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAOf;CACF"}
+{"version":3,"file":"private_log_data.d.ts","sourceRoot":"","sources":["../../src/kernel/private_log_data.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,qBAAa,cAAc;IAEhB,GAAG,EAAE,UAAU;IACf,eAAe,EAAE,MAAM;IACvB,OAAO,EAAE,MAAM;IAHxB,YACS,GAAG,EAAE,UAAU,EACf,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,MAAM,EACpB;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC,GAAG,cAAc,CAE5D;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC,yCAEhD;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,cAAc,CAG5D;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,kBAG9C;IAED,QAAQ,4BAEP;IAED,MAAM,CAAC,KAAK,mBAEX;IAED,OAAO,IAAI,OAAO,CAEjB;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAMf;CACF;AAED,qBAAa,oBAAoB;IAEtB,KAAK,EAAE,cAAc;IACrB,eAAe,EAAE,YAAY;IAFtC,YACS,KAAK,EAAE,cAAc,EACrB,eAAe,EAAE,YAAY,EAClC;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,oBAAoB,CAAC,GAAG,oBAAoB,CAExE;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,oBAAoB,CAAC,2CAEtD;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,wBAM3C;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,yBAEX;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,wBAG9C;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAOf;CACF"}

package/dest/kernel/private_log_data.js

@@ -78,7 +78,7 @@ export class ScopedPrivateLogData {
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new ScopedPrivateLogData(reader.readObject(PrivateLogData), AztecAddress.fromField(reader.readField()));
+        return new ScopedPrivateLogData(reader.readObject(PrivateLogData), AztecAddress.fromFieldUnsafe(reader.readField()));
     }
     isEmpty() {
         return this.inner.isEmpty() && this.contractAddress.isZero();

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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9rZXJuZWwvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsMkJBQTJCLENBQUMifQ==
+//# 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/keys/derivation.d.ts

@@ -4,30 +4,66 @@ 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 computeAppNullifierHidingKey(masterNullifierHidingKey: 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 deriveMasterNullifierHidingKey(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<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<{
-    masterNullifierHidingKey: 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;
-    masterNullifierPublicKey: import("@aztec/foundation/curves/grumpkin").Point;
+    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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVyaXZhdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tleXMvZGVyaXZhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3hELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUVuRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDaEQsT0FBTyxFQUFFLFNBQVMsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFHOUMsd0JBQWdCLDRCQUE0QixDQUFDLHdCQUF3QixFQUFFLGNBQWMsRUFBRSxHQUFHLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FFckg7QUFFRCx3QkFBZ0IsbUJBQW1CLENBQUMsR0FBRyxFQUFFLGNBQWMsRUFBRSxHQUFHLEVBQUUsWUFBWSxFQUFFLFNBQVMsRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUc3RztBQUVELHdCQUFzQixjQUFjLENBQUMsSUFBSSxFQUFFLGNBQWMsRUFBRSxHQUFHLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FLekY7QUFFRCx3QkFBZ0IsOEJBQThCLENBQUMsU0FBUyxFQUFFLEVBQUUsR0FBRyxjQUFjLENBRTVFO0FBRUQsd0JBQWdCLG9DQUFvQyxDQUFDLFNBQVMsRUFBRSxFQUFFLEdBQUcsY0FBYyxDQUVsRjtBQUVELHdCQUFnQixvQ0FBb0MsQ0FBQyxTQUFTLEVBQUUsRUFBRSxHQUFHLGNBQWMsQ0FFbEY7QUFFRCx3QkFBZ0IsZ0JBQWdCLENBQUMsU0FBUyxFQUFFLEVBQUUsR0FBRyxjQUFjLENBRzlEO0FBRUQsd0JBQWdCLGlCQUFpQixDQUFDLGNBQWMsRUFBRSxFQUFFLEVBQUUsY0FBYyxFQUFFLEVBQUUsZUFFdkU7QUFFRCx3QkFBc0IsY0FBYyxDQUFDLFVBQVUsRUFBRSxVQUFVLEVBQUUsY0FBYyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLENBWXRHO0FBRUQsd0JBQXNCLG9CQUFvQixDQUFDLFVBQVUsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsZUFvQmxFO0FBRUQsd0JBQWdCLDRCQUE0QixDQUFDLFNBQVMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUU5RTtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsVUFBVSxDQUFDLFNBQVMsRUFBRSxFQUFFOzs7Ozs7Ozs7R0F3QzdDIn0=
+//# 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":"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,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,GAAG,OAAO,CAAC,SAAS,CAAC,CAE9E;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,SAAS,EAAE,EAAE;;;;;;;;;GAwC7C"}
+{"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,15 +1,15 @@
-import { DEFAULT_FBPK_M_HASH, DEFAULT_MSPK_M_HASH, DomainSeparator } from '@aztec/constants';
+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 { hashPublicKey } from './public_key.js';
+import { PublicKey, hashPublicKey } from './public_key.js';
 import { PublicKeys } from './public_keys.js';
 import { getKeyGenerator } from './utils.js';
-export function computeAppNullifierHidingKey(masterNullifierHidingKey, app) {
-    return computeAppSecretKey(masterNullifierHidingKey, app, 'n'); // 'n' is the key prefix for nullifier hiding 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);
@@ -25,7 +25,7 @@ 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 deriveMasterNullifierHidingKey(secretKey) {
+export function deriveMasterNullifierHidingSecretKey(secretKey) {
     return sha512ToGrumpkinScalar([
         secretKey,
         DomainSeparator.NHK_M
@@ -43,6 +43,18 @@ export function deriveMasterOutgoingViewingSecretKey(secretKey) {
         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([
@@ -85,43 +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) {
+ */ 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 masterNullifierHidingKey = deriveMasterNullifierHidingKey(secretKey);
-    const masterIncomingViewingSecretKey = deriveMasterIncomingViewingSecretKey(secretKey);
-    const masterOutgoingViewingSecretKey = deriveMasterOutgoingViewingSecretKey(secretKey);
-    const masterTaggingSecretKey = sha512ToGrumpkinScalar([
-        secretKey,
-        DomainSeparator.TSK_M
-    ]);
-    // Then we derive master public keys
-    const masterNullifierPublicKey = await derivePublicKeyFromSecretKey(masterNullifierHidingKey);
+    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);
+    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 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).
+    // 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.
-    //
-    // 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));
+    const publicKeys = new PublicKeys(await hashPublicKey(masterNullifierHidingPublicKey), masterIncomingViewingPublicKey, await hashPublicKey(masterOutgoingViewingPublicKey), await hashPublicKey(masterTaggingPublicKey), await hashPublicKey(masterMessageSigningPublicKey), await hashPublicKey(masterFallbackPublicKey));
     return {
-        masterNullifierHidingKey,
+        masterNullifierHidingSecretKey,
         masterIncomingViewingSecretKey,
         masterOutgoingViewingSecretKey,
         masterTaggingSecretKey,
-        masterNullifierPublicKey,
+        masterMessageSigningSecretKey,
+        masterFallbackSecretKey,
+        masterNullifierHidingPublicKey,
         masterOutgoingViewingPublicKey,
         masterTaggingPublicKey,
+        masterMessageSigningPublicKey,
+        masterFallbackPublicKey,
         publicKeys
     };
 }