@aztec/stdlib 0.0.0-test.1 → 0.0.1-commit.017a351

package/dest/kernel/hints/build_nullifier_read_request_hints.js

@@ -1,20 +1,13 @@
 import { MAX_NULLIFIER_READ_REQUESTS_PER_TX } from '@aztec/constants';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { AztecAddress } from '../../aztec-address/index.js';
-import { siloNullifier } from '../../hash/hash.js';
-import { Nullifier } from '../nullifier.js';
-import { countAccumulatedItems, getNonEmptyItems } from '../utils/order_and_comparison.js';
 import { NullifierReadRequestHintsBuilder } from './nullifier_read_request_hints.js';
-import { ReadRequest, ScopedReadRequest } from './read_request.js';
-import { PendingReadHint, ReadRequestResetStates, ReadRequestState } from './read_request_hints.js';
-import { ScopedValueCache } from './scoped_value_cache.js';
+import { PendingReadHint, ReadRequestActionEnum, ReadRequestResetActions } from './read_request_hints.js';
 export function isValidNullifierReadRequest(readRequest, nullifier) {
     return readRequest.value.equals(nullifier.value) && nullifier.contractAddress.equals(readRequest.contractAddress) && readRequest.counter > nullifier.counter;
 }
-export function getNullifierReadRequestResetStates(nullifierReadRequests, nullifiers, futureNullifiers) {
-    const resetStates = ReadRequestResetStates.empty(MAX_NULLIFIER_READ_REQUESTS_PER_TX);
+export function getNullifierReadRequestResetActions(nullifierReadRequests, nullifiers) {
+    const resetActions = ReadRequestResetActions.empty(MAX_NULLIFIER_READ_REQUESTS_PER_TX);
     const nullifierMap = new Map();
-    getNonEmptyItems(nullifiers).forEach((nullifier, index)=>{
+    nullifiers.getActiveItems().forEach((nullifier, index)=>{
         const value = nullifier.value.toBigInt();
         const arr = nullifierMap.get(value) ?? [];
         arr.push({
@@ -23,45 +16,48 @@ export function getNullifierReadRequestResetStates(nullifierReadRequests, nullif
         });
         nullifierMap.set(value, arr);
     });
-    const futureNullifiersMap = new ScopedValueCache(futureNullifiers);
-    const numReadRequests = countAccumulatedItems(nullifierReadRequests);
-    for(let i = 0; i < numReadRequests; ++i){
-        const readRequest = nullifierReadRequests[i];
-        const pendingNullifier = nullifierMap.get(readRequest.value.toBigInt())?.find(({ nullifier })=>isValidNullifierReadRequest(readRequest, nullifier));
-        if (pendingNullifier !== undefined) {
-            resetStates.states[i] = ReadRequestState.PENDING;
-            resetStates.pendingReadHints.push(new PendingReadHint(i, pendingNullifier.index));
-        } else if (!futureNullifiersMap.get(readRequest).some((futureNullifier)=>isValidNullifierReadRequest(readRequest, futureNullifier))) {
-            resetStates.states[i] = ReadRequestState.SETTLED;
+    for(let i = 0; i < nullifierReadRequests.claimedLength; ++i){
+        const readRequest = nullifierReadRequests.array[i];
+        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 resetStates;
+    return resetActions;
 }
-export async function buildNullifierReadRequestHintsFromResetStates(oracle, nullifierReadRequests, resetStates, maxPending = MAX_NULLIFIER_READ_REQUESTS_PER_TX, maxSettled = MAX_NULLIFIER_READ_REQUESTS_PER_TX, siloed = false) {
+export async function buildNullifierReadRequestHintsFromResetActions(oracle, nullifierReadRequests, resetActions, maxPending = MAX_NULLIFIER_READ_REQUESTS_PER_TX, maxSettled = MAX_NULLIFIER_READ_REQUESTS_PER_TX) {
     const builder = new NullifierReadRequestHintsBuilder(maxPending, maxSettled);
-    resetStates.pendingReadHints.forEach((hint)=>{
+    resetActions.pendingReadHints.forEach((hint)=>{
         builder.addPendingReadRequest(hint.readRequestIndex, hint.pendingValueIndex);
     });
-    for(let i = 0; i < resetStates.states.length; i++){
-        if (resetStates.states[i] === ReadRequestState.SETTLED) {
-            const readRequest = nullifierReadRequests[i];
-            const siloedValue = siloed ? readRequest.value : await siloNullifier(readRequest.contractAddress, readRequest.value);
-            const membershipWitnessWithPreimage = await oracle.getNullifierMembershipWitness(siloedValue);
-            builder.addSettledReadRequest(i, membershipWitnessWithPreimage.membershipWitness, membershipWitnessWithPreimage.leafPreimage);
+    // Collect all settled read requests
+    const settledRequests = [];
+    for(let i = 0; i < resetActions.actions.length; i++){
+        if (resetActions.actions[i] === ReadRequestActionEnum.READ_AS_SETTLED) {
+            settledRequests.push({
+                index: i,
+                readRequest: nullifierReadRequests.array[i]
+            });
         }
     }
+    const siloedValues = settledRequests.map(({ readRequest })=>readRequest.value);
+    // Fetch all membership witnesses in parallel
+    const membershipWitnesses = await Promise.all(siloedValues.map((value)=>oracle.getNullifierMembershipWitness(value)));
+    // Add settled read requests to builder
+    for(let i = 0; i < settledRequests.length; i++){
+        builder.addSettledReadRequest(settledRequests[i].index, membershipWitnesses[i].membershipWitness, membershipWitnesses[i].leafPreimage);
+    }
     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, siloed = false) {
-    const resetStates = getNullifierReadRequestResetStates(nullifierReadRequests, nullifiers, futureNullifiers);
-    return await buildNullifierReadRequestHintsFromResetStates(oracle, nullifierReadRequests, resetStates, maxPending, maxSettled, siloed);
-}
-export async function buildSiloedNullifierReadRequestHints(oracle, nullifierReadRequests, nullifiers, maxPending = MAX_NULLIFIER_READ_REQUESTS_PER_TX, maxSettled = MAX_NULLIFIER_READ_REQUESTS_PER_TX) {
-    // Nullifiers outputted from public kernels are already siloed while read requests are not.
-    // Siloing the read request values and set the contract addresses to zero to find the matching nullifier contexts.
-    const nonEmptyNullifierReadRequests = getNonEmptyItems(nullifierReadRequests);
-    const readRequests = await Promise.all(nonEmptyNullifierReadRequests.map(async (r)=>new ReadRequest(await siloNullifier(r.contractAddress, r.value), r.counter).scope(AztecAddress.ZERO)));
-    const siloedReadRequests = padArrayEnd(readRequests, ScopedReadRequest.empty(), MAX_NULLIFIER_READ_REQUESTS_PER_TX);
-    const scopedNullifiers = nullifiers.map((n)=>new Nullifier(n.value, n.counter, n.noteHash).scope(AztecAddress.ZERO));
-    return buildNullifierReadRequestHints(oracle, siloedReadRequests, scopedNullifiers, [], maxPending, maxSettled, true);
+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

@@ -1,10 +1,14 @@
 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 { TransientDataIndexHint } from './transient_data_index_hint.js';
-export declare function buildTransientDataHints<NOTE_HASHES_LEN extends number, NULLIFIERS_LEN extends number>(noteHashes: Tuple<ScopedNoteHash, NOTE_HASHES_LEN>, nullifiers: Tuple<ScopedNullifier, NULLIFIERS_LEN>, futureNoteHashReads: ScopedReadRequest[], futureNullifierReads: ScopedReadRequest[], noteHashNullifierCounterMap: Map<number, number>, validationRequestsSplitCounter: number, noteHashesLength?: NOTE_HASHES_LEN, nullifiersLength?: NULLIFIERS_LEN): {
+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[], futureLogs: PrivateLogData[], noteHashNullifierCounterMap: Map<number, number>, splitCounter: number): {
     numTransientData: number;
-    hints: Tuple<TransientDataIndexHint, NULLIFIERS_LEN>;
+    hints: Tuple<TransientDataSquashingHint, NULLIFIERS_LEN>;
 };
-//# sourceMappingURL=build_transient_data_hints.d.ts.map
+/** 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,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAIvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAExE,wBAAgB,uBAAuB,CAAC,eAAe,SAAS,MAAM,EAAE,cAAc,SAAS,MAAM,EACnG,UAAU,EAAE,KAAK,CAAC,cAAc,EAAE,eAAe,CAAC,EAClD,UAAU,EAAE,KAAK,CAAC,eAAe,EAAE,cAAc,CAAC,EAClD,mBAAmB,EAAE,iBAAiB,EAAE,EACxC,oBAAoB,EAAE,iBAAiB,EAAE,EACzC,2BAA2B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAChD,8BAA8B,EAAE,MAAM,EACtC,gBAAgB,GAAE,eAAsD,EACxE,gBAAgB,GAAE,cAAoD,GACrE;IAAE,gBAAgB,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC,sBAAsB,EAAE,cAAc,CAAC,CAAA;CAAE,CA2DpF"}
+{"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

@@ -1,21 +1,21 @@
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { countAccumulatedItems } from '../utils/order_and_comparison.js';
 import { isValidNoteHashReadRequest } from './build_note_hash_read_request_hints.js';
 import { isValidNullifierReadRequest } from './build_nullifier_read_request_hints.js';
 import { ScopedValueCache } from './scoped_value_cache.js';
-import { TransientDataIndexHint } from './transient_data_index_hint.js';
-export function buildTransientDataHints(noteHashes, nullifiers, futureNoteHashReads, futureNullifierReads, noteHashNullifierCounterMap, validationRequestsSplitCounter, noteHashesLength = noteHashes.length, nullifiersLength = nullifiers.length) {
+import { TransientDataSquashingHint } from './transient_data_squashing_hint.js';
+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.forEach((n, i)=>nullifierIndexMap.set(n.counter, i));
+    nullifiers.getActiveItems().forEach((n, i)=>nullifierIndexMap.set(n.counter, i));
     const hints = [];
-    const numNoteHashes = countAccumulatedItems(noteHashes);
-    for(let noteHashIndex = 0; noteHashIndex < numNoteHashes; noteHashIndex++){
-        const noteHash = noteHashes[noteHashIndex];
+    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);
@@ -23,9 +23,9 @@ export function buildTransientDataHints(noteHashes, nullifiers, futureNoteHashRe
         if (nullifierIndex === undefined) {
             continue;
         }
-        const nullifier = nullifiers[nullifierIndex];
+        const nullifier = nullifiers.array[nullifierIndex];
         // Cannot nullify a non-revertible note hash with a revertible nullifier.
-        if (noteHash.counter < validationRequestsSplitCounter && nullifier.counter >= validationRequestsSplitCounter) {
+        if (noteHash.counter < splitCounter && nullifier.counter >= splitCounter) {
             continue;
         }
         // If the following errors show up, something's wrong with how we build the noteHashNullifierCounterMap in client_execution_context.ts.
@@ -42,10 +42,15 @@ export function buildTransientDataHints(noteHashes, nullifiers, futureNoteHashRe
         if (futureNullifierReadsMap.get(nullifier).find((read)=>isValidNullifierReadRequest(read, nullifier))) {
             continue;
         }
-        hints.push(new TransientDataIndexHint(nullifierIndex, noteHashIndex));
+        hints.push(new TransientDataSquashingHint(nullifierIndex, noteHashIndex));
     }
+    const noActionHint = new TransientDataSquashingHint(nullifiers.array.length, noteHashes.array.length);
     return {
         numTransientData: hints.length,
-        hints: padArrayEnd(hints, new TransientDataIndexHint(nullifiersLength, noteHashesLength), nullifiersLength)
+        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/find_private_kernel_reset_dimensions.d.ts

@@ -1,3 +1,3 @@
 import { PrivateKernelResetDimensions, type PrivateKernelResetDimensionsConfig } from '../private_kernel_reset_dimensions.js';
 export declare function findPrivateKernelResetDimensions(requestedDimensions: PrivateKernelResetDimensions, config: PrivateKernelResetDimensionsConfig, isInner?: boolean, allowRemainder?: boolean): PrivateKernelResetDimensions;
-//# sourceMappingURL=find_private_kernel_reset_dimensions.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmluZF9wcml2YXRlX2tlcm5lbF9yZXNldF9kaW1lbnNpb25zLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMva2VybmVsL2hpbnRzL2ZpbmRfcHJpdmF0ZV9rZXJuZWxfcmVzZXRfZGltZW5zaW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQ0wsNEJBQTRCLEVBQzVCLEtBQUssa0NBQWtDLEVBRXhDLE1BQU0sdUNBQXVDLENBQUM7QUErSC9DLHdCQUFnQixnQ0FBZ0MsQ0FDOUMsbUJBQW1CLEVBQUUsNEJBQTRCLEVBQ2pELE1BQU0sRUFBRSxrQ0FBa0MsRUFDMUMsT0FBTyxVQUFRLEVBQ2YsY0FBYyxVQUFRLGdDQTJCdkIifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"find_private_kernel_reset_dimensions.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/find_private_kernel_reset_dimensions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,KAAK,kCAAkC,EAExC,MAAM,uCAAuC,CAAC;AAmI/C,wBAAgB,gCAAgC,CAC9C,mBAAmB,EAAE,4BAA4B,EACjD,MAAM,EAAE,kCAAkC,EAC1C,OAAO,UAAQ,EACf,cAAc,UAAQ,gCA2BvB"}
+{"version":3,"file":"find_private_kernel_reset_dimensions.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/find_private_kernel_reset_dimensions.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,4BAA4B,EAC5B,KAAK,kCAAkC,EAExC,MAAM,uCAAuC,CAAC;AA+H/C,wBAAgB,gCAAgC,CAC9C,mBAAmB,EAAE,4BAA4B,EACjD,MAAM,EAAE,kCAAkC,EAC1C,OAAO,UAAQ,EACf,cAAc,UAAQ,gCA2BvB"}

package/dest/kernel/hints/find_private_kernel_reset_dimensions.js

@@ -1,7 +1,5 @@
+import { isDefined } from '@aztec/foundation/types';
 import { PrivateKernelResetDimensions, privateKernelResetDimensionNames } from '../private_kernel_reset_dimensions.js';
-function isDefined(value) {
-    return value !== undefined;
-}
 function computeCost(dimensions, config) {
     return privateKernelResetDimensionNames.reduce((accum, name)=>accum + dimensions[name] * config.dimensions[name].cost, 0);
 }
@@ -91,7 +89,7 @@ function findSpecialCase(requestedDimensions, config, isQualified) {
 export function findPrivateKernelResetDimensions(requestedDimensions, config, isInner = false, allowRemainder = false) {
     const requestedValues = requestedDimensions.toValues();
     const isEnough = allowRemainder ? ()=>true : (dimensions)=>dimensions.toValues().every((v, i)=>v >= requestedValues[i]);
-    const isQualified = !isInner ? isEnough : (dimensions)=>dimensions.NOTE_HASH_SILOING_AMOUNT === 0 && dimensions.NULLIFIER_SILOING_AMOUNT === 0 && dimensions.PRIVATE_LOG_SILOING_AMOUNT === 0 && isEnough(dimensions);
+    const isQualified = !isInner ? isEnough : (dimensions)=>dimensions.NOTE_HASH_SILOING === 0 && dimensions.NULLIFIER_SILOING === 0 && dimensions.PRIVATE_LOG_SILOING === 0 && isEnough(dimensions);
     const options = [
         findVariant(requestedDimensions, config, isQualified),
         findStandalone(requestedDimensions, config, isQualified),

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

@@ -6,12 +6,11 @@ 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 './rollup_validation_requests.js';
-export * from './transient_data_index_hint.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';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9rZXJuZWwvaGludHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyx5Q0FBeUMsQ0FBQztBQUN4RCxjQUFjLHlDQUF5QyxDQUFDO0FBQ3hELGNBQWMsaUNBQWlDLENBQUM7QUFDaEQsY0FBYywyQ0FBMkMsQ0FBQztBQUMxRCxjQUFjLG1DQUFtQyxDQUFDO0FBQ2xELGNBQWMsbUNBQW1DLENBQUM7QUFDbEQsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsMkNBQTJDLENBQUM7QUFDMUQsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsa0RBQWtELENBQUM7QUFDakUsY0FBYyxvQ0FBb0MsQ0FBQztBQUNuRCxjQUFjLGlDQUFpQyxDQUFDO0FBQ2hELGNBQWMsNkJBQTZCLENBQUMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/index.ts"],"names":[],"mappings":"AAAA,cAAc,yCAAyC,CAAC;AACxD,cAAc,yCAAyC,CAAC;AACxD,cAAc,iCAAiC,CAAC;AAChD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,mCAAmC,CAAC;AAClD,cAAc,mCAAmC,CAAC;AAClD,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,2CAA2C,CAAC;AAC1D,cAAc,mBAAmB,CAAC;AAClC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kDAAkD,CAAC;AACjE,cAAc,iCAAiC,CAAC;AAChD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iCAAiC,CAAC;AAChD,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/index.ts"],"names":[],"mappings":"AAAA,cAAc,yCAAyC,CAAC;AACxD,cAAc,yCAAyC,CAAC;AACxD,cAAc,iCAAiC,CAAC;AAChD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,mCAAmC,CAAC;AAClD,cAAc,mCAAmC,CAAC;AAClD,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,2CAA2C,CAAC;AAC1D,cAAc,mBAAmB,CAAC;AAClC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kDAAkD,CAAC;AACjE,cAAc,oCAAoC,CAAC;AACnD,cAAc,iCAAiC,CAAC;AAChD,cAAc,6BAA6B,CAAC"}

package/dest/kernel/hints/index.js

@@ -6,11 +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 './rollup_validation_requests.js';
-export * from './transient_data_index_hint.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_hint.d.ts

@@ -1,19 +1,13 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { GrumpkinScalar } from '@aztec/foundation/fields';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { BufferReader } from '@aztec/foundation/serialize';
 export declare class KeyValidationHint {
     /** Master secret key used to derive sk_app and pk_m. */
     skM: GrumpkinScalar;
-    /** Index of the request in the array of hints. */
-    requestIndex: number;
     constructor(
     /** Master secret key used to derive sk_app and pk_m. */
-    skM: GrumpkinScalar, 
-    /** Index of the request in the array of hints. */
-    requestIndex: number);
+    skM: GrumpkinScalar);
     static fromBuffer(buffer: Buffer | BufferReader): KeyValidationHint;
-    toBuffer(): Buffer;
-    static nada(keyValidationRequestLen: number): KeyValidationHint;
+    toBuffer(): Buffer<ArrayBufferLike>;
+    static empty(): KeyValidationHint;
 }
-//# sourceMappingURL=key_validation_hint.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5X3ZhbGlkYXRpb25faGludC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2tlcm5lbC9oaW50cy9rZXlfdmFsaWRhdGlvbl9oaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUNuRSxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTlFLHFCQUFhLGlCQUFpQjtJQUUxQix3REFBd0Q7SUFDakQsR0FBRyxFQUFFLGNBQWM7SUFGNUI7SUFDRSx3REFBd0Q7SUFDakQsR0FBRyxFQUFFLGNBQWMsRUFDeEI7SUFFSixNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxxQkFHOUM7SUFFRCxRQUFRLDRCQUVQO0lBRUQsTUFBTSxDQUFDLEtBQUssc0JBRVg7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"key_validation_hint.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/key_validation_hint.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,qBAAa,iBAAiB;IAE1B,wDAAwD;IACjD,GAAG,EAAE,cAAc;IAC1B,kDAAkD;IAC3C,YAAY,EAAE,MAAM;;IAH3B,wDAAwD;IACjD,GAAG,EAAE,cAAc;IAC1B,kDAAkD;IAC3C,YAAY,EAAE,MAAM;IAG7B,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,QAAQ;IAIR,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,MAAM;CAG5C"}
+{"version":3,"file":"key_validation_hint.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/key_validation_hint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,qBAAa,iBAAiB;IAE1B,wDAAwD;IACjD,GAAG,EAAE,cAAc;IAF5B;IACE,wDAAwD;IACjD,GAAG,EAAE,cAAc,EACxB;IAEJ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,qBAG9C;IAED,QAAQ,4BAEP;IAED,MAAM,CAAC,KAAK,sBAEX;CACF"}

package/dest/kernel/hints/key_validation_hint.js

@@ -1,20 +1,18 @@
-import { GrumpkinScalar } from '@aztec/foundation/fields';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 export class KeyValidationHint {
     skM;
-    requestIndex;
-    constructor(/** Master secret key used to derive sk_app and pk_m. */ skM, /** Index of the request in the array of hints. */ requestIndex){
+    constructor(/** Master secret key used to derive sk_app and pk_m. */ skM){
         this.skM = skM;
-        this.requestIndex = requestIndex;
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new KeyValidationHint(reader.readObject(GrumpkinScalar), reader.readNumber());
+        return new KeyValidationHint(reader.readObject(GrumpkinScalar));
     }
     toBuffer() {
-        return serializeToBuffer(this.skM, this.requestIndex);
+        return serializeToBuffer(this.skM);
     }
-    static nada(keyValidationRequestLen) {
-        return new KeyValidationHint(GrumpkinScalar.zero(), keyValidationRequestLen);
+    static empty() {
+        return new KeyValidationHint(GrumpkinScalar.zero());
     }
 }

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

@@ -1,25 +1,28 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
+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);
-    toBuffer(): Buffer;
-    get skAppAsGrumpkinScalar(): import("@aztec/foundation/fields").Fq;
+    /** 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;
     toFields(): Fr[];
     static fromFields(fields: Fr[] | FieldReader): KeyValidationRequest;
     isEmpty(): boolean;
     static empty(): KeyValidationRequest;
-    static random(): Promise<KeyValidationRequest>;
+    static random(): KeyValidationRequest;
 }
-//# sourceMappingURL=key_validation_request.d.ts.map
+//# 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,cAAc,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACrE,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;;IAGxB,6FAA6F;IAC7E,GAAG,EAAE,KAAK,EAC1B,KAAK,EAAE,EAAE,GAAG,cAAc;IAS5B,QAAQ;IAIR,IAAI,qBAAqB,0CAExB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,QAAQ,IAAI,EAAE,EAAE;IAUhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,oBAAoB;IAKnE,OAAO;IAIP,MAAM,CAAC,KAAK;WAIC,MAAM;CAGpB"}
+{"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,34 +1,37 @@
 import { KEY_VALIDATION_REQUEST_LENGTH } from '@aztec/constants';
-import { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
+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}`);
         }
@@ -36,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_separator.js

@@ -0,0 +1,41 @@
+import { KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH } from '@aztec/constants';
+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, along with a domain separator for the key type.
+ */ export class KeyValidationRequestAndSeparator {
+    request;
+    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.keyTypeDomainSeparator = keyTypeDomainSeparator;
+    }
+    toBuffer() {
+        return serializeToBuffer(this.request, this.keyTypeDomainSeparator);
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new KeyValidationRequestAndSeparator(reader.readObject(KeyValidationRequest), Fr.fromBuffer(reader));
+    }
+    toFields() {
+        const fields = [
+            ...this.request.toFields(),
+            this.keyTypeDomainSeparator
+        ];
+        if (fields.length !== KEY_VALIDATION_REQUEST_AND_GENERATOR_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 KeyValidationRequestAndSeparator(KeyValidationRequest.fromFields(reader), reader.readField());
+    }
+    isEmpty() {
+        return this.request.isEmpty() && this.keyTypeDomainSeparator.isZero();
+    }
+    static empty() {
+        return new KeyValidationRequestAndSeparator(KeyValidationRequest.empty(), Fr.ZERO);
+    }
+}

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

@@ -1,7 +1,5 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { MAX_NOTE_HASH_READ_REQUESTS_PER_TX, NOTE_HASH_TREE_HEIGHT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { BufferReader } from '@aztec/foundation/serialize';
 import type { MembershipWitness } from '@aztec/foundation/trees';
 import { ReadRequestResetHints } from './read_request_hints.js';
@@ -21,4 +19,4 @@ export declare class NoteHashReadRequestHintsBuilder<PENDING extends number, SET
     toHints(): NoteHashReadRequestHints<PENDING, SETTLED>;
 }
 export {};
-//# sourceMappingURL=note_hash_read_request_hints.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9oYXNoX3JlYWRfcmVxdWVzdF9oaW50cy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2tlcm5lbC9oaW50cy9ub3RlX2hhc2hfcmVhZF9yZXF1ZXN0X2hpbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxrQ0FBa0MsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTdGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRWpFLE9BQU8sRUFBc0MscUJBQXFCLEVBQW1CLE1BQU0seUJBQXlCLENBQUM7QUFFckgsS0FBSyxpQkFBaUIsR0FBRyxFQUFFLENBQUM7QUFFNUIsTUFBTSxNQUFNLHdCQUF3QixDQUFDLE9BQU8sU0FBUyxNQUFNLEVBQUUsT0FBTyxTQUFTLE1BQU0sSUFBSSxxQkFBcUIsQ0FDMUcsT0FBTyxrQ0FBa0MsRUFDekMsT0FBTyxFQUNQLE9BQU8sRUFDUCxPQUFPLHFCQUFxQixFQUM1QixpQkFBaUIsQ0FDbEIsQ0FBQztBQUVGLHdCQUFnQixrQ0FBa0MsQ0FBQyxPQUFPLFNBQVMsTUFBTSxFQUFFLE9BQU8sU0FBUyxNQUFNLEVBQy9GLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxFQUM3QixVQUFVLEVBQUUsT0FBTyxFQUNuQixVQUFVLEVBQUUsT0FBTyxHQUNsQix3QkFBd0IsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBUzVDO0FBRUQscUJBQWEsK0JBQStCLENBQUMsT0FBTyxTQUFTLE1BQU0sRUFBRSxPQUFPLFNBQVMsTUFBTTthQU12RSxVQUFVLEVBQUUsT0FBTzthQUNuQixVQUFVLEVBQUUsT0FBTztJQU5yQyxPQUFPLENBQUMsS0FBSyxDQUE2QztJQUNuRCxtQkFBbUIsU0FBSztJQUN4QixtQkFBbUIsU0FBSztJQUUvQixZQUNrQixVQUFVLEVBQUUsT0FBTyxFQUNuQixVQUFVLEVBQUUsT0FBTyxFQVNwQztJQUVELE1BQU0sQ0FBQyxLQUFLLENBQUMsT0FBTyxTQUFTLE1BQU0sRUFBRSxPQUFPLFNBQVMsTUFBTSxFQUFFLFVBQVUsRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE9BQU8sOENBRXBHO0lBRUQscUJBQXFCLENBQUMsZ0JBQWdCLEVBQUUsTUFBTSxFQUFFLGFBQWEsRUFBRSxNQUFNLFFBT3BFO0lBRUQscUJBQXFCLENBQ25CLGdCQUFnQixFQUFFLE1BQU0sRUFDeEIsaUJBQWlCLEVBQUUsaUJBQWlCLENBQUMsT0FBTyxxQkFBcUIsQ0FBQyxFQUNsRSxLQUFLLEVBQUUsaUJBQWlCLFFBWXpCO0lBRUQsT0FBTywrQ0FFTjtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"note_hash_read_request_hints.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/note_hash_read_request_hints.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,kCAAkC,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAE7F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAEL,qBAAqB,EAItB,MAAM,yBAAyB,CAAC;AAEjC,KAAK,iBAAiB,GAAG,EAAE,CAAC;AAE5B,MAAM,MAAM,wBAAwB,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,IAAI,qBAAqB,CAC1G,OAAO,kCAAkC,EACzC,OAAO,EACP,OAAO,EACP,OAAO,qBAAqB,EAC5B,iBAAiB,CAClB,CAAC;AAEF,wBAAgB,kCAAkC,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EAC/F,MAAM,EAAE,MAAM,GAAG,YAAY,EAC7B,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,GAClB,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAS5C;AAED,qBAAa,+BAA+B,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM;aAK7D,UAAU,EAAE,OAAO;aAAkB,UAAU,EAAE,OAAO;IAJpF,OAAO,CAAC,KAAK,CAA6C;IACnD,mBAAmB,SAAK;IACxB,mBAAmB,SAAK;gBAEH,UAAU,EAAE,OAAO,EAAkB,UAAU,EAAE,OAAO;IAUpF,MAAM,CAAC,KAAK,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO;IAIrG,qBAAqB,CAAC,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IAYrE,qBAAqB,CACnB,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,EAClE,KAAK,EAAE,iBAAiB;IAiB1B,OAAO;CAGR"}
+{"version":3,"file":"note_hash_read_request_hints.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/note_hash_read_request_hints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAE7F,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAsC,qBAAqB,EAAmB,MAAM,yBAAyB,CAAC;AAErH,KAAK,iBAAiB,GAAG,EAAE,CAAC;AAE5B,MAAM,MAAM,wBAAwB,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,IAAI,qBAAqB,CAC1G,OAAO,kCAAkC,EACzC,OAAO,EACP,OAAO,EACP,OAAO,qBAAqB,EAC5B,iBAAiB,CAClB,CAAC;AAEF,wBAAgB,kCAAkC,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EAC/F,MAAM,EAAE,MAAM,GAAG,YAAY,EAC7B,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,GAClB,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAS5C;AAED,qBAAa,+BAA+B,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM;aAMvE,UAAU,EAAE,OAAO;aACnB,UAAU,EAAE,OAAO;IANrC,OAAO,CAAC,KAAK,CAA6C;IACnD,mBAAmB,SAAK;IACxB,mBAAmB,SAAK;IAE/B,YACkB,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,EASpC;IAED,MAAM,CAAC,KAAK,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,8CAEpG;IAED,qBAAqB,CAAC,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAOpE;IAED,qBAAqB,CACnB,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,EAClE,KAAK,EAAE,iBAAiB,QAYzB;IAED,OAAO,+CAEN;CACF"}

package/dest/kernel/hints/note_hash_read_request_hints.js

@@ -1,7 +1,7 @@
 import { MAX_NOTE_HASH_READ_REQUESTS_PER_TX, NOTE_HASH_TREE_HEIGHT } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
-import { Fr } from '@aztec/foundation/fields';
-import { PendingReadHint, ReadRequestResetHints, ReadRequestState, ReadRequestStatus, SettledReadHint } from './read_request_hints.js';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { PendingReadHint, ReadRequestAction, ReadRequestResetHints, SettledReadHint } from './read_request_hints.js';
 export function noteHashReadRequestHintsFromBuffer(buffer, numPending, numSettled) {
     return ReadRequestResetHints.fromBuffer(buffer, MAX_NOTE_HASH_READ_REQUESTS_PER_TX, numPending, numSettled, NOTE_HASH_TREE_HEIGHT, Fr);
 }
@@ -16,7 +16,7 @@ export class NoteHashReadRequestHintsBuilder {
         this.maxSettled = maxSettled;
         this.numPendingReadHints = 0;
         this.numSettledReadHints = 0;
-        this.hints = new ReadRequestResetHints(makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_TX, ReadRequestStatus.nada), makeTuple(maxPending, ()=>PendingReadHint.nada(MAX_NOTE_HASH_READ_REQUESTS_PER_TX)), makeTuple(maxSettled, ()=>SettledReadHint.nada(MAX_NOTE_HASH_READ_REQUESTS_PER_TX, NOTE_HASH_TREE_HEIGHT, Fr.zero)));
+        this.hints = new ReadRequestResetHints(makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_TX, ReadRequestAction.skip), makeTuple(maxPending, ()=>PendingReadHint.nada(MAX_NOTE_HASH_READ_REQUESTS_PER_TX)), makeTuple(maxSettled, ()=>SettledReadHint.nada(MAX_NOTE_HASH_READ_REQUESTS_PER_TX, NOTE_HASH_TREE_HEIGHT, Fr.zero)));
     }
     static empty(maxPending, maxSettled) {
         return new NoteHashReadRequestHintsBuilder(maxPending, maxSettled).toHints();
@@ -25,7 +25,7 @@ export class NoteHashReadRequestHintsBuilder {
         if (this.numPendingReadHints === this.maxPending) {
             throw new Error('Cannot add more pending read request.');
         }
-        this.hints.readRequestStatuses[readRequestIndex] = new ReadRequestStatus(ReadRequestState.PENDING, this.numPendingReadHints);
+        this.hints.readRequestActions[readRequestIndex] = ReadRequestAction.readAsPending(this.numPendingReadHints);
         this.hints.pendingReadHints[this.numPendingReadHints] = new PendingReadHint(readRequestIndex, noteHashIndex);
         this.numPendingReadHints++;
     }
@@ -33,7 +33,7 @@ export class NoteHashReadRequestHintsBuilder {
         if (this.numSettledReadHints === this.maxSettled) {
             throw new Error('Cannot add more settled read request.');
         }
-        this.hints.readRequestStatuses[readRequestIndex] = new ReadRequestStatus(ReadRequestState.SETTLED, this.numSettledReadHints);
+        this.hints.readRequestActions[readRequestIndex] = ReadRequestAction.readAsSettled(this.numSettledReadHints);
         this.hints.settledReadHints[this.numSettledReadHints] = new SettledReadHint(readRequestIndex, membershipWitness, value);
         this.numSettledReadHints++;
     }