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

package/dest/kernel/hints/build_nullifier_read_request_hints.js

@@ -1,11 +1,10 @@
 import { MAX_NULLIFIER_READ_REQUESTS_PER_TX } from '@aztec/constants';
 import { NullifierReadRequestHintsBuilder } from './nullifier_read_request_hints.js';
 import { PendingReadHint, ReadRequestActionEnum, ReadRequestResetActions } from './read_request_hints.js';
-import { ScopedValueCache } from './scoped_value_cache.js';
 export function isValidNullifierReadRequest(readRequest, nullifier) {
     return readRequest.value.equals(nullifier.value) && nullifier.contractAddress.equals(readRequest.contractAddress) && readRequest.counter > nullifier.counter;
 }
-export function getNullifierReadRequestResetActions(nullifierReadRequests, nullifiers, futureNullifiers) {
+export function getNullifierReadRequestResetActions(nullifierReadRequests, nullifiers) {
     const resetActions = ReadRequestResetActions.empty(MAX_NULLIFIER_READ_REQUESTS_PER_TX);
     const nullifierMap = new Map();
     nullifiers.getActiveItems().forEach((nullifier, index)=>{
@@ -17,15 +16,19 @@ export function getNullifierReadRequestResetActions(nullifierReadRequests, nulli
         });
         nullifierMap.set(value, arr);
     });
-    const futureNullifiersMap = new ScopedValueCache(futureNullifiers);
     for(let i = 0; i < nullifierReadRequests.claimedLength; ++i){
         const readRequest = nullifierReadRequests.array[i];
-        const pendingNullifier = nullifierMap.get(readRequest.value.toBigInt())?.find(({ nullifier })=>isValidNullifierReadRequest(readRequest, nullifier));
-        if (pendingNullifier !== undefined) {
-            resetActions.actions[i] = ReadRequestActionEnum.READ_AS_PENDING;
-            resetActions.pendingReadHints.push(new PendingReadHint(i, pendingNullifier.index));
-        } else if (!futureNullifiersMap.get(readRequest).some((futureNullifier)=>isValidNullifierReadRequest(readRequest, futureNullifier))) {
+        if (readRequest.contractAddress.isZero()) {
+            // Settled read: empty contract address means resolve against the nullifier tree.
             resetActions.actions[i] = ReadRequestActionEnum.READ_AS_SETTLED;
+        } else {
+            // Pending read: non-empty contract address means match against a pending nullifier.
+            const pendingNullifier = nullifierMap.get(readRequest.value.toBigInt())?.find(({ nullifier })=>isValidNullifierReadRequest(readRequest, nullifier));
+            if (pendingNullifier) {
+                resetActions.actions[i] = ReadRequestActionEnum.READ_AS_PENDING;
+                resetActions.pendingReadHints.push(new PendingReadHint(i, pendingNullifier.index));
+            }
+        // Otherwise, the read request may be resolved by a future nullifier. Leave as NOOP.
         }
     }
     return resetActions;
@@ -54,7 +57,7 @@ export async function buildNullifierReadRequestHintsFromResetActions(oracle, nul
     }
     return builder.toHints();
 }
-export async function buildNullifierReadRequestHints(oracle, nullifierReadRequests, nullifiers, futureNullifiers, maxPending = MAX_NULLIFIER_READ_REQUESTS_PER_TX, maxSettled = MAX_NULLIFIER_READ_REQUESTS_PER_TX) {
-    const resetActions = getNullifierReadRequestResetActions(nullifierReadRequests, nullifiers, futureNullifiers);
+export async function buildNullifierReadRequestHints(oracle, nullifierReadRequests, nullifiers, maxPending = MAX_NULLIFIER_READ_REQUESTS_PER_TX, maxSettled = MAX_NULLIFIER_READ_REQUESTS_PER_TX) {
+    const resetActions = getNullifierReadRequestResetActions(nullifierReadRequests, nullifiers);
     return await buildNullifierReadRequestHintsFromResetActions(oracle, nullifierReadRequests, resetActions, maxPending, maxSettled);
 }

package/dest/kernel/hints/build_transient_data_hints.d.ts

@@ -2,10 +2,13 @@ import type { Tuple } from '@aztec/foundation/serialize';
 import type { ClaimedLengthArray } from '../claimed_length_array.js';
 import type { ScopedNoteHash } from '../note_hash.js';
 import type { ScopedNullifier } from '../nullifier.js';
+import type { PrivateLogData, ScopedPrivateLogData } from '../private_log_data.js';
 import type { ScopedReadRequest } from './read_request.js';
 import { TransientDataSquashingHint } from './transient_data_squashing_hint.js';
-export declare function buildTransientDataHints<NOTE_HASHES_LEN extends number, NULLIFIERS_LEN extends number>(noteHashes: ClaimedLengthArray<ScopedNoteHash, NOTE_HASHES_LEN>, nullifiers: ClaimedLengthArray<ScopedNullifier, NULLIFIERS_LEN>, futureNoteHashReads: ScopedReadRequest[], futureNullifierReads: ScopedReadRequest[], noteHashNullifierCounterMap: Map<number, number>, splitCounter: number): {
+export declare function buildTransientDataHints<NOTE_HASHES_LEN extends number, NULLIFIERS_LEN extends number>(noteHashes: ClaimedLengthArray<ScopedNoteHash, NOTE_HASHES_LEN>, nullifiers: ClaimedLengthArray<ScopedNullifier, NULLIFIERS_LEN>, futureNoteHashReads: ScopedReadRequest[], futureNullifierReads: ScopedReadRequest[], futureLogs: PrivateLogData[], noteHashNullifierCounterMap: Map<number, number>, splitCounter: number): {
     numTransientData: number;
     hints: Tuple<TransientDataSquashingHint, NULLIFIERS_LEN>;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRfdHJhbnNpZW50X2RhdGFfaGludHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9rZXJuZWwvaGludHMvYnVpbGRfdHJhbnNpZW50X2RhdGFfaGludHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFekQsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN0RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUd2RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRTNELE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBRWhGLHdCQUFnQix1QkFBdUIsQ0FBQyxlQUFlLFNBQVMsTUFBTSxFQUFFLGNBQWMsU0FBUyxNQUFNLEVBQ25HLFVBQVUsRUFBRSxrQkFBa0IsQ0FBQyxjQUFjLEVBQUUsZUFBZSxDQUFDLEVBQy9ELFVBQVUsRUFBRSxrQkFBa0IsQ0FBQyxlQUFlLEVBQUUsY0FBYyxDQUFDLEVBQy9ELG1CQUFtQixFQUFFLGlCQUFpQixFQUFFLEVBQ3hDLG9CQUFvQixFQUFFLGlCQUFpQixFQUFFLEVBQ3pDLDJCQUEyQixFQUFFLEdBQUcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLEVBQ2hELFlBQVksRUFBRSxNQUFNLEdBQ25CO0lBQUUsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDO0lBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQywwQkFBMEIsRUFBRSxjQUFjLENBQUMsQ0FBQTtDQUFFLENBMkR4RiJ9
+/** Counts private logs that are linked to squashed note hashes and would be removed along with them. */
+export declare function countSquashedLogs<NOTE_HASHES_LEN extends number, LOGS_LEN extends number>(noteHashes: ClaimedLengthArray<ScopedNoteHash, NOTE_HASHES_LEN>, privateLogs: ClaimedLengthArray<ScopedPrivateLogData, LOGS_LEN>, squashingHints: TransientDataSquashingHint[]): number;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRfdHJhbnNpZW50X2RhdGFfaGludHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9rZXJuZWwvaGludHMvYnVpbGRfdHJhbnNpZW50X2RhdGFfaGludHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFekQsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN0RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUduRixPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRTNELE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBRWhGLHdCQUFnQix1QkFBdUIsQ0FBQyxlQUFlLFNBQVMsTUFBTSxFQUFFLGNBQWMsU0FBUyxNQUFNLEVBQ25HLFVBQVUsRUFBRSxrQkFBa0IsQ0FBQyxjQUFjLEVBQUUsZUFBZSxDQUFDLEVBQy9ELFVBQVUsRUFBRSxrQkFBa0IsQ0FBQyxlQUFlLEVBQUUsY0FBYyxDQUFDLEVBQy9ELG1CQUFtQixFQUFFLGlCQUFpQixFQUFFLEVBQ3hDLG9CQUFvQixFQUFFLGlCQUFpQixFQUFFLEVBQ3pDLFVBQVUsRUFBRSxjQUFjLEVBQUUsRUFDNUIsMkJBQTJCLEVBQUUsR0FBRyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsRUFDaEQsWUFBWSxFQUFFLE1BQU0sR0FDbkI7SUFBRSxnQkFBZ0IsRUFBRSxNQUFNLENBQUM7SUFBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLDBCQUEwQixFQUFFLGNBQWMsQ0FBQyxDQUFBO0NBQUUsQ0E4RHhGO0FBRUQsd0dBQXdHO0FBQ3hHLHdCQUFnQixpQkFBaUIsQ0FBQyxlQUFlLFNBQVMsTUFBTSxFQUFFLFFBQVEsU0FBUyxNQUFNLEVBQ3ZGLFVBQVUsRUFBRSxrQkFBa0IsQ0FBQyxjQUFjLEVBQUUsZUFBZSxDQUFDLEVBQy9ELFdBQVcsRUFBRSxrQkFBa0IsQ0FBQyxvQkFBb0IsRUFBRSxRQUFRLENBQUMsRUFDL0QsY0FBYyxFQUFFLDBCQUEwQixFQUFFLEdBQzNDLE1BQU0sQ0FHUiJ9

package/dest/kernel/hints/build_transient_data_hints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build_transient_data_hints.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/build_transient_data_hints.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAEhF,wBAAgB,uBAAuB,CAAC,eAAe,SAAS,MAAM,EAAE,cAAc,SAAS,MAAM,EACnG,UAAU,EAAE,kBAAkB,CAAC,cAAc,EAAE,eAAe,CAAC,EAC/D,UAAU,EAAE,kBAAkB,CAAC,eAAe,EAAE,cAAc,CAAC,EAC/D,mBAAmB,EAAE,iBAAiB,EAAE,EACxC,oBAAoB,EAAE,iBAAiB,EAAE,EACzC,2BAA2B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAChD,YAAY,EAAE,MAAM,GACnB;IAAE,gBAAgB,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC,0BAA0B,EAAE,cAAc,CAAC,CAAA;CAAE,CA2DxF"}
+{"version":3,"file":"build_transient_data_hints.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/build_transient_data_hints.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAGnF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAEhF,wBAAgB,uBAAuB,CAAC,eAAe,SAAS,MAAM,EAAE,cAAc,SAAS,MAAM,EACnG,UAAU,EAAE,kBAAkB,CAAC,cAAc,EAAE,eAAe,CAAC,EAC/D,UAAU,EAAE,kBAAkB,CAAC,eAAe,EAAE,cAAc,CAAC,EAC/D,mBAAmB,EAAE,iBAAiB,EAAE,EACxC,oBAAoB,EAAE,iBAAiB,EAAE,EACzC,UAAU,EAAE,cAAc,EAAE,EAC5B,2BAA2B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAChD,YAAY,EAAE,MAAM,GACnB;IAAE,gBAAgB,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC,0BAA0B,EAAE,cAAc,CAAC,CAAA;CAAE,CA8DxF;AAED,wGAAwG;AACxG,wBAAgB,iBAAiB,CAAC,eAAe,SAAS,MAAM,EAAE,QAAQ,SAAS,MAAM,EACvF,UAAU,EAAE,kBAAkB,CAAC,cAAc,EAAE,eAAe,CAAC,EAC/D,WAAW,EAAE,kBAAkB,CAAC,oBAAoB,EAAE,QAAQ,CAAC,EAC/D,cAAc,EAAE,0BAA0B,EAAE,GAC3C,MAAM,CAGR"}

package/dest/kernel/hints/build_transient_data_hints.js

@@ -3,17 +3,19 @@ import { isValidNoteHashReadRequest } from './build_note_hash_read_request_hints
 import { isValidNullifierReadRequest } from './build_nullifier_read_request_hints.js';
 import { ScopedValueCache } from './scoped_value_cache.js';
 import { TransientDataSquashingHint } from './transient_data_squashing_hint.js';
-export function buildTransientDataHints(noteHashes, nullifiers, futureNoteHashReads, futureNullifierReads, noteHashNullifierCounterMap, splitCounter) {
+export function buildTransientDataHints(noteHashes, nullifiers, futureNoteHashReads, futureNullifierReads, futureLogs, noteHashNullifierCounterMap, splitCounter) {
     const futureNoteHashReadsMap = new ScopedValueCache(futureNoteHashReads);
     const futureNullifierReadsMap = new ScopedValueCache(futureNullifierReads);
+    const futureLogNoteHashCounters = new Set(futureLogs.filter((l)=>l.noteHashCounter > 0).map((l)=>l.noteHashCounter));
     const nullifierIndexMap = new Map();
     nullifiers.getActiveItems().forEach((n, i)=>nullifierIndexMap.set(n.counter, i));
     const hints = [];
     for(let noteHashIndex = 0; noteHashIndex < noteHashes.claimedLength; noteHashIndex++){
         const noteHash = noteHashes.array[noteHashIndex];
         const noteHashNullifierCounter = noteHashNullifierCounterMap.get(noteHash.counter);
-        // The note hash might not be linked to a nullifier or it might be read in the future
-        if (!noteHashNullifierCounter || futureNoteHashReadsMap.get(noteHash).find((read)=>isValidNoteHashReadRequest(read, noteHash))) {
+        // The note hash might not be linked to a nullifier, or it might be read in the future, or a future log might be
+        // linked to it.
+        if (!noteHashNullifierCounter || futureNoteHashReadsMap.get(noteHash).find((read)=>isValidNoteHashReadRequest(read, noteHash)) || futureLogNoteHashCounters.has(noteHash.counter)) {
             continue;
         }
         const nullifierIndex = nullifierIndexMap.get(noteHashNullifierCounter);
@@ -48,3 +50,7 @@ export function buildTransientDataHints(noteHashes, nullifiers, futureNoteHashRe
         hints: padArrayEnd(hints, noActionHint, nullifiers.array.length)
     };
 }
+/** Counts private logs that are linked to squashed note hashes and would be removed along with them. */ export function countSquashedLogs(noteHashes, privateLogs, squashingHints) {
+    const squashedNoteHashCounters = new Set(squashingHints.map((h)=>noteHashes.array[h.noteHashIndex].counter));
+    return privateLogs.getActiveItems().filter((l)=>squashedNoteHashCounters.has(l.inner.noteHashCounter)).length;
+}

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

@@ -6,10 +6,10 @@ export * from './note_hash_read_request_hints.js';
 export * from './nullifier_read_request_hints.js';
 export * from './read_request_hints.js';
 export * from './key_validation_hint.js';
-export * from './key_validation_request_and_generator.js';
+export * from './key_validation_request_and_separator.js';
 export * from './read_request.js';
 export * from './key_validation_request.js';
-export * from './scoped_key_validation_request_and_generator.js';
+export * from './scoped_key_validation_request_and_separator.js';
 export * from './transient_data_squashing_hint.js';
 export * from './private_kernel_reset_hints.js';
 export * from './tree_leaf_read_request.js';

package/dest/kernel/hints/index.js

@@ -6,10 +6,10 @@ export * from './note_hash_read_request_hints.js';
 export * from './nullifier_read_request_hints.js';
 export * from './read_request_hints.js';
 export * from './key_validation_hint.js';
-export * from './key_validation_request_and_generator.js';
+export * from './key_validation_request_and_separator.js';
 export * from './read_request.js';
 export * from './key_validation_request.js';
-export * from './scoped_key_validation_request_and_generator.js';
+export * from './scoped_key_validation_request_and_separator.js';
 export * from './transient_data_squashing_hint.js';
 export * from './private_kernel_reset_hints.js';
 export * from './tree_leaf_read_request.js';

package/dest/kernel/hints/key_validation_request.d.ts

@@ -1,17 +1,21 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { GrumpkinScalar, Point } from '@aztec/foundation/curves/grumpkin';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 /**
  * Request for validating keys used in the app.
+ *
+ * The master public key is exposed only as `pkMHash` (its `hashPublicKey` digest).
+ * The kernel reset circuit derives the corresponding point from the master secret key hint and
+ * asserts that its hash matches `pkMHash`.
  */
 export declare class KeyValidationRequest {
-    /** Master public key corresponding to the same underlying secret as app secret key below. */
-    readonly pkM: Point;
-    /** App-siloed secret key corresponding to the same underlying secret as master public key above. */
+    /** Hash of the master public key corresponding to the same underlying secret as `skApp`. */
+    readonly pkMHash: Fr;
+    /** App-siloed secret key corresponding to the same underlying secret as `pkMHash`. */
     readonly skApp: Fr;
     constructor(
-    /** Master public key corresponding to the same underlying secret as app secret key below. */
-    pkM: Point, skApp: Fr | GrumpkinScalar);
+    /** Hash of the master public key corresponding to the same underlying secret as `skApp`. */
+    pkMHash: Fr, skApp: Fr | GrumpkinScalar);
     toBuffer(): Buffer<ArrayBufferLike>;
     get skAppAsGrumpkinScalar(): import("@aztec/foundation/curves/bn254").Fq;
     static fromBuffer(buffer: Buffer | BufferReader): KeyValidationRequest;
@@ -19,6 +23,6 @@ export declare class KeyValidationRequest {
     static fromFields(fields: Fr[] | FieldReader): KeyValidationRequest;
     isEmpty(): boolean;
     static empty(): KeyValidationRequest;
-    static random(): Promise<KeyValidationRequest>;
+    static random(): KeyValidationRequest;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5X3ZhbGlkYXRpb25fcmVxdWVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2tlcm5lbC9oaW50cy9rZXlfdmFsaWRhdGlvbl9yZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsY0FBYyxFQUFFLEtBQUssRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQzFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTNGOztHQUVHO0FBQ0gscUJBQWEsb0JBQW9CO0lBSzdCLDZGQUE2RjthQUM3RSxHQUFHLEVBQUUsS0FBSztJQUw1QixvR0FBb0c7SUFDcEcsU0FBZ0IsS0FBSyxFQUFFLEVBQUUsQ0FBQztJQUUxQjtJQUNFLDZGQUE2RjtJQUM3RSxHQUFHLEVBQUUsS0FBSyxFQUMxQixLQUFLLEVBQUUsRUFBRSxHQUFHLGNBQWMsRUFPM0I7SUFFRCxRQUFRLDRCQUVQO0lBRUQsSUFBSSxxQkFBcUIsZ0RBRXhCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksd0JBRzlDO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxHQUFHLG9CQUFvQixDQUdsRTtJQUVELE9BQU8sWUFFTjtJQUVELE1BQU0sQ0FBQyxLQUFLLHlCQUVYO0lBRUQsT0FBYSxNQUFNLGtDQUVsQjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5X3ZhbGlkYXRpb25fcmVxdWVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2tlcm5lbC9oaW50cy9rZXlfdmFsaWRhdGlvbl9yZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDbkUsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFM0Y7Ozs7OztHQU1HO0FBQ0gscUJBQWEsb0JBQW9CO0lBSzdCLDRGQUE0RjthQUM1RSxPQUFPLEVBQUUsRUFBRTtJQUw3QixzRkFBc0Y7SUFDdEYsU0FBZ0IsS0FBSyxFQUFFLEVBQUUsQ0FBQztJQUUxQjtJQUNFLDRGQUE0RjtJQUM1RSxPQUFPLEVBQUUsRUFBRSxFQUMzQixLQUFLLEVBQUUsRUFBRSxHQUFHLGNBQWMsRUFLM0I7SUFFRCxRQUFRLDRCQUVQO0lBRUQsSUFBSSxxQkFBcUIsZ0RBRXhCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksd0JBRzlDO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxHQUFHLG9CQUFvQixDQUdsRTtJQUVELE9BQU8sWUFFTjtJQUVELE1BQU0sQ0FBQyxLQUFLLHlCQUVYO0lBRUQsTUFBTSxDQUFDLE1BQU0seUJBRVo7Q0FDRiJ9

package/dest/kernel/hints/key_validation_request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"key_validation_request.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/key_validation_request.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F;;GAEG;AACH,qBAAa,oBAAoB;IAK7B,6FAA6F;aAC7E,GAAG,EAAE,KAAK;IAL5B,oGAAoG;IACpG,SAAgB,KAAK,EAAE,EAAE,CAAC;IAE1B;IACE,6FAA6F;IAC7E,GAAG,EAAE,KAAK,EAC1B,KAAK,EAAE,EAAE,GAAG,cAAc,EAO3B;IAED,QAAQ,4BAEP;IAED,IAAI,qBAAqB,gDAExB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,wBAG9C;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,oBAAoB,CAGlE;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,yBAEX;IAED,OAAa,MAAM,kCAElB;CACF"}
+{"version":3,"file":"key_validation_request.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/key_validation_request.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F;;;;;;GAMG;AACH,qBAAa,oBAAoB;IAK7B,4FAA4F;aAC5E,OAAO,EAAE,EAAE;IAL7B,sFAAsF;IACtF,SAAgB,KAAK,EAAE,EAAE,CAAC;IAE1B;IACE,4FAA4F;IAC5E,OAAO,EAAE,EAAE,EAC3B,KAAK,EAAE,EAAE,GAAG,cAAc,EAK3B;IAED,QAAQ,4BAEP;IAED,IAAI,qBAAqB,gDAExB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,wBAG9C;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,oBAAoB,CAGlE;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,yBAEX;IAED,MAAM,CAAC,MAAM,yBAEZ;CACF"}

package/dest/kernel/hints/key_validation_request.js

@@ -1,35 +1,37 @@
 import { KEY_VALIDATION_REQUEST_LENGTH } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { GrumpkinScalar, Point } from '@aztec/foundation/curves/grumpkin';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 /**
  * Request for validating keys used in the app.
+ *
+ * The master public key is exposed only as `pkMHash` (its `hashPublicKey` digest).
+ * The kernel reset circuit derives the corresponding point from the master secret key hint and
+ * asserts that its hash matches `pkMHash`.
  */ export class KeyValidationRequest {
-    pkM;
-    /** App-siloed secret key corresponding to the same underlying secret as master public key above. */ skApp;
-    constructor(/** Master public key corresponding to the same underlying secret as app secret key below. */ pkM, skApp){
-        this.pkM = pkM;
-        // I am doing this conversion here because in some places skApp is represented as GrumpkinScalar (Fq).
-        // I can do this conversion even though Fq.MODULUS is larger than Fr.MODULUS because when we pass in
-        // the skApp as GrumpkinScalar it was converted to that form from Fr. So, it is safe to convert it back
-        // to Fr. If this would change in the future the code below will throw an error so it should be easy to debug.
+    pkMHash;
+    /** App-siloed secret key corresponding to the same underlying secret as `pkMHash`. */ skApp;
+    constructor(/** Hash of the master public key corresponding to the same underlying secret as `skApp`. */ pkMHash, skApp){
+        this.pkMHash = pkMHash;
+        // skApp may arrive as a GrumpkinScalar (Fq) in some code paths; safe to truncate to Fr because
+        // the value originally came from an Fr poseidon hash and was widened to GrumpkinScalar.
         this.skApp = skApp instanceof Fr ? skApp : new Fr(skApp.toBigInt());
     }
     toBuffer() {
-        return serializeToBuffer(this.pkM, this.skApp);
+        return serializeToBuffer(this.pkMHash, this.skApp);
     }
     get skAppAsGrumpkinScalar() {
         return new GrumpkinScalar(this.skApp.toBigInt());
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new KeyValidationRequest(Point.fromBuffer(reader), Fr.fromBuffer(reader));
+        return new KeyValidationRequest(Fr.fromBuffer(reader), Fr.fromBuffer(reader));
     }
     toFields() {
         const fields = [
-            this.pkM.toFields(),
+            this.pkMHash,
             this.skApp
-        ].flat();
+        ];
         if (fields.length !== KEY_VALIDATION_REQUEST_LENGTH) {
             throw new Error(`Invalid number of fields for KeyValidationRequest. Expected ${KEY_VALIDATION_REQUEST_LENGTH}, got ${fields.length}`);
         }
@@ -37,15 +39,15 @@ import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new KeyValidationRequest(Point.fromFields(reader), reader.readField());
+        return new KeyValidationRequest(reader.readField(), reader.readField());
     }
     isEmpty() {
-        return this.pkM.isZero() && this.skApp.isZero();
+        return this.pkMHash.isZero() && this.skApp.isZero();
     }
     static empty() {
-        return new KeyValidationRequest(Point.ZERO, Fr.ZERO);
+        return new KeyValidationRequest(Fr.ZERO, Fr.ZERO);
     }
-    static async random() {
-        return new KeyValidationRequest(await Point.random(), Fr.random());
+    static random() {
+        return new KeyValidationRequest(Fr.random(), Fr.random());
     }
 }

package/dest/kernel/hints/key_validation_request_and_separator.d.ts

@@ -0,0 +1,24 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
+import { KeyValidationRequest } from './key_validation_request.js';
+/**
+ * Request for validating keys used in the app, along with a domain separator for the key type.
+ */
+export declare class KeyValidationRequestAndSeparator {
+    /** The key validation request. */
+    readonly request: KeyValidationRequest;
+    /** Domain separator for the key type, used along with sk_m to derive the sk_app stored in the request. */
+    readonly keyTypeDomainSeparator: Fr;
+    constructor(
+    /** The key validation request. */
+    request: KeyValidationRequest, 
+    /** Domain separator for the key type, used along with sk_m to derive the sk_app stored in the request. */
+    keyTypeDomainSeparator: Fr);
+    toBuffer(): Buffer<ArrayBufferLike>;
+    static fromBuffer(buffer: Buffer | BufferReader): KeyValidationRequestAndSeparator;
+    toFields(): Fr[];
+    static fromFields(fields: Fr[] | FieldReader): KeyValidationRequestAndSeparator;
+    isEmpty(): boolean;
+    static empty(): KeyValidationRequestAndSeparator;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5X3ZhbGlkYXRpb25fcmVxdWVzdF9hbmRfc2VwYXJhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMva2VybmVsL2hpbnRzL2tleV92YWxpZGF0aW9uX3JlcXVlc3RfYW5kX3NlcGFyYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFM0YsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFbkU7O0dBRUc7QUFDSCxxQkFBYSxnQ0FBZ0M7SUFFekMsa0NBQWtDO2FBQ2xCLE9BQU8sRUFBRSxvQkFBb0I7SUFDN0MsMEdBQTBHO2FBQzFGLHNCQUFzQixFQUFFLEVBQUU7SUFKNUM7SUFDRSxrQ0FBa0M7SUFDbEIsT0FBTyxFQUFFLG9CQUFvQjtJQUM3QywwR0FBMEc7SUFDMUYsc0JBQXNCLEVBQUUsRUFBRSxFQUN4QztJQUVKLFFBQVEsNEJBRVA7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxvQ0FHOUM7SUFFRCxRQUFRLElBQUksRUFBRSxFQUFFLENBUWY7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLEdBQUcsZ0NBQWdDLENBRzlFO0lBRUQsT0FBTyxZQUVOO0lBRUQsTUFBTSxDQUFDLEtBQUsscUNBRVg7Q0FDRiJ9

package/dest/kernel/hints/key_validation_request_and_separator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"key_validation_request_and_separator.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/key_validation_request_and_separator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE;;GAEG;AACH,qBAAa,gCAAgC;IAEzC,kCAAkC;aAClB,OAAO,EAAE,oBAAoB;IAC7C,0GAA0G;aAC1F,sBAAsB,EAAE,EAAE;IAJ5C;IACE,kCAAkC;IAClB,OAAO,EAAE,oBAAoB;IAC7C,0GAA0G;IAC1F,sBAAsB,EAAE,EAAE,EACxC;IAEJ,QAAQ,4BAEP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,oCAG9C;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,gCAAgC,CAG9E;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,qCAEX;CACF"}

package/dest/kernel/hints/{key_validation_request_and_generator.js → key_validation_request_and_separator.js}

@@ -3,42 +3,39 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { KeyValidationRequest } from './key_validation_request.js';
 /**
- * Request for validating keys used in the app and a generator.
- */ export class KeyValidationRequestAndGenerator {
+ * Request for validating keys used in the app, along with a domain separator for the key type.
+ */ export class KeyValidationRequestAndSeparator {
     request;
-    skAppGenerator;
-    constructor(/** The key validation request. */ request, /**
-     * The generator index which can be used along with sk_m to derive the sk_app stored in the request.
-     * Note: This generator constrains that a correct key type gets validated in the kernel.
-     */ skAppGenerator){
+    keyTypeDomainSeparator;
+    constructor(/** The key validation request. */ request, /** Domain separator for the key type, used along with sk_m to derive the sk_app stored in the request. */ keyTypeDomainSeparator){
         this.request = request;
-        this.skAppGenerator = skAppGenerator;
+        this.keyTypeDomainSeparator = keyTypeDomainSeparator;
     }
     toBuffer() {
-        return serializeToBuffer(this.request, this.skAppGenerator);
+        return serializeToBuffer(this.request, this.keyTypeDomainSeparator);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new KeyValidationRequestAndGenerator(reader.readObject(KeyValidationRequest), Fr.fromBuffer(reader));
+        return new KeyValidationRequestAndSeparator(reader.readObject(KeyValidationRequest), Fr.fromBuffer(reader));
     }
     toFields() {
         const fields = [
             ...this.request.toFields(),
-            this.skAppGenerator
+            this.keyTypeDomainSeparator
         ];
         if (fields.length !== KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH) {
-            throw new Error(`Invalid number of fields for KeyValidationRequestAndGenerator. Expected ${KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH}, got ${fields.length}`);
+            throw new Error(`Invalid number of fields for KeyValidationRequestAndSeparator. Expected ${KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH}, got ${fields.length}`);
         }
         return fields;
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new KeyValidationRequestAndGenerator(KeyValidationRequest.fromFields(reader), reader.readField());
+        return new KeyValidationRequestAndSeparator(KeyValidationRequest.fromFields(reader), reader.readField());
     }
     isEmpty() {
-        return this.request.isEmpty() && this.skAppGenerator.isZero();
+        return this.request.isEmpty() && this.keyTypeDomainSeparator.isZero();
     }
     static empty() {
-        return new KeyValidationRequestAndGenerator(KeyValidationRequest.empty(), Fr.ZERO);
+        return new KeyValidationRequestAndSeparator(KeyValidationRequest.empty(), Fr.ZERO);
     }
 }

package/dest/kernel/hints/{scoped_key_validation_request_and_generator.d.ts → scoped_key_validation_request_and_separator.d.ts}

@@ -1,19 +1,19 @@
 import type { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '../../aztec-address/index.js';
-import { KeyValidationRequestAndGenerator } from './key_validation_request_and_generator.js';
+import { KeyValidationRequestAndSeparator } from './key_validation_request_and_separator.js';
 /**
  * Request for validating keys used in the app.
  */
-export declare class ScopedKeyValidationRequestAndGenerator {
-    readonly request: KeyValidationRequestAndGenerator;
+export declare class ScopedKeyValidationRequestAndSeparator {
+    readonly request: KeyValidationRequestAndSeparator;
     readonly contractAddress: AztecAddress;
-    constructor(request: KeyValidationRequestAndGenerator, contractAddress: AztecAddress);
+    constructor(request: KeyValidationRequestAndSeparator, contractAddress: AztecAddress);
     toBuffer(): Buffer<ArrayBufferLike>;
-    static fromBuffer(buffer: Buffer | BufferReader): ScopedKeyValidationRequestAndGenerator;
+    static fromBuffer(buffer: Buffer | BufferReader): ScopedKeyValidationRequestAndSeparator;
     toFields(): Fr[];
-    static fromFields(fields: Fr[] | FieldReader): ScopedKeyValidationRequestAndGenerator;
+    static fromFields(fields: Fr[] | FieldReader): ScopedKeyValidationRequestAndSeparator;
     isEmpty(): boolean;
-    static empty(): ScopedKeyValidationRequestAndGenerator;
+    static empty(): ScopedKeyValidationRequestAndSeparator;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NvcGVkX2tleV92YWxpZGF0aW9uX3JlcXVlc3RfYW5kX2dlbmVyYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2tlcm5lbC9oaW50cy9zY29wZWRfa2V5X3ZhbGlkYXRpb25fcmVxdWVzdF9hbmRfZ2VuZXJhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTNGLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUU3Rjs7R0FFRztBQUNILHFCQUFhLHNDQUFzQzthQUUvQixPQUFPLEVBQUUsZ0NBQWdDO2FBQ3pDLGVBQWUsRUFBRSxZQUFZO0lBRi9DLFlBQ2tCLE9BQU8sRUFBRSxnQ0FBZ0MsRUFDekMsZUFBZSxFQUFFLFlBQVksRUFDM0M7SUFFSixRQUFRLDRCQUVQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksMENBTTlDO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxHQUFHLHNDQUFzQyxDQU1wRjtJQUVELE9BQU8sWUFFTjtJQUVELE1BQU0sQ0FBQyxLQUFLLDJDQUVYO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NvcGVkX2tleV92YWxpZGF0aW9uX3JlcXVlc3RfYW5kX3NlcGFyYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2tlcm5lbC9oaW50cy9zY29wZWRfa2V5X3ZhbGlkYXRpb25fcmVxdWVzdF9hbmRfc2VwYXJhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTNGLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUU3Rjs7R0FFRztBQUNILHFCQUFhLHNDQUFzQzthQUUvQixPQUFPLEVBQUUsZ0NBQWdDO2FBQ3pDLGVBQWUsRUFBRSxZQUFZO0lBRi9DLFlBQ2tCLE9BQU8sRUFBRSxnQ0FBZ0MsRUFDekMsZUFBZSxFQUFFLFlBQVksRUFDM0M7SUFFSixRQUFRLDRCQUVQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksMENBTTlDO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxHQUFHLHNDQUFzQyxDQU1wRjtJQUVELE9BQU8sWUFFTjtJQUVELE1BQU0sQ0FBQyxLQUFLLDJDQUVYO0NBQ0YifQ==

package/dest/kernel/hints/{scoped_key_validation_request_and_generator.d.ts.map → scoped_key_validation_request_and_separator.d.ts.map}

@@ -1 +1 @@
-{"version":3,"file":"scoped_key_validation_request_and_generator.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/scoped_key_validation_request_and_generator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAE7F;;GAEG;AACH,qBAAa,sCAAsC;aAE/B,OAAO,EAAE,gCAAgC;aACzC,eAAe,EAAE,YAAY;IAF/C,YACkB,OAAO,EAAE,gCAAgC,EACzC,eAAe,EAAE,YAAY,EAC3C;IAEJ,QAAQ,4BAEP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,0CAM9C;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,sCAAsC,CAMpF;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,2CAEX;CACF"}
+{"version":3,"file":"scoped_key_validation_request_and_separator.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/scoped_key_validation_request_and_separator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAE7F;;GAEG;AACH,qBAAa,sCAAsC;aAE/B,OAAO,EAAE,gCAAgC;aACzC,eAAe,EAAE,YAAY;IAF/C,YACkB,OAAO,EAAE,gCAAgC,EACzC,eAAe,EAAE,YAAY,EAC3C;IAEJ,QAAQ,4BAEP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,0CAM9C;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,sCAAsC,CAMpF;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,2CAEX;CACF"}

package/dest/kernel/hints/{scoped_key_validation_request_and_generator.js → scoped_key_validation_request_and_separator.js}

@@ -1,10 +1,10 @@
 import { SCOPED_KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH } from '@aztec/constants';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { AztecAddress } from '../../aztec-address/index.js';
-import { KeyValidationRequestAndGenerator } from './key_validation_request_and_generator.js';
+import { KeyValidationRequestAndSeparator } from './key_validation_request_and_separator.js';
 /**
  * Request for validating keys used in the app.
- */ export class ScopedKeyValidationRequestAndGenerator {
+ */ export class ScopedKeyValidationRequestAndSeparator {
     request;
     contractAddress;
     constructor(request, contractAddress){
@@ -16,7 +16,7 @@ import { KeyValidationRequestAndGenerator } from './key_validation_request_and_g
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new ScopedKeyValidationRequestAndGenerator(KeyValidationRequestAndGenerator.fromBuffer(reader), AztecAddress.fromBuffer(reader));
+        return new ScopedKeyValidationRequestAndSeparator(KeyValidationRequestAndSeparator.fromBuffer(reader), AztecAddress.fromBuffer(reader));
     }
     toFields() {
         const fields = [
@@ -24,18 +24,18 @@ import { KeyValidationRequestAndGenerator } from './key_validation_request_and_g
             this.contractAddress.toField()
         ];
         if (fields.length !== SCOPED_KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH) {
-            throw new Error(`Invalid number of fields for ScopedKeyValidationRequestAndGenerator. Expected ${SCOPED_KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH}, got ${fields.length}`);
+            throw new Error(`Invalid number of fields for ScopedKeyValidationRequestAndSeparator. Expected ${SCOPED_KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH}, got ${fields.length}`);
         }
         return fields;
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new ScopedKeyValidationRequestAndGenerator(KeyValidationRequestAndGenerator.fromFields(reader), AztecAddress.fromFields(reader));
+        return new ScopedKeyValidationRequestAndSeparator(KeyValidationRequestAndSeparator.fromFields(reader), AztecAddress.fromFields(reader));
     }
     isEmpty() {
         return this.request.isEmpty() && this.contractAddress.isZero();
     }
     static empty() {
-        return new ScopedKeyValidationRequestAndGenerator(KeyValidationRequestAndGenerator.empty(), AztecAddress.ZERO);
+        return new ScopedKeyValidationRequestAndSeparator(KeyValidationRequestAndSeparator.empty(), AztecAddress.ZERO);
     }
 }

package/dest/kernel/index.d.ts

@@ -7,7 +7,11 @@ export * from './private_call_data.js';
 export * from './private_kernel_circuit_public_inputs.js';
 export * from './private_kernel_data.js';
 export * from './private_kernel_init_circuit_private_inputs.js';
+export * from './private_kernel_init_2_circuit_private_inputs.js';
+export * from './private_kernel_init_3_circuit_private_inputs.js';
 export * from './private_kernel_inner_circuit_private_inputs.js';
+export * from './private_kernel_inner_2_circuit_private_inputs.js';
+export * from './private_kernel_inner_3_circuit_private_inputs.js';
 export * from './private_kernel_reset_circuit_private_inputs.js';
 export * from './private_kernel_reset_dimensions.js';
 export * from './private_kernel_tail_circuit_private_inputs.js';
@@ -30,4 +34,4 @@ export * from './private_validation_requests.js';
 export * from './private_kernel_simulated_output.js';
 export * from './private_kernel_prover_output.js';
 export * from './padded_side_effects.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXJuZWwvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYywyQkFBMkIsQ0FBQztBQUMxQyxjQUFjLG1DQUFtQyxDQUFDO0FBQ2xELGNBQWMseUNBQXlDLENBQUM7QUFDeEQsY0FBYyxxREFBcUQsQ0FBQztBQUNwRSxjQUFjLCtCQUErQixDQUFDO0FBQzlDLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsY0FBYywyQ0FBMkMsQ0FBQztBQUMxRCxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsaURBQWlELENBQUM7QUFDaEUsY0FBYyxrREFBa0QsQ0FBQztBQUNqRSxjQUFjLGtEQUFrRCxDQUFDO0FBQ2pFLGNBQWMsc0NBQXNDLENBQUM7QUFDckQsY0FBYyxpREFBaUQsQ0FBQztBQUNoRSxjQUFjLGdEQUFnRCxDQUFDO0FBQy9ELGNBQWMsc0NBQXNDLENBQUM7QUFDckQsY0FBYyx5Q0FBeUMsQ0FBQztBQUN4RCxjQUFjLGlEQUFpRCxDQUFDO0FBQ2hFLGNBQWMscURBQXFELENBQUM7QUFDcEUsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxvQ0FBb0MsQ0FBQztBQUNuRCxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsMEJBQTBCLENBQUM7QUFDekMsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLHVCQUF1QixDQUFDO0FBQ3RDLGNBQWMsMkJBQTJCLENBQUM7QUFDMUMsY0FBYyxrQ0FBa0MsQ0FBQztBQUNqRCxjQUFjLHNDQUFzQyxDQUFDO0FBQ3JELGNBQWMsbUNBQW1DLENBQUM7QUFDbEQsY0FBYywwQkFBMEIsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXJuZWwvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYywyQkFBMkIsQ0FBQztBQUMxQyxjQUFjLG1DQUFtQyxDQUFDO0FBQ2xELGNBQWMseUNBQXlDLENBQUM7QUFDeEQsY0FBYyxxREFBcUQsQ0FBQztBQUNwRSxjQUFjLCtCQUErQixDQUFDO0FBQzlDLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsY0FBYywyQ0FBMkMsQ0FBQztBQUMxRCxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsaURBQWlELENBQUM7QUFDaEUsY0FBYyxtREFBbUQsQ0FBQztBQUNsRSxjQUFjLG1EQUFtRCxDQUFDO0FBQ2xFLGNBQWMsa0RBQWtELENBQUM7QUFDakUsY0FBYyxvREFBb0QsQ0FBQztBQUNuRSxjQUFjLG9EQUFvRCxDQUFDO0FBQ25FLGNBQWMsa0RBQWtELENBQUM7QUFDakUsY0FBYyxzQ0FBc0MsQ0FBQztBQUNyRCxjQUFjLGlEQUFpRCxDQUFDO0FBQ2hFLGNBQWMsZ0RBQWdELENBQUM7QUFDL0QsY0FBYyxzQ0FBc0MsQ0FBQztBQUNyRCxjQUFjLHlDQUF5QyxDQUFDO0FBQ3hELGNBQWMsaURBQWlELENBQUM7QUFDaEUsY0FBYyxxREFBcUQsQ0FBQztBQUNwRSxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLG9DQUFvQyxDQUFDO0FBQ25ELGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsY0FBYywyQkFBMkIsQ0FBQztBQUMxQyxjQUFjLGtDQUFrQyxDQUFDO0FBQ2pELGNBQWMsc0NBQXNDLENBQUM7QUFDckQsY0FBYyxtQ0FBbUMsQ0FBQztBQUNsRCxjQUFjLDBCQUEwQixDQUFDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/kernel/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mCAAmC,CAAC;AAClD,cAAc,yCAAyC,CAAC;AACxD,cAAc,qDAAqD,CAAC;AACpE,cAAc,+BAA+B,CAAC;AAC9C,cAAc,wBAAwB,CAAC;AACvC,cAAc,2CAA2C,CAAC;AAC1D,cAAc,0BAA0B,CAAC;AACzC,cAAc,iDAAiD,CAAC;AAChE,cAAc,kDAAkD,CAAC;AACjE,cAAc,kDAAkD,CAAC;AACjE,cAAc,sCAAsC,CAAC;AACrD,cAAc,iDAAiD,CAAC;AAChE,cAAc,gDAAgD,CAAC;AAC/D,cAAc,sCAAsC,CAAC;AACrD,cAAc,yCAAyC,CAAC;AACxD,cAAc,iDAAiD,CAAC;AAChE,cAAc,qDAAqD,CAAC;AACpE,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,eAAe,CAAC;AAC9B,cAAc,oCAAoC,CAAC;AACnD,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kCAAkC,CAAC;AACjD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/kernel/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mCAAmC,CAAC;AAClD,cAAc,yCAAyC,CAAC;AACxD,cAAc,qDAAqD,CAAC;AACpE,cAAc,+BAA+B,CAAC;AAC9C,cAAc,wBAAwB,CAAC;AACvC,cAAc,2CAA2C,CAAC;AAC1D,cAAc,0BAA0B,CAAC;AACzC,cAAc,iDAAiD,CAAC;AAChE,cAAc,mDAAmD,CAAC;AAClE,cAAc,mDAAmD,CAAC;AAClE,cAAc,kDAAkD,CAAC;AACjE,cAAc,oDAAoD,CAAC;AACnE,cAAc,oDAAoD,CAAC;AACnE,cAAc,kDAAkD,CAAC;AACjE,cAAc,sCAAsC,CAAC;AACrD,cAAc,iDAAiD,CAAC;AAChE,cAAc,gDAAgD,CAAC;AAC/D,cAAc,sCAAsC,CAAC;AACrD,cAAc,yCAAyC,CAAC;AACxD,cAAc,iDAAiD,CAAC;AAChE,cAAc,qDAAqD,CAAC;AACpE,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,eAAe,CAAC;AAC9B,cAAc,oCAAoC,CAAC;AACnD,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kCAAkC,CAAC;AACjD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,0BAA0B,CAAC"}

package/dest/kernel/index.js

@@ -7,7 +7,11 @@ export * from './private_call_data.js';
 export * from './private_kernel_circuit_public_inputs.js';
 export * from './private_kernel_data.js';
 export * from './private_kernel_init_circuit_private_inputs.js';
+export * from './private_kernel_init_2_circuit_private_inputs.js';
+export * from './private_kernel_init_3_circuit_private_inputs.js';
 export * from './private_kernel_inner_circuit_private_inputs.js';
+export * from './private_kernel_inner_2_circuit_private_inputs.js';
+export * from './private_kernel_inner_3_circuit_private_inputs.js';
 export * from './private_kernel_reset_circuit_private_inputs.js';
 export * from './private_kernel_reset_dimensions.js';
 export * from './private_kernel_tail_circuit_private_inputs.js';

package/dest/kernel/log_hash.d.ts

@@ -1,5 +1,5 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
+import { BufferReader, BufferSink, FieldReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { inspect } from 'util';
 import { AztecAddress } from '../aztec-address/index.js';
@@ -13,6 +13,7 @@ export declare class LogHash {
     isEmpty(): boolean;
     static empty(): LogHash;
     toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     static fromBuffer(buffer: Buffer | BufferReader): LogHash;
     toString(): string;
     scope(contractAddress: AztecAddress): ScopedLogHash;
@@ -27,6 +28,7 @@ export declare class CountedLogHash {
     isEmpty(): boolean;
     static empty(): CountedLogHash;
     toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     static fromBuffer(buffer: Buffer | BufferReader): CountedLogHash;
 }
 export declare class ScopedLogHash {
@@ -39,6 +41,7 @@ export declare class ScopedLogHash {
     isEmpty(): boolean;
     static empty(): ScopedLogHash;
     toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     static fromBuffer(buffer: Buffer | BufferReader): ScopedLogHash;
     toString(): string;
 }
@@ -49,8 +52,9 @@ export declare class ScopedCountedLogHash {
     toFields(): Fr[];
     static fromFields(fields: Fr[] | FieldReader): ScopedCountedLogHash;
     toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     static fromBuffer(buffer: Buffer | BufferReader): ScopedCountedLogHash;
     isEmpty(): boolean;
     static empty(): ScopedCountedLogHash;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX2hhc2guZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXJuZWwvbG9nX2hhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBQzNGLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFL0IsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXpELHFCQUFhLE9BQU87SUFFVCxLQUFLLEVBQUUsRUFBRTtJQUNULE1BQU0sRUFBRSxNQUFNO0lBRnZCLFlBQ1MsS0FBSyxFQUFFLEVBQUUsRUFDVCxNQUFNLEVBQUUsTUFBTSxFQUNuQjtJQUVKLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxPQUFPLENBQUMsV0FFcEM7SUFFRCxRQUFRLElBQUksRUFBRSxFQUFFLENBRWY7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLFdBRzNDO0lBRUQsT0FBTyxZQUVOO0lBRUQsTUFBTSxDQUFDLEtBQUssWUFFWDtJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksV0FHOUM7SUFFRCxRQUFRLElBQUksTUFBTSxDQUVqQjtJQUVELEtBQUssQ0FBQyxlQUFlLEVBQUUsWUFBWSxpQkFFbEM7SUFFRCxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxNQUFNLENBRXpCO0NBQ0Y7QUFFRCxxQkFBYSxjQUFjO0lBRWhCLE9BQU8sRUFBRSxPQUFPO0lBQ2hCLE9BQU8sRUFBRSxNQUFNO0lBRnhCLFlBQ1MsT0FBTyxFQUFFLE9BQU8sRUFDaEIsT0FBTyxFQUFFLE1BQU0sRUFDcEI7SUFFSixRQUFRLElBQUksRUFBRSxFQUFFLENBRWY7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLGtCQUczQztJQUVELE9BQU8sWUFFTjtJQUVELE1BQU0sQ0FBQyxLQUFLLG1CQUVYO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxrQkFHOUM7Q0FDRjtBQUVELHFCQUFhLGFBQWE7SUFFZixPQUFPLEVBQUUsT0FBTztJQUNoQixlQUFlLEVBQUUsWUFBWTtJQUZ0QyxZQUNTLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLGVBQWUsRUFBRSxZQUFZLEVBQ2xDO0lBRUosSUFBSSxLQUFLLE9BRVI7SUFFRCxRQUFRLElBQUksRUFBRSxFQUFFLENBRWY7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLGlCQUczQztJQUVELE9BQU8sWUFFTjtJQUVELE1BQU0sQ0FBQyxLQUFLLGtCQUVYO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxpQkFHOUM7SUFFRCxRQUFRLElBQUksTUFBTSxDQUVqQjtDQUNGO0FBRUQscUJBQWEsb0JBQW9CO0lBRXRCLEtBQUssRUFBRSxjQUFjO0lBQ3JCLGVBQWUsRUFBRSxZQUFZO0lBRnRDLFlBQ1MsS0FBSyxFQUFFLGNBQWMsRUFDckIsZUFBZSxFQUFFLFlBQVksRUFDbEM7SUFFSixRQUFRLElBQUksRUFBRSxFQUFFLENBRWY7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLHdCQUczQztJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksd0JBRzlDO0lBRUQsT0FBTyxZQUVOO0lBRUQsTUFBTSxDQUFDLEtBQUsseUJBRVg7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX2hhc2guZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXJuZWwvbG9nX2hhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLFdBQVcsRUFBbUIsTUFBTSw2QkFBNkIsQ0FBQztBQUNyRyxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRS9CLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxxQkFBYSxPQUFPO0lBRVQsS0FBSyxFQUFFLEVBQUU7SUFDVCxNQUFNLEVBQUUsTUFBTTtJQUZ2QixZQUNTLEtBQUssRUFBRSxFQUFFLEVBQ1QsTUFBTSxFQUFFLE1BQU0sRUFDbkI7SUFFSixNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsT0FBTyxDQUFDLFdBRXBDO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQUVmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxXQUczQztJQUVELE9BQU8sWUFFTjtJQUVELE1BQU0sQ0FBQyxLQUFLLFlBRVg7SUFFRCxRQUFRLElBQUksTUFBTSxDQUFDO0lBQ25CLFFBQVEsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLElBQUksQ0FBQztJQVFqQyxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxXQUc5QztJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsS0FBSyxDQUFDLGVBQWUsRUFBRSxZQUFZLGlCQUVsQztJQUVELENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLE1BQU0sQ0FFekI7Q0FDRjtBQUVELHFCQUFhLGNBQWM7SUFFaEIsT0FBTyxFQUFFLE9BQU87SUFDaEIsT0FBTyxFQUFFLE1BQU07SUFGeEIsWUFDUyxPQUFPLEVBQUUsT0FBTyxFQUNoQixPQUFPLEVBQUUsTUFBTSxFQUNwQjtJQUVKLFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FFZjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsa0JBRzNDO0lBRUQsT0FBTyxZQUVOO0lBRUQsTUFBTSxDQUFDLEtBQUssbUJBRVg7SUFFRCxRQUFRLElBQUksTUFBTSxDQUFDO0lBQ25CLFFBQVEsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLElBQUksQ0FBQztJQVFqQyxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxrQkFHOUM7Q0FDRjtBQUVELHFCQUFhLGFBQWE7SUFFZixPQUFPLEVBQUUsT0FBTztJQUNoQixlQUFlLEVBQUUsWUFBWTtJQUZ0QyxZQUNTLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLGVBQWUsRUFBRSxZQUFZLEVBQ2xDO0lBRUosSUFBSSxLQUFLLE9BRVI7SUFFRCxRQUFRLElBQUksRUFBRSxFQUFFLENBRWY7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLGlCQUczQztJQUVELE9BQU8sWUFFTjtJQUVELE1BQU0sQ0FBQyxLQUFLLGtCQUVYO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FBQztJQUNuQixRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxJQUFJLENBQUM7SUFRakMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksaUJBRzlDO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7Q0FDRjtBQUVELHFCQUFhLG9CQUFvQjtJQUV0QixLQUFLLEVBQUUsY0FBYztJQUNyQixlQUFlLEVBQUUsWUFBWTtJQUZ0QyxZQUNTLEtBQUssRUFBRSxjQUFjLEVBQ3JCLGVBQWUsRUFBRSxZQUFZLEVBQ2xDO0lBRUosUUFBUSxJQUFJLEVBQUUsRUFBRSxDQUVmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyx3QkFHM0M7SUFFRCxRQUFRLElBQUksTUFBTSxDQUFDO0lBQ25CLFFBQVEsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLElBQUksQ0FBQztJQVFqQyxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSx3QkFHOUM7SUFFRCxPQUFPLFlBRU47SUFFRCxNQUFNLENBQUMsS0FBSyx5QkFFWDtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"log_hash.d.ts","sourceRoot":"","sources":["../../src/kernel/log_hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAC3F,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;AAEzD,qBAAa,OAAO;IAET,KAAK,EAAE,EAAE;IACT,MAAM,EAAE,MAAM;IAFvB,YACS,KAAK,EAAE,EAAE,EACT,MAAM,EAAE,MAAM,EACnB;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,WAEpC;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,WAG3C;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,YAEX;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,WAG9C;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,KAAK,CAAC,eAAe,EAAE,YAAY,iBAElC;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAEzB;CACF;AAED,qBAAa,cAAc;IAEhB,OAAO,EAAE,OAAO;IAChB,OAAO,EAAE,MAAM;IAFxB,YACS,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACpB;IAEJ,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,kBAG3C;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,mBAEX;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,kBAG9C;CACF;AAED,qBAAa,aAAa;IAEf,OAAO,EAAE,OAAO;IAChB,eAAe,EAAE,YAAY;IAFtC,YACS,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,YAAY,EAClC;IAEJ,IAAI,KAAK,OAER;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,iBAG3C;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,kBAEX;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,iBAG9C;IAED,QAAQ,IAAI,MAAM,CAEjB;CACF;AAED,qBAAa,oBAAoB;IAEtB,KAAK,EAAE,cAAc;IACrB,eAAe,EAAE,YAAY;IAFtC,YACS,KAAK,EAAE,cAAc,EACrB,eAAe,EAAE,YAAY,EAClC;IAEJ,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,wBAG3C;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,wBAG9C;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,yBAEX;CACF"}
+{"version":3,"file":"log_hash.d.ts","sourceRoot":"","sources":["../../src/kernel/log_hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAmB,MAAM,6BAA6B,CAAC;AACrG,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;AAEzD,qBAAa,OAAO;IAET,KAAK,EAAE,EAAE;IACT,MAAM,EAAE,MAAM;IAFvB,YACS,KAAK,EAAE,EAAE,EACT,MAAM,EAAE,MAAM,EACnB;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,WAEpC;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,WAG3C;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,YAEX;IAED,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAQjC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,WAG9C;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,KAAK,CAAC,eAAe,EAAE,YAAY,iBAElC;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAEzB;CACF;AAED,qBAAa,cAAc;IAEhB,OAAO,EAAE,OAAO;IAChB,OAAO,EAAE,MAAM;IAFxB,YACS,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACpB;IAEJ,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,kBAG3C;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,mBAEX;IAED,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAQjC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,kBAG9C;CACF;AAED,qBAAa,aAAa;IAEf,OAAO,EAAE,OAAO;IAChB,eAAe,EAAE,YAAY;IAFtC,YACS,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,YAAY,EAClC;IAEJ,IAAI,KAAK,OAER;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,iBAG3C;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,kBAEX;IAED,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAQjC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,iBAG9C;IAED,QAAQ,IAAI,MAAM,CAEjB;CACF;AAED,qBAAa,oBAAoB;IAEtB,KAAK,EAAE,cAAc;IACrB,eAAe,EAAE,YAAY;IAFtC,YACS,KAAK,EAAE,cAAc,EACrB,eAAe,EAAE,YAAY,EAClC;IAEJ,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,wBAG3C;IAED,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAQjC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,wBAG9C;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,yBAEX;CACF"}

package/dest/kernel/log_hash.js

@@ -1,6 +1,6 @@
 var _computedKey;
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { BufferReader, BufferSink, FieldReader, serializeToSink } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { AztecAddress } from '../aztec-address/index.js';
 _computedKey = inspect.custom;
@@ -30,8 +30,11 @@ export class LogHash {
     static empty() {
         return new LogHash(Fr.zero(), 0);
     }
-    toBuffer() {
-        return serializeToBuffer(this.value, this.length);
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, this.value, this.length);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
@@ -70,8 +73,11 @@ export class CountedLogHash {
     static empty() {
         return new CountedLogHash(LogHash.empty(), 0);
     }
-    toBuffer() {
-        return serializeToBuffer(this.logHash, this.counter);
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, this.logHash, this.counter);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
@@ -104,8 +110,11 @@ export class ScopedLogHash {
     static empty() {
         return new ScopedLogHash(LogHash.empty(), AztecAddress.ZERO);
     }
-    toBuffer() {
-        return serializeToBuffer(this.logHash, this.contractAddress);
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, this.logHash, this.contractAddress);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
@@ -132,8 +141,11 @@ export class ScopedCountedLogHash {
         const reader = FieldReader.asReader(fields);
         return new ScopedCountedLogHash(reader.readObject(CountedLogHash), AztecAddress.fromField(reader.readField()));
     }
-    toBuffer() {
-        return serializeToBuffer(this.inner, this.contractAddress);
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, this.inner, this.contractAddress);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);