@aztec/pxe 0.61.0 → 0.63.0

package/src/database/kv_pxe_database.ts

@@ -1,16 +1,13 @@
-import {
-  type IncomingNotesFilter,
-  MerkleTreeId,
-  NoteStatus,
-  type OutgoingNotesFilter,
-  type PublicKey,
-} from '@aztec/circuit-types';
+import { type IncomingNotesFilter, MerkleTreeId, NoteStatus, type OutgoingNotesFilter } from '@aztec/circuit-types';
 import {
   AztecAddress,
   CompleteAddress,
   type ContractInstanceWithAddress,
   Header,
+  type IndexedTaggingSecret,
+  type PublicKey,
   SerializableContractInstance,
+  computePoint,
 } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
@@ -25,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';
@@ -35,8 +31,9 @@ import { type PxeDatabase } from './pxe_database.js';
  */
 export class KVPxeDatabase implements PxeDatabase {
   #synchronizedBlock: AztecSingleton<Buffer>;
-  #addresses: AztecArray<Buffer>;
-  #addressIndex: AztecMap<string, number>;
+  #completeAddresses: AztecArray<Buffer>;
+  #completeAddressIndex: AztecMap<string, number>;
+  #addressBook: AztecSet<string>;
   #authWitnesses: AztecMap<string, Buffer[]>;
   #capsules: AztecArray<Buffer[]>;
   #notes: AztecMap<string, Buffer>;
@@ -46,9 +43,7 @@ export class KVPxeDatabase implements PxeDatabase {
   #nullifiedNotesByContract: AztecMultiMap<string, string>;
   #nullifiedNotesByStorageSlot: AztecMultiMap<string, string>;
   #nullifiedNotesByTxHash: AztecMultiMap<string, string>;
-  #nullifiedNotesByIvpkM: AztecMultiMap<string, string>;
-  #deferredNotes: AztecArray<Buffer | null>;
-  #deferredNotesByContract: AztecMultiMap<string, number>;
+  #nullifiedNotesByAddressPoint: AztecMultiMap<string, string>;
   #syncedBlockPerPublicKey: AztecMap<string, number>;
   #contractArtifacts: AztecMap<string, Buffer>;
   #contractInstances: AztecMap<string, Buffer>;
@@ -64,15 +59,21 @@ export class KVPxeDatabase implements PxeDatabase {
   #notesByContractAndScope: Map<string, AztecMultiMap<string, string>>;
   #notesByStorageSlotAndScope: Map<string, AztecMultiMap<string, string>>;
   #notesByTxHashAndScope: Map<string, AztecMultiMap<string, string>>;
-  #notesByIvpkMAndScope: 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;
 
-    this.#addresses = db.openArray('addresses');
-    this.#addressIndex = db.openMap('address_index');
+    this.#completeAddresses = db.openArray('complete_addresses');
+    this.#completeAddressIndex = db.openMap('complete_address_index');
+
+    this.#addressBook = db.openSet('address_book');
 
     this.#authWitnesses = db.openMap('auth_witnesses');
     this.#capsules = db.openArray('capsules');
@@ -90,10 +91,7 @@ export class KVPxeDatabase implements PxeDatabase {
     this.#nullifiedNotesByContract = db.openMultiMap('nullified_notes_by_contract');
     this.#nullifiedNotesByStorageSlot = db.openMultiMap('nullified_notes_by_storage_slot');
     this.#nullifiedNotesByTxHash = db.openMultiMap('nullified_notes_by_tx_hash');
-    this.#nullifiedNotesByIvpkM = db.openMultiMap('nullified_notes_by_ivpk_m');
-
-    this.#deferredNotes = db.openArray('deferred_notes');
-    this.#deferredNotesByContract = db.openMultiMap('deferred_notes_by_contract');
+    this.#nullifiedNotesByAddressPoint = db.openMultiMap('nullified_notes_by_address_point');
 
     this.#outgoingNotes = db.openMap('outgoing_notes');
     this.#outgoingNotesByContract = db.openMultiMap('outgoing_notes_by_contract');
@@ -105,16 +103,17 @@ export class KVPxeDatabase implements PxeDatabase {
     this.#notesByContractAndScope = new Map<string, AztecMultiMap<string, string>>();
     this.#notesByStorageSlotAndScope = new Map<string, AztecMultiMap<string, string>>();
     this.#notesByTxHashAndScope = new Map<string, AztecMultiMap<string, string>>();
-    this.#notesByIvpkMAndScope = new Map<string, AztecMultiMap<string, string>>();
+    this.#notesByAddressPointAndScope = new Map<string, AztecMultiMap<string, string>>();
 
     for (const scope of this.#scopes.entries()) {
       this.#notesByContractAndScope.set(scope, db.openMultiMap(`${scope}:notes_by_contract`));
       this.#notesByStorageSlotAndScope.set(scope, db.openMultiMap(`${scope}:notes_by_storage_slot`));
       this.#notesByTxHashAndScope.set(scope, db.openMultiMap(`${scope}:notes_by_tx_hash`));
-      this.#notesByIvpkMAndScope.set(scope, db.openMultiMap(`${scope}:notes_by_ivpk_m`));
+      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(
@@ -201,7 +200,7 @@ export class KVPxeDatabase implements PxeDatabase {
         void this.#notesByContractAndScope.get(scope.toString())!.set(dao.contractAddress.toString(), noteIndex);
         void this.#notesByStorageSlotAndScope.get(scope.toString())!.set(dao.storageSlot.toString(), noteIndex);
         void this.#notesByTxHashAndScope.get(scope.toString())!.set(dao.txHash.toString(), noteIndex);
-        void this.#notesByIvpkMAndScope.get(scope.toString())!.set(dao.ivpkM.toString(), noteIndex);
+        void this.#notesByAddressPointAndScope.get(scope.toString())!.set(dao.addressPoint.toString(), noteIndex);
       }
 
       for (const dao of outgoingNotes) {
@@ -215,60 +214,8 @@ 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
-      ? this.#getCompleteAddress(filter.owner)?.publicKeys.masterIncomingViewingPublicKey
-      : undefined;
+    const publicKey: PublicKey | undefined = filter.owner ? computePoint(filter.owner) : undefined;
 
     filter.status = filter.status ?? NoteStatus.ACTIVE;
 
@@ -286,14 +233,14 @@ export class KVPxeDatabase implements PxeDatabase {
 
       activeNoteIdsPerScope.push(
         publicKey
-          ? this.#notesByIvpkMAndScope.get(formattedScopeString)!.getValues(publicKey.toString())
+          ? this.#notesByAddressPointAndScope.get(formattedScopeString)!.getValues(publicKey.toString())
           : filter.txHash
           ? this.#notesByTxHashAndScope.get(formattedScopeString)!.getValues(filter.txHash.toString())
           : filter.contractAddress
           ? this.#notesByContractAndScope.get(formattedScopeString)!.getValues(filter.contractAddress.toString())
           : filter.storageSlot
           ? this.#notesByStorageSlotAndScope.get(formattedScopeString)!.getValues(filter.storageSlot.toString())
-          : this.#notesByIvpkMAndScope.get(formattedScopeString)!.values(),
+          : this.#notesByAddressPointAndScope.get(formattedScopeString)!.values(),
       );
     }
 
@@ -305,7 +252,7 @@ export class KVPxeDatabase implements PxeDatabase {
     if (filter.status == NoteStatus.ACTIVE_OR_NULLIFIED) {
       candidateNoteSources.push({
         ids: publicKey
-          ? this.#nullifiedNotesByIvpkM.getValues(publicKey.toString())
+          ? this.#nullifiedNotesByAddressPoint.getValues(publicKey.toString())
           : filter.txHash
           ? this.#nullifiedNotesByTxHash.getValues(filter.txHash.toString())
           : filter.contractAddress
@@ -338,7 +285,7 @@ export class KVPxeDatabase implements PxeDatabase {
           continue;
         }
 
-        if (publicKey && !note.ivpkM.equals(publicKey)) {
+        if (publicKey && !note.addressPoint.equals(publicKey)) {
           continue;
         }
 
@@ -403,7 +350,7 @@ export class KVPxeDatabase implements PxeDatabase {
     return Promise.resolve(notes);
   }
 
-  removeNullifiedNotes(nullifiers: Fr[], accountIvpkM: PublicKey): Promise<IncomingNoteDao[]> {
+  removeNullifiedNotes(nullifiers: Fr[], accountAddressPoint: PublicKey): Promise<IncomingNoteDao[]> {
     if (nullifiers.length === 0) {
       return Promise.resolve([]);
     }
@@ -425,7 +372,7 @@ export class KVPxeDatabase implements PxeDatabase {
         }
 
         const note = IncomingNoteDao.fromBuffer(noteBuffer);
-        if (!note.ivpkM.equals(accountIvpkM)) {
+        if (!note.addressPoint.equals(accountAddressPoint)) {
           // tried to nullify someone else's note
           continue;
         }
@@ -435,7 +382,7 @@ export class KVPxeDatabase implements PxeDatabase {
         void this.#notes.delete(noteIndex);
 
         for (const scope in this.#scopes.entries()) {
-          void this.#notesByIvpkMAndScope.get(scope)!.deleteValue(accountIvpkM.toString(), noteIndex);
+          void this.#notesByAddressPointAndScope.get(scope)!.deleteValue(accountAddressPoint.toString(), noteIndex);
           void this.#notesByTxHashAndScope.get(scope)!.deleteValue(note.txHash.toString(), noteIndex);
           void this.#notesByContractAndScope.get(scope)!.deleteValue(note.contractAddress.toString(), noteIndex);
           void this.#notesByStorageSlotAndScope.get(scope)!.deleteValue(note.storageSlot.toString(), noteIndex);
@@ -445,7 +392,7 @@ export class KVPxeDatabase implements PxeDatabase {
         void this.#nullifiedNotesByContract.set(note.contractAddress.toString(), noteIndex);
         void this.#nullifiedNotesByStorageSlot.set(note.storageSlot.toString(), noteIndex);
         void this.#nullifiedNotesByTxHash.set(note.txHash.toString(), noteIndex);
-        void this.#nullifiedNotesByIvpkM.set(note.ivpkM.toString(), noteIndex);
+        void this.#nullifiedNotesByAddressPoint.set(note.addressPoint.toString(), noteIndex);
 
         void this.#nullifierToNoteId.delete(nullifier.toString());
       }
@@ -461,7 +408,7 @@ export class KVPxeDatabase implements PxeDatabase {
     await this.#nullifiedNotesByContract.set(note.contractAddress.toString(), noteIndex);
     await this.#nullifiedNotesByStorageSlot.set(note.storageSlot.toString(), noteIndex);
     await this.#nullifiedNotesByTxHash.set(note.txHash.toString(), noteIndex);
-    await this.#nullifiedNotesByIvpkM.set(note.ivpkM.toString(), noteIndex);
+    await this.#nullifiedNotesByAddressPoint.set(note.addressPoint.toString(), noteIndex);
 
     return Promise.resolve();
   }
@@ -499,7 +446,7 @@ export class KVPxeDatabase implements PxeDatabase {
     this.#notesByContractAndScope.set(scopeString, this.#db.openMultiMap(`${scopeString}:notes_by_contract`));
     this.#notesByStorageSlotAndScope.set(scopeString, this.#db.openMultiMap(`${scopeString}:notes_by_storage_slot`));
     this.#notesByTxHashAndScope.set(scopeString, this.#db.openMultiMap(`${scopeString}:notes_by_tx_hash`));
-    this.#notesByIvpkMAndScope.set(scopeString, this.#db.openMultiMap(`${scopeString}:notes_by_ivpk_m`));
+    this.#notesByAddressPointAndScope.set(scopeString, this.#db.openMultiMap(`${scopeString}:notes_by_address_point`));
 
     return true;
   }
@@ -510,15 +457,15 @@ export class KVPxeDatabase implements PxeDatabase {
     return this.#db.transaction(() => {
       const addressString = completeAddress.address.toString();
       const buffer = completeAddress.toBuffer();
-      const existing = this.#addressIndex.get(addressString);
+      const existing = this.#completeAddressIndex.get(addressString);
       if (typeof existing === 'undefined') {
-        const index = this.#addresses.length;
-        void this.#addresses.push(buffer);
-        void this.#addressIndex.set(addressString, index);
+        const index = this.#completeAddresses.length;
+        void this.#completeAddresses.push(buffer);
+        void this.#completeAddressIndex.set(addressString, index);
 
         return true;
       } else {
-        const existingBuffer = this.#addresses.at(existing);
+        const existingBuffer = this.#completeAddresses.at(existing);
 
         if (existingBuffer?.equals(buffer)) {
           return false;
@@ -532,12 +479,12 @@ export class KVPxeDatabase implements PxeDatabase {
   }
 
   #getCompleteAddress(address: AztecAddress): CompleteAddress | undefined {
-    const index = this.#addressIndex.get(address.toString());
+    const index = this.#completeAddressIndex.get(address.toString());
     if (typeof index === 'undefined') {
       return undefined;
     }
 
-    const value = this.#addresses.at(index);
+    const value = this.#completeAddresses.at(index);
     return value ? CompleteAddress.fromBuffer(value) : undefined;
   }
 
@@ -546,7 +493,31 @@ export class KVPxeDatabase implements PxeDatabase {
   }
 
   getCompleteAddresses(): Promise<CompleteAddress[]> {
-    return Promise.resolve(Array.from(this.#addresses).map(v => CompleteAddress.fromBuffer(v)));
+    return Promise.resolve(Array.from(this.#completeAddresses).map(v => CompleteAddress.fromBuffer(v)));
+  }
+
+  async addContactAddress(address: AztecAddress): Promise<boolean> {
+    if (this.#addressBook.has(address.toString())) {
+      return false;
+    }
+
+    await this.#addressBook.add(address.toString());
+
+    return true;
+  }
+
+  getContactAddresses(): AztecAddress[] {
+    return [...this.#addressBook.entries()].map(AztecAddress.fromString);
+  }
+
+  async removeContactAddress(address: AztecAddress): Promise<boolean> {
+    if (!this.#addressBook.has(address.toString())) {
+      return false;
+    }
+
+    await this.#addressBook.delete(address.toString());
+
+    return true;
   }
 
   getSynchedBlockNumberForAccount(account: AztecAddress): number | undefined {
@@ -571,25 +542,43 @@ export class KVPxeDatabase implements PxeDatabase {
       (sum, value) => sum + value.length * Fr.SIZE_IN_BYTES,
       0,
     );
-    const addressesSize = this.#addresses.length * CompleteAddress.SIZE_IN_BYTES;
+    const addressesSize = this.#completeAddresses.length * CompleteAddress.SIZE_IN_BYTES;
     const treeRootsSize = Object.keys(MerkleTreeId).length * Fr.SIZE_IN_BYTES;
 
     return incomingNotesSize + outgoingNotesSize + treeRootsSize + authWitsSize + addressesSize;
   }
 
-  async incrementTaggingSecretsIndexes(appTaggingSecrets: Fr[]): Promise<void> {
-    const indexes = await this.getTaggingSecretsIndexes(appTaggingSecrets);
+  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(index => {
-        const nextIndex = index ? index + 1 : 1;
-        void this.#taggingSecretIndexes.set(appTaggingSecrets.toString(), nextIndex);
+      indexes.forEach((taggingSecretIndex, listIndex) => {
+        const nextIndex = taggingSecretIndex + 1;
+        void storageMap.set(appTaggingSecrets[listIndex].toString(), nextIndex);
       });
     });
   }
 
-  getTaggingSecretsIndexes(appTaggingSecrets: Fr[]): Promise<number[]> {
-    return this.db.transaction(() =>
-      appTaggingSecrets.map(secret => this.#taggingSecretIndexes.get(secret.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.
@@ -39,7 +39,7 @@ export class OutgoingNoteDao {
     payload: L1NotePayload,
     noteInfo: NoteInfo,
     dataStartIndexForTx: number,
-    ivpkM: PublicKey,
+    ovpkM: PublicKey,
   ) {
     const noteHashIndexInTheWholeTree = BigInt(dataStartIndexForTx + noteInfo.noteHashIndex);
     return new OutgoingNoteDao(
@@ -51,7 +51,7 @@ export class OutgoingNoteDao {
       noteInfo.nonce,
       noteInfo.noteHash,
       noteHashIndexInTheWholeTree,
-      ivpkM,
+      ovpkM,
     );
   }
 

package/src/database/pxe_database.ts

@@ -3,6 +3,7 @@ import {
   type CompleteAddress,
   type ContractInstanceWithAddress,
   type Header,
+  type IndexedTaggingSecret,
   type PublicKey,
 } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
@@ -11,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';
 
@@ -89,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.
    *
@@ -145,6 +126,26 @@ export interface PxeDatabase extends ContractArtifactDatabase, ContractInstanceD
    */
   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.
@@ -186,7 +187,31 @@ export interface PxeDatabase extends ContractArtifactDatabase, ContractInstanceD
    */
   estimateSize(): Promise<number>;
 
-  getTaggingSecretsIndexes(appTaggingSecrets: Fr[]): Promise<number[]>;
+  /**
+   * 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[]>;
 
-  incrementTaggingSecretsIndexes(appTaggingSecrets: Fr[]): Promise<void>;
+  /**
+   * 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>;
 }

package/src/database/pxe_database_test_suite.ts

@@ -5,6 +5,7 @@ import {
   INITIAL_L2_BLOCK_NUM,
   PublicKeys,
   SerializableContractInstance,
+  computePoint,
 } from '@aztec/circuits.js';
 import { makeHeader } from '@aztec/circuits.js/testing';
 import { randomInt } from '@aztec/foundation/crypto';
@@ -101,7 +102,7 @@ export function describePxeDatabase(getDatabase: () => PxeDatabase) {
 
         [
           () => ({ owner: owners[0].address }),
-          () => notes.filter(note => note.ivpkM.equals(owners[0].publicKeys.masterIncomingViewingPublicKey)),
+          () => notes.filter(note => note.addressPoint.equals(computePoint(owners[0].address))),
         ],
 
         [
@@ -123,7 +124,7 @@ export function describePxeDatabase(getDatabase: () => PxeDatabase) {
           randomIncomingNoteDao({
             contractAddress: contractAddresses[i % contractAddresses.length],
             storageSlot: storageSlots[i % storageSlots.length],
-            ivpkM: owners[i % owners.length].publicKeys.masterIncomingViewingPublicKey,
+            addressPoint: computePoint(owners[i % owners.length].address),
             index: BigInt(i),
           }),
         );
@@ -155,13 +156,11 @@ export function describePxeDatabase(getDatabase: () => PxeDatabase) {
 
         // Nullify all notes and use the same filter as other test cases
         for (const owner of owners) {
-          const notesToNullify = notes.filter(note =>
-            note.ivpkM.equals(owner.publicKeys.masterIncomingViewingPublicKey),
-          );
+          const notesToNullify = notes.filter(note => note.addressPoint.equals(computePoint(owner.address)));
           const nullifiers = notesToNullify.map(note => note.siloedNullifier);
-          await expect(
-            database.removeNullifiedNotes(nullifiers, owner.publicKeys.masterIncomingViewingPublicKey),
-          ).resolves.toEqual(notesToNullify);
+          await expect(database.removeNullifiedNotes(nullifiers, computePoint(owner.address))).resolves.toEqual(
+            notesToNullify,
+          );
         }
 
         await expect(
@@ -172,11 +171,9 @@ export function describePxeDatabase(getDatabase: () => PxeDatabase) {
       it('skips nullified notes by default or when requesting active', async () => {
         await database.addNotes(notes, []);
 
-        const notesToNullify = notes.filter(note =>
-          note.ivpkM.equals(owners[0].publicKeys.masterIncomingViewingPublicKey),
-        );
+        const notesToNullify = notes.filter(note => note.addressPoint.equals(computePoint(owners[0].address)));
         const nullifiers = notesToNullify.map(note => note.siloedNullifier);
-        await expect(database.removeNullifiedNotes(nullifiers, notesToNullify[0].ivpkM)).resolves.toEqual(
+        await expect(database.removeNullifiedNotes(nullifiers, notesToNullify[0].addressPoint)).resolves.toEqual(
           notesToNullify,
         );
 
@@ -190,11 +187,9 @@ export function describePxeDatabase(getDatabase: () => PxeDatabase) {
       it('returns active and nullified notes when requesting either', async () => {
         await database.addNotes(notes, []);
 
-        const notesToNullify = notes.filter(note =>
-          note.ivpkM.equals(owners[0].publicKeys.masterIncomingViewingPublicKey),
-        );
+        const notesToNullify = notes.filter(note => note.addressPoint.equals(computePoint(owners[0].address)));
         const nullifiers = notesToNullify.map(note => note.siloedNullifier);
-        await expect(database.removeNullifiedNotes(nullifiers, notesToNullify[0].ivpkM)).resolves.toEqual(
+        await expect(database.removeNullifiedNotes(nullifiers, notesToNullify[0].addressPoint)).resolves.toEqual(
           notesToNullify,
         );
 
@@ -251,10 +246,7 @@ export function describePxeDatabase(getDatabase: () => PxeDatabase) {
         ).resolves.toEqual([notes[0]]);
 
         await expect(
-          database.removeNullifiedNotes(
-            [notes[0].siloedNullifier],
-            owners[0].publicKeys.masterIncomingViewingPublicKey,
-          ),
+          database.removeNullifiedNotes([notes[0].siloedNullifier], computePoint(owners[0].address)),
         ).resolves.toEqual([notes[0]]);
 
         await expect(

package/src/index.ts

@@ -4,7 +4,7 @@ export * from './config/index.js';
 
 export { Tx, TxHash } from '@aztec/circuit-types';
 
-export { TxRequest, PartialAddress } from '@aztec/circuits.js';
+export { TxRequest } from '@aztec/circuits.js';
 export * from '@aztec/foundation/fields';
 export * from '@aztec/foundation/eth-address';
 export * from '@aztec/foundation/aztec-address';

package/src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts

@@ -424,7 +424,7 @@ export class PrivateKernelResetPrivateInputsBuilder {
       throw new Error('`needsResetTransientData` must be run before `needsSiloNoteHashes`.');
     }
 
-    const numNoteHashes = this.previousKernel.end.noteHashes.filter(n => !n.contractAddress.isEmpty()).length;
+    const numNoteHashes = this.previousKernel.end.noteHashes.filter(n => !n.contractAddress.isZero()).length;
     const numToSilo = Math.max(0, numNoteHashes - this.numTransientData);
     this.requestedDimensions.NOTE_HASH_SILOING_AMOUNT = numToSilo;
 
@@ -436,7 +436,7 @@ export class PrivateKernelResetPrivateInputsBuilder {
       throw new Error('`needsResetTransientData` must be run before `needsSiloNullifiers`.');
     }
 
-    const numNullifiers = this.previousKernel.end.nullifiers.filter(n => !n.contractAddress.isEmpty()).length;
+    const numNullifiers = this.previousKernel.end.nullifiers.filter(n => !n.contractAddress.isZero()).length;
     const numToSilo = Math.max(0, numNullifiers - this.numTransientData);
     // Include the first nullifier if there's something to silo.
     // The reset circuit checks that capped_size must be greater than or equal to all non-empty nullifiers.
@@ -454,7 +454,17 @@ export class PrivateKernelResetPrivateInputsBuilder {
 
     const numLogs = this.previousKernel.end.encryptedLogsHashes.filter(l => !l.logHash.randomness.isZero()).length;
     const numToSilo = Math.max(0, numLogs - this.numTransientData);
-    this.requestedDimensions.ENCRYPTED_LOG_SILOING_AMOUNT = numToSilo;
+    // The reset circuit checks that capped_size must be greater than or equal to all non-empty logs.
+    // Since there is no current config with ENCRYPTED_LOG_SILOING_AMOUNT = 0 (only 1+), it defaults to 1,
+    // so the circuit fails when we have more than 1 log and require no siloing.
+    const numLogsNoSiloing = this.previousKernel.end.encryptedLogsHashes.filter(
+      l => !l.logHash.isEmpty() && l.logHash.randomness.isZero(),
+    ).length;
+    const cappedSize = !numToSilo && numLogsNoSiloing > 1 ? numLogsNoSiloing : numToSilo;
+    // NB: This is a little flimsy, and only works because we have either ENCRYPTED_LOG_SILOING_AMOUNT=1 or 8.
+    // e.g. if we have 2 logs that need siloing, and 2 that dont, then numLogs = ENCRYPTED_LOG_SILOING_AMOUNT = 2
+    // This would fail because the circuit thinks that cappedSize = 2, but we have 4 logs.
+    this.requestedDimensions.ENCRYPTED_LOG_SILOING_AMOUNT = cappedSize;
 
     return numToSilo > 0;
   }