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

package/src/note/note_dao.ts

@@ -17,13 +17,15 @@ export class NoteDao {
     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 owner of the note - generally the account that can spend the note. */
+    public owner: 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 randomness injected to the note.
+     * The randomness injected to the note hash preimage.
      */
     public randomness: Fr,
     /** The nonce that was injected into the note hash preimage in order to guarantee uniqueness. */
@@ -60,6 +62,7 @@ export class NoteDao {
     return serializeToBuffer([
       this.note,
       this.contractAddress,
+      this.owner,
       this.storageSlot,
       this.randomness,
       this.noteNonce,
@@ -77,6 +80,7 @@ export class NoteDao {
 
     const note = Note.fromBuffer(reader);
     const contractAddress = AztecAddress.fromBuffer(reader);
+    const owner = AztecAddress.fromBuffer(reader);
     const storageSlot = Fr.fromBuffer(reader);
     const randomness = Fr.fromBuffer(reader);
     const noteNonce = Fr.fromBuffer(reader);
@@ -90,6 +94,7 @@ export class NoteDao {
     return new NoteDao(
       note,
       contractAddress,
+      owner,
       storageSlot,
       randomness,
       noteNonce,
@@ -118,12 +123,15 @@ export class NoteDao {
   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;
+    return (
+      noteSize + AztecAddress.SIZE_IN_BYTES * 2 + Fr.SIZE_IN_BYTES * 4 + TxHash.SIZE + Point.SIZE_IN_BYTES + indexSize
+    );
   }
 
   static async random({
     note = Note.random(),
     contractAddress = undefined,
+    owner = undefined,
     storageSlot = Fr.random(),
     randomness = Fr.random(),
     noteNonce = Fr.random(),
@@ -137,6 +145,7 @@ export class NoteDao {
     return new NoteDao(
       note,
       contractAddress ?? (await AztecAddress.random()),
+      owner ?? (await AztecAddress.random()),
       storageSlot,
       randomness,
       noteNonce,

package/src/note/notes_filter.ts

@@ -16,6 +16,8 @@ export type NotesFilter = {
    * @remarks Providing a contract address is required as we need that information to trigger private state sync.
    */
   contractAddress: AztecAddress;
+  /** The owner of the note. */
+  owner?: AztecAddress;
   /** The specific storage location of the note on the contract. */
   storageSlot?: Fr;
   /** The status of the note. Defaults to 'ACTIVE'. */
@@ -28,6 +30,7 @@ export type NotesFilter = {
 
 export const NotesFilterSchema: ZodFor<NotesFilter> = z.object({
   contractAddress: schemas.AztecAddress,
+  owner: schemas.AztecAddress.optional(),
   storageSlot: schemas.Fr.optional(),
   status: z.nativeEnum(NoteStatus).optional(),
   siloedNullifier: schemas.Fr.optional(),

package/src/p2p/block_attestation.ts

@@ -1,3 +1,4 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { keccak256, tryRecoverAddress } from '@aztec/foundation/crypto';
 import type { EthAddress } from '@aztec/foundation/eth-address';
@@ -62,7 +63,7 @@ export class BlockAttestation extends Gossipable {
     return this.payload.archive;
   }
 
-  get slotNumber(): Fr {
+  get slotNumber(): SlotNumber {
     return this.payload.header.slotNumber;
   }
 

package/src/p2p/block_proposal.ts

@@ -1,3 +1,4 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { keccak256, tryRecoverAddress } from '@aztec/foundation/crypto';
 import type { EthAddress } from '@aztec/foundation/eth-address';
@@ -65,13 +66,13 @@ export class BlockProposal extends Gossipable {
     return this.payload.archive;
   }
 
-  get slotNumber(): Fr {
+  get slotNumber(): SlotNumber {
     return this.payload.header.slotNumber;
   }
 
   toBlockInfo(): Omit<L2BlockInfo, 'blockNumber'> {
     return {
-      slotNumber: this.slotNumber.toNumber(),
+      slotNumber: this.slotNumber,
       lastArchive: this.payload.header.lastArchiveRoot,
       timestamp: this.payload.header.timestamp,
       archive: this.archive,

package/src/p2p/consensus_payload.ts

@@ -10,7 +10,6 @@ import { z } from 'zod';
 import type { L2Block } from '../block/l2_block.js';
 import type { Checkpoint } from '../checkpoint/checkpoint.js';
 import { CheckpointHeader } from '../rollup/checkpoint_header.js';
-import { StateReference } from '../tx/state_reference.js';
 import type { Signable, SignatureDomainSeparator } from './signature_utils.js';
 
 export class ConsensusPayload implements Signable {
@@ -21,8 +20,6 @@ export class ConsensusPayload implements Signable {
     public readonly header: CheckpointHeader,
     /** The archive root after the block is added */
     public readonly archive: Fr,
-    /** The state reference after the block is added */
-    public readonly stateReference: StateReference,
   ) {}
 
   static get schema() {
@@ -30,13 +27,12 @@ export class ConsensusPayload implements Signable {
       .object({
         header: CheckpointHeader.schema,
         archive: schemas.Fr,
-        stateReference: StateReference.schema,
       })
-      .transform(obj => new ConsensusPayload(obj.header, obj.archive, obj.stateReference));
+      .transform(obj => new ConsensusPayload(obj.header, obj.archive));
   }
 
   static getFields(fields: FieldsOf<ConsensusPayload>) {
-    return [fields.header, fields.archive, fields.stateReference] as const;
+    return [fields.header, fields.archive] as const;
   }
 
   getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer {
@@ -44,64 +40,53 @@ export class ConsensusPayload implements Signable {
       'uint8, ' + //domainSeperator
         '(' +
         'bytes32, ' + // archive
-        '((bytes32,uint32),((bytes32,uint32),(bytes32,uint32),(bytes32,uint32))), ' + // stateReference
         '(int256), ' + // oracleInput
         'bytes32' + // headerHash
         ')',
     );
     const archiveRoot = this.archive.toString();
-    const stateReference = this.stateReference.toAbi();
 
     const headerHash = this.header.hash().toString();
     const encodedData = encodeAbiParameters(abi, [
       domainSeparator,
-      [archiveRoot, stateReference, [0n] /* @todo See #9963 */, headerHash],
+      [archiveRoot, [0n] /* @todo See #9963 */, headerHash],
     ] as const);
 
     return hexToBuffer(encodedData);
   }
 
   toBuffer(): Buffer {
-    return serializeToBuffer([this.header, this.archive, this.stateReference]);
+    return serializeToBuffer([this.header, this.archive]);
   }
 
   public equals(other: ConsensusPayload): boolean {
-    return (
-      this.header.equals(other.header) &&
-      this.archive.equals(other.archive) &&
-      this.stateReference.equals(other.stateReference)
-    );
+    return this.header.equals(other.header) && this.archive.equals(other.archive);
   }
 
   static fromBuffer(buf: Buffer | BufferReader): ConsensusPayload {
     const reader = BufferReader.asReader(buf);
-    const payload = new ConsensusPayload(
-      reader.readObject(CheckpointHeader),
-      reader.readObject(Fr),
-      reader.readObject(StateReference),
-    );
+    const payload = new ConsensusPayload(reader.readObject(CheckpointHeader), reader.readObject(Fr));
     return payload;
   }
 
   static fromFields(fields: FieldsOf<ConsensusPayload>): ConsensusPayload {
-    return new ConsensusPayload(fields.header, fields.archive, fields.stateReference);
+    return new ConsensusPayload(fields.header, fields.archive);
   }
 
   static fromBlock(block: L2Block): ConsensusPayload {
-    return new ConsensusPayload(block.header.toCheckpointHeader(), block.archive.root, block.header.state);
+    return new ConsensusPayload(block.header.toCheckpointHeader(), block.archive.root);
   }
 
   static fromCheckpoint(checkpoint: Checkpoint): ConsensusPayload {
-    const lastBlock = checkpoint.blocks.at(-1)!;
-    return new ConsensusPayload(checkpoint.header, checkpoint.archive.root, lastBlock.header.state);
+    return new ConsensusPayload(checkpoint.header, checkpoint.archive.root);
   }
 
   static empty(): ConsensusPayload {
-    return new ConsensusPayload(CheckpointHeader.empty(), Fr.ZERO, StateReference.empty());
+    return new ConsensusPayload(CheckpointHeader.empty(), Fr.ZERO);
   }
 
   static random(): ConsensusPayload {
-    return new ConsensusPayload(CheckpointHeader.random(), Fr.random(), StateReference.random());
+    return new ConsensusPayload(CheckpointHeader.random(), Fr.random());
   }
 
   /**
@@ -121,11 +106,10 @@ export class ConsensusPayload implements Signable {
     return {
       header: this.header.toInspect(),
       archive: this.archive.toString(),
-      stateReference: this.stateReference.toInspect(),
     };
   }
 
   toString() {
-    return `header: ${this.header.toString()}, archive: ${this.archive.toString()}, stateReference: ${this.stateReference.l1ToL2MessageTree.root.toString()}`;
+    return `header: ${this.header.toString()}, archive: ${this.archive.toString()}}`;
   }
 }

package/src/rollup/checkpoint_constant_data.ts

@@ -1,3 +1,4 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
@@ -24,7 +25,7 @@ export class CheckpointConstantData {
     /** Identifier of the prover. */
     public proverId: Fr,
     /** Slot number of the checkpoint. */
-    public slotNumber: Fr,
+    public slotNumber: SlotNumber,
     /** Coinbase address of the rollup. */
     public coinbase: EthAddress,
     /** Address to receive fees. */
@@ -58,7 +59,7 @@ export class CheckpointConstantData {
       Fr.ZERO,
       Fr.ZERO,
       Fr.ZERO,
-      Fr.ZERO,
+      SlotNumber.ZERO,
       EthAddress.ZERO,
       AztecAddress.ZERO,
       GasFees.empty(),
@@ -66,7 +67,17 @@ export class CheckpointConstantData {
   }
 
   toBuffer() {
-    return serializeToBuffer(...CheckpointConstantData.getFields(this));
+    return serializeToBuffer(
+      this.chainId,
+      this.version,
+      this.vkTreeRoot,
+      this.protocolContractsHash,
+      this.proverId,
+      new Fr(this.slotNumber),
+      this.coinbase,
+      this.feeRecipient,
+      this.gasFees,
+    );
   }
 
   static fromBuffer(buffer: Buffer | BufferReader) {
@@ -77,13 +88,21 @@ export class CheckpointConstantData {
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
+      SlotNumber(Fr.fromBuffer(reader).toNumber()),
       reader.readObject(EthAddress),
       reader.readObject(AztecAddress),
       reader.readObject(GasFees),
     );
   }
 
+  /**
+   * Returns the slot number as a SlotNumber branded type.
+   * @deprecated Use slotNumber directly instead.
+   */
+  getSlotNumber(): SlotNumber {
+    return this.slotNumber;
+  }
+
   toInspect() {
     return {
       chainId: this.chainId.toNumber(),
@@ -91,7 +110,7 @@ export class CheckpointConstantData {
       vkTreeRoot: this.vkTreeRoot.toString(),
       protocolContractsHash: this.protocolContractsHash.toString(),
       proverId: this.proverId.toString(),
-      slotNumber: this.slotNumber.toNumber(),
+      slotNumber: this.slotNumber,
       coinbase: this.coinbase.toString(),
       feeRecipient: this.feeRecipient.toString(),
       gasFees: this.gasFees.toInspect(),

package/src/rollup/checkpoint_header.ts

@@ -1,4 +1,5 @@
 import type { ViemHeader } from '@aztec/ethereum';
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { sha256ToField } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
@@ -25,7 +26,7 @@ export class CheckpointHeader {
     /** Content commitment of the L2 block. */
     public contentCommitment: ContentCommitment,
     /** Slot number of the L2 block */
-    public slotNumber: Fr,
+    public slotNumber: SlotNumber,
     /** Timestamp of the L2 block. */
     public timestamp: UInt64,
     /** Recipient of block reward. */
@@ -44,7 +45,7 @@ export class CheckpointHeader {
         lastArchiveRoot: schemas.Fr,
         blockHeadersHash: schemas.Fr,
         contentCommitment: ContentCommitment.schema,
-        slotNumber: schemas.Fr,
+        slotNumber: schemas.SlotNumber,
         timestamp: schemas.BigInt,
         coinbase: schemas.EthAddress,
         feeRecipient: schemas.AztecAddress,
@@ -79,7 +80,7 @@ export class CheckpointHeader {
       reader.readObject(Fr),
       reader.readObject(Fr),
       reader.readObject(ContentCommitment),
-      Fr.fromBuffer(reader),
+      SlotNumber(Fr.fromBuffer(reader).toNumber()),
       reader.readUInt64(),
       reader.readObject(EthAddress),
       reader.readObject(AztecAddress),
@@ -93,7 +94,7 @@ export class CheckpointHeader {
       this.lastArchiveRoot.equals(other.lastArchiveRoot) &&
       this.blockHeadersHash.equals(other.blockHeadersHash) &&
       this.contentCommitment.equals(other.contentCommitment) &&
-      this.slotNumber.equals(other.slotNumber) &&
+      this.slotNumber === other.slotNumber &&
       this.timestamp === other.timestamp &&
       this.coinbase.equals(other.coinbase) &&
       this.feeRecipient.equals(other.feeRecipient) &&
@@ -108,7 +109,7 @@ export class CheckpointHeader {
       this.lastArchiveRoot,
       this.blockHeadersHash,
       this.contentCommitment,
-      this.slotNumber,
+      new Fr(this.slotNumber),
       bigintToUInt64BE(this.timestamp),
       this.coinbase,
       this.feeRecipient,
@@ -126,7 +127,7 @@ export class CheckpointHeader {
       lastArchiveRoot: Fr.ZERO,
       blockHeadersHash: Fr.ZERO,
       contentCommitment: ContentCommitment.empty(),
-      slotNumber: Fr.ZERO,
+      slotNumber: SlotNumber.ZERO,
       timestamp: 0n,
       coinbase: EthAddress.ZERO,
       feeRecipient: AztecAddress.ZERO,
@@ -141,7 +142,7 @@ export class CheckpointHeader {
       lastArchiveRoot: Fr.random(),
       blockHeadersHash: Fr.random(),
       contentCommitment: ContentCommitment.random(),
-      slotNumber: new Fr(BigInt(Math.floor(Math.random() * 1000) + 1)),
+      slotNumber: SlotNumber(Math.floor(Math.random() * 1000) + 1),
       timestamp: BigInt(Math.floor(Date.now() / 1000)),
       coinbase: EthAddress.random(),
       feeRecipient: new AztecAddress(Fr.random()),
@@ -156,7 +157,7 @@ export class CheckpointHeader {
       this.lastArchiveRoot.isZero() &&
       this.blockHeadersHash.isZero() &&
       this.contentCommitment.isEmpty() &&
-      this.slotNumber.isZero() &&
+      this.slotNumber === 0 &&
       this.timestamp === 0n &&
       this.coinbase.isZero() &&
       this.feeRecipient.isZero() &&
@@ -182,7 +183,7 @@ export class CheckpointHeader {
       Fr.fromString(header.lastArchiveRoot),
       Fr.fromString(header.blockHeadersHash),
       ContentCommitment.fromViem(header.contentCommitment),
-      new Fr(header.slotNumber),
+      SlotNumber.fromBigInt(header.slotNumber),
       header.timestamp,
       new EthAddress(hexToBuffer(header.coinbase)),
       new AztecAddress(hexToBuffer(header.feeRecipient)),
@@ -191,12 +192,20 @@ export class CheckpointHeader {
     );
   }
 
+  /**
+   * Returns the slot number as a SlotNumber branded type.
+   * @deprecated Use slotNumber directly instead.
+   */
+  getSlotNumber(): SlotNumber {
+    return this.slotNumber;
+  }
+
   toViem(): ViemHeader {
     return {
       lastArchiveRoot: this.lastArchiveRoot.toString(),
       blockHeadersHash: this.blockHeadersHash.toString(),
       contentCommitment: this.contentCommitment.toViem(),
-      slotNumber: this.slotNumber.toBigInt(),
+      slotNumber: BigInt(this.slotNumber),
       timestamp: this.timestamp,
       coinbase: this.coinbase.toString(),
       feeRecipient: `0x${this.feeRecipient.toBuffer().toString('hex').padStart(64, '0')}`,
@@ -213,7 +222,7 @@ export class CheckpointHeader {
       lastArchive: this.lastArchiveRoot.toString(),
       blockHeadersHash: this.blockHeadersHash.toString(),
       contentCommitment: this.contentCommitment.toInspect(),
-      slotNumber: this.slotNumber.toBigInt(),
+      slotNumber: this.slotNumber,
       timestamp: this.timestamp,
       coinbase: this.coinbase.toString(),
       feeRecipient: this.feeRecipient.toString(),
@@ -228,7 +237,7 @@ export class CheckpointHeader {
   lastArchiveRoot: ${this.lastArchiveRoot.toString()},
   blockHeadersHash: ${this.blockHeadersHash.toString()},
   contentCommitment: ${inspect(this.contentCommitment)},
-  slotNumber: ${this.slotNumber.toBigInt()},
+  slotNumber: ${this.slotNumber},
   timestamp: ${this.timestamp},
   coinbase: ${this.coinbase.toString()},
   feeRecipient: ${this.feeRecipient.toString()},

package/src/schemas/schemas.ts

@@ -1,3 +1,4 @@
+import type { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import type { Buffer32 } from '@aztec/foundation/buffer';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { Fq, Fr, Point } from '@aztec/foundation/fields';
@@ -65,6 +66,12 @@ export const schemas = {
   /** Accepts a hex string. */
   EventSelector: EventSelector.schema,
 
+  /** Accepts a number, bigint, or string and coerces to SlotNumber. */
+  SlotNumber: foundationSchemas.SlotNumber as ZodFor<SlotNumber>,
+
+  /** Accepts a number, bigint, or string and coerces to EpochNumber. */
+  EpochNumber: foundationSchemas.EpochNumber as ZodFor<EpochNumber>,
+
   GasUsed: z.object({
     totalGas: Gas.schema,
     teardownGas: Gas.schema,

package/src/slashing/empire.ts

@@ -1,4 +1,4 @@
-import { EpochNumber } from '@aztec/foundation/branded-types';
+import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 
 import { getRoundForSlot, getRoundsForEpoch } from './helpers.js';
 import type { Offense, OffenseIdentifier, SlashPayload, SlashPayloadRound, ValidatorSlash } from './types.js';
@@ -85,7 +85,7 @@ export function getFirstEligibleRoundForOffense(
     case OffenseType.ATTESTED_DESCENDANT_OF_INVALID:
     case OffenseType.BROADCASTED_INVALID_BLOCK_PROPOSAL: {
       const slot = offense.epochOrSlot;
-      const detectedSlot = slot + 1n;
+      const detectedSlot = SlotNumber.fromBigInt(slot + 1n);
       return getRoundForSlot(detectedSlot, constants).round + 1n;
     }
     // Assume these are epoch-based offenses, even though we should never have to process these

package/src/slashing/helpers.ts

@@ -1,4 +1,4 @@
-import { EpochNumber } from '@aztec/foundation/branded-types';
+import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 
 import { type L1RollupConstants, getEpochAtSlot, getSlotRangeForEpoch } from '../epoch-helpers/index.js';
 import type { SlasherConfig } from '../interfaces/slasher.js';
@@ -6,12 +6,13 @@ import { type Offense, OffenseType } from './types.js';
 
 /** Returns the voting round number and voting slot within the round for a given L2 slot. */
 export function getRoundForSlot(
-  slot: bigint,
+  slot: SlotNumber,
   constants: { slashingRoundSize: number },
-): { round: bigint; votingSlot: bigint } {
+): { round: bigint; votingSlot: SlotNumber } {
   const roundSize = BigInt(constants.slashingRoundSize);
-  const round = slot / roundSize;
-  const votingSlot = slot % roundSize;
+  const slotBigInt = BigInt(slot);
+  const round = slotBigInt / roundSize;
+  const votingSlot = SlotNumber.fromBigInt(slotBigInt % roundSize);
   return { round, votingSlot };
 }
 
@@ -32,8 +33,8 @@ export function getEpochsForRound(
   constants: { slashingRoundSize: number; epochDuration: number },
 ): EpochNumber[] {
   const epochs: EpochNumber[] = [];
-  const firstSlot = round * BigInt(constants.slashingRoundSize);
-  const lastSlot = firstSlot + BigInt(constants.slashingRoundSize) - 1n;
+  const firstSlot = SlotNumber.fromBigInt(round * BigInt(constants.slashingRoundSize));
+  const lastSlot = SlotNumber(firstSlot + constants.slashingRoundSize - 1);
   const startEpoch = getEpochAtSlot(firstSlot, constants);
   const endEpoch = getEpochAtSlot(lastSlot, constants);
   for (let epoch = startEpoch; epoch <= endEpoch; epoch = EpochNumber(epoch + 1)) {
@@ -103,9 +104,11 @@ export function getTimeUnitForOffense(offense: OffenseType): 'epoch' | 'slot' {
 export function getSlotForOffense(
   offense: Pick<Offense, 'epochOrSlot' | 'offenseType'>,
   constants: Pick<L1RollupConstants, 'epochDuration'>,
-): bigint {
+): SlotNumber {
   const { epochOrSlot, offenseType } = offense;
-  return getTimeUnitForOffense(offenseType) === 'epoch' ? epochOrSlot * BigInt(constants.epochDuration) : epochOrSlot;
+  return getTimeUnitForOffense(offenseType) === 'epoch'
+    ? SlotNumber.fromBigInt(epochOrSlot * BigInt(constants.epochDuration))
+    : SlotNumber.fromBigInt(epochOrSlot);
 }
 
 /** Returns the epoch for a given offense. If the offense type or epoch is not defined, returns undefined. */

package/src/slashing/interfaces.ts

@@ -1,3 +1,5 @@
+import type { SlotNumber } from '@aztec/foundation/branded-types';
+
 import type { ProposerSlashAction } from './types.js';
 
 export interface ProposerSlashActionProvider {
@@ -7,5 +9,5 @@ export interface ProposerSlashActionProvider {
    * @param slotNumber - The current slot number
    * @returns The actions to take
    */
-  getProposerActions(slotNumber: bigint): Promise<ProposerSlashAction[]>;
+  getProposerActions(slotNumber: SlotNumber): Promise<ProposerSlashAction[]>;
 }

package/src/tests/factories.ts

@@ -43,6 +43,7 @@ import {
   VK_TREE_HEIGHT,
 } from '@aztec/constants';
 import { type FieldsOf, makeTuple } from '@aztec/foundation/array';
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { compact } from '@aztec/foundation/collection';
 import { Grumpkin, SchnorrSignature, poseidon2HashWithSeparator, sha256 } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -694,7 +695,7 @@ export function makeGlobalVariables(seed = 1, overrides: Partial<FieldsOf<Global
     chainId: new Fr(seed),
     version: new Fr(seed + 1),
     blockNumber: seed + 2,
-    slotNumber: new Fr(seed + 3),
+    slotNumber: SlotNumber(seed + 3),
     timestamp: BigInt(seed + 4),
     coinbase: EthAddress.fromField(new Fr(seed + 5)),
     feeRecipient: AztecAddress.fromField(new Fr(seed + 6)),
@@ -775,7 +776,7 @@ function makeCheckpointConstantData(seed = 1) {
     fr(seed + 2),
     fr(seed + 3),
     fr(seed + 4),
-    fr(seed + 5),
+    SlotNumber(seed + 5),
     makeEthAddress(seed + 6),
     makeAztecAddress(seed + 7),
     makeGasFees(seed + 8),
@@ -916,7 +917,7 @@ export function makeL2BlockHeader(
     overrides?.state ?? makeStateReference(seed + 0x600),
     makeGlobalVariables((seed += 0x700), {
       ...(blockNumber ? { blockNumber } : {}),
-      ...(slotNumber ? { slotNumber: new Fr(slotNumber) } : {}),
+      ...(slotNumber ? { slotNumber: SlotNumber(slotNumber) } : {}),
     }),
     new Fr(seed + 0x800),
     new Fr(seed + 0x900),
@@ -930,7 +931,7 @@ export function makeCheckpointHeader(seed = 0) {
     lastArchiveRoot: fr(seed + 0x100),
     blockHeadersHash: fr(seed + 0x150),
     contentCommitment: makeContentCommitment(seed + 0x200),
-    slotNumber: new Fr(seed + 0x300),
+    slotNumber: SlotNumber(seed + 0x300),
     timestamp: BigInt(seed + 0x400),
     coinbase: makeEthAddress(seed + 0x500),
     feeRecipient: makeAztecAddress(seed + 0x600),

package/src/tests/mocks.ts

@@ -56,7 +56,6 @@ import {
   PrivateCallExecutionResult,
   PrivateExecutionResult,
   ProtocolContracts,
-  StateReference,
   Tx,
   TxConstantData,
   makeProcessedTxFromPrivateOnlyTx,
@@ -408,7 +407,6 @@ export interface MakeConsensusPayloadOptions {
   proposerSigner?: Secp256k1Signer;
   header?: L2BlockHeader;
   archive?: Fr;
-  stateReference?: StateReference;
   txHashes?: TxHash[];
   txs?: Tx[];
 }
@@ -418,12 +416,11 @@ const makeAndSignConsensusPayload = (
   options?: MakeConsensusPayloadOptions,
 ) => {
   const header = options?.header ?? makeL2BlockHeader(1);
-  const { signer = Secp256k1Signer.random(), archive = Fr.random(), stateReference = header.state } = options ?? {};
+  const { signer = Secp256k1Signer.random(), archive = Fr.random() } = options ?? {};
 
   const payload = ConsensusPayload.fromFields({
     header: header.toCheckpointHeader(),
     archive,
-    stateReference,
   });
 
   const hash = getHashedSignaturePayloadEthSignedMessage(payload, domainSeparator);
@@ -452,18 +449,11 @@ 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);
-  const {
-    signer,
-    attesterSigner = signer,
-    proposerSigner = signer,
-    archive = Fr.random(),
-    stateReference = header.state,
-  } = options;
+  const { signer, attesterSigner = signer, proposerSigner = signer, archive = Fr.random() } = options;
 
   const payload = ConsensusPayload.fromFields({
     header: header.toCheckpointHeader(),
     archive,
-    stateReference,
   });
 
   return makeBlockAttestationFromPayload(payload, attesterSigner, proposerSigner);
@@ -476,12 +466,10 @@ export const makeAttestationFromCheckpoint = (
 ): BlockAttestation => {
   const header = checkpoint.header;
   const archive = checkpoint.archive.root;
-  const stateReference = checkpoint.blocks.at(-1)!.header.state;
 
   const payload = ConsensusPayload.fromFields({
     header,
     archive,
-    stateReference,
   });
 
   return makeBlockAttestationFromPayload(payload, attesterSigner, proposerSigner);
@@ -494,12 +482,10 @@ export const makeBlockAttestationFromBlock = (
 ): BlockAttestation => {
   const header = block.header;
   const archive = block.archive.root;
-  const stateReference = block.header.state;
 
   const payload = ConsensusPayload.fromFields({
     header: header.toCheckpointHeader(),
     archive,
-    stateReference,
   });
 
   return makeBlockAttestationFromPayload(payload, attesterSigner, proposerSigner);

package/src/trees/append_only_tree_snapshot.ts

@@ -1,4 +1,3 @@
-import type { ViemAppendOnlyTreeSnapshot } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
@@ -72,17 +71,6 @@ export class AppendOnlyTreeSnapshot {
     return new AppendOnlyTreeSnapshot(reader.readField(), Number(reader.readField().toBigInt()));
   }
 
-  static fromViem(snapshot: ViemAppendOnlyTreeSnapshot) {
-    return new AppendOnlyTreeSnapshot(Fr.fromString(snapshot.root), snapshot.nextAvailableLeafIndex);
-  }
-
-  toViem(): ViemAppendOnlyTreeSnapshot {
-    return {
-      root: this.root.toString(),
-      nextAvailableLeafIndex: this.nextAvailableLeafIndex,
-    };
-  }
-
   toAbi(): [`0x${string}`, number] {
     return [this.root.toString(), this.nextAvailableLeafIndex];
   }