@aztec/pxe 0.0.1-commit.f2ce05ee → 0.0.1-commit.f5a9928

package/dest/logs/log_service.js

@@ -1,123 +1,217 @@
 import { createLogger } from '@aztec/foundation/log';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { DirectionalAppTaggingSecret, 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;
-    capsuleStore;
     recipientTaggingStore;
-    senderAddressBookStore;
+    taggingSecretSourcesStore;
     addressStore;
+    scopes;
     jobId;
     log;
-    constructor(aztecNode, anchorBlockHeader, keyStore, capsuleStore, 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.capsuleStore = capsuleStore;
         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 bulkRetrieveLogs(logRetrievalRequests) {
-        return await Promise.all(logRetrievalRequests.map(async (request)=>{
-            const [publicLog, privateLog] = await Promise.all([
-                this.#getPublicLogByTag(request.tag, request.contractAddress),
-                this.#getPrivateLogByTag(await SiloedTag.compute(request.tag, request.contractAddress))
-            ]);
-            if (publicLog !== null && privateLog !== null) {
-                throw new Error(`Found both a public and private log when searching for tag ${request.tag} from contract ${request.contractAddress}`);
+    /** 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 publicLog ?? privateLog;
-        }));
+        }
+        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)
+            ]);
     }
-    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) {
-            // TODO(#11627): handle this case
-            throw new Error(`Got ${logsForTag.length} logs for tag ${tag} and contract ${contractAddress.toString()}. getPublicLogByTag currently only supports a single log per tag`);
+    async #fetchPublicLogs(contractAddress, requests, anchor) {
+        const indices = requests.flatMap((r, i)=>r.source !== LogSource.PRIVATE ? [
+                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 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 #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) {
-            // TODO(#11627): handle this case
-            throw new Error(`Got ${logsForTag.length} logs for tag ${siloedTag}. getPrivateLogByTag currently only supports a single log per tag`);
+    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 fetchTaggedLogs(contractAddress, pendingTaggedLogArrayBaseSlot, scopes) {
-        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();
-        // Determine recipients: use scopes if provided, otherwise get all accounts
-        const recipients = scopes && scopes.length > 0 ? scopes : await this.keyStore.getAccounts();
-        // For each recipient, fetch secrets, load logs, and store them.
-        // We run these per-recipient tasks in parallel so that logs are loaded for all recipients concurrently.
-        await Promise.all(recipients.map(async (recipient)=>{
-            // 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, contractAddress, this.aztecNode, this.recipientTaggingStore, anchorBlockNumber, anchorBlockHash, this.jobId)));
-            // Flatten all logs from all secrets
-            const allLogs = logArrays.flat();
-            // Store the logs for this recipient
-            if (allLogs.length > 0) {
-                await this.#storePendingTaggedLogs(contractAddress, pendingTaggedLogArrayBaseSlot, recipient, allLogs);
+    /**
+   * 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
+                    ]
+                });
             }
-        }));
+        }
+        return groups;
     }
-    async #getSecretsForSenders(contractAddress, recipient) {
-        const recipientCompleteAddress = await this.#getCompleteAddress(recipient);
+    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));
+    }
+    /**
+   * 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 || !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((sender)=>{
-            return DirectionalAppTaggingSecret.compute(recipientCompleteAddress, recipientIvsk, sender, contractAddress, recipient);
+        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 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, recipient);
-            return pendingTaggedLog.toFields();
-        });
-        // TODO: This looks like it could belong more at the oracle interface level
-        return this.capsuleStore.appendToCapsuleArray(contractAddress, capsuleArrayBaseSlot, pendingTaggedLogs, this.jobId);
-    }
-    async #getCompleteAddress(account) {
-        const completeAddress = await this.addressStore.getCompleteAddress(account);
-        if (!completeAddress) {
-            throw new Error(`No public key registered for address ${account}.
-				Register it by calling pxe.addAccount(...).\nSee docs for context: https://docs.aztec.network/developers/resources/debugging/aztecnr-errors#simulation-error-no-public-key-registered-for-address-0x0-register-it-by-calling-pxeregisterrecipient-or-pxeregisteraccount`);
-        }
-        return completeAddress;
-    }
 }

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"}

package/dest/messages/tx_resolver_service.js

@@ -0,0 +1,62 @@
+import { uniqueBy } from '@aztec/foundation/collection';
+import { allToCompletion } from '@aztec/foundation/promise';
+import { TxHash } from '@aztec/stdlib/tx';
+/** Resolves transaction hashes into their on-chain context (note hashes, nullifiers, and mined position). */ export class TxResolverService {
+    aztecNode;
+    constructor(aztecNode){
+        this.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.
+   */ async resolveTxs(txHashes, anchorBlockNumber) {
+        const nonZeroTxHashes = txHashes.filter((h)=>!h.isZero()).map((h)=>TxHash.fromField(h));
+        const uniqueTxHashes = uniqueBy(nonZeroTxHashes, (h)=>h.toString());
+        const fetched = await allToCompletion(uniqueTxHashes.map((h)=>this.aztecNode.getTxReceipt(h, {
+                includeTxEffect: true
+            })));
+        const txEffects = new Map(uniqueTxHashes.map((h, i)=>{
+            const receipt = fetched[i];
+            if (!receipt.isMined() || !receipt.txEffect) {
+                return [
+                    h.toString(),
+                    undefined
+                ];
+            }
+            return [
+                h.toString(),
+                {
+                    data: receipt.txEffect,
+                    l2BlockNumber: receipt.blockNumber,
+                    l2BlockHash: receipt.blockHash,
+                    txIndexInBlock: receipt.txIndexInBlock,
+                    slotNumber: receipt.slotNumber
+                }
+            ];
+        }).filter((entry)=>entry[1] !== undefined));
+        return txHashes.map((txHashField)=>{
+            const txHash = TxHash.fromField(txHashField);
+            const txEffect = txEffects.get(txHash.toString());
+            if (!txEffect || txEffect.l2BlockNumber > anchorBlockNumber) {
+                return null;
+            }
+            // Every tx has at least one nullifier (the first nullifier derived from the tx hash). Hitting this condition
+            // would mean a buggy node, but since consumers rely on nullifiers[0], the defensive check does no harm.
+            const data = txEffect.data;
+            if (data.nullifiers.length === 0) {
+                throw new Error(`Tx effect for ${txHash} has no nullifiers`);
+            }
+            return {
+                txHash: data.txHash,
+                noteHashes: data.noteHashes,
+                nullifiers: data.nullifiers,
+                blockNumber: txEffect.l2BlockNumber,
+                blockHash: txEffect.l2BlockHash,
+                txIndexInBlock: txEffect.txIndexInBlock
+            };
+        });
+    }
+}

package/dest/node/benchmarked_node.d.ts

@@ -0,0 +1,20 @@
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import type { NodeStats } from '@aztec/stdlib/tx';
+export interface Recording {
+    /** Closes the recording and returns what it saw. Reads served after this are not recorded. */
+    stop(): NodeStats;
+}
+/** An {@link AztecNode} wrapper that can report the reads it serves. */
+export interface BenchmarkedAztecNode extends AztecNode {
+    /**
+     * Opens a recording of the reads this wrapper serves, until {@link Recording.stop}. Recordings are independent, so
+     * several may run at once: one measuring a whole run sees the same reads as one measuring a single operation.
+     *
+     * Nothing is measured while none is open, which is what keeps a long-lived wrapper from accumulating a run's worth
+     * of timings nobody asked for.
+     */
+    startRecording(): Recording;
+}
+/** Wraps `node` so that the reads it answers can be recorded. */
+export declare function withRecording(node: AztecNode): BenchmarkedAztecNode;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmVuY2htYXJrZWRfbm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL25vZGUvYmVuY2htYXJrZWRfbm9kZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQWlCbEQsTUFBTSxXQUFXLFNBQVM7SUFDeEIsOEZBQThGO0lBQzlGLElBQUksSUFBSSxTQUFTLENBQUM7Q0FDbkI7QUFFRCx3RUFBd0U7QUFDeEUsTUFBTSxXQUFXLG9CQUFxQixTQUFRLFNBQVM7SUFDckQ7Ozs7OztPQU1HO0lBQ0gsY0FBYyxJQUFJLFNBQVMsQ0FBQztDQUM3QjtBQUVELGlFQUFpRTtBQUNqRSx3QkFBZ0IsYUFBYSxDQUFDLElBQUksRUFBRSxTQUFTLEdBQUcsb0JBQW9CLENBNEZuRSJ9

package/dest/node/benchmarked_node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"benchmarked_node.d.ts","sourceRoot":"","sources":["../../src/node/benchmarked_node.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAiBlD,MAAM,WAAW,SAAS;IACxB,8FAA8F;IAC9F,IAAI,IAAI,SAAS,CAAC;CACnB;AAED,wEAAwE;AACxE,MAAM,WAAW,oBAAqB,SAAQ,SAAS;IACrD;;;;;;OAMG;IACH,cAAc,IAAI,SAAS,CAAC;CAC7B;AAED,iEAAiE;AACjE,wBAAgB,aAAa,CAAC,IAAI,EAAE,SAAS,GAAG,oBAAoB,CA4FnE"}

package/dest/node/benchmarked_node.js

@@ -0,0 +1,94 @@
+import { Timer } from '@aztec/foundation/timer';
+/** Wraps `node` so that the reads it answers can be recorded. */ export function withRecording(node) {
+    // The stats of every recording currently open
+    const open = new Set();
+    // Round trip tracking
+    let inFlightCount = 0;
+    let currentRoundTripTimer = null;
+    let currentRoundTripMethods = [];
+    return new Proxy(node, {
+        get (target, prop) {
+            if (prop === 'startRecording') {
+                return ()=>{
+                    const stats = {
+                        perMethod: {},
+                        roundTrips: {
+                            roundTrips: 0,
+                            totalBlockingTime: 0,
+                            roundTripDurations: [],
+                            roundTripMethods: []
+                        }
+                    };
+                    open.add(stats);
+                    return {
+                        stop: ()=>{
+                            open.delete(stats);
+                            return stats;
+                        }
+                    };
+                };
+            }
+            const value = Reflect.get(target, prop);
+            if (typeof value !== 'function' || typeof prop !== 'string') {
+                return value;
+            }
+            return (...args)=>{
+                // With no recording open there is nobody to report to, so the read is left untimed.
+                if (open.size === 0) {
+                    return value.apply(target, args);
+                }
+                // Start of a new round trip batch?
+                if (inFlightCount === 0) {
+                    currentRoundTripTimer = new Timer();
+                    currentRoundTripMethods = [];
+                }
+                inFlightCount++;
+                currentRoundTripMethods.push(prop);
+                const callTimer = new Timer();
+                const result = value.apply(target, args);
+                // Handle completion - called when the call finishes (after Promise resolves)
+                const handleCompletion = ()=>{
+                    const callTime = callTimer.ms();
+                    for (const stats of open){
+                        timesFor(stats, prop).push(callTime);
+                    }
+                    inFlightCount--;
+                    // End of round trip batch - all concurrent calls completed
+                    if (inFlightCount === 0 && currentRoundTripTimer) {
+                        const roundTripTime = currentRoundTripTimer.ms();
+                        for (const { roundTrips } of open){
+                            roundTrips.roundTrips++;
+                            roundTrips.totalBlockingTime += roundTripTime;
+                            roundTrips.roundTripDurations.push(roundTripTime);
+                            roundTrips.roundTripMethods.push(currentRoundTripMethods);
+                        }
+                        currentRoundTripTimer = null;
+                        currentRoundTripMethods = [];
+                    }
+                };
+                // If the result is a Promise, chain the completion handler
+                if (isThenable(result)) {
+                    return result.then((resolved)=>{
+                        handleCompletion();
+                        return resolved;
+                    }, (error)=>{
+                        handleCompletion();
+                        throw error;
+                    });
+                } else {
+                    // Synchronous method - handle completion immediately
+                    handleCompletion();
+                    return result;
+                }
+            };
+        }
+    });
+}
+/** The times `stats` holds for `method`, added on first use. */ function timesFor(stats, method) {
+    return (stats.perMethod[method] ??= {
+        times: []
+    }).times;
+}
+/** Whether completion can be chained onto `value` with `.then`, which a promise from any implementation allows. */ function isThenable(value) {
+    return typeof value === 'object' && value !== null && 'then' in value && typeof value.then === 'function';
+}

package/dest/node/caching_aztec_node.d.ts

@@ -0,0 +1,24 @@
+import type { AztecNode } from '@aztec/stdlib/interfaces/server';
+import { type BenchmarkedAztecNode } from './benchmarked_node.js';
+/**
+ * An {@link AztecNode} wrapper that serves repeated reads from a cache it owns.
+ */
+export interface CachingAztecNode extends BenchmarkedAztecNode {
+    /** Clears the read cache. The owner calls this periodically to bound memory. Cached entries never go stale. */
+    wipeCache(): void;
+}
+/**
+ * Wraps `node`, serving repeated reads from a cache the wrapper owns. Consumers share cached reads by sharing the
+ * wrapper.
+ *
+ * Only hash-pinned reads are cached. A block hash names immutable content, so the same call can never correctly answer
+ * differently, and even an `undefined` witness or leaf index is kept as a non-membership fact. That makes the wrapper
+ * safe for any consumer, whatever its anchor block. Uncached methods, and reads that name a block any other way (see
+ * {@link hashReferenceOf}), pass straight through. A few entries below opt out even when hash-pinned, where the answer
+ * can still change, and the tag queries opt in only once the request also stops short of blocks yet to be produced
+ * (see {@link hasImmutableAnswer}).
+ *
+ * Wiping (see {@link CachingAztecNode.wipeCache}) bounds memory. Correctness does not depend on it.
+ */
+export declare function withCache(node: AztecNode): CachingAztecNode;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGluZ19henRlY19ub2RlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbm9kZS9jYWNoaW5nX2F6dGVjX25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFZakUsT0FBTyxFQUFFLEtBQUssb0JBQW9CLEVBQWlCLE1BQU0sdUJBQXVCLENBQUM7QUFFakY7O0dBRUc7QUFDSCxNQUFNLFdBQVcsZ0JBQWlCLFNBQVEsb0JBQW9CO0lBQzVELCtHQUErRztJQUMvRyxTQUFTLElBQUksSUFBSSxDQUFDO0NBQ25CO0FBRUQ7Ozs7Ozs7Ozs7OztHQVlHO0FBQ0gsd0JBQWdCLFNBQVMsQ0FBQyxJQUFJLEVBQUUsU0FBUyxHQUFHLGdCQUFnQixDQXdKM0QifQ==

package/dest/node/caching_aztec_node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"caching_aztec_node.d.ts","sourceRoot":"","sources":["../../src/node/caching_aztec_node.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAYjE,OAAO,EAAE,KAAK,oBAAoB,EAAiB,MAAM,uBAAuB,CAAC;AAEjF;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,oBAAoB;IAC5D,+GAA+G;IAC/G,SAAS,IAAI,IAAI,CAAC;CACnB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,SAAS,GAAG,gBAAgB,CAwJ3D"}