@aztec/pxe 0.62.0 → 0.63.1

package/dest/synchronizer/synchronizer.js

@@ -1,10 +1,6 @@
-var _Synchronizer_instances, _Synchronizer_reprocessDeferredNotesForContract, _Synchronizer_removeNullifiedNotes;
-import { __classPrivateFieldGet } from "tslib";
-import { MerkleTreeId } from '@aztec/circuit-types';
-import { INITIAL_L2_BLOCK_NUM, } from '@aztec/circuits.js';
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
-import { NoteProcessor } from '../note_processor/index.js';
 /**
  * The Synchronizer class manages the synchronization of note processors and interacts with the Aztec node
  * to obtain encrypted logs, blocks, and other necessary information for the accounts.
@@ -14,14 +10,11 @@ import { NoteProcessor } from '../note_processor/index.js';
  */
 export class Synchronizer {
     constructor(node, db, jobQueue, logSuffix = '') {
-        _Synchronizer_instances.add(this);
         this.node = node;
         this.db = db;
         this.jobQueue = jobQueue;
-        this.noteProcessors = [];
         this.running = false;
         this.initialSyncBlockNumber = INITIAL_L2_BLOCK_NUM - 1;
-        this.noteProcessorsToCatchUp = [];
         this.log = createDebugLogger(logSuffix ? `aztec:pxe_synchronizer_${logSuffix}` : 'aztec:pxe_synchronizer');
     }
     /**
@@ -65,14 +58,7 @@ export class Synchronizer {
             let moreWork = true;
             // keep external this.running flag to interrupt greedy sync
             while (moreWork && this.running) {
-                if (this.noteProcessorsToCatchUp.length > 0) {
-                    // There is a note processor that needs to catch up. We hijack the main loop to catch up the note processor.
-                    moreWork = await this.workNoteProcessorCatchUp(limit);
-                }
-                else {
-                    // No note processor needs to catch up. We continue with the normal flow.
-                    moreWork = await this.work(limit);
-                }
+                moreWork = await this.work(limit);
             }
         });
     }
@@ -92,10 +78,6 @@ export class Synchronizer {
             // Update latest tree roots from the most recent block
             const latestBlock = blocks[blocks.length - 1];
             await this.setHeaderFromBlock(latestBlock);
-            this.log.debug(`Forwarding ${blocks.length} blocks to ${this.noteProcessors.length} note processors`);
-            for (const noteProcessor of this.noteProcessors) {
-                await noteProcessor.process(blocks);
-            }
             return true;
         }
         catch (err) {
@@ -103,86 +85,6 @@ export class Synchronizer {
             return false;
         }
     }
-    /**
-     * 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.
-     */
-    async workNoteProcessorCatchUp(limit = 1) {
-        const toBlockNumber = this.getSynchedBlockNumber();
-        // filter out note processors that are already caught up
-        // and sort them by the block number they are lagging behind in ascending order
-        const noteProcessorsToCatchUp = [];
-        this.noteProcessorsToCatchUp.forEach(noteProcessor => {
-            if (noteProcessor.status.syncedToBlock >= toBlockNumber) {
-                // Note processor is ahead of main sync, nothing to do
-                this.noteProcessors.push(noteProcessor);
-            }
-            else {
-                noteProcessorsToCatchUp.push(noteProcessor);
-            }
-        });
-        this.noteProcessorsToCatchUp = noteProcessorsToCatchUp;
-        if (!this.noteProcessorsToCatchUp.length) {
-            // No note processors to catch up, nothing to do here,
-            // but we return true to continue with the normal flow.
-            return true;
-        }
-        // create a copy so that:
-        // 1. we can modify the original array while iterating over it
-        // 2. we don't need to serialize insertions into the array
-        const catchUpGroup = this.noteProcessorsToCatchUp
-            .slice()
-            // sort by the block number they are lagging behind
-            .sort((a, b) => a.status.syncedToBlock - b.status.syncedToBlock);
-        // grab the note processor that is lagging behind the most
-        const from = catchUpGroup[0].status.syncedToBlock + 1;
-        // Ensuring that the note processor does not sync further than the main sync.
-        limit = Math.min(limit, toBlockNumber - from + 1);
-        // this.log(`Catching up ${catchUpGroup.length} note processors by up to ${limit} blocks starting at block ${from}`);
-        if (limit < 1) {
-            throw new Error(`Unexpected limit ${limit} for note processor catch up`);
-        }
-        try {
-            const blocks = await this.node.getBlocks(from, limit);
-            if (!blocks.length) {
-                // This should never happen because this function should only be called when the note processor is lagging
-                // behind main sync.
-                throw new Error('No blocks in processor catch up mode');
-            }
-            for (const noteProcessor of catchUpGroup) {
-                // find the index of the first block that the note processor is not yet synced to
-                const index = blocks.findIndex(block => block.number > noteProcessor.status.syncedToBlock);
-                if (index === -1) {
-                    // Due to the limit, we might not have fetched a new enough block for the note processor.
-                    // And since the group is sorted, we break as soon as we find a note processor
-                    // that needs blocks newer than the newest block we fetched.
-                    break;
-                }
-                this.log.debug(`Catching up note processor ${noteProcessor.account.toString()} by processing ${blocks.length - index} blocks`);
-                await noteProcessor.process(blocks.slice(index));
-                if (noteProcessor.status.syncedToBlock === toBlockNumber) {
-                    // Note processor caught up, move it to `noteProcessors` from `noteProcessorsToCatchUp`.
-                    this.log.debug(`Note processor for ${noteProcessor.account.toString()} has caught up`, {
-                        eventName: 'note-processor-caught-up',
-                        account: noteProcessor.account.toString(),
-                        duration: noteProcessor.timer.ms(),
-                        dbSize: await this.db.estimateSize(),
-                        ...noteProcessor.stats,
-                    });
-                    this.noteProcessorsToCatchUp = this.noteProcessorsToCatchUp.filter(np => !np.account.equals(noteProcessor.account));
-                    this.noteProcessors.push(noteProcessor);
-                }
-            }
-            return true; // could be more work, immediately continue syncing
-        }
-        catch (err) {
-            this.log.error(`Error in synchronizer workNoteProcessorCatchUp`, err);
-            return false;
-        }
-    }
     async setHeaderFromBlock(latestBlock) {
         if (latestBlock.number < this.initialSyncBlockNumber) {
             return;
@@ -201,40 +103,6 @@ export class Synchronizer {
         await this.runningPromise?.stop();
         this.log.info('Stopped');
     }
-    /**
-     * 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, keyStore, startingBlock) {
-        const predicate = (x) => x.account.equals(account);
-        const processor = this.noteProcessors.find(predicate) ?? this.noteProcessorsToCatchUp.find(predicate);
-        if (processor) {
-            return;
-        }
-        this.noteProcessorsToCatchUp.push(NoteProcessor.create(account, keyStore, this.db, this.node, startingBlock));
-    }
-    /**
-     * 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.
-     */
-    async isAccountStateSynchronized(account) {
-        const findByAccountAddress = (x) => x.account.address.equals(account);
-        const processor = this.noteProcessors.find(findByAccountAddress) ?? this.noteProcessorsToCatchUp.find(findByAccountAddress);
-        if (!processor) {
-            throw new Error(`Checking if account is synched is not possible for ${account} because it is only registered as a recipient.`);
-        }
-        return await processor.isSynchronized();
-    }
     getSynchedBlockNumber() {
         return this.db.getBlockNumber() ?? this.initialSyncBlockNumber;
     }
@@ -256,73 +124,7 @@ export class Synchronizer {
         const lastBlockNumber = this.getSynchedBlockNumber();
         return {
             blocks: lastBlockNumber,
-            notes: Object.fromEntries(this.noteProcessors.map(n => [n.account.address.toString(), n.status.syncedToBlock])),
         };
     }
-    /**
-     * Returns the note processor stats.
-     * @returns The note processor stats for notes for each public key being tracked.
-     */
-    getSyncStats() {
-        return Object.fromEntries(this.noteProcessors.map(n => [n.account.address.toString(), n.stats]));
-    }
-    /**
-     * Retry decoding any deferred notes for the specified contract address.
-     * @param contractAddress - the contract address that has just been added
-     */
-    reprocessDeferredNotesForContract(contractAddress) {
-        return this.jobQueue.put(() => __classPrivateFieldGet(this, _Synchronizer_instances, "m", _Synchronizer_reprocessDeferredNotesForContract).call(this, contractAddress));
-    }
 }
-_Synchronizer_instances = new WeakSet(), _Synchronizer_reprocessDeferredNotesForContract = async function _Synchronizer_reprocessDeferredNotesForContract(contractAddress) {
-    const deferredNotes = await this.db.getDeferredNotesByContract(contractAddress);
-    // group deferred notes by txHash to properly deal with possible duplicates
-    const txHashToDeferredNotes = new Map();
-    for (const note of deferredNotes) {
-        const notesForTx = txHashToDeferredNotes.get(note.txHash) ?? [];
-        notesForTx.push(note);
-        txHashToDeferredNotes.set(note.txHash, notesForTx);
-    }
-    // keep track of decoded notes
-    const incomingNotes = [];
-    // now process each txHash
-    for (const deferredNotes of txHashToDeferredNotes.values()) {
-        // to be safe, try each note processor in case the deferred notes are for different accounts.
-        for (const processor of this.noteProcessors) {
-            const { incomingNotes: inNotes, outgoingNotes: outNotes } = await processor.decodeDeferredNotes(deferredNotes);
-            incomingNotes.push(...inNotes);
-            await this.db.addNotes(inNotes, outNotes, processor.account.address);
-            inNotes.forEach(noteDao => {
-                this.log.debug(`Decoded deferred incoming note under account ${processor.account.toString()} for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot} with nullifier ${noteDao.siloedNullifier.toString()}`);
-            });
-            outNotes.forEach(noteDao => {
-                this.log.debug(`Decoded deferred outgoing note under account ${processor.account.toString()} for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot}`);
-            });
-        }
-    }
-    // now drop the deferred notes, and add the decoded notes
-    await this.db.removeDeferredNotesByContract(contractAddress);
-    await __classPrivateFieldGet(this, _Synchronizer_instances, "m", _Synchronizer_removeNullifiedNotes).call(this, incomingNotes);
-}, _Synchronizer_removeNullifiedNotes = async function _Synchronizer_removeNullifiedNotes(notes) {
-    // now group the decoded incoming notes by public key
-    const addressPointToIncomingNotes = new Map();
-    for (const noteDao of notes) {
-        const notesForAddressPoint = addressPointToIncomingNotes.get(noteDao.addressPoint) ?? [];
-        notesForAddressPoint.push(noteDao);
-        addressPointToIncomingNotes.set(noteDao.addressPoint, notesForAddressPoint);
-    }
-    // now for each group, look for the nullifiers in the nullifier tree
-    for (const [publicKey, notes] of addressPointToIncomingNotes.entries()) {
-        const nullifiers = notes.map(n => n.siloedNullifier);
-        const relevantNullifiers = [];
-        for (const nullifier of nullifiers) {
-            // NOTE: this leaks information about the nullifiers I'm interested in to the node.
-            const found = await this.node.findLeafIndex('latest', MerkleTreeId.NULLIFIER_TREE, nullifier);
-            if (found) {
-                relevantNullifiers.push(nullifier);
-            }
-        }
-        await this.db.removeNullifiedNotes(relevantNullifiers, publicKey);
-    }
-};
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"synchronizer.js","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAgC,YAAY,EAAe,MAAM,sBAAsB,CAAC;AAE/F,OAAO,EAIL,oBAAoB,GAErB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAoB,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE5E,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAMnE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D;;;;;;GAMG;AACH,MAAM,OAAO,YAAY;IAQvB,YAAoB,IAAe,EAAU,EAAe,EAAU,QAAqB,EAAE,SAAS,GAAG,EAAE;;QAAvF,SAAI,GAAJ,IAAI,CAAW;QAAU,OAAE,GAAF,EAAE,CAAa;QAAU,aAAQ,GAAR,QAAQ,CAAa;QANnF,mBAAc,GAAoB,EAAE,CAAC;QACrC,YAAO,GAAG,KAAK,CAAC;QAChB,2BAAsB,GAAG,oBAAoB,GAAG,CAAC,CAAC;QAElD,4BAAuB,GAAoB,EAAE,CAAC;QAGpD,IAAI,CAAC,GAAG,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,0BAA0B,SAAS,EAAE,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC;IAC7G,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,aAAa,GAAG,IAAI;QAChD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAClD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC,CAAC;QAChF,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IACjC,CAAC;IAES,KAAK,CAAC,WAAW;QACzB,mCAAmC;QACnC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QACjD,IAAI,CAAC,sBAAsB,GAAG,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1F,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IACxC,CAAC;IAED;;;;;;;;;;OAUG;IACO,IAAI,CAAC,KAAa;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YAClC,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,2DAA2D;YAC3D,OAAO,QAAQ,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBAChC,IAAI,IAAI,CAAC,uBAAuB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5C,4GAA4G;oBAC5G,QAAQ,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;gBACxD,CAAC;qBAAM,CAAC;oBACN,yEAAyE;oBACzE,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACpC,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACO,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;QAC9C,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACtD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,sDAAsD;YACtD,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC9C,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAE3C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,MAAM,CAAC,MAAM,cAAc,IAAI,CAAC,cAAc,CAAC,MAAM,kBAAkB,CAAC,CAAC;YACtG,KAAK,MAAM,aAAa,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBAChD,MAAM,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACtC,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;YAClD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,wBAAwB,CAAC,KAAK,GAAG,CAAC;QAChD,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAEnD,wDAAwD;QACxD,+EAA+E;QAC/E,MAAM,uBAAuB,GAAoB,EAAE,CAAC;QAEpD,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;YACnD,IAAI,aAAa,CAAC,MAAM,CAAC,aAAa,IAAI,aAAa,EAAE,CAAC;gBACxD,sDAAsD;gBACtD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBACN,uBAAuB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,uBAAuB,GAAG,uBAAuB,CAAC;QAEvD,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,CAAC;YACzC,sDAAsD;YACtD,uDAAuD;YACvD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,yBAAyB;QACzB,8DAA8D;QAC9D,0DAA0D;QAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,uBAAuB;aAC9C,KAAK,EAAE;YACR,mDAAmD;aAClD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAEnE,0DAA0D;QAC1D,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,GAAG,CAAC,CAAC;QACtD,6EAA6E;QAC7E,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC;QAClD,qHAAqH;QAErH,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,oBAAoB,KAAK,8BAA8B,CAAC,CAAC;QAC3E,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACtD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,0GAA0G;gBAC1G,oBAAoB;gBACpB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;YAC1D,CAAC;YAED,KAAK,MAAM,aAAa,IAAI,YAAY,EAAE,CAAC;gBACzC,iFAAiF;gBACjF,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;gBAC3F,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;oBACjB,yFAAyF;oBACzF,8EAA8E;oBAC9E,4DAA4D;oBAC5D,MAAM;gBACR,CAAC;gBAED,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,8BAA8B,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,kBAC5D,MAAM,CAAC,MAAM,GAAG,KAClB,SAAS,CACV,CAAC;gBACF,MAAM,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;gBAEjD,IAAI,aAAa,CAAC,MAAM,CAAC,aAAa,KAAK,aAAa,EAAE,CAAC;oBACzD,wFAAwF;oBACxF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,gBAAgB,EAAE;wBACrF,SAAS,EAAE,0BAA0B;wBACrC,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE;wBACzC,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,EAAE;wBAClC,MAAM,EAAE,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE;wBACpC,GAAG,aAAa,CAAC,KAAK;qBACc,CAAC,CAAC;oBAExC,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAChE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAChD,CAAC;oBACF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAC1C,CAAC;YACH,CAAC;YAED,OAAO,IAAI,CAAC,CAAC,mDAAmD;QAClE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gDAAgD,EAAE,GAAG,CAAC,CAAC;YACtE,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,WAAoB;QACnD,IAAI,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACrD,OAAO;QACT,CAAC;QAED,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,MAAM,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC;QAClC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED;;;;;;;;;OASG;IACI,UAAU,CAAC,OAAwB,EAAE,QAAkB,EAAE,aAAqB;QACnF,MAAM,SAAS,GAAG,CAAC,CAAgB,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAClE,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtG,IAAI,SAAS,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QAED,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC;IAChH,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,0BAA0B,CAAC,OAAqB;QAC3D,MAAM,oBAAoB,GAAG,CAAC,CAAgB,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrF,MAAM,SAAS,GACb,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAC5G,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,sDAAsD,OAAO,gDAAgD,CAC9G,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,SAAS,CAAC,cAAc,EAAE,CAAC;IAC1C,CAAC;IAEO,qBAAqB;QAC3B,OAAO,IAAI,CAAC,EAAE,CAAC,cAAc,EAAE,IAAI,IAAI,CAAC,sBAAsB,CAAC;IACjE,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,yBAAyB;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;QAChD,OAAO,MAAM,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAChD,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,MAAM,eAAe,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACrD,OAAO;YACL,MAAM,EAAE,eAAe;YACvB,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;SAChH,CAAC;IACJ,CAAC;IAED;;;OAGG;IACI,YAAY;QACjB,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnG,CAAC;IAED;;;OAGG;IACI,iCAAiC,CAAC,eAA6B;QACpE,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,uBAAA,IAAI,gFAAmC,MAAvC,IAAI,EAAoC,eAAe,CAAC,CAAC,CAAC;IAC3F,CAAC;CAwEF;2FAtEC,KAAK,0DAAoC,eAA6B;IACpE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,0BAA0B,CAAC,eAAe,CAAC,CAAC;IAEhF,2EAA2E;IAC3E,MAAM,qBAAqB,GAAmC,IAAI,GAAG,EAAE,CAAC;IACxE,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QACjC,MAAM,UAAU,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAChE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;IAED,8BAA8B;IAC9B,MAAM,aAAa,GAAsB,EAAE,CAAC;IAE5C,0BAA0B;IAC1B,KAAK,MAAM,aAAa,IAAI,qBAAqB,CAAC,MAAM,EAAE,EAAE,CAAC;QAC3D,6FAA6F;QAC7F,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YAC5C,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,MAAM,SAAS,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;YAC/G,aAAa,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;YAE/B,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAErE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBACxB,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,gDAAgD,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,iBAC1E,OAAO,CAAC,eACV,YAAY,OAAO,CAAC,WAAW,mBAAmB,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,CACvF,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBACzB,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,gDAAgD,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,iBAC1E,OAAO,CAAC,eACV,YAAY,OAAO,CAAC,WAAW,EAAE,CAClC,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,yDAAyD;IACzD,MAAM,IAAI,CAAC,EAAE,CAAC,6BAA6B,CAAC,eAAe,CAAC,CAAC;IAE7D,MAAM,uBAAA,IAAI,mEAAsB,MAA1B,IAAI,EAAuB,aAAa,CAAC,CAAC;AAClD,CAAC,uCAED,KAAK,6CAAuB,KAAwB;IAClD,qDAAqD;IACrD,MAAM,2BAA2B,GAAsC,IAAI,GAAG,EAAE,CAAC;IACjF,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE,CAAC;QAC5B,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QACzF,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnC,2BAA2B,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;IAC9E,CAAC;IAED,oEAAoE;IACpE,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,2BAA2B,CAAC,OAAO,EAAE,EAAE,CAAC;QACvE,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;QACrD,MAAM,kBAAkB,GAAS,EAAE,CAAC;QACpC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,mFAAmF;YACnF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,YAAY,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;YAC9F,IAAI,KAAK,EAAE,CAAC;gBACV,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACrC,CAAC;QACH,CAAC;QACD,MAAM,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;IACpE,CAAC;AACH,CAAC"}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luY2hyb25pemVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N5bmNocm9uaXplci9zeW5jaHJvbml6ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDMUQsT0FBTyxFQUFvQixpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTVFLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUluRTs7Ozs7O0dBTUc7QUFDSCxNQUFNLE9BQU8sWUFBWTtJQU12QixZQUFvQixJQUFlLEVBQVUsRUFBZSxFQUFVLFFBQXFCLEVBQUUsU0FBUyxHQUFHLEVBQUU7UUFBdkYsU0FBSSxHQUFKLElBQUksQ0FBVztRQUFVLE9BQUUsR0FBRixFQUFFLENBQWE7UUFBVSxhQUFRLEdBQVIsUUFBUSxDQUFhO1FBSm5GLFlBQU8sR0FBRyxLQUFLLENBQUM7UUFDaEIsMkJBQXNCLEdBQUcsb0JBQW9CLEdBQUcsQ0FBQyxDQUFDO1FBSXhELElBQUksQ0FBQyxHQUFHLEdBQUcsaUJBQWlCLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQywwQkFBMEIsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLHdCQUF3QixDQUFDLENBQUM7SUFDN0csQ0FBQztJQUVEOzs7Ozs7O09BT0c7SUFDSSxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssR0FBRyxDQUFDLEVBQUUsYUFBYSxHQUFHLElBQUk7UUFDaEQsSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDakIsT0FBTztRQUNULENBQUM7UUFDRCxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQztRQUVwQixNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDO1FBQ2xELElBQUksQ0FBQyxHQUFHLENBQUMsSUFB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

package/package.json

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

package/src/config/index.ts

@@ -5,6 +5,7 @@ import {
   getConfigFromMappings,
   numberConfigHelper,
 } from '@aztec/foundation/config';
+import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
 import { type Network } from '@aztec/types/network';
 
 import { readFileSync } from 'fs';
@@ -35,11 +36,9 @@ export interface PXEConfig {
   l2BlockPollingIntervalMS: number;
   /** L2 block to start scanning from for new accounts */
   l2StartingBlock: number;
-  /** Where to store PXE data. If not set, will store in memory */
-  dataDirectory?: string;
 }
 
-export type PXEServiceConfig = PXEConfig & KernelProverConfig & BBProverConfig;
+export type PXEServiceConfig = PXEConfig & KernelProverConfig & BBProverConfig & DataStoreConfig;
 
 export type CliPXEOptions = {
   /** External Aztec network to connect to. e.g. devnet */
@@ -51,6 +50,7 @@ export type CliPXEOptions = {
 };
 
 export const pxeConfigMappings: ConfigMappingsType<PXEServiceConfig> = {
+  ...dataConfigMappings,
   l2BlockPollingIntervalMS: {
     env: 'PXE_BLOCK_POLLING_INTERVAL_MS',
     description: 'The interval to wait between polling for new blocks.',
@@ -61,10 +61,6 @@ export const pxeConfigMappings: ConfigMappingsType<PXEServiceConfig> = {
     ...numberConfigHelper(INITIAL_L2_BLOCK_NUM),
     description: 'L2 block to start scanning from for new accounts',
   },
-  dataDirectory: {
-    env: 'PXE_DATA_DIRECTORY',
-    description: 'Where to store PXE data. If not set, will store in memory',
-  },
   bbBinaryPath: {
     env: 'BB_BINARY_PATH',
     description: 'Path to the BB binary',
@@ -111,6 +107,7 @@ export const pxeCliConfigMappings: ConfigMappingsType<CliPXEOptions> = {
 export const allPxeConfigMappings: ConfigMappingsType<CliPXEOptions & PXEServiceConfig> = {
   ...pxeConfigMappings,
   ...pxeCliConfigMappings,
+  ...dataConfigMappings,
   proverEnabled: {
     env: 'PXE_PROVER_ENABLED',
     parseEnv: (val: string) => ['1', 'true', 'TRUE'].includes(val) || !!process.env.NETWORK,

package/src/contract_data_oracle/index.ts

@@ -130,6 +130,11 @@ export class ContractDataOracle {
     return tree.getFunctionMembershipWitness(selector);
   }
 
+  public async getDebugContractName(contractAddress: AztecAddress) {
+    const tree = await this.getTreeForAddress(contractAddress);
+    return tree.getArtifact().name;
+  }
+
   public async getDebugFunctionName(contractAddress: AztecAddress, selector: FunctionSelector) {
     const tree = await this.getTreeForAddress(contractAddress);
     const { name: contractName } = tree.getArtifact();

package/src/database/incoming_note_dao.ts

@@ -5,7 +5,7 @@ import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type NoteData } from '@aztec/simulator';
 
-import { type NoteInfo } from '../note_processor/utils/index.js';
+import { type NoteInfo } from '../note_decryption_utils/index.js';
 
 /**
  * A note with contextual data which was decrypted as incoming.

package/src/database/kv_pxe_database.ts

@@ -4,9 +4,9 @@ import {
   CompleteAddress,
   type ContractInstanceWithAddress,
   Header,
+  type IndexedTaggingSecret,
   type PublicKey,
   SerializableContractInstance,
-  type TaggingSecret,
   computePoint,
 } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
@@ -22,7 +22,6 @@ import {
 } from '@aztec/kv-store';
 import { contractArtifactFromBuffer, contractArtifactToBuffer } from '@aztec/types/abi';
 
-import { DeferredNoteDao } from './deferred_note_dao.js';
 import { IncomingNoteDao } from './incoming_note_dao.js';
 import { OutgoingNoteDao } from './outgoing_note_dao.js';
 import { type PxeDatabase } from './pxe_database.js';
@@ -45,8 +44,6 @@ export class KVPxeDatabase implements PxeDatabase {
   #nullifiedNotesByStorageSlot: AztecMultiMap<string, string>;
   #nullifiedNotesByTxHash: AztecMultiMap<string, string>;
   #nullifiedNotesByAddressPoint: AztecMultiMap<string, string>;
-  #deferredNotes: AztecArray<Buffer | null>;
-  #deferredNotesByContract: AztecMultiMap<string, number>;
   #syncedBlockPerPublicKey: AztecMap<string, number>;
   #contractArtifacts: AztecMap<string, Buffer>;
   #contractInstances: AztecMap<string, Buffer>;
@@ -64,7 +61,11 @@ export class KVPxeDatabase implements PxeDatabase {
   #notesByTxHashAndScope: Map<string, AztecMultiMap<string, string>>;
   #notesByAddressPointAndScope: Map<string, AztecMultiMap<string, string>>;
 
-  #taggingSecretIndexes: AztecMap<string, number>;
+  // Stores the last index used for each tagging secret, taking direction into account
+  // This is necessary to avoid reusing the same index for the same secret, which happens if
+  // sender and recipient are the same
+  #taggingSecretIndexesForSenders: AztecMap<string, number>;
+  #taggingSecretIndexesForRecipients: AztecMap<string, number>;
 
   constructor(private db: AztecKVStore) {
     this.#db = db;
@@ -92,9 +93,6 @@ export class KVPxeDatabase implements PxeDatabase {
     this.#nullifiedNotesByTxHash = db.openMultiMap('nullified_notes_by_tx_hash');
     this.#nullifiedNotesByAddressPoint = db.openMultiMap('nullified_notes_by_address_point');
 
-    this.#deferredNotes = db.openArray('deferred_notes');
-    this.#deferredNotesByContract = db.openMultiMap('deferred_notes_by_contract');
-
     this.#outgoingNotes = db.openMap('outgoing_notes');
     this.#outgoingNotesByContract = db.openMultiMap('outgoing_notes_by_contract');
     this.#outgoingNotesByStorageSlot = db.openMultiMap('outgoing_notes_by_storage_slot');
@@ -114,7 +112,8 @@ export class KVPxeDatabase implements PxeDatabase {
       this.#notesByAddressPointAndScope.set(scope, db.openMultiMap(`${scope}:notes_by_address_point`));
     }
 
-    this.#taggingSecretIndexes = db.openMap('tagging_secret_indices');
+    this.#taggingSecretIndexesForSenders = db.openMap('tagging_secret_indexes_for_senders');
+    this.#taggingSecretIndexesForRecipients = db.openMap('tagging_secret_indexes_for_recipients');
   }
 
   public async getContract(
@@ -215,56 +214,6 @@ export class KVPxeDatabase implements PxeDatabase {
     });
   }
 
-  async addDeferredNotes(deferredNotes: DeferredNoteDao[]): Promise<void> {
-    const newLength = await this.#deferredNotes.push(...deferredNotes.map(note => note.toBuffer()));
-    for (const [index, note] of deferredNotes.entries()) {
-      const noteId = newLength - deferredNotes.length + index;
-      await this.#deferredNotesByContract.set(note.payload.contractAddress.toString(), noteId);
-    }
-  }
-
-  getDeferredNotesByContract(contractAddress: AztecAddress): Promise<DeferredNoteDao[]> {
-    const noteIds = this.#deferredNotesByContract.getValues(contractAddress.toString());
-    const notes: DeferredNoteDao[] = [];
-    for (const noteId of noteIds) {
-      const serializedNote = this.#deferredNotes.at(noteId);
-      if (!serializedNote) {
-        continue;
-      }
-
-      const note = DeferredNoteDao.fromBuffer(serializedNote);
-      notes.push(note);
-    }
-
-    return Promise.resolve(notes);
-  }
-
-  /**
-   * Removes all deferred notes for a given contract address.
-   * @param contractAddress - the contract address to remove deferred notes for
-   * @returns an array of the removed deferred notes
-   */
-  removeDeferredNotesByContract(contractAddress: AztecAddress): Promise<DeferredNoteDao[]> {
-    return this.#db.transaction(() => {
-      const deferredNotes: DeferredNoteDao[] = [];
-      const indices = Array.from(this.#deferredNotesByContract.getValues(contractAddress.toString()));
-
-      for (const index of indices) {
-        const deferredNoteBuffer = this.#deferredNotes.at(index);
-        if (!deferredNoteBuffer) {
-          continue;
-        } else {
-          deferredNotes.push(DeferredNoteDao.fromBuffer(deferredNoteBuffer));
-        }
-
-        void this.#deferredNotesByContract.deleteValue(contractAddress.toString(), index);
-        void this.#deferredNotes.setAt(index, null);
-      }
-
-      return deferredNotes;
-    });
-  }
-
   getIncomingNotes(filter: IncomingNotesFilter): Promise<IncomingNoteDao[]> {
     const publicKey: PublicKey | undefined = filter.owner ? computePoint(filter.owner) : undefined;
 
@@ -599,23 +548,37 @@ export class KVPxeDatabase implements PxeDatabase {
     return incomingNotesSize + outgoingNotesSize + treeRootsSize + authWitsSize + addressesSize;
   }
 
-  async incrementTaggingSecretsIndexes(appTaggingSecretsWithRecipient: TaggingSecret[]): Promise<void> {
-    const indexes = await this.getTaggingSecretsIndexes(appTaggingSecretsWithRecipient);
+  async incrementTaggingSecretsIndexesAsSender(appTaggingSecrets: Fr[]): Promise<void> {
+    await this.#incrementTaggingSecretsIndexes(appTaggingSecrets, this.#taggingSecretIndexesForSenders);
+  }
+
+  async #incrementTaggingSecretsIndexes(appTaggingSecrets: Fr[], storageMap: AztecMap<string, number>): Promise<void> {
+    const indexes = await this.#getTaggingSecretsIndexes(appTaggingSecrets, storageMap);
     await this.db.transaction(() => {
       indexes.forEach((taggingSecretIndex, listIndex) => {
         const nextIndex = taggingSecretIndex + 1;
-        const { secret, recipient } = appTaggingSecretsWithRecipient[listIndex];
-        const key = `${secret.toString()}-${recipient.toString()}`;
-        void this.#taggingSecretIndexes.set(key, nextIndex);
+        void storageMap.set(appTaggingSecrets[listIndex].toString(), nextIndex);
       });
     });
   }
 
-  getTaggingSecretsIndexes(appTaggingSecretsWithRecipient: TaggingSecret[]): Promise<number[]> {
-    return this.db.transaction(() =>
-      appTaggingSecretsWithRecipient.map(
-        ({ secret, recipient }) => this.#taggingSecretIndexes.get(`${secret.toString()}-${recipient.toString()}`) ?? 0,
-      ),
-    );
+  async setTaggingSecretsIndexesAsRecipient(indexedSecrets: IndexedTaggingSecret[]): Promise<void> {
+    await this.db.transaction(() => {
+      indexedSecrets.forEach(indexedSecret => {
+        void this.#taggingSecretIndexesForRecipients.set(indexedSecret.secret.toString(), indexedSecret.index);
+      });
+    });
+  }
+
+  async getTaggingSecretsIndexesAsRecipient(appTaggingSecrets: Fr[]) {
+    return await this.#getTaggingSecretsIndexes(appTaggingSecrets, this.#taggingSecretIndexesForRecipients);
+  }
+
+  async getTaggingSecretsIndexesAsSender(appTaggingSecrets: Fr[]) {
+    return await this.#getTaggingSecretsIndexes(appTaggingSecrets, this.#taggingSecretIndexesForSenders);
+  }
+
+  #getTaggingSecretsIndexes(appTaggingSecrets: Fr[], storageMap: AztecMap<string, number>): Promise<number[]> {
+    return this.db.transaction(() => appTaggingSecrets.map(secret => storageMap.get(`${secret.toString()}`) ?? 0));
   }
 }

package/src/database/outgoing_note_dao.ts

@@ -4,7 +4,7 @@ import { NoteSelector } from '@aztec/foundation/abi';
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import { type NoteInfo } from '../note_processor/utils/index.js';
+import { type NoteInfo } from '../note_decryption_utils/index.js';
 
 /**
  * A note with contextual data which was decrypted as outgoing.

package/src/database/pxe_database.ts

@@ -3,8 +3,8 @@ import {
   type CompleteAddress,
   type ContractInstanceWithAddress,
   type Header,
+  type IndexedTaggingSecret,
   type PublicKey,
-  type TaggingSecret,
 } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
@@ -12,7 +12,6 @@ import { type Fr } from '@aztec/foundation/fields';
 
 import { type ContractArtifactDatabase } from './contracts/contract_artifact_db.js';
 import { type ContractInstanceDatabase } from './contracts/contract_instance_db.js';
-import { type DeferredNoteDao } from './deferred_note_dao.js';
 import { type IncomingNoteDao } from './incoming_note_dao.js';
 import { type OutgoingNoteDao } from './outgoing_note_dao.js';
 
@@ -90,25 +89,6 @@ export interface PxeDatabase extends ContractArtifactDatabase, ContractInstanceD
    */
   addNotes(incomingNotes: IncomingNoteDao[], outgoingNotes: OutgoingNoteDao[], scope?: AztecAddress): Promise<void>;
 
-  /**
-   * Add notes to the database that are intended for us, but we don't yet have the contract.
-   * @param deferredNotes - An array of deferred notes.
-   */
-  addDeferredNotes(deferredNotes: DeferredNoteDao[]): Promise<void>;
-
-  /**
-   * Get deferred notes for a given contract address.
-   * @param contractAddress - The contract address to get the deferred notes for.
-   */
-  getDeferredNotesByContract(contractAddress: AztecAddress): Promise<DeferredNoteDao[]>;
-
-  /**
-   * Remove deferred notes for a given contract address.
-   * @param contractAddress - The contract address to remove the deferred notes for.
-   * @returns an array of the removed deferred notes
-   */
-  removeDeferredNotesByContract(contractAddress: AztecAddress): Promise<DeferredNoteDao[]>;
-
   /**
    * Remove nullified notes associated with the given account and nullifiers.
    *
@@ -209,18 +189,29 @@ export interface PxeDatabase extends ContractArtifactDatabase, ContractInstanceD
 
   /**
    * Returns the last seen indexes for the provided app siloed tagging secrets or 0 if they've never been seen.
-   * The recipient must also be provided to convey "directionality" of the secret and index pair, or in other words
-   * whether the index was used to tag a sent or received note.
    * @param appTaggingSecrets - The app siloed tagging secrets.
    * @returns The indexes for the provided secrets, 0 if they've never been seen.
    */
-  getTaggingSecretsIndexes(appTaggingSecretsWithRecipient: TaggingSecret[]): Promise<number[]>;
+  getTaggingSecretsIndexesAsRecipient(appTaggingSecrets: Fr[]): Promise<number[]>;
+
+  /**
+   * Returns the last seen indexes for the provided app siloed tagging secrets or 0 if they've never been used
+   * @param appTaggingSecrets - The app siloed tagging secrets.
+   * @returns The indexes for the provided secrets, 0 if they've never been seen.
+   */
+  getTaggingSecretsIndexesAsSender(appTaggingSecrets: Fr[]): Promise<number[]>;
+
+  /**
+   * Increments the index for the provided app siloed tagging secrets in the senders database
+   * To be used when the generated tags have been used as sender
+   * @param appTaggingSecrets - The app siloed tagging secrets.
+   */
+  incrementTaggingSecretsIndexesAsSender(appTaggingSecrets: Fr[]): Promise<void>;
 
   /**
-   * Increments the index for the provided app siloed tagging secrets.
-   * The recipient must also be provided to convey "directionality" of the secret and index pair, or in other words
-   * whether the index was used to tag a sent or received note.
+   * Sets the index for the provided app siloed tagging secrets
+   * To be used when the generated tags have been "seen" as a recipient
    * @param appTaggingSecrets - The app siloed tagging secrets.
    */
-  incrementTaggingSecretsIndexes(appTaggingSecretsWithRecipient: TaggingSecret[]): Promise<void>;
+  setTaggingSecretsIndexesAsRecipient(indexedTaggingSecrets: IndexedTaggingSecret[]): Promise<void>;
 }