@aztec/pxe 0.0.1-commit.fff30aa → 0.0.1-dev

package/dest/events/event_service.js

@@ -1,5 +1,5 @@
 import { createLogger } from '@aztec/foundation/log';
-import { siloNullifier } from '@aztec/stdlib/hash';
+import { computePrivateEventCommitment, siloNullifier } from '@aztec/stdlib/hash';
 export class EventService {
     anchorBlockHeader;
     aztecNode;
@@ -13,16 +13,37 @@ export class EventService {
         this.jobId = jobId;
         this.log = log;
     }
-    async validateAndStoreEvent(contractAddress, selector, randomness, content, eventCommitment, txHash, scope) {
+    /**
+   * Validates and stores a batch of private events against pre-fetched tx effects.
+   *
+   * @param requests - The events to validate and store.
+   * @param scope - The scope under which the events are being stored.
+   * @param txEffects - Pre-fetched tx effects keyed by `TxHash.toString()`. Must contain entries for every request's
+   *                   txHash; missing entries are treated as a node bug and cause an error.
+   */ async validateAndStoreEvents(requests, scope, txEffects) {
+        if (requests.length === 0) {
+            return;
+        }
+        const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
+        await Promise.all(requests.map((req)=>this.#validateAndStoreEvent(req, scope, txEffects, anchorBlockNumber)));
+    }
+    async #validateAndStoreEvent(request, scope, txEffects, anchorBlockNumber) {
+        const { contractAddress, eventTypeId: selector, randomness, serializedEvent: content, eventCommitment, txHash } = request;
+        // Defense-in-depth: the built-in private-event path derives this commitment from content before enqueueing, but
+        // unconstrained PXE-side code (e.g. a custom message handler) can reach this oracle with arbitrary
+        // (content, commitment) pairs. Without this check it could bind arbitrary content to a legitimate tx nullifier,
+        // causing PXE to surface fabricated event data.
+        const recomputedCommitment = await computePrivateEventCommitment(randomness, selector.toField(), content);
+        if (!recomputedCommitment.equals(eventCommitment)) {
+            this.log.warn(`Skipping event whose content does not hash to the provided commitment. contract=${contractAddress}, selector=${selector}, eventCommitment=${eventCommitment}, txHash=${txHash}, recomputedCommitment=${recomputedCommitment}`);
+            return;
+        }
         // While using 'latest' block number would be fine for private events since they cannot be accessed from Aztec.nr
         // (and thus we're less concerned about being ahead of the synced block), we use the synced block number to
         // maintain consistent behavior in the PXE. Additionally, events should never be ahead of the synced block here
         // since `fetchTaggedLogs` only processes logs up to the synced block.
-        const [siloedEventCommitment, txEffect] = await Promise.all([
-            siloNullifier(contractAddress, eventCommitment),
-            this.aztecNode.getTxEffect(txHash)
-        ]);
-        const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
+        const siloedEventCommitment = await siloNullifier(contractAddress, eventCommitment);
+        const txEffect = txEffects.get(txHash.toString());
         if (!txEffect) {
             // We error out instead of just logging a warning and skipping the event because this would indicate a bug. This
             // is because the node has already served info about this tx either when obtaining the log (TxScopedL2Log contain

package/dest/hooks/authorize_utility_call.d.ts

@@ -0,0 +1,37 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { FunctionSelector } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+/** Information about a cross-contract utility call that requires authorization. */
+export type UtilityCallAuthorizationRequest = {
+    /** The contract requesting the cross-contract call. */
+    caller: AztecAddress;
+    /** The target contract being called. */
+    target: AztecAddress;
+    /** The function selector being invoked on the target. */
+    functionSelector: FunctionSelector;
+    /** The name of the function being called, if known from the contract artifact. */
+    functionName?: string;
+    /** The serialized arguments passed to the function. */
+    args: Fr[];
+    /** Whether the call originates from a private or utility execution context. */
+    callerContext: 'private' | 'utility';
+};
+/** Authorization was granted. */
+type Authorized = {
+    authorized: true;
+};
+/** Authorization was denied. */
+type Denied = {
+    authorized: false;
+    /** Reason for denial, included in the error message. */
+    reason?: string;
+};
+/** Result of an authorization hook evaluation. */
+export type UtilityCallAuthorizationResponse = Authorized | Denied;
+/**
+ * Hook called when a utility function attempts a cross-contract call.
+ * Returns a response indicating whether the call is authorized and an optional denial reason.
+ */
+export type AuthorizeUtilityCall = (request: UtilityCallAuthorizationRequest) => Promise<UtilityCallAuthorizationResponse>;
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aG9yaXplX3V0aWxpdHlfY2FsbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2hvb2tzL2F1dGhvcml6ZV91dGlsaXR5X2NhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVoRSxtRkFBbUY7QUFDbkYsTUFBTSxNQUFNLCtCQUErQixHQUFHO0lBQzVDLHVEQUF1RDtJQUN2RCxNQUFNLEVBQUUsWUFBWSxDQUFDO0lBQ3JCLHdDQUF3QztJQUN4QyxNQUFNLEVBQUUsWUFBWSxDQUFDO0lBQ3JCLHlEQUF5RDtJQUN6RCxnQkFBZ0IsRUFBRSxnQkFBZ0IsQ0FBQztJQUNuQyxrRkFBa0Y7SUFDbEYsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLHVEQUF1RDtJQUN2RCxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFDWCwrRUFBK0U7SUFDL0UsYUFBYSxFQUFFLFNBQVMsR0FBRyxTQUFTLENBQUM7Q0FDdEMsQ0FBQztBQUVGLGlDQUFpQztBQUNqQyxLQUFLLFVBQVUsR0FBRztJQUFFLFVBQVUsRUFBRSxJQUFJLENBQUE7Q0FBRSxDQUFDO0FBRXZDLGdDQUFnQztBQUNoQyxLQUFLLE1BQU0sR0FBRztJQUNaLFVBQVUsRUFBRSxLQUFLLENBQUM7SUFDbEIsd0RBQXdEO0lBQ3hELE1BQU0sQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNqQixDQUFDO0FBRUYsa0RBQWtEO0FBQ2xELE1BQU0sTUFBTSxnQ0FBZ0MsR0FBRyxVQUFVLEdBQUcsTUFBTSxDQUFDO0FBRW5FOzs7R0FHRztBQUNILE1BQU0sTUFBTSxvQkFBb0IsR0FBRyxDQUNqQyxPQUFPLEVBQUUsK0JBQStCLEtBQ3JDLE9BQU8sQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDIn0=

package/dest/hooks/authorize_utility_call.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"authorize_utility_call.d.ts","sourceRoot":"","sources":["../../src/hooks/authorize_utility_call.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,mFAAmF;AACnF,MAAM,MAAM,+BAA+B,GAAG;IAC5C,uDAAuD;IACvD,MAAM,EAAE,YAAY,CAAC;IACrB,wCAAwC;IACxC,MAAM,EAAE,YAAY,CAAC;IACrB,yDAAyD;IACzD,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,kFAAkF;IAClF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uDAAuD;IACvD,IAAI,EAAE,EAAE,EAAE,CAAC;IACX,+EAA+E;IAC/E,aAAa,EAAE,SAAS,GAAG,SAAS,CAAC;CACtC,CAAC;AAEF,iCAAiC;AACjC,KAAK,UAAU,GAAG;IAAE,UAAU,EAAE,IAAI,CAAA;CAAE,CAAC;AAEvC,gCAAgC;AAChC,KAAK,MAAM,GAAG;IACZ,UAAU,EAAE,KAAK,CAAC;IAClB,wDAAwD;IACxD,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,kDAAkD;AAClD,MAAM,MAAM,gCAAgC,GAAG,UAAU,GAAG,MAAM,CAAC;AAEnE;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG,CACjC,OAAO,EAAE,+BAA+B,KACrC,OAAO,CAAC,gCAAgC,CAAC,CAAC"}

package/dest/hooks/authorize_utility_call.js

@@ -0,0 +1,4 @@
+/**
+ * Hook called when a utility function attempts a cross-contract call.
+ * Returns a response indicating whether the call is authorized and an optional denial reason.
+ */ export { };

package/dest/hooks/execution_hooks.d.ts

@@ -0,0 +1,42 @@
+import type { AuthorizeUtilityCall } from './authorize_utility_call.js';
+/**
+ * Hooks that PXE invokes during client-side simulation to gate operations that the protocol
+ * does not restrict on its own. They give the wallet a chance to apply custom policies (e.g.
+ * prompting the user, consulting a dynamic allowlist, or inspecting call arguments) before the
+ * execution proceeds.
+ *
+ * For example, {@link authorizeUtilityCall} is called whenever a utility function makes a
+ * cross-contract call. A call made by a malicious contract could leak private information, so the
+ * hook lets the wallet decide, per-call, whether to allow it. A static allowlist would not work
+ * here because neither the app nor the wallet can predict ahead of time which contracts will be
+ * invoked during execution.
+ *
+ * Note: hooks are unrelated to authentication witnesses (authwits). Authwits are an on-chain
+ * mechanism where a contract verifies that a caller was authorized by a specific account; hooks
+ * are a client-side PXE concern that gates execution before it proceeds.
+ *
+ * @example
+ * ```ts
+ * const pxe = await PXE.create({
+ *   // ...
+ *   hooks: {
+ *     authorizeUtilityCall: async (req) => {
+ *       // Allow calls to a known helper contract, deny everything else.
+ *       return req.target.equals(trustedHelper)
+ *         ? { authorized: true }
+ *         : { authorized: false, reason: 'Unknown target' };
+ *     },
+ *   },
+ * });
+ * ```
+ */
+export interface ExecutionHooks {
+    /** Called when a contract attempts a cross-contract utility call. */
+    authorizeUtilityCall: AuthorizeUtilityCall;
+}
+/**
+ * Builds an {@link ExecutionHooks} from individually-constructed hook callbacks. Returns `undefined`
+ * when every field is absent, so callers can unconditionally pass the result as `hooks`.
+ */
+export declare function composeHooks(partial: Partial<ExecutionHooks>): ExecutionHooks | undefined;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0aW9uX2hvb2tzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaG9va3MvZXhlY3V0aW9uX2hvb2tzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFeEU7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQThCRztBQUNILE1BQU0sV0FBVyxjQUFjO0lBQzdCLHFFQUFxRTtJQUNyRSxvQkFBb0IsRUFBRSxvQkFBb0IsQ0FBQztDQUM1QztBQUVEOzs7R0FHRztBQUNILHdCQUFnQixZQUFZLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxjQUFjLENBQUMsR0FBRyxjQUFjLEdBQUcsU0FBUyxDQUt6RiJ9

package/dest/hooks/execution_hooks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"execution_hooks.d.ts","sourceRoot":"","sources":["../../src/hooks/execution_hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAExE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,WAAW,cAAc;IAC7B,qEAAqE;IACrE,oBAAoB,EAAE,oBAAoB,CAAC;CAC5C;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,cAAc,GAAG,SAAS,CAKzF"}

package/dest/hooks/execution_hooks.js

@@ -0,0 +1,9 @@
+/**
+ * Builds an {@link ExecutionHooks} from individually-constructed hook callbacks. Returns `undefined`
+ * when every field is absent, so callers can unconditionally pass the result as `hooks`.
+ */ export function composeHooks(partial) {
+    if (Object.values(partial).every((v)=>v === undefined)) {
+        return undefined;
+    }
+    return partial;
+}

package/dest/hooks/index.d.ts

@@ -0,0 +1,4 @@
+export type { AuthorizeUtilityCall, UtilityCallAuthorizationRequest, UtilityCallAuthorizationResponse, } from './authorize_utility_call.js';
+export type { ExecutionHooks } from './execution_hooks.js';
+export { composeHooks } from './execution_hooks.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ob29rcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxZQUFZLEVBQ1Ysb0JBQW9CLEVBQ3BCLCtCQUErQixFQUMvQixnQ0FBZ0MsR0FDakMsTUFBTSw2QkFBNkIsQ0FBQztBQUNyQyxZQUFZLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHNCQUFzQixDQUFDIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,oBAAoB,EACpB,+BAA+B,EAC/B,gCAAgC,GACjC,MAAM,6BAA6B,CAAC;AACrC,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC"}

package/dest/hooks/index.js

@@ -0,0 +1 @@
+export { composeHooks } from './execution_hooks.js';

package/dest/logs/log_service.d.ts

@@ -25,4 +25,4 @@ export declare class LogService {
     fetchLogsByTag(contractAddress: AztecAddress, logRetrievalRequests: LogRetrievalRequest[]): Promise<(LogRetrievalResponse | null)[]>;
     fetchTaggedLogs(contractAddress: AztecAddress, recipient: AztecAddress): Promise<PendingTaggedLog[]>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3NlcnZpY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2dzL2xvZ19zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBZSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUN2RixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNqRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDMUQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxFQUF1QyxnQkFBZ0IsRUFBa0IsTUFBTSxvQkFBb0IsQ0FBQztBQUMzRyxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHNFQUFzRSxDQUFDO0FBQ2hILE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHVFQUF1RSxDQUFDO0FBQzdHLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUN6RSxPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHFEQUFxRCxDQUFDO0FBQ2pHLE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sdURBQXVELENBQUM7QUFPcEcscUJBQWEsVUFBVTs7SUFJbkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBQzFCLE9BQU8sQ0FBQyxRQUFRLENBQUMsaUJBQWlCO0lBQ2xDLE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVztJQUM1QixPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVE7SUFDekIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxxQkFBcUI7SUFDdEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxzQkFBc0I7SUFDdkMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZO0lBQzdCLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSztJQVZ4QixPQUFPLENBQUMsR0FBRyxDQUFTO0lBRXBCLFlBQ21CLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsV0FBVyxFQUFFLGNBQWMsRUFDM0IsUUFBUSxFQUFFLFFBQVEsRUFDbEIscUJBQXFCLEVBQUUscUJBQXFCLEVBQzVDLHNCQUFzQixFQUFFLHNCQUFzQixFQUM5QyxZQUFZLEVBQUUsWUFBWSxFQUMxQixLQUFLLEVBQUUsTUFBTSxFQUM5QixRQUFRLENBQUMsRUFBRSxjQUFjLEVBRzFCO0lBRVksY0FBYyxDQUN6QixlQUFlLEVBQUUsWUFBWSxFQUM3QixvQkFBb0IsRUFBRSxtQkFBbUIsRUFBRSxHQUMxQyxPQUFPLENBQUMsQ0FBQyxvQkFBb0IsR0FBRyxJQUFJLENBQUMsRUFBRSxDQUFDLENBdUIxQztJQXFEWSxlQUFlLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLENBa0NoSDtDQTBDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3NlcnZpY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2dzL2xvZ19zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBZSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUN2RixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNqRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDMUQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxFQUVMLGdCQUFnQixFQUdqQixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sc0VBQXNFLENBQUM7QUFDaEgsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sdUVBQXVFLENBQUM7QUFDN0csT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBQ3pFLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0scURBQXFELENBQUM7QUFDakcsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx1REFBdUQsQ0FBQztBQU9wRyxxQkFBYSxVQUFVOztJQUluQixPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVM7SUFDMUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUI7SUFDbEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxXQUFXO0lBQzVCLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUTtJQUN6QixPQUFPLENBQUMsUUFBUSxDQUFDLHFCQUFxQjtJQUN0QyxPQUFPLENBQUMsUUFBUSxDQUFDLHNCQUFzQjtJQUN2QyxPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBVnhCLE9BQU8sQ0FBQyxHQUFHLENBQVM7SUFFcEIsWUFDbUIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsaUJBQWlCLEVBQUUsV0FBVyxFQUM5QixXQUFXLEVBQUUsY0FBYyxFQUMzQixRQUFRLEVBQUUsUUFBUSxFQUNsQixxQkFBcUIsRUFBRSxxQkFBcUIsRUFDNUMsc0JBQXNCLEVBQUUsc0JBQXNCLEVBQzlDLFlBQVksRUFBRSxZQUFZLEVBQzFCLEtBQUssRUFBRSxNQUFNLEVBQzlCLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFHMUI7SUFFWSxjQUFjLENBQ3pCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLG9CQUFvQixFQUFFLG1CQUFtQixFQUFFLEdBQzFDLE9BQU8sQ0FBQyxDQUFDLG9CQUFvQixHQUFHLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FxQzFDO0lBdUJZLGVBQWUsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLFNBQVMsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FvQmhIO0NBMENGIn0=

package/dest/logs/log_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log_service.d.ts","sourceRoot":"","sources":["../../src/logs/log_service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AACvF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAuC,gBAAgB,EAAkB,MAAM,oBAAoB,CAAC;AAC3G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sEAAsE,CAAC;AAChH,OAAO,EAAE,oBAAoB,EAAE,MAAM,uEAAuE,CAAC;AAC7G,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AACjG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uDAAuD,CAAC;AAOpG,qBAAa,UAAU;;IAInB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAVxB,OAAO,CAAC,GAAG,CAAS;IAEpB,YACmB,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,WAAW,EAC9B,WAAW,EAAE,cAAc,EAC3B,QAAQ,EAAE,QAAQ,EAClB,qBAAqB,EAAE,qBAAqB,EAC5C,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,EAC9B,QAAQ,CAAC,EAAE,cAAc,EAG1B;IAEY,cAAc,CACzB,eAAe,EAAE,YAAY,EAC7B,oBAAoB,EAAE,mBAAmB,EAAE,GAC1C,OAAO,CAAC,CAAC,oBAAoB,GAAG,IAAI,CAAC,EAAE,CAAC,CAuB1C;IAqDY,eAAe,CAAC,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAkChH;CA0CF"}
+{"version":3,"file":"log_service.d.ts","sourceRoot":"","sources":["../../src/logs/log_service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AACvF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAEL,gBAAgB,EAGjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sEAAsE,CAAC;AAChH,OAAO,EAAE,oBAAoB,EAAE,MAAM,uEAAuE,CAAC;AAC7G,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AACjG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uDAAuD,CAAC;AAOpG,qBAAa,UAAU;;IAInB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAVxB,OAAO,CAAC,GAAG,CAAS;IAEpB,YACmB,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,WAAW,EAC9B,WAAW,EAAE,cAAc,EAC3B,QAAQ,EAAE,QAAQ,EAClB,qBAAqB,EAAE,qBAAqB,EAC5C,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,EAC9B,QAAQ,CAAC,EAAE,cAAc,EAG1B;IAEY,cAAc,CACzB,eAAe,EAAE,YAAY,EAC7B,oBAAoB,EAAE,mBAAmB,EAAE,GAC1C,OAAO,CAAC,CAAC,oBAAoB,GAAG,IAAI,CAAC,EAAE,CAAC,CAqC1C;IAuBY,eAAe,CAAC,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAoBhH;CA0CF"}

package/dest/logs/log_service.js

@@ -2,7 +2,7 @@ import { createLogger } from '@aztec/foundation/log';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { ExtendedDirectionalAppTaggingSecret, PendingTaggedLog, SiloedTag } from '@aztec/stdlib/logs';
 import { LogRetrievalResponse } from '../contract_function_simulator/noir-structs/log_retrieval_response.js';
-import { getAllPrivateLogsByTags, getAllPublicLogsByTagsFromContract, loadPrivateLogsForSenderRecipientPair } from '../tagging/index.js';
+import { getAllPrivateLogsByTags, getAllPublicLogsByTagsFromContract, syncTaggedPrivateLogs } from '../tagging/index.js';
 export class LogService {
     aztecNode;
     anchorBlockHeader;
@@ -30,57 +30,42 @@ export class LogService {
                 throw new Error(`Got a log retrieval request from ${request.contractAddress}, expected ${contractAddress}`);
             }
         }
-        return await Promise.all(logRetrievalRequests.map(async (request)=>{
-            const [publicLog, privateLog] = await Promise.all([
-                this.#getPublicLogByTag(request.tag, request.contractAddress),
-                this.#getPrivateLogByTag(await SiloedTag.computeFromTagAndApp(request.tag, request.contractAddress))
-            ]);
+        if (logRetrievalRequests.length === 0) {
+            return [];
+        }
+        const anchorBlockHash = await this.anchorBlockHeader.hash();
+        const tags = logRetrievalRequests.map((r)=>r.tag);
+        const siloedTags = await Promise.all(logRetrievalRequests.map((r)=>SiloedTag.computeFromTagAndApp(r.tag, r.contractAddress)));
+        const [allPublicLogsPerTag, allPrivateLogsPerTag] = await Promise.all([
+            getAllPublicLogsByTagsFromContract(this.aztecNode, contractAddress, tags, anchorBlockHash),
+            getAllPrivateLogsByTags(this.aztecNode, siloedTags, anchorBlockHash)
+        ]);
+        return logRetrievalRequests.map((request, i)=>{
+            const publicLog = this.#extractSingleLog(allPublicLogsPerTag[i], `public log for tag ${request.tag} and contract ${request.contractAddress.toString()}`);
+            const privateLog = this.#extractSingleLog(allPrivateLogsPerTag[i], `private log for tag ${siloedTags[i]}`);
             if (publicLog !== null && privateLog !== null) {
                 this.log.warn(`Found both a public and private log for tag ${request.tag} from contract ${request.contractAddress}. This may indicate a contract bug. Returning the public log.`);
             }
             return publicLog ?? privateLog;
-        }));
+        });
     }
-    async #getPublicLogByTag(tag, contractAddress) {
-        const anchorBlockHash = await this.anchorBlockHeader.hash();
-        const allLogsPerTag = await getAllPublicLogsByTagsFromContract(this.aztecNode, contractAddress, [
-            tag
-        ], anchorBlockHash);
-        const logsForTag = allLogsPerTag[0];
+    #extractSingleLog(logsForTag, description) {
         if (logsForTag.length === 0) {
             return null;
-        } else if (logsForTag.length > 1) {
-            this.log.warn(`Expected at most 1 public log for tag ${tag} and contract ${contractAddress.toString()}, got ${logsForTag.length}. This may indicate a contract bug. Returning the first log.`);
         }
-        const scopedLog = logsForTag[0];
-        return new LogRetrievalResponse(scopedLog.logData.slice(1), scopedLog.txHash, scopedLog.noteHashes, scopedLog.firstNullifier);
-    }
-    async #getPrivateLogByTag(siloedTag) {
-        const anchorBlockHash = await this.anchorBlockHeader.hash();
-        const allLogsPerTag = await getAllPrivateLogsByTags(this.aztecNode, [
-            siloedTag
-        ], anchorBlockHash);
-        const logsForTag = allLogsPerTag[0];
-        if (logsForTag.length === 0) {
-            return null;
-        } else if (logsForTag.length > 1) {
-            this.log.warn(`Expected at most 1 private log for tag ${siloedTag}, got ${logsForTag.length}. This may indicate a contract bug. Returning the first log.`);
+        if (logsForTag.length > 1) {
+            this.log.warn(`Expected at most 1 ${description}, got ${logsForTag.length}. This may indicate a contract bug. Returning the first log.`);
         }
         const scopedLog = logsForTag[0];
         return new LogRetrievalResponse(scopedLog.logData.slice(1), scopedLog.txHash, scopedLog.noteHashes, scopedLog.firstNullifier);
     }
     async fetchTaggedLogs(contractAddress, recipient) {
         this.log.verbose(`Fetching tagged logs for ${contractAddress.toString()}`);
-        // We only load logs from block up to and including the anchor block number
-        const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
-        const anchorBlockHash = await this.anchorBlockHeader.hash();
         const l2Tips = await this.l2TipsStore.getL2Tips();
-        const currentTimestamp = this.anchorBlockHeader.globalVariables.timestamp;
         // Get all secrets for this recipient (one per sender)
         const secrets = await this.#getSecretsForSenders(contractAddress, recipient);
-        // Load logs for all sender-recipient pairs in parallel
-        const logArrays = await Promise.all(secrets.map((secret)=>loadPrivateLogsForSenderRecipientPair(secret, this.aztecNode, this.recipientTaggingStore, anchorBlockNumber, anchorBlockHash, currentTimestamp, l2Tips.finalized.block.number, this.jobId)));
-        return logArrays.flat().map((scopedLog)=>new PendingTaggedLog(scopedLog.logData, scopedLog.txHash, scopedLog.noteHashes, scopedLog.firstNullifier));
+        const logs = await syncTaggedPrivateLogs(secrets, this.aztecNode, this.recipientTaggingStore, this.anchorBlockHeader, l2Tips.finalized.block.number, this.jobId);
+        return logs.map((scopedLog)=>new PendingTaggedLog(scopedLog.logData, scopedLog.txHash, scopedLog.noteHashes, scopedLog.firstNullifier));
     }
     async #getSecretsForSenders(contractAddress, recipient) {
         const recipientCompleteAddress = await this.addressStore.getCompleteAddress(recipient);

package/dest/messages/message_context_service.d.ts

@@ -14,4 +14,4 @@ export declare class MessageContextService {
      */
     getMessageContextsByTxHash(txHashes: Fr[], anchorBlockNumber: number): Promise<(MessageContext | null)[]>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzc2FnZV9jb250ZXh0X3NlcnZpY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tZXNzYWdlcy9tZXNzYWdlX2NvbnRleHRfc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBR3BELCtFQUErRTtBQUMvRSxxQkFBYSxxQkFBcUI7SUFDcEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBQXRDLFlBQTZCLFNBQVMsRUFBRSxTQUFTLEVBQUk7SUFFckQ7Ozs7OztPQU1HO0lBQ0gsMEJBQTBCLENBQUMsUUFBUSxFQUFFLEVBQUUsRUFBRSxFQUFFLGlCQUFpQixFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsQ0FBQyxjQUFjLEdBQUcsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQTBCeEc7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzc2FnZV9jb250ZXh0X3NlcnZpY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tZXNzYWdlcy9tZXNzYWdlX2NvbnRleHRfc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBR3BELCtFQUErRTtBQUMvRSxxQkFBYSxxQkFBcUI7SUFDcEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBQXRDLFlBQTZCLFNBQVMsRUFBRSxTQUFTLEVBQUk7SUFFckQ7Ozs7OztPQU1HO0lBQ0csMEJBQTBCLENBQUMsUUFBUSxFQUFFLEVBQUUsRUFBRSxFQUFFLGlCQUFpQixFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsQ0FBQyxjQUFjLEdBQUcsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQTBCOUc7Q0FDRiJ9

package/dest/messages/message_context_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message_context_service.d.ts","sourceRoot":"","sources":["../../src/messages/message_context_service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,+EAA+E;AAC/E,qBAAa,qBAAqB;IACpB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAtC,YAA6B,SAAS,EAAE,SAAS,EAAI;IAErD;;;;;;OAMG;IACH,0BAA0B,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,cAAc,GAAG,IAAI,CAAC,EAAE,CAAC,CA0BxG;CACF"}
+{"version":3,"file":"message_context_service.d.ts","sourceRoot":"","sources":["../../src/messages/message_context_service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,+EAA+E;AAC/E,qBAAa,qBAAqB;IACpB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAtC,YAA6B,SAAS,EAAE,SAAS,EAAI;IAErD;;;;;;OAMG;IACG,0BAA0B,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,cAAc,GAAG,IAAI,CAAC,EAAE,CAAC,CA0B9G;CACF"}

package/dest/messages/message_context_service.js

@@ -1,3 +1,4 @@
+import { uniqueBy } from '@aztec/foundation/collection';
 import { MessageContext } from '@aztec/stdlib/logs';
 import { TxHash } from '@aztec/stdlib/tx';
 /** Resolves transaction hashes into the context needed to process messages. */ export class MessageContextService {
@@ -11,16 +12,17 @@ import { TxHash } from '@aztec/stdlib/tx';
    * For each tx hash, looks up the corresponding tx effect and extracts the note hashes and first nullifier needed to
    * process messages that originated from that transaction. Returns `null` for tx hashes that are zero, not yet
    * available, or in blocks beyond the anchor block.
-   */ getMessageContextsByTxHash(txHashes, anchorBlockNumber) {
-        // TODO: optimize, we might be hitting the node to get the same txHash repeatedly
-        return Promise.all(txHashes.map(async (txHashField)=>{
-            // A zero tx hash indicates a tx-less offchain message (e.g. one not tied to any onchain transaction).
-            // These messages don't have a transaction context to resolve, so we return null.
-            if (txHashField.isZero()) {
-                return null;
-            }
+   */ async getMessageContextsByTxHash(txHashes, anchorBlockNumber) {
+        const nonZeroTxHashes = txHashes.filter((h)=>!h.isZero()).map((h)=>TxHash.fromField(h));
+        const uniqueTxHashes = uniqueBy(nonZeroTxHashes, (h)=>h.toString());
+        const fetched = await Promise.all(uniqueTxHashes.map((h)=>this.aztecNode.getTxEffect(h)));
+        const txEffects = new Map(uniqueTxHashes.map((h, i)=>[
+                h.toString(),
+                fetched[i]
+            ]).filter((entry)=>entry[1] !== undefined));
+        return txHashes.map((txHashField)=>{
             const txHash = TxHash.fromField(txHashField);
-            const txEffect = await this.aztecNode.getTxEffect(txHash);
+            const txEffect = txEffects.get(txHash.toString());
             if (!txEffect || txEffect.l2BlockNumber > anchorBlockNumber) {
                 return null;
             }
@@ -31,6 +33,6 @@ import { TxHash } from '@aztec/stdlib/tx';
                 throw new Error(`Tx effect for ${txHash} has no nullifiers`);
             }
             return new MessageContext(data.txHash, data.noteHashes, data.nullifiers[0]);
-        }));
+        });
     }
 }

package/dest/notes/note_service.d.ts

@@ -2,9 +2,11 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type AztecNode } from '@aztec/stdlib/interfaces/client';
 import { Note, NoteStatus } from '@aztec/stdlib/note';
-import type { BlockHeader, TxHash } from '@aztec/stdlib/tx';
+import type { BlockHeader, IndexedTxEffect } from '@aztec/stdlib/tx';
+import type { NoteValidationRequest } from '../contract_function_simulator/noir-structs/note_validation_request.js';
 import type { NoteStore } from '../storage/note_store/note_store.js';
 export declare class NoteService {
+    #private;
     private readonly noteStore;
     private readonly aztecNode;
     private readonly anchorBlockHeader;
@@ -43,6 +45,26 @@ export declare class NoteService {
      * @param contractAddress - The contract whose notes should be checked and nullified.
      */
     syncNoteNullifiers(contractAddress: AztecAddress, scopes: AztecAddress[]): Promise<void>;
-    validateAndStoreNote(contractAddress: AztecAddress, owner: AztecAddress, storageSlot: Fr, randomness: Fr, noteNonce: Fr, content: Fr[], noteHash: Fr, nullifier: Fr, txHash: TxHash, scope: AztecAddress): Promise<void>;
+    /**
+     * Validates and stores a batch of notes against pre-fetched tx effects.
+     *
+     * For each request we must verify that:
+     *  - the note actually exists in the corresponding tx effect (and thus in the note hash tree), and
+     *  - the note has not already been nullified.
+     *
+     * Failing to do either would result in circuits getting either non-existent notes and failing to produce inclusion
+     * proofs for them, or getting nullified notes and producing duplicate nullifiers, both of which are catastrophic
+     * failure modes.
+     *
+     * Note that adding a note and removing it is *not* equivalent to never adding it in the first place. A nullifier
+     * emitted in a block that comes after note creation might result in the note being de-nullified by a chain reorg,
+     * so we must store both the note hash and nullifier block information.
+     *
+     * @param requests - The notes to validate and store.
+     * @param scope - The scope under which the notes are being stored.
+     * @param txEffects - Pre-fetched tx effects keyed by `TxHash.toString()`. Must contain entries for every request's
+     *                   txHash; missing entries are treated as a node bug and cause an error.
+     */
+    validateAndStoreNotes(requests: NoteValidationRequest[], scope: AztecAddress, txEffects: Map<string, IndexedTxEffect>): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbm90ZXMvbm90ZV9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUdoRSxPQUFPLEVBQUUsS0FBSyxTQUFTLEVBQWUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RSxPQUFPLEVBQUUsSUFBSSxFQUFXLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUU1RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUVyRSxxQkFBYSxXQUFXO0lBRXBCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVM7SUFDMUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUI7SUFDbEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBSnhCLFlBQ21CLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsS0FBSyxFQUFFLE1BQU0sRUFDNUI7SUFFSjs7Ozs7Ozs7T0FRRztJQUNVLFFBQVEsQ0FDbkIsZUFBZSxFQUFFLFlBQVksRUFDN0IsS0FBSyxFQUFFLFlBQVksR0FBRyxTQUFTLEVBQy9CLFdBQVcsRUFBRSxFQUFFLEVBQ2YsTUFBTSxFQUFFLFVBQVUsRUFDbEIsTUFBTSxFQUFFLFlBQVksRUFBRTs7Ozs7Ozs7OztTQXlCdkI7SUFFRDs7Ozs7Ozs7Ozs7T0FXRztJQUNVLGtCQUFrQixDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FzQ3BHO0lBRVksb0JBQW9CLENBQy9CLGVBQWUsRUFBRSxZQUFZLEVBQzdCLEtBQUssRUFBRSxZQUFZLEVBQ25CLFdBQVcsRUFBRSxFQUFFLEVBQ2YsVUFBVSxFQUFFLEVBQUUsRUFDZCxTQUFTLEVBQUUsRUFBRSxFQUNiLE9BQU8sRUFBRSxFQUFFLEVBQUUsRUFDYixRQUFRLEVBQUUsRUFBRSxFQUNaLFNBQVMsRUFBRSxFQUFFLEVBQ2IsTUFBTSxFQUFFLE1BQU0sRUFDZCxLQUFLLEVBQUUsWUFBWSxHQUNsQixPQUFPLENBQUMsSUFBSSxDQUFDLENBaUZmO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbm90ZXMvbm90ZV9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUdoRSxPQUFPLEVBQUUsS0FBSyxTQUFTLEVBQWUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RSxPQUFPLEVBQUUsSUFBSSxFQUFXLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVyRSxPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHdFQUF3RSxDQUFDO0FBQ3BILE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRXJFLHFCQUFhLFdBQVc7O0lBRXBCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVM7SUFDMUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUI7SUFDbEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBSnhCLFlBQ21CLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsS0FBSyxFQUFFLE1BQU0sRUFDNUI7SUFFSjs7Ozs7Ozs7T0FRRztJQUNVLFFBQVEsQ0FDbkIsZUFBZSxFQUFFLFlBQVksRUFDN0IsS0FBSyxFQUFFLFlBQVksR0FBRyxTQUFTLEVBQy9CLFdBQVcsRUFBRSxFQUFFLEVBQ2YsTUFBTSxFQUFFLFVBQVUsRUFDbEIsTUFBTSxFQUFFLFlBQVksRUFBRTs7Ozs7Ozs7OztTQXlCdkI7SUFFRDs7Ozs7Ozs7Ozs7T0FXRztJQUNVLGtCQUFrQixDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FxQnBHO0lBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FtQkc7SUFDVSxxQkFBcUIsQ0FDaEMsUUFBUSxFQUFFLHFCQUFxQixFQUFFLEVBQ2pDLEtBQUssRUFBRSxZQUFZLEVBQ25CLFNBQVMsRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLGVBQWUsQ0FBQyxHQUN0QyxPQUFPLENBQUMsSUFBSSxDQUFDLENBa0dmO0NBVUYifQ==

package/dest/notes/note_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"note_service.d.ts","sourceRoot":"","sources":["../../src/notes/note_service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,EAAE,KAAK,SAAS,EAAe,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,IAAI,EAAW,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAErE,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK;IAJxB,YACmB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,WAAW,EAC9B,KAAK,EAAE,MAAM,EAC5B;IAEJ;;;;;;;;OAQG;IACU,QAAQ,CACnB,eAAe,EAAE,YAAY,EAC7B,KAAK,EAAE,YAAY,GAAG,SAAS,EAC/B,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,YAAY,EAAE;;;;;;;;;;SAyBvB;IAED;;;;;;;;;;;OAWG;IACU,kBAAkB,CAAC,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsCpG;IAEY,oBAAoB,CAC/B,eAAe,EAAE,YAAY,EAC7B,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,EAAE,EACf,UAAU,EAAE,EAAE,EACd,SAAS,EAAE,EAAE,EACb,OAAO,EAAE,EAAE,EAAE,EACb,QAAQ,EAAE,EAAE,EACZ,SAAS,EAAE,EAAE,EACb,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAiFf;CACF"}
+{"version":3,"file":"note_service.d.ts","sourceRoot":"","sources":["../../src/notes/note_service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,EAAE,KAAK,SAAS,EAAe,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,IAAI,EAAW,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAErE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wEAAwE,CAAC;AACpH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAErE,qBAAa,WAAW;;IAEpB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK;IAJxB,YACmB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,WAAW,EAC9B,KAAK,EAAE,MAAM,EAC5B;IAEJ;;;;;;;;OAQG;IACU,QAAQ,CACnB,eAAe,EAAE,YAAY,EAC7B,KAAK,EAAE,YAAY,GAAG,SAAS,EAC/B,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,YAAY,EAAE;;;;;;;;;;SAyBvB;IAED;;;;;;;;;;;OAWG;IACU,kBAAkB,CAAC,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBpG;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACU,qBAAqB,CAChC,QAAQ,EAAE,qBAAqB,EAAE,EACjC,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC,CAkGf;CAUF"}

package/dest/notes/note_service.js

@@ -1,3 +1,4 @@
+import { chunk } from '@aztec/foundation/collection';
 import { computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/stdlib/hash';
 import { MAX_RPC_LEN } from '@aztec/stdlib/interfaces/client';
 import { Note, NoteDao } from '@aztec/stdlib/note';
@@ -62,19 +63,7 @@ export class NoteService {
             return;
         }
         const nullifiersToCheck = contractNotes.map((note)=>note.siloedNullifier);
-        const nullifierBatches = nullifiersToCheck.reduce((acc, nullifier)=>{
-            if (acc[acc.length - 1].length < MAX_RPC_LEN) {
-                acc[acc.length - 1].push(nullifier);
-            } else {
-                acc.push([
-                    nullifier
-                ]);
-            }
-            return acc;
-        }, [
-            []
-        ]);
-        const nullifierIndexes = (await Promise.all(nullifierBatches.map((batch)=>this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, batch)))).flat();
+        const nullifierIndexes = await this.#findNullifierIndexes(anchorBlockHash, nullifiersToCheck);
         const foundNullifiers = nullifiersToCheck.map((nullifier, i)=>{
             if (nullifierIndexes[i] !== undefined) {
                 return {
@@ -87,19 +76,29 @@ export class NoteService {
         }).filter((nullifier)=>nullifier !== undefined);
         await this.noteStore.applyNullifiers(foundNullifiers, this.jobId);
     }
-    async validateAndStoreNote(contractAddress, owner, storageSlot, randomness, noteNonce, content, noteHash, nullifier, txHash, scope) {
-        // We are going to store the new note in the NoteStore, which will let us later return it via `getNotes`.
-        // There's two things we need to check before we do this however:
-        //  - we must make sure the note does actually exist in the note hash tree
-        //  - we need to check if the note has already been nullified
-        //
-        // Failing to do either of the above would result in circuits getting either non-existent notes and failing to
-        // produce inclusion proofs for them, or getting nullified notes and producing duplicate nullifiers, both of which
-        // are catastrophic failure modes.
-        //
-        // Note that adding a note and removing it is *not* equivalent to never adding it in the first place. A nullifier
-        // emitted in a block that comes after note creation might result in the note being de-nullified by a chain reorg,
-        // so we must store both the note hash and nullifier block information.
+    /**
+   * Validates and stores a batch of notes against pre-fetched tx effects.
+   *
+   * For each request we must verify that:
+   *  - the note actually exists in the corresponding tx effect (and thus in the note hash tree), and
+   *  - the note has not already been nullified.
+   *
+   * Failing to do either would result in circuits getting either non-existent notes and failing to produce inclusion
+   * proofs for them, or getting nullified notes and producing duplicate nullifiers, both of which are catastrophic
+   * failure modes.
+   *
+   * Note that adding a note and removing it is *not* equivalent to never adding it in the first place. A nullifier
+   * emitted in a block that comes after note creation might result in the note being de-nullified by a chain reorg,
+   * so we must store both the note hash and nullifier block information.
+   *
+   * @param requests - The notes to validate and store.
+   * @param scope - The scope under which the notes are being stored.
+   * @param txEffects - Pre-fetched tx effects keyed by `TxHash.toString()`. Must contain entries for every request's
+   *                   txHash; missing entries are treated as a node bug and cause an error.
+   */ async validateAndStoreNotes(requests, scope, txEffects) {
+        if (requests.length === 0) {
+            return;
+        }
         // We avoid making node queries at 'latest' since we don't want to process notes or nullifiers that only exist ahead
         // in time of the locally synced state.
         // Note that while this technically results in historical queries, we perform it at the latest locally synced block
@@ -110,48 +109,64 @@ export class NoteService {
         const anchorBlockHash = await this.anchorBlockHeader.hash();
         // By computing siloed and unique note hashes ourselves we prevent contracts from interfering with the note storage
         // of other contracts, which would constitute a security breach.
-        const uniqueNoteHash = await computeUniqueNoteHash(noteNonce, await siloNoteHash(contractAddress, noteHash));
-        const siloedNullifier = await siloNullifier(contractAddress, nullifier);
-        const [txEffect, [nullifierIndex]] = await Promise.all([
-            this.aztecNode.getTxEffect(txHash),
-            this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, [
+        const computed = await Promise.all(requests.map(async ({ contractAddress, noteHash, nullifier, noteNonce })=>{
+            const [siloedNoteHash, siloedNullifier] = await Promise.all([
+                siloNoteHash(contractAddress, noteHash),
+                siloNullifier(contractAddress, nullifier)
+            ]);
+            const uniqueNoteHash = await computeUniqueNoteHash(noteNonce, siloedNoteHash);
+            return {
+                uniqueNoteHash,
                 siloedNullifier
-            ])
-        ]);
-        if (!txEffect) {
-            // We error out instead of just logging a warning and skipping the note because this would indicate a bug. This
-            // is because the node has already served info about this tx either when obtaining the log (TxScopedL2Log contain
-            // tx info) or when getting metadata for the offchain message (before the message got passed to `process_log`).
-            throw new Error(`Could not find tx effect for tx hash ${txHash} when processing a note.`);
-        }
-        if (txEffect.l2BlockNumber > anchorBlockNumber) {
-            // If the message was delivered onchain, this would indicate a bug: log sync should never load logs from blocks
-            // newer than the anchor block. If the note came via an offchain message, it would likely also be a bug, since we
-            // sync a new anchor block before calling `process_message`. For this not to be a bug, the message would need to
-            // come from a newer block than the anchor served by the node, implying the node isn't properly synced.
-            //     We therefore error out here rather than assuming the offchain message was constructed by a malicious
-            // sender with the intention of bricking recipient's PXE (if we assumed that we would just ignore the message).
-            throw new Error(`Obtained a newer tx effect for ${txHash} for a note validation request than the anchor block ${anchorBlockNumber}. This is a bug as we should not ever be processing a note from a newer block than the anchor block.`);
-        }
-        // Find the index of the note hash in the noteHashes array to determine note ordering within the tx
-        const noteIndexInTx = txEffect.data.noteHashes.findIndex((nh)=>nh.equals(uniqueNoteHash));
-        if (noteIndexInTx === -1) {
-            // Similar to the comment above - we error out as this would indicate a bug in nonce discovery.
-            throw new Error(`Note hash ${noteHash} (uniqued as ${uniqueNoteHash}) is not present in tx ${txHash}`);
-        }
-        const noteDao = new NoteDao(new Note(content), contractAddress, owner, storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, txEffect.l2BlockNumber, txEffect.l2BlockHash.toString(), txEffect.txIndexInBlock, noteIndexInTx);
-        await this.noteStore.addNotes([
-            noteDao
-        ], scope, this.jobId);
-        if (nullifierIndex !== undefined) {
-            // We found nullifier index which implies that the note has already been nullified.
-            const { data: _, ...blockHashAndNum } = nullifierIndex;
-            await this.noteStore.applyNullifiers([
-                {
+            };
+        }));
+        const nullifierIndexes = await this.#findNullifierIndexes(anchorBlockHash, computed.map((c)=>c.siloedNullifier));
+        const noteDaos = [];
+        const foundNullifiers = [];
+        for(let i = 0; i < requests.length; i++){
+            const { contractAddress, owner, storageSlot, randomness, noteNonce, content, noteHash, txHash } = requests[i];
+            const { uniqueNoteHash, siloedNullifier } = computed[i];
+            const nullifierIndex = nullifierIndexes[i];
+            const txEffect = txEffects.get(txHash.toString());
+            if (!txEffect) {
+                // We error out instead of just logging a warning and skipping the note because this would indicate a bug. This
+                // is because the node has already served info about this tx either when obtaining the log (TxScopedL2Log
+                // contain tx info) or when getting metadata for the offchain message (before the message got passed to
+                // `process_log`).
+                throw new Error(`Could not find tx effect for tx hash ${txHash} when processing a note.`);
+            }
+            if (txEffect.l2BlockNumber > anchorBlockNumber) {
+                // If the message was delivered onchain, this would indicate a bug: log sync should never load logs from blocks
+                // newer than the anchor block. If the note came via an offchain message, it would likely also be a bug, since
+                // we sync a new anchor block before calling `process_message`. For this not to be a bug, the message would
+                // need to come from a newer block than the anchor served by the node, implying the node isn't properly synced.
+                //     We therefore error out here rather than assuming the offchain message was constructed by a malicious
+                // sender with the intention of bricking recipient's PXE (if we assumed that we would just ignore the message).
+                throw new Error(`Obtained a newer tx effect for ${txHash} for a note validation request than the anchor block ${anchorBlockNumber}. This is a bug as we should not ever be processing a note from a newer block than the anchor block.`);
+            }
+            // Find the index of the note hash in the noteHashes array to determine note ordering within the tx
+            const noteIndexInTx = txEffect.data.noteHashes.findIndex((nh)=>nh.equals(uniqueNoteHash));
+            if (noteIndexInTx === -1) {
+                // Similar to the comment above - we error out as this would indicate a bug in nonce discovery.
+                throw new Error(`Note hash ${noteHash} (uniqued as ${uniqueNoteHash}) is not present in tx ${txHash}`);
+            }
+            noteDaos.push(new NoteDao(new Note(content), contractAddress, owner, storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, txEffect.l2BlockNumber, txEffect.l2BlockHash.toString(), txEffect.txIndexInBlock, noteIndexInTx));
+            if (nullifierIndex !== undefined) {
+                // We found a nullifier index which implies that the note has already been nullified.
+                const { data: _, ...blockHashAndNum } = nullifierIndex;
+                foundNullifiers.push({
                     data: siloedNullifier,
                     ...blockHashAndNum
-                }
-            ], this.jobId);
+                });
+            }
         }
+        await this.noteStore.addNotes(noteDaos, scope, this.jobId);
+        if (foundNullifiers.length > 0) {
+            await this.noteStore.applyNullifiers(foundNullifiers, this.jobId);
+        }
+    }
+    async #findNullifierIndexes(anchorBlockHash, siloedNullifiers) {
+        const batches = chunk(siloedNullifiers, MAX_RPC_LEN);
+        return (await Promise.all(batches.map((batch)=>this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, batch)))).flat();
     }
 }

package/dest/oracle_version.d.ts

@@ -1,4 +1,4 @@
 export declare const ORACLE_VERSION_MAJOR = 22;
-export declare const ORACLE_VERSION_MINOR = 1;
-export declare const ORACLE_INTERFACE_HASH = "efafa0db2cc1f94e26d794d0079c8f71115261df0c3d0fa8cb5b64f17a12db92";
+export declare const ORACLE_VERSION_MINOR = 3;
+export declare const ORACLE_INTERFACE_HASH = "0649632102f27d1411749e46733b96103eaac948914d328afc4b90d3bf6e5af5";
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JhY2xlX3ZlcnNpb24uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9vcmFjbGVfdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFZQSxlQUFPLE1BQU0sb0JBQW9CLEtBQUssQ0FBQztBQUN2QyxlQUFPLE1BQU0sb0JBQW9CLElBQUksQ0FBQztBQVF0QyxlQUFPLE1BQU0scUJBQXFCLHFFQUFxRSxDQUFDIn0=