@aztec/stdlib 3.0.0-nightly.20251126 → 3.0.0-nightly.20251128

package/src/tests/factories.ts

@@ -1,4 +1,9 @@
-import { makeBatchedBlobAccumulator, makeSpongeBlob } from '@aztec/blob-lib/testing';
+import {
+  makeBlobAccumulator,
+  makeFinalBlobAccumulator,
+  makeFinalBlobBatchingChallenges,
+  makeSpongeBlob,
+} from '@aztec/blob-lib/testing';
 import {
   ARCHIVE_HEIGHT,
   AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED,
@@ -77,7 +82,7 @@ import {
 import { PublicDataRead } from '../avm/public_data_read.js';
 import { PublicDataWrite } from '../avm/public_data_write.js';
 import { AztecAddress } from '../aztec-address/index.js';
-import { L2BlockHeader } from '../block/index.js';
+import { L2BlockHeader } from '../block/l2_block_header.js';
 import {
   type ContractClassPublic,
   ContractDeploymentData,
@@ -296,7 +301,12 @@ export function makeContractStorageRead(seed = 1): ContractStorageRead {
 }
 
 function makeTxConstantData(seed = 1) {
-  return new TxConstantData(makeHeader(seed), makeTxContext(seed + 0x100), new Fr(seed + 0x200), new Fr(seed + 0x201));
+  return new TxConstantData(
+    makeBlockHeader(seed),
+    makeTxContext(seed + 0x100),
+    new Fr(seed + 0x200),
+    new Fr(seed + 0x201),
+  );
 }
 
 function makePaddedTuple<T, N extends number>(
@@ -673,7 +683,7 @@ export function makePrivateCircuitPublicInputs(seed = 0): PrivateCircuitPublicIn
     endSideEffectCounter: fr(seed + 0x850),
     expectedNonRevertibleSideEffectCounter: fr(seed + 0x860),
     expectedRevertibleSideEffectCounter: fr(seed + 0x861),
-    anchorBlockHeader: makeHeader(seed + 0xd00, undefined),
+    anchorBlockHeader: makeBlockHeader(seed + 0xd00),
     txContext: makeTxContext(seed + 0x1400),
     isFeePayer: false,
   });
@@ -825,16 +835,15 @@ export function makeBlockRollupPublicInputs(seed = 0): BlockRollupPublicInputs {
 }
 
 export function makeCheckpointRollupPublicInputs(seed = 0) {
-  const startBlobAccumulator = makeBatchedBlobAccumulator(seed);
   return new CheckpointRollupPublicInputs(
     makeEpochConstantData(seed),
     makeAppendOnlyTreeSnapshot(seed + 0x100),
     makeAppendOnlyTreeSnapshot(seed + 0x200),
     makeTuple(AZTEC_MAX_EPOCH_DURATION, () => fr(seed), 0x300),
-    makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeFeeRecipient(seed), 0x700),
-    startBlobAccumulator.toBlobAccumulator(),
-    makeBatchedBlobAccumulator(seed + 1).toBlobAccumulator(),
-    startBlobAccumulator.finalBlobChallenges,
+    makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeFeeRecipient(seed), 0x400),
+    makeBlobAccumulator(seed + 0x500),
+    makeBlobAccumulator(seed + 0x600),
+    makeFinalBlobBatchingChallenges(seed + 0x700),
   );
 }
 
@@ -869,7 +878,7 @@ export function makeRootRollupPublicInputs(seed = 0): RootRollupPublicInputs {
     makeTuple(AZTEC_MAX_EPOCH_DURATION, () => fr(seed), 0x300),
     makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeFeeRecipient(seed), 0x500),
     makeEpochConstantData(seed + 0x600),
-    makeBatchedBlobAccumulator(seed).toFinalBlobAccumulator(),
+    makeFinalBlobAccumulator(seed + 0x700),
   );
 }
 
@@ -880,23 +889,15 @@ export function makeContentCommitment(seed = 0): ContentCommitment {
   return new ContentCommitment(fr(seed + 0x100), fr(seed + 0x200), fr(seed + 0x300));
 }
 
-/**
- * Makes header.
- */
-export function makeHeader(
+export function makeBlockHeader(
   seed = 0,
-  blockNumber: number | undefined = undefined,
-  slotNumber: number | undefined = undefined,
-  overrides: Partial<FieldsOf<BlockHeader>> = {},
+  overrides: Partial<FieldsOf<Omit<BlockHeader, 'globalVariables'>>> & Partial<FieldsOf<GlobalVariables>> = {},
 ): BlockHeader {
   return BlockHeader.from({
     lastArchive: makeAppendOnlyTreeSnapshot(seed + 0x100),
     state: makeStateReference(seed + 0x200),
     spongeBlobHash: fr(seed + 0x300),
-    globalVariables: makeGlobalVariables((seed += 0x700), {
-      ...(blockNumber ? { blockNumber } : {}),
-      ...(slotNumber ? { slotNumber: new Fr(slotNumber) } : {}),
-    }),
+    globalVariables: makeGlobalVariables((seed += 0x700), overrides),
     totalFees: fr(seed + 0x800),
     totalManaUsed: fr(seed + 0x900),
     ...overrides,

package/src/tests/mocks.ts

@@ -17,10 +17,12 @@ import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
 import { PublicDataWrite } from '../avm/public_data_write.js';
 import { RevertCode } from '../avm/revert_code.js';
 import { AztecAddress } from '../aztec-address/index.js';
-import { CommitteeAttestation, L1PublishedData, L2BlockHeader } from '../block/index.js';
+import { CommitteeAttestation, L2BlockHeader } from '../block/index.js';
 import { L2Block } from '../block/l2_block.js';
 import type { CommitteeAttestationsAndSigners } from '../block/proposal/attestations_and_signers.js';
 import { PublishedL2Block } from '../block/published_l2_block.js';
+import type { Checkpoint } from '../checkpoint/checkpoint.js';
+import { L1PublishedData } from '../checkpoint/published_checkpoint.js';
 import { computeContractAddressFromInstance } from '../contract/contract_address.js';
 import { getContractClassFromArtifact } from '../contract/contract_class.js';
 import { SerializableContractInstance } from '../contract/contract_instance.js';
@@ -40,8 +42,6 @@ import {
 import { PrivateToAvmAccumulatedData } from '../kernel/private_to_avm_accumulated_data.js';
 import { PrivateToPublicAccumulatedDataBuilder } from '../kernel/private_to_public_accumulated_data_builder.js';
 import { PublicCallRequestArrayLengths } from '../kernel/public_call_request.js';
-import { Note } from '../note/note.js';
-import { UniqueNote } from '../note/unique_note.js';
 import { BlockAttestation } from '../p2p/block_attestation.js';
 import { BlockProposal } from '../p2p/block_proposal.js';
 import { ConsensusPayload } from '../p2p/consensus_payload.js';
@@ -69,9 +69,9 @@ import { TxHash } from '../tx/tx_hash.js';
 import {
   makeAvmCircuitInputs,
   makeAztecAddress,
+  makeBlockHeader,
   makeGas,
   makeGlobalVariables,
-  makeHeader,
   makeL2BlockHeader,
   makePrivateToPublicAccumulatedData,
   makePrivateToRollupAccumulatedData,
@@ -82,16 +82,6 @@ import {
 
 export const randomTxHash = (): TxHash => TxHash.random();
 
-export const randomUniqueNote = async ({
-  note = Note.random(),
-  contractAddress = undefined,
-  txHash = randomTxHash(),
-  storageSlot = Fr.random(),
-  noteNonce = Fr.random(),
-}: Partial<UniqueNote> = {}) => {
-  return new UniqueNote(note, contractAddress ?? (await AztecAddress.random()), storageSlot, txHash, noteNonce);
-};
-
 export const mockTx = async (
   seed = 1,
   {
@@ -223,7 +213,7 @@ export async function mockProcessedTx({
   privateOnly?: boolean;
 } & Parameters<typeof mockTx>[1] = {}) {
   seed *= 0x1000; // Avoid clashing with the previous mock values if seed only increases by 1.
-  anchorBlockHeader ??= db?.getInitialHeader() ?? makeHeader(seed);
+  anchorBlockHeader ??= db?.getInitialHeader() ?? makeBlockHeader(seed);
   feePayer ??= makeAztecAddress(seed + 0x100);
   feePaymentPublicDataWrite ??= makePublicDataWrite(seed + 0x200);
 
@@ -460,15 +450,15 @@ export const makeBlockProposal = (options?: MakeConsensusPayloadOptions): BlockP
 };
 
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8028)
-export const makeBlockAttestation = (options?: MakeConsensusPayloadOptions): BlockAttestation => {
-  const header = options?.header ?? makeL2BlockHeader(1);
+export const makeBlockAttestation = (options: MakeConsensusPayloadOptions = {}): BlockAttestation => {
+  const header = options.header ?? makeL2BlockHeader(1);
   const {
     signer,
-    attesterSigner = signer ?? Secp256k1Signer.random(),
-    proposerSigner = signer ?? Secp256k1Signer.random(),
+    attesterSigner = signer,
+    proposerSigner = signer,
     archive = Fr.random(),
     stateReference = header.state,
-  } = options ?? {};
+  } = options;
 
   const payload = ConsensusPayload.fromFields({
     header: header.toCheckpointHeader(),
@@ -476,15 +466,25 @@ export const makeBlockAttestation = (options?: MakeConsensusPayloadOptions): Blo
     stateReference,
   });
 
-  // Sign as attester
-  const attestationHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
-  const attestationSignature = attesterSigner.sign(attestationHash);
+  return makeBlockAttestationFromPayload(payload, attesterSigner, proposerSigner);
+};
 
-  // Sign as proposer
-  const proposalHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockProposal);
-  const proposerSignature = proposerSigner.sign(proposalHash);
+export const makeAttestationFromCheckpoint = (
+  checkpoint: Checkpoint,
+  attesterSigner?: Secp256k1Signer,
+  proposerSigner?: Secp256k1Signer,
+): BlockAttestation => {
+  const header = checkpoint.header;
+  const archive = checkpoint.archive.root;
+  const stateReference = checkpoint.blocks.at(-1)!.header.state;
 
-  return new BlockAttestation(payload, attestationSignature, proposerSignature);
+  const payload = ConsensusPayload.fromFields({
+    header,
+    archive,
+    stateReference,
+  });
+
+  return makeBlockAttestationFromPayload(payload, attesterSigner, proposerSigner);
 };
 
 export const makeBlockAttestationFromBlock = (
@@ -502,6 +502,14 @@ export const makeBlockAttestationFromBlock = (
     stateReference,
   });
 
+  return makeBlockAttestationFromPayload(payload, attesterSigner, proposerSigner);
+};
+
+export const makeBlockAttestationFromPayload = (
+  payload: ConsensusPayload,
+  attesterSigner?: Secp256k1Signer,
+  proposerSigner?: Secp256k1Signer,
+): BlockAttestation => {
   // Sign as attester
   const attestationHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
   const attestationSigner = attesterSigner ?? Secp256k1Signer.random();

package/src/tx/block_header.ts

@@ -1,5 +1,5 @@
 import { BLOCK_HEADER_LENGTH, GeneratorIndex } from '@aztec/constants';
-import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
+import { poseidon2HashWithSeparator, randomInt } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { type ZodFor, schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
@@ -161,6 +161,18 @@ export class BlockHeader {
     return poseidon2HashWithSeparator(this.toFields(), GeneratorIndex.BLOCK_HASH);
   }
 
+  static random(overrides: Partial<FieldsOf<BlockHeader>> & Partial<FieldsOf<GlobalVariables>> = {}): BlockHeader {
+    return BlockHeader.from({
+      lastArchive: AppendOnlyTreeSnapshot.random(),
+      state: StateReference.random(),
+      spongeBlobHash: Fr.random(),
+      globalVariables: GlobalVariables.random(overrides),
+      totalFees: new Fr(randomInt(100_000)),
+      totalManaUsed: new Fr(randomInt(100_000_000)),
+      ...overrides,
+    });
+  }
+
   toInspect() {
     return {
       lastArchive: this.lastArchive.root.toString(),

package/src/tx/global_variables.ts

@@ -1,4 +1,5 @@
 import { GLOBAL_VARIABLES_LENGTH } from '@aztec/constants';
+import { randomInt } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
@@ -195,6 +196,20 @@ export class GlobalVariables {
     );
   }
 
+  static random(overrides: Partial<FieldsOf<GlobalVariables>> = {}): GlobalVariables {
+    return GlobalVariables.from({
+      chainId: new Fr(randomInt(100_000)),
+      version: new Fr(randomInt(100_000)),
+      blockNumber: randomInt(100_000),
+      slotNumber: new Fr(randomInt(100_000)),
+      coinbase: EthAddress.random(),
+      feeRecipient: AztecAddress.fromField(Fr.random()),
+      gasFees: GasFees.random(),
+      timestamp: BigInt(randomInt(100_000_000)),
+      ...overrides,
+    });
+  }
+
   toInspect() {
     return {
       chainId: this.chainId.toNumber(),

package/src/tx/indexed_tx_effect.ts

@@ -13,7 +13,7 @@ export function indexedTxSchema() {
 
 export async function randomIndexedTxEffect(): Promise<IndexedTxEffect> {
   return {
-    ...randomInBlock(await TxEffect.random()),
+    ...randomInBlock(await TxEffect.random({ numNullifiers: 1 + Math.floor(Math.random() * 64) })),
     txIndexInBlock: Math.floor(Math.random() * 1000),
   };
 }

package/src/tx/tx_effect.ts

@@ -14,6 +14,7 @@ import {
   MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
 } from '@aztec/constants';
 import { type FieldsOf, makeTuple, makeTupleAsync } from '@aztec/foundation/array';
+import { randomInt } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { type ZodFor, schemas } from '@aztec/foundation/schemas';
 import { BufferReader, serializeArrayOfBufferableToVector, serializeToBuffer } from '@aztec/foundation/serialize';
@@ -191,36 +192,39 @@ export class TxEffect {
     return computeTxOutHash(this.l2ToL1Msgs);
   }
 
-  static async random(
+  static async random({
+    numNoteHashes,
+    numNullifiers,
+    numL2ToL1Msgs,
+    numPublicDataWrites,
+    numPrivateLogs,
     numPublicCallsPerTx = 3,
     numPublicLogsPerCall = 1,
-    maxEffects: number | undefined = undefined,
-  ): Promise<TxEffect> {
+    numContractClassLogs,
+    maxEffects,
+  }: {
+    numNoteHashes?: number;
+    numNullifiers?: number;
+    numL2ToL1Msgs?: number;
+    numPublicDataWrites?: number;
+    numPrivateLogs?: number;
+    numPublicCallsPerTx?: number;
+    numPublicLogsPerCall?: number;
+    numContractClassLogs?: number;
+    maxEffects?: number;
+  } = {}): Promise<TxEffect> {
+    const count = (max: number, num?: number) => num ?? Math.min(maxEffects ?? randomInt(max), max);
     return new TxEffect(
       RevertCode.random(),
       TxHash.random(),
       new Fr(Math.floor(Math.random() * 100_000)),
-      makeTuple(
-        maxEffects === undefined ? MAX_NOTE_HASHES_PER_TX : Math.min(maxEffects, MAX_NOTE_HASHES_PER_TX),
-        Fr.random,
-      ),
-      makeTuple(
-        maxEffects === undefined ? MAX_NULLIFIERS_PER_TX : Math.min(maxEffects, MAX_NULLIFIERS_PER_TX),
-        Fr.random,
-      ),
-      makeTuple(
-        maxEffects === undefined ? MAX_L2_TO_L1_MSGS_PER_TX : Math.min(maxEffects, MAX_L2_TO_L1_MSGS_PER_TX),
-        Fr.random,
-      ),
-      makeTuple(
-        maxEffects === undefined
-          ? MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
-          : Math.min(maxEffects, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX),
-        PublicDataWrite.random,
-      ),
-      makeTuple(MAX_PRIVATE_LOGS_PER_TX, () => PrivateLog.random()),
+      makeTuple(count(MAX_NOTE_HASHES_PER_TX, numNoteHashes), Fr.random),
+      makeTuple(count(MAX_NULLIFIERS_PER_TX, numNullifiers), Fr.random),
+      makeTuple(count(MAX_L2_TO_L1_MSGS_PER_TX, numL2ToL1Msgs), Fr.random),
+      makeTuple(count(MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, numPublicDataWrites), PublicDataWrite.random),
+      makeTuple(count(MAX_PRIVATE_LOGS_PER_TX, numPrivateLogs), () => PrivateLog.random()),
       await Promise.all(new Array(numPublicCallsPerTx * numPublicLogsPerCall).fill(null).map(() => PublicLog.random())),
-      await makeTupleAsync(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLog.random),
+      await makeTupleAsync(count(MAX_CONTRACT_CLASS_LOGS_PER_TX, numContractClassLogs), ContractClassLog.random),
     );
   }
 

package/src/validators/schemas.ts

@@ -66,7 +66,7 @@ export const SingleValidatorStatsSchema = z.object({
     z.object({
       missed: schemas.Integer,
       total: schemas.Integer,
-      epoch: schemas.BigInt,
+      epoch: schemas.EpochNumber,
     }),
   ),
   lastProcessedSlot: schemas.BigInt.optional(),

package/src/validators/types.ts

@@ -1,3 +1,4 @@
+import type { EpochNumber } from '@aztec/foundation/branded-types';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 
 export type ValidatorStatusType = 'block' | 'attestation';
@@ -39,7 +40,7 @@ export type ValidatorsEpochPerformance = Record<`0x${string}`, { missed: number;
 
 export type SingleValidatorStats = {
   validator: ValidatorStats;
-  allTimeProvenPerformance: { missed: number; total: number; epoch: bigint }[];
+  allTimeProvenPerformance: { missed: number; total: number; epoch: EpochNumber }[];
   lastProcessedSlot?: bigint;
   initialSlot?: bigint;
   slotWindow: number;

package/dest/note/unique_note.d.ts

@@ -1,39 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
-import { AztecAddress } from '../aztec-address/index.js';
-import { type ZodFor } from '../schemas/index.js';
-import { TxHash } from '../tx/tx_hash.js';
-import { Note } from './note.js';
-/**
- * A note with contextual data and a nonce that makes it unique.
- */
-export declare class UniqueNote {
-    /** The note as emitted from the Noir contract. */
-    note: Note;
-    /** The contract address this note is created in. */
-    contractAddress: AztecAddress;
-    /** The specific storage location of the note on the contract. */
-    storageSlot: Fr;
-    /** The hash of the tx the note was created in. */
-    txHash: TxHash;
-    /** The nonce that was injected into the note hash preimage in order to guarantee uniqueness. */
-    noteNonce: Fr;
-    constructor(
-    /** The note as emitted from the Noir contract. */
-    note: Note, 
-    /** The contract address this note is created in. */
-    contractAddress: AztecAddress, 
-    /** The specific storage location of the note on the contract. */
-    storageSlot: Fr, 
-    /** The hash of the tx the note was created in. */
-    txHash: TxHash, 
-    /** The nonce that was injected into the note hash preimage in order to guarantee uniqueness. */
-    noteNonce: Fr);
-    static get schema(): ZodFor<UniqueNote>;
-    toBuffer(): Buffer;
-    static random(): Promise<UniqueNote>;
-    static fromBuffer(buffer: Buffer | BufferReader): UniqueNote;
-    static fromString(str: string): UniqueNote;
-    toString(): `0x${string}`;
-}
-//# sourceMappingURL=unique_note.d.ts.map

package/dest/note/unique_note.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"unique_note.d.ts","sourceRoot":"","sources":["../../src/note/unique_note.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAK9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC;;GAEG;AACH,qBAAa,UAAU;IAEnB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IACrB,gGAAgG;IACzF,SAAS,EAAE,EAAE;;IATpB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IACrB,gGAAgG;IACzF,SAAS,EAAE,EAAE;IAGtB,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,CAYtC;IAED,QAAQ,IAAI,MAAM;WAIL,MAAM;IAInB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAY/C,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,QAAQ;CAGT"}

package/dest/note/unique_note.js

@@ -1,62 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { z } from 'zod';
-import { AztecAddress } from '../aztec-address/index.js';
-import { schemas } from '../schemas/index.js';
-import { TxHash } from '../tx/tx_hash.js';
-import { Note } from './note.js';
-/**
- * A note with contextual data and a nonce that makes it unique.
- */ export class UniqueNote {
-    note;
-    contractAddress;
-    storageSlot;
-    txHash;
-    noteNonce;
-    constructor(/** The note as emitted from the Noir contract. */ note, /** The contract address this note is created in. */ contractAddress, /** The specific storage location of the note on the contract. */ storageSlot, /** The hash of the tx the note was created in. */ txHash, /** The nonce that was injected into the note hash preimage in order to guarantee uniqueness. */ noteNonce){
-        this.note = note;
-        this.contractAddress = contractAddress;
-        this.storageSlot = storageSlot;
-        this.txHash = txHash;
-        this.noteNonce = noteNonce;
-    }
-    static get schema() {
-        return z.object({
-            note: Note.schema,
-            contractAddress: schemas.AztecAddress,
-            storageSlot: schemas.Fr,
-            txHash: TxHash.schema,
-            noteNonce: schemas.Fr
-        }).transform(({ note, contractAddress, storageSlot, txHash, noteNonce })=>{
-            return new UniqueNote(note, contractAddress, storageSlot, txHash, noteNonce);
-        });
-    }
-    toBuffer() {
-        return serializeToBuffer([
-            this.note,
-            this.contractAddress,
-            this.storageSlot,
-            this.txHash,
-            this.noteNonce
-        ]);
-    }
-    static async random() {
-        return new UniqueNote(Note.random(), await AztecAddress.random(), Fr.random(), TxHash.random(), Fr.random());
-    }
-    static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        const note = reader.readObject(Note);
-        const contractAddress = reader.readObject(AztecAddress);
-        const storageSlot = reader.readObject(Fr);
-        const txHash = reader.readObject(TxHash);
-        const noteNonce = reader.readObject(Fr);
-        return new UniqueNote(note, contractAddress, storageSlot, txHash, noteNonce);
-    }
-    static fromString(str) {
-        return UniqueNote.fromBuffer(hexToBuffer(str));
-    }
-    toString() {
-        return bufferToHex(this.toBuffer());
-    }
-}

package/src/note/unique_note.ts

@@ -1,70 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-
-import { z } from 'zod';
-
-import { AztecAddress } from '../aztec-address/index.js';
-import { type ZodFor, schemas } from '../schemas/index.js';
-import { TxHash } from '../tx/tx_hash.js';
-import { Note } from './note.js';
-
-/**
- * A note with contextual data and a nonce that makes it unique.
- */
-export class UniqueNote {
-  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 that was injected into the note hash preimage in order to guarantee uniqueness. */
-    public noteNonce: Fr,
-  ) {}
-
-  static get schema(): ZodFor<UniqueNote> {
-    return z
-      .object({
-        note: Note.schema,
-        contractAddress: schemas.AztecAddress,
-        storageSlot: schemas.Fr,
-        txHash: TxHash.schema,
-        noteNonce: schemas.Fr,
-      })
-      .transform(({ note, contractAddress, storageSlot, txHash, noteNonce }) => {
-        return new UniqueNote(note, contractAddress, storageSlot, txHash, noteNonce);
-      });
-  }
-
-  toBuffer(): Buffer {
-    return serializeToBuffer([this.note, this.contractAddress, this.storageSlot, this.txHash, this.noteNonce]);
-  }
-
-  static async random() {
-    return new UniqueNote(Note.random(), await AztecAddress.random(), Fr.random(), TxHash.random(), Fr.random());
-  }
-
-  static fromBuffer(buffer: Buffer | BufferReader) {
-    const reader = BufferReader.asReader(buffer);
-
-    const note = reader.readObject(Note);
-    const contractAddress = reader.readObject(AztecAddress);
-    const storageSlot = reader.readObject(Fr);
-    const txHash = reader.readObject(TxHash);
-    const noteNonce = reader.readObject(Fr);
-
-    return new UniqueNote(note, contractAddress, storageSlot, txHash, noteNonce);
-  }
-
-  static fromString(str: string) {
-    return UniqueNote.fromBuffer(hexToBuffer(str));
-  }
-
-  toString() {
-    return bufferToHex(this.toBuffer());
-  }
-}