@aztec/pxe 0.0.1-commit.42ee6df9b → 0.0.1-commit.431c48d

package/dest/hooks/resolve_custom_request.d.ts

@@ -0,0 +1,23 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+/**
+ * A custom, caller-defined request resolved via the {@link ResolveCustomRequest} hook. It carries no fixed meaning:
+ * `kind` selects the request type so one hook can serve many such types, and `payload` holds the opaque,
+ * request-specific arguments. The resolver answers by whatever means it needs (local state, a third party,
+ * offchain data).
+ */
+export type CustomRequest = {
+    /** The address of the contract issuing the request. */
+    contractAddress: AztecAddress;
+    /** The issuing contract's class ID, so resolvers can apply class-level (not just per-address) policy. */
+    contractClassId: Fr;
+    /** Discriminates the request type, letting one hook serve many such types. */
+    kind: Fr;
+    /** Opaque, request-specific arguments. */
+    payload: Fr[];
+};
+/**
+ * Hook resolving a {@link CustomRequest}. The resolver produces the response however it needs to.
+ */
+export type ResolveCustomRequest = (request: CustomRequest) => Promise<Fr[]>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZV9jdXN0b21fcmVxdWVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2hvb2tzL3Jlc29sdmVfY3VzdG9tX3JlcXVlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFaEU7Ozs7O0dBS0c7QUFDSCxNQUFNLE1BQU0sYUFBYSxHQUFHO0lBQzFCLHVEQUF1RDtJQUN2RCxlQUFlLEVBQUUsWUFBWSxDQUFDO0lBQzlCLHlHQUF5RztJQUN6RyxlQUFlLEVBQUUsRUFBRSxDQUFDO0lBQ3BCLDhFQUE4RTtJQUM5RSxJQUFJLEVBQUUsRUFBRSxDQUFDO0lBQ1QsMENBQTBDO0lBQzFDLE9BQU8sRUFBRSxFQUFFLEVBQUUsQ0FBQztDQUNmLENBQUM7QUFFRjs7R0FFRztBQUNILE1BQU0sTUFBTSxvQkFBb0IsR0FBRyxDQUFDLE9BQU8sRUFBRSxhQUFhLEtBQUssT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"resolve_custom_request.d.ts","sourceRoot":"","sources":["../../src/hooks/resolve_custom_request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,uDAAuD;IACvD,eAAe,EAAE,YAAY,CAAC;IAC9B,yGAAyG;IACzG,eAAe,EAAE,EAAE,CAAC;IACpB,8EAA8E;IAC9E,IAAI,EAAE,EAAE,CAAC;IACT,0CAA0C;IAC1C,OAAO,EAAE,EAAE,EAAE,CAAC;CACf,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC"}

package/dest/hooks/resolve_custom_request.js

@@ -0,0 +1,3 @@
+/**
+ * Hook resolving a {@link CustomRequest}. The resolver produces the response however it needs to.
+ */ export { };

package/dest/hooks/resolve_tagging_secret_strategy.d.ts

@@ -0,0 +1,50 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { Point } from '@aztec/foundation/curves/grumpkin';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { AppTaggingSecretKind } from '@aztec/stdlib/logs';
+/**
+ * How a message's tagging secret is chosen: the wallet's strategy, returned by the `resolveTaggingSecretStrategy` hook
+ * when no onchain handshake has been registered for the sender/recipient pair. This is intent (plus, for an arbitrary
+ * secret, the raw material); PXE resolves it into the secret it hands the contract.
+ */
+export type TaggingSecretStrategy = {
+    /** Establish a fresh non-interactive handshake via the onchain registry; reveals the recipient onchain. */
+    type: 'non-interactive-handshake';
+} | {
+    /**
+     * Establish a fresh interactive handshake via the onchain registry. Reveals nothing about the recipient
+     * onchain, but requires the recipient to answer the registry's signed-authorization request (served through
+     * the {@link ResolveCustomRequest} hook), so the send fails when it cannot be served.
+     */
+    type: 'interactive-handshake';
+} | {
+    /** Derive the secret from the sender's and recipient's address keys via ECDH. PXE computes and silos it. */
+    type: 'address-derived';
+} | {
+    /**
+     * A raw shared secret point the two parties already share offchain (e.g. coordinated out-of-band), supplied by
+     * the wallet. PXE app-silos it before use. Only sound for unconstrained delivery, since nothing onchain proves
+     * the recipient knows it.
+     */
+    type: 'arbitrary-secret';
+    /** The raw (un-siloed) shared secret point to derive the tag from. */
+    secret: Point;
+};
+/** The strategy PXE applies to both delivery modes when no `resolveTaggingSecretStrategy` hook is configured. */
+export declare const DEFAULT_TAGGING_SECRET_STRATEGY: TaggingSecretStrategy;
+/** Information about the message delivery requesting a tagging secret strategy. */
+export type TaggingSecretStrategyRequest = {
+    contractAddress: AztecAddress;
+    /**
+     * The contract class ID of the executing contract, so wallets can apply class-level (not just per-address) policy.
+     */
+    contractClassId: Fr;
+    sender: AztecAddress;
+    recipient: AztecAddress;
+    deliveryMode: AppTaggingSecretKind;
+};
+/**
+ * Hook returning the {@link TaggingSecretStrategy} for an outgoing message.
+ */
+export type ResolveTaggingSecretStrategy = (request: TaggingSecretStrategyRequest) => Promise<TaggingSecretStrategy>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZV90YWdnaW5nX3NlY3JldF9zdHJhdGVneS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2hvb2tzL3Jlc29sdmVfdGFnZ2luZ19zZWNyZXRfc3RyYXRlZ3kudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUsvRDs7OztHQUlHO0FBQ0gsTUFBTSxNQUFNLHFCQUFxQixHQUM3QjtJQUNFLDJHQUEyRztJQUMzRyxJQUFJLEVBQUUsMkJBQTJCLENBQUM7Q0FDbkMsR0FDRDtJQUNFOzs7O09BSUc7SUFDSCxJQUFJLEVBQUUsdUJBQXVCLENBQUM7Q0FDL0IsR0FDRDtJQUNFLDRHQUE0RztJQUM1RyxJQUFJLEVBQUUsaUJBQWlCLENBQUM7Q0FDekIsR0FDRDtJQUNFOzs7O09BSUc7SUFDSCxJQUFJLEVBQUUsa0JBQWtCLENBQUM7SUFDekIsc0VBQXNFO0lBQ3RFLE1BQU0sRUFBRSxLQUFLLENBQUM7Q0FDZixDQUFDO0FBRU4saUhBQWlIO0FBQ2pILGVBQU8sTUFBTSwrQkFBK0IsRUFBRSxxQkFBNkQsQ0FBQztBQUU1RyxtRkFBbUY7QUFDbkYsTUFBTSxNQUFNLDRCQUE0QixHQUFHO0lBQ3pDLGVBQWUsRUFBRSxZQUFZLENBQUM7SUFDOUI7O09BRUc7SUFDSCxlQUFlLEVBQUUsRUFBRSxDQUFDO0lBQ3BCLE1BQU0sRUFBRSxZQUFZLENBQUM7SUFDckIsU0FBUyxFQUFFLFlBQVksQ0FBQztJQUN4QixZQUFZLEVBQUUsb0JBQW9CLENBQUM7Q0FDcEMsQ0FBQztBQUVGOztHQUVHO0FBQ0gsTUFBTSxNQUFNLDRCQUE0QixHQUFHLENBQUMsT0FBTyxFQUFFLDRCQUE0QixLQUFLLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"resolve_tagging_secret_strategy.d.ts","sourceRoot":"","sources":["../../src/hooks/resolve_tagging_secret_strategy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAK/D;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAC7B;IACE,2GAA2G;IAC3G,IAAI,EAAE,2BAA2B,CAAC;CACnC,GACD;IACE;;;;OAIG;IACH,IAAI,EAAE,uBAAuB,CAAC;CAC/B,GACD;IACE,4GAA4G;IAC5G,IAAI,EAAE,iBAAiB,CAAC;CACzB,GACD;IACE;;;;OAIG;IACH,IAAI,EAAE,kBAAkB,CAAC;IACzB,sEAAsE;IACtE,MAAM,EAAE,KAAK,CAAC;CACf,CAAC;AAEN,iHAAiH;AACjH,eAAO,MAAM,+BAA+B,EAAE,qBAA6D,CAAC;AAE5G,mFAAmF;AACnF,MAAM,MAAM,4BAA4B,GAAG;IACzC,eAAe,EAAE,YAAY,CAAC;IAC9B;;OAEG;IACH,eAAe,EAAE,EAAE,CAAC;IACpB,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,EAAE,YAAY,CAAC;IACxB,YAAY,EAAE,oBAAoB,CAAC;CACpC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,4BAA4B,GAAG,CAAC,OAAO,EAAE,4BAA4B,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC"}

package/dest/hooks/resolve_tagging_secret_strategy.js

@@ -0,0 +1,3 @@
+/** The strategy PXE applies to both delivery modes when no `resolveTaggingSecretStrategy` hook is configured. */ export const DEFAULT_TAGGING_SECRET_STRATEGY = {
+    type: 'non-interactive-handshake'
+};

package/dest/job_coordinator/job_coordinator.d.ts

@@ -20,6 +20,15 @@ export interface StagedStore {
      * @param jobId - The job identifier
      */
     discardStaged(jobId: string): Promise<void>;
+    /**
+     * A store may have pending work that must finish before the job's staged writes are committed or discarded, yet
+     * commits run inside a transaction that cannot wait for it. Such stores implement this method: it is called before
+     * every commit and discard, outside the transaction. If settling fails, the commit is cancelled, but a discard
+     * proceeds.
+     *
+     * @param jobId - The job identifier
+     */
+    settle?(jobId: string): Promise<void>;
 }
 /**
  * JobCoordinator manages job lifecycle and provides crash resilience for PXE operations.
@@ -72,4 +81,4 @@ export declare class JobCoordinator {
      */
     hasJobInProgress(): boolean;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiam9iX2Nvb3JkaW5hdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvam9iX2Nvb3JkaW5hdG9yL2pvYl9jb29yZGluYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWUsS0FBSyxjQUFjLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDdkYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUV6RDs7R0FFRztBQUNILE1BQU0sV0FBVyxXQUFXO0lBQzFCLCtGQUErRjtJQUMvRixRQUFRLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUUzQjs7Ozs7T0FLRztJQUNILE1BQU0sQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUVyQzs7Ozs7T0FLRztJQUNILGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztDQUM3QztBQUVEOzs7Ozs7Ozs7Ozs7R0FZRztBQUNILHFCQUFhLGNBQWM7O0lBQ3pCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFTO0lBRTdCLDhCQUE4QjtJQUM5QixPQUFPLEVBQUUsaUJBQWlCLENBQUM7SUFLM0IsWUFBWSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsUUFBUSxDQUFDLEVBQUUsY0FBYyxFQUdoRTtJQUVEOzs7T0FHRztJQUNILGFBQWEsQ0FBQyxLQUFLLEVBQUUsV0FBVyxHQUFHLElBQUksQ0FNdEM7SUFFRDs7T0FFRztJQUNILGNBQWMsQ0FBQyxNQUFNLEVBQUUsV0FBVyxFQUFFLEdBQUcsSUFBSSxDQUkxQztJQUVEOzs7O09BSUc7SUFDSCxRQUFRLElBQUksTUFBTSxDQWFqQjtJQUVEOzs7O09BSUc7SUFDRyxTQUFTLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBbUI1QztJQUVEOzs7O09BSUc7SUFDRyxRQUFRLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBYzNDO0lBRUQ7O09BRUc7SUFDSCxnQkFBZ0IsSUFBSSxPQUFPLENBRTFCO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiam9iX2Nvb3JkaW5hdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvam9iX2Nvb3JkaW5hdG9yL2pvYl9jb29yZGluYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWUsS0FBSyxjQUFjLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFFdkYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUV6RDs7R0FFRztBQUNILE1BQU0sV0FBVyxXQUFXO0lBQzFCLCtGQUErRjtJQUMvRixRQUFRLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUUzQjs7Ozs7T0FLRztJQUNILE1BQU0sQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUVyQzs7Ozs7T0FLRztJQUNILGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUU1Qzs7Ozs7OztPQU9HO0lBQ0gsTUFBTSxDQUFDLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7Q0FDdkM7QUFFRDs7Ozs7Ozs7Ozs7O0dBWUc7QUFDSCxxQkFBYSxjQUFjOztJQUN6QixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBUztJQUU3Qiw4QkFBOEI7SUFDOUIsT0FBTyxFQUFFLGlCQUFpQixDQUFDO0lBSzNCLFlBQVksT0FBTyxFQUFFLGlCQUFpQixFQUFFLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFHaEU7SUFFRDs7O09BR0c7SUFDSCxhQUFhLENBQUMsS0FBSyxFQUFFLFdBQVcsR0FBRyxJQUFJLENBTXRDO0lBRUQ7O09BRUc7SUFDSCxjQUFjLENBQUMsTUFBTSxFQUFFLFdBQVcsRUFBRSxHQUFHLElBQUksQ0FJMUM7SUFFRDs7OztPQUlHO0lBQ0gsUUFBUSxJQUFJLE1BQU0sQ0FhakI7SUFFRDs7OztPQUlHO0lBQ0csU0FBUyxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXNCNUM7SUFFRDs7OztPQUlHO0lBQ0csUUFBUSxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQWdCM0M7SUFFRDs7T0FFRztJQUNILGdCQUFnQixJQUFJLE9BQU8sQ0FFMUI7Q0FlRiJ9

package/dest/job_coordinator/job_coordinator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"job_coordinator.d.ts","sourceRoot":"","sources":["../../src/job_coordinator/job_coordinator.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AACvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEzD;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,+FAA+F;IAC/F,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B;;;;;OAKG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAErC;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7C;AAED;;;;;;;;;;;;GAYG;AACH,qBAAa,cAAc;;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAE7B,8BAA8B;IAC9B,OAAO,EAAE,iBAAiB,CAAC;IAK3B,YAAY,OAAO,EAAE,iBAAiB,EAAE,QAAQ,CAAC,EAAE,cAAc,EAGhE;IAED;;;OAGG;IACH,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,CAMtC;IAED;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAI1C;IAED;;;;OAIG;IACH,QAAQ,IAAI,MAAM,CAajB;IAED;;;;OAIG;IACG,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmB5C;IAED;;;;OAIG;IACG,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAc3C;IAED;;OAEG;IACH,gBAAgB,IAAI,OAAO,CAE1B;CACF"}
+{"version":3,"file":"job_coordinator.d.ts","sourceRoot":"","sources":["../../src/job_coordinator/job_coordinator.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AAEvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEzD;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,+FAA+F;IAC/F,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B;;;;;OAKG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAErC;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5C;;;;;;;OAOG;IACH,MAAM,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED;;;;;;;;;;;;GAYG;AACH,qBAAa,cAAc;;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAE7B,8BAA8B;IAC9B,OAAO,EAAE,iBAAiB,CAAC;IAK3B,YAAY,OAAO,EAAE,iBAAiB,EAAE,QAAQ,CAAC,EAAE,cAAc,EAGhE;IAED;;;OAGG;IACH,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,CAMtC;IAED;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAI1C;IAED;;;;OAIG;IACH,QAAQ,IAAI,MAAM,CAajB;IAED;;;;OAIG;IACG,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsB5C;IAED;;;;OAIG;IACG,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB3C;IAED;;OAEG;IACH,gBAAgB,IAAI,OAAO,CAE1B;CAeF"}

package/dest/job_coordinator/job_coordinator.js

@@ -1,5 +1,6 @@
 import { randomBytes } from '@aztec/foundation/crypto/random';
 import { createLogger } from '@aztec/foundation/log';
+import { allToCompletion } from '@aztec/foundation/promise';
 /**
  * JobCoordinator manages job lifecycle and provides crash resilience for PXE operations.
  *
@@ -60,6 +61,10 @@ import { createLogger } from '@aztec/foundation/log';
             throw new Error(`Cannot commit job ${jobId}: no matching job in progress. ` + `Current job: ${this.#currentJobId ?? 'none'}`);
         }
         this.log.debug(`Committing job ${jobId}`);
+        // Settling must stay outside the transaction: it can take arbitrarily long.
+        await allToCompletion([
+            ...this.#stores.values()
+        ].map((store)=>store.settle?.(jobId)));
         // Commit all stores atomically in a single transaction.
         // Each store's commit is a no-op if it has no staged data (but that's up to each store to handle).
         await this.kvStore.transactionAsync(async ()=>{
@@ -80,6 +85,7 @@ import { createLogger } from '@aztec/foundation/log';
             this.log.warn(`Abort called for job ${jobId} but current job is ${this.#currentJobId ?? 'none'}`);
         }
         this.log.debug(`Aborting job ${jobId}`);
+        await this.#settleStoresLoggingFailures(jobId);
         for (const store of this.#stores.values()){
             await store.discardStaged(jobId);
         }
@@ -91,4 +97,17 @@ import { createLogger } from '@aztec/foundation/log';
    */ hasJobInProgress() {
         return this.#currentJobId !== undefined;
     }
+    /**
+   * Settles every store, logging failures instead of propagating them. The abort must run to completion no matter what,
+   * so a store that fails to settle cannot stop the others from discarding or mask the error that aborted the job.
+   */ async #settleStoresLoggingFailures(jobId) {
+        await allToCompletion([
+            ...this.#stores.values()
+        ].map((store)=>store.settle?.(jobId).catch((err)=>{
+                this.log.warn(`Store ${store.storeName} failed to settle while aborting job ${jobId}`, {
+                    jobId,
+                    err
+                });
+            })));
+    }
 }

package/dest/logs/log_service.d.ts

@@ -2,27 +2,38 @@ import type { Fr } from '@aztec/foundation/curves/bn254';
 import { type LoggerBindings } from '@aztec/foundation/log';
 import type { KeyStore } from '@aztec/key-store';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { L2TipsProvider } from '@aztec/stdlib/block';
 import type { AztecNode } from '@aztec/stdlib/interfaces/server';
+import { AppTaggingSecret } from '@aztec/stdlib/logs';
 import type { BlockHeader } from '@aztec/stdlib/tx';
-import type { LogRetrievalRequest } from '../contract_function_simulator/noir-structs/log_retrieval_request.js';
-import { LogRetrievalResponse } from '../contract_function_simulator/noir-structs/log_retrieval_response.js';
+import type { UInt64 } from '@aztec/stdlib/types';
+import { type LogRetrievalRequest } from '../contract_function_simulator/noir-structs/log_retrieval_request.js';
+import type { TxOnchainContext } from '../messages/tx_resolver_service.js';
 import { AddressStore } from '../storage/address_store/address_store.js';
-import type { CapsuleService } from '../storage/capsule_store/capsule_service.js';
 import type { RecipientTaggingStore } from '../storage/tagging_store/recipient_tagging_store.js';
-import type { SenderAddressBookStore } from '../storage/tagging_store/sender_address_book_store.js';
+import type { TaggingSecretSourcesStore } from '../storage/tagging_store/tagging_secret_sources_store.js';
 export declare class LogService {
     #private;
     private readonly aztecNode;
     private readonly anchorBlockHeader;
+    private readonly l2TipsStore;
     private readonly keyStore;
-    private readonly capsuleService;
     private readonly recipientTaggingStore;
-    private readonly senderAddressBookStore;
+    private readonly taggingSecretSourcesStore;
     private readonly addressStore;
+    private readonly scopes;
     private readonly jobId;
     private log;
-    constructor(aztecNode: AztecNode, anchorBlockHeader: BlockHeader, keyStore: KeyStore, capsuleService: CapsuleService, recipientTaggingStore: RecipientTaggingStore, senderAddressBookStore: SenderAddressBookStore, addressStore: AddressStore, jobId: string, bindings?: LoggerBindings);
-    fetchLogsByTag(contractAddress: AztecAddress, logRetrievalRequests: LogRetrievalRequest[]): Promise<(LogRetrievalResponse | null)[]>;
-    fetchTaggedLogs(contractAddress: AztecAddress, pendingTaggedLogArrayBaseSlot: Fr, recipient: AztecAddress): Promise<void>;
+    constructor(aztecNode: AztecNode, anchorBlockHeader: BlockHeader, l2TipsStore: L2TipsProvider, keyStore: KeyStore, recipientTaggingStore: RecipientTaggingStore, taggingSecretSourcesStore: TaggingSecretSourcesStore, addressStore: AddressStore, scopes: AztecAddress[], jobId: string, bindings?: LoggerBindings);
+    /** Fetches all logs matching each request's tag, returning an array of log arrays (one per request). */
+    fetchLogsByTag(contractAddress: AztecAddress, logRetrievalRequests: LogRetrievalRequest[]): Promise<RetrievedTaggedLog[][]>;
+    /** Fetches the pending tagged logs for a recipient across all its tagging secrets for the contract. */
+    fetchTaggedLogs(contractAddress: AztecAddress, recipient: AztecAddress, providedSecrets: AppTaggingSecret[]): Promise<RetrievedTaggedLog[]>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3NlcnZpY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2dzL2xvZ19zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sRUFBZSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUN2RixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNqRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFRakUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxzRUFBc0UsQ0FBQztBQUNoSCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx1RUFBdUUsQ0FBQztBQUM3RyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFDekUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDbEYsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxxREFBcUQsQ0FBQztBQUNqRyxPQUFPLEtBQUssRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVEQUF1RCxDQUFDO0FBT3BHLHFCQUFhLFVBQVU7O0lBSW5CLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGlCQUFpQjtJQUNsQyxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVE7SUFDekIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjO0lBQy9CLE9BQU8sQ0FBQyxRQUFRLENBQUMscUJBQXFCO0lBQ3RDLE9BQU8sQ0FBQyxRQUFRLENBQUMsc0JBQXNCO0lBQ3ZDLE9BQU8sQ0FBQyxRQUFRLENBQUMsWUFBWTtJQUM3QixPQUFPLENBQUMsUUFBUSxDQUFDLEtBQUs7SUFWeEIsT0FBTyxDQUFDLEdBQUcsQ0FBUztJQUVwQixZQUNtQixTQUFTLEVBQUUsU0FBUyxFQUNwQixpQkFBaUIsRUFBRSxXQUFXLEVBQzlCLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLGNBQWMsRUFBRSxjQUFjLEVBQzlCLHFCQUFxQixFQUFFLHFCQUFxQixFQUM1QyxzQkFBc0IsRUFBRSxzQkFBc0IsRUFDOUMsWUFBWSxFQUFFLFlBQVksRUFDMUIsS0FBSyxFQUFFLE1BQU0sRUFDOUIsUUFBUSxDQUFDLEVBQUUsY0FBYyxFQUcxQjtJQUVZLGNBQWMsQ0FDekIsZUFBZSxFQUFFLFlBQVksRUFDN0Isb0JBQW9CLEVBQUUsbUJBQW1CLEVBQUUsR0FDMUMsT0FBTyxDQUFDLENBQUMsb0JBQW9CLEdBQUcsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQXVCMUM7SUFxRFksZUFBZSxDQUMxQixlQUFlLEVBQUUsWUFBWSxFQUM3Qiw2QkFBNkIsRUFBRSxFQUFFLEVBQ2pDLFNBQVMsRUFBRSxZQUFZLGlCQStCeEI7Q0F1RUYifQ==
+/** A tagged log fetched from the node, together with the onchain context of the tx that emitted it. */
+export type RetrievedTaggedLog = TxOnchainContext & {
+    /** The raw log payload, tag included. */
+    logData: Fr[];
+    blockTimestamp: UInt64;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3NlcnZpY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2dzL2xvZ19zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpELE9BQU8sRUFBZSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUV2RixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNqRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFMUQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxFQUNMLGdCQUFnQixFQUtqQixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRWxELE9BQU8sRUFDTCxLQUFLLG1CQUFtQixFQUV6QixNQUFNLHNFQUFzRSxDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDM0UsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBRXpFLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0scURBQXFELENBQUM7QUFDakcsT0FBTyxLQUFLLEVBQUUseUJBQXlCLEVBQUUsTUFBTSwwREFBMEQsQ0FBQztBQWExRyxxQkFBYSxVQUFVOztJQUluQixPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVM7SUFDMUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUI7SUFDbEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxXQUFXO0lBQzVCLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUTtJQUN6QixPQUFPLENBQUMsUUFBUSxDQUFDLHFCQUFxQjtJQUN0QyxPQUFPLENBQUMsUUFBUSxDQUFDLHlCQUF5QjtJQUMxQyxPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBQ3ZCLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSztJQVh4QixPQUFPLENBQUMsR0FBRyxDQUFTO0lBRXBCLFlBQ21CLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsV0FBVyxFQUFFLGNBQWMsRUFDM0IsUUFBUSxFQUFFLFFBQVEsRUFDbEIscUJBQXFCLEVBQUUscUJBQXFCLEVBQzVDLHlCQUF5QixFQUFFLHlCQUF5QixFQUNwRCxZQUFZLEVBQUUsWUFBWSxFQUMxQixNQUFNLEVBQUUsWUFBWSxFQUFFLEVBQ3RCLEtBQUssRUFBRSxNQUFNLEVBQzlCLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFHMUI7SUFFRCx3R0FBd0c7SUFDM0YsY0FBYyxDQUN6QixlQUFlLEVBQUUsWUFBWSxFQUM3QixvQkFBb0IsRUFBRSxtQkFBbUIsRUFBRSxHQUMxQyxPQUFPLENBQUMsa0JBQWtCLEVBQUUsRUFBRSxDQUFDLENBc0JqQztJQXdHRCx1R0FBdUc7SUFDMUYsZUFBZSxDQUMxQixlQUFlLEVBQUUsWUFBWSxFQUM3QixTQUFTLEVBQUUsWUFBWSxFQUN2QixlQUFlLEVBQUUsZ0JBQWdCLEVBQUUsR0FDbEMsT0FBTyxDQUFDLGtCQUFrQixFQUFFLENBQUMsQ0E0Qi9CO0NBZ0VGO0FBRUQsdUdBQXVHO0FBQ3ZHLE1BQU0sTUFBTSxrQkFBa0IsR0FBRyxnQkFBZ0IsR0FBRztJQUNsRCx5Q0FBeUM7SUFDekMsT0FBTyxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBQ2QsY0FBYyxFQUFFLE1BQU0sQ0FBQztDQUN4QixDQUFDIn0=

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,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,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,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAQjE,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,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAClF,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,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,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,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,cAAc,EAC9B,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,CAC1B,eAAe,EAAE,YAAY,EAC7B,6BAA6B,EAAE,EAAE,EACjC,SAAS,EAAE,YAAY,iBA+BxB;CAuEF"}
+{"version":3,"file":"log_service.d.ts","sourceRoot":"","sources":["../../src/logs/log_service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AAEvF,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;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EACL,gBAAgB,EAKjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EACL,KAAK,mBAAmB,EAEzB,MAAM,sEAAsE,CAAC;AAC9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AAEzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AACjG,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0DAA0D,CAAC;AAa1G,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,yBAAyB;IAC1C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAXxB,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,yBAAyB,EAAE,yBAAyB,EACpD,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,YAAY,EAAE,EACtB,KAAK,EAAE,MAAM,EAC9B,QAAQ,CAAC,EAAE,cAAc,EAG1B;IAED,wGAAwG;IAC3F,cAAc,CACzB,eAAe,EAAE,YAAY,EAC7B,oBAAoB,EAAE,mBAAmB,EAAE,GAC1C,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAsBjC;IAwGD,uGAAuG;IAC1F,eAAe,CAC1B,eAAe,EAAE,YAAY,EAC7B,SAAS,EAAE,YAAY,EACvB,eAAe,EAAE,gBAAgB,EAAE,GAClC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CA4B/B;CAgEF;AAED,uGAAuG;AACvG,MAAM,MAAM,kBAAkB,GAAG,gBAAgB,GAAG;IAClD,yCAAyC;IACzC,OAAO,EAAE,EAAE,EAAE,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC"}

package/dest/logs/log_service.js

@@ -1,120 +1,217 @@
 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 { allToCompletion } from '@aztec/foundation/promise';
+import { AppTaggingSecret, AppTaggingSecretKind, SiloedTag, computeSharedTaggingSecret } from '@aztec/stdlib/logs';
+import { LogSource } from '../contract_function_simulator/noir-structs/log_retrieval_request.js';
+import { assertAllowedScope } from '../storage/allowed_scopes.js';
+import { getAllPrivateLogsByTags, getAllPublicLogsByTagsFromContract, logQueryAnchorOf, syncTaggedPrivateLogs } from '../tagging/index.js';
+const rangeKey = (fromBlock, toBlock)=>`${fromBlock ?? ''}-${toBlock ?? ''}`;
 export class LogService {
     aztecNode;
     anchorBlockHeader;
+    l2TipsStore;
     keyStore;
-    capsuleService;
     recipientTaggingStore;
-    senderAddressBookStore;
+    taggingSecretSourcesStore;
     addressStore;
+    scopes;
     jobId;
     log;
-    constructor(aztecNode, anchorBlockHeader, keyStore, capsuleService, recipientTaggingStore, senderAddressBookStore, addressStore, jobId, bindings){
+    constructor(aztecNode, anchorBlockHeader, l2TipsStore, keyStore, recipientTaggingStore, taggingSecretSourcesStore, addressStore, scopes, jobId, bindings){
         this.aztecNode = aztecNode;
         this.anchorBlockHeader = anchorBlockHeader;
+        this.l2TipsStore = l2TipsStore;
         this.keyStore = keyStore;
-        this.capsuleService = capsuleService;
         this.recipientTaggingStore = recipientTaggingStore;
-        this.senderAddressBookStore = senderAddressBookStore;
+        this.taggingSecretSourcesStore = taggingSecretSourcesStore;
         this.addressStore = addressStore;
+        this.scopes = scopes;
         this.jobId = jobId;
         this.log = createLogger('pxe:log_service', bindings);
     }
-    async fetchLogsByTag(contractAddress, logRetrievalRequests) {
+    /** Fetches all logs matching each request's tag, returning an array of log arrays (one per request). */ async fetchLogsByTag(contractAddress, logRetrievalRequests) {
         for (const request of logRetrievalRequests){
             if (!contractAddress.equals(request.contractAddress)) {
                 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 anchor = await logQueryAnchorOf(this.anchorBlockHeader);
+        const [publicLogsPerRequest, privateLogsPerRequest] = await allToCompletion([
+            this.#fetchPublicLogs(contractAddress, logRetrievalRequests, anchor),
+            this.#fetchPrivateLogs(logRetrievalRequests, anchor)
+        ]);
+        return logRetrievalRequests.map((_request, i)=>[
+                ...publicLogsPerRequest[i].map(LogService.#toRetrievedTaggedLog),
+                ...privateLogsPerRequest[i].map(LogService.#toRetrievedTaggedLog)
             ]);
-            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 #fetchPublicLogs(contractAddress, requests, anchor) {
+        const indices = requests.flatMap((r, i)=>r.source !== LogSource.PRIVATE ? [
+                i
+            ] : []);
+        if (indices.length === 0) {
+            return requests.map(()=>[]);
+        }
+        const resultsPerRequest = requests.map(()=>[]);
+        const groups = LogService.#groupByRange(indices.map((i)=>({
+                index: i,
+                request: requests[i]
+            })));
+        await allToCompletion(Array.from(groups.values()).map(async (group)=>{
+            const tags = group.entries.map((e)=>e.request.tag);
+            const results = await getAllPublicLogsByTagsFromContract(this.aztecNode, contractAddress, tags, anchor, {
+                fromBlock: group.fromBlock,
+                toBlock: group.toBlock,
+                includeEffects: true
+            });
+            group.entries.forEach((entry, i)=>{
+                resultsPerRequest[entry.index] = results[i];
+            });
         }));
+        return resultsPerRequest;
     }
-    async #getPublicLogByTag(tag, contractAddress) {
-        const anchorBlockHash = await this.anchorBlockHeader.hash();
-        const allLogsPerTag = await getAllPublicLogsByTagsFromContract(this.aztecNode, contractAddress, [
-            tag
-        ], anchorBlockHash);
-        const logsForTag = allLogsPerTag[0];
-        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.`);
+    async #fetchPrivateLogs(requests, anchor) {
+        const indices = requests.flatMap((r, i)=>r.source !== LogSource.PUBLIC ? [
+                i
+            ] : []);
+        if (indices.length === 0) {
+            return requests.map(()=>[]);
         }
-        const scopedLog = logsForTag[0];
-        return new LogRetrievalResponse(scopedLog.logData.slice(1), scopedLog.txHash, scopedLog.noteHashes, scopedLog.firstNullifier);
+        const resultsPerRequest = requests.map(()=>[]);
+        const groups = LogService.#groupByRange(indices.map((i)=>({
+                index: i,
+                request: requests[i]
+            })));
+        await allToCompletion(Array.from(groups.values()).map(async (group)=>{
+            const siloedTags = await allToCompletion(group.entries.map((e)=>SiloedTag.computeFromTagAndApp(e.request.tag, e.request.contractAddress)));
+            const results = await getAllPrivateLogsByTags(this.aztecNode, siloedTags, anchor, {
+                fromBlock: group.fromBlock,
+                toBlock: group.toBlock,
+                includeEffects: true
+            });
+            group.entries.forEach((entry, i)=>{
+                resultsPerRequest[entry.index] = results[i];
+            });
+        }));
+        return resultsPerRequest;
     }
-    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.`);
+    /**
+   * Groups requests by their (fromBlock, toBlock) range so each distinct range becomes a single node call with
+   * the range pushed down into the query (no in-memory filter).
+   */ static #groupByRange(entries) {
+        const groups = new Map();
+        for (const entry of entries){
+            const fromBlock = entry.request.fromBlock.value;
+            const toBlock = entry.request.toBlock.value;
+            const key = rangeKey(fromBlock, toBlock);
+            const existing = groups.get(key);
+            if (existing) {
+                existing.entries.push(entry);
+            } else {
+                groups.set(key, {
+                    fromBlock,
+                    toBlock,
+                    entries: [
+                        entry
+                    ]
+                });
+            }
         }
-        const scopedLog = logsForTag[0];
-        return new LogRetrievalResponse(scopedLog.logData.slice(1), scopedLog.txHash, scopedLog.noteHashes, scopedLog.firstNullifier);
+        return groups;
     }
-    async fetchTaggedLogs(contractAddress, pendingTaggedLogArrayBaseSlot, 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();
-        // 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, this.jobId)));
-        // Flatten all logs from all secrets
-        const allLogs = logArrays.flat();
-        if (allLogs.length > 0) {
-            await this.#storePendingTaggedLogs(contractAddress, pendingTaggedLogArrayBaseSlot, recipient, allLogs);
+    static #toRetrievedTaggedLog(log) {
+        // includeEffects: true was used, so noteHashes and nullifiers are populated. Every tx has at least one nullifier
+        // (the first nullifier derived from the tx hash); empty here would indicate a buggy node.
+        const noteHashes = log.noteHashes;
+        const nullifiers = log.nullifiers;
+        if (nullifiers.length === 0) {
+            throw new Error(`Log for tx ${log.txHash} returned no nullifiers from the node`);
         }
+        return {
+            logData: log.logData,
+            txHash: log.txHash,
+            noteHashes,
+            nullifiers,
+            blockNumber: log.blockNumber,
+            blockTimestamp: log.blockTimestamp,
+            blockHash: log.blockHash,
+            // The log index and the tx receipt both count the tx's position in `block.body.txEffects`, so this is the same
+            // index a receipt reports. Note ordering depends on the two staying in agreement.
+            txIndexInBlock: log.txIndexWithinBlock
+        };
+    }
+    /** Fetches the pending tagged logs for a recipient across all its tagging secrets for the contract. */ async fetchTaggedLogs(contractAddress, recipient, providedSecrets) {
+        assertAllowedScope(recipient, this.scopes);
+        this.log.verbose(`Fetching tagged logs for contract ${contractAddress.toString()} and recipient ${recipient.toString()}`);
+        const l2Tips = await this.l2TipsStore.getL2Tips();
+        // Secrets PXE can enumerate for this recipient (senders via ECDH + pre-shared store secrets), plus any the app
+        // supplies explicitly for secrets PXE cannot enumerate itself (e.g. handshake-derived ones). The latter arrive
+        // already computed and are searched even when the recipient's account is unknown locally, since they need no ECDH.
+        const combinedSecrets = [
+            ...await this.#getPointDerivedSecrets(contractAddress, recipient),
+            ...providedSecrets
+        ];
+        // These sources can overlap (a sender that is also a PXE account, or a pre-shared secret that coincides with a
+        // sender-derived one), so we deduplicate the combined set.
+        const secrets = Array.from(new Map(combinedSecrets.map((secret)=>[
+                secret.toString(),
+                secret
+            ])).values());
+        const logs = await syncTaggedPrivateLogs(secrets, this.aztecNode, this.recipientTaggingStore, this.anchorBlockHeader, l2Tips.finalized.block.number, this.jobId);
+        return logs.map((log)=>LogService.#toRetrievedTaggedLog(log));
     }
-    async #getSecretsForSenders(contractAddress, recipient) {
+    /**
+   * Computes the tagging secrets PXE can enumerate for a recipient: one per known sender (via ECDH) plus any
+   * pre-shared secrets registered directly for the recipient. Each registered secret is scanned under the tag
+   * streams its kind can back. Deriving the sender-based secrets requires the recipient's address preimage and keys,
+   * so returns an empty array when those are unavailable. App-supplied secrets (e.g. derived from discovered
+   * handshakes) are handled separately by the caller and do not go through here.
+   */ async #getPointDerivedSecrets(contractAddress, recipient) {
         const recipientCompleteAddress = await this.addressStore.getCompleteAddress(recipient);
-        if (!recipientCompleteAddress) {
+        if (!recipientCompleteAddress || !await this.keyStore.hasAccount(recipient)) {
+            this.log.warn(`Skipping sender-derived tag retrieval for ${recipient.toString()} due to unknown address preimage`);
             return [];
         }
         const recipientIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(recipient);
+        const [senderPoints, registeredSecrets] = await allToCompletion([
+            this.#getSecretsForSenders(recipientCompleteAddress, recipientIvsk),
+            this.taggingSecretSourcesStore.getSharedSecretsForRecipient(recipient)
+        ]);
+        return allToCompletion([
+            ...senderPoints.map((secret)=>AppTaggingSecret.computeDirectional(secret, contractAddress, recipient)),
+            ...registeredSecrets.flatMap(({ kind, secret })=>{
+                switch(kind){
+                    case 'arbitrary-secret':
+                        return [
+                            AppTaggingSecret.computeDirectional(secret, contractAddress, recipient)
+                        ];
+                    case 'handshake':
+                        // A handshake-backed sender tags messages with the bare app-siloed secret, one tag domain per delivery
+                        // mode.
+                        return [
+                            AppTaggingSecret.computeAppSiloed(secret, contractAddress, AppTaggingSecretKind.UNCONSTRAINED),
+                            AppTaggingSecret.computeAppSiloed(secret, contractAddress, AppTaggingSecretKind.CONSTRAINED)
+                        ];
+                }
+            })
+        ]);
+    }
+    async #getSecretsForSenders(recipientCompleteAddress, recipientIvsk) {
         // We implicitly add all PXE accounts as senders, this helps us decrypt tags on notes that we send to ourselves
-        // (recipient = us, sender = us)
+        // (recipient = us, sender = us).
         const allSenders = [
-            ...await this.senderAddressBookStore.getSenders(),
+            ...await this.taggingSecretSourcesStore.getSenders(),
             ...await this.keyStore.getAccounts()
         ];
-        // We deduplicate the senders by adding them to a set and then converting the set back to an array
-        const deduplicatedSenders = Array.from(new Set(allSenders.map((sender)=>sender.toString()))).map((sender)=>AztecAddress.fromString(sender));
-        return Promise.all(deduplicatedSenders.map(async (sender)=>{
-            const secret = await ExtendedDirectionalAppTaggingSecret.compute(recipientCompleteAddress, recipientIvsk, sender, contractAddress, recipient);
-            if (!secret) {
-                // Note that all senders originate from either the SenderAddressBookStore or the KeyStore.
-                // TODO(F-512): make sure we actually prevent registering invalid senders.
+        return allToCompletion(allSenders.map(async (sender)=>{
+            const taggingSecretPoint = await computeSharedTaggingSecret(recipientCompleteAddress, recipientIvsk, sender);
+            if (!taggingSecretPoint) {
+                // Note that all senders originate from either the TaggingSecretSourcesStore or the KeyStore.
                 throw new Error(`Failed to compute a tagging secret for sender ${sender} - this implies this is an invalid address, which should not happen as they have been previously registered in PXE.`);
             }
-            return secret;
+            return taggingSecretPoint;
         }));
     }
-    #storePendingTaggedLogs(contractAddress, capsuleArrayBaseSlot, recipient, privateLogs) {
-        // Build all pending tagged logs from the scoped logs
-        const pendingTaggedLogs = privateLogs.map((scopedLog)=>{
-            const pendingTaggedLog = new PendingTaggedLog(scopedLog.logData, scopedLog.txHash, scopedLog.noteHashes, scopedLog.firstNullifier);
-            return pendingTaggedLog.toFields();
-        });
-        // TODO: This looks like it could belong more at the oracle interface level
-        return this.capsuleService.appendToCapsuleArray(contractAddress, capsuleArrayBaseSlot, pendingTaggedLogs, this.jobId, recipient);
-    }
 }

package/dest/messages/tx_resolver_service.d.ts

@@ -0,0 +1,28 @@
+import type { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import type { BlockHash } from '@aztec/stdlib/block';
+import type { AztecNode } from '@aztec/stdlib/interfaces/server';
+import { TxHash } from '@aztec/stdlib/tx';
+/** Resolves transaction hashes into their on-chain context (note hashes, nullifiers, and mined position). */
+export declare class TxResolverService {
+    private readonly aztecNode;
+    constructor(aztecNode: AztecNode);
+    /**
+     * Resolves a list of tx hashes into their on-chain context.
+     *
+     * For each tx hash, looks up the corresponding tx effect and extracts its note hashes and nullifiers, and the
+     * position it was mined at. Returns `null` for tx hashes that are zero, not yet available, or in blocks beyond the
+     * anchor block.
+     */
+    resolveTxs(txHashes: Fr[], anchorBlockNumber: number): Promise<(TxOnchainContext | null)[]>;
+}
+/** The onchain context of a tx: the position it was mined at, and the effects it produced. */
+export type TxOnchainContext = {
+    txHash: TxHash;
+    noteHashes: Fr[];
+    nullifiers: Fr[];
+    blockNumber: BlockNumber;
+    blockHash: BlockHash;
+    txIndexInBlock: number;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcmVzb2x2ZXJfc2VydmljZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21lc3NhZ2VzL3R4X3Jlc29sdmVyX3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFbkUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sRUFBd0IsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFaEUsNkdBQTZHO0FBQzdHLHFCQUFhLGlCQUFpQjtJQUNoQixPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVM7SUFBdEMsWUFBNkIsU0FBUyxFQUFFLFNBQVMsRUFBSTtJQUVyRDs7Ozs7O09BTUc7SUFDRyxVQUFVLENBQUMsUUFBUSxFQUFFLEVBQUUsRUFBRSxFQUFFLGlCQUFpQixFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsQ0FBQyxnQkFBZ0IsR0FBRyxJQUFJLENBQUMsRUFBRSxDQUFDLENBa0RoRztDQUNGO0FBRUQsOEZBQThGO0FBQzlGLE1BQU0sTUFBTSxnQkFBZ0IsR0FBRztJQUM3QixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsVUFBVSxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBQ2pCLFVBQVUsRUFBRSxFQUFFLEVBQUUsQ0FBQztJQUNqQixXQUFXLEVBQUUsV0FBVyxDQUFDO0lBQ3pCLFNBQVMsRUFBRSxTQUFTLENBQUM7SUFDckIsY0FBYyxFQUFFLE1BQU0sQ0FBQztDQUN4QixDQUFDIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"tx_resolver_service.d.ts","sourceRoot":"","sources":["../../src/messages/tx_resolver_service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAwB,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEhE,6GAA6G;AAC7G,qBAAa,iBAAiB;IAChB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAtC,YAA6B,SAAS,EAAE,SAAS,EAAI;IAErD;;;;;;OAMG;IACG,UAAU,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,gBAAgB,GAAG,IAAI,CAAC,EAAE,CAAC,CAkDhG;CACF;AAED,8FAA8F;AAC9F,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,EAAE,EAAE,CAAC;IACjB,UAAU,EAAE,EAAE,EAAE,CAAC;IACjB,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC"}