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

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=build_nullifier_read_request_hints.d.ts.map
+//# 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>, validationRequestsSplitCounter: 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=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,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,8BAA8B,EAAE,MAAM,GACrC;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, validationRequestsSplitCounter) {
+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);
@@ -23,7 +25,7 @@ export function buildTransientDataHints(noteHashes, nullifiers, futureNoteHashRe
         }
         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.
@@ -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,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);
 }

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

@@ -6,11 +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 './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.js

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

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

@@ -1,4 +1,4 @@
-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. */
@@ -10,4 +10,4 @@ export declare class 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;;IAD1B,wDAAwD;IACjD,GAAG,EAAE,cAAc;IAG5B,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,QAAQ;IAIR,MAAM,CAAC,KAAK;CAGb"}
+{"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,4 +1,5 @@
-import { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar, Point } from '@aztec/foundation/curves/grumpkin';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 /**
  * Request for validating keys used in the app.
@@ -12,7 +13,7 @@ export declare class KeyValidationRequest {
     /** Master public key corresponding to the same underlying secret as app secret key below. */
     pkM: Point, 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;
@@ -20,4 +21,4 @@ export declare class KeyValidationRequest {
     static empty(): KeyValidationRequest;
     static random(): Promise<KeyValidationRequest>;
 }
-//# sourceMappingURL=key_validation_request.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5X3ZhbGlkYXRpb25fcmVxdWVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2tlcm5lbC9oaW50cy9rZXlfdmFsaWRhdGlvbl9yZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsY0FBYyxFQUFFLEtBQUssRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQzFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTNGOztHQUVHO0FBQ0gscUJBQWEsb0JBQW9CO0lBSzdCLDZGQUE2RjthQUM3RSxHQUFHLEVBQUUsS0FBSztJQUw1QixvR0FBb0c7SUFDcEcsU0FBZ0IsS0FBSyxFQUFFLEVBQUUsQ0FBQztJQUUxQjtJQUNFLDZGQUE2RjtJQUM3RSxHQUFHLEVBQUUsS0FBSyxFQUMxQixLQUFLLEVBQUUsRUFBRSxHQUFHLGNBQWMsRUFPM0I7SUFFRCxRQUFRLDRCQUVQO0lBRUQsSUFBSSxxQkFBcUIsZ0RBRXhCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksd0JBRzlDO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxHQUFHLG9CQUFvQixDQUdsRTtJQUVELE9BQU8sWUFFTjtJQUVELE1BQU0sQ0FBQyxLQUFLLHlCQUVYO0lBRUQsT0FBYSxNQUFNLGtDQUVsQjtDQUNGIn0=

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,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F;;GAEG;AACH,qBAAa,oBAAoB;IAK7B,6FAA6F;aAC7E,GAAG,EAAE,KAAK;IAL5B,oGAAoG;IACpG,SAAgB,KAAK,EAAE,EAAE,CAAC;IAE1B;IACE,6FAA6F;IAC7E,GAAG,EAAE,KAAK,EAC1B,KAAK,EAAE,EAAE,GAAG,cAAc,EAO3B;IAED,QAAQ,4BAEP;IAED,IAAI,qBAAqB,gDAExB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,wBAG9C;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,oBAAoB,CAGlE;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,yBAEX;IAED,OAAa,MAAM,kCAElB;CACF"}

package/dest/kernel/hints/key_validation_request.js

@@ -1,5 +1,6 @@
 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, Point } from '@aztec/foundation/curves/grumpkin';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 /**
  * Request for validating keys used in the app.

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 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';
@@ -19,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,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;gBAGb,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO;IAWrC,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;IASrE,qBAAqB,CACnB,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,EAClE,KAAK,EAAE,iBAAiB;IAc1B,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,6 +1,6 @@
 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 { 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);

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

@@ -17,4 +17,4 @@ export declare class NullifierReadRequestHintsBuilder<PENDING extends number, SE
     addSettledReadRequest(readRequestIndex: number, membershipWitness: MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>, leafPreimage: NullifierLeafPreimage): void;
     toHints(): NullifierReadRequestHints<PENDING, SETTLED>;
 }
-//# sourceMappingURL=nullifier_read_request_hints.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnVsbGlmaWVyX3JlYWRfcmVxdWVzdF9oaW50cy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2tlcm5lbC9oaW50cy9udWxsaWZpZXJfcmVhZF9yZXF1ZXN0X2hpbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxrQ0FBa0MsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTdGLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFakUsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDN0QsT0FBTyxFQUFzQyxxQkFBcUIsRUFBbUIsTUFBTSx5QkFBeUIsQ0FBQztBQUVySCxNQUFNLE1BQU0seUJBQXlCLENBQUMsT0FBTyxTQUFTLE1BQU0sRUFBRSxPQUFPLFNBQVMsTUFBTSxJQUFJLHFCQUFxQixDQUMzRyxPQUFPLGtDQUFrQyxFQUN6QyxPQUFPLEVBQ1AsT0FBTyxFQUNQLE9BQU8scUJBQXFCLEVBQzVCLHFCQUFxQixDQUN0QixDQUFDO0FBRUYsd0JBQWdCLG1DQUFtQyxDQUFDLE9BQU8sU0FBUyxNQUFNLEVBQUUsT0FBTyxTQUFTLE1BQU0sRUFDaEcsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEVBQzdCLGVBQWUsRUFBRSxPQUFPLEVBQ3hCLGVBQWUsRUFBRSxPQUFPLEdBQ3ZCLHlCQUF5QixDQUFDLE9BQU8sRUFBRSxPQUFPLENBQUMsQ0FTN0M7QUFFRCxxQkFBYSxnQ0FBZ0MsQ0FBQyxPQUFPLFNBQVMsTUFBTSxFQUFFLE9BQU8sU0FBUyxNQUFNO2FBTXhFLFVBQVUsRUFBRSxPQUFPO2FBQ25CLFVBQVUsRUFBRSxPQUFPO0lBTnJDLE9BQU8sQ0FBQyxLQUFLLENBQThDO0lBQzNELE9BQU8sQ0FBQyxtQkFBbUIsQ0FBSztJQUNoQyxPQUFPLENBQUMsbUJBQW1CLENBQUs7SUFFaEMsWUFDa0IsVUFBVSxFQUFFLE9BQU8sRUFDbkIsVUFBVSxFQUFFLE9BQU8sRUFTcEM7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sU0FBUyxNQUFNLEVBQUUsT0FBTyxTQUFTLE1BQU0sRUFBRSxVQUFVLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxPQUFPLCtDQUVwRztJQUVELHFCQUFxQixDQUFDLGdCQUFnQixFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsTUFBTSxRQVFyRTtJQUVELHFCQUFxQixDQUNuQixnQkFBZ0IsRUFBRSxNQUFNLEVBQ3hCLGlCQUFpQixFQUFFLGlCQUFpQixDQUFDLE9BQU8scUJBQXFCLENBQUMsRUFDbEUsWUFBWSxFQUFFLHFCQUFxQixRQVlwQztJQUVELE9BQU8sZ0RBRU47Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"nullifier_read_request_hints.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/nullifier_read_request_hints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAE7F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAsC,qBAAqB,EAAmB,MAAM,yBAAyB,CAAC;AAErH,MAAM,MAAM,yBAAyB,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,IAAI,qBAAqB,CAC3G,OAAO,kCAAkC,EACzC,OAAO,EACP,OAAO,EACP,OAAO,qBAAqB,EAC5B,qBAAqB,CACtB,CAAC;AAEF,wBAAgB,mCAAmC,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EAChG,MAAM,EAAE,MAAM,GAAG,YAAY,EAC7B,eAAe,EAAE,OAAO,EACxB,eAAe,EAAE,OAAO,GACvB,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAS7C;AAED,qBAAa,gCAAgC,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM;aAMxE,UAAU,EAAE,OAAO;aACnB,UAAU,EAAE,OAAO;IANrC,OAAO,CAAC,KAAK,CAA8C;IAC3D,OAAO,CAAC,mBAAmB,CAAK;IAChC,OAAO,CAAC,mBAAmB,CAAK;gBAGd,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO;IAWrC,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,cAAc,EAAE,MAAM;IAUtE,qBAAqB,CACnB,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,EAClE,YAAY,EAAE,qBAAqB;IAcrC,OAAO;CAGR"}
+{"version":3,"file":"nullifier_read_request_hints.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/nullifier_read_request_hints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAE7F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAsC,qBAAqB,EAAmB,MAAM,yBAAyB,CAAC;AAErH,MAAM,MAAM,yBAAyB,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,IAAI,qBAAqB,CAC3G,OAAO,kCAAkC,EACzC,OAAO,EACP,OAAO,EACP,OAAO,qBAAqB,EAC5B,qBAAqB,CACtB,CAAC;AAEF,wBAAgB,mCAAmC,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EAChG,MAAM,EAAE,MAAM,GAAG,YAAY,EAC7B,eAAe,EAAE,OAAO,EACxB,eAAe,EAAE,OAAO,GACvB,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAS7C;AAED,qBAAa,gCAAgC,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM;aAMxE,UAAU,EAAE,OAAO;aACnB,UAAU,EAAE,OAAO;IANrC,OAAO,CAAC,KAAK,CAA8C;IAC3D,OAAO,CAAC,mBAAmB,CAAK;IAChC,OAAO,CAAC,mBAAmB,CAAK;IAEhC,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,+CAEpG;IAED,qBAAqB,CAAC,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,QAQrE;IAED,qBAAqB,CACnB,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,EAClE,YAAY,EAAE,qBAAqB,QAYpC;IAED,OAAO,gDAEN;CACF"}

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

@@ -20,11 +20,6 @@ export declare class PrivateKernelResetHints<NH_RR_PENDING extends number, NH_RR
      * Contains hints for the transient note hashes to locate corresponding nullifiers.
      */
     transientDataSquashingHints: Tuple<TransientDataSquashingHint, TRANSIENT_DATA_HINTS_LEN>;
-    /**
-     * The "final" minRevertibleSideEffectCounter of a tx, to split the data for squashing.
-     * Not the minRevertibleSideEffectCounter at the point the reset circuit is run.
-     */
-    validationRequestsSplitCounter: number;
     constructor(
     /**
      * Contains hints for the transient read requests to localize corresponding commitments.
@@ -41,12 +36,7 @@ export declare class PrivateKernelResetHints<NH_RR_PENDING extends number, NH_RR
     /**
      * Contains hints for the transient note hashes to locate corresponding nullifiers.
      */
-    transientDataSquashingHints: Tuple<TransientDataSquashingHint, TRANSIENT_DATA_HINTS_LEN>, 
-    /**
-     * The "final" minRevertibleSideEffectCounter of a tx, to split the data for squashing.
-     * Not the minRevertibleSideEffectCounter at the point the reset circuit is run.
-     */
-    validationRequestsSplitCounter: number);
+    transientDataSquashingHints: Tuple<TransientDataSquashingHint, TRANSIENT_DATA_HINTS_LEN>);
     toBuffer(): Buffer<ArrayBufferLike>;
     trimToSizes(numNoteHashReadRequestPending: number, numNoteHashReadRequestSettled: number, numNullifierReadRequestPending: number, numNullifierReadRequestSettled: number, numKeyValidationHints: number, numTransientDataSquashingHints: number): PrivateKernelResetHints<number, number, number, number, number, number>;
     /**
@@ -56,4 +46,4 @@ export declare class PrivateKernelResetHints<NH_RR_PENDING extends number, NH_RR
      */
     static fromBuffer<NH_RR_PENDING extends number, NH_RR_SETTLED extends number, NLL_RR_PENDING extends number, NLL_RR_SETTLED extends number, KEY_VALIDATION_HINTS_LEN extends number, TRANSIENT_DATA_HINTS_LEN extends number>(buffer: Buffer | BufferReader, numNoteHashReadRequestPending: NH_RR_PENDING, numNoteHashReadRequestSettled: NH_RR_SETTLED, numNullifierReadRequestPending: NLL_RR_PENDING, numNullifierReadRequestSettled: NLL_RR_SETTLED, numKeyValidationHints: KEY_VALIDATION_HINTS_LEN, numTransientDataSquashingHints: TRANSIENT_DATA_HINTS_LEN): PrivateKernelResetHints<NH_RR_PENDING, NH_RR_SETTLED, NLL_RR_PENDING, NLL_RR_SETTLED, KEY_VALIDATION_HINTS_LEN, TRANSIENT_DATA_HINTS_LEN>;
 }
-//# sourceMappingURL=private_kernel_reset_hints.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfcmVzZXRfaGludHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9rZXJuZWwvaGludHMvcHJpdmF0ZV9rZXJuZWxfcmVzZXRfaGludHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxLQUFLLEtBQUssRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUUxRixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM3RCxPQUFPLEVBQUUsS0FBSyx3QkFBd0IsRUFBc0MsTUFBTSxtQ0FBbUMsQ0FBQztBQUN0SCxPQUFPLEVBQUUsS0FBSyx5QkFBeUIsRUFBdUMsTUFBTSxtQ0FBbUMsQ0FBQztBQUN4SCxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUVoRixxQkFBYSx1QkFBdUIsQ0FDbEMsYUFBYSxTQUFTLE1BQU0sRUFDNUIsYUFBYSxTQUFTLE1BQU0sRUFDNUIsY0FBYyxTQUFTLE1BQU0sRUFDN0IsY0FBYyxTQUFTLE1BQU0sRUFDN0Isd0JBQXdCLFNBQVMsTUFBTSxFQUN2Qyx3QkFBd0IsU0FBUyxNQUFNO0lBR3JDOztPQUVHO0lBQ0ksd0JBQXdCLEVBQUUsd0JBQXdCLENBQUMsYUFBYSxFQUFFLGFBQWEsQ0FBQztJQUN2Rjs7T0FFRztJQUNJLHlCQUF5QixFQUFFLHlCQUF5QixDQUFDLGNBQWMsRUFBRSxjQUFjLENBQUM7SUFDM0Y7O09BRUc7SUFDSSxrQkFBa0IsRUFBRSxLQUFLLENBQUMsaUJBQWlCLEVBQUUsd0JBQXdCLENBQUM7SUFDN0U7O09BRUc7SUFDSSwyQkFBMkIsRUFBRSxLQUFLLENBQUMsMEJBQTBCLEVBQUUsd0JBQXdCLENBQUM7SUFoQmpHO0lBQ0U7O09BRUc7SUFDSSx3QkFBd0IsRUFBRSx3QkFBd0IsQ0FBQyxhQUFhLEVBQUUsYUFBYSxDQUFDO0lBQ3ZGOztPQUVHO0lBQ0kseUJBQXlCLEVBQUUseUJBQXlCLENBQUMsY0FBYyxFQUFFLGNBQWMsQ0FBQztJQUMzRjs7T0FFRztJQUNJLGtCQUFrQixFQUFFLEtBQUssQ0FBQyxpQkFBaUIsRUFBRSx3QkFBd0IsQ0FBQztJQUM3RTs7T0FFRztJQUNJLDJCQUEyQixFQUFFLEtBQUssQ0FBQywwQkFBMEIsRUFBRSx3QkFBd0IsQ0FBQyxFQUM3RjtJQUVKLFFBQVEsNEJBT1A7SUFFRCxXQUFXLENBQ1QsNkJBQTZCLEVBQUUsTUFBTSxFQUNyQyw2QkFBNkIsRUFBRSxNQUFNLEVBQ3JDLDhCQUE4QixFQUFFLE1BQU0sRUFDdEMsOEJBQThCLEVBQUUsTUFBTSxFQUN0QyxxQkFBcUIsRUFBRSxNQUFNLEVBQzdCLDhCQUE4QixFQUFFLE1BQU0sMkVBbUJ2QztJQUNEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUNmLGFBQWEsU0FBUyxNQUFNLEVBQzVCLGFBQWEsU0FBUyxNQUFNLEVBQzVCLGNBQWMsU0FBUyxNQUFNLEVBQzdCLGNBQWMsU0FBUyxNQUFNLEVBQzdCLHdCQUF3QixTQUFTLE1BQU0sRUFDdkMsd0JBQXdCLFNBQVMsTUFBTSxFQUV2QyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksRUFDN0IsNkJBQTZCLEVBQUUsYUFBYSxFQUM1Qyw2QkFBNkIsRUFBRSxhQUFhLEVBQzVDLDhCQUE4QixFQUFFLGNBQWMsRUFDOUMsOEJBQThCLEVBQUUsY0FBYyxFQUM5QyxxQkFBcUIsRUFBRSx3QkFBd0IsRUFDL0MsOEJBQThCLEVBQUUsd0JBQXdCLEdBQ3ZELHVCQUF1QixDQUN4QixhQUFhLEVBQ2IsYUFBYSxFQUNiLGNBQWMsRUFDZCxjQUFjLEVBQ2Qsd0JBQXdCLEVBQ3hCLHdCQUF3QixDQUN6QixDQWNBO0NBQ0YifQ==