@aztec/pxe 0.63.0 → 0.64.0

package/dest/synchronizer/synchronizer.d.ts

@@ -1,5 +1,6 @@
-import { type AztecNode } from '@aztec/circuit-types';
-import { type SerialQueue } from '@aztec/foundation/queue';
+import { type AztecNode, L2BlockStream, type L2BlockStreamEvent, type L2BlockStreamEventHandler } from '@aztec/circuit-types';
+import { type L2TipsStore } from '@aztec/kv-store/stores';
+import { type PXEConfig } from '../config/index.js';
 import { type PxeDatabase } from '../database/index.js';
 /**
  * The Synchronizer class manages the synchronization of note processors and interacts with the Aztec node
@@ -8,15 +9,18 @@ import { type PxeDatabase } from '../database/index.js';
  * details, and fetch transactions by hash. The Synchronizer ensures that it maintains the note processors
  * in sync with the blockchain while handling retries and errors gracefully.
  */
-export declare class Synchronizer {
+export declare class Synchronizer implements L2BlockStreamEventHandler {
     private node;
     private db;
-    private jobQueue;
-    private runningPromise?;
+    private l2TipsStore;
     private running;
     private initialSyncBlockNumber;
     private log;
-    constructor(node: AztecNode, db: PxeDatabase, jobQueue: SerialQueue, logSuffix?: string);
+    protected readonly blockStream: L2BlockStream;
+    constructor(node: AztecNode, db: PxeDatabase, l2TipsStore: L2TipsStore, config?: Partial<Pick<PXEConfig, 'l2BlockPollingIntervalMS' | 'l2StartingBlock'>>, logSuffix?: string);
+    protected createBlockStream(config: Partial<Pick<PXEConfig, 'l2BlockPollingIntervalMS' | 'l2StartingBlock'>>): L2BlockStream;
+    /** Handle events emitted by the block stream. */
+    handleBlockStreamEvent(event: L2BlockStreamEvent): Promise<void>;
     /**
      * Starts the synchronization process by fetching encrypted logs and blocks from a specified position.
      * Continuously processes the fetched data for all note processors until stopped. If there is no data
@@ -25,28 +29,7 @@ export declare class Synchronizer {
      * @param limit - The maximum number of encrypted, unencrypted logs and blocks to fetch in each iteration.
      * @param retryInterval - The time interval (in ms) to wait before retrying if no data is available.
      */
-    start(limit?: number, retryInterval?: number): Promise<void>;
-    protected initialSync(): Promise<void>;
-    /**
-     * Fetches encrypted logs and blocks from the Aztec node and processes them for all note processors.
-     * If needed, catches up note processors that are lagging behind the main sync, e.g. because we just added a new account.
-     *
-     * Uses the job queue to ensure that
-     * - sync does not overlap with pxe simulations.
-     * - one sync is running at a time.
-     *
-     * @param limit - The maximum number of encrypted, unencrypted logs and blocks to fetch in each iteration.
-     * @returns a promise that resolves when the sync is complete
-     */
-    protected sync(limit: number): Promise<void>;
-    /**
-     * Fetches encrypted logs and blocks from the Aztec node and processes them for all note processors.
-     *
-     * @param limit - The maximum number of encrypted, unencrypted logs and blocks to fetch in each iteration.
-     * @returns true if there could be more work, false if we're caught up or there was an error.
-     */
-    protected work(limit?: number): Promise<boolean>;
-    private setHeaderFromBlock;
+    start(): Promise<void>;
     /**
      * Stops the synchronizer gracefully, interrupting any ongoing sleep and waiting for the current
      * iteration to complete before setting the running state to false. Once stopped, the synchronizer
@@ -55,6 +38,8 @@ export declare class Synchronizer {
      * @returns A promise that resolves when the synchronizer has successfully stopped.
      */
     stop(): Promise<void>;
+    /** Triggers a single run. */
+    trigger(): Promise<void>;
     private getSynchedBlockNumber;
     /**
      * Checks whether all the blocks were processed (tree roots updated, txs updated with block info, etc.).

package/dest/synchronizer/synchronizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAgB,MAAM,sBAAsB,CAAC;AAGpE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;;GAMG;AACH,qBAAa,YAAY;IAMX,OAAO,CAAC,IAAI;IAAa,OAAO,CAAC,EAAE;IAAe,OAAO,CAAC,QAAQ;IAL9E,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,sBAAsB,CAA4B;IAC1D,OAAO,CAAC,GAAG,CAAc;gBAEL,IAAI,EAAE,SAAS,EAAU,EAAE,EAAE,WAAW,EAAU,QAAQ,EAAE,WAAW,EAAE,SAAS,SAAK;IAI3G;;;;;;;OAOG;IACU,KAAK,CAAC,KAAK,SAAI,EAAE,aAAa,SAAO;cAalC,WAAW;IAO3B;;;;;;;;;;OAUG;IACH,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM;IAU5B;;;;;OAKG;cACa,IAAI,CAAC,KAAK,SAAI,GAAG,OAAO,CAAC,OAAO,CAAC;YAkBnC,kBAAkB;IAQhC;;;;;;OAMG;IACU,IAAI;IAMjB,OAAO,CAAC,qBAAqB;IAI7B;;;;;OAKG;IACU,yBAAyB;IAKtC;;;OAGG;IACI,aAAa;;;CAMrB"}
+{"version":3,"file":"synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EACd,aAAa,EACb,KAAK,kBAAkB,EACvB,KAAK,yBAAyB,EAC/B,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;;GAMG;AACH,qBAAa,YAAa,YAAW,yBAAyB;IAO1D,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,WAAW;IARrB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,sBAAsB,CAA4B;IAC1D,OAAO,CAAC,GAAG,CAAc;IACzB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;gBAGpC,IAAI,EAAE,SAAS,EACf,EAAE,EAAE,WAAW,EACf,WAAW,EAAE,WAAW,EAChC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,0BAA0B,GAAG,iBAAiB,CAAC,CAAM,EACrF,SAAS,CAAC,EAAE,MAAM;IAMpB,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,0BAA0B,GAAG,iBAAiB,CAAC,CAAC;IAO5G,iDAAiD;IACpC,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB7E;;;;;;;OAOG;IACU,KAAK;IAelB;;;;;;OAMG;IACU,IAAI;IAMjB,6BAA6B;IAChB,OAAO;IAIpB,OAAO,CAAC,qBAAqB;IAI7B;;;;;OAKG;IACU,yBAAyB;IAKtC;;;OAGG;IACI,aAAa;;;CAMrB"}

package/dest/synchronizer/synchronizer.js

@@ -1,6 +1,6 @@
+import { L2BlockStream, } from '@aztec/circuit-types';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { RunningPromise } from '@aztec/foundation/running-promise';
 /**
  * The Synchronizer class manages the synchronization of note processors and interacts with the Aztec node
  * to obtain encrypted logs, blocks, and other necessary information for the accounts.
@@ -9,13 +9,41 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
  * in sync with the blockchain while handling retries and errors gracefully.
  */
 export class Synchronizer {
-    constructor(node, db, jobQueue, logSuffix = '') {
+    constructor(node, db, l2TipsStore, config = {}, logSuffix) {
         this.node = node;
         this.db = db;
-        this.jobQueue = jobQueue;
+        this.l2TipsStore = l2TipsStore;
         this.running = false;
         this.initialSyncBlockNumber = INITIAL_L2_BLOCK_NUM - 1;
         this.log = createDebugLogger(logSuffix ? `aztec:pxe_synchronizer_${logSuffix}` : 'aztec:pxe_synchronizer');
+        this.blockStream = this.createBlockStream(config);
+    }
+    createBlockStream(config) {
+        return new L2BlockStream(this.node, this.l2TipsStore, this, {
+            pollIntervalMS: config.l2BlockPollingIntervalMS,
+            startingBlock: config.l2StartingBlock,
+        });
+    }
+    /** Handle events emitted by the block stream. */
+    async handleBlockStreamEvent(event) {
+        await this.l2TipsStore.handleBlockStreamEvent(event);
+        switch (event.type) {
+            case 'blocks-added':
+                this.log.verbose(`Processing blocks ${event.blocks[0].number} to ${event.blocks.at(-1).number}`);
+                await this.db.setHeader(event.blocks.at(-1).header);
+                break;
+            case 'chain-pruned':
+                this.log.info(`Pruning data after block ${event.blockNumber} due to reorg`);
+                // We first unnullify and then remove so that unnullified notes that were created after the block number end up deleted.
+                await this.db.unnullifyNotesAfter(event.blockNumber);
+                await this.db.removeNotesAfter(event.blockNumber);
+                // Remove all note tagging indexes to force a full resync. This is suboptimal, but unless we track the
+                // block number in which each index is used it's all we can do.
+                await this.db.resetNoteSyncData();
+                // Update the header to the last block.
+                await this.db.setHeader(await this.node.getBlockHeader(event.blockNumber));
+                break;
+        }
     }
     /**
      * Starts the synchronization process by fetching encrypted logs and blocks from a specified position.
@@ -25,72 +53,18 @@ export class Synchronizer {
      * @param limit - The maximum number of encrypted, unencrypted logs and blocks to fetch in each iteration.
      * @param retryInterval - The time interval (in ms) to wait before retrying if no data is available.
      */
-    async start(limit = 1, retryInterval = 1000) {
+    async start() {
         if (this.running) {
             return;
         }
         this.running = true;
-        await this.jobQueue.put(() => this.initialSync());
+        // REFACTOR: We should know the header of the genesis block without having to request it from the node.
+        await this.db.setHeader(await this.node.getBlockHeader(0));
+        await this.trigger();
         this.log.info('Initial sync complete');
-        this.runningPromise = new RunningPromise(() => this.sync(limit), retryInterval);
-        this.runningPromise.start();
+        this.blockStream.start();
         this.log.debug('Started loop');
     }
-    async initialSync() {
-        // fast forward to the latest block
-        const latestHeader = await this.node.getHeader();
-        this.initialSyncBlockNumber = Number(latestHeader.globalVariables.blockNumber.toBigInt());
-        await this.db.setHeader(latestHeader);
-    }
-    /**
-     * Fetches encrypted logs and blocks from the Aztec node and processes them for all note processors.
-     * If needed, catches up note processors that are lagging behind the main sync, e.g. because we just added a new account.
-     *
-     * Uses the job queue to ensure that
-     * - sync does not overlap with pxe simulations.
-     * - one sync is running at a time.
-     *
-     * @param limit - The maximum number of encrypted, unencrypted logs and blocks to fetch in each iteration.
-     * @returns a promise that resolves when the sync is complete
-     */
-    sync(limit) {
-        return this.jobQueue.put(async () => {
-            let moreWork = true;
-            // keep external this.running flag to interrupt greedy sync
-            while (moreWork && this.running) {
-                moreWork = await this.work(limit);
-            }
-        });
-    }
-    /**
-     * Fetches encrypted logs and blocks from the Aztec node and processes them for all note processors.
-     *
-     * @param limit - The maximum number of encrypted, unencrypted logs and blocks to fetch in each iteration.
-     * @returns true if there could be more work, false if we're caught up or there was an error.
-     */
-    async work(limit = 1) {
-        const from = this.getSynchedBlockNumber() + 1;
-        try {
-            const blocks = await this.node.getBlocks(from, limit);
-            if (blocks.length === 0) {
-                return false;
-            }
-            // Update latest tree roots from the most recent block
-            const latestBlock = blocks[blocks.length - 1];
-            await this.setHeaderFromBlock(latestBlock);
-            return true;
-        }
-        catch (err) {
-            this.log.error(`Error in synchronizer work`, err);
-            return false;
-        }
-    }
-    async setHeaderFromBlock(latestBlock) {
-        if (latestBlock.number < this.initialSyncBlockNumber) {
-            return;
-        }
-        await this.db.setHeader(latestBlock.header);
-    }
     /**
      * Stops the synchronizer gracefully, interrupting any ongoing sleep and waiting for the current
      * iteration to complete before setting the running state to false. Once stopped, the synchronizer
@@ -100,9 +74,13 @@ export class Synchronizer {
      */
     async stop() {
         this.running = false;
-        await this.runningPromise?.stop();
+        await this.blockStream.stop();
         this.log.info('Stopped');
     }
+    /** Triggers a single run. */
+    async trigger() {
+        await this.blockStream.sync();
+    }
     getSynchedBlockNumber() {
         return this.db.getBlockNumber() ?? this.initialSyncBlockNumber;
     }
@@ -127,4 +105,4 @@ export class Synchronizer {
         };
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luY2hyb25pemVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N5bmNocm9uaXplci9zeW5jaHJvbml6ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDMUQsT0FBTyxFQUFvQixpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTVFLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUluRTs7Ozs7O0dBTUc7QUFDSCxNQUFNLE9BQU8sWUFBWTtJQU12QixZQUFvQixJQUFlLEVBQVUsRUFBZSxFQUFVLFFBQXFCLEVBQUUsU0FBUyxHQUFHLEVBQUU7UUFBdkYsU0FBSSxHQUFKLElBQUksQ0FBVztRQUFVLE9BQUUsR0FBRixFQUFFLENBQWE7UUFBVSxhQUFRLEdBQVIsUUFBUSxDQUFhO1FBSm5GLFlBQU8sR0FBRyxLQUFLLENBQUM7UUFDaEIsMkJBQXNCLEdBQUcsb0JBQW9CLEdBQUcsQ0FBQyxDQUFDO1FBSXhELElBQUksQ0FBQyxHQUFHLEdBQUcsaUJBQWlCLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQywwQkFBMEIsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLHdCQUF3QixDQUFDLENBQUM7SUFDN0csQ0FBQztJQUVEOzs7Ozs7O09BT0c7SUFDSSxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssR0FBRyxDQUFDLEVBQUUsYUFBYSxHQUFHLElBQUk7UUFDaEQsSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDakIsT0FBTztRQUNULENBQUM7UUFDRCxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQztRQUVwQixNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDO1FBQ2xELElBQUksQ0FBQyxHQUFHLENBQUMsSUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luY2hyb25pemVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N5bmNocm9uaXplci9zeW5jaHJvbml6ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUVMLGFBQWEsR0FHZCxNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzFELE9BQU8sRUFBb0IsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQU01RTs7Ozs7O0dBTUc7QUFDSCxNQUFNLE9BQU8sWUFBWTtJQU12QixZQUNVLElBQWUsRUFDZixFQUFlLEVBQ2YsV0FBd0IsRUFDaEMsU0FBbUYsRUFBRSxFQUNyRixTQUFrQjtRQUpWLFNBQUksR0FBSixJQUFJLENBQVc7UUFDZixPQUFFLEdBQUYsRUFBRSxDQUFhO1FBQ2YsZ0JBQVcsR0FBWCxXQUFXLENBQWE7UUFSMUIsWUFBTyxHQUFHLEtBQUssQ0FBQztRQUNoQiwyQkFBc0IsR0FBRyxvQkFBb0IsR0FBRyxDQUFDLENBQUM7UUFXeEQsSUFBSSxDQUFDLEdBQUcsR0FBRyxpQkFBaUIsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLDBCQUEwQixTQUFTLEVBQUUsQ0FBQyxDQUFDLENBQUMsd0JBQXdCLENBQUMsQ0FBQztRQUMzRyxJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNwRCxDQUFDO0lBRVMsaUJBQWlCLENBQUMsTUFBZ0Y7UUFDMUcsT0FBTyxJQUFJLGFBQWEsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxXQUFXLEVBQUUsSUFBSSxFQUFFO1lBQzFELGNBQWMsRUFBRSxNQUFNLENBQUMsd0JBQXdCO1lBQy9DLGFBQWEsRUFBRSxNQUFNLENBQUMsZUFBZTtTQUN0QyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsaURBQWlEO0lBQzFDLEtBQUss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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.63.0",
+  "version": "0.64.0",
   "type": "module",
   "exports": "./dest/index.js",
   "bin": "./dest/bin/index.js",
@@ -59,19 +59,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.63.0",
-    "@aztec/bb.js": "0.63.0",
-    "@aztec/builder": "0.63.0",
-    "@aztec/circuit-types": "0.63.0",
-    "@aztec/circuits.js": "0.63.0",
-    "@aztec/ethereum": "0.63.0",
-    "@aztec/foundation": "0.63.0",
-    "@aztec/key-store": "0.63.0",
-    "@aztec/kv-store": "0.63.0",
-    "@aztec/noir-protocol-circuits-types": "0.63.0",
-    "@aztec/protocol-contracts": "0.63.0",
-    "@aztec/simulator": "0.63.0",
-    "@aztec/types": "0.63.0",
+    "@aztec/bb-prover": "0.64.0",
+    "@aztec/bb.js": "0.64.0",
+    "@aztec/builder": "0.64.0",
+    "@aztec/circuit-types": "0.64.0",
+    "@aztec/circuits.js": "0.64.0",
+    "@aztec/ethereum": "0.64.0",
+    "@aztec/foundation": "0.64.0",
+    "@aztec/key-store": "0.64.0",
+    "@aztec/kv-store": "0.64.0",
+    "@aztec/noir-protocol-circuits-types": "0.64.0",
+    "@aztec/protocol-contracts": "0.64.0",
+    "@aztec/simulator": "0.64.0",
+    "@aztec/types": "0.64.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
     "@noir-lang/types": "workspace:*",

package/src/database/contracts/contract_artifact_db.ts

@@ -9,6 +9,7 @@ export interface ContractArtifactDatabase {
    * Adds a new contract artifact to the database or updates an existing one.
    * @param id - Id of the corresponding contract class.
    * @param contract - Contract artifact to add.
+   * @throws - If there are duplicate private function selectors.
    */
   addContractArtifact(id: Fr, contract: ContractArtifact): Promise<void>;
   /**

package/src/database/incoming_note_dao.ts

@@ -1,4 +1,4 @@
-import { type L1NotePayload, Note, TxHash } from '@aztec/circuit-types';
+import { type L1NotePayload, Note, TxHash, randomTxHash } from '@aztec/circuit-types';
 import { AztecAddress, Fr, Point, type PublicKey } from '@aztec/circuits.js';
 import { NoteSelector } from '@aztec/foundation/abi';
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
@@ -22,6 +22,10 @@ export class IncomingNoteDao implements NoteData {
     public noteTypeId: NoteSelector,
     /** The hash of the tx the note was created in. */
     public txHash: TxHash,
+    /** The L2 block number in which the tx with this note was included. */
+    public l2BlockNumber: number,
+    /** The L2 block hash in which the tx with this note was included. */
+    public l2BlockHash: string,
     /** The nonce of the note. */
     public nonce: Fr,
     /**
@@ -44,6 +48,8 @@ export class IncomingNoteDao implements NoteData {
     note: Note,
     payload: L1NotePayload,
     noteInfo: NoteInfo,
+    l2BlockNumber: number,
+    l2BlockHash: string,
     dataStartIndexForTx: number,
     addressPoint: PublicKey,
   ) {
@@ -54,6 +60,8 @@ export class IncomingNoteDao implements NoteData {
       payload.storageSlot,
       payload.noteTypeId,
       noteInfo.txHash,
+      l2BlockNumber,
+      l2BlockHash,
       noteInfo.nonce,
       noteInfo.noteHash,
       noteInfo.siloedNullifier,
@@ -69,6 +77,8 @@ export class IncomingNoteDao implements NoteData {
       this.storageSlot,
       this.noteTypeId,
       this.txHash.buffer,
+      this.l2BlockNumber,
+      Fr.fromString(this.l2BlockHash),
       this.nonce,
       this.noteHash,
       this.siloedNullifier,
@@ -76,6 +86,7 @@ export class IncomingNoteDao implements NoteData {
       this.addressPoint,
     ]);
   }
+
   static fromBuffer(buffer: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buffer);
 
@@ -84,6 +95,8 @@ export class IncomingNoteDao implements NoteData {
     const storageSlot = Fr.fromBuffer(reader);
     const noteTypeId = reader.readObject(NoteSelector);
     const txHash = reader.readObject(TxHash);
+    const l2BlockNumber = reader.readNumber();
+    const l2BlockHash = Fr.fromBuffer(reader).toString();
     const nonce = Fr.fromBuffer(reader);
     const noteHash = Fr.fromBuffer(reader);
     const siloedNullifier = Fr.fromBuffer(reader);
@@ -96,6 +109,8 @@ export class IncomingNoteDao implements NoteData {
       storageSlot,
       noteTypeId,
       txHash,
+      l2BlockNumber,
+      l2BlockHash,
       nonce,
       noteHash,
       siloedNullifier,
@@ -122,4 +137,34 @@ export class IncomingNoteDao implements NoteData {
     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;
   }
+
+  static random({
+    note = Note.random(),
+    contractAddress = AztecAddress.random(),
+    txHash = randomTxHash(),
+    storageSlot = Fr.random(),
+    noteTypeId = NoteSelector.random(),
+    nonce = Fr.random(),
+    l2BlockNumber = Math.floor(Math.random() * 1000),
+    l2BlockHash = Fr.random().toString(),
+    noteHash = Fr.random(),
+    siloedNullifier = Fr.random(),
+    index = Fr.random().toBigInt(),
+    addressPoint = Point.random(),
+  }: Partial<IncomingNoteDao> = {}) {
+    return new IncomingNoteDao(
+      note,
+      contractAddress,
+      storageSlot,
+      noteTypeId,
+      txHash,
+      l2BlockNumber,
+      l2BlockHash,
+      nonce,
+      noteHash,
+      siloedNullifier,
+      index,
+      addressPoint,
+    );
+  }
 }