@aztec/pxe 0.61.0 → 0.63.0

package/dest/simulator_oracle/index.d.ts

@@ -1,14 +1,15 @@
-import { type AztecNode, type L2Block, MerkleTreeId, type NoteStatus, type NullifierMembershipWitness, type PublicDataWitness } from '@aztec/circuit-types';
-import { type AztecAddress, type CompleteAddress, type ContractInstance, type Fr, type FunctionSelector, type Header, IndexedTaggingSecret, type KeyValidationRequest, type L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
+import { type AztecNode, type L2Block, type L2BlockNumber, MerkleTreeId, type NoteStatus, type NullifierMembershipWitness, type PublicDataWitness, type TxScopedL2Log } from '@aztec/circuit-types';
+import { type AztecAddress, type CompleteAddress, type ContractInstance, Fr, type FunctionSelector, type Header, IndexedTaggingSecret, type KeyValidationRequest, type L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
 import { type FunctionArtifact } from '@aztec/foundation/abi';
 import { type KeyStore } from '@aztec/key-store';
-import { type DBOracle, MessageLoadOracleInputs } from '@aztec/simulator';
+import { type AcirSimulator, type DBOracle, MessageLoadOracleInputs } from '@aztec/simulator';
 import { type ContractDataOracle } from '../contract_data_oracle/index.js';
 import { type PxeDatabase } from '../database/index.js';
 /**
  * A data oracle that provides information needed for simulating a transaction.
  */
 export declare class SimulatorOracle implements DBOracle {
+    #private;
     private contractDataOracle;
     private db;
     private keyStore;
@@ -49,7 +50,7 @@ export declare class SimulatorOracle implements DBOracle {
     getCommitmentIndex(commitment: Fr): Promise<bigint | undefined>;
     getCommitmentValue(_leafIndex: bigint): Promise<Fr | undefined>;
     getNullifierIndex(nullifier: Fr): Promise<bigint | undefined>;
-    findLeafIndex(blockNumber: number, treeId: MerkleTreeId, leafValue: Fr): Promise<bigint | undefined>;
+    findLeafIndex(blockNumber: L2BlockNumber, treeId: MerkleTreeId, leafValue: Fr): Promise<bigint | undefined>;
     getSiblingPath(blockNumber: number, treeId: MerkleTreeId, leafIndex: bigint): Promise<Fr[]>;
     getNullifierMembershipWitnessAtLatestBlock(nullifier: Fr): Promise<NullifierMembershipWitness | undefined>;
     getNullifierMembershipWitness(blockNumber: number, nullifier: Fr): Promise<NullifierMembershipWitness | undefined>;
@@ -69,21 +70,42 @@ export declare class SimulatorOracle implements DBOracle {
      */
     getBlockNumber(): Promise<number>;
     getDebugFunctionName(contractAddress: AztecAddress, selector: FunctionSelector): Promise<string>;
+    /**
+     * Returns the full contents of your address book.
+     * This is used when calculating tags for incoming notes by deriving the shared secret, the contract-siloed tagging secret, and
+     * finally the index specified tag. We will then query the node with this tag for each address in the address book.
+     * @returns The full list of the users contact addresses.
+     */
+    getContacts(): AztecAddress[];
     /**
      * Returns the tagging secret for a given sender and recipient pair. For this to work, the ivpsk_m of the sender must be known.
-     * Includes the last known index used for tagging with this secret.
+     * 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.
      */
-    getAppTaggingSecret(contractAddress: AztecAddress, sender: AztecAddress, recipient: AztecAddress): Promise<IndexedTaggingSecret>;
+    getAppTaggingSecretAsSender(contractAddress: AztecAddress, sender: AztecAddress, recipient: AztecAddress): Promise<IndexedTaggingSecret>;
     /**
-     * Returns the siloed tagging secrets for a given recipient and all the senders in the address book
+     * Increments the tagging secret for a given sender and recipient pair. For this to work, the ivpsk_m of the sender must be known.
      * @param contractAddress - The contract address to silo the secret for
-     * @param recipient - The address receiving the notes
-     * @returns A list of siloed tagging secrets
+     * @param sender - The address sending the note
+     * @param recipient - The address receiving the note
+     */
+    incrementAppTaggingSecretIndexAsSender(contractAddress: AztecAddress, sender: AztecAddress, recipient: AztecAddress): Promise<void>;
+    /**
+     * Synchronizes the logs tagged with scoped addresses and all the senders in the addressbook.
+     * 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
+     */
+    syncTaggedLogs(contractAddress: AztecAddress, maxBlockNumber: number, scopes?: AztecAddress[]): Promise<Map<string, TxScopedL2Log[]>>;
+    /**
+     * Processes the tagged logs returned by syncTaggedLogs by decrypting them and storing them in the database.
+     * @param logs - The logs to process.
+     * @param recipient - The recipient of the logs.
      */
-    getAppTaggingSecretsForSenders(contractAddress: AztecAddress, recipient: AztecAddress): Promise<IndexedTaggingSecret[]>;
+    processTaggedLogs(logs: TxScopedL2Log[], recipient: AztecAddress, simulator?: AcirSimulator): Promise<void>;
 }
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/simulator_oracle/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/simulator_oracle/index.ts"],"names":[],"mappings":"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"}

package/dest/simulator_oracle/index.js

@@ -1,14 +1,19 @@
-import { MerkleTreeId, getNonNullifiedL1ToL2MessageWitness, } from '@aztec/circuit-types';
-import { IndexedTaggingSecret, computeTaggingSecret, } from '@aztec/circuits.js';
+var _SimulatorOracle_instances, _SimulatorOracle_calculateTaggingSecret, _SimulatorOracle_getAppTaggingSecretsForContacts, _SimulatorOracle_decryptTaggedLogs;
+import { __classPrivateFieldGet } from "tslib";
+import { L1NotePayload, MerkleTreeId, getNonNullifiedL1ToL2MessageWitness, } from '@aztec/circuit-types';
+import { Fr, IndexedTaggingSecret, computeAddressSecret, computePoint, computeTaggingSecret, } from '@aztec/circuits.js';
 import { getFunctionArtifact } from '@aztec/foundation/abi';
 import { poseidon2Hash } from '@aztec/foundation/crypto';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { MessageLoadOracleInputs } from '@aztec/simulator';
+import { produceNoteDaos } from '../note_decryption_utils/produce_note_daos.js';
+import { getAcirSimulator } from '../simulator/index.js';
 /**
  * A data oracle that provides information needed for simulating a transaction.
  */
 export class SimulatorOracle {
     constructor(contractDataOracle, db, keyStore, aztecNode, log = createDebugLogger('aztec:pxe:simulator_oracle')) {
+        _SimulatorOracle_instances.add(this);
         this.contractDataOracle = contractDataOracle;
         this.db = db;
         this.keyStore = keyStore;
@@ -22,7 +27,7 @@ export class SimulatorOracle {
         const completeAddress = await this.db.getCompleteAddress(account);
         if (!completeAddress) {
             throw new Error(`No public key registered for address ${account}.
-        Register it by calling pxe.registerRecipient(...) or pxe.registerAccount(...).\nSee docs for context: https://docs.aztec.network/reference/common_errors/aztecnr-errors#simulation-error-no-public-key-registered-for-address-0x0-register-it-by-calling-pxeregisterrecipient-or-pxeregisteraccount`);
+        Register it by calling pxe.registerAccount(...).\nSee docs for context: https://docs.aztec.network/reference/common_errors/aztecnr-errors#simulation-error-no-public-key-registered-for-address-0x0-register-it-by-calling-pxeregisterrecipient-or-pxeregisteraccount`);
         }
         return completeAddress;
     }
@@ -101,17 +106,18 @@ export class SimulatorOracle {
      * @returns - The index of the commitment. Undefined if it does not exist in the tree.
      */
     async getCommitmentIndex(commitment) {
-        return await this.aztecNode.findLeafIndex('latest', MerkleTreeId.NOTE_HASH_TREE, commitment);
+        return await this.findLeafIndex('latest', MerkleTreeId.NOTE_HASH_TREE, commitment);
     }
     // We need this in public as part of the EXISTS calls - but isn't used in private
     getCommitmentValue(_leafIndex) {
         throw new Error('Unimplemented in private!');
     }
     async getNullifierIndex(nullifier) {
-        return await this.aztecNode.findLeafIndex('latest', MerkleTreeId.NULLIFIER_TREE, nullifier);
+        return await this.findLeafIndex('latest', MerkleTreeId.NULLIFIER_TREE, nullifier);
     }
     async findLeafIndex(blockNumber, treeId, leafValue) {
-        return await this.aztecNode.findLeafIndex(blockNumber, treeId, leafValue);
+        const [leafIndex] = await this.aztecNode.findLeavesIndexes(blockNumber, treeId, [leafValue]);
+        return leafIndex;
     }
     async getSiblingPath(blockNumber, treeId, leafIndex) {
         switch (treeId) {
@@ -161,42 +167,229 @@ export class SimulatorOracle {
     getDebugFunctionName(contractAddress, selector) {
         return this.contractDataOracle.getDebugFunctionName(contractAddress, selector);
     }
+    /**
+     * Returns the full contents of your address book.
+     * This is used when calculating tags for incoming notes by deriving the shared secret, the contract-siloed tagging secret, and
+     * finally the index specified tag. We will then query the node with this tag for each address in the address book.
+     * @returns The full list of the users contact addresses.
+     */
+    getContacts() {
+        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.
-     * Includes the last known index used for tagging with this secret.
+     * 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.
      */
-    async getAppTaggingSecret(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 secret = poseidon2Hash([sharedSecret.x, sharedSecret.y, contractAddress]);
-        const [index] = await this.db.getTaggingSecretsIndexes([secret]);
+    async getAppTaggingSecretAsSender(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);
     }
     /**
-     * Returns the siloed tagging secrets for a given recipient and all the senders in the address book
+     * Increments the tagging secret for a given sender and recipient pair. For this to work, the ivpsk_m of the sender must be known.
      * @param contractAddress - The contract address to silo the secret for
-     * @param recipient - The address receiving the notes
-     * @returns A list of siloed tagging secrets
+     * @param sender - The address sending the note
+     * @param recipient - The address receiving the note
      */
-    async getAppTaggingSecretsForSenders(contractAddress, recipient) {
-        const recipientCompleteAddress = await this.getCompleteAddress(recipient);
-        const completeAddresses = await this.db.getCompleteAddresses();
-        // Filter out the addresses corresponding to accounts
-        const accounts = await this.keyStore.getAccounts();
-        const senders = completeAddresses.filter(completeAddress => !accounts.find(account => account.equals(completeAddress.address)));
-        const recipientIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(recipient);
-        const secrets = senders.map(({ address: sender }) => {
-            const sharedSecret = computeTaggingSecret(recipientCompleteAddress, recipientIvsk, sender);
-            return poseidon2Hash([sharedSecret.x, sharedSecret.y, contractAddress]);
+    async incrementAppTaggingSecretIndexAsSender(contractAddress, sender, recipient) {
+        const secret = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_calculateTaggingSecret).call(this, contractAddress, sender, recipient);
+        const contractName = await this.contractDataOracle.getDebugContractName(contractAddress);
+        this.log.verbose(`Incrementing secret ${secret} as sender ${sender} for recipient: ${recipient} at contract: ${contractName}(${contractAddress})`);
+        await this.db.incrementTaggingSecretsIndexesAsSender([secret]);
+    }
+    /**
+     * Synchronizes the logs tagged with scoped addresses and all the senders in the addressbook.
+     * 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) {
+        const recipients = scopes ? scopes : await this.keyStore.getAccounts();
+        const result = 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 inadvertedly 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.computeTag(recipient));
+                const logsByTags = await this.aztecNode.getLogsByTags(currentTags);
+                const newTaggingSecrets = [];
+                logsByTags.forEach((logsByTag, logIndex) => {
+                    const { secret: currentSecret, index: currentIndex } = currentTagggingSecrets[logIndex];
+                    const currentSecretAsStr = currentSecret.toString();
+                    this.log.debug(`Syncing logs for recipient ${recipient}, secret ${currentSecretAsStr}:${currentIndex} at contract: ${contractName}(${contractAddress})`);
+                    // 3.1. Append logs to the list and increment the index for the tags that have logs (#9380)
+                    if (logsByTag.length > 0) {
+                        this.log.verbose(`Found ${logsByTag.length} logs for secret ${currentSecretAsStr} as recipient ${recipient}. Incrementing index to ${currentIndex + 1} at contract: ${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] = currentIndex + 1;
+                            // 3.3. Slide the window forwards if we have found logs beyond the initial index
+                            maxIndexesToCheck[currentSecretAsStr] = currentIndex + INDEX_OFFSET;
+                        }
+                    }
+                    // 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.fromString(secret), secretsToIncrement[secret])));
+                currentTagggingSecrets = newTaggingSecrets;
+            }
+            result.set(recipient.toString(), logs.filter(log => log.blockNumber <= maxBlockNumber));
+        }
+        return result;
+    }
+    /**
+     * Processes the tagged logs returned by syncTaggedLogs by decrypting them and storing them in the database.
+     * @param logs - The logs to process.
+     * @param recipient - The recipient of the logs.
+     */
+    async processTaggedLogs(logs, recipient, simulator) {
+        const { incomingNotes, outgoingNotes } = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_decryptTaggedLogs).call(this, logs, recipient, simulator);
+        if (incomingNotes.length || outgoingNotes.length) {
+            await this.db.addNotes(incomingNotes, outgoingNotes, recipient);
+            incomingNotes.forEach(noteDao => {
+                this.log.verbose(`Added incoming note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot} with nullifier ${noteDao.siloedNullifier.toString()}`);
+            });
+            outgoingNotes.forEach(noteDao => {
+                this.log.verbose(`Added outgoing note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot}`);
+            });
+        }
+        const nullifiedNotes = [];
+        const currentNotesForRecipient = await this.db.getIncomingNotes({ owner: recipient });
+        const nullifierIndexes = await this.aztecNode.findLeavesIndexes('latest', MerkleTreeId.NULLIFIER_TREE, currentNotesForRecipient.map(note => note.siloedNullifier));
+        const foundNullifiers = currentNotesForRecipient
+            .filter((_, i) => nullifierIndexes[i] !== undefined)
+            .map(note => note.siloedNullifier);
+        await this.db.removeNullifiedNotes(foundNullifiers, computePoint(recipient));
+        nullifiedNotes.forEach(noteDao => {
+            this.log.verbose(`Removed note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot} with nullifier ${noteDao.siloedNullifier.toString()}`);
         });
-        const indexes = await this.db.getTaggingSecretsIndexes(secrets);
-        return secrets.map((secret, i) => new IndexedTaggingSecret(secret, indexes[i]));
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/simulator_oracle/index.ts"],"names":[],"mappings":"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"}
+_SimulatorOracle_instances = new WeakSet(), _SimulatorOracle_calculateTaggingSecret = async function _SimulatorOracle_calculateTaggingSecret(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 = 
+/**
+ * Returns the siloed 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
+ */
+async function _SimulatorOracle_getAppTaggingSecretsForContacts(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 = [...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);
+        return poseidon2Hash([sharedSecret.x, sharedSecret.y, contractAddress]);
+    });
+    const indexes = await this.db.getTaggingSecretsIndexesAsRecipient(appTaggingSecrets);
+    return appTaggingSecrets.map((secret, i) => new IndexedTaggingSecret(secret, indexes[i]));
+}, _SimulatorOracle_decryptTaggedLogs = 
+/**
+ * Decrypts logs tagged for a recipient and returns them.
+ * @param scopedLogs - The logs to decrypt.
+ * @param recipient - The recipient of the logs.
+ * @param simulator - The simulator to use for decryption.
+ * @returns The decrypted notes.
+ */
+async function _SimulatorOracle_decryptTaggedLogs(scopedLogs, recipient, simulator) {
+    const recipientCompleteAddress = await this.getCompleteAddress(recipient);
+    const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
+    const addressSecret = computeAddressSecret(recipientCompleteAddress.getPreaddress(), ivskM);
+    const ovskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterOutgoingViewingPublicKey);
+    // Since we could have notes with the same index for different txs, we need
+    // to keep track of them scoping by txHash
+    const excludedIndices = new Map();
+    const incomingNotes = [];
+    const outgoingNotes = [];
+    const txEffectsCache = new Map();
+    for (const scopedLog of scopedLogs) {
+        const incomingNotePayload = L1NotePayload.decryptAsIncoming(scopedLog.logData, addressSecret, scopedLog.isFromPublic);
+        const outgoingNotePayload = L1NotePayload.decryptAsOutgoing(scopedLog.logData, ovskM, scopedLog.isFromPublic);
+        if (incomingNotePayload || outgoingNotePayload) {
+            if (incomingNotePayload && outgoingNotePayload && !incomingNotePayload.equals(outgoingNotePayload)) {
+                this.log.warn(`Incoming and outgoing note payloads do not match. Incoming: ${JSON.stringify(incomingNotePayload)}, Outgoing: ${JSON.stringify(outgoingNotePayload)}`);
+                continue;
+            }
+            const payload = incomingNotePayload || outgoingNotePayload;
+            const txEffect = txEffectsCache.get(scopedLog.txHash.toString()) ?? (await this.aztecNode.getTxEffect(scopedLog.txHash));
+            if (!txEffect) {
+                this.log.warn(`No tx effect found for ${scopedLog.txHash} while decrypting tagged logs`);
+                continue;
+            }
+            txEffectsCache.set(scopedLog.txHash.toString(), txEffect);
+            if (!excludedIndices.has(scopedLog.txHash.toString())) {
+                excludedIndices.set(scopedLog.txHash.toString(), new Set());
+            }
+            const { incomingNote, outgoingNote } = await produceNoteDaos(
+            // I don't like this at all, but we need a simulator to run `computeNoteHashAndOptionallyANullifier`. This generates
+            // a chicken-and-egg problem due to this oracle requiring a simulator, which in turn requires this oracle. Furthermore, since jest doesn't allow
+            // mocking ESM exports, we have to pollute the method even more by providing a simulator parameter so tests can inject a fake one.
+            simulator ?? getAcirSimulator(this.db, this.aztecNode, this.keyStore, this.contractDataOracle), this.db, incomingNotePayload ? computePoint(recipient) : undefined, outgoingNotePayload ? recipientCompleteAddress.publicKeys.masterOutgoingViewingPublicKey : undefined, payload, txEffect.txHash, txEffect.noteHashes, scopedLog.dataStartIndexForTx, excludedIndices.get(scopedLog.txHash.toString()), this.log);
+            if (incomingNote) {
+                incomingNotes.push(incomingNote);
+            }
+            if (outgoingNote) {
+                outgoingNotes.push(outgoingNote);
+            }
+        }
+    }
+    return { incomingNotes, outgoingNotes };
+};
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/simulator_oracle/index.ts"],"names":[],"mappings":"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"}

package/dest/synchronizer/synchronizer.d.ts

@@ -1,7 +1,5 @@
 import { type AztecNode } from '@aztec/circuit-types';
-import { type AztecAddress, type CompleteAddress } from '@aztec/circuits.js';
 import { type SerialQueue } from '@aztec/foundation/queue';
-import { type KeyStore } from '@aztec/key-store';
 import { type PxeDatabase } from '../database/index.js';
 /**
  * The Synchronizer class manages the synchronization of note processors and interacts with the Aztec node
@@ -11,16 +9,13 @@ import { type PxeDatabase } from '../database/index.js';
  * in sync with the blockchain while handling retries and errors gracefully.
  */
 export declare class Synchronizer {
-    #private;
     private node;
     private db;
     private jobQueue;
     private runningPromise?;
-    private noteProcessors;
     private running;
     private initialSyncBlockNumber;
     private log;
-    private noteProcessorsToCatchUp;
     constructor(node: AztecNode, db: PxeDatabase, jobQueue: SerialQueue, logSuffix?: string);
     /**
      * Starts the synchronization process by fetching encrypted logs and blocks from a specified position.
@@ -51,14 +46,6 @@ export declare class Synchronizer {
      * @returns true if there could be more work, false if we're caught up or there was an error.
      */
     protected work(limit?: number): Promise<boolean>;
-    /**
-     * Catch up note processors that are lagging behind the main sync.
-     * e.g. because we just added a new account.
-     *
-     * @param limit - the maximum number of encrypted, unencrypted logs and blocks to fetch in each iteration.
-     * @returns true if there could be more work, false if there was an error which allows a retry with delay.
-     */
-    protected workNoteProcessorCatchUp(limit?: number): Promise<boolean>;
     private setHeaderFromBlock;
     /**
      * Stops the synchronizer gracefully, interrupting any ongoing sleep and waiting for the current
@@ -68,26 +55,6 @@ export declare class Synchronizer {
      * @returns A promise that resolves when the synchronizer has successfully stopped.
      */
     stop(): Promise<void>;
-    /**
-     * Add a new account to the Synchronizer with the specified private key.
-     * Creates a NoteProcessor instance for the account and pushes it into the noteProcessors array.
-     * The method resolves immediately after pushing the new note processor.
-     *
-     * @param publicKey - The public key for the account.
-     * @param keyStore - The key store.
-     * @param startingBlock - The block where to start scanning for notes for this accounts.
-     * @returns A promise that resolves once the account is added to the Synchronizer.
-     */
-    addAccount(account: CompleteAddress, keyStore: KeyStore, startingBlock: number): void;
-    /**
-     * Checks if the specified account is synchronized.
-     * @param account - The aztec address for which to query the sync status.
-     * @returns True if the account is fully synched, false otherwise.
-     * @remarks Checks whether all the notes from all the blocks have been processed. If it is not the case, the
-     *          retrieved information from contracts might be old/stale (e.g. old token balance).
-     * @throws If checking a sync status of account which is not registered.
-     */
-    isAccountStateSynchronized(account: AztecAddress): Promise<boolean>;
     private getSynchedBlockNumber;
     /**
      * Checks whether all the blocks were processed (tree roots updated, txs updated with block info, etc.).
@@ -102,21 +69,6 @@ export declare class Synchronizer {
      */
     getSyncStatus(): {
         blocks: number;
-        notes: {
-            [k: string]: number;
-        };
-    };
-    /**
-     * Returns the note processor stats.
-     * @returns The note processor stats for notes for each public key being tracked.
-     */
-    getSyncStats(): {
-        [k: string]: import("@aztec/circuit-types/stats").NoteProcessorStats;
     };
-    /**
-     * Retry decoding any deferred notes for the specified contract address.
-     * @param contractAddress - the contract address that has just been added
-     */
-    reprocessDeferredNotesForContract(contractAddress: AztecAddress): Promise<void>;
 }
 //# sourceMappingURL=synchronizer.d.ts.map

package/dest/synchronizer/synchronizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAA2C,MAAM,sBAAsB,CAAC;AAE/F,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,eAAe,EAIrB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD;;;;;;GAMG;AACH,qBAAa,YAAY;;IAQX,OAAO,CAAC,IAAI;IAAa,OAAO,CAAC,EAAE;IAAe,OAAO,CAAC,QAAQ;IAP9E,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,sBAAsB,CAA4B;IAC1D,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,uBAAuB,CAAuB;gBAElC,IAAI,EAAE,SAAS,EAAU,EAAE,EAAE,WAAW,EAAU,QAAQ,EAAE,WAAW,EAAE,SAAS,SAAK;IAI3G;;;;;;;OAOG;IACU,KAAK,CAAC,KAAK,SAAI,EAAE,aAAa,SAAO;cAalC,WAAW;IAO3B;;;;;;;;;;OAUG;IACH,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM;IAgB5B;;;;;OAKG;cACa,IAAI,CAAC,KAAK,SAAI,GAAG,OAAO,CAAC,OAAO,CAAC;IAuBjD;;;;;;OAMG;cACa,wBAAwB,CAAC,KAAK,SAAI,GAAG,OAAO,CAAC,OAAO,CAAC;YA2FvD,kBAAkB;IAQhC;;;;;;OAMG;IACU,IAAI;IAMjB;;;;;;;;;OASG;IACI,UAAU,CAAC,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM;IAUrF;;;;;;;OAOG;IACU,0BAA0B,CAAC,OAAO,EAAE,YAAY;IAY7D,OAAO,CAAC,qBAAqB;IAI7B;;;;;OAKG;IACU,yBAAyB;IAKtC;;;OAGG;IACI,aAAa;;;;;;IAQpB;;;OAGG;IACI,YAAY;;;IAInB;;;OAGG;IACI,iCAAiC,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;CA0EvF"}
+{"version":3,"file":"synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAgB,MAAM,sBAAsB,CAAC;AAGpE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;;GAMG;AACH,qBAAa,YAAY;IAMX,OAAO,CAAC,IAAI;IAAa,OAAO,CAAC,EAAE;IAAe,OAAO,CAAC,QAAQ;IAL9E,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,sBAAsB,CAA4B;IAC1D,OAAO,CAAC,GAAG,CAAc;gBAEL,IAAI,EAAE,SAAS,EAAU,EAAE,EAAE,WAAW,EAAU,QAAQ,EAAE,WAAW,EAAE,SAAS,SAAK;IAI3G;;;;;;;OAOG;IACU,KAAK,CAAC,KAAK,SAAI,EAAE,aAAa,SAAO;cAalC,WAAW;IAO3B;;;;;;;;;;OAUG;IACH,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM;IAU5B;;;;;OAKG;cACa,IAAI,CAAC,KAAK,SAAI,GAAG,OAAO,CAAC,OAAO,CAAC;YAkBnC,kBAAkB;IAQhC;;;;;;OAMG;IACU,IAAI;IAMjB,OAAO,CAAC,qBAAqB;IAI7B;;;;;OAKG;IACU,yBAAyB;IAKtC;;;OAGG;IACI,aAAa;;;CAMrB"}