@aztec/pxe 0.11.1 → 0.13.0

package/dest/simulator_oracle/index.js

@@ -15,7 +15,7 @@ export class SimulatorOracle {
     async getCompleteAddress(address) {
         const completeAddress = await this.db.getCompleteAddress(address);
         if (!completeAddress)
-            throw new Error(`No public key registered for address ${address.toString()}. Register it by calling pxe.registerRecipient(...) or pxe.registerAccount(...)`);
+            throw new Error(`No public key registered for address ${address.toString()}. Register it by calling pxe.registerRecipient(...) or pxe.registerAccount(...).\nSee docs for context: https://docs.aztec.network/dev_docs/contracts/common_errors#no-public-key-registered-error`);
         return completeAddress;
     }
     async getAuthWitness(messageHash) {
@@ -25,12 +25,12 @@ export class SimulatorOracle {
         return witness;
     }
     async getNotes(contractAddress, storageSlot) {
-        const noteDaos = await this.db.getNoteSpendingInfo(contractAddress, storageSlot);
-        return noteDaos.map(({ contractAddress, storageSlot, nonce, notePreimage, innerNoteHash, siloedNullifier, index }) => ({
+        const noteDaos = await this.db.getNotes({ contractAddress, storageSlot });
+        return noteDaos.map(({ contractAddress, storageSlot, nonce, note, innerNoteHash, siloedNullifier, index }) => ({
             contractAddress,
             storageSlot,
             nonce,
-            preimage: notePreimage.items,
+            note,
             innerNoteHash,
             siloedNullifier,
             // PXE can use this index to get full MembershipWitness
@@ -45,6 +45,17 @@ export class SimulatorOracle {
             debug,
         };
     }
+    async getFunctionArtifactByName(contractAddress, functionName) {
+        const artifact = await this.contractDataOracle.getFunctionArtifactByName(contractAddress, functionName);
+        if (!artifact) {
+            return;
+        }
+        const debug = await this.contractDataOracle.getFunctionDebugMetadata(contractAddress, artifact.selector);
+        return {
+            ...artifact,
+            debug,
+        };
+    }
     async getPortalContractAddress(contractAddress) {
         return await this.contractDataOracle.getPortalContractAddress(contractAddress);
     }
@@ -60,7 +71,7 @@ export class SimulatorOracle {
         const messageAndIndex = await this.stateInfoProvider.getL1ToL2MessageAndIndex(msgKey);
         const message = messageAndIndex.message.toFieldArray();
         const index = messageAndIndex.index;
-        const siblingPath = await this.stateInfoProvider.getL1ToL2MessagesTreePath(index);
+        const siblingPath = await this.stateInfoProvider.getL1ToL2MessageSiblingPath(index);
         return {
             message,
             siblingPath: siblingPath.toFieldArray(),
@@ -88,4 +99,4 @@ export class SimulatorOracle {
         return Promise.resolve(this.db.getHistoricBlockData());
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2ltdWxhdG9yX29yYWNsZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFXQSxPQUFPLEVBQVksWUFBWSxFQUFxQixNQUFNLGNBQWMsQ0FBQztBQUt6RTs7R0FFRztBQUNILE1BQU0sT0FBTyxlQUFlO0lBQzFCLFlBQ1Usa0JBQXNDLEVBQ3RDLEVBQVksRUFDWixRQUFrQixFQUNsQixpQkFBb0M7UUFIcEMsdUJBQWtCLEdBQWxCLGtCQUFrQixDQUFvQjtRQUN0QyxPQUFFLEdBQUYsRUFBRSxDQUFVO1FBQ1osYUFBUSxHQUFSLFFBQVEsQ0FBVTtRQUNsQixzQkFBaUIsR0FBakIsaUJBQWlCLENBQW1CO0lBQzNDLENBQUM7SUFFSixZQUFZLENBQUMsZ0JBQThCLEVBQUUsTUFBaUI7UUFDNUQsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLG9CQUFvQixDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3BELENBQUM7SUFFRCxLQUFLLENBQUMsa0JBQWtCLENBQUMsT0FBcUI7UUFDNUMsTUFBTSxlQUFlLEdBQUcsTUFBTSxJQUFJLENBQUMsRUFBRSxDQUFDLGtCQUFrQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxlQUFlO1lBQ2xCLE1BQU0sSUFBSSxLQUFLLENBQ2Isd0NBQXdDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsaUZBQWlGLENBQzVJLENBQUM7UUFDSixPQUFPLGVBQWUsQ0FBQztJQUN6QixDQUFDO0lBRUQsS0FBSyxDQUFDLGNBQWMsQ0FBQyxXQUFlO1FBQ2xDLE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDMUQsSUFBSSxDQUFDLE9BQU87WUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLHlDQUF5QyxXQUFXLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2ltdWxhdG9yX29yYWNsZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFXQSxPQUFPLEVBQVksWUFBWSxFQUFxQixNQUFNLGNBQWMsQ0FBQztBQUt6RTs7R0FFRztBQUNILE1BQU0sT0FBTyxlQUFlO0lBQzFCLFlBQ1Usa0JBQXNDLEVBQ3RDLEVBQVksRUFDWixRQUFrQixFQUNsQixpQkFBb0M7UUFIcEMsdUJBQWtCLEdBQWxCLGtCQUFrQixDQUFvQjtRQUN0QyxPQUFFLEdBQUYsRUFBRSxDQUFVO1FBQ1osYUFBUSxHQUFSLFFBQVEsQ0FBVTtRQUNsQixzQkFBaUIsR0FBakIsaUJBQWlCLENBQW1CO0lBQzNDLENBQUM7SUFFSixZQUFZLENBQUMsZ0JBQThCLEVBQUUsTUFBaUI7UUFDNUQsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLG9CQUFvQixDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3BELENBQUM7SUFFRCxLQUFLLENBQUMsa0JBQWtCLENBQUMsT0FBcUI7UUFDNUMsTUFBTSxlQUFlLEdBQUcsTUFBTSxJQUFJLENBQUMsRUFBRSxDQUFDLGtCQUFrQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxlQUFlO1lBQ2xCLE1BQU0sSUFBSSxLQUFLLENBQ2Isd0NBQXdDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsb01BQW9NLENBQy9QLENBQUM7UUFDSixPQUFPLGVBQWUsQ0FBQztJQUN6QixDQUFDO0lBRUQsS0FBSyxDQUFDLGNBQWMsQ0FBQyxXQUFlO1FBQ2xDLE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDMUQsSUFBSSxDQUFDLE9BQU87WUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLHlDQUF5QyxXQUFXLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FB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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.11.1",
+  "version": "0.13.0",
   "type": "module",
   "exports": "./dest/index.js",
   "bin": "./dest/bin/index.js",
@@ -26,19 +26,19 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.m?js$": "$1"
+      "^(\\.{1,2}/.*)\\.[cm]?js$": "$1"
     },
     "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
-    "@aztec/acir-simulator": "0.11.1",
-    "@aztec/circuits.js": "0.11.1",
-    "@aztec/ethereum": "0.11.1",
-    "@aztec/foundation": "0.11.1",
-    "@aztec/key-store": "0.11.1",
-    "@aztec/noir-compiler": "0.11.1",
-    "@aztec/types": "0.11.1",
+    "@aztec/acir-simulator": "0.13.0",
+    "@aztec/circuits.js": "0.13.0",
+    "@aztec/ethereum": "0.13.0",
+    "@aztec/foundation": "0.13.0",
+    "@aztec/key-store": "0.13.0",
+    "@aztec/noir-compiler": "0.13.0",
+    "@aztec/types": "0.13.0",
     "koa": "^2.14.2",
     "koa-router": "^12.0.0",
     "lodash.omit": "^4.5.0",

package/src/contract_data_oracle/index.ts

@@ -44,6 +44,19 @@ export class ContractDataOracle {
     return tree.getFunctionArtifact(selector);
   }
 
+  /**
+   * Retrieves the artifact of a specified function within a given contract.
+   * The function is identified by its name, which is unique within a contract.
+   *
+   * @param contractAddress - The AztecAddress representing the contract containing the function.
+   * @param functionName - The name of the function.
+   * @returns The corresponding function's artifact as an object.
+   */
+  public async getFunctionArtifactByName(contractAddress: AztecAddress, functionName: string) {
+    const contract = await this.db.getContract(contractAddress);
+    return contract?.functions.find(f => f.name === functionName);
+  }
+
   /**
    * Retrieves the debug metadata of a specified function within a given contract.
    * The function is identified by its selector, which is a unique code generated from the function's signature.

package/src/contract_tree/index.ts

@@ -154,7 +154,7 @@ export class ContractTree {
   public async getContractMembershipWitness() {
     const index = await this.getContractIndex();
 
-    const siblingPath = await this.stateInfoProvider.getContractPath(index);
+    const siblingPath = await this.stateInfoProvider.getContractSiblingPath(index);
     return new MembershipWitness<typeof CONTRACT_TREE_HEIGHT>(
       CONTRACT_TREE_HEIGHT,
       index,

package/src/database/database.ts

@@ -1,9 +1,9 @@
-import { CompleteAddress, HistoricBlockData } from '@aztec/circuits.js';
+import { CompleteAddress, HistoricBlockData, PublicKey } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
-import { ContractDatabase, MerkleTreeId, PublicKey } from '@aztec/types';
+import { ContractDatabase, MerkleTreeId, NoteFilter } from '@aztec/types';
 
-import { NoteSpendingInfoDao } from './note_spending_info_dao.js';
+import { NoteDao } from './note_dao.js';
 
 /**
  * A database interface that provides methods for retrieving, adding, and removing transactional data related to Aztec
@@ -25,46 +25,35 @@ export interface Database extends ContractDatabase {
   getAuthWitness(messageHash: Fr): Promise<Fr[]>;
 
   /**
-   * Get auxiliary transaction data based on contract address and storage slot.
-   * It searches for matching NoteSpendingInfoDao objects in the MemoryDB's noteSpendingInfoTable
-   * where both the contractAddress and storageSlot properties match the given inputs.
-   *
-   * @param contract - The contract address.
-   * @param storageSlot - A Fr object representing the storage slot to search for in the auxiliary data.
-   * @returns An array of NoteSpendingInfoDao objects that fulfill the contract address and storage slot criteria.
+   * Gets notes based on the provided filter.
+   * @param filter - The filter to apply to the notes.
+   * @returns The requested notes.
    */
-  getNoteSpendingInfo(contract: AztecAddress, storageSlot: Fr): Promise<NoteSpendingInfoDao[]>;
+  getNotes(filter: NoteFilter): Promise<NoteDao[]>;
 
   /**
-   * Add a NoteSpendingInfoDao instance to the noteSpendingInfoTable.
-   * This function is used to store auxiliary data related to a transaction,
-   * such as contract address and storage slot, in the database.
-   *
-   * @param noteSpendingInfoDao - The NoteSpendingInfoDao instance containing the auxiliary data of a transaction.
-   * @returns A promise that resolves when the auxiliary data is added to the database.
+   * Adds a note to DB.
+   * @param note - The note to add.
    */
-  addNoteSpendingInfo(noteSpendingInfoDao: NoteSpendingInfoDao): Promise<void>;
+  addNote(note: NoteDao): Promise<void>;
 
   /**
-   * Adds an array of NoteSpendingInfoDaos to the noteSpendingInfoTable.
-   * This function is used to insert multiple transaction auxiliary data objects into the database at once,
+   * Adds an array of notes to DB.
+   * This function is used to insert multiple notes to the database at once,
    * which can improve performance when dealing with large numbers of transactions.
    *
-   * @param noteSpendingInfoDaos - An array of NoteSpendingInfoDao instances representing the auxiliary data of transactions.
-   * @returns A Promise that resolves when all NoteSpendingInfoDaos have been successfully added to the noteSpendingInfoTable.
+   * @param notes - An array of notes.
    */
-  addNoteSpendingInfoBatch(noteSpendingInfoDaos: NoteSpendingInfoDao[]): Promise<void>;
+  addNotes(notes: NoteDao[]): Promise<void>;
 
   /**
-   * Remove nullified transaction auxiliary data records associated with the given account and nullifiers.
-   * The function filters the records based on matching account and nullifier values, and updates the
-   * noteSpendingInfoTable with the remaining records. It returns an array of removed NoteSpendingInfoDao instances.
+   * Remove nullified notes associated with the given account and nullifiers.
    *
    * @param nullifiers - An array of Fr instances representing nullifiers to be matched.
    * @param account - A PublicKey instance representing the account for which the records are being removed.
-   * @returns A Promise resolved with an array of removed NoteSpendingInfoDao instances.
+   * @returns Removed notes.
    */
-  removeNullifiedNoteSpendingInfo(nullifiers: Fr[], account: PublicKey): Promise<NoteSpendingInfoDao[]>;
+  removeNullifiedNotes(nullifiers: Fr[], account: PublicKey): Promise<NoteDao[]>;
 
   /**
    * Retrieve the stored Merkle tree roots from the database.

package/src/database/index.ts

@@ -1,3 +1,2 @@
 export * from './database.js';
 export * from './memory_db.js';
-export * from './note_spending_info_dao.js';

package/src/database/memory_db.ts

@@ -1,12 +1,12 @@
-import { CompleteAddress, HistoricBlockData } from '@aztec/circuits.js';
+import { CompleteAddress, HistoricBlockData, PublicKey } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { MerkleTreeId, PublicKey } from '@aztec/types';
+import { MerkleTreeId, NoteFilter } from '@aztec/types';
 
 import { MemoryContractDatabase } from '../contract_database/index.js';
 import { Database } from './database.js';
-import { NoteSpendingInfoDao, getNoteSpendingInfoDaoSize } from './note_spending_info_dao.js';
+import { NoteDao } from './note_dao.js';
 
 /**
  * The MemoryDB class provides an in-memory implementation of a database to manage transactions and auxiliary data.
@@ -15,7 +15,7 @@ import { NoteSpendingInfoDao, getNoteSpendingInfoDaoSize } from './note_spending
  * As an in-memory database, the stored data will not persist beyond the life of the application instance.
  */
 export class MemoryDB extends MemoryContractDatabase implements Database {
-  private noteSpendingInfoTable: NoteSpendingInfoDao[] = [];
+  private notesTable: NoteDao[] = [];
   private treeRoots: Record<MerkleTreeId, Fr> | undefined;
   private globalVariablesHash: Fr | undefined;
   private addresses: CompleteAddress[] = [];
@@ -44,41 +44,51 @@ export class MemoryDB extends MemoryContractDatabase implements Database {
     return Promise.resolve(this.authWitnesses[messageHash.toString()]);
   }
 
-  public addNoteSpendingInfo(noteSpendingInfoDao: NoteSpendingInfoDao) {
-    this.noteSpendingInfoTable.push(noteSpendingInfoDao);
+  public addNote(note: NoteDao) {
+    this.notesTable.push(note);
     return Promise.resolve();
   }
 
-  public addNoteSpendingInfoBatch(noteSpendingInfoDaos: NoteSpendingInfoDao[]) {
-    this.noteSpendingInfoTable.push(...noteSpendingInfoDaos);
+  public addNotes(notes: NoteDao[]) {
+    this.notesTable.push(...notes);
     return Promise.resolve();
   }
 
-  public getNoteSpendingInfo(contract: AztecAddress, storageSlot: Fr) {
-    const res = this.noteSpendingInfoTable.filter(
-      noteSpendingInfo =>
-        noteSpendingInfo.contractAddress.equals(contract) &&
-        noteSpendingInfo.storageSlot.toBuffer().equals(storageSlot.toBuffer()),
+  public async getNotes(filter: NoteFilter): Promise<NoteDao[]> {
+    let ownerPublicKey: PublicKey | undefined;
+    if (filter.owner !== undefined) {
+      const ownerCompleteAddress = await this.getCompleteAddress(filter.owner);
+      if (ownerCompleteAddress === undefined) {
+        throw new Error(`Owner ${filter.owner.toString()} not found in memory database`);
+      }
+      ownerPublicKey = ownerCompleteAddress.publicKey;
+    }
+
+    return this.notesTable.filter(
+      note =>
+        (filter.contractAddress == undefined || note.contractAddress.equals(filter.contractAddress)) &&
+        (filter.txHash == undefined || note.txHash.equals(filter.txHash)) &&
+        (filter.storageSlot == undefined || note.storageSlot.equals(filter.storageSlot!)) &&
+        (ownerPublicKey == undefined || note.publicKey.equals(ownerPublicKey!)),
     );
-    return Promise.resolve(res);
   }
 
-  public removeNullifiedNoteSpendingInfo(nullifiers: Fr[], account: PublicKey) {
+  public removeNullifiedNotes(nullifiers: Fr[], account: PublicKey) {
     const nullifierSet = new Set(nullifiers.map(nullifier => nullifier.toString()));
-    const [remaining, removed] = this.noteSpendingInfoTable.reduce(
-      (acc: [NoteSpendingInfoDao[], NoteSpendingInfoDao[]], noteSpendingInfo) => {
-        const nullifier = noteSpendingInfo.siloedNullifier.toString();
-        if (noteSpendingInfo.publicKey.equals(account) && nullifierSet.has(nullifier)) {
-          acc[1].push(noteSpendingInfo);
+    const [remaining, removed] = this.notesTable.reduce(
+      (acc: [NoteDao[], NoteDao[]], note) => {
+        const nullifier = note.siloedNullifier.toString();
+        if (note.publicKey.equals(account) && nullifierSet.has(nullifier)) {
+          acc[1].push(note);
         } else {
-          acc[0].push(noteSpendingInfo);
+          acc[0].push(note);
         }
         return acc;
       },
       [[], []],
     );
 
-    this.noteSpendingInfoTable = remaining;
+    this.notesTable = remaining;
 
     return Promise.resolve(removed);
   }
@@ -146,7 +156,7 @@ export class MemoryDB extends MemoryContractDatabase implements Database {
   }
 
   public estimateSize() {
-    const notesSize = this.noteSpendingInfoTable.reduce((sum, note) => sum + getNoteSpendingInfoDaoSize(note), 0);
+    const notesSize = this.notesTable.reduce((sum, note) => sum + note.getSize(), 0);
     const treeRootsSize = this.treeRoots ? Object.entries(this.treeRoots).length * Fr.SIZE_IN_BYTES : 0;
     const authWits = Object.entries(this.authWitnesses);
     const authWitsSize = authWits.reduce((sum, [key, value]) => sum + key.length + value.length * Fr.SIZE_IN_BYTES, 0);

package/src/database/note_dao.ts

@@ -0,0 +1,90 @@
+import { AztecAddress, Fr, Point, PublicKey } from '@aztec/circuits.js';
+import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer';
+import { BufferReader, Note, TxHash } from '@aztec/types';
+
+/**
+ * A note with contextual data.
+ */
+export class NoteDao {
+  constructor(
+    /** The note as emitted from the Noir contract. */
+    public note: Note,
+    /** The contract address this note is created in. */
+    public contractAddress: AztecAddress,
+    /** The specific storage location of the note on the contract. */
+    public storageSlot: Fr,
+    /** The hash of the tx the note was created in. */
+    public txHash: TxHash,
+    /** The nonce of the note. */
+    public nonce: Fr,
+    /**
+     * Inner note hash of the note. This is customizable by the app circuit.
+     * We can use this value to compute siloedNoteHash and uniqueSiloedNoteHash.
+     */
+    public innerNoteHash: Fr,
+    /** The nullifier of the note (siloed by contract address). */
+    public siloedNullifier: Fr,
+    /** The location of the relevant note in the note hash tree. */
+    public index: bigint,
+    /** The public key with which the note was encrypted. */
+    public publicKey: PublicKey,
+  ) {}
+
+  toBuffer(): Buffer {
+    return Buffer.concat([
+      this.note.toBuffer(),
+      this.contractAddress.toBuffer(),
+      this.storageSlot.toBuffer(),
+      this.txHash.buffer,
+      this.nonce.toBuffer(),
+      this.innerNoteHash.toBuffer(),
+      this.siloedNullifier.toBuffer(),
+      toBufferBE(this.index, 32),
+      this.publicKey.toBuffer(),
+    ]);
+  }
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+
+    const note = Note.fromBuffer(reader);
+    const contractAddress = AztecAddress.fromBuffer(reader);
+    const storageSlot = Fr.fromBuffer(reader);
+    const txHash = new TxHash(reader.readBytes(TxHash.SIZE));
+    const nonce = Fr.fromBuffer(reader);
+    const innerNoteHash = Fr.fromBuffer(reader);
+    const siloedNullifier = Fr.fromBuffer(reader);
+    const index = toBigIntBE(reader.readBytes(32));
+    const publicKey = Point.fromBuffer(reader);
+
+    return new NoteDao(
+      note,
+      contractAddress,
+      storageSlot,
+      txHash,
+      nonce,
+      innerNoteHash,
+      siloedNullifier,
+      index,
+      publicKey,
+    );
+  }
+
+  toString() {
+    return '0x' + this.toBuffer().toString('hex');
+  }
+
+  static fromString(str: string) {
+    const hex = str.replace(/^0x/, '');
+    return NoteDao.fromBuffer(Buffer.from(hex, 'hex'));
+  }
+
+  /**
+   * Returns the size in bytes of the Note Dao.
+   * @returns - Its size in bytes.
+   */
+  public getSize() {
+    const indexSize = Math.ceil(Math.log2(Number(this.index)));
+    const noteSize = 4 + this.note.items.length * Fr.SIZE_IN_BYTES;
+    return noteSize + AztecAddress.SIZE_IN_BYTES + Fr.SIZE_IN_BYTES * 4 + TxHash.SIZE + Point.SIZE_IN_BYTES + indexSize;
+  }
+}

package/src/kernel_oracle/index.ts

@@ -24,7 +24,7 @@ export class KernelOracle implements ProvingDataOracle {
   }
 
   async getNoteMembershipWitness(leafIndex: bigint): Promise<MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT>> {
-    const path = await this.node.getDataTreePath(leafIndex);
+    const path = await this.node.getNoteHashSiblingPath(leafIndex);
     return new MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT>(
       path.pathSize,
       leafIndex,

package/src/kernel_prover/kernel_prover.ts

@@ -1,4 +1,4 @@
-import { ExecutionResult, NewNoteData } from '@aztec/acir-simulator';
+import { ExecutionResult, NoteAndSlot } from '@aztec/acir-simulator';
 import {
   AztecAddress,
   CONTRACT_TREE_HEIGHT,
@@ -42,7 +42,7 @@ export interface OutputNoteData {
   /**
    * The encrypted note data for an output note.
    */
-  data: NewNoteData;
+  data: NoteAndSlot;
   /**
    * The unique value representing the note.
    */
@@ -231,11 +231,11 @@ export class KernelProver {
 
   /**
    * Retrieves the new output notes for a given execution result.
-   * The function maps over the new note preimages and associates them with their corresponding
+   * The function maps over the new notes and associates them with their corresponding
    * commitments in the public inputs of the execution result. It also includes the contract address
    * from the call context of the public inputs.
    *
-   * @param executionResult - The execution result object containing note preimages and public inputs.
+   * @param executionResult - The execution result object containing notes and public inputs.
    * @returns An array of OutputNoteData objects, each representing an output note with its associated data.
    */
   private async getNewNotes(executionResult: ExecutionResult): Promise<OutputNoteData[]> {

package/src/note_processor/note_processor.ts

@@ -1,13 +1,14 @@
-import { CircuitsWasm, MAX_NEW_COMMITMENTS_PER_TX, MAX_NEW_NULLIFIERS_PER_TX } from '@aztec/circuits.js';
+import { CircuitsWasm, MAX_NEW_COMMITMENTS_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, PublicKey } from '@aztec/circuits.js';
 import { computeCommitmentNonce, siloNullifier } from '@aztec/circuits.js/abis';
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
-import { AztecNode, KeyStore, L2BlockContext, L2BlockL2Logs, NoteSpendingInfo, PublicKey } from '@aztec/types';
+import { AztecNode, KeyStore, L1NotePayload, L2BlockContext, L2BlockL2Logs } from '@aztec/types';
 import { NoteProcessorStats } from '@aztec/types/stats';
 
-import { Database, NoteSpendingInfoDao } from '../database/index.js';
+import { Database } from '../database/index.js';
+import { NoteDao } from '../database/note_dao.js';
 import { getAcirSimulator } from '../simulator/index.js';
 
 /**
@@ -19,9 +20,9 @@ interface ProcessedData {
    */
   blockContext: L2BlockContext;
   /**
-   * A collection of data access objects for note spending info.
+   * DAOs of processed notes.
    */
-  noteSpendingInfoDaos: NoteSpendingInfoDao[];
+  noteDaos: NoteDao[];
 }
 
 /**
@@ -92,22 +93,23 @@ export class NoteProcessor {
       return;
     }
 
-    const blocksAndNoteSpendingInfo: ProcessedData[] = [];
+    const blocksAndNotes: ProcessedData[] = [];
     const curve = await Grumpkin.new();
 
     // Iterate over both blocks and encrypted logs.
     for (let blockIndex = 0; blockIndex < encryptedL2BlockLogs.length; ++blockIndex) {
       this.stats.blocks++;
       const { txLogs } = encryptedL2BlockLogs[blockIndex];
-      const block = l2BlockContexts[blockIndex].block;
+      const blockContext = l2BlockContexts[blockIndex];
+      const block = blockContext.block;
       const dataStartIndexForBlock = block.startNoteHashTreeSnapshot.nextAvailableLeafIndex;
 
       // We are using set for `userPertainingTxIndices` to avoid duplicates. This would happen in case there were
       // multiple encrypted logs in a tx pertaining to a user.
-      const noteSpendingInfoDaos: NoteSpendingInfoDao[] = [];
+      const noteDaos: NoteDao[] = [];
       const privateKey = await this.keyStore.getAccountPrivateKey(this.publicKey);
 
-      // Iterate over all the encrypted logs and try decrypting them. If successful, store the note spending info.
+      // Iterate over all the encrypted logs and try decrypting them. If successful, store the note.
       for (let indexOfTxInABlock = 0; indexOfTxInABlock < txLogs.length; ++indexOfTxInABlock) {
         this.stats.txs++;
         const dataStartIndexForTx = dataStartIndexForBlock + indexOfTxInABlock * MAX_NEW_COMMITMENTS_PER_TX;
@@ -126,26 +128,31 @@ export class NoteProcessor {
         for (const functionLogs of txFunctionLogs) {
           for (const logs of functionLogs.logs) {
             this.stats.seen++;
-            const noteSpendingInfo = NoteSpendingInfo.fromEncryptedBuffer(logs, privateKey, curve);
-            if (noteSpendingInfo) {
+            const payload = L1NotePayload.fromEncryptedBuffer(logs, privateKey, curve);
+            if (payload) {
               // We have successfully decrypted the data.
               try {
                 const { commitmentIndex, nonce, innerNoteHash, siloedNullifier } = await this.findNoteIndexAndNullifier(
                   newCommitments,
                   newNullifiers[0],
-                  noteSpendingInfo,
+                  payload,
                   excludedIndices,
                 );
                 const index = BigInt(dataStartIndexForTx + commitmentIndex);
                 excludedIndices.add(commitmentIndex);
-                noteSpendingInfoDaos.push({
-                  ...noteSpendingInfo,
-                  nonce,
-                  innerNoteHash,
-                  siloedNullifier,
-                  index,
-                  publicKey: this.publicKey,
-                });
+                noteDaos.push(
+                  new NoteDao(
+                    payload.note,
+                    payload.contractAddress,
+                    payload.storageSlot,
+                    blockContext.getTxHash(indexOfTxInABlock),
+                    nonce,
+                    innerNoteHash,
+                    siloedNullifier,
+                    index,
+                    this.publicKey,
+                  ),
+                );
                 this.stats.decrypted++;
               } catch (e) {
                 this.stats.failed++;
@@ -156,13 +163,13 @@ export class NoteProcessor {
         }
       }
 
-      blocksAndNoteSpendingInfo.push({
+      blocksAndNotes.push({
         blockContext: l2BlockContexts[blockIndex],
-        noteSpendingInfoDaos,
+        noteDaos,
       });
     }
 
-    await this.processBlocksAndNoteSpendingInfo(blocksAndNoteSpendingInfo);
+    await this.processBlocksAndNotes(blocksAndNotes);
 
     this.syncedToBlock = l2BlockContexts[l2BlockContexts.length - 1].block.number;
     this.log(`Synched block ${this.syncedToBlock}`);
@@ -173,20 +180,20 @@ export class NoteProcessor {
    * commitment for the current tx matches this value.
    * Compute the nullifier for a given transaction auxiliary data.
    * The nullifier is calculated using the private key of the account,
-   * contract address, and note preimage associated with the noteSpendingInfo.
+   * contract address, and the note associated with the l1NotePayload.
    * This method assists in identifying spent commitments in the private state.
    * @param commitments - Commitments in the tx. One of them should be the note's commitment.
    * @param firstNullifier - First nullifier in the tx.
-   * @param noteSpendingInfo - An instance of NoteSpendingInfo containing transaction details.
+   * @param l1NotePayload - An instance of l1NotePayload containing transaction details.
    * @param excludedIndices - Indices that have been assigned a note in the same tx. Notes in a tx can have the same
-   * NoteSpendingInfo. We need to find a different index for each replicate.
+   * l1NotePayload. We need to find a different index for each replicate.
    * @returns Information for a decrypted note, including the index of its commitment, nonce, inner note
    * hash, and the siloed nullifier. Throw if cannot find the nonce for the note.
    */
   private async findNoteIndexAndNullifier(
     commitments: Fr[],
     firstNullifier: Fr,
-    { contractAddress, storageSlot, notePreimage }: NoteSpendingInfo,
+    { contractAddress, storageSlot, note }: L1NotePayload,
     excludedIndices: Set<number>,
   ) {
     const wasm = await CircuitsWasm.get();
@@ -204,12 +211,7 @@ export class NoteProcessor {
 
       const expectedNonce = computeCommitmentNonce(wasm, firstNullifier, commitmentIndex);
       ({ innerNoteHash, siloedNoteHash, uniqueSiloedNoteHash, innerNullifier } =
-        await this.simulator.computeNoteHashAndNullifier(
-          contractAddress,
-          expectedNonce,
-          storageSlot,
-          notePreimage.items,
-        ));
+        await this.simulator.computeNoteHashAndNullifier(contractAddress, expectedNonce, storageSlot, note));
       if (commitment.equals(uniqueSiloedNoteHash)) {
         nonce = expectedNonce;
         break;
@@ -253,28 +255,28 @@ https://github.com/AztecProtocol/aztec-packages/issues/1641`;
    * transaction auxiliary data from the database. This function keeps track of new nullifiers
    * and ensures all other transactions are updated with newly settled block information.
    *
-   * @param blocksAndNoteSpendingInfo - Array of objects containing L2BlockContexts, user-pertaining transaction indices, and NoteSpendingInfoDaos.
+   * @param blocksAndNotes - Array of objects containing L2BlockContexts, user-pertaining transaction indices, and NoteDaos.
    */
-  private async processBlocksAndNoteSpendingInfo(blocksAndNoteSpendingInfo: ProcessedData[]) {
-    const noteSpendingInfoDaosBatch = blocksAndNoteSpendingInfo.flatMap(b => b.noteSpendingInfoDaos);
-    if (noteSpendingInfoDaosBatch.length) {
-      await this.db.addNoteSpendingInfoBatch(noteSpendingInfoDaosBatch);
-      noteSpendingInfoDaosBatch.forEach(noteSpendingInfo => {
+  private async processBlocksAndNotes(blocksAndNotes: ProcessedData[]) {
+    const noteDaos = blocksAndNotes.flatMap(b => b.noteDaos);
+    if (noteDaos.length) {
+      await this.db.addNotes(noteDaos);
+      noteDaos.forEach(noteDao => {
         this.log(
-          `Added note spending info for contract ${noteSpendingInfo.contractAddress} at slot ${
-            noteSpendingInfo.storageSlot
-          } with nullifier ${noteSpendingInfo.siloedNullifier.toString()}`,
+          `Added note for contract ${noteDao.contractAddress} at slot ${
+            noteDao.storageSlot
+          } with nullifier ${noteDao.siloedNullifier.toString()}`,
         );
       });
     }
 
-    const newNullifiers: Fr[] = blocksAndNoteSpendingInfo.flatMap(b => b.blockContext.block.newNullifiers);
-    const removedNoteSpendingInfo = await this.db.removeNullifiedNoteSpendingInfo(newNullifiers, this.publicKey);
-    removedNoteSpendingInfo.forEach(noteSpendingInfo => {
+    const newNullifiers: Fr[] = blocksAndNotes.flatMap(b => b.blockContext.block.newNullifiers);
+    const removedNotes = await this.db.removeNullifiedNotes(newNullifiers, this.publicKey);
+    removedNotes.forEach(noteDao => {
       this.log(
-        `Removed note spending info for contract ${noteSpendingInfo.contractAddress} at slot ${
-          noteSpendingInfo.storageSlot
-        } with nullifier ${noteSpendingInfo.siloedNullifier.toString()}`,
+        `Removed note for contract ${noteDao.contractAddress} at slot ${
+          noteDao.storageSlot
+        } with nullifier ${noteDao.siloedNullifier.toString()}`,
       );
     });
   }