@aztec/pxe 0.67.0 → 0.67.1-devnet

package/dest/simulator_oracle/index.js

@@ -1,13 +1,14 @@
-var _SimulatorOracle_instances, _SimulatorOracle_calculateTaggingSecret, _SimulatorOracle_getAppTaggingSecretsForContacts, _SimulatorOracle_decryptTaggedLogs;
+var _SimulatorOracle_instances, _SimulatorOracle_calculateAppTaggingSecret, _SimulatorOracle_getIndexedTaggingSecretsForContacts, _SimulatorOracle_decryptTaggedLogs;
 import { __classPrivateFieldGet } from "tslib";
 import { L1NotePayload, MerkleTreeId, getNonNullifiedL1ToL2MessageWitness, } from '@aztec/circuit-types';
-import { Fr, IndexedTaggingSecret, PrivateLog, computeAddressSecret, computeTaggingSecret, } from '@aztec/circuits.js';
+import { Fr, IndexedTaggingSecret, PrivateLog, computeAddressSecret, computeTaggingSecretPoint, } from '@aztec/circuits.js';
 import { getFunctionArtifact } from '@aztec/foundation/abi';
 import { poseidon2Hash } from '@aztec/foundation/crypto';
 import { createLogger } from '@aztec/foundation/log';
 import { MessageLoadOracleInputs } from '@aztec/simulator/acvm';
 import { produceNoteDaos } from '../note_decryption_utils/produce_note_daos.js';
 import { getAcirSimulator } from '../simulator/index.js';
+import { getIndexedTaggingSecretsForTheWindow, getInitialIndexesMap } from './tagging_utils.js';
 /**
  * A data oracle that provides information needed for simulating a transaction.
  */
@@ -177,27 +178,27 @@ export class SimulatorOracle {
         return this.db.getContactAddresses();
     }
     /**
-     * Returns the tagging secret for a given sender and recipient pair. For this to work, the ivpsk_m of the sender must be known.
+     * Returns the tagging secret for a given sender and recipient pair. For this to work, the ivsk_m of the sender must be known.
      * Includes the next index to be used used for tagging with this secret.
      * @param contractAddress - The contract address to silo the secret for
      * @param sender - The address sending the note
      * @param recipient - The address receiving the note
-     * @returns A siloed tagging secret that can be used to tag notes.
+     * @returns An indexed tagging secret that can be used to tag notes.
      */
-    async getAppTaggingSecretAsSender(contractAddress, sender, recipient) {
+    async getIndexedTaggingSecretAsSender(contractAddress, sender, recipient) {
         await this.syncTaggedLogsAsSender(contractAddress, sender, recipient);
-        const secret = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_calculateTaggingSecret).call(this, contractAddress, sender, recipient);
-        const [index] = await this.db.getTaggingSecretsIndexesAsSender([secret]);
-        return new IndexedTaggingSecret(secret, index);
+        const appTaggingSecret = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_calculateAppTaggingSecret).call(this, contractAddress, sender, recipient);
+        const [index] = await this.db.getTaggingSecretsIndexesAsSender([appTaggingSecret]);
+        return new IndexedTaggingSecret(appTaggingSecret, index);
     }
     /**
-     * Increments the tagging secret for a given sender and recipient pair. For this to work, the ivpsk_m of the sender must be known.
+     * Increments the tagging secret for a given sender and recipient pair. For this to work, the ivsk_m of the sender must be known.
      * @param contractAddress - The contract address to silo the secret for
      * @param sender - The address sending the note
      * @param recipient - The address receiving the note
      */
     async incrementAppTaggingSecretIndexAsSender(contractAddress, sender, recipient) {
-        const secret = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_calculateTaggingSecret).call(this, contractAddress, sender, recipient);
+        const secret = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_calculateAppTaggingSecret).call(this, contractAddress, sender, recipient);
         const contractName = await this.contractDataOracle.getDebugContractName(contractAddress);
         this.log.debug(`Incrementing app tagging secret at ${contractName}(${contractAddress})`, {
             secret,
@@ -217,7 +218,7 @@ export class SimulatorOracle {
      * @param recipient - The address of the recipient.
      */
     async syncTaggedLogsAsSender(contractAddress, sender, recipient) {
-        const appTaggingSecret = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_calculateTaggingSecret).call(this, contractAddress, sender, recipient);
+        const appTaggingSecret = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_calculateAppTaggingSecret).call(this, contractAddress, sender, recipient);
         let [currentIndex] = await this.db.getTaggingSecretsIndexesAsSender([appTaggingSecret]);
         const INDEX_OFFSET = 10;
         let previousEmptyBack = 0;
@@ -263,102 +264,112 @@ export class SimulatorOracle {
     }
     /**
      * Synchronizes the logs tagged with scoped addresses and all the senders in the address book.
-     * Returns the unsynched logs and updates the indexes of the secrets used to tag them until there are no more logs to sync.
+     * Returns the unsynched logs and updates the indexes of the secrets used to tag them until there are no more logs
+     * to sync.
      * @param contractAddress - The address of the contract that the logs are tagged for
      * @param recipient - The address of the recipient
      * @returns A list of encrypted logs tagged with the recipient's address
      */
     async syncTaggedLogs(contractAddress, maxBlockNumber, scopes) {
+        // Half the size of the window we slide over the tagging secret indexes.
+        const WINDOW_HALF_SIZE = 10;
+        // Ideally this algorithm would be implemented in noir, exposing its building blocks as oracles.
+        // However it is impossible at the moment due to the language not supporting nested slices.
+        // This nesting is necessary because for a given set of tags we don't
+        // know how many logs we will get back. Furthermore, these logs are of undetermined
+        // length, since we don't really know the note they correspond to until we decrypt them.
         const recipients = scopes ? scopes : await this.keyStore.getAccounts();
-        const result = new Map();
+        // A map of logs going from recipient address to logs. Note that the logs might have been processed before
+        // due to us having a sliding window that "looks back" for logs as well. (We look back as there is no guarantee
+        // that a logs will be received ordered by a given tax index and that the tags won't be reused).
+        const logsMap = new Map();
         const contractName = await this.contractDataOracle.getDebugContractName(contractAddress);
         for (const recipient of recipients) {
-            const logs = [];
-            // Ideally this algorithm would be implemented in noir, exposing its building blocks as oracles.
-            // However it is impossible at the moment due to the language not supporting nested slices.
-            // This nesting is necessary because for a given set of tags we don't
-            // know how many logs we will get back. Furthermore, these logs are of undetermined
-            // length, since we don't really know the note they correspond to until we decrypt them.
-            // 1. Get all the secrets for the recipient and sender pairs (#9365)
-            const appTaggingSecrets = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_getAppTaggingSecretsForContacts).call(this, contractAddress, recipient);
-            // 1.1 Set up a sliding window with an offset. Chances are the sender might have messed up
-            // and inadvertently incremented their index without use getting any logs (for example, in case
-            // of a revert). If we stopped looking for logs the first time
-            // we receive 0 for a tag, we might never receive anything from that sender again.
-            // Also there's a possibility that we have advanced our index, but the sender has reused it, so
-            // we might have missed some logs. For these reasons, we have to look both back and ahead of the
-            // stored index
-            const INDEX_OFFSET = 10;
-            const searchState = appTaggingSecrets.reduce((acc, appTaggingSecret) => ({
-                // Start looking for logs before the stored index
-                currentTagggingSecrets: acc.currentTagggingSecrets.concat([
-                    new IndexedTaggingSecret(appTaggingSecret.secret, Math.max(0, appTaggingSecret.index - INDEX_OFFSET)),
-                ]),
-                // Keep looking for logs beyond the stored index
-                maxIndexesToCheck: {
-                    ...acc.maxIndexesToCheck,
-                    ...{ [appTaggingSecret.secret.toString()]: appTaggingSecret.index + INDEX_OFFSET },
-                },
-                // Keeps track of the secrets we have to increment in the database
-                secretsToIncrement: {},
-                // Store the initial set of indexes for the secrets
-                initialSecretIndexes: {
-                    ...acc.initialSecretIndexes,
-                    ...{ [appTaggingSecret.secret.toString()]: appTaggingSecret.index },
-                },
-            }), { currentTagggingSecrets: [], maxIndexesToCheck: {}, secretsToIncrement: {}, initialSecretIndexes: {} });
-            let { currentTagggingSecrets } = searchState;
-            const { maxIndexesToCheck, secretsToIncrement, initialSecretIndexes } = searchState;
-            while (currentTagggingSecrets.length > 0) {
-                // 2. Compute tags using the secrets, recipient and index. Obtain logs for each tag (#9380)
-                const currentTags = currentTagggingSecrets.map(taggingSecret => taggingSecret.computeSiloedTag(recipient, contractAddress));
-                const logsByTags = await this.aztecNode.getLogsByTags(currentTags);
-                const newTaggingSecrets = [];
+            const logsForRecipient = [];
+            // Get all the secrets for the recipient and sender pairs (#9365)
+            const secrets = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_getIndexedTaggingSecretsForContacts).call(this, contractAddress, recipient);
+            // We fetch logs for a window of indexes in a range:
+            //    <latest_log_index - WINDOW_HALF_SIZE, latest_log_index + WINDOW_HALF_SIZE>.
+            //
+            // We use this window approach because it could happen that a sender might have messed up and inadvertently
+            // incremented their index without us getting any logs (for example, in case of a revert). If we stopped looking
+            // for logs the first time we don't receive any logs for a tag, we might never receive anything from that sender again.
+            //    Also there's a possibility that we have advanced our index, but the sender has reused it, so we might have missed
+            // some logs. For these reasons, we have to look both back and ahead of the stored index.
+            let secretsAndWindows = secrets.map(secret => {
+                return {
+                    appTaggingSecret: secret.appTaggingSecret,
+                    leftMostIndex: Math.max(0, secret.index - WINDOW_HALF_SIZE),
+                    rightMostIndex: secret.index + WINDOW_HALF_SIZE,
+                };
+            });
+            // As we iterate we store the largest index we have seen for a given secret to later on store it in the db.
+            const newLargestIndexMapToStore = {};
+            // The initial/unmodified indexes of the secrets stored in a key-value map where key is the app tagging secret.
+            const initialIndexesMap = getInitialIndexesMap(secrets);
+            while (secretsAndWindows.length > 0) {
+                const secretsForTheWholeWindow = getIndexedTaggingSecretsForTheWindow(secretsAndWindows);
+                const tagsForTheWholeWindow = secretsForTheWholeWindow.map(secret => secret.computeSiloedTag(recipient, contractAddress));
+                // We store the new largest indexes we find in the iteration in the following map to later on construct
+                // a new set of secrets and windows to fetch logs for.
+                const newLargestIndexMapForIteration = {};
+                // Fetch the logs for the tags and iterate over them
+                const logsByTags = await this.aztecNode.getLogsByTags(tagsForTheWholeWindow);
                 logsByTags.forEach((logsByTag, logIndex) => {
-                    const { secret: currentSecret, index: currentIndex } = currentTagggingSecrets[logIndex];
-                    const currentSecretAsStr = currentSecret.toString();
-                    this.log.debug(`Syncing logs for recipient ${recipient} at contract ${contractName}(${contractAddress})`, {
-                        recipient,
-                        secret: currentSecret,
-                        index: currentIndex,
-                        contractName,
-                        contractAddress,
-                    });
-                    // 3.1. Append logs to the list and increment the index for the tags that have logs (#9380)
                     if (logsByTag.length > 0) {
-                        const newIndex = currentIndex + 1;
-                        this.log.debug(`Found ${logsByTag.length} logs as recipient ${recipient}. Incrementing index to ${newIndex} at contract ${contractName}(${contractAddress})`, {
+                        // The logs for the given tag exist so we store them for later processing
+                        logsForRecipient.push(...logsByTag);
+                        // We retrieve the indexed tagging secret corresponding to the log as I need that to evaluate whether
+                        // a new largest index have been found.
+                        const secretCorrespondingToLog = secretsForTheWholeWindow[logIndex];
+                        const initialIndex = initialIndexesMap[secretCorrespondingToLog.appTaggingSecret.toString()];
+                        this.log.debug(`Found ${logsByTag.length} logs as recipient ${recipient}`, {
                             recipient,
-                            secret: currentSecret,
-                            newIndex,
+                            secret: secretCorrespondingToLog.appTaggingSecret,
                             contractName,
                             contractAddress,
                         });
-                        logs.push(...logsByTag);
-                        if (currentIndex >= initialSecretIndexes[currentSecretAsStr]) {
-                            // 3.2. Increment the index for the tags that have logs, provided they're higher than the one
-                            // we have stored in the db (#9380)
-                            secretsToIncrement[currentSecretAsStr] = newIndex;
-                            // 3.3. Slide the window forwards if we have found logs beyond the initial index
-                            maxIndexesToCheck[currentSecretAsStr] = currentIndex + INDEX_OFFSET;
+                        if (secretCorrespondingToLog.index >= initialIndex &&
+                            (newLargestIndexMapForIteration[secretCorrespondingToLog.appTaggingSecret.toString()] === undefined ||
+                                secretCorrespondingToLog.index >=
+                                    newLargestIndexMapForIteration[secretCorrespondingToLog.appTaggingSecret.toString()])) {
+                            // We have found a new largest index so we store it for later processing (storing it in the db + fetching
+                            // the difference of the window sets of current and the next iteration)
+                            newLargestIndexMapForIteration[secretCorrespondingToLog.appTaggingSecret.toString()] =
+                                secretCorrespondingToLog.index + 1;
+                            this.log.debug(`Incrementing index to ${secretCorrespondingToLog.index + 1} at contract ${contractName}(${contractAddress})`);
                         }
                     }
-                    // 3.4 Keep increasing the index (inside the window) temporarily for the tags that have no logs
-                    // There's a chance the sender missed some and we want to catch up
-                    if (currentIndex < maxIndexesToCheck[currentSecretAsStr]) {
-                        const newTaggingSecret = new IndexedTaggingSecret(currentSecret, currentIndex + 1);
-                        newTaggingSecrets.push(newTaggingSecret);
-                    }
                 });
-                await this.db.setTaggingSecretsIndexesAsRecipient(Object.keys(secretsToIncrement).map(secret => new IndexedTaggingSecret(Fr.fromHexString(secret), secretsToIncrement[secret])));
-                currentTagggingSecrets = newTaggingSecrets;
+                // Now based on the new largest indexes we found, we will construct a new secrets and windows set to fetch logs
+                // for. Note that it's very unlikely that a new log from the current window would appear between the iterations
+                // so we fetch the logs only for the difference of the window sets.
+                const newSecretsAndWindows = [];
+                for (const [appTaggingSecret, newIndex] of Object.entries(newLargestIndexMapForIteration)) {
+                    const secret = secrets.find(secret => secret.appTaggingSecret.toString() === appTaggingSecret);
+                    if (secret) {
+                        newSecretsAndWindows.push({
+                            appTaggingSecret: secret.appTaggingSecret,
+                            // We set the left most index to the new index to avoid fetching the same logs again
+                            leftMostIndex: newIndex,
+                            rightMostIndex: newIndex + WINDOW_HALF_SIZE,
+                        });
+                        // We store the new largest index in the map to later store it in the db.
+                        newLargestIndexMapToStore[appTaggingSecret] = newIndex;
+                    }
+                    else {
+                        throw new Error(`Secret not found for appTaggingSecret ${appTaggingSecret}. This is a bug as it should never happen!`);
+                    }
+                }
+                // Now we set the new secrets and windows and proceed to the next iteration.
+                secretsAndWindows = newSecretsAndWindows;
             }
-            result.set(recipient.toString(), 
-            // Remove logs with a block number higher than the max block number
-            // Duplicates are likely to happen due to the sliding window, so we also filter them out
-            logs.filter((log, index, self) => log.blockNumber <= maxBlockNumber && index === self.findIndex(otherLog => otherLog.equals(log))));
+            // We filter the logs by block number and store them in the map.
+            logsMap.set(recipient.toString(), logsForRecipient.filter(log => log.blockNumber <= maxBlockNumber));
+            // At this point we have processed all the logs for the recipient so we store the new largest indexes in the db.
+            await this.db.setTaggingSecretsIndexesAsRecipient(Object.entries(newLargestIndexMapToStore).map(([appTaggingSecret, index]) => new IndexedTaggingSecret(Fr.fromHexString(appTaggingSecret), index)));
         }
-        return result;
+        return logsMap;
     }
     /**
      * Processes the tagged logs returned by syncTaggedLogs by decrypting them and storing them in the database.
@@ -377,52 +388,54 @@ export class SimulatorOracle {
                 });
             });
         }
-        const nullifiedNotes = [];
-        const currentNotesForRecipient = await this.db.getIncomingNotes({ owner: recipient });
-        const nullifiersToCheck = currentNotesForRecipient.map(note => note.siloedNullifier);
-        const currentBlockNumber = await this.getBlockNumber();
-        const nullifierIndexes = await this.aztecNode.findNullifiersIndexesWithBlock(currentBlockNumber, nullifiersToCheck);
-        const foundNullifiers = nullifiersToCheck
-            .map((nullifier, i) => {
-            if (nullifierIndexes[i] !== undefined) {
-                return { ...nullifierIndexes[i], ...{ data: nullifier } };
-            }
-        })
-            .filter(nullifier => nullifier !== undefined);
-        await this.db.removeNullifiedNotes(foundNullifiers, recipient.toAddressPoint());
-        nullifiedNotes.forEach(noteDao => {
-            this.log.verbose(`Removed note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot}`, {
-                contract: noteDao.contractAddress,
-                slot: noteDao.storageSlot,
-                nullifier: noteDao.siloedNullifier.toString(),
+    }
+    async removeNullifiedNotes(contractAddress) {
+        for (const recipient of await this.keyStore.getAccounts()) {
+            const currentNotesForRecipient = await this.db.getIncomingNotes({ contractAddress, owner: recipient });
+            const nullifiersToCheck = currentNotesForRecipient.map(note => note.siloedNullifier);
+            const nullifierIndexes = await this.aztecNode.findNullifiersIndexesWithBlock('latest', nullifiersToCheck);
+            const foundNullifiers = nullifiersToCheck
+                .map((nullifier, i) => {
+                if (nullifierIndexes[i] !== undefined) {
+                    return { ...nullifierIndexes[i], ...{ data: nullifier } };
+                }
+            })
+                .filter(nullifier => nullifier !== undefined);
+            const nullifiedNotes = await this.db.removeNullifiedNotes(foundNullifiers, recipient.toAddressPoint());
+            nullifiedNotes.forEach(noteDao => {
+                this.log.verbose(`Removed note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot}`, {
+                    contract: noteDao.contractAddress,
+                    slot: noteDao.storageSlot,
+                    nullifier: noteDao.siloedNullifier.toString(),
+                });
             });
-        });
+        }
     }
 }
-_SimulatorOracle_instances = new WeakSet(), _SimulatorOracle_calculateTaggingSecret = async function _SimulatorOracle_calculateTaggingSecret(contractAddress, sender, recipient) {
+_SimulatorOracle_instances = new WeakSet(), _SimulatorOracle_calculateAppTaggingSecret = async function _SimulatorOracle_calculateAppTaggingSecret(contractAddress, sender, recipient) {
     const senderCompleteAddress = await this.getCompleteAddress(sender);
     const senderIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(sender);
-    const sharedSecret = computeTaggingSecret(senderCompleteAddress, senderIvsk, recipient);
-    // Silo the secret to the app so it can't be used to track other app's notes
-    const siloedSecret = poseidon2Hash([sharedSecret.x, sharedSecret.y, contractAddress]);
-    return siloedSecret;
-}, _SimulatorOracle_getAppTaggingSecretsForContacts = 
+    const secretPoint = computeTaggingSecretPoint(senderCompleteAddress, senderIvsk, recipient);
+    // Silo the secret so it can't be used to track other app's notes
+    const appSecret = poseidon2Hash([secretPoint.x, secretPoint.y, contractAddress]);
+    return appSecret;
+}, _SimulatorOracle_getIndexedTaggingSecretsForContacts = 
 /**
- * Returns the siloed tagging secrets for a given recipient and all the senders in the address book
+ * Returns the indexed tagging secrets for a given recipient and all the senders in the address book
  * This method should be exposed as an oracle call to allow aztec.nr to perform the orchestration
  * of the syncTaggedLogs and processTaggedLogs methods. However, it is not possible to do so at the moment,
  * so we're keeping it private for now.
  * @param contractAddress - The contract address to silo the secret for
  * @param recipient - The address receiving the notes
- * @returns A list of siloed tagging secrets
+ * @returns A list of indexed tagging secrets
  */
-async function _SimulatorOracle_getAppTaggingSecretsForContacts(contractAddress, recipient) {
+async function _SimulatorOracle_getIndexedTaggingSecretsForContacts(contractAddress, recipient) {
     const recipientCompleteAddress = await this.getCompleteAddress(recipient);
     const recipientIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(recipient);
     // We implicitly add all PXE accounts as contacts, this helps us decrypt tags on notes that we send to ourselves (recipient = us, sender = us)
     const contacts = [...(await this.db.getContactAddresses()), ...(await this.keyStore.getAccounts())].filter((address, index, self) => index === self.findIndex(otherAddress => otherAddress.equals(address)));
     const appTaggingSecrets = contacts.map(contact => {
-        const sharedSecret = computeTaggingSecret(recipientCompleteAddress, recipientIvsk, contact);
+        const sharedSecret = computeTaggingSecretPoint(recipientCompleteAddress, recipientIvsk, contact);
         return poseidon2Hash([sharedSecret.x, sharedSecret.y, contractAddress]);
     });
     const indexes = await this.db.getTaggingSecretsIndexesAsRecipient(appTaggingSecrets);
@@ -471,4 +484,4 @@ async function _SimulatorOracle_decryptTaggedLogs(scopedLogs, recipient, simulat
     }
     return { incomingNotes };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/simulator_oracle/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/simulator_oracle/index.ts"],"names":[],"mappings":";;AAAA,OAAO,EAGL,aAAa,EAGb,YAAY,EAMZ,mCAAmC,GACpC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAKL,EAAE,EAEF,oBAAoB,EAGpB,UAAU,EACV,oBAAoB,EACpB,yBAAyB,GAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAyB,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAMhE,OAAO,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,oCAAoC,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAEhG;;GAEG;AACH,MAAM,OAAO,eAAe;IAC1B,YACU,kBAAsC,EACtC,EAAe,EACf,QAAkB,EAClB,SAAoB,EACpB,MAAM,YAAY,CAAC,sBAAsB,CAAC;;QAJ1C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,OAAE,GAAF,EAAE,CAAa;QACf,aAAQ,GAAR,QAAQ,CAAU;QAClB,cAAS,GAAT,SAAS,CAAW;QACpB,QAAG,GAAH,GAAG,CAAuC;IACjD,CAAC;IAEJ,uBAAuB,CAAC,OAAW,EAAE,eAA6B;QAChE,OAAO,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,OAAqB;QAC5C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAClE,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CACb,wCAAwC,OAAO;8QACuN,CACvQ,CAAC;QACJ,CAAC;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,OAAqB;QAC7C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,0CAA0C,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAClF,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,WAAe;QAClC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,yCAAyC,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACrF,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC;QAC3C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,eAA6B,EAAE,WAAe,EAAE,MAAkB,EAAE,MAAuB;QACxG,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC;YAC9C,eAAe;YACf,WAAW;YACX,MAAM;YACN,MAAM;SACP,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,eAAe,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;YACxG,eAAe;YACf,WAAW;YACX,KAAK;YACL,IAAI;YACJ,QAAQ;YACR,eAAe;YACf,uDAAuD;YACvD,KAAK;SACN,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,eAA6B,EAAE,QAA0B;QACjF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAC9F,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,wBAAwB,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAChG,OAAO;YACL,GAAG,QAAQ;YACX,KAAK;SACN,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC7B,eAA6B,EAC7B,YAAoB;QAEpB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;QACpF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QAC7F,OAAO,QAAQ,IAAI,mBAAmB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACjE,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,0BAA0B,CAC9B,eAA6B,EAC7B,WAAe,EACf,MAAU;QAEV,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,GAAG,MAAM,mCAAmC,CAC3E,IAAI,CAAC,SAAS,EACd,eAAe,EACf,WAAW,EACX,MAAM,CACP,CAAC;QAEF,6FAA6F;QAC7F,OAAO,IAAI,uBAAuB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAChE,CAAC;IAED,uBAAuB;IAChB,kBAAkB,CAAC,UAAkB;QAC1C,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,kBAAkB,CAAC,UAAc;QACrC,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,YAAY,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IACrF,CAAC;IAED,iFAAiF;IAC1E,kBAAkB,CAAC,UAAkB;QAC1C,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,SAAa;QACnC,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,YAAY,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IACpF,CAAC;IAEM,KAAK,CAAC,aAAa,CACxB,WAA0B,EAC1B,MAAoB,EACpB,SAAa;QAEb,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QAC7F,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,WAAmB,EAAE,MAAoB,EAAE,SAAiB;QACtF,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,YAAY,CAAC,cAAc;gBAC9B,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC3F,KAAK,YAAY,CAAC,cAAc;gBAC9B,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC1F,KAAK,YAAY,CAAC,gBAAgB;gBAChC,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC5F,KAAK,YAAY,CAAC,OAAO;gBACvB,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACzF;gBACE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,0CAA0C,CAAC,SAAa;QACnE,OAAO,IAAI,CAAC,6BAA6B,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,EAAE,SAAS,CAAC,CAAC;IACpF,CAAC;IAEM,6BAA6B,CAClC,WAAmB,EACnB,SAAa;QAEb,OAAO,IAAI,CAAC,SAAS,CAAC,6BAA6B,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IAC9E,CAAC;IAEM,gCAAgC,CACrC,WAAmB,EACnB,SAAa;QAEb,OAAO,IAAI,CAAC,SAAS,CAAC,gCAAgC,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACjF,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,WAAmB;QACvC,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACpD,CAAC;IAEM,KAAK,CAAC,wBAAwB,CAAC,WAAmB,EAAE,QAAY;QACrE,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC9E,CAAC;IAED;;;;;OAKG;IACH,cAAc;QACZ,OAAO,IAAI,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC;IAClC,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,cAAc;QACzB,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;IAC/C,CAAC;IAEM,oBAAoB,CAAC,eAA6B,EAAE,QAA0B;QACnF,OAAO,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IACjF,CAAC;IAED;;;;;OAKG;IACI,WAAW;QAChB,OAAO,IAAI,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC;IACvC,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,+BAA+B,CAC1C,eAA6B,EAC7B,MAAoB,EACpB,SAAuB;QAEvB,MAAM,IAAI,CAAC,sBAAsB,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAEtE,MAAM,gBAAgB,GAAG,MAAM,uBAAA,IAAI,8EAA2B,MAA/B,IAAI,EAA4B,eAAe,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACnG,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,gCAAgC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEnF,OAAO,IAAI,oBAAoB,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;IAC3D,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,sCAAsC,CACjD,eAA6B,EAC7B,MAAoB,EACpB,SAAuB;QAEvB,MAAM,MAAM,GAAG,MAAM,uBAAA,IAAI,8EAA2B,MAA/B,IAAI,EAA4B,eAAe,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACzF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;QACzF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,YAAY,IAAI,eAAe,GAAG,EAAE;YACvF,MAAM;YACN,MAAM;YACN,SAAS;YACT,YAAY;YACZ,eAAe;SAChB,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,gCAAgC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACzE,MAAM,IAAI,CAAC,EAAE,CAAC,gCAAgC,CAAC,CAAC,IAAI,oBAAoB,CAAC,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAChG,CAAC;IAuCD;;;;;;OAMG;IACI,KAAK,CAAC,sBAAsB,CACjC,eAA6B,EAC7B,MAAoB,EACpB,SAAuB;QAEvB,MAAM,gBAAgB,GAAG,MAAM,uBAAA,IAAI,8EAA2B,MAA/B,IAAI,EAA4B,eAAe,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACnG,IAAI,CAAC,YAAY,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,gCAAgC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAExF,MAAM,YAAY,GAAG,EAAE,CAAC;QAExB,IAAI,iBAAiB,GAAG,CAAC,CAAC;QAC1B,IAAI,gBAAgB,GAAG,CAAC,CAAC;QACzB,IAAI,iBAAyB,CAAC;QAE9B,uIAAuI;QACvI,+IAA+I;QAC/I,oKAAoK;QACpK,qKAAqK;QACrK,6BAA6B;QAC7B,mCAAmC;QACnC,wLAAwL;QACxL,qEAAqE;QACrE,uKAAuK;QACvK,iDAAiD;QACjD,gDAAgD;QAChD,mCAAmC;QACnC,yKAAyK;QAEzK,GAAG,CAAC;YACF,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC5D,MAAM,uBAAuB,GAAG,IAAI,oBAAoB,CAAC,gBAAgB,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC;gBAC7F,OAAO,uBAAuB,CAAC,gBAAgB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YAC9E,CAAC,CAAC,CAAC;YACH,iBAAiB,GAAG,gBAAgB,CAAC;YAErC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;YAErE,MAAM,eAAe,GAAG,YAAY,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;YACxF,iBAAiB,GAAG,eAAe,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC;YAE5E,MAAM,cAAc,GAAG,YAAY,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;YAC3F,gBAAgB,GAAG,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,GAAG,cAAc,CAAC;YAE5F,YAAY,IAAI,YAAY,CAAC;QAC/B,CAAC,QAAQ,iBAAiB,GAAG,iBAAiB,GAAG,YAAY,EAAE;QAE/D,yGAAyG;QACzG,MAAM,QAAQ,GAAG,YAAY,GAAG,CAAC,YAAY,GAAG,iBAAiB,CAAC,CAAC;QAEnE,MAAM,IAAI,CAAC,EAAE,CAAC,gCAAgC,CAAC,CAAC,IAAI,oBAAoB,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;QAEvG,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;QACzF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,MAAM,gBAAgB,YAAY,IAAI,eAAe,GAAG,EAAE;YAClG,MAAM;YACN,MAAM,EAAE,gBAAgB;YACxB,KAAK,EAAE,YAAY;YACnB,YAAY;YACZ,eAAe;SAChB,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,cAAc,CACzB,eAA6B,EAC7B,cAAsB,EACtB,MAAuB;QAEvB,wEAAwE;QACxE,MAAM,gBAAgB,GAAG,EAAE,CAAC;QAE5B,gGAAgG;QAChG,2FAA2F;QAC3F,qEAAqE;QACrE,mFAAmF;QACnF,wFAAwF;QAExF,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QACvE,0GAA0G;QAC1G,+GAA+G;QAC/G,gGAAgG;QAChG,MAAM,OAAO,GAAG,IAAI,GAAG,EAA2B,CAAC;QACnD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;QACzF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,MAAM,gBAAgB,GAAoB,EAAE,CAAC;YAE7C,iEAAiE;YACjE,MAAM,OAAO,GAAG,MAAM,uBAAA,IAAI,wFAAqC,MAAzC,IAAI,EAAsC,eAAe,EAAE,SAAS,CAAC,CAAC;YAE5F,oDAAoD;YACpD,iFAAiF;YACjF,EAAE;YACF,2GAA2G;YAC3G,gHAAgH;YAChH,uHAAuH;YACvH,uHAAuH;YACvH,yFAAyF;YACzF,IAAI,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBAC3C,OAAO;oBACL,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;oBACzC,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,GAAG,gBAAgB,CAAC;oBAC3D,cAAc,EAAE,MAAM,CAAC,KAAK,GAAG,gBAAgB;iBAChD,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,2GAA2G;YAC3G,MAAM,yBAAyB,GAA4B,EAAE,CAAC;YAE9D,+GAA+G;YAC/G,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAExD,OAAO,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpC,MAAM,wBAAwB,GAAG,oCAAoC,CAAC,iBAAiB,CAAC,CAAC;gBACzF,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAClE,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,eAAe,CAAC,CACpD,CAAC;gBAEF,uGAAuG;gBACvG,sDAAsD;gBACtD,MAAM,8BAA8B,GAA4B,EAAE,CAAC;gBAEnE,oDAAoD;gBACpD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;gBAE7E,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;oBACzC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACzB,yEAAyE;wBACzE,gBAAgB,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;wBAEpC,qGAAqG;wBACrG,uCAAuC;wBACvC,MAAM,wBAAwB,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC;wBACpE,MAAM,YAAY,GAAG,iBAAiB,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;wBAE7F,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,SAAS,CAAC,MAAM,sBAAsB,SAAS,EAAE,EAAE;4BACzE,SAAS;4BACT,MAAM,EAAE,wBAAwB,CAAC,gBAAgB;4BACjD,YAAY;4BACZ,eAAe;yBAChB,CAAC,CAAC;wBAEH,IACE,wBAAwB,CAAC,KAAK,IAAI,YAAY;4BAC9C,CAAC,8BAA8B,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,KAAK,SAAS;gCACjG,wBAAwB,CAAC,KAAK;oCAC5B,8BAA8B,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC,EACzF,CAAC;4BACD,yGAAyG;4BACzG,uEAAuE;4BACvE,8BAA8B,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;gCAClF,wBAAwB,CAAC,KAAK,GAAG,CAAC,CAAC;4BAErC,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,yBACE,wBAAwB,CAAC,KAAK,GAAG,CACnC,gBAAgB,YAAY,IAAI,eAAe,GAAG,CACnD,CAAC;wBACJ,CAAC;oBACH,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,+GAA+G;gBAC/G,+GAA+G;gBAC/G,mEAAmE;gBACnE,MAAM,oBAAoB,GAAG,EAAE,CAAC;gBAChC,KAAK,MAAM,CAAC,gBAAgB,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,8BAA8B,CAAC,EAAE,CAAC;oBAC1F,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,gBAAgB,CAAC,CAAC;oBAC/F,IAAI,MAAM,EAAE,CAAC;wBACX,oBAAoB,CAAC,IAAI,CAAC;4BACxB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;4BACzC,oFAAoF;4BACpF,aAAa,EAAE,QAAQ;4BACvB,cAAc,EAAE,QAAQ,GAAG,gBAAgB;yBAC5C,CAAC,CAAC;wBAEH,yEAAyE;wBACzE,yBAAyB,CAAC,gBAAgB,CAAC,GAAG,QAAQ,CAAC;oBACzD,CAAC;yBAAM,CAAC;wBACN,MAAM,IAAI,KAAK,CACb,yCAAyC,gBAAgB,4CAA4C,CACtG,CAAC;oBACJ,CAAC;gBACH,CAAC;gBAED,4EAA4E;gBAC5E,iBAAiB,GAAG,oBAAoB,CAAC;YAC3C,CAAC;YAED,gEAAgE;YAChE,OAAO,CAAC,GAAG,CACT,SAAS,CAAC,QAAQ,EAAE,EACpB,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,IAAI,cAAc,CAAC,CAClE,CAAC;YAEF,gHAAgH;YAChH,MAAM,IAAI,CAAC,EAAE,CAAC,mCAAmC,CAC/C,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,GAAG,CAC3C,CAAC,CAAC,gBAAgB,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,oBAAoB,CAAC,EAAE,CAAC,aAAa,CAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC,CACnG,CACF,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAqED;;;;OAIG;IACI,KAAK,CAAC,iBAAiB,CAC5B,IAAqB,EACrB,SAAuB,EACvB,SAAyB;QAEzB,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,uBAAA,IAAI,sEAAmB,MAAvB,IAAI,EAAoB,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACpF,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;YACzB,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;YACjD,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC9B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,oCAAoC,OAAO,CAAC,eAAe,YAAY,OAAO,CAAC,WAAW,EAAE,EAAE;oBAC7G,QAAQ,EAAE,OAAO,CAAC,eAAe;oBACjC,IAAI,EAAE,OAAO,CAAC,WAAW;oBACzB,SAAS,EAAE,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE;iBAC9C,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,eAA6B;QAC7D,KAAK,MAAM,SAAS,IAAI,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;YAC1D,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YACvG,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACrF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,8BAA8B,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;YAE1G,MAAM,eAAe,GAAG,iBAAiB;iBACtC,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE;gBACpB,IAAI,gBAAgB,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;oBACtC,OAAO,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,EAAiB,CAAC;gBAC3E,CAAC;YACH,CAAC,CAAC;iBACD,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,KAAK,SAAS,CAAkB,CAAC;YAEjE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,eAAe,EAAE,SAAS,CAAC,cAAc,EAAE,CAAC,CAAC;YACvG,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC/B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,6BAA6B,OAAO,CAAC,eAAe,YAAY,OAAO,CAAC,WAAW,EAAE,EAAE;oBACtG,QAAQ,EAAE,OAAO,CAAC,eAAe;oBACjC,IAAI,EAAE,OAAO,CAAC,WAAW;oBACzB,SAAS,EAAE,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE;iBAC9C,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;yFAhXC,KAAK,qDAA4B,eAA6B,EAAE,MAAoB,EAAE,SAAuB;IAC3G,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACpE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,iCAAiC,CAAC,MAAM,CAAC,CAAC;IACjF,MAAM,WAAW,GAAG,yBAAyB,CAAC,qBAAqB,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IAC5F,iEAAiE;IACjE,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC;IACjF,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;GAQG;AACH,KAAK,+DACH,eAA6B,EAC7B,SAAuB;IAEvB,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC1E,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,iCAAiC,CAAC,SAAS,CAAC,CAAC;IAEvF,8IAA8I;IAC9I,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM,CACxG,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CACjG,CAAC;IACF,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QAC/C,MAAM,YAAY,GAAG,yBAAyB,CAAC,wBAAwB,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QACjG,OAAO,aAAa,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,mCAAmC,CAAC,iBAAiB,CAAC,CAAC;IACrF,OAAO,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,oBAAoB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5F,CAAC;AA2ND;;;;;;GAMG;AACH,KAAK,6CAAoB,UAA2B,EAAE,SAAuB,EAAE,SAAyB;IACtG,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC1E,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAClD,wBAAwB,CAAC,UAAU,CAAC,8BAA8B,CACnE,CAAC;IACF,MAAM,aAAa,GAAG,oBAAoB,CAAC,wBAAwB,CAAC,aAAa,EAAE,EAAE,KAAK,CAAC,CAAC;IAE5F,2EAA2E;IAC3E,0CAA0C;IAC1C,MAAM,eAAe,GAA6B,IAAI,GAAG,EAAE,CAAC;IAC5D,MAAM,aAAa,GAAsB,EAAE,CAAC;IAE5C,MAAM,cAAc,GAAG,IAAI,GAAG,EAAyC,CAAC;IAExE,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,mBAAmB,GAAG,SAAS,CAAC,YAAY;YAChD,CAAC,CAAC,aAAa,CAAC,2BAA2B,CAAC,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;YAC7E,CAAC,CAAC,aAAa,CAAC,iBAAiB,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,CAAC;QAE7F,IAAI,mBAAmB,EAAE,CAAC;YACxB,MAAM,OAAO,GAAG,mBAAmB,CAAC;YAEpC,MAAM,QAAQ,GACZ,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YAE1G,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,0BAA0B,SAAS,CAAC,MAAM,+BAA+B,CAAC,CAAC;gBACzF,SAAS;YACX,CAAC;YAED,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;YAE1D,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;gBACtD,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;YAC9D,CAAC;YACD,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,eAAe;YAC5C,oHAAoH;YACpH,gJAAgJ;YAChJ,kIAAkI;YAClI,SAAS,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,EAC9F,IAAI,CAAC,EAAE,EACP,mBAAmB,CAAC,CAAC,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,SAAS,EAC5D,OAAQ,EACR,QAAQ,CAAC,IAAI,CAAC,MAAM,EACpB,QAAQ,CAAC,aAAa,EACtB,QAAQ,CAAC,WAAW,EACpB,QAAQ,CAAC,IAAI,CAAC,UAAU,EACxB,SAAS,CAAC,mBAAmB,EAC7B,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAE,EACjD,IAAI,CAAC,GAAG,CACT,CAAC;YAEF,IAAI,YAAY,EAAE,CAAC;gBACjB,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,EAAE,aAAa,EAAE,CAAC;AAC3B,CAAC"}

package/dest/simulator_oracle/tagging_utils.d.ts

@@ -0,0 +1,15 @@
+import { type Fr, IndexedTaggingSecret } from '@aztec/circuits.js';
+export declare function getIndexedTaggingSecretsForTheWindow(secretsAndWindows: {
+    appTaggingSecret: Fr;
+    leftMostIndex: number;
+    rightMostIndex: number;
+}[]): IndexedTaggingSecret[];
+/**
+ * Creates a map from app tagging secret to initial index.
+ * @param indexedTaggingSecrets - The indexed tagging secrets to get the initial indexes from.
+ * @returns The map from app tagging secret to initial index.
+ */
+export declare function getInitialIndexesMap(indexedTaggingSecrets: IndexedTaggingSecret[]): {
+    [k: string]: number;
+};
+//# sourceMappingURL=tagging_utils.d.ts.map

package/dest/simulator_oracle/tagging_utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tagging_utils.d.ts","sourceRoot":"","sources":["../../src/simulator_oracle/tagging_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAEnE,wBAAgB,oCAAoC,CAClD,iBAAiB,EAAE;IAAE,gBAAgB,EAAE,EAAE,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,EAAE,GAC3F,oBAAoB,EAAE,CAQxB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,qBAAqB,EAAE,oBAAoB,EAAE,GAAG;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAQ3G"}

package/dest/simulator_oracle/tagging_utils.js

@@ -0,0 +1,23 @@
+import { IndexedTaggingSecret } from '@aztec/circuits.js';
+export function getIndexedTaggingSecretsForTheWindow(secretsAndWindows) {
+    const secrets = [];
+    for (const secretAndWindow of secretsAndWindows) {
+        for (let i = secretAndWindow.leftMostIndex; i <= secretAndWindow.rightMostIndex; i++) {
+            secrets.push(new IndexedTaggingSecret(secretAndWindow.appTaggingSecret, i));
+        }
+    }
+    return secrets;
+}
+/**
+ * Creates a map from app tagging secret to initial index.
+ * @param indexedTaggingSecrets - The indexed tagging secrets to get the initial indexes from.
+ * @returns The map from app tagging secret to initial index.
+ */
+export function getInitialIndexesMap(indexedTaggingSecrets) {
+    const initialIndexes = {};
+    for (const indexedTaggingSecret of indexedTaggingSecrets) {
+        initialIndexes[indexedTaggingSecret.appTaggingSecret.toString()] = indexedTaggingSecret.index;
+    }
+    return initialIndexes;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFnZ2luZ191dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zaW11bGF0b3Jfb3JhY2xlL3RhZ2dpbmdfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFXLG9CQUFvQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFbkUsTUFBTSxVQUFVLG9DQUFvQyxDQUNsRCxpQkFBNEY7SUFFNUYsTUFBTSxPQUFPLEdBQTJCLEVBQUUsQ0FBQztJQUMzQyxLQUFLLE1BQU0sZUFBZSxJQUFJLGlCQUFpQixFQUFFLENBQUM7UUFDaEQsS0FBSyxJQUFJLENBQUMsR0FBRyxlQUFlLENBQUMsYUFBYSxFQUFFLENBQUMsSUFBSSxlQUFlLENBQUMsY0FBYyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7WUFDckYsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLG9CQUFvQixDQUFDLGVBQWUsQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzlFLENBQUM7SUFDSCxDQUFDO0lBQ0QsT0FBTyxPQUFPLENBQUM7QUFDakIsQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsb0JBQW9CLENBQUMscUJBQTZDO0lBQ2hGLE1BQU0sY0FBYyxHQUE0QixFQUFFLENBQUM7SUFFbkQsS0FBSyxNQUFNLG9CQUFvQixJQUFJLHFCQUFxQixFQUFFLENBQUM7UUFDekQsY0FBYyxDQUFDLG9CQUFvQixDQUFDLGdCQUFnQixDQUFDLFFBQVEsRUFBRSxDQUFDLEdBQUcsb0JBQW9CLENBQUMsS0FBSyxDQUFDO0lBQ2hHLENBQUM7SUFFRCxPQUFPLGNBQWMsQ0FBQztBQUN4QixDQUFDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"create_pxe_service.d.ts","sourceRoot":"","sources":["../../src/utils/create_pxe_service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAOhF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,gBAAgB,EACxB,YAAY,GAAE,MAAM,GAAG,OAAO,GAAG,SAAqB,EACtD,YAAY,CAAC,EAAE,mBAAmB,uBAwBnC"}
+{"version":3,"file":"create_pxe_service.d.ts","sourceRoot":"","sources":["../../src/utils/create_pxe_service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAOhF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,gBAAgB,EACxB,YAAY,GAAE,MAAM,GAAG,OAAO,GAAG,SAAqB,EACtD,YAAY,CAAC,EAAE,mBAAmB,uBAwBnC"}

package/dest/utils/create_pxe_service.js

@@ -1,4 +1,5 @@
 import { BBNativePrivateKernelProver } from '@aztec/bb-prover';
+import { BBWasmPrivateKernelProver } from '@aztec/bb-prover/wasm';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { createLogger } from '@aztec/foundation/log';
 import { KeyStore } from '@aztec/key-store';
@@ -40,10 +41,12 @@ function createProver(config, logSuffix) {
     }
     // (@PhilWindle) Temporary validation until WASM is implemented
     if (!config.bbBinaryPath || !config.bbWorkingDirectory) {
-        throw new Error(`Prover must be configured with binary path and working directory`);
+        return new BBWasmPrivateKernelProver(16);
+    }
+    else {
+        const bbConfig = config;
+        const log = createLogger('pxe:bb-native-prover' + (logSuffix ? `:${logSuffix}` : ''));
+        return BBNativePrivateKernelProver.new({ bbSkipCleanup: false, ...bbConfig }, log);
     }
-    const bbConfig = config;
-    const log = createLogger('pxe:bb-native-prover' + (logSuffix ? `:${logSuffix}` : ''));
-    return BBNativePrivateKernelProver.new({ bbSkipCleanup: false, ...bbConfig }, log);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlX3B4ZV9zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2NyZWF0ZV9weGVfc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUvRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDdkQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBR3JELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUMvRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQUN2RixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFM0Q7Ozs7Ozs7Ozs7R0FVRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsZ0JBQWdCLENBQ3BDLFNBQW9CLEVBQ3BCLE1BQXdCLEVBQ3hCLGVBQTZDLFNBQVMsRUFDdEQsWUFBa0M7SUFFbEMsTUFBTSxTQUFTLEdBQ2IsT0FBTyxZQUFZLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQztJQUVqSCxNQUFNLFdBQVcsR0FBRyxNQUFNLFNBQVMsQ0FBQyxzQkFBc0IsRUFBRSxDQUFDO0lBQzdELE1BQU0sbUJBQW1CLEdBQUc7UUFDMUIsR0FBRyxNQUFNO1FBQ1QsV0FBVztLQUNRLENBQUM7SUFFdEIsTUFBTSxRQUFRLEdBQUcsSUFBSSxRQUFRLENBQzNCLE1BQU0sV0FBVyxDQUFDLGVBQWUsRUFBRSxtQkFBbUIsRUFBRSxZQUFZLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUMzRixDQUFDO0lBRUYsTUFBTSxLQUFLLEdBQUcsTUFBTSxXQUFXLENBQUMsVUFBVSxFQUFFLG1CQUFtQixFQUFFLFlBQVksQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDO0lBRWhHLE1BQU0sRUFBRSxHQUFHLE1BQU0sYUFBYSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUM3QyxNQUFNLElBQUksR0FBRyxJQUFJLFdBQVcsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFFM0MsTUFBTSxNQUFNLEdBQUcsWUFBWSxJQUFJLENBQUMsTUFBTSxZQUFZLENBQUMsTUFBTSxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDdkUsTUFBTSxHQUFHLEdBQUcsSUFBSSxVQUFVLENBQUMsUUFBUSxFQUFFLFNBQVMsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDckYsTUFBTSxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDakIsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDO0FBRUQsU0FBUyxZQUFZLENBQUMsTUFBd0IsRUFBRSxTQUFrQjtJQUNoRSxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsRUFBRSxDQUFDO1FBQzFCLE9BQU8sSUFBSSx1QkFBdUIsRUFBRSxDQUFDO0lBQ3ZDLENBQUM7SUFFRCwrREFBK0Q7SUFDL0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxZQUFZLElBQUksQ0FBQyxNQUFNLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztRQUN2RCxNQUFNLElBQUksS0FBSyxDQUFDLGtFQUFrRSxDQUFDLENBQUM7SUFDdEYsQ0FBQztJQUNELE1BQU0sUUFBUSxHQUFHLE1BQW9HLENBQUM7SUFDdEgsTUFBTSxHQUFHLEdBQUcsWUFBWSxDQUFDLHNCQUFzQixHQUFHLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxJQUFJLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ3RGLE9BQU8sMkJBQTJCLENBQUMsR0FBRyxDQUFDLEVBQUUsYUFBYSxFQUFFLEtBQUssRUFBRSxHQUFHLFFBQVEsRUFBRSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0FBQ3JGLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlX3B4ZV9zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2NyZWF0ZV9weGVfc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMvRCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVsRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDdkQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBR3JELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUMvRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQUN2RixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFM0Q7Ozs7Ozs7Ozs7R0FVRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsZ0JBQWdCLENBQ3BDLFNBQW9CLEVBQ3BCLE1BQXdCLEVBQ3hCLGVBQTZDLFNBQVMsRUFDdEQsWUFBa0M7SUFFbEMsTUFBTSxTQUFTLEdBQ2IsT0FBTyxZQUFZLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQztJQUVqSCxNQUFNLFdBQVcsR0FBRyxNQUFNLFNBQVMsQ0FBQyxzQkFBc0IsRUFBRSxDQUFDO0lBQzdELE1BQU0sbUJBQW1CLEdBQUc7UUFDMUIsR0FBRyxNQUFNO1FBQ1QsV0FBVztLQUNRLENBQUM7SUFFdEIsTUFBTSxRQUFRLEdBQUcsSUFBSSxRQUFRLENBQzNCLE1BQU0sV0FBVyxDQUFDLGVBQWUsRUFBRSxtQkFBbUIsRUFBRSxZQUFZLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUMzRixDQUFDO0lBRUYsTUFBTSxLQUFLLEdBQUcsTUFBTSxXQUFXLENBQUMsVUFBVSxFQUFFLG1CQUFtQixFQUFFLFlBQVksQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDO0lBRWhHLE1BQU0sRUFBRSxHQUFHLE1BQU0sYUFBYSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUM3QyxNQUFNLElBQUksR0FBRyxJQUFJLFdBQVcsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFFM0MsTUFBTSxNQUFNLEdBQUcsWUFBWSxJQUFJLENBQUMsTUFBTSxZQUFZLENBQUMsTUFBTSxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDdkUsTUFBTSxHQUFHLEdBQUcsSUFBSSxVQUFVLENBQUMsUUFBUSxFQUFFLFNBQVMsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDckYsTUFBTSxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDakIsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDO0FBRUQsU0FBUyxZQUFZLENBQUMsTUFBd0IsRUFBRSxTQUFrQjtJQUNoRSxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsRUFBRSxDQUFDO1FBQzFCLE9BQU8sSUFBSSx1QkFBdUIsRUFBRSxDQUFDO0lBQ3ZDLENBQUM7SUFFRCwrREFBK0Q7SUFDL0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxZQUFZLElBQUksQ0FBQyxNQUFNLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztRQUN2RCxPQUFPLElBQUkseUJBQXlCLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDM0MsQ0FBQztTQUFNLENBQUM7UUFDTixNQUFNLFFBQVEsR0FBRyxNQUNDLENBQUM7UUFDbkIsTUFBTSxHQUFHLEdBQUcsWUFBWSxDQUFDLHNCQUFzQixHQUFHLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxJQUFJLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3RGLE9BQU8sMkJBQTJCLENBQUMsR0FBRyxDQUFDLEVBQUUsYUFBYSxFQUFFLEtBQUssRUFBRSxHQUFHLFFBQVEsRUFBRSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ3JGLENBQUM7QUFDSCxDQUFDIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.67.0",
+  "version": "0.67.1-devnet",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -71,19 +71,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.67.0",
-    "@aztec/bb.js": "0.67.0",
-    "@aztec/builder": "0.67.0",
-    "@aztec/circuit-types": "0.67.0",
-    "@aztec/circuits.js": "0.67.0",
-    "@aztec/ethereum": "0.67.0",
-    "@aztec/foundation": "0.67.0",
-    "@aztec/key-store": "0.67.0",
-    "@aztec/kv-store": "0.67.0",
-    "@aztec/noir-protocol-circuits-types": "0.67.0",
-    "@aztec/protocol-contracts": "0.67.0",
-    "@aztec/simulator": "0.67.0",
-    "@aztec/types": "0.67.0",
+    "@aztec/bb-prover": "0.67.1-devnet",
+    "@aztec/bb.js": "0.67.1-devnet",
+    "@aztec/builder": "0.67.1-devnet",
+    "@aztec/circuit-types": "0.67.1-devnet",
+    "@aztec/circuits.js": "0.67.1-devnet",
+    "@aztec/ethereum": "0.67.1-devnet",
+    "@aztec/foundation": "0.67.1-devnet",
+    "@aztec/key-store": "0.67.1-devnet",
+    "@aztec/kv-store": "0.67.1-devnet",
+    "@aztec/noir-protocol-circuits-types": "0.67.1-devnet",
+    "@aztec/protocol-contracts": "0.67.1-devnet",
+    "@aztec/simulator": "0.67.1-devnet",
+    "@aztec/types": "0.67.1-devnet",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
     "@noir-lang/types": "workspace:*",

package/src/database/kv_pxe_database.ts

@@ -585,7 +585,9 @@ export class KVPxeDatabase implements PxeDatabase {
 
   async #setTaggingSecretsIndexes(indexedSecrets: IndexedTaggingSecret[], storageMap: AztecAsyncMap<string, number>) {
     await Promise.all(
-      indexedSecrets.map(indexedSecret => storageMap.set(indexedSecret.secret.toString(), indexedSecret.index)),
+      indexedSecrets.map(indexedSecret =>
+        storageMap.set(indexedSecret.appTaggingSecret.toString(), indexedSecret.index),
+      ),
     );
   }
 

package/src/kernel_oracle/index.ts

@@ -15,7 +15,7 @@ import {
 import { createLogger } from '@aztec/foundation/log';
 import { type Tuple } from '@aztec/foundation/serialize';
 import { type KeyStore } from '@aztec/key-store';
-import { getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-types';
+import { getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-types/client';
 
 import { type ContractDataOracle } from '../contract_data_oracle/index.js';
 import { type ProvingDataOracle } from './../kernel_prover/proving_data_oracle.js';