@aztec/pxe 0.61.0 → 0.62.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 PublicKey,
   SerializableContractInstance,
+  type TaggingSecret,
+  computePoint,
 } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
@@ -35,8 +32,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,7 +44,7 @@ export class KVPxeDatabase implements PxeDatabase {
   #nullifiedNotesByContract: AztecMultiMap<string, string>;
   #nullifiedNotesByStorageSlot: AztecMultiMap<string, string>;
   #nullifiedNotesByTxHash: AztecMultiMap<string, string>;
-  #nullifiedNotesByIvpkM: AztecMultiMap<string, string>;
+  #nullifiedNotesByAddressPoint: AztecMultiMap<string, string>;
   #deferredNotes: AztecArray<Buffer | null>;
   #deferredNotesByContract: AztecMultiMap<string, number>;
   #syncedBlockPerPublicKey: AztecMap<string, number>;
@@ -64,15 +62,17 @@ 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>;
 
   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,7 +90,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.#nullifiedNotesByAddressPoint = db.openMultiMap('nullified_notes_by_address_point');
 
     this.#deferredNotes = db.openArray('deferred_notes');
     this.#deferredNotesByContract = db.openMultiMap('deferred_notes_by_contract');
@@ -105,13 +105,13 @@ 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');
@@ -201,7 +201,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) {
@@ -266,9 +266,7 @@ export class KVPxeDatabase implements PxeDatabase {
   }
 
   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 +284,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 +303,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 +336,7 @@ export class KVPxeDatabase implements PxeDatabase {
           continue;
         }
 
-        if (publicKey && !note.ivpkM.equals(publicKey)) {
+        if (publicKey && !note.addressPoint.equals(publicKey)) {
           continue;
         }
 
@@ -403,7 +401,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 +423,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 +433,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 +443,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 +459,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 +497,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 +508,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 +530,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 +544,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 +593,29 @@ 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 incrementTaggingSecretsIndexes(appTaggingSecretsWithRecipient: TaggingSecret[]): Promise<void> {
+    const indexes = await this.getTaggingSecretsIndexes(appTaggingSecretsWithRecipient);
     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;
+        const { secret, recipient } = appTaggingSecretsWithRecipient[listIndex];
+        const key = `${secret.toString()}-${recipient.toString()}`;
+        void this.#taggingSecretIndexes.set(key, nextIndex);
       });
     });
   }
 
-  getTaggingSecretsIndexes(appTaggingSecrets: Fr[]): Promise<number[]> {
+  getTaggingSecretsIndexes(appTaggingSecretsWithRecipient: TaggingSecret[]): Promise<number[]> {
     return this.db.transaction(() =>
-      appTaggingSecrets.map(secret => this.#taggingSecretIndexes.get(secret.toString()) ?? 0),
+      appTaggingSecretsWithRecipient.map(
+        ({ secret, recipient }) => this.#taggingSecretIndexes.get(`${secret.toString()}-${recipient.toString()}`) ?? 0,
+      ),
     );
   }
 }

package/src/database/outgoing_note_dao.ts

@@ -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

@@ -4,6 +4,7 @@ import {
   type ContractInstanceWithAddress,
   type Header,
   type PublicKey,
+  type TaggingSecret,
 } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
@@ -145,6 +146,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 +207,20 @@ 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.
+   * 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[]>;
 
-  incrementTaggingSecretsIndexes(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.
+   * @param appTaggingSecrets - The app siloed tagging secrets.
+   */
+  incrementTaggingSecretsIndexes(appTaggingSecretsWithRecipient: TaggingSecret[]): 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/note_processor/note_processor.ts

@@ -5,6 +5,7 @@ import {
   INITIAL_L2_BLOCK_NUM,
   MAX_NOTE_HASHES_PER_TX,
   computeAddressSecret,
+  computePoint,
 } from '@aztec/circuits.js';
 import { type Fr } from '@aztec/foundation/fields';
 import { type Logger, createDebugLogger } from '@aztec/foundation/log';
@@ -146,11 +147,16 @@ export class NoteProcessor {
         // We iterate over both encrypted and unencrypted logs to decrypt the notes since partial notes are passed
         // via the unencrypted logs stream.
         for (const txFunctionLogs of [encryptedTxFunctionLogs, unencryptedTxFunctionLogs]) {
+          const isFromPublic = txFunctionLogs === unencryptedTxFunctionLogs;
           for (const functionLogs of txFunctionLogs) {
             for (const unprocessedLog of functionLogs.logs) {
               this.stats.seen++;
-              const incomingNotePayload = L1NotePayload.decryptAsIncoming(unprocessedLog.data, addressSecret);
-              const outgoingNotePayload = L1NotePayload.decryptAsOutgoing(unprocessedLog.data, ovskM);
+              const incomingNotePayload = L1NotePayload.decryptAsIncoming(
+                unprocessedLog.data,
+                addressSecret,
+                isFromPublic,
+              );
+              const outgoingNotePayload = L1NotePayload.decryptAsOutgoing(unprocessedLog.data, ovskM, isFromPublic);
 
               if (incomingNotePayload || outgoingNotePayload) {
                 if (incomingNotePayload && outgoingNotePayload && !incomingNotePayload.equals(outgoingNotePayload)) {
@@ -168,7 +174,7 @@ export class NoteProcessor {
                   await produceNoteDaos(
                     this.simulator,
                     this.db,
-                    incomingNotePayload ? this.account.publicKeys.masterIncomingViewingPublicKey : undefined,
+                    incomingNotePayload ? computePoint(this.account.address) : undefined,
                     outgoingNotePayload ? this.account.publicKeys.masterOutgoingViewingPublicKey : undefined,
                     payload!,
                     txEffect.txHash,
@@ -250,10 +256,7 @@ export class NoteProcessor {
     const nullifiers: Fr[] = blocksAndNotes.flatMap(b =>
       b.block.body.txEffects.flatMap(txEffect => txEffect.nullifiers),
     );
-    const removedNotes = await this.db.removeNullifiedNotes(
-      nullifiers,
-      this.account.publicKeys.masterIncomingViewingPublicKey,
-    );
+    const removedNotes = await this.db.removeNullifiedNotes(nullifiers, computePoint(this.account.address));
     removedNotes.forEach(noteDao => {
       this.log.verbose(
         `Removed note for contract ${noteDao.contractAddress} at slot ${
@@ -312,7 +315,7 @@ export class NoteProcessor {
     for (const deferredNote of deferredNoteDaos) {
       const { publicKey, payload, txHash, noteHashes, dataStartIndexForTx, unencryptedLogs } = deferredNote;
 
-      const isIncoming = publicKey.equals(this.account.publicKeys.masterIncomingViewingPublicKey);
+      const isIncoming = publicKey.equals(computePoint(this.account.address));
       const isOutgoing = publicKey.equals(this.account.publicKeys.masterOutgoingViewingPublicKey);
 
       if (!isIncoming && !isOutgoing) {
@@ -323,7 +326,7 @@ export class NoteProcessor {
       const { incomingNote, outgoingNote } = await produceNoteDaos(
         this.simulator,
         this.db,
-        isIncoming ? this.account.publicKeys.masterIncomingViewingPublicKey : undefined,
+        isIncoming ? computePoint(this.account.address) : undefined,
         isOutgoing ? this.account.publicKeys.masterOutgoingViewingPublicKey : undefined,
         payload,
         txHash,

package/src/note_processor/utils/produce_note_daos.ts

@@ -17,7 +17,7 @@ import { produceNoteDaosForKey } from './produce_note_daos_for_key.js';
  *
  * @param simulator - An instance of AcirSimulator.
  * @param db - An instance of PxeDatabase.
- * @param ivpkM - The public counterpart to the secret key to be used in the decryption of incoming note logs.
+ * @param addressPoint - The public counterpart to the address secret, which is used in the decryption of incoming note logs.
  * @param ovpkM - The public counterpart to the secret key to be used in the decryption of outgoing note logs.
  * @param payload - An instance of l1NotePayload.
  * @param txHash - The hash of the transaction that created the note. Equivalent to the first nullifier of the transaction.
@@ -31,7 +31,7 @@ import { produceNoteDaosForKey } from './produce_note_daos_for_key.js';
 export async function produceNoteDaos(
   simulator: AcirSimulator,
   db: PxeDatabase,
-  ivpkM: PublicKey | undefined,
+  addressPoint: PublicKey | undefined,
   ovpkM: PublicKey | undefined,
   payload: L1NotePayload,
   txHash: TxHash,
@@ -46,8 +46,8 @@ export async function produceNoteDaos(
   incomingDeferredNote: DeferredNoteDao | undefined;
   outgoingDeferredNote: DeferredNoteDao | undefined;
 }> {
-  if (!ivpkM && !ovpkM) {
-    throw new Error('Both ivpkM and ovpkM are undefined. Cannot create note.');
+  if (!addressPoint && !ovpkM) {
+    throw new Error('Both addressPoint and ovpkM are undefined. Cannot create note.');
   }
 
   let incomingNote: IncomingNoteDao | undefined;
@@ -55,11 +55,11 @@ export async function produceNoteDaos(
   let incomingDeferredNote: DeferredNoteDao | undefined;
   let outgoingDeferredNote: DeferredNoteDao | undefined;
 
-  if (ivpkM) {
+  if (addressPoint) {
     [incomingNote, incomingDeferredNote] = await produceNoteDaosForKey(
       simulator,
       db,
-      ivpkM,
+      addressPoint,
       payload,
       txHash,
       noteHashes,

package/src/pxe_http/pxe_http_server.ts

@@ -6,6 +6,7 @@ import {
   EncryptedL2Log,
   EncryptedL2NoteLog,
   EncryptedNoteL2BlockL2Logs,
+  EventMetadata,
   ExtendedNote,
   ExtendedUnencryptedL2Log,
   L2Block,
@@ -27,7 +28,7 @@ import {
   UniqueNote,
 } from '@aztec/circuit-types';
 import { FunctionSelector, PrivateCircuitPublicInputs, PublicKeys } from '@aztec/circuits.js';
-import { NoteSelector } from '@aztec/foundation/abi';
+import { EventSelector, NoteSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -44,43 +45,45 @@ export function createPXERpcServer(pxeService: PXE): JsonRpcServer {
   return new JsonRpcServer(
     pxeService,
     {
-      CompleteAddress,
+      AuthWitness,
       AztecAddress,
-      TxExecutionRequest,
-      ExtendedUnencryptedL2Log,
-      FunctionSelector,
-      TxHash,
       Buffer32,
+      CompleteAddress,
       EthAddress,
-      Point,
+      EventSelector,
+      ExtendedNote,
+      ExtendedUnencryptedL2Log,
       Fr,
+      FunctionSelector,
       GrumpkinScalar,
+      L2Block,
+      LogId,
       Note,
-      ExtendedNote,
+      Point,
       PublicKeys,
-      UniqueNote,
       SiblingPath,
-      AuthWitness,
-      L2Block,
       TxEffect,
-      LogId,
+      TxExecutionRequest,
+      TxHash,
+      UniqueNote,
     },
     {
-      EncryptedNoteL2BlockL2Logs,
-      EncryptedL2NoteLog,
+      CountedPublicExecutionRequest,
+      CountedNoteLog,
       EncryptedL2Log,
-      UnencryptedL2Log,
+      EncryptedL2NoteLog,
+      EncryptedNoteL2BlockL2Logs,
+      EventMetadata,
       NoteSelector,
       NullifierMembershipWitness,
-      TxSimulationResult,
-      TxProvingResult,
       PrivateCircuitPublicInputs,
       PrivateExecutionResult,
-      CountedPublicExecutionRequest,
-      CountedNoteLog,
+      TxSimulationResult,
+      TxProvingResult,
       Tx,
       TxReceipt,
       UnencryptedL2BlockL2Logs,
+      UnencryptedL2Log,
     },
     ['start', 'stop'],
   );