@aztec/pxe 0.61.0 → 0.63.0

package/dest/database/kv_pxe_database.js

@@ -1,11 +1,10 @@
-var _KVPxeDatabase_instances, _KVPxeDatabase_synchronizedBlock, _KVPxeDatabase_addresses, _KVPxeDatabase_addressIndex, _KVPxeDatabase_authWitnesses, _KVPxeDatabase_capsules, _KVPxeDatabase_notes, _KVPxeDatabase_nullifiedNotes, _KVPxeDatabase_nullifierToNoteId, _KVPxeDatabase_nullifiedNotesByContract, _KVPxeDatabase_nullifiedNotesByStorageSlot, _KVPxeDatabase_nullifiedNotesByTxHash, _KVPxeDatabase_nullifiedNotesByIvpkM, _KVPxeDatabase_deferredNotes, _KVPxeDatabase_deferredNotesByContract, _KVPxeDatabase_syncedBlockPerPublicKey, _KVPxeDatabase_contractArtifacts, _KVPxeDatabase_contractInstances, _KVPxeDatabase_db, _KVPxeDatabase_outgoingNotes, _KVPxeDatabase_outgoingNotesByContract, _KVPxeDatabase_outgoingNotesByStorageSlot, _KVPxeDatabase_outgoingNotesByTxHash, _KVPxeDatabase_outgoingNotesByOvpkM, _KVPxeDatabase_scopes, _KVPxeDatabase_notesByContractAndScope, _KVPxeDatabase_notesByStorageSlotAndScope, _KVPxeDatabase_notesByTxHashAndScope, _KVPxeDatabase_notesByIvpkMAndScope, _KVPxeDatabase_taggingSecretIndexes, _KVPxeDatabase_addScope, _KVPxeDatabase_getCompleteAddress;
+var _KVPxeDatabase_instances, _KVPxeDatabase_synchronizedBlock, _KVPxeDatabase_completeAddresses, _KVPxeDatabase_completeAddressIndex, _KVPxeDatabase_addressBook, _KVPxeDatabase_authWitnesses, _KVPxeDatabase_capsules, _KVPxeDatabase_notes, _KVPxeDatabase_nullifiedNotes, _KVPxeDatabase_nullifierToNoteId, _KVPxeDatabase_nullifiedNotesByContract, _KVPxeDatabase_nullifiedNotesByStorageSlot, _KVPxeDatabase_nullifiedNotesByTxHash, _KVPxeDatabase_nullifiedNotesByAddressPoint, _KVPxeDatabase_syncedBlockPerPublicKey, _KVPxeDatabase_contractArtifacts, _KVPxeDatabase_contractInstances, _KVPxeDatabase_db, _KVPxeDatabase_outgoingNotes, _KVPxeDatabase_outgoingNotesByContract, _KVPxeDatabase_outgoingNotesByStorageSlot, _KVPxeDatabase_outgoingNotesByTxHash, _KVPxeDatabase_outgoingNotesByOvpkM, _KVPxeDatabase_scopes, _KVPxeDatabase_notesByContractAndScope, _KVPxeDatabase_notesByStorageSlotAndScope, _KVPxeDatabase_notesByTxHashAndScope, _KVPxeDatabase_notesByAddressPointAndScope, _KVPxeDatabase_taggingSecretIndexesForSenders, _KVPxeDatabase_taggingSecretIndexesForRecipients, _KVPxeDatabase_addScope, _KVPxeDatabase_getCompleteAddress, _KVPxeDatabase_incrementTaggingSecretsIndexes, _KVPxeDatabase_getTaggingSecretsIndexes;
 import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
-import { MerkleTreeId, NoteStatus, } from '@aztec/circuit-types';
-import { AztecAddress, CompleteAddress, Header, SerializableContractInstance, } from '@aztec/circuits.js';
+import { MerkleTreeId, NoteStatus } from '@aztec/circuit-types';
+import { AztecAddress, CompleteAddress, Header, SerializableContractInstance, computePoint, } from '@aztec/circuits.js';
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { Fr } from '@aztec/foundation/fields';
 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';
 /**
@@ -16,8 +15,9 @@ export class KVPxeDatabase {
         _KVPxeDatabase_instances.add(this);
         this.db = db;
         _KVPxeDatabase_synchronizedBlock.set(this, void 0);
-        _KVPxeDatabase_addresses.set(this, void 0);
-        _KVPxeDatabase_addressIndex.set(this, void 0);
+        _KVPxeDatabase_completeAddresses.set(this, void 0);
+        _KVPxeDatabase_completeAddressIndex.set(this, void 0);
+        _KVPxeDatabase_addressBook.set(this, void 0);
         _KVPxeDatabase_authWitnesses.set(this, void 0);
         _KVPxeDatabase_capsules.set(this, void 0);
         _KVPxeDatabase_notes.set(this, void 0);
@@ -26,9 +26,7 @@ export class KVPxeDatabase {
         _KVPxeDatabase_nullifiedNotesByContract.set(this, void 0);
         _KVPxeDatabase_nullifiedNotesByStorageSlot.set(this, void 0);
         _KVPxeDatabase_nullifiedNotesByTxHash.set(this, void 0);
-        _KVPxeDatabase_nullifiedNotesByIvpkM.set(this, void 0);
-        _KVPxeDatabase_deferredNotes.set(this, void 0);
-        _KVPxeDatabase_deferredNotesByContract.set(this, void 0);
+        _KVPxeDatabase_nullifiedNotesByAddressPoint.set(this, void 0);
         _KVPxeDatabase_syncedBlockPerPublicKey.set(this, void 0);
         _KVPxeDatabase_contractArtifacts.set(this, void 0);
         _KVPxeDatabase_contractInstances.set(this, void 0);
@@ -42,11 +40,16 @@ export class KVPxeDatabase {
         _KVPxeDatabase_notesByContractAndScope.set(this, void 0);
         _KVPxeDatabase_notesByStorageSlotAndScope.set(this, void 0);
         _KVPxeDatabase_notesByTxHashAndScope.set(this, void 0);
-        _KVPxeDatabase_notesByIvpkMAndScope.set(this, void 0);
-        _KVPxeDatabase_taggingSecretIndexes.set(this, void 0);
+        _KVPxeDatabase_notesByAddressPointAndScope.set(this, void 0);
+        // 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
+        _KVPxeDatabase_taggingSecretIndexesForSenders.set(this, void 0);
+        _KVPxeDatabase_taggingSecretIndexesForRecipients.set(this, void 0);
         __classPrivateFieldSet(this, _KVPxeDatabase_db, db, "f");
-        __classPrivateFieldSet(this, _KVPxeDatabase_addresses, db.openArray('addresses'), "f");
-        __classPrivateFieldSet(this, _KVPxeDatabase_addressIndex, db.openMap('address_index'), "f");
+        __classPrivateFieldSet(this, _KVPxeDatabase_completeAddresses, db.openArray('complete_addresses'), "f");
+        __classPrivateFieldSet(this, _KVPxeDatabase_completeAddressIndex, db.openMap('complete_address_index'), "f");
+        __classPrivateFieldSet(this, _KVPxeDatabase_addressBook, db.openSet('address_book'), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_authWitnesses, db.openMap('auth_witnesses'), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_capsules, db.openArray('capsules'), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_contractArtifacts, db.openMap('contract_artifacts'), "f");
@@ -59,9 +62,7 @@ export class KVPxeDatabase {
         __classPrivateFieldSet(this, _KVPxeDatabase_nullifiedNotesByContract, db.openMultiMap('nullified_notes_by_contract'), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_nullifiedNotesByStorageSlot, db.openMultiMap('nullified_notes_by_storage_slot'), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_nullifiedNotesByTxHash, db.openMultiMap('nullified_notes_by_tx_hash'), "f");
-        __classPrivateFieldSet(this, _KVPxeDatabase_nullifiedNotesByIvpkM, db.openMultiMap('nullified_notes_by_ivpk_m'), "f");
-        __classPrivateFieldSet(this, _KVPxeDatabase_deferredNotes, db.openArray('deferred_notes'), "f");
-        __classPrivateFieldSet(this, _KVPxeDatabase_deferredNotesByContract, db.openMultiMap('deferred_notes_by_contract'), "f");
+        __classPrivateFieldSet(this, _KVPxeDatabase_nullifiedNotesByAddressPoint, db.openMultiMap('nullified_notes_by_address_point'), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_outgoingNotes, db.openMap('outgoing_notes'), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_outgoingNotesByContract, db.openMultiMap('outgoing_notes_by_contract'), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_outgoingNotesByStorageSlot, db.openMultiMap('outgoing_notes_by_storage_slot'), "f");
@@ -71,14 +72,15 @@ export class KVPxeDatabase {
         __classPrivateFieldSet(this, _KVPxeDatabase_notesByContractAndScope, new Map(), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_notesByStorageSlotAndScope, new Map(), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_notesByTxHashAndScope, new Map(), "f");
-        __classPrivateFieldSet(this, _KVPxeDatabase_notesByIvpkMAndScope, new Map(), "f");
+        __classPrivateFieldSet(this, _KVPxeDatabase_notesByAddressPointAndScope, new Map(), "f");
         for (const scope of __classPrivateFieldGet(this, _KVPxeDatabase_scopes, "f").entries()) {
             __classPrivateFieldGet(this, _KVPxeDatabase_notesByContractAndScope, "f").set(scope, db.openMultiMap(`${scope}:notes_by_contract`));
             __classPrivateFieldGet(this, _KVPxeDatabase_notesByStorageSlotAndScope, "f").set(scope, db.openMultiMap(`${scope}:notes_by_storage_slot`));
             __classPrivateFieldGet(this, _KVPxeDatabase_notesByTxHashAndScope, "f").set(scope, db.openMultiMap(`${scope}:notes_by_tx_hash`));
-            __classPrivateFieldGet(this, _KVPxeDatabase_notesByIvpkMAndScope, "f").set(scope, db.openMultiMap(`${scope}:notes_by_ivpk_m`));
+            __classPrivateFieldGet(this, _KVPxeDatabase_notesByAddressPointAndScope, "f").set(scope, db.openMultiMap(`${scope}:notes_by_address_point`));
         }
-        __classPrivateFieldSet(this, _KVPxeDatabase_taggingSecretIndexes, db.openMap('tagging_secret_indices'), "f");
+        __classPrivateFieldSet(this, _KVPxeDatabase_taggingSecretIndexesForSenders, db.openMap('tagging_secret_indexes_for_senders'), "f");
+        __classPrivateFieldSet(this, _KVPxeDatabase_taggingSecretIndexesForRecipients, db.openMap('tagging_secret_indexes_for_recipients'), "f");
     }
     async getContract(address) {
         const instance = await this.getContractInstance(address);
@@ -139,7 +141,7 @@ export class KVPxeDatabase {
                 void __classPrivateFieldGet(this, _KVPxeDatabase_notesByContractAndScope, "f").get(scope.toString()).set(dao.contractAddress.toString(), noteIndex);
                 void __classPrivateFieldGet(this, _KVPxeDatabase_notesByStorageSlotAndScope, "f").get(scope.toString()).set(dao.storageSlot.toString(), noteIndex);
                 void __classPrivateFieldGet(this, _KVPxeDatabase_notesByTxHashAndScope, "f").get(scope.toString()).set(dao.txHash.toString(), noteIndex);
-                void __classPrivateFieldGet(this, _KVPxeDatabase_notesByIvpkMAndScope, "f").get(scope.toString()).set(dao.ivpkM.toString(), noteIndex);
+                void __classPrivateFieldGet(this, _KVPxeDatabase_notesByAddressPointAndScope, "f").get(scope.toString()).set(dao.addressPoint.toString(), noteIndex);
             }
             for (const dao of outgoingNotes) {
                 const noteIndex = toBufferBE(dao.index, 32).toString('hex');
@@ -151,53 +153,8 @@ export class KVPxeDatabase {
             }
         });
     }
-    async addDeferredNotes(deferredNotes) {
-        const newLength = await __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotes, "f").push(...deferredNotes.map(note => note.toBuffer()));
-        for (const [index, note] of deferredNotes.entries()) {
-            const noteId = newLength - deferredNotes.length + index;
-            await __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotesByContract, "f").set(note.payload.contractAddress.toString(), noteId);
-        }
-    }
-    getDeferredNotesByContract(contractAddress) {
-        const noteIds = __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotesByContract, "f").getValues(contractAddress.toString());
-        const notes = [];
-        for (const noteId of noteIds) {
-            const serializedNote = __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotes, "f").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) {
-        return __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").transaction(() => {
-            const deferredNotes = [];
-            const indices = Array.from(__classPrivateFieldGet(this, _KVPxeDatabase_deferredNotesByContract, "f").getValues(contractAddress.toString()));
-            for (const index of indices) {
-                const deferredNoteBuffer = __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotes, "f").at(index);
-                if (!deferredNoteBuffer) {
-                    continue;
-                }
-                else {
-                    deferredNotes.push(DeferredNoteDao.fromBuffer(deferredNoteBuffer));
-                }
-                void __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotesByContract, "f").deleteValue(contractAddress.toString(), index);
-                void __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotes, "f").setAt(index, null);
-            }
-            return deferredNotes;
-        });
-    }
     getIncomingNotes(filter) {
-        const publicKey = filter.owner
-            ? __classPrivateFieldGet(this, _KVPxeDatabase_instances, "m", _KVPxeDatabase_getCompleteAddress).call(this, filter.owner)?.publicKeys.masterIncomingViewingPublicKey
-            : undefined;
+        const publicKey = filter.owner ? computePoint(filter.owner) : undefined;
         filter.status = filter.status ?? NoteStatus.ACTIVE;
         const candidateNoteSources = [];
         filter.scopes ?? (filter.scopes = [...__classPrivateFieldGet(this, _KVPxeDatabase_scopes, "f").entries()].map(addressString => AztecAddress.fromString(addressString)));
@@ -208,14 +165,14 @@ export class KVPxeDatabase {
                 throw new Error('Trying to get incoming notes of an scope that is not in the PXE database');
             }
             activeNoteIdsPerScope.push(publicKey
-                ? __classPrivateFieldGet(this, _KVPxeDatabase_notesByIvpkMAndScope, "f").get(formattedScopeString).getValues(publicKey.toString())
+                ? __classPrivateFieldGet(this, _KVPxeDatabase_notesByAddressPointAndScope, "f").get(formattedScopeString).getValues(publicKey.toString())
                 : filter.txHash
                     ? __classPrivateFieldGet(this, _KVPxeDatabase_notesByTxHashAndScope, "f").get(formattedScopeString).getValues(filter.txHash.toString())
                     : filter.contractAddress
                         ? __classPrivateFieldGet(this, _KVPxeDatabase_notesByContractAndScope, "f").get(formattedScopeString).getValues(filter.contractAddress.toString())
                         : filter.storageSlot
                             ? __classPrivateFieldGet(this, _KVPxeDatabase_notesByStorageSlotAndScope, "f").get(formattedScopeString).getValues(filter.storageSlot.toString())
-                            : __classPrivateFieldGet(this, _KVPxeDatabase_notesByIvpkMAndScope, "f").get(formattedScopeString).values());
+                            : __classPrivateFieldGet(this, _KVPxeDatabase_notesByAddressPointAndScope, "f").get(formattedScopeString).values());
         }
         candidateNoteSources.push({
             ids: new Set(activeNoteIdsPerScope.flatMap(iterableIterator => [...iterableIterator])),
@@ -224,7 +181,7 @@ export class KVPxeDatabase {
         if (filter.status == NoteStatus.ACTIVE_OR_NULLIFIED) {
             candidateNoteSources.push({
                 ids: publicKey
-                    ? __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByIvpkM, "f").getValues(publicKey.toString())
+                    ? __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByAddressPoint, "f").getValues(publicKey.toString())
                     : filter.txHash
                         ? __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByTxHash, "f").getValues(filter.txHash.toString())
                         : filter.contractAddress
@@ -252,7 +209,7 @@ export class KVPxeDatabase {
                 if (filter.storageSlot && !note.storageSlot.equals(filter.storageSlot)) {
                     continue;
                 }
-                if (publicKey && !note.ivpkM.equals(publicKey)) {
+                if (publicKey && !note.addressPoint.equals(publicKey)) {
                     continue;
                 }
                 if (filter.siloedNullifier && !note.siloedNullifier.equals(filter.siloedNullifier)) {
@@ -304,7 +261,7 @@ export class KVPxeDatabase {
         }
         return Promise.resolve(notes);
     }
-    removeNullifiedNotes(nullifiers, accountIvpkM) {
+    removeNullifiedNotes(nullifiers, accountAddressPoint) {
         if (nullifiers.length === 0) {
             return Promise.resolve([]);
         }
@@ -321,14 +278,14 @@ export class KVPxeDatabase {
                     continue;
                 }
                 const note = IncomingNoteDao.fromBuffer(noteBuffer);
-                if (!note.ivpkM.equals(accountIvpkM)) {
+                if (!note.addressPoint.equals(accountAddressPoint)) {
                     // tried to nullify someone else's note
                     continue;
                 }
                 nullifiedNotes.push(note);
                 void __classPrivateFieldGet(this, _KVPxeDatabase_notes, "f").delete(noteIndex);
                 for (const scope in __classPrivateFieldGet(this, _KVPxeDatabase_scopes, "f").entries()) {
-                    void __classPrivateFieldGet(this, _KVPxeDatabase_notesByIvpkMAndScope, "f").get(scope).deleteValue(accountIvpkM.toString(), noteIndex);
+                    void __classPrivateFieldGet(this, _KVPxeDatabase_notesByAddressPointAndScope, "f").get(scope).deleteValue(accountAddressPoint.toString(), noteIndex);
                     void __classPrivateFieldGet(this, _KVPxeDatabase_notesByTxHashAndScope, "f").get(scope).deleteValue(note.txHash.toString(), noteIndex);
                     void __classPrivateFieldGet(this, _KVPxeDatabase_notesByContractAndScope, "f").get(scope).deleteValue(note.contractAddress.toString(), noteIndex);
                     void __classPrivateFieldGet(this, _KVPxeDatabase_notesByStorageSlotAndScope, "f").get(scope).deleteValue(note.storageSlot.toString(), noteIndex);
@@ -337,7 +294,7 @@ export class KVPxeDatabase {
                 void __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByContract, "f").set(note.contractAddress.toString(), noteIndex);
                 void __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByStorageSlot, "f").set(note.storageSlot.toString(), noteIndex);
                 void __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByTxHash, "f").set(note.txHash.toString(), noteIndex);
-                void __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByIvpkM, "f").set(note.ivpkM.toString(), noteIndex);
+                void __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByAddressPoint, "f").set(note.addressPoint.toString(), noteIndex);
                 void __classPrivateFieldGet(this, _KVPxeDatabase_nullifierToNoteId, "f").delete(nullifier.toString());
             }
             return nullifiedNotes;
@@ -349,7 +306,7 @@ export class KVPxeDatabase {
         await __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByContract, "f").set(note.contractAddress.toString(), noteIndex);
         await __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByStorageSlot, "f").set(note.storageSlot.toString(), noteIndex);
         await __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByTxHash, "f").set(note.txHash.toString(), noteIndex);
-        await __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByIvpkM, "f").set(note.ivpkM.toString(), noteIndex);
+        await __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByAddressPoint, "f").set(note.addressPoint.toString(), noteIndex);
         return Promise.resolve();
     }
     async setHeader(header) {
@@ -374,15 +331,15 @@ export class KVPxeDatabase {
         return __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").transaction(() => {
             const addressString = completeAddress.address.toString();
             const buffer = completeAddress.toBuffer();
-            const existing = __classPrivateFieldGet(this, _KVPxeDatabase_addressIndex, "f").get(addressString);
+            const existing = __classPrivateFieldGet(this, _KVPxeDatabase_completeAddressIndex, "f").get(addressString);
             if (typeof existing === 'undefined') {
-                const index = __classPrivateFieldGet(this, _KVPxeDatabase_addresses, "f").length;
-                void __classPrivateFieldGet(this, _KVPxeDatabase_addresses, "f").push(buffer);
-                void __classPrivateFieldGet(this, _KVPxeDatabase_addressIndex, "f").set(addressString, index);
+                const index = __classPrivateFieldGet(this, _KVPxeDatabase_completeAddresses, "f").length;
+                void __classPrivateFieldGet(this, _KVPxeDatabase_completeAddresses, "f").push(buffer);
+                void __classPrivateFieldGet(this, _KVPxeDatabase_completeAddressIndex, "f").set(addressString, index);
                 return true;
             }
             else {
-                const existingBuffer = __classPrivateFieldGet(this, _KVPxeDatabase_addresses, "f").at(existing);
+                const existingBuffer = __classPrivateFieldGet(this, _KVPxeDatabase_completeAddresses, "f").at(existing);
                 if (existingBuffer?.equals(buffer)) {
                     return false;
                 }
@@ -394,7 +351,24 @@ export class KVPxeDatabase {
         return Promise.resolve(__classPrivateFieldGet(this, _KVPxeDatabase_instances, "m", _KVPxeDatabase_getCompleteAddress).call(this, account));
     }
     getCompleteAddresses() {
-        return Promise.resolve(Array.from(__classPrivateFieldGet(this, _KVPxeDatabase_addresses, "f")).map(v => CompleteAddress.fromBuffer(v)));
+        return Promise.resolve(Array.from(__classPrivateFieldGet(this, _KVPxeDatabase_completeAddresses, "f")).map(v => CompleteAddress.fromBuffer(v)));
+    }
+    async addContactAddress(address) {
+        if (__classPrivateFieldGet(this, _KVPxeDatabase_addressBook, "f").has(address.toString())) {
+            return false;
+        }
+        await __classPrivateFieldGet(this, _KVPxeDatabase_addressBook, "f").add(address.toString());
+        return true;
+    }
+    getContactAddresses() {
+        return [...__classPrivateFieldGet(this, _KVPxeDatabase_addressBook, "f").entries()].map(AztecAddress.fromString);
+    }
+    async removeContactAddress(address) {
+        if (!__classPrivateFieldGet(this, _KVPxeDatabase_addressBook, "f").has(address.toString())) {
+            return false;
+        }
+        await __classPrivateFieldGet(this, _KVPxeDatabase_addressBook, "f").delete(address.toString());
+        return true;
     }
     getSynchedBlockNumberForAccount(account) {
         return __classPrivateFieldGet(this, _KVPxeDatabase_syncedBlockPerPublicKey, "f").get(account.toString());
@@ -406,24 +380,28 @@ export class KVPxeDatabase {
         const incomingNotesSize = Array.from(await this.getIncomingNotes({})).reduce((sum, note) => sum + note.getSize(), 0);
         const outgoingNotesSize = Array.from(await this.getOutgoingNotes({})).reduce((sum, note) => sum + note.getSize(), 0);
         const authWitsSize = Array.from(__classPrivateFieldGet(this, _KVPxeDatabase_authWitnesses, "f").values()).reduce((sum, value) => sum + value.length * Fr.SIZE_IN_BYTES, 0);
-        const addressesSize = __classPrivateFieldGet(this, _KVPxeDatabase_addresses, "f").length * CompleteAddress.SIZE_IN_BYTES;
+        const addressesSize = __classPrivateFieldGet(this, _KVPxeDatabase_completeAddresses, "f").length * CompleteAddress.SIZE_IN_BYTES;
         const treeRootsSize = Object.keys(MerkleTreeId).length * Fr.SIZE_IN_BYTES;
         return incomingNotesSize + outgoingNotesSize + treeRootsSize + authWitsSize + addressesSize;
     }
-    async incrementTaggingSecretsIndexes(appTaggingSecrets) {
-        const indexes = await this.getTaggingSecretsIndexes(appTaggingSecrets);
+    async incrementTaggingSecretsIndexesAsSender(appTaggingSecrets) {
+        await __classPrivateFieldGet(this, _KVPxeDatabase_instances, "m", _KVPxeDatabase_incrementTaggingSecretsIndexes).call(this, appTaggingSecrets, __classPrivateFieldGet(this, _KVPxeDatabase_taggingSecretIndexesForSenders, "f"));
+    }
+    async setTaggingSecretsIndexesAsRecipient(indexedSecrets) {
         await this.db.transaction(() => {
-            indexes.forEach(index => {
-                const nextIndex = index ? index + 1 : 1;
-                void __classPrivateFieldGet(this, _KVPxeDatabase_taggingSecretIndexes, "f").set(appTaggingSecrets.toString(), nextIndex);
+            indexedSecrets.forEach(indexedSecret => {
+                void __classPrivateFieldGet(this, _KVPxeDatabase_taggingSecretIndexesForRecipients, "f").set(indexedSecret.secret.toString(), indexedSecret.index);
             });
         });
     }
-    getTaggingSecretsIndexes(appTaggingSecrets) {
-        return this.db.transaction(() => appTaggingSecrets.map(secret => __classPrivateFieldGet(this, _KVPxeDatabase_taggingSecretIndexes, "f").get(secret.toString()) ?? 0));
+    async getTaggingSecretsIndexesAsRecipient(appTaggingSecrets) {
+        return await __classPrivateFieldGet(this, _KVPxeDatabase_instances, "m", _KVPxeDatabase_getTaggingSecretsIndexes).call(this, appTaggingSecrets, __classPrivateFieldGet(this, _KVPxeDatabase_taggingSecretIndexesForRecipients, "f"));
+    }
+    async getTaggingSecretsIndexesAsSender(appTaggingSecrets) {
+        return await __classPrivateFieldGet(this, _KVPxeDatabase_instances, "m", _KVPxeDatabase_getTaggingSecretsIndexes).call(this, appTaggingSecrets, __classPrivateFieldGet(this, _KVPxeDatabase_taggingSecretIndexesForSenders, "f"));
     }
 }
-_KVPxeDatabase_synchronizedBlock = new WeakMap(), _KVPxeDatabase_addresses = new WeakMap(), _KVPxeDatabase_addressIndex = new WeakMap(), _KVPxeDatabase_authWitnesses = new WeakMap(), _KVPxeDatabase_capsules = new WeakMap(), _KVPxeDatabase_notes = new WeakMap(), _KVPxeDatabase_nullifiedNotes = new WeakMap(), _KVPxeDatabase_nullifierToNoteId = new WeakMap(), _KVPxeDatabase_nullifiedNotesByContract = new WeakMap(), _KVPxeDatabase_nullifiedNotesByStorageSlot = new WeakMap(), _KVPxeDatabase_nullifiedNotesByTxHash = new WeakMap(), _KVPxeDatabase_nullifiedNotesByIvpkM = new WeakMap(), _KVPxeDatabase_deferredNotes = new WeakMap(), _KVPxeDatabase_deferredNotesByContract = new WeakMap(), _KVPxeDatabase_syncedBlockPerPublicKey = new WeakMap(), _KVPxeDatabase_contractArtifacts = new WeakMap(), _KVPxeDatabase_contractInstances = new WeakMap(), _KVPxeDatabase_db = new WeakMap(), _KVPxeDatabase_outgoingNotes = new WeakMap(), _KVPxeDatabase_outgoingNotesByContract = new WeakMap(), _KVPxeDatabase_outgoingNotesByStorageSlot = new WeakMap(), _KVPxeDatabase_outgoingNotesByTxHash = new WeakMap(), _KVPxeDatabase_outgoingNotesByOvpkM = new WeakMap(), _KVPxeDatabase_scopes = new WeakMap(), _KVPxeDatabase_notesByContractAndScope = new WeakMap(), _KVPxeDatabase_notesByStorageSlotAndScope = new WeakMap(), _KVPxeDatabase_notesByTxHashAndScope = new WeakMap(), _KVPxeDatabase_notesByIvpkMAndScope = new WeakMap(), _KVPxeDatabase_taggingSecretIndexes = new WeakMap(), _KVPxeDatabase_instances = new WeakSet(), _KVPxeDatabase_addScope = async function _KVPxeDatabase_addScope(scope) {
+_KVPxeDatabase_synchronizedBlock = new WeakMap(), _KVPxeDatabase_completeAddresses = new WeakMap(), _KVPxeDatabase_completeAddressIndex = new WeakMap(), _KVPxeDatabase_addressBook = new WeakMap(), _KVPxeDatabase_authWitnesses = new WeakMap(), _KVPxeDatabase_capsules = new WeakMap(), _KVPxeDatabase_notes = new WeakMap(), _KVPxeDatabase_nullifiedNotes = new WeakMap(), _KVPxeDatabase_nullifierToNoteId = new WeakMap(), _KVPxeDatabase_nullifiedNotesByContract = new WeakMap(), _KVPxeDatabase_nullifiedNotesByStorageSlot = new WeakMap(), _KVPxeDatabase_nullifiedNotesByTxHash = new WeakMap(), _KVPxeDatabase_nullifiedNotesByAddressPoint = new WeakMap(), _KVPxeDatabase_syncedBlockPerPublicKey = new WeakMap(), _KVPxeDatabase_contractArtifacts = new WeakMap(), _KVPxeDatabase_contractInstances = new WeakMap(), _KVPxeDatabase_db = new WeakMap(), _KVPxeDatabase_outgoingNotes = new WeakMap(), _KVPxeDatabase_outgoingNotesByContract = new WeakMap(), _KVPxeDatabase_outgoingNotesByStorageSlot = new WeakMap(), _KVPxeDatabase_outgoingNotesByTxHash = new WeakMap(), _KVPxeDatabase_outgoingNotesByOvpkM = new WeakMap(), _KVPxeDatabase_scopes = new WeakMap(), _KVPxeDatabase_notesByContractAndScope = new WeakMap(), _KVPxeDatabase_notesByStorageSlotAndScope = new WeakMap(), _KVPxeDatabase_notesByTxHashAndScope = new WeakMap(), _KVPxeDatabase_notesByAddressPointAndScope = new WeakMap(), _KVPxeDatabase_taggingSecretIndexesForSenders = new WeakMap(), _KVPxeDatabase_taggingSecretIndexesForRecipients = new WeakMap(), _KVPxeDatabase_instances = new WeakSet(), _KVPxeDatabase_addScope = async function _KVPxeDatabase_addScope(scope) {
     const scopeString = scope.toString();
     if (__classPrivateFieldGet(this, _KVPxeDatabase_scopes, "f").has(scopeString)) {
         return false;
@@ -432,14 +410,24 @@ _KVPxeDatabase_synchronizedBlock = new WeakMap(), _KVPxeDatabase_addresses = new
     __classPrivateFieldGet(this, _KVPxeDatabase_notesByContractAndScope, "f").set(scopeString, __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").openMultiMap(`${scopeString}:notes_by_contract`));
     __classPrivateFieldGet(this, _KVPxeDatabase_notesByStorageSlotAndScope, "f").set(scopeString, __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").openMultiMap(`${scopeString}:notes_by_storage_slot`));
     __classPrivateFieldGet(this, _KVPxeDatabase_notesByTxHashAndScope, "f").set(scopeString, __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").openMultiMap(`${scopeString}:notes_by_tx_hash`));
-    __classPrivateFieldGet(this, _KVPxeDatabase_notesByIvpkMAndScope, "f").set(scopeString, __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").openMultiMap(`${scopeString}:notes_by_ivpk_m`));
+    __classPrivateFieldGet(this, _KVPxeDatabase_notesByAddressPointAndScope, "f").set(scopeString, __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").openMultiMap(`${scopeString}:notes_by_address_point`));
     return true;
 }, _KVPxeDatabase_getCompleteAddress = function _KVPxeDatabase_getCompleteAddress(address) {
-    const index = __classPrivateFieldGet(this, _KVPxeDatabase_addressIndex, "f").get(address.toString());
+    const index = __classPrivateFieldGet(this, _KVPxeDatabase_completeAddressIndex, "f").get(address.toString());
     if (typeof index === 'undefined') {
         return undefined;
     }
-    const value = __classPrivateFieldGet(this, _KVPxeDatabase_addresses, "f").at(index);
+    const value = __classPrivateFieldGet(this, _KVPxeDatabase_completeAddresses, "f").at(index);
     return value ? CompleteAddress.fromBuffer(value) : undefined;
+}, _KVPxeDatabase_incrementTaggingSecretsIndexes = async function _KVPxeDatabase_incrementTaggingSecretsIndexes(appTaggingSecrets, storageMap) {
+    const indexes = await __classPrivateFieldGet(this, _KVPxeDatabase_instances, "m", _KVPxeDatabase_getTaggingSecretsIndexes).call(this, appTaggingSecrets, storageMap);
+    await this.db.transaction(() => {
+        indexes.forEach((taggingSecretIndex, listIndex) => {
+            const nextIndex = taggingSecretIndex + 1;
+            void storageMap.set(appTaggingSecrets[listIndex].toString(), nextIndex);
+        });
+    });
+}, _KVPxeDatabase_getTaggingSecretsIndexes = function _KVPxeDatabase_getTaggingSecretsIndexes(appTaggingSecrets, storageMap) {
+    return this.db.transaction(() => appTaggingSecrets.map(secret => storageMap.get(`${secret.toString()}`) ?? 0));
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kv_pxe_database.js","sourceRoot":"","sources":["../../src/database/kv_pxe_database.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kv_pxe_database.js","sourceRoot":"","sources":["../../src/database/kv_pxe_database.ts"],"names":[],"mappings":"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"}

package/dest/database/outgoing_note_dao.d.ts

@@ -4,7 +4,7 @@ import { type L1NotePayload, Note, TxHash } from '@aztec/circuit-types';
 import { AztecAddress, Fr, type PublicKey } from '@aztec/circuits.js';
 import { NoteSelector } from '@aztec/foundation/abi';
 import { BufferReader } 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.
  */
@@ -52,7 +52,7 @@ export declare class OutgoingNoteDao {
     index: bigint, 
     /** The public key with which the note was encrypted. */
     ovpkM: PublicKey);
-    static fromPayloadAndNoteInfo(note: Note, payload: L1NotePayload, noteInfo: NoteInfo, dataStartIndexForTx: number, ivpkM: PublicKey): OutgoingNoteDao;
+    static fromPayloadAndNoteInfo(note: Note, payload: L1NotePayload, noteInfo: NoteInfo, dataStartIndexForTx: number, ovpkM: PublicKey): OutgoingNoteDao;
     toBuffer(): Buffer;
     static fromBuffer(buffer: Buffer | BufferReader): OutgoingNoteDao;
     toString(): string;

package/dest/database/outgoing_note_dao.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"outgoing_note_dao.d.ts","sourceRoot":"","sources":["../../src/database/outgoing_note_dao.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,EAAE,EAAS,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAEjE;;GAEG;AACH,qBAAa,eAAe;IAExB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,iDAAiD;IAC1C,UAAU,EAAE,YAAY;IAC/B,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IACrB,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAChB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB,+DAA+D;IACxD,KAAK,EAAE,MAAM;IACpB,wDAAwD;IACjD,KAAK,EAAE,SAAS;;IApBvB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,iDAAiD;IAC1C,UAAU,EAAE,YAAY;IAC/B,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IACrB,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAChB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB,+DAA+D;IACxD,KAAK,EAAE,MAAM;IACpB,wDAAwD;IACjD,KAAK,EAAE,SAAS;IAGzB,MAAM,CAAC,sBAAsB,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,EAAE,MAAM,EAC3B,KAAK,EAAE,SAAS;IAgBlB,QAAQ,IAAI,MAAM;IAalB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IA0B/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAK7B;;;OAGG;IACI,OAAO;CAIf"}
+{"version":3,"file":"outgoing_note_dao.d.ts","sourceRoot":"","sources":["../../src/database/outgoing_note_dao.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,EAAE,EAAS,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAElE;;GAEG;AACH,qBAAa,eAAe;IAExB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,iDAAiD;IAC1C,UAAU,EAAE,YAAY;IAC/B,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IACrB,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAChB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB,+DAA+D;IACxD,KAAK,EAAE,MAAM;IACpB,wDAAwD;IACjD,KAAK,EAAE,SAAS;;IApBvB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,iDAAiD;IAC1C,UAAU,EAAE,YAAY;IAC/B,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IACrB,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAChB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB,+DAA+D;IACxD,KAAK,EAAE,MAAM;IACpB,wDAAwD;IACjD,KAAK,EAAE,SAAS;IAGzB,MAAM,CAAC,sBAAsB,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,EAAE,MAAM,EAC3B,KAAK,EAAE,SAAS;IAgBlB,QAAQ,IAAI,MAAM;IAalB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IA0B/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAK7B;;;OAGG;IACI,OAAO;CAIf"}

package/dest/database/outgoing_note_dao.js

@@ -39,9 +39,9 @@ export class OutgoingNoteDao {
         this.index = index;
         this.ovpkM = ovpkM;
     }
-    static fromPayloadAndNoteInfo(note, payload, noteInfo, dataStartIndexForTx, ivpkM) {
+    static fromPayloadAndNoteInfo(note, payload, noteInfo, dataStartIndexForTx, ovpkM) {
         const noteHashIndexInTheWholeTree = BigInt(dataStartIndexForTx + noteInfo.noteHashIndex);
-        return new OutgoingNoteDao(note, payload.contractAddress, payload.storageSlot, payload.noteTypeId, noteInfo.txHash, noteInfo.nonce, noteInfo.noteHash, noteHashIndexInTheWholeTree, ivpkM);
+        return new OutgoingNoteDao(note, payload.contractAddress, payload.storageSlot, payload.noteTypeId, noteInfo.txHash, noteInfo.nonce, noteInfo.noteHash, noteHashIndexInTheWholeTree, ovpkM);
     }
     toBuffer() {
         return serializeToBuffer([

package/dest/database/pxe_database.d.ts

@@ -1,11 +1,10 @@
 import { type IncomingNotesFilter, type OutgoingNotesFilter } from '@aztec/circuit-types';
-import { type CompleteAddress, type ContractInstanceWithAddress, type Header, type PublicKey } from '@aztec/circuits.js';
+import { type CompleteAddress, type ContractInstanceWithAddress, type Header, type IndexedTaggingSecret, type PublicKey } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 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';
 /**
@@ -72,22 +71,6 @@ export interface PxeDatabase extends ContractArtifactDatabase, ContractInstanceD
      * @remark - Will create a database for the scope if it does not already exist.
      */
     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.
      *
@@ -121,6 +104,23 @@ export interface PxeDatabase extends ContractArtifactDatabase, ContractInstanceD
      * @returns A Promise that resolves when the hash has been successfully updated in the database.
      */
     setHeader(header: Header): Promise<void>;
+    /**
+     * Adds contact address to the database.
+     * @param address - The address to add to the address book.
+     * @returns A promise resolving to true if the address was added, false if it already exists.
+     */
+    addContactAddress(address: AztecAddress): Promise<boolean>;
+    /**
+     * Retrieves the list of contact addresses in the address book.
+     * @returns An array of Aztec addresses.
+     */
+    getContactAddresses(): AztecAddress[];
+    /**
+     * Removes a contact address from the database.
+     * @param address - The address to remove from the address book.
+     * @returns A promise resolving to true if the address was removed, false if it does not exist.
+     */
+    removeContactAddress(address: AztecAddress): Promise<boolean>;
     /**
      * Adds complete address to the database.
      * @param address - The complete address to add.
@@ -156,7 +156,29 @@ export interface PxeDatabase extends ContractArtifactDatabase, ContractInstanceD
      * @returns The estimated size in bytes of this db.
      */
     estimateSize(): Promise<number>;
-    getTaggingSecretsIndexes(appTaggingSecrets: Fr[]): Promise<number[]>;
-    incrementTaggingSecretsIndexes(appTaggingSecrets: Fr[]): Promise<void>;
+    /**
+     * Returns the last seen indexes for the provided app siloed tagging secrets or 0 if they've never been seen.
+     * @param appTaggingSecrets - The app siloed tagging secrets.
+     * @returns The indexes for the provided secrets, 0 if they've never been seen.
+     */
+    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>;
+    /**
+     * 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.
+     */
+    setTaggingSecretsIndexesAsRecipient(indexedTaggingSecrets: IndexedTaggingSecret[]): Promise<void>;
 }
 //# sourceMappingURL=pxe_database.d.ts.map