@aztec/pxe 0.0.0-test.0 → 0.0.1-commit.03f7ef2

package/dest/tagging/recipient_sync/utils/load_logs_for_range.js

@@ -0,0 +1,29 @@
+import { SiloedTag, Tag } from '@aztec/stdlib/logs';
+/**
+ * Gets private logs with their corresponding block timestamps and tagging indexes for the given index range, `app` and
+ * `secret`. At most load logs from blocks up to and including `anchorBlockNumber`. `start` is inclusive and `end` is
+ * exclusive.
+ */ export async function loadLogsForRange(secret, app, aztecNode, start, end, anchorBlockNumber) {
+    // Derive tags for the window
+    const preTags = Array(end - start).fill(0).map((_, i)=>({
+            secret,
+            index: start + i
+        }));
+    const siloedTags = await Promise.all(preTags.map((preTag)=>Tag.compute(preTag))).then((tags)=>Promise.all(tags.map((tag)=>SiloedTag.compute(tag, app))));
+    const logs = await aztecNode.getPrivateLogsByTags(siloedTags);
+    // Pair logs with their corresponding tagging indexes
+    const logsWithIndexes = [];
+    for(let i = 0; i < logs.length; i++){
+        const logsForTag = logs[i];
+        const taggingIndex = preTags[i].index;
+        for (const log of logsForTag){
+            if (log.blockNumber <= anchorBlockNumber) {
+                logsWithIndexes.push({
+                    log,
+                    taggingIndex
+                });
+            }
+        }
+    }
+    return logsWithIndexes;
+}

package/dest/tagging/sync/sync_sender_tagging_indexes.d.ts

@@ -0,0 +1,21 @@
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { AztecNode } from '@aztec/stdlib/interfaces/server';
+import type { DirectionalAppTaggingSecret } from '@aztec/stdlib/logs';
+import type { SenderTaggingDataProvider } from '../../storage/tagging_data_provider/sender_tagging_data_provider.js';
+export declare const UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN = 95;
+/**
+ * Syncs tagging indexes. This function needs to be called whenever a private log is being sent.
+ *
+ * @param secret - The secret that's unique for (sender, recipient, contract) tuple while the direction of
+ * sender -> recipient matters.
+ * @param app - The address of the contract that the logs are tagged for. Needs to be provided because we perform
+ * second round of siloing in this function which is necessary because kernels do it as well (they silo first field
+ * of the private log which corresponds to the tag).
+ * @remarks When syncing the indexes as sender we don't care about the log contents - we only care about the highest
+ * pending and highest finalized indexes as that guides the next index choice when sending a log. The next index choice
+ * is simply the highest pending index plus one (or finalized if pending is undefined).
+ * @dev This function looks for new indexes, adds them to pending, then it checks status of each pending index and
+ * updates its status accordingly.
+ */
+export declare function syncSenderTaggingIndexes(secret: DirectionalAppTaggingSecret, app: AztecAddress, aztecNode: AztecNode, taggingDataProvider: SenderTaggingDataProvider): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luY19zZW5kZXJfdGFnZ2luZ19pbmRleGVzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdGFnZ2luZy9zeW5jL3N5bmNfc2VuZGVyX3RhZ2dpbmdfaW5kZXhlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSwyQkFBMkIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXRFLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLE1BQU0scUVBQXFFLENBQUM7QUFtQnJILGVBQU8sTUFBTSxzQ0FBc0MsS0FBSyxDQUFDO0FBRXpEOzs7Ozs7Ozs7Ozs7O0dBYUc7QUFDSCx3QkFBc0Isd0JBQXdCLENBQzVDLE1BQU0sRUFBRSwyQkFBMkIsRUFDbkMsR0FBRyxFQUFFLFlBQVksRUFDakIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsbUJBQW1CLEVBQUUseUJBQXlCLEdBQzdDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FtRWYifQ==

package/dest/tagging/sync/sync_sender_tagging_indexes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync_sender_tagging_indexes.d.ts","sourceRoot":"","sources":["../../../src/tagging/sync/sync_sender_tagging_indexes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEtE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qEAAqE,CAAC;AAmBrH,eAAO,MAAM,sCAAsC,KAAK,CAAC;AAEzD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,2BAA2B,EACnC,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,SAAS,EACpB,mBAAmB,EAAE,yBAAyB,GAC7C,OAAO,CAAC,IAAI,CAAC,CAmEf"}

package/dest/tagging/sync/sync_sender_tagging_indexes.js

@@ -0,0 +1,89 @@
+import { getStatusChangeOfPending } from './utils/get_status_change_of_pending.js';
+import { loadAndStoreNewTaggingIndexes } from './utils/load_and_store_new_tagging_indexes.js';
+// This window has to be as large as the largest expected number of logs emitted in a tx for a given directional app
+// tagging secret. If we get more tag indexes consumed than this window, an error is thrown in `PXE::proveTx` function.
+// This is set to a larger value than MAX_PRIVATE_LOGS_PER_TX (currently 64) because there could be more than
+// MAX_PRIVATE_LOGS_PER_TX indexes consumed in case the logs are squashed. This happens when the log contains a note
+// and the note is nullified in the same tx.
+//
+// Rationale for value 95:
+// - The `e2e_pending_note_hashes_contract` test's "Should handle overflowing the kernel data structures in nested
+//   calls" test case hits 95 tagging indexes emitted in a single transaction. This test creates and nullifies many
+//   notes recursively to test kernel reset circuit behavior, which causes logs to be squashed but still consume
+//   tagging indexes during the sync process. Since this is testing MAX_PRIVATE_LOGS_PER_TX overflow we can be
+//   reasonably certain that this value is large enough for standard use cases.
+// - This value is below MAX_RPC_LEN (100) which is the limit for array parameters in the JSON RPC schema for
+//   `getLogsByTags`. Any test that would perform sync over JSON RPC (not by having access to the Aztec node instance
+//   directly) would error out if that maximum was hit (docs_examples.test.ts is an example of this).
+export const UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN = 95;
+/**
+ * Syncs tagging indexes. This function needs to be called whenever a private log is being sent.
+ *
+ * @param secret - The secret that's unique for (sender, recipient, contract) tuple while the direction of
+ * sender -> recipient matters.
+ * @param app - The address of the contract that the logs are tagged for. Needs to be provided because we perform
+ * second round of siloing in this function which is necessary because kernels do it as well (they silo first field
+ * of the private log which corresponds to the tag).
+ * @remarks When syncing the indexes as sender we don't care about the log contents - we only care about the highest
+ * pending and highest finalized indexes as that guides the next index choice when sending a log. The next index choice
+ * is simply the highest pending index plus one (or finalized if pending is undefined).
+ * @dev This function looks for new indexes, adds them to pending, then it checks status of each pending index and
+ * updates its status accordingly.
+ */ export async function syncSenderTaggingIndexes(secret, app, aztecNode, taggingDataProvider) {
+    // # Explanation of how syncing works
+    //
+    // When choosing an index, we select: highest pending index + 1 (or highest finalized index + 1 if no pending).
+    // If the chosen index is more than WINDOW_LEN from the highest finalized index, we throw an error. By having this
+    // hard limit we give a guarantee to a recipient that he doesn't need to look further than WINDOW_LEN ahead of the
+    // highest finalized index.
+    //
+    // This function synchronizes the finalized and pending indexes by iteratively querying the node for a window of
+    // indexes at a time, storing all those indexes as pending, and then checking the status of each pending index to
+    // update its finalization status accordingly. If we stumble upon a window with no indexes, we stop the loop.
+    //
+    // Stopping at that point is safe because of the limit described above - there can never be an index that is more
+    // than WINDOW_LEN from the highest finalized index.
+    //
+    // # Note on performance
+    // Each window advance requires two queries (logs + tx status). For example, syncing indexes 0–500 with a window of
+    // 100 takes at least 10 round trips (5 windows × 2 queries).
+    const finalizedIndex = await taggingDataProvider.getLastFinalizedIndex(secret);
+    let start = finalizedIndex === undefined ? 0 : finalizedIndex + 1;
+    let end = start + UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN;
+    let previousFinalizedIndex = finalizedIndex;
+    let newFinalizedIndex = undefined;
+    while(true){
+        // Load and store indexes for the current window. These indexes may already exist in the database if txs using
+        // them were previously sent from this PXE. Any duplicates are handled by the tagging data provider.
+        await loadAndStoreNewTaggingIndexes(secret, app, start, end, aztecNode, taggingDataProvider);
+        // Retrieve all indexes within the current window from storage and update their status accordingly.
+        const pendingTxHashes = await taggingDataProvider.getTxHashesOfPendingIndexes(secret, start, end);
+        if (pendingTxHashes.length === 0) {
+            break;
+        }
+        const { txHashesToFinalize, txHashesToDrop } = await getStatusChangeOfPending(pendingTxHashes, aztecNode);
+        await taggingDataProvider.dropPendingIndexes(txHashesToDrop);
+        await taggingDataProvider.finalizePendingIndexes(txHashesToFinalize);
+        // We check if the finalized index has been updated.
+        newFinalizedIndex = await taggingDataProvider.getLastFinalizedIndex(secret);
+        if (previousFinalizedIndex !== newFinalizedIndex) {
+            // A new finalized index was found, so we'll run the loop again. For example:
+            // - Previous finalized index: 10
+            // - New finalized index: 13
+            // - Window length: 10
+            //
+            // In the last iteration, we processed indexes 11-20. To avoid reprocessing the same logs,
+            // we'll only look at the new indexes 21-23:
+            //
+            //    Previous window: [11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
+            //    New window:                                             [21, 22, 23]
+            const previousEnd = end;
+            // Add 1 because `end` is exclusive and the known finalized index is not included in the window.
+            end = newFinalizedIndex + UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN + 1;
+            start = previousEnd;
+            previousFinalizedIndex = newFinalizedIndex;
+        } else {
+            break;
+        }
+    }
+}

package/dest/tagging/sync/utils/get_status_change_of_pending.d.ts

@@ -0,0 +1,11 @@
+import type { AztecNode } from '@aztec/stdlib/interfaces/server';
+import { TxHash } from '@aztec/stdlib/tx';
+/**
+ * Based on receipts obtained from `aztecNode` returns which pending transactions changed their status to finalized or
+ * dropped.
+ */
+export declare function getStatusChangeOfPending(pending: TxHash[], aztecNode: AztecNode): Promise<{
+    txHashesToFinalize: TxHash[];
+    txHashesToDrop: TxHash[];
+}>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X3N0YXR1c19jaGFuZ2Vfb2ZfcGVuZGluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3RhZ2dpbmcvc3luYy91dGlscy9nZXRfc3RhdHVzX2NoYW5nZV9vZl9wZW5kaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sRUFBRSxNQUFNLEVBQVksTUFBTSxrQkFBa0IsQ0FBQztBQUVwRDs7O0dBR0c7QUFDSCx3QkFBc0Isd0JBQXdCLENBQzVDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFDakIsU0FBUyxFQUFFLFNBQVMsR0FDbkIsT0FBTyxDQUFDO0lBQUUsa0JBQWtCLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFBQyxjQUFjLEVBQUUsTUFBTSxFQUFFLENBQUE7Q0FBRSxDQUFDLENBaUNyRSJ9

package/dest/tagging/sync/utils/get_status_change_of_pending.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get_status_change_of_pending.d.ts","sourceRoot":"","sources":["../../../../src/tagging/sync/utils/get_status_change_of_pending.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAY,MAAM,kBAAkB,CAAC;AAEpD;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,MAAM,EAAE,EACjB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC;IAAE,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAiCrE"}

package/dest/tagging/sync/utils/get_status_change_of_pending.js

@@ -0,0 +1,32 @@
+import { TxStatus } from '@aztec/stdlib/tx';
+/**
+ * Based on receipts obtained from `aztecNode` returns which pending transactions changed their status to finalized or
+ * dropped.
+ */ export async function getStatusChangeOfPending(pending, aztecNode) {
+    // Get receipts for all pending tx hashes and the finalized block number.
+    const [receipts, { finalized }] = await Promise.all([
+        Promise.all(pending.map((pendingTxHash)=>aztecNode.getTxReceipt(pendingTxHash))),
+        aztecNode.getL2Tips()
+    ]);
+    const txHashesToFinalize = [];
+    const txHashesToDrop = [];
+    for(let i = 0; i < receipts.length; i++){
+        const receipt = receipts[i];
+        const txHash = pending[i];
+        if (receipt.status === TxStatus.SUCCESS && receipt.blockNumber && receipt.blockNumber <= finalized.number) {
+            // Tx has been included in a block and the corresponding block is finalized --> we mark the indexes as
+            // finalized.
+            txHashesToFinalize.push(txHash);
+        } else if (receipt.status === TxStatus.DROPPED || receipt.status === TxStatus.APP_LOGIC_REVERTED || receipt.status === TxStatus.TEARDOWN_REVERTED || receipt.status === TxStatus.BOTH_REVERTED) {
+            // Tx was dropped or reverted --> we drop the corresponding pending indexes.
+            // TODO(#17615): Don't drop pending indexes corresponding to non-revertible phases.
+            txHashesToDrop.push(txHash);
+        } else {
+        // Tx is still pending or the corresponding block is not yet finalized --> we don't do anything.
+        }
+    }
+    return {
+        txHashesToFinalize,
+        txHashesToDrop
+    };
+}

package/dest/tagging/sync/utils/load_and_store_new_tagging_indexes.d.ts

@@ -0,0 +1,18 @@
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { AztecNode } from '@aztec/stdlib/interfaces/server';
+import type { DirectionalAppTaggingSecret } from '@aztec/stdlib/logs';
+import type { SenderTaggingDataProvider } from '../../../storage/tagging_data_provider/sender_tagging_data_provider.js';
+/**
+ * Loads tagging indexes from the Aztec node and stores them in the tagging data provider.
+ * @remarks This function is one of two places by which a pending index can get to the tagging data provider. The other
+ * place is when a tx is being sent from this PXE.
+ * @param secret - The directional app tagging secret that's unique for (sender, recipient, contract) tuple.
+ * @param app - The address of the contract that the logs are tagged for. Used for siloing tags to match
+ * kernel circuit behavior.
+ * @param start - The starting index (inclusive) of the window to process.
+ * @param end - The ending index (exclusive) of the window to process.
+ * @param aztecNode - The Aztec node instance to query for logs.
+ * @param taggingDataProvider - The data provider to store pending indexes.
+ */
+export declare function loadAndStoreNewTaggingIndexes(secret: DirectionalAppTaggingSecret, app: AztecAddress, start: number, end: number, aztecNode: AztecNode, taggingDataProvider: SenderTaggingDataProvider): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9hZF9hbmRfc3RvcmVfbmV3X3RhZ2dpbmdfaW5kZXhlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3RhZ2dpbmcvc3luYy91dGlscy9sb2FkX2FuZF9zdG9yZV9uZXdfdGFnZ2luZ19pbmRleGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFVLE1BQU0sb0JBQW9CLENBQUM7QUFJOUUsT0FBTyxLQUFLLEVBQUUseUJBQXlCLEVBQUUsTUFBTSx3RUFBd0UsQ0FBQztBQUV4SDs7Ozs7Ozs7Ozs7R0FXRztBQUNILHdCQUFzQiw2QkFBNkIsQ0FDakQsTUFBTSxFQUFFLDJCQUEyQixFQUNuQyxHQUFHLEVBQUUsWUFBWSxFQUNqQixLQUFLLEVBQUUsTUFBTSxFQUNiLEdBQUcsRUFBRSxNQUFNLEVBQ1gsU0FBUyxFQUFFLFNBQVMsRUFDcEIsbUJBQW1CLEVBQUUseUJBQXlCLGlCQWtCL0MifQ==

package/dest/tagging/sync/utils/load_and_store_new_tagging_indexes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"load_and_store_new_tagging_indexes.d.ts","sourceRoot":"","sources":["../../../../src/tagging/sync/utils/load_and_store_new_tagging_indexes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,2BAA2B,EAAU,MAAM,oBAAoB,CAAC;AAI9E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wEAAwE,CAAC;AAExH;;;;;;;;;;;GAWG;AACH,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,2BAA2B,EACnC,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,SAAS,EACpB,mBAAmB,EAAE,yBAAyB,iBAkB/C"}

package/dest/tagging/sync/utils/load_and_store_new_tagging_indexes.js

@@ -0,0 +1,55 @@
+import { SiloedTag, Tag } from '@aztec/stdlib/logs';
+import { TxHash } from '@aztec/stdlib/tx';
+/**
+ * Loads tagging indexes from the Aztec node and stores them in the tagging data provider.
+ * @remarks This function is one of two places by which a pending index can get to the tagging data provider. The other
+ * place is when a tx is being sent from this PXE.
+ * @param secret - The directional app tagging secret that's unique for (sender, recipient, contract) tuple.
+ * @param app - The address of the contract that the logs are tagged for. Used for siloing tags to match
+ * kernel circuit behavior.
+ * @param start - The starting index (inclusive) of the window to process.
+ * @param end - The ending index (exclusive) of the window to process.
+ * @param aztecNode - The Aztec node instance to query for logs.
+ * @param taggingDataProvider - The data provider to store pending indexes.
+ */ export async function loadAndStoreNewTaggingIndexes(secret, app, start, end, aztecNode, taggingDataProvider) {
+    // We compute the tags for the current window of indexes
+    const preTagsForWindow = Array(end - start).fill(0).map((_, i)=>({
+            secret,
+            index: start + i
+        }));
+    const siloedTagsForWindow = await Promise.all(preTagsForWindow.map(async (preTag)=>SiloedTag.compute(await Tag.compute(preTag), app)));
+    const txsForTags = await getTxsContainingTags(siloedTagsForWindow, aztecNode);
+    const highestIndexMap = getTxHighestIndexMap(txsForTags, preTagsForWindow);
+    // Now we iterate over the map, reconstruct the preTags and tx hash and store them in the db.
+    for (const [txHashStr, highestIndex] of highestIndexMap.entries()){
+        const txHash = TxHash.fromString(txHashStr);
+        await taggingDataProvider.storePendingIndexes([
+            {
+                secret,
+                index: highestIndex
+            }
+        ], txHash);
+    }
+}
+// Returns txs that used the given tags. A tag might have been used in multiple txs and for this reason we return
+// an array for each tag.
+async function getTxsContainingTags(tags, aztecNode) {
+    const allLogs = await aztecNode.getPrivateLogsByTags(tags);
+    return allLogs.map((logs)=>logs.map((log)=>log.txHash));
+}
+// Returns a map of txHash to the highest index for that txHash.
+function getTxHighestIndexMap(txHashesForTags, preTagsForWindow) {
+    if (txHashesForTags.length !== preTagsForWindow.length) {
+        throw new Error(`Number of tx hashes arrays does not match number of pre-tags. ${txHashesForTags.length} !== ${preTagsForWindow.length}`);
+    }
+    const highestIndexMap = new Map();
+    for(let i = 0; i < txHashesForTags.length; i++){
+        const taggingIndex = preTagsForWindow[i].index;
+        const txHashesForTag = txHashesForTags[i];
+        for (const txHash of txHashesForTag){
+            const key = txHash.toString();
+            highestIndexMap.set(key, Math.max(highestIndexMap.get(key) ?? 0, taggingIndex));
+        }
+    }
+    return highestIndexMap;
+}

package/dest/tagging/utils.d.ts

@@ -0,0 +1,18 @@
+import type { DirectionalAppTaggingSecret, PreTag } from '@aztec/stdlib/logs';
+export declare function getPreTagsForTheWindow(secretsAndWindows: {
+    secret: DirectionalAppTaggingSecret;
+    leftMostIndex: number;
+    rightMostIndex: number;
+}[]): PreTag[];
+/**
+ * Creates a map from directional app tagging secret to initial index.
+ * @param preTags - The pre-tags to get the initial indexes map from.
+ * @returns The map from directional app tagging secret to initial index.
+ */
+export declare function getInitialIndexesMap(preTags: {
+    secret: DirectionalAppTaggingSecret;
+    index: number | undefined;
+}[]): {
+    [k: string]: number;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90YWdnaW5nL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSTlFLHdCQUFnQixzQkFBc0IsQ0FDcEMsaUJBQWlCLEVBQUU7SUFBRSxNQUFNLEVBQUUsMkJBQTJCLENBQUM7SUFBQyxhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQUMsY0FBYyxFQUFFLE1BQU0sQ0FBQTtDQUFFLEVBQUUsR0FDMUcsTUFBTSxFQUFFLENBUVY7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQWdCLG9CQUFvQixDQUFDLE9BQU8sRUFBRTtJQUFFLE1BQU0sRUFBRSwyQkFBMkIsQ0FBQztJQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFBO0NBQUUsRUFBRSxHQUFHO0lBQ25ILENBQUMsQ0FBQyxFQUFFLE1BQU0sR0FBRyxNQUFNLENBQUM7Q0FDckIsQ0FRQSJ9

package/dest/tagging/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/tagging/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAI9E,wBAAgB,sBAAsB,CACpC,iBAAiB,EAAE;IAAE,MAAM,EAAE,2BAA2B,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,EAAE,GAC1G,MAAM,EAAE,CAQV;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE;IAAE,MAAM,EAAE,2BAA2B,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,GAAG;IACnH,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAQA"}

package/dest/tagging/utils.js

@@ -0,0 +1,25 @@
+// TODO(#17775): If this does not get dropped when implementing the linked issue make this return tags instead. This
+// will move some complexity from syncTaggedLogs to here.
+export function getPreTagsForTheWindow(secretsAndWindows) {
+    const secrets = [];
+    for (const secretAndWindow of secretsAndWindows){
+        for(let i = secretAndWindow.leftMostIndex; i <= secretAndWindow.rightMostIndex; i++){
+            secrets.push({
+                secret: secretAndWindow.secret,
+                index: i
+            });
+        }
+    }
+    return secrets;
+}
+/**
+ * Creates a map from directional app tagging secret to initial index.
+ * @param preTags - The pre-tags to get the initial indexes map from.
+ * @returns The map from directional app tagging secret to initial index.
+ */ export function getInitialIndexesMap(preTags) {
+    const initialIndexes = {};
+    for (const preTag of preTags){
+        initialIndexes[preTag.secret.toString()] = preTag.index ?? 0;
+    }
+    return initialIndexes;
+}

package/dest/tree_membership/tree_membership_service.d.ts

@@ -0,0 +1,52 @@
+import type { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { SiblingPath } from '@aztec/foundation/trees';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { BlockParameter } from '@aztec/stdlib/block';
+import type { AztecNode } from '@aztec/stdlib/interfaces/server';
+import { MerkleTreeId, NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
+import type { AnchorBlockDataProvider } from '../storage/anchor_block_data_provider/anchor_block_data_provider.js';
+export declare class TreeMembershipService {
+    #private;
+    private readonly aztecNode;
+    private readonly anchorBlockDataProvider;
+    constructor(aztecNode: AztecNode, anchorBlockDataProvider: AnchorBlockDataProvider);
+    /**
+     * Gets the index of a nullifier in the nullifier tree.
+     * @returns - The index of the nullifier. Undefined if it does not exist in the tree.
+     */
+    getNullifierIndex(nullifier: Fr): Promise<bigint | undefined>;
+    /**
+     * Fetches the index and sibling path of a leaf at a given block from a given tree.
+     * @param blockNumber - The block number at which to get the membership witness.
+     * @param treeId - Id of the tree to get the sibling path from.
+     * @param leafValue - The leaf value
+     * @returns The index and sibling path concatenated [index, sibling_path]
+     */
+    getMembershipWitness(blockNumber: BlockParameter, treeId: MerkleTreeId, leafValue: Fr): Promise<Fr[]>;
+    /**
+     * Returns a low nullifier membership witness for a given nullifier at a given block.
+     * @param blockNumber - The block number at which to get the index.
+     * @param nullifier - Nullifier we try to find the low nullifier witness for.
+     * @returns The low nullifier membership witness (if found).
+     * @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
+     * list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
+     * we are trying to prove non-inclusion for.
+     */
+    getLowNullifierMembershipWitness(blockNumber: BlockParameter, nullifier: Fr): Promise<NullifierMembershipWitness | undefined>;
+    /**
+     * Returns a witness for a given slot of the public data tree at a given block.
+     * @param blockNumber - The block number at which to get the witness.
+     * @param leafSlot - The slot of the public data in the public data tree.
+     */
+    getPublicDataWitness(blockNumber: BlockParameter, leafSlot: Fr): Promise<PublicDataWitness | undefined>;
+    /**
+     * Looks for the L1 to L2 membership witness of a message at the Aztec node, given its hash.
+     * @param contractAddress - Address of a contract by which the message was emitted.
+     * @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages.
+     * The message nullifier is computed locally, so the secret is not sent to the node.
+     * @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
+     */
+    getL1ToL2MembershipWitness(contractAddress: AztecAddress, messageHash: Fr, secret: Fr): Promise<[bigint, SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>]>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJlZV9tZW1iZXJzaGlwX3NlcnZpY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90cmVlX21lbWJlcnNoaXAvdHJlZV9tZW1iZXJzaGlwX3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRSxPQUFPLEVBQUUsWUFBWSxFQUFFLDBCQUEwQixFQUFFLGlCQUFpQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFbEcsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxxRUFBcUUsQ0FBQztBQUVuSCxxQkFBYSxxQkFBcUI7O0lBRTlCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLHVCQUF1QjtJQUYxQyxZQUNtQixTQUFTLEVBQUUsU0FBUyxFQUNwQix1QkFBdUIsRUFBRSx1QkFBdUIsRUFDL0Q7SUFFSjs7O09BR0c7SUFDSSxpQkFBaUIsQ0FBQyxTQUFTLEVBQUUsRUFBRSwrQkFFckM7SUFFRDs7Ozs7O09BTUc7SUFDVSxvQkFBb0IsQ0FBQyxXQUFXLEVBQUUsY0FBYyxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FNakg7SUFFRDs7Ozs7Ozs7T0FRRztJQUNVLGdDQUFnQyxDQUMzQyxXQUFXLEVBQUUsY0FBYyxFQUMzQixTQUFTLEVBQUUsRUFBRSxHQUNaLE9BQU8sQ0FBQywwQkFBMEIsR0FBRyxTQUFTLENBQUMsQ0FNakQ7SUFFRDs7OztPQUlHO0lBQ1Usb0JBQW9CLENBQUMsV0FBVyxFQUFFLGNBQWMsRUFBRSxRQUFRLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxpQkFBaUIsR0FBRyxTQUFTLENBQUMsQ0FNbkg7SUFFRDs7Ozs7O09BTUc7SUFDSSwwQkFBMEIsQ0FDL0IsZUFBZSxFQUFFLFlBQVksRUFDN0IsV0FBVyxFQUFFLEVBQUUsRUFDZixNQUFNLEVBQUUsRUFBRSxHQUNULE9BQU8sQ0FBQyxDQUFDLE1BQU0sRUFBRSxXQUFXLENBQUMsT0FBTyx3QkFBd0IsQ0FBQyxDQUFDLENBQUMsQ0FFakU7Q0F5QkYifQ==

package/dest/tree_membership/tree_membership_service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree_membership_service.d.ts","sourceRoot":"","sources":["../../src/tree_membership/tree_membership_service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAElG,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qEAAqE,CAAC;AAEnH,qBAAa,qBAAqB;;IAE9B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IAF1C,YACmB,SAAS,EAAE,SAAS,EACpB,uBAAuB,EAAE,uBAAuB,EAC/D;IAEJ;;;OAGG;IACI,iBAAiB,CAAC,SAAS,EAAE,EAAE,+BAErC;IAED;;;;;;OAMG;IACU,oBAAoB,CAAC,WAAW,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAMjH;IAED;;;;;;;;OAQG;IACU,gCAAgC,CAC3C,WAAW,EAAE,cAAc,EAC3B,SAAS,EAAE,EAAE,GACZ,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC,CAMjD;IAED;;;;OAIG;IACU,oBAAoB,CAAC,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAMnH;IAED;;;;;;OAMG;IACI,0BAA0B,CAC/B,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC,CAEjE;CAyBF"}

package/dest/tree_membership/tree_membership_service.js

@@ -0,0 +1,84 @@
+import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+export class TreeMembershipService {
+    aztecNode;
+    anchorBlockDataProvider;
+    constructor(aztecNode, anchorBlockDataProvider){
+        this.aztecNode = aztecNode;
+        this.anchorBlockDataProvider = anchorBlockDataProvider;
+    }
+    /**
+   * Gets the index of a nullifier in the nullifier tree.
+   * @returns - The index of the nullifier. Undefined if it does not exist in the tree.
+   */ getNullifierIndex(nullifier) {
+        return this.#findLeafIndex('latest', MerkleTreeId.NULLIFIER_TREE, nullifier);
+    }
+    /**
+   * Fetches the index and sibling path of a leaf at a given block from a given tree.
+   * @param blockNumber - The block number at which to get the membership witness.
+   * @param treeId - Id of the tree to get the sibling path from.
+   * @param leafValue - The leaf value
+   * @returns The index and sibling path concatenated [index, sibling_path]
+   */ async getMembershipWitness(blockNumber, treeId, leafValue) {
+        const witness = await this.#tryGetMembershipWitness(blockNumber, treeId, leafValue);
+        if (!witness) {
+            throw new Error(`Leaf value ${leafValue} not found in tree ${MerkleTreeId[treeId]} at block ${blockNumber}`);
+        }
+        return witness;
+    }
+    /**
+   * Returns a low nullifier membership witness for a given nullifier at a given block.
+   * @param blockNumber - The block number at which to get the index.
+   * @param nullifier - Nullifier we try to find the low nullifier witness for.
+   * @returns The low nullifier membership witness (if found).
+   * @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
+   * list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
+   * we are trying to prove non-inclusion for.
+   */ async getLowNullifierMembershipWitness(blockNumber, nullifier) {
+        const anchorBlockNumber = (await this.anchorBlockDataProvider.getBlockHeader()).getBlockNumber();
+        if (blockNumber !== 'latest' && blockNumber > anchorBlockNumber) {
+            throw new Error(`Block number ${blockNumber} is higher than current block ${anchorBlockNumber}`);
+        }
+        return this.aztecNode.getLowNullifierMembershipWitness(blockNumber, nullifier);
+    }
+    /**
+   * Returns a witness for a given slot of the public data tree at a given block.
+   * @param blockNumber - The block number at which to get the witness.
+   * @param leafSlot - The slot of the public data in the public data tree.
+   */ async getPublicDataWitness(blockNumber, leafSlot) {
+        const anchorBlockNumber = (await this.anchorBlockDataProvider.getBlockHeader()).getBlockNumber();
+        if (blockNumber !== 'latest' && blockNumber > anchorBlockNumber) {
+            throw new Error(`Block number ${blockNumber} is higher than current block ${anchorBlockNumber}`);
+        }
+        return await this.aztecNode.getPublicDataWitness(blockNumber, leafSlot);
+    }
+    /**
+   * Looks for the L1 to L2 membership witness of a message at the Aztec node, given its hash.
+   * @param contractAddress - Address of a contract by which the message was emitted.
+   * @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages.
+   * The message nullifier is computed locally, so the secret is not sent to the node.
+   * @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
+   */ getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
+        return getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret);
+    }
+    async #tryGetMembershipWitness(blockNumber, treeId, value) {
+        switch(treeId){
+            case MerkleTreeId.NULLIFIER_TREE:
+                return (await this.aztecNode.getNullifierMembershipWitness(blockNumber, value))?.withoutPreimage().toFields();
+            case MerkleTreeId.NOTE_HASH_TREE:
+                return (await this.aztecNode.getNoteHashMembershipWitness(blockNumber, value))?.toFields();
+            case MerkleTreeId.PUBLIC_DATA_TREE:
+                return (await this.aztecNode.getPublicDataWitness(blockNumber, value))?.withoutPreimage().toFields();
+            case MerkleTreeId.ARCHIVE:
+                return (await this.aztecNode.getArchiveMembershipWitness(blockNumber, value))?.toFields();
+            default:
+                throw new Error('Not implemented');
+        }
+    }
+    async #findLeafIndex(blockNumber, treeId, leafValue) {
+        const [leafIndex] = await this.aztecNode.findLeavesIndexes(blockNumber, treeId, [
+            leafValue
+        ]);
+        return leafIndex?.data;
+    }
+}

package/package.json

@@ -1,24 +1,22 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.0.0-test.0",
+  "version": "0.0.1-commit.03f7ef2",
   "type": "module",
   "exports": {
     "./server": "./dest/entrypoints/server/index.js",
     "./client/lazy": "./dest/entrypoints/client/lazy/index.js",
     "./client/bundle": "./dest/entrypoints/client/bundle/index.js",
-    "./config": "./dest/config/index.js",
-    "./testing": "./dest/test/pxe_test_suite.js"
+    "./simulator": "./dest/contract_function_simulator/index.js",
+    "./config": "./dest/config/index.js"
   },
   "bin": "./dest/bin/index.js",
   "scripts": {
-    "build": "yarn clean && yarn generate && tsc -b",
-    "build:dev": "tsc -b --watch",
+    "build": "yarn clean && yarn generate && tsgo -b",
+    "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo ./src/config/package_info.ts",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
-    "start": "LOG_LEVEL=${LOG_LEVEL:-debug} && node ./dest/bin/index.js",
-    "generate": "node ./scripts/generate_package_info.js"
+    "generate": "node ./scripts/generate_package_info.js",
+    "check_oracle_version": "node ./dest/bin/check_oracle_version.js"
   },
   "inherits": [
     "../package.common.json",
@@ -56,42 +54,47 @@
     "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
+    ],
+    "testEnvironment": "../../foundation/src/jest/env.mjs",
+    "setupFilesAfterEnv": [
+      "../../foundation/src/jest/setupAfterEnv.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.0.0-test.0",
-    "@aztec/bb.js": "0.0.0-test.0",
-    "@aztec/builder": "0.0.0-test.0",
-    "@aztec/constants": "0.0.0-test.0",
-    "@aztec/ethereum": "0.0.0-test.0",
-    "@aztec/foundation": "0.0.0-test.0",
-    "@aztec/key-store": "0.0.0-test.0",
-    "@aztec/kv-store": "0.0.0-test.0",
-    "@aztec/noir-protocol-circuits-types": "0.0.0-test.0",
-    "@aztec/protocol-contracts": "0.0.0-test.0",
-    "@aztec/simulator": "0.0.0-test.0",
-    "@aztec/stdlib": "0.0.0-test.0",
-    "@msgpack/msgpack": "^3.0.0-beta2",
-    "koa": "^2.14.2",
-    "koa-router": "^12.0.0",
+    "@aztec/bb-prover": "0.0.1-commit.03f7ef2",
+    "@aztec/bb.js": "0.0.1-commit.03f7ef2",
+    "@aztec/builder": "0.0.1-commit.03f7ef2",
+    "@aztec/constants": "0.0.1-commit.03f7ef2",
+    "@aztec/ethereum": "0.0.1-commit.03f7ef2",
+    "@aztec/foundation": "0.0.1-commit.03f7ef2",
+    "@aztec/key-store": "0.0.1-commit.03f7ef2",
+    "@aztec/kv-store": "0.0.1-commit.03f7ef2",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.03f7ef2",
+    "@aztec/noir-types": "0.0.1-commit.03f7ef2",
+    "@aztec/protocol-contracts": "0.0.1-commit.03f7ef2",
+    "@aztec/simulator": "0.0.1-commit.03f7ef2",
+    "@aztec/stdlib": "0.0.1-commit.03f7ef2",
+    "koa": "^2.16.1",
+    "koa-router": "^13.1.1",
     "lodash.omit": "^4.5.0",
     "sha3": "^2.1.4",
     "tslib": "^2.4.0",
-    "viem": "2.22.8",
-    "@aztec/noir-types": "0.0.0-test.0"
+    "viem": "npm:@aztec/viem@2.38.2"
   },
   "devDependencies": {
-    "@aztec/noir-contracts.js": "0.0.0-test.0",
-    "@jest/globals": "^29.5.0",
-    "@types/jest": "^29.5.0",
+    "@aztec/merkle-tree": "0.0.1-commit.03f7ef2",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.03f7ef2",
+    "@jest/globals": "^30.0.0",
+    "@types/jest": "^30.0.0",
     "@types/lodash.omit": "^4.5.7",
     "@types/lodash.times": "^4.3.9",
-    "@types/node": "^18.7.23",
-    "jest": "^29.5.0",
-    "jest-mock-extended": "^3.0.3",
+    "@types/node": "^22.15.17",
+    "@typescript/native-preview": "7.0.0-dev.20251126.1",
+    "jest": "^30.0.0",
+    "jest-mock-extended": "^4.0.0",
     "lodash.times": "^4.3.2",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "files": [
     "dest",
@@ -100,6 +103,6 @@
   ],
   "types": "./dest/index.d.ts",
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   }
 }