@aztec/pxe 3.0.0-canary.a9708bd → 3.0.0-devnet.2-patch.1

package/dest/test/pxe_test_suite.js

@@ -1,97 +0,0 @@
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
-import { randomContractArtifact, randomContractInstanceWithAddress, randomDeployedContract } from '@aztec/stdlib/testing';
-import omit from 'lodash.omit';
-export const pxeTestSuite = (testName, pxeSetup)=>{
-    describe(testName, ()=>{
-        let pxe;
-        beforeAll(async ()=>{
-            pxe = await pxeSetup();
-        }, 120_000);
-        it('registers an account and returns it as an account only and not as a recipient', async ()=>{
-            const randomSecretKey = Fr.random();
-            const randomPartialAddress = Fr.random();
-            const completeAddress = await pxe.registerAccount(randomSecretKey, randomPartialAddress);
-            // Check that the account is correctly registered using the getAccounts and getRecipients methods
-            const accounts = await pxe.getRegisteredAccounts();
-            expect(accounts).toContainEqual(completeAddress);
-        });
-        it('does not throw when registering the same account twice (just ignores the second attempt)', async ()=>{
-            const randomSecretKey = Fr.random();
-            const randomPartialAddress = Fr.random();
-            await pxe.registerAccount(randomSecretKey, randomPartialAddress);
-            await pxe.registerAccount(randomSecretKey, randomPartialAddress);
-        });
-        it('successfully adds a contract', async ()=>{
-            const contracts = await Promise.all([
-                randomDeployedContract(),
-                randomDeployedContract()
-            ]);
-            for (const contract of contracts){
-                await pxe.registerContract(contract);
-            }
-            const expectedContractAddresses = contracts.map((contract)=>contract.instance.address);
-            const contractAddresses = await pxe.getContracts();
-            expect(contractAddresses).toEqual(expect.arrayContaining(expectedContractAddresses));
-        });
-        it('registers a class and adds a contract for it', async ()=>{
-            const artifact = randomContractArtifact();
-            const contractClass = await getContractClassFromArtifact(artifact);
-            const contractClassId = contractClass.id;
-            const instance = await randomContractInstanceWithAddress({
-                contractClassId
-            });
-            await pxe.registerContractClass(artifact);
-            expect((await pxe.getContractClassMetadata(contractClassId)).contractClass).toMatchObject(omit(contractClass, 'privateFunctionsRoot', 'publicBytecodeCommitment'));
-            await pxe.registerContract({
-                instance
-            });
-            expect((await pxe.getContractMetadata(instance.address)).contractInstance).toEqual(instance);
-        });
-        it('refuses to register a class with a mismatched address', async ()=>{
-            const artifact = randomContractArtifact();
-            const contractClass = await getContractClassFromArtifact(artifact);
-            const contractClassId = contractClass.id;
-            const instance = await randomContractInstanceWithAddress({
-                contractClassId
-            });
-            await expect(pxe.registerContract({
-                instance: {
-                    ...instance,
-                    address: await AztecAddress.random()
-                },
-                artifact
-            })).rejects.toThrow(/Added a contract in which the address does not match the contract instance./);
-        });
-        it('refuses to register a contract with a class that has not been registered', async ()=>{
-            const instance = await randomContractInstanceWithAddress();
-            await expect(pxe.registerContract({
-                instance
-            })).rejects.toThrow(/Artifact not found when registering an instance/);
-        });
-        it('refuses to register a contract with an artifact with mismatching class id', async ()=>{
-            const artifact = randomContractArtifact();
-            const instance = await randomContractInstanceWithAddress();
-            await expect(pxe.registerContract({
-                instance,
-                artifact
-            })).rejects.toThrow(/Artifact does not match/i);
-        });
-        // Note: Not testing a successful run of `proveTx`, `sendTx`, `getTxReceipt` and `simulateUtility` here as it
-        //       requires a larger setup and it's sufficiently tested in the e2e tests.
-        // Note: Not testing `getContractData`, `getPublicLogs` and `getPublicStorageAt` here as these
-        //       functions only call AztecNode and these methods are frequently used by the e2e tests.
-        it('successfully gets a block number', async ()=>{
-            const blockNum = await pxe.getBlockNumber();
-            expect(blockNum).toBeGreaterThanOrEqual(INITIAL_L2_BLOCK_NUM);
-        });
-        it('successfully gets node info', async ()=>{
-            const nodeInfo = await pxe.getNodeInfo();
-            expect(typeof nodeInfo.rollupVersion).toEqual('number');
-            expect(typeof nodeInfo.l1ChainId).toEqual('number');
-            expect(nodeInfo.l1ContractAddresses.rollupAddress.toString()).toMatch(/0x[a-fA-F0-9]+/);
-        });
-    });
-};

package/src/bin/index.ts

@@ -1,62 +0,0 @@
-#!/usr/bin/env -S node --no-warnings
-import { type SafeJsonRpcServerOptions, createNamespacedSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
-import { createLogger } from '@aztec/foundation/log';
-import { type PXE, PXESchema, createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
-
-import http from 'http';
-
-import { getPXEServiceConfig } from '../config/index.js';
-import { createPXEService } from '../entrypoints/server/utils.js';
-
-const { PXE_PORT = 8080, AZTEC_NODE_URL = 'http://localhost:8079' } = process.env;
-
-const logger = createLogger('pxe:service');
-
-/**
- * Creates an http server that forwards calls to the PXE and starts it on the given port.
- * @param pxeService - PXE that answers queries to the created HTTP server.
- * @param port - Port to listen in.
- * @param maxBatchSize - Maximum allowed batch size for JSON RPC batch requests.
- * @returns A running http server.
- */
-function startPXEHttpServer(
-  pxeService: PXE,
-  port: string | number,
-  opts: Pick<SafeJsonRpcServerOptions, 'maxBatchSize'> = {},
-): http.Server {
-  const rpcServer = createNamespacedSafeJsonRpcServer({ pxe: [pxeService, PXESchema] }, opts);
-
-  const app = rpcServer.getApp();
-  // eslint-disable-next-line @typescript-eslint/no-misused-promises
-  const httpServer = http.createServer(app.callback());
-  httpServer.listen(port);
-
-  return httpServer;
-}
-
-/**
- * Create and start a new PXE HTTP Server
- */
-async function main() {
-  logger.info(`Setting up PXE...`);
-
-  const pxeConfig = getPXEServiceConfig();
-  const nodeRpcClient = createAztecNodeClient(AZTEC_NODE_URL, {});
-  const pxeService = await createPXEService(nodeRpcClient, pxeConfig);
-
-  const shutdown = () => {
-    logger.info('Shutting down...');
-    process.exit(0);
-  };
-
-  process.once('SIGINT', shutdown);
-  process.once('SIGTERM', shutdown);
-
-  startPXEHttpServer(pxeService, PXE_PORT);
-  logger.info(`PXE listening on port ${PXE_PORT}`);
-}
-
-main().catch(err => {
-  logger.error(err);
-  process.exit(1);
-});

package/src/contract_function_simulator/oracle/typed_oracle.ts

@@ -1,289 +0,0 @@
-import type { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants';
-import { Fr, Point } from '@aztec/foundation/fields';
-import type { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { CompleteAddress, ContractInstance } from '@aztec/stdlib/contract';
-import type { KeyValidationRequest } from '@aztec/stdlib/kernel';
-import type { ContractClassLog, IndexedTaggingSecret } from '@aztec/stdlib/logs';
-import type { Note, NoteStatus } from '@aztec/stdlib/note';
-import { type MerkleTreeId, type NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
-import type { BlockHeader } from '@aztec/stdlib/tx';
-import type { UInt64 } from '@aztec/stdlib/types';
-
-import type { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
-
-/**
- * Information about a note needed during execution.
- */
-export interface NoteData {
-  /** The actual note content (the fields of the Noir #[note] struct). */
-  note: Note;
-  /** The address of the contract that owns the note. */
-  contractAddress: AztecAddress;
-  /** The storage slot of the note. */
-  storageSlot: Fr;
-  /** The nonce injected into the note hash preimage by kernels. */
-  noteNonce: Fr;
-  /** A hash of the note as it gets stored in the note hash tree. */
-  noteHash: Fr;
-  /** The corresponding nullifier of the note. Undefined for pending notes. */
-  siloedNullifier?: Fr;
-  /** The note's leaf index in the note hash tree. Undefined for pending notes. */
-  index?: bigint;
-}
-
-class OracleMethodNotAvailableError extends Error {
-  constructor(methodName: string) {
-    super(`Oracle method ${methodName} is not available.`);
-  }
-}
-
-/**
- * Oracle with typed parameters and typed return values.
- * Methods that require read and/or write will have to be implemented based on the context (public, private, or view)
- * and are unavailable by default.
- */
-export abstract class TypedOracle {
-  utilityAssertCompatibleOracleVersion(_version: number): void {
-    throw new OracleMethodNotAvailableError('utilityAssertCompatibleOracleVersion');
-  }
-
-  utilityGetRandomField(): Fr {
-    throw new OracleMethodNotAvailableError('utilityGetRandomField');
-  }
-
-  privateStoreInExecutionCache(_values: Fr[], _hash: Fr): void {
-    throw new OracleMethodNotAvailableError('privateStoreInExecutionCache');
-  }
-
-  privateLoadFromExecutionCache(_hash: Fr): Promise<Fr[]> {
-    return Promise.reject(new OracleMethodNotAvailableError('privateLoadFromExecutionCache'));
-  }
-
-  utilityGetBlockNumber(): Promise<number> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetBlockNumber'));
-  }
-
-  utilityGetTimestamp(): Promise<UInt64> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetTimestamp'));
-  }
-
-  utilityGetContractAddress(): Promise<AztecAddress> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetContractAddress'));
-  }
-
-  utilityGetChainId(): Promise<Fr> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetChainId'));
-  }
-
-  utilityGetVersion(): Promise<Fr> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetVersion'));
-  }
-
-  utilityGetKeyValidationRequest(_pkMHash: Fr): Promise<KeyValidationRequest> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetKeyValidationRequest'));
-  }
-
-  utilityGetContractInstance(_address: AztecAddress): Promise<ContractInstance> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetContractInstance'));
-  }
-
-  utilityGetMembershipWitness(_blockNumber: number, _treeId: MerkleTreeId, _leafValue: Fr): Promise<Fr[] | undefined> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetMembershipWitness'));
-  }
-
-  utilityGetNullifierMembershipWitness(
-    _blockNumber: number,
-    _nullifier: Fr,
-  ): Promise<NullifierMembershipWitness | undefined> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetNullifierMembershipWitness'));
-  }
-
-  utilityGetPublicDataWitness(_blockNumber: number, _leafSlot: Fr): Promise<PublicDataWitness | undefined> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetPublicDataWitness'));
-  }
-
-  utilityGetLowNullifierMembershipWitness(
-    _blockNumber: number,
-    _nullifier: Fr,
-  ): Promise<NullifierMembershipWitness | undefined> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetLowNullifierMembershipWitness'));
-  }
-
-  utilityGetBlockHeader(_blockNumber: number): Promise<BlockHeader | undefined> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetBlockHeader'));
-  }
-
-  utilityGetCompleteAddress(_account: AztecAddress): Promise<CompleteAddress> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetCompleteAddress'));
-  }
-
-  utilityGetAuthWitness(_messageHash: Fr): Promise<Fr[] | undefined> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetAuthWitness'));
-  }
-
-  utilityGetNotes(
-    _storageSlot: Fr,
-    _numSelects: number,
-    _selectByIndexes: number[],
-    _selectByOffsets: number[],
-    _selectByLengths: number[],
-    _selectValues: Fr[],
-    _selectComparators: number[],
-    _sortByIndexes: number[],
-    _sortByOffsets: number[],
-    _sortByLengths: number[],
-    _sortOrder: number[],
-    _limit: number,
-    _offset: number,
-    _status: NoteStatus,
-  ): Promise<NoteData[]> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetNotes'));
-  }
-
-  privateNotifyCreatedNote(
-    _storageSlot: Fr,
-    _noteTypeId: NoteSelector,
-    _note: Fr[],
-    _noteHash: Fr,
-    _counter: number,
-  ): void {
-    throw new OracleMethodNotAvailableError('privateNotifyCreatedNote');
-  }
-
-  privateNotifyNullifiedNote(_innerNullifier: Fr, _noteHash: Fr, _counter: number): Promise<void> {
-    return Promise.reject(new OracleMethodNotAvailableError('privateNotifyNullifiedNote'));
-  }
-
-  privateNotifyCreatedNullifier(_innerNullifier: Fr): Promise<void> {
-    return Promise.reject(new OracleMethodNotAvailableError('privateNotifyCreatedNullifier'));
-  }
-
-  utilityCheckNullifierExists(_innerNullifier: Fr): Promise<boolean> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityCheckNullifierExists'));
-  }
-
-  utilityGetL1ToL2MembershipWitness(
-    _contractAddress: AztecAddress,
-    _messageHash: Fr,
-    _secret: Fr,
-  ): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetL1ToL2MembershipWitness'));
-  }
-
-  utilityStorageRead(
-    _contractAddress: AztecAddress,
-    _startStorageSlot: Fr,
-    _blockNumber: number,
-    _numberOfElements: number,
-  ): Promise<Fr[]> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityStorageRead'));
-  }
-
-  privateNotifyCreatedContractClassLog(_log: ContractClassLog, _counter: number): void {
-    throw new OracleMethodNotAvailableError('privateNotifyCreatedContractClassLog');
-  }
-
-  privateCallPrivateFunction(
-    _targetContractAddress: AztecAddress,
-    _functionSelector: FunctionSelector,
-    _argsHash: Fr,
-    _sideEffectCounter: number,
-    _isStaticCall: boolean,
-  ): Promise<{ endSideEffectCounter: Fr; returnsHash: Fr }> {
-    return Promise.reject(new OracleMethodNotAvailableError('privateCallPrivateFunction'));
-  }
-
-  privateNotifyEnqueuedPublicFunctionCall(
-    _targetContractAddress: AztecAddress,
-    _calldataHash: Fr,
-    _sideEffectCounter: number,
-    _isStaticCall: boolean,
-  ): Promise<void> {
-    return Promise.reject(new OracleMethodNotAvailableError('privateNotifyEnqueuedPublicFunctionCall'));
-  }
-
-  privateNotifySetPublicTeardownFunctionCall(
-    _targetContractAddress: AztecAddress,
-    _calldataHash: Fr,
-    _sideEffectCounter: number,
-    _isStaticCall: boolean,
-  ): Promise<void> {
-    return Promise.reject(new OracleMethodNotAvailableError('privateNotifySetPublicTeardownFunctionCall'));
-  }
-
-  privateNotifySetMinRevertibleSideEffectCounter(_minRevertibleSideEffectCounter: number): Promise<void> {
-    throw new OracleMethodNotAvailableError('privateNotifySetMinRevertibleSideEffectCounter');
-  }
-
-  utilityDebugLog(_message: string, _fields: Fr[]): void {
-    throw new OracleMethodNotAvailableError('utilityDebugLog');
-  }
-
-  utilityGetIndexedTaggingSecretAsSender(
-    _sender: AztecAddress,
-    _recipient: AztecAddress,
-  ): Promise<IndexedTaggingSecret> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetIndexedTaggingSecretAsSender'));
-  }
-
-  privateIncrementAppTaggingSecretIndexAsSender(_sender: AztecAddress, _recipient: AztecAddress): Promise<void> {
-    return Promise.reject(new OracleMethodNotAvailableError('privateIncrementAppTaggingSecretIndexAsSender'));
-  }
-
-  utilityFetchTaggedLogs(_pendingTaggedLogArrayBaseSlot: Fr): Promise<void> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityFetchTaggedLogs'));
-  }
-
-  utilityValidateEnqueuedNotesAndEvents(
-    _contractAddress: AztecAddress,
-    _noteValidationRequestsArrayBaseSlot: Fr,
-    _eventValidationRequestsArrayBaseSlot: Fr,
-  ): Promise<void> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityValidateEnqueuedNotesAndEvents'));
-  }
-
-  utilityBulkRetrieveLogs(
-    _contractAddress: AztecAddress,
-    _logRetrievalRequestsArrayBaseSlot: Fr,
-    _logRetrievalResponsesArrayBaseSlot: Fr,
-  ): Promise<void> {
-    throw new OracleMethodNotAvailableError('utilityBulkRetrieveLogs');
-  }
-
-  utilityStoreCapsule(_contractAddress: AztecAddress, _key: Fr, _capsule: Fr[]): Promise<void> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityStoreCapsule'));
-  }
-
-  utilityLoadCapsule(_contractAddress: AztecAddress, _key: Fr): Promise<Fr[] | null> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityLoadCapsule'));
-  }
-
-  utilityDeleteCapsule(_contractAddress: AztecAddress, _key: Fr): Promise<void> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityDeleteCapsule'));
-  }
-
-  utilityCopyCapsule(_contractAddress: AztecAddress, _srcKey: Fr, _dstKey: Fr, _numEntries: number): Promise<void> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityCopyCapsule'));
-  }
-
-  utilityAes128Decrypt(_ciphertext: Buffer, _iv: Buffer, _symKey: Buffer): Promise<Buffer> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityAes128Decrypt'));
-  }
-
-  utilityGetSharedSecret(_address: AztecAddress, _ephPk: Point): Promise<Point> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityGetSharedSecret'));
-  }
-
-  utilityEmitOffchainEffect(_data: Fr[]): Promise<void> {
-    return Promise.reject(new OracleMethodNotAvailableError('utilityEmitOffchainEffect'));
-  }
-
-  privateGetSenderForTags(): Promise<AztecAddress | undefined> {
-    return Promise.reject(new OracleMethodNotAvailableError('privateGetSenderForTags'));
-  }
-
-  privateSetSenderForTags(_senderForTags: AztecAddress): Promise<void> {
-    return Promise.reject(new OracleMethodNotAvailableError('privateSetSenderForTags'));
-  }
-}

package/src/contract_function_simulator/tagging_utils.ts

@@ -1,32 +0,0 @@
-import type { Fr } from '@aztec/foundation/fields';
-import { IndexedTaggingSecret } from '@aztec/stdlib/logs';
-
-// Half the size of the window we slide over the tagging secret indexes.
-export const WINDOW_HALF_SIZE = 10;
-
-export function getIndexedTaggingSecretsForTheWindow(
-  secretsAndWindows: { appTaggingSecret: Fr; leftMostIndex: number; rightMostIndex: number }[],
-): IndexedTaggingSecret[] {
-  const secrets: IndexedTaggingSecret[] = [];
-  for (const secretAndWindow of secretsAndWindows) {
-    for (let i = secretAndWindow.leftMostIndex; i <= secretAndWindow.rightMostIndex; i++) {
-      secrets.push(new IndexedTaggingSecret(secretAndWindow.appTaggingSecret, i));
-    }
-  }
-  return secrets;
-}
-
-/**
- * Creates a map from app tagging secret to initial index.
- * @param indexedTaggingSecrets - The indexed tagging secrets to get the initial indexes from.
- * @returns The map from app tagging secret to initial index.
- */
-export function getInitialIndexesMap(indexedTaggingSecrets: IndexedTaggingSecret[]): { [k: string]: number } {
-  const initialIndexes: { [k: string]: number } = {};
-
-  for (const indexedTaggingSecret of indexedTaggingSecrets) {
-    initialIndexes[indexedTaggingSecret.appTaggingSecret.toString()] = indexedTaggingSecret.index;
-  }
-
-  return initialIndexes;
-}

package/src/pxe_service/index.ts

@@ -1,2 +0,0 @@
-export * from './pxe_service.js';
-export { enrichPublicSimulationError } from './error_enriching.js';

package/src/storage/data_provider.ts

@@ -1,3 +0,0 @@
-export interface DataProvider {
-  getSize(): Promise<number>;
-}

package/src/storage/note_data_provider/note_dao.ts

@@ -1,154 +0,0 @@
-import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
-import { Fr, Point } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { Note } from '@aztec/stdlib/note';
-import { TxHash } from '@aztec/stdlib/tx';
-
-import type { NoteData } from '../../contract_function_simulator/oracle/typed_oracle.js';
-
-/**
- * A Note Data Access Object, representing a note that was committed to the note hash tree, holding all of the
- * information required to use it during execution and manage its state.
- */
-export class NoteDao implements NoteData {
-  constructor(
-    // Note information
-
-    /** The packed content of the note, as will be returned in the getNotes oracle. */
-    public note: Note,
-    /** The address of the contract that created the note (i.e. the address used by the kernel during siloing). */
-    public contractAddress: AztecAddress,
-    /**
-     * The storage location of the note. This value is not used for anything in PXE, but we do index by storage slot
-     * since contracts typically make queries based on it.
-     */
-    public storageSlot: Fr,
-    /** The nonce that was injected into the note hash preimage in order to guarantee uniqueness. */
-    public noteNonce: Fr,
-
-    // Computed values
-    /**
-     * The inner hash (non-unique, non-siloed) of the note. Each contract determines how the note is hashed. Can
-     * be used alongside contractAddress and nonce to compute the uniqueNoteHash and the siloedNoteHash.
-     */
-    public noteHash: Fr,
-    /**
-     * The nullifier of the note, siloed by contract address.
-     * Note: Might be set as 0 if the note was added to PXE as nullified.
-     */
-    public siloedNullifier: Fr,
-
-    // Metadata
-    /** The hash of the tx in which this note was created. Knowing the tx hash allows for efficient node queries e.g.
-     *  when searching for txEffects.
-     */
-    public txHash: TxHash,
-    /** The L2 block number in which the tx with this note was included. Used for note management while processing
-     * reorgs.*/
-    public l2BlockNumber: number,
-    /** The L2 block hash in which the tx with this note was included. Used for note management while processing
-     * reorgs.*/
-    public l2BlockHash: string,
-    /** The index of the leaf in the global note hash tree the note is stored at */
-    public index: bigint,
-    /**
-     * The address whose public key was used to encrypt the note log during delivery.
-     * (This is the x-coordinate of the public key.)
-     */
-    public recipient: AztecAddress,
-  ) {}
-
-  toBuffer(): Buffer {
-    return serializeToBuffer([
-      this.note,
-      this.contractAddress,
-      this.storageSlot,
-      this.noteNonce,
-      this.noteHash,
-      this.siloedNullifier,
-      this.txHash,
-      this.l2BlockNumber,
-      Fr.fromHexString(this.l2BlockHash),
-      this.index,
-      this.recipient,
-    ]);
-  }
-
-  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 noteNonce = Fr.fromBuffer(reader);
-    const noteHash = Fr.fromBuffer(reader);
-    const siloedNullifier = Fr.fromBuffer(reader);
-    const txHash = reader.readObject(TxHash);
-    const l2BlockNumber = reader.readNumber();
-    const l2BlockHash = Fr.fromBuffer(reader).toString();
-    const index = toBigIntBE(reader.readBytes(32));
-    const recipient = AztecAddress.fromBuffer(reader);
-
-    return new NoteDao(
-      note,
-      contractAddress,
-      storageSlot,
-      noteNonce,
-      noteHash,
-      siloedNullifier,
-      txHash,
-      l2BlockNumber,
-      l2BlockHash,
-      index,
-      recipient,
-    );
-  }
-
-  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;
-  }
-
-  static async random({
-    note = Note.random(),
-    contractAddress = undefined,
-    storageSlot = Fr.random(),
-    noteNonce = Fr.random(),
-    noteHash = Fr.random(),
-    siloedNullifier = Fr.random(),
-    txHash = TxHash.random(),
-    l2BlockNumber = Math.floor(Math.random() * 1000),
-    l2BlockHash = Fr.random().toString(),
-    index = Fr.random().toBigInt(),
-    recipient = undefined,
-  }: Partial<NoteDao> = {}) {
-    return new NoteDao(
-      note,
-      contractAddress ?? (await AztecAddress.random()),
-      storageSlot,
-      noteNonce,
-      noteHash,
-      siloedNullifier,
-      txHash,
-      l2BlockNumber,
-      l2BlockHash,
-      index,
-      recipient ?? (await AztecAddress.random()),
-    );
-  }
-}