addressing Jan's comments

yarn-project/aztec.js/src/index.ts

@@ -102,7 +102,7 @@ export {
   EncryptedLogOutgoingBody,
   EventType,
   ExtendedNote,
-  ExtendedNoteWithNonce,
+  UniqueNote,
   FunctionCall,
   L1Actor,
   L1ToL2Message,

yarn-project/aztec.js/src/rpc_clients/pxe_client.ts

@@ -2,7 +2,6 @@ import {
   AuthWitness,
   EncryptedNoteL2BlockL2Logs,
   ExtendedNote,
-  ExtendedNoteWithNonce,
   ExtendedUnencryptedL2Log,
   L2Block,
   LogId,
@@ -16,6 +15,7 @@ import {
   TxHash,
   TxReceipt,
   UnencryptedL2BlockL2Logs,
+  UniqueNote,
 } from '@aztec/circuit-types';
 import {
   AztecAddress,
@@ -46,7 +46,7 @@ export const createPXEClient = (url: string, fetch = makeFetch([1, 2, 3], false)
       FunctionSelector,
       EthAddress,
       ExtendedNote,
-      ExtendedNoteWithNonce,
+      UniqueNote,
       ExtendedUnencryptedL2Log,
       Fr,
       GrumpkinScalar,

yarn-project/aztec.js/src/wallet/base_wallet.ts

@@ -3,7 +3,6 @@ import {
   type EventMetadata,
   type EventType,
   type ExtendedNote,
-  type ExtendedNoteWithNonce,
   type GetUnencryptedLogsResponse,
   type IncomingNotesFilter,
   type L2Block,
@@ -18,6 +17,7 @@ import {
   type TxExecutionRequest,
   type TxHash,
   type TxReceipt,
+  type UniqueNote,
 } from '@aztec/circuit-types';
 import { type NoteProcessorStats } from '@aztec/circuit-types/stats';
 import {
@@ -121,10 +121,10 @@ export abstract class BaseWallet implements Wallet {
   getTxReceipt(txHash: TxHash): Promise<TxReceipt> {
     return this.pxe.getTxReceipt(txHash);
   }
-  getIncomingNotes(filter: IncomingNotesFilter): Promise<ExtendedNoteWithNonce[]> {
+  getIncomingNotes(filter: IncomingNotesFilter): Promise<UniqueNote[]> {
     return this.pxe.getIncomingNotes(filter);
   }
-  getOutgoingNotes(filter: OutgoingNotesFilter): Promise<ExtendedNoteWithNonce[]> {
+  getOutgoingNotes(filter: OutgoingNotesFilter): Promise<UniqueNote[]> {
     return this.pxe.getOutgoingNotes(filter);
   }
   getPublicStorageAt(contract: AztecAddress, storageSlot: Fr): Promise<any> {

yarn-project/circuit-types/src/interfaces/pxe.ts

@@ -18,7 +18,7 @@ import { type AuthWitness } from '../auth_witness.js';
 import { type L2Block } from '../l2_block.js';
 import { type GetUnencryptedLogsResponse, type L1EventPayload, type LogFilter } from '../logs/index.js';
 import { type IncomingNotesFilter } from '../notes/incoming_notes_filter.js';
-import { type ExtendedNote, type ExtendedNoteWithNonce, type OutgoingNotesFilter } from '../notes/index.js';
+import { type ExtendedNote, type OutgoingNotesFilter, type UniqueNote } from '../notes/index.js';
 import { type NoteProcessorStats } from '../stats/stats.js';
 import { type SimulatedTx, type Tx, type TxHash, type TxReceipt } from '../tx/index.js';
 import { type TxEffect } from '../tx_effect.js';
@@ -235,14 +235,14 @@ export interface PXE {
    * @param filter - The filter to apply to the notes.
    * @returns The requested notes.
    */
-  getIncomingNotes(filter: IncomingNotesFilter): Promise<ExtendedNoteWithNonce[]>;
+  getIncomingNotes(filter: IncomingNotesFilter): Promise<UniqueNote[]>;
 
   /**
    * Gets outgoing notes of accounts registered in this PXE based on the provided filter.
    * @param filter - The filter to apply to the notes.
    * @returns The requested notes.
    */
-  getOutgoingNotes(filter: OutgoingNotesFilter): Promise<ExtendedNoteWithNonce[]>;
+  getOutgoingNotes(filter: OutgoingNotesFilter): Promise<UniqueNote[]>;
 
   /**
    * Adds a note to the database.

yarn-project/circuit-types/src/mocks.ts

@@ -31,7 +31,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { type ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts';
 
 import { EncryptedNoteTxL2Logs, EncryptedTxL2Logs, Note, UnencryptedTxL2Logs } from './logs/index.js';
-import { ExtendedNote, ExtendedNoteWithNonce } from './notes/index.js';
+import { ExtendedNote, UniqueNote } from './notes/index.js';
 import { PublicExecutionRequest } from './public_execution_request.js';
 import { NestedProcessReturnValues, PublicSimulationOutput, SimulatedTx, Tx, TxHash } from './tx/index.js';
 
@@ -256,14 +256,14 @@ export const randomExtendedNote = ({
   return new ExtendedNote(note, owner, contractAddress, storageSlot, noteTypeId, txHash);
 };
 
-export const randomExtendedNoteWithNonce = ({
+export const randomUniqueNote = ({
   note = Note.random(),
   owner = AztecAddress.random(),
   contractAddress = AztecAddress.random(),
   txHash = randomTxHash(),
   storageSlot = Fr.random(),
   noteTypeId = NoteSelector.random(),
   nonce = Fr.random(),
-}: Partial<ExtendedNoteWithNonce> = {}) => {
-  return new ExtendedNoteWithNonce(note, owner, contractAddress, storageSlot, noteTypeId, txHash, nonce);
+}: Partial<UniqueNote> = {}) => {
+  return new UniqueNote(note, owner, contractAddress, storageSlot, noteTypeId, txHash, nonce);
 };

yarn-project/circuit-types/src/notes/extended_note.test.ts

@@ -1,5 +1,5 @@
-import { randomExtendedNote, randomExtendedNoteWithNonce } from '../mocks.js';
-import { ExtendedNote, ExtendedNoteWithNonce } from './extended_note.js';
+import { randomExtendedNote, randomUniqueNote } from '../mocks.js';
+import { ExtendedNote, UniqueNote } from './extended_note.js';
 
 describe('Extended Note', () => {
   it('convert to and from buffer', () => {
@@ -9,10 +9,10 @@ describe('Extended Note', () => {
   });
 });
 
-describe('Extended Note with nonce', () => {
+describe('Unique Note', () => {
   it('convert to and from buffer', () => {
-    const extendedNote = randomExtendedNoteWithNonce();
-    const buf = extendedNote.toBuffer();
-    expect(ExtendedNoteWithNonce.fromBuffer(buf)).toEqual(extendedNote);
+    const uniqueNote = randomUniqueNote();
+    const buf = uniqueNote.toBuffer();
+    expect(UniqueNote.fromBuffer(buf)).toEqual(uniqueNote);
   });
 });

yarn-project/circuit-types/src/notes/extended_note.ts

@@ -58,7 +58,7 @@ export class ExtendedNote {
   }
 }
 
-export class ExtendedNoteWithNonce extends ExtendedNote {
+export class UniqueNote extends ExtendedNote {
   constructor(
     /** The note as emitted from the Noir contract. */
     note: Note,
@@ -106,6 +106,6 @@ export class ExtendedNoteWithNonce extends ExtendedNote {
 
   static override fromString(str: string) {
     const hex = str.replace(/^0x/, '');
-    return ExtendedNoteWithNonce.fromBuffer(Buffer.from(hex, 'hex'));
+    return UniqueNote.fromBuffer(Buffer.from(hex, 'hex'));
   }
 }

yarn-project/circuit-types/src/tx/tx_receipt.ts

@@ -1,7 +1,7 @@
 import { RevertCode } from '@aztec/circuits.js';
 import { type Fr } from '@aztec/foundation/fields';
 
-import { type ExtendedNoteWithNonce } from '../notes/extended_note.js';
+import { type UniqueNote } from '../notes/extended_note.js';
 import { type PublicDataWrite } from '../public_data_write.js';
 import { TxHash } from './tx_hash.js';
 
@@ -126,11 +126,11 @@ interface DebugInfo {
    * in the PXE which was used to submit the tx. You will not get notes of accounts which are not registered in
    * the PXE here even though they were created in this tx.
    */
-  visibleIncomingNotes: ExtendedNoteWithNonce[];
+  visibleIncomingNotes: UniqueNote[];
   /**
    * Notes created in this tx which were successfully decoded with the outgoing keys of accounts which are registered
    * in the PXE which was used to submit the tx. You will not get notes of accounts which are not registered in
    * the PXE here even though they were created in this tx.
    */
-  visibleOutgoingNotes: ExtendedNoteWithNonce[];
+  visibleOutgoingNotes: UniqueNote[];
 }

yarn-project/end-to-end/src/e2e_crowdfunding_and_claim.test.ts

@@ -6,13 +6,13 @@ import {
   type CheatCodes,
   type DebugLogger,
   ExtendedNote,
-  type ExtendedNoteWithNonce,
   Fr,
   Note,
   type PXE,
   PackedValues,
   TxExecutionRequest,
   type TxHash,
+  type UniqueNote,
   computeSecretHash,
   deriveKeys,
 } from '@aztec/aztec.js';
@@ -181,22 +181,22 @@ describe('e2e_crowdfunding_and_claim', () => {
     ]);
   };
 
-  // Processes extended note such that it can be passed to a claim function of Claim contract
-  const processExtendedNote = (extendedNote: ExtendedNoteWithNonce) => {
+  // Processes unique note such that it can be passed to a claim function of Claim contract
+  const processUniqueNote = (uniqueNote: UniqueNote) => {
     return {
       header: {
         // eslint-disable-next-line camelcase
-        contract_address: extendedNote.contractAddress,
+        contract_address: uniqueNote.contractAddress,
         // eslint-disable-next-line camelcase
-        storage_slot: extendedNote.storageSlot,
+        storage_slot: uniqueNote.storageSlot,
         // eslint-disable-next-line camelcase
         note_hash_counter: 0, // set as 0 as note is not transient
-        nonce: extendedNote.nonce,
+        nonce: uniqueNote.nonce,
       },
-      value: extendedNote.note.items[0],
+      value: uniqueNote.note.items[0],
       // eslint-disable-next-line camelcase
-      npk_m_hash: extendedNote.note.items[1],
-      randomness: extendedNote.note.items[2],
+      npk_m_hash: uniqueNote.note.items[1],
+      randomness: uniqueNote.note.items[2],
     };
   };
 
@@ -229,7 +229,7 @@ describe('e2e_crowdfunding_and_claim', () => {
       expect(notes!.length).toEqual(1);
 
       // Set the value note in a format which can be passed to claim function
-      valueNote = processExtendedNote(notes![0]);
+      valueNote = processUniqueNote(notes![0]);
     }
 
     // 3) We claim the reward token via the Claim contract
@@ -300,7 +300,7 @@ describe('e2e_crowdfunding_and_claim', () => {
     expect(notes!.length).toEqual(1);
 
     // Set the value note in a format which can be passed to claim function
-    const anotherDonationNote = processExtendedNote(notes![0]);
+    const anotherDonationNote = processUniqueNote(notes![0]);
 
     // We create an unrelated pxe and wallet without access to the nsk_app that correlates to the npk_m specified in the proof note.
     let unrelatedWallet: AccountWallet;
@@ -352,7 +352,7 @@ describe('e2e_crowdfunding_and_claim', () => {
       const receipt = await inclusionsProofsContract.methods.create_note(owner, 5n).send().wait({ debug: true });
       const { visibleIncomingNotes } = receipt.debugInfo!;
       expect(visibleIncomingNotes.length).toEqual(1);
-      note = processExtendedNote(visibleIncomingNotes![0]);
+      note = processUniqueNote(visibleIncomingNotes![0]);
     }
 
     // 3) Test the note was included

yarn-project/pxe/src/pxe_http/pxe_http_server.ts

@@ -3,7 +3,6 @@ import {
   CompleteAddress,
   EncryptedNoteL2BlockL2Logs,
   ExtendedNote,
-  ExtendedNoteWithNonce,
   ExtendedUnencryptedL2Log,
   L2Block,
   LogId,
@@ -17,6 +16,7 @@ import {
   TxHash,
   TxReceipt,
   UnencryptedL2BlockL2Logs,
+  UniqueNote,
 } from '@aztec/circuit-types';
 import { FunctionSelector } from '@aztec/circuits.js';
 import { NoteSelector } from '@aztec/foundation/abi';
@@ -49,7 +49,7 @@ export function createPXERpcServer(pxeService: PXE): JsonRpcServer {
       GrumpkinScalar,
       Note,
       ExtendedNote,
-      ExtendedNoteWithNonce,
+      UniqueNote,
       AuthWitness,
       L2Block,
       TxEffect,

yarn-project/pxe/src/pxe_service/pxe_service.ts

@@ -6,7 +6,6 @@ import {
   type EventMetadata,
   EventType,
   type ExtendedNote,
-  ExtendedNoteWithNonce,
   type FunctionCall,
   type GetUnencryptedLogsResponse,
   type IncomingNotesFilter,
@@ -27,6 +26,7 @@ import {
   type TxHash,
   type TxReceipt,
   UnencryptedTxL2Logs,
+  UniqueNote,
   isNoirCallStackUnresolved,
 } from '@aztec/circuit-types';
 import {
@@ -297,7 +297,7 @@ export class PXEService implements PXE {
     return await this.node.getPublicStorageAt(contract, slot, 'latest');
   }
 
-  public async getIncomingNotes(filter: IncomingNotesFilter): Promise<ExtendedNoteWithNonce[]> {
+  public async getIncomingNotes(filter: IncomingNotesFilter): Promise<UniqueNote[]> {
     const noteDaos = await this.db.getIncomingNotes(filter);
 
     // TODO(#6531): Refactor --> This type conversion is ugly but I decided to keep it this way for now because
@@ -313,7 +313,7 @@ export class PXEService implements PXE {
         }
         owner = completeAddresses.address;
       }
-      return new ExtendedNoteWithNonce(
+      return new UniqueNote(
         dao.note,
         owner,
         dao.contractAddress,
@@ -326,7 +326,7 @@ export class PXEService implements PXE {
     return Promise.all(extendedNotes);
   }
 
-  public async getOutgoingNotes(filter: OutgoingNotesFilter): Promise<ExtendedNoteWithNonce[]> {
+  public async getOutgoingNotes(filter: OutgoingNotesFilter): Promise<UniqueNote[]> {
     const noteDaos = await this.db.getOutgoingNotes(filter);
 
     // TODO(#6532): Refactor --> This type conversion is ugly but I decided to keep it this way for now because
@@ -342,7 +342,7 @@ export class PXEService implements PXE {
         }
         owner = completeAddresses.address;
       }
-      return new ExtendedNoteWithNonce(
+      return new UniqueNote(
         dao.note,
         owner,
         dao.contractAddress,