@aztec/stdlib 0.0.1-commit.d3ec352c → 0.0.1-commit.d58ff9d0

package/dest/kernel/hints/build_note_hash_read_request_hints.js

@@ -1,11 +1,10 @@
 import { MAX_NOTE_HASH_READ_REQUESTS_PER_TX } from '@aztec/constants';
 import { NoteHashReadRequestHintsBuilder } from './note_hash_read_request_hints.js';
 import { PendingReadHint, ReadRequestActionEnum, ReadRequestResetActions } from './read_request_hints.js';
-import { ScopedValueCache } from './scoped_value_cache.js';
 export function isValidNoteHashReadRequest(readRequest, noteHash) {
     return noteHash.value.equals(readRequest.value) && noteHash.contractAddress.equals(readRequest.contractAddress) && readRequest.counter > noteHash.counter;
 }
-export function getNoteHashReadRequestResetActions(noteHashReadRequests, noteHashes, futureNoteHashes) {
+export function getNoteHashReadRequestResetActions(noteHashReadRequests, noteHashes) {
     const resetActions = ReadRequestResetActions.empty(MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
     const noteHashMap = new Map();
     noteHashes.getActiveItems().forEach((noteHash, index)=>{
@@ -17,34 +16,47 @@ export function getNoteHashReadRequestResetActions(noteHashReadRequests, noteHas
         });
         noteHashMap.set(value, arr);
     });
-    const futureNoteHashMap = new ScopedValueCache(futureNoteHashes);
     for(let i = 0; i < noteHashReadRequests.claimedLength; ++i){
         const readRequest = noteHashReadRequests.array[i];
-        const pendingNoteHash = noteHashMap.get(readRequest.value.toBigInt())?.find((n)=>isValidNoteHashReadRequest(readRequest, n.noteHash));
-        if (pendingNoteHash !== undefined) {
-            resetActions.actions[i] = ReadRequestActionEnum.READ_AS_PENDING;
-            resetActions.pendingReadHints.push(new PendingReadHint(i, pendingNoteHash.index));
-        } else if (!futureNoteHashMap.get(readRequest).find((futureNoteHash)=>isValidNoteHashReadRequest(readRequest, futureNoteHash))) {
+        if (readRequest.contractAddress.isZero()) {
+            // Settled read: empty contract address means resolve against the note hash tree.
             resetActions.actions[i] = ReadRequestActionEnum.READ_AS_SETTLED;
+        } else {
+            // Pending read: non-empty contract address means match against a pending note hash.
+            const pendingNoteHash = noteHashMap.get(readRequest.value.toBigInt())?.find((n)=>isValidNoteHashReadRequest(readRequest, n.noteHash));
+            if (pendingNoteHash) {
+                resetActions.actions[i] = ReadRequestActionEnum.READ_AS_PENDING;
+                resetActions.pendingReadHints.push(new PendingReadHint(i, pendingNoteHash.index));
+            }
+        // Otherwise, the read request may be resolved by a future note hash. Leave as NOOP.
         }
     }
     return resetActions;
 }
-export async function buildNoteHashReadRequestHintsFromResetActions(oracle, noteHashReadRequests, noteHashes, resetActions, noteHashLeafIndexMap, maxPending = MAX_NOTE_HASH_READ_REQUESTS_PER_TX, maxSettled = MAX_NOTE_HASH_READ_REQUESTS_PER_TX) {
+export async function buildNoteHashReadRequestHintsFromResetActions(oracle, noteHashReadRequests, noteHashes, resetActions, maxPending = MAX_NOTE_HASH_READ_REQUESTS_PER_TX, maxSettled = MAX_NOTE_HASH_READ_REQUESTS_PER_TX) {
     const builder = new NoteHashReadRequestHintsBuilder(maxPending, maxSettled);
     resetActions.pendingReadHints.forEach((hint)=>{
         builder.addPendingReadRequest(hint.readRequestIndex, hint.pendingValueIndex);
     });
+    // Collect all settled read requests
+    const settledRequests = [];
     for(let i = 0; i < resetActions.actions.length; i++){
         if (resetActions.actions[i] === ReadRequestActionEnum.READ_AS_SETTLED) {
-            const readRequest = noteHashReadRequests.array[i];
-            const leafIndex = noteHashLeafIndexMap.get(readRequest.value.toBigInt());
-            if (leafIndex === undefined) {
-                throw new Error('Read request is reading an unknown note hash.');
-            }
-            const membershipWitness = await oracle.getNoteHashMembershipWitness(leafIndex);
-            builder.addSettledReadRequest(i, membershipWitness, readRequest.value);
+            settledRequests.push({
+                index: i,
+                readRequest: noteHashReadRequests.array[i]
+            });
+        }
+    }
+    // Fetch all membership witnesses in parallel
+    const membershipWitnesses = await Promise.all(settledRequests.map(({ readRequest })=>oracle.getNoteHashMembershipWitness(readRequest.value)));
+    // Add settled read requests to builder
+    for(let i = 0; i < settledRequests.length; i++){
+        const membershipWitness = membershipWitnesses[i];
+        if (!membershipWitness) {
+            throw new Error('Read request is reading an unknown note hash.');
         }
+        builder.addSettledReadRequest(settledRequests[i].index, membershipWitness, settledRequests[i].readRequest.value);
     }
     const noteHashMap = new Map();
     noteHashes.getActiveItems().forEach((noteHash, index)=>{
@@ -58,7 +70,7 @@ export async function buildNoteHashReadRequestHintsFromResetActions(oracle, note
     });
     return builder.toHints();
 }
-export async function buildNoteHashReadRequestHints(oracle, noteHashReadRequests, noteHashes, noteHashLeafIndexMap, futureNoteHashes, maxPending = MAX_NOTE_HASH_READ_REQUESTS_PER_TX, maxSettled = MAX_NOTE_HASH_READ_REQUESTS_PER_TX) {
-    const resetActions = getNoteHashReadRequestResetActions(noteHashReadRequests, noteHashes, futureNoteHashes);
-    return await buildNoteHashReadRequestHintsFromResetActions(oracle, noteHashReadRequests, noteHashes, resetActions, noteHashLeafIndexMap, maxPending, maxSettled);
+export async function buildNoteHashReadRequestHints(oracle, noteHashReadRequests, noteHashes, maxPending = MAX_NOTE_HASH_READ_REQUESTS_PER_TX, maxSettled = MAX_NOTE_HASH_READ_REQUESTS_PER_TX) {
+    const resetActions = getNoteHashReadRequestResetActions(noteHashReadRequests, noteHashes);
+    return await buildNoteHashReadRequestHintsFromResetActions(oracle, noteHashReadRequests, noteHashes, resetActions, maxPending, maxSettled);
 }

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

@@ -1,5 +1,5 @@
 import { type MAX_NULLIFIERS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX, type NULLIFIER_TREE_HEIGHT } from '@aztec/constants';
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { MembershipWitness } from '@aztec/foundation/trees';
 import type { NullifierLeafPreimage } from '../../trees/nullifier_leaf.js';
 import type { ClaimedLengthArray } from '../claimed_length_array.js';
@@ -11,12 +11,12 @@ interface NullifierMembershipWitnessWithPreimage {
     membershipWitness: MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>;
     leafPreimage: NullifierLeafPreimage;
 }
-export declare function getNullifierReadRequestResetActions(nullifierReadRequests: ClaimedLengthArray<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, nullifiers: ClaimedLengthArray<ScopedNullifier, typeof MAX_NULLIFIERS_PER_TX>, futureNullifiers: ScopedNullifier[]): ReadRequestResetActions<typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>;
+export declare function getNullifierReadRequestResetActions(nullifierReadRequests: ClaimedLengthArray<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, nullifiers: ClaimedLengthArray<ScopedNullifier, typeof MAX_NULLIFIERS_PER_TX>): ReadRequestResetActions<typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>;
 export declare function buildNullifierReadRequestHintsFromResetActions<PENDING extends number, SETTLED extends number>(oracle: {
     getNullifierMembershipWitness(nullifier: Fr): Promise<NullifierMembershipWitnessWithPreimage>;
-}, nullifierReadRequests: ClaimedLengthArray<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, resetActions: ReadRequestResetActions<typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, maxPending?: PENDING, maxSettled?: SETTLED, siloed?: boolean): Promise<import("./nullifier_read_request_hints.js").NullifierReadRequestHints<PENDING, SETTLED>>;
+}, nullifierReadRequests: ClaimedLengthArray<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, resetActions: ReadRequestResetActions<typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, maxPending?: PENDING, maxSettled?: SETTLED): Promise<import("./nullifier_read_request_hints.js").NullifierReadRequestHints<PENDING, SETTLED>>;
 export declare function buildNullifierReadRequestHints<PENDING extends number, SETTLED extends number>(oracle: {
     getNullifierMembershipWitness(nullifier: Fr): Promise<NullifierMembershipWitnessWithPreimage>;
-}, nullifierReadRequests: ClaimedLengthArray<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, nullifiers: ClaimedLengthArray<ScopedNullifier, typeof MAX_NULLIFIERS_PER_TX>, futureNullifiers: ScopedNullifier[], maxPending?: PENDING, maxSettled?: SETTLED, siloed?: boolean): Promise<import("./nullifier_read_request_hints.js").NullifierReadRequestHints<PENDING, SETTLED>>;
+}, nullifierReadRequests: ClaimedLengthArray<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, nullifiers: ClaimedLengthArray<ScopedNullifier, typeof MAX_NULLIFIERS_PER_TX>, maxPending?: PENDING, maxSettled?: SETTLED): Promise<import("./nullifier_read_request_hints.js").NullifierReadRequestHints<PENDING, SETTLED>>;
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRfbnVsbGlmaWVyX3JlYWRfcmVxdWVzdF9oaW50cy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2tlcm5lbC9oaW50cy9idWlsZF9udWxsaWZpZXJfcmVhZF9yZXF1ZXN0X2hpbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLHFCQUFxQixFQUMxQixrQ0FBa0MsRUFDbEMsS0FBSyxxQkFBcUIsRUFDM0IsTUFBTSxrQkFBa0IsQ0FBQztBQUMxQixPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNuRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUc1RCxPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNFLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFdkQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDdEQsT0FBTyxFQUEwQyx1QkFBdUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRzFHLHdCQUFnQiwyQkFBMkIsQ0FBQyxXQUFXLEVBQUUsaUJBQWlCLEVBQUUsU0FBUyxFQUFFLGVBQWUsV0FNckc7QUFFRCxVQUFVLHNDQUFzQztJQUM5QyxpQkFBaUIsRUFBRSxpQkFBaUIsQ0FBQyxPQUFPLHFCQUFxQixDQUFDLENBQUM7SUFDbkUsWUFBWSxFQUFFLHFCQUFxQixDQUFDO0NBQ3JDO0FBRUQsd0JBQWdCLG1DQUFtQyxDQUNqRCxxQkFBcUIsRUFBRSxrQkFBa0IsQ0FBQyxpQkFBaUIsRUFBRSxPQUFPLGtDQUFrQyxDQUFDLEVBQ3ZHLFVBQVUsRUFBRSxrQkFBa0IsQ0FBQyxlQUFlLEVBQUUsT0FBTyxxQkFBcUIsQ0FBQyxFQUM3RSxnQkFBZ0IsRUFBRSxlQUFlLEVBQUUsR0FDbEMsdUJBQXVCLENBQUMsT0FBTyxrQ0FBa0MsQ0FBQyxDQWdDcEU7QUFFRCx3QkFBc0IsOENBQThDLENBQUMsT0FBTyxTQUFTLE1BQU0sRUFBRSxPQUFPLFNBQVMsTUFBTSxFQUNqSCxNQUFNLEVBQUU7SUFDTiw2QkFBNkIsQ0FBQyxTQUFTLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxzQ0FBc0MsQ0FBQyxDQUFDO0NBQy9GLEVBQ0QscUJBQXFCLEVBQUUsa0JBQWtCLENBQUMsaUJBQWlCLEVBQUUsT0FBTyxrQ0FBa0MsQ0FBQyxFQUN2RyxZQUFZLEVBQUUsdUJBQXVCLENBQUMsT0FBTyxrQ0FBa0MsQ0FBQyxFQUNoRixVQUFVLEdBQUUsT0FBdUQsRUFDbkUsVUFBVSxHQUFFLE9BQXVELEVBQ25FLE1BQU0sVUFBUSxvR0F3QmY7QUFFRCx3QkFBc0IsOEJBQThCLENBQUMsT0FBTyxTQUFTLE1BQU0sRUFBRSxPQUFPLFNBQVMsTUFBTSxFQUNqRyxNQUFNLEVBQUU7SUFDTiw2QkFBNkIsQ0FBQyxTQUFTLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxzQ0FBc0MsQ0FBQyxDQUFDO0NBQy9GLEVBQ0QscUJBQXFCLEVBQUUsa0JBQWtCLENBQUMsaUJBQWlCLEVBQUUsT0FBTyxrQ0FBa0MsQ0FBQyxFQUN2RyxVQUFVLEVBQUUsa0JBQWtCLENBQUMsZUFBZSxFQUFFLE9BQU8scUJBQXFCLENBQUMsRUFDN0UsZ0JBQWdCLEVBQUUsZUFBZSxFQUFFLEVBQ25DLFVBQVUsR0FBRSxPQUF1RCxFQUNuRSxVQUFVLEdBQUUsT0FBdUQsRUFDbkUsTUFBTSxVQUFRLG9HQVdmIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRfbnVsbGlmaWVyX3JlYWRfcmVxdWVzdF9oaW50cy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2tlcm5lbC9oaW50cy9idWlsZF9udWxsaWZpZXJfcmVhZF9yZXF1ZXN0X2hpbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLHFCQUFxQixFQUMxQixrQ0FBa0MsRUFDbEMsS0FBSyxxQkFBcUIsRUFDM0IsTUFBTSxrQkFBa0IsQ0FBQztBQUMxQixPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUU1RCxPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNFLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFdkQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDdEQsT0FBTyxFQUEwQyx1QkFBdUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTFHLHdCQUFnQiwyQkFBMkIsQ0FBQyxXQUFXLEVBQUUsaUJBQWlCLEVBQUUsU0FBUyxFQUFFLGVBQWUsV0FNckc7QUFFRCxVQUFVLHNDQUFzQztJQUM5QyxpQkFBaUIsRUFBRSxpQkFBaUIsQ0FBQyxPQUFPLHFCQUFxQixDQUFDLENBQUM7SUFDbkUsWUFBWSxFQUFFLHFCQUFxQixDQUFDO0NBQ3JDO0FBRUQsd0JBQWdCLG1DQUFtQyxDQUNqRCxxQkFBcUIsRUFBRSxrQkFBa0IsQ0FBQyxpQkFBaUIsRUFBRSxPQUFPLGtDQUFrQyxDQUFDLEVBQ3ZHLFVBQVUsRUFBRSxrQkFBa0IsQ0FBQyxlQUFlLEVBQUUsT0FBTyxxQkFBcUIsQ0FBQyxHQUM1RSx1QkFBdUIsQ0FBQyxPQUFPLGtDQUFrQyxDQUFDLENBZ0NwRTtBQUVELHdCQUFzQiw4Q0FBOEMsQ0FBQyxPQUFPLFNBQVMsTUFBTSxFQUFFLE9BQU8sU0FBUyxNQUFNLEVBQ2pILE1BQU0sRUFBRTtJQUNOLDZCQUE2QixDQUFDLFNBQVMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLHNDQUFzQyxDQUFDLENBQUM7Q0FDL0YsRUFDRCxxQkFBcUIsRUFBRSxrQkFBa0IsQ0FBQyxpQkFBaUIsRUFBRSxPQUFPLGtDQUFrQyxDQUFDLEVBQ3ZHLFlBQVksRUFBRSx1QkFBdUIsQ0FBQyxPQUFPLGtDQUFrQyxDQUFDLEVBQ2hGLFVBQVUsR0FBRSxPQUF1RCxFQUNuRSxVQUFVLEdBQUUsT0FBdUQsb0dBK0JwRTtBQUVELHdCQUFzQiw4QkFBOEIsQ0FBQyxPQUFPLFNBQVMsTUFBTSxFQUFFLE9BQU8sU0FBUyxNQUFNLEVBQ2pHLE1BQU0sRUFBRTtJQUNOLDZCQUE2QixDQUFDLFNBQVMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLHNDQUFzQyxDQUFDLENBQUM7Q0FDL0YsRUFDRCxxQkFBcUIsRUFBRSxrQkFBa0IsQ0FBQyxpQkFBaUIsRUFBRSxPQUFPLGtDQUFrQyxDQUFDLEVBQ3ZHLFVBQVUsRUFBRSxrQkFBa0IsQ0FBQyxlQUFlLEVBQUUsT0FBTyxxQkFBcUIsQ0FBQyxFQUM3RSxVQUFVLEdBQUUsT0FBdUQsRUFDbkUsVUFBVSxHQUFFLE9BQXVELG9HQVVwRSJ9

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

@@ -1 +1 @@
-{"version":3,"file":"build_nullifier_read_request_hints.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/build_nullifier_read_request_hints.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,qBAAqB,EAC1B,kCAAkC,EAClC,KAAK,qBAAqB,EAC3B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAA0C,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAG1G,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,iBAAiB,EAAE,SAAS,EAAE,eAAe,WAMrG;AAED,UAAU,sCAAsC;IAC9C,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,CAAC;IACnE,YAAY,EAAE,qBAAqB,CAAC;CACrC;AAED,wBAAgB,mCAAmC,CACjD,qBAAqB,EAAE,kBAAkB,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC,EACvG,UAAU,EAAE,kBAAkB,CAAC,eAAe,EAAE,OAAO,qBAAqB,CAAC,EAC7E,gBAAgB,EAAE,eAAe,EAAE,GAClC,uBAAuB,CAAC,OAAO,kCAAkC,CAAC,CAgCpE;AAED,wBAAsB,8CAA8C,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EACjH,MAAM,EAAE;IACN,6BAA6B,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAC;CAC/F,EACD,qBAAqB,EAAE,kBAAkB,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC,EACvG,YAAY,EAAE,uBAAuB,CAAC,OAAO,kCAAkC,CAAC,EAChF,UAAU,GAAE,OAAuD,EACnE,UAAU,GAAE,OAAuD,EACnE,MAAM,UAAQ,oGAwBf;AAED,wBAAsB,8BAA8B,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EACjG,MAAM,EAAE;IACN,6BAA6B,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAC;CAC/F,EACD,qBAAqB,EAAE,kBAAkB,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC,EACvG,UAAU,EAAE,kBAAkB,CAAC,eAAe,EAAE,OAAO,qBAAqB,CAAC,EAC7E,gBAAgB,EAAE,eAAe,EAAE,EACnC,UAAU,GAAE,OAAuD,EACnE,UAAU,GAAE,OAAuD,EACnE,MAAM,UAAQ,oGAWf"}
+{"version":3,"file":"build_nullifier_read_request_hints.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/build_nullifier_read_request_hints.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,qBAAqB,EAC1B,kCAAkC,EAClC,KAAK,qBAAqB,EAC3B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAA0C,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAE1G,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,iBAAiB,EAAE,SAAS,EAAE,eAAe,WAMrG;AAED,UAAU,sCAAsC;IAC9C,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,CAAC;IACnE,YAAY,EAAE,qBAAqB,CAAC;CACrC;AAED,wBAAgB,mCAAmC,CACjD,qBAAqB,EAAE,kBAAkB,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC,EACvG,UAAU,EAAE,kBAAkB,CAAC,eAAe,EAAE,OAAO,qBAAqB,CAAC,GAC5E,uBAAuB,CAAC,OAAO,kCAAkC,CAAC,CAgCpE;AAED,wBAAsB,8CAA8C,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EACjH,MAAM,EAAE;IACN,6BAA6B,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAC;CAC/F,EACD,qBAAqB,EAAE,kBAAkB,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC,EACvG,YAAY,EAAE,uBAAuB,CAAC,OAAO,kCAAkC,CAAC,EAChF,UAAU,GAAE,OAAuD,EACnE,UAAU,GAAE,OAAuD,oGA+BpE;AAED,wBAAsB,8BAA8B,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EACjG,MAAM,EAAE;IACN,6BAA6B,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAC;CAC/F,EACD,qBAAqB,EAAE,kBAAkB,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC,EACvG,UAAU,EAAE,kBAAkB,CAAC,eAAe,EAAE,OAAO,qBAAqB,CAAC,EAC7E,UAAU,GAAE,OAAuD,EACnE,UAAU,GAAE,OAAuD,oGAUpE"}

package/dest/kernel/hints/build_nullifier_read_request_hints.js

@@ -1,12 +1,10 @@
 import { MAX_NULLIFIER_READ_REQUESTS_PER_TX } from '@aztec/constants';
-import { siloNullifier } from '../../hash/hash.js';
 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)=>{
@@ -18,35 +16,48 @@ 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;
 }
-export async function buildNullifierReadRequestHintsFromResetActions(oracle, nullifierReadRequests, resetActions, 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);
     resetActions.pendingReadHints.forEach((hint)=>{
         builder.addPendingReadRequest(hint.readRequestIndex, hint.pendingValueIndex);
     });
+    // Collect all settled read requests
+    const settledRequests = [];
     for(let i = 0; i < resetActions.actions.length; i++){
         if (resetActions.actions[i] === ReadRequestActionEnum.READ_AS_SETTLED) {
-            const readRequest = nullifierReadRequests.array[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);
+            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 resetActions = getNullifierReadRequestResetActions(nullifierReadRequests, nullifiers, futureNullifiers);
-    return await buildNullifierReadRequestHintsFromResetActions(oracle, nullifierReadRequests, resetActions, maxPending, maxSettled, siloed);
+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/find_private_kernel_reset_dimensions.d.ts

@@ -1,3 +1,9 @@
 import { PrivateKernelResetDimensions, type PrivateKernelResetDimensionsConfig } from '../private_kernel_reset_dimensions.js';
-export declare function findPrivateKernelResetDimensions(requestedDimensions: PrivateKernelResetDimensions, config: PrivateKernelResetDimensionsConfig, isInner?: boolean, allowRemainder?: boolean): PrivateKernelResetDimensions;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmluZF9wcml2YXRlX2tlcm5lbF9yZXNldF9kaW1lbnNpb25zLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMva2VybmVsL2hpbnRzL2ZpbmRfcHJpdmF0ZV9rZXJuZWxfcmVzZXRfZGltZW5zaW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsNEJBQTRCLEVBQzVCLEtBQUssa0NBQWtDLEVBRXhDLE1BQU0sdUNBQXVDLENBQUM7QUFtSS9DLHdCQUFnQixnQ0FBZ0MsQ0FDOUMsbUJBQW1CLEVBQUUsNEJBQTRCLEVBQ2pELE1BQU0sRUFBRSxrQ0FBa0MsRUFDMUMsT0FBTyxVQUFRLEVBQ2YsY0FBYyxVQUFRLGdDQTJCdkIifQ==
+/**
+ * Picks which catalog group the selector should search. Mid-tx resets go to `inner` (no
+ * siloing); terminal kernels go to `finalTail` or `finalTailToPublic`, depending on whether
+ * the tx has public function calls.
+ */
+export type ResetDimensionsMode = 'inner' | 'finalTail' | 'finalTailToPublic';
+export declare function findPrivateKernelResetDimensions(requestedDimensions: PrivateKernelResetDimensions, config: PrivateKernelResetDimensionsConfig, mode: ResetDimensionsMode, allowRemainder?: boolean): PrivateKernelResetDimensions;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmluZF9wcml2YXRlX2tlcm5lbF9yZXNldF9kaW1lbnNpb25zLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMva2VybmVsL2hpbnRzL2ZpbmRfcHJpdmF0ZV9rZXJuZWxfcmVzZXRfZGltZW5zaW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsNEJBQTRCLEVBQzVCLEtBQUssa0NBQWtDLEVBR3hDLE1BQU0sdUNBQXVDLENBQUM7QUE4Qy9DOzs7O0dBSUc7QUFDSCxNQUFNLE1BQU0sbUJBQW1CLEdBQUcsT0FBTyxHQUFHLFdBQVcsR0FBRyxtQkFBbUIsQ0FBQztBQUU5RSx3QkFBZ0IsZ0NBQWdDLENBQzlDLG1CQUFtQixFQUFFLDRCQUE0QixFQUNqRCxNQUFNLEVBQUUsa0NBQWtDLEVBQzFDLElBQUksRUFBRSxtQkFBbUIsRUFDekIsY0FBYyxVQUFRLGdDQVl2QiJ9

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":"AAAA,OAAO,EACL,4BAA4B,EAC5B,KAAK,kCAAkC,EAGxC,MAAM,uCAAuC,CAAC;AA8C/C;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,GAAG,OAAO,GAAG,WAAW,GAAG,mBAAmB,CAAC;AAE9E,wBAAgB,gCAAgC,CAC9C,mBAAmB,EAAE,4BAA4B,EACjD,MAAM,EAAE,kCAAkC,EAC1C,IAAI,EAAE,mBAAmB,EACzB,cAAc,UAAQ,gCAYvB"}

package/dest/kernel/hints/find_private_kernel_reset_dimensions.js

@@ -1,10 +1,4 @@
 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);
-}
 function getSize(dimensions) {
     return privateKernelResetDimensionNames.reduce((accum, name)=>accum + dimensions[name], 0);
 }
@@ -19,84 +13,26 @@ function getRemainder(requestedDimensions, foundDimensions) {
     });
     return remainingDimensions ? remainder : undefined;
 }
-function pickFromValues(targetValue, values) {
-    // Find the min value in `values` that's greater than or equal to `targetValue`.
-    const minGte = values.reduce((prev, curr)=>curr >= targetValue && (prev === undefined || curr < prev) ? curr : prev, undefined);
-    // If no such value is found, returns the max value.
-    return minGte ?? Math.max(...values);
-}
-function pickCheapest(options) {
-    return options.reduce((prev, curr)=>curr.cost < prev.cost ? curr : prev, options[0]);
-}
-function pickSmallestRemainder(options) {
-    const optionsWithSize = options.filter((o)=>o.remainder).map((option)=>({
-            option,
-            size: getSize(option.remainder)
-        }));
-    return optionsWithSize.reduce((prev, curr)=>curr.size < prev.size ? curr : prev, optionsWithSize[0])?.option;
-}
+// Returns the cheapest option that fully covers the request, or the option with the smallest
+// remainder if none do. Caller must pass a non-empty list.
 function pickBestOption(options) {
-    const optionsResetAll = options.filter((opt)=>!opt.remainder);
-    const optionsResetPartial = options.filter((opt)=>opt.remainder);
-    // The best option is the cheapest one that can reset all dimensions.
-    // If no such option exists, find one that can reset the most data.
-    return pickCheapest(optionsResetAll) || pickSmallestRemainder(optionsResetPartial);
-}
-function findVariant(requestedDimensions, config, isQualified) {
-    const variant = PrivateKernelResetDimensions.empty();
-    privateKernelResetDimensionNames.forEach((name)=>{
-        variant[name] = pickFromValues(requestedDimensions[name], config.dimensions[name].variants);
-    });
-    if (!isQualified(variant)) {
-        return;
+    const fullCoverage = options.filter((opt)=>!opt.remainder);
+    if (fullCoverage.length) {
+        return fullCoverage.reduce((prev, curr)=>curr.cost < prev.cost ? curr : prev);
     }
-    return {
-        dimensions: variant,
-        cost: computeCost(variant, config),
-        remainder: getRemainder(requestedDimensions, variant)
-    };
+    return options.reduce((prev, curr)=>getSize(curr.remainder) < getSize(prev.remainder) ? curr : prev);
 }
-function findStandalone(requestedDimensions, config, isQualified) {
-    const needsReset = privateKernelResetDimensionNames.filter((name)=>requestedDimensions[name] > 0);
-    if (needsReset.length !== 1) {
-        // At the moment, we only use standalone to reset one dimension when it's about to overflow.
-        return;
-    }
-    const name = needsReset[0];
-    const value = pickFromValues(requestedDimensions[name], config.dimensions[name].standalone);
-    if (!value) {
-        return;
-    }
-    const dimensions = PrivateKernelResetDimensions.from({
-        [name]: value
-    });
-    if (!isQualified(dimensions)) {
-        return;
-    }
+function buildOption(entry, requestedDimensions) {
+    const dimensions = PrivateKernelResetDimensions.fromValues(entry.dimensions);
     return {
         dimensions,
-        cost: computeCost(dimensions, config),
+        cost: entry.cost,
         remainder: getRemainder(requestedDimensions, dimensions)
     };
 }
-function findSpecialCase(requestedDimensions, config, isQualified) {
-    const specialCases = config.specialCases.map(PrivateKernelResetDimensions.fromValues);
-    const options = specialCases.filter(isQualified).map((dimensions)=>({
-            dimensions,
-            cost: computeCost(dimensions, config),
-            remainder: getRemainder(requestedDimensions, dimensions)
-        }));
-    return pickBestOption(options);
-}
-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 === 0 && dimensions.NULLIFIER_SILOING === 0 && dimensions.PRIVATE_LOG_SILOING === 0 && isEnough(dimensions);
-    const options = [
-        findVariant(requestedDimensions, config, isQualified),
-        findStandalone(requestedDimensions, config, isQualified),
-        findSpecialCase(requestedDimensions, config, isQualified)
-    ].filter(isDefined);
+export function findPrivateKernelResetDimensions(requestedDimensions, config, mode, allowRemainder = false) {
+    const catalog = config[mode];
+    const options = catalog.map((entry)=>buildOption(entry, requestedDimensions)).filter((option)=>allowRemainder || !option.remainder);
     if (!options.length) {
         throw new Error(`Cannot find an option for dimension: ${requestedDimensions.toValues()}`);
     }

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

@@ -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 './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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9rZXJuZWwvaGludHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyx5Q0FBeUMsQ0FBQztBQUN4RCxjQUFjLHlDQUF5QyxDQUFDO0FBQ3hELGNBQWMsaUNBQWlDLENBQUM7QUFDaEQsY0FBYywyQ0FBMkMsQ0FBQztBQUMxRCxjQUFjLG1DQUFtQyxDQUFDO0FBQ2xELGNBQWMsbUNBQW1DLENBQUM7QUFDbEQsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsMkNBQTJDLENBQUM7QUFDMUQsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsa0RBQWtELENBQUM7QUFDakUsY0FBYyxvQ0FBb0MsQ0FBQztBQUNuRCxjQUFjLGlDQUFpQyxDQUFDO0FBQ2hELGNBQWMsNkJBQTZCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9rZXJuZWwvaGludHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyx5Q0FBeUMsQ0FBQztBQUN4RCxjQUFjLHlDQUF5QyxDQUFDO0FBQ3hELGNBQWMsaUNBQWlDLENBQUM7QUFDaEQsY0FBYywyQ0FBMkMsQ0FBQztBQUMxRCxjQUFjLG1DQUFtQyxDQUFDO0FBQ2xELGNBQWMsbUNBQW1DLENBQUM7QUFDbEQsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsMkNBQTJDLENBQUM7QUFDMUQsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsa0RBQWtELENBQUM7QUFDakUsY0FBYyxvQ0FBb0MsQ0FBQztBQUNuRCxjQUFjLGlDQUFpQyxDQUFDIn0=

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,oCAAoC,CAAC;AACnD,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"}

package/dest/kernel/hints/index.js

@@ -6,10 +6,9 @@ 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_hint.d.ts

@@ -1,6 +1,7 @@
-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;
     constructor(
     /** Master secret key used to derive sk_app and pk_m. */
@@ -9,4 +10,4 @@ export declare class KeyValidationHint {
     toBuffer(): Buffer<ArrayBufferLike>;
     static empty(): KeyValidationHint;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5X3ZhbGlkYXRpb25faGludC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2tlcm5lbC9oaW50cy9rZXlfdmFsaWRhdGlvbl9oaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTlFLHFCQUFhLGlCQUFpQjtJQUduQixHQUFHLEVBQUUsY0FBYztJQUY1QjtJQUNFLHdEQUF3RDtJQUNqRCxHQUFHLEVBQUUsY0FBYyxFQUN4QjtJQUVKLE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLHFCQUc5QztJQUVELFFBQVEsNEJBRVA7SUFFRCxNQUFNLENBQUMsS0FBSyxzQkFFWDtDQUNGIn0=
+//# 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;IAGnB,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"}
+{"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,4 +1,4 @@
-import { GrumpkinScalar } from '@aztec/foundation/fields';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 export class KeyValidationHint {
     skM;

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

@@ -1,22 +1,28 @@
-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 {
-    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/fields").Fq;
+    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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5X3ZhbGlkYXRpb25fcmVxdWVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2tlcm5lbC9oaW50cy9rZXlfdmFsaWRhdGlvbl9yZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsY0FBYyxFQUFFLEtBQUssRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3JFLE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTNGOztHQUVHO0FBQ0gscUJBQWEsb0JBQW9CO2FBTWIsR0FBRyxFQUFFLEtBQUs7SUFMNUIsb0dBQW9HO0lBQ3BHLFNBQWdCLEtBQUssRUFBRSxFQUFFLENBQUM7SUFFMUI7SUFDRSw2RkFBNkY7SUFDN0UsR0FBRyxFQUFFLEtBQUssRUFDMUIsS0FBSyxFQUFFLEVBQUUsR0FBRyxjQUFjLEVBTzNCO0lBRUQsUUFBUSw0QkFFUDtJQUVELElBQUkscUJBQXFCLDBDQUV4QjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLHdCQUc5QztJQUVELFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FRZjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsR0FBRyxvQkFBb0IsQ0FHbEU7SUFFRCxPQUFPLFlBRU47SUFFRCxNQUFNLENBQUMsS0FBSyx5QkFFWDtJQUVELE9BQWEsTUFBTSxrQ0FFbEI7Q0FDRiJ9
+//# 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;aAMb,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,0CAExB;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,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());
     }
 }