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

package/dest/test/rollup_cheat_codes.js

@@ -1,5 +1,5 @@
 import { RollupContract } from '@aztec/ethereum';
-import { EpochNumber } from '@aztec/foundation/branded-types';
+import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
@@ -29,14 +29,14 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
     }
     /** Returns the current slot */ async getSlot() {
         const ts = BigInt((await this.client.getBlock()).timestamp);
-        return await this.rollup.read.getSlotAt([
+        return SlotNumber.fromBigInt(await this.rollup.read.getSlotAt([
             ts
-        ]);
+        ]));
     }
     /** Returns the current epoch */ async getEpoch() {
         const slotNumber = await this.getSlot();
         return EpochNumber.fromBigInt(await this.rollup.read.getEpochAtSlot([
-            slotNumber
+            BigInt(slotNumber)
         ]));
     }
     /**
@@ -71,7 +71,7 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
         ]);
         return {
             epochDuration,
-            slotDuration
+            slotDuration: Number(slotDuration)
         };
     }
     /**
@@ -80,8 +80,9 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
    * @param opts - Options
    */ async advanceToEpoch(epoch, opts = {}) {
         const { epochDuration: slotsInEpoch } = await this.getConfig();
+        const slotNumber = SlotNumber(epoch * Number(slotsInEpoch));
         const timestamp = await this.rollup.read.getTimestampForSlot([
-            BigInt(epoch) * slotsInEpoch
+            BigInt(slotNumber)
         ]) + BigInt(opts.offset ?? 0);
         try {
             await this.ethCheatCodes.warp(Number(timestamp), {
@@ -98,8 +99,8 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
     /** Warps time in L1 until the next epoch */ async advanceToNextEpoch() {
         const slot = await this.getSlot();
         const { epochDuration, slotDuration } = await this.getConfig();
-        const slotsUntilNextEpoch = epochDuration - slot % epochDuration + 1n;
-        const timeToNextEpoch = slotsUntilNextEpoch * slotDuration;
+        const slotsUntilNextEpoch = epochDuration - BigInt(slot) % epochDuration + 1n;
+        const timeToNextEpoch = slotsUntilNextEpoch * BigInt(slotDuration);
         const l1Timestamp = BigInt((await this.client.getBlock()).timestamp);
         await this.ethCheatCodes.warp(Number(l1Timestamp + timeToNextEpoch), {
             silent: true,
@@ -109,17 +110,18 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
     }
     /** Warps time in L1 until the beginning of the next slot. */ async advanceToNextSlot() {
         const currentSlot = await this.getSlot();
+        const nextSlot = SlotNumber(currentSlot + 1);
         const timestamp = await this.rollup.read.getTimestampForSlot([
-            currentSlot + 1n
+            BigInt(nextSlot)
         ]);
         await this.ethCheatCodes.warp(Number(timestamp), {
             silent: true,
             resetBlockInterval: true
         });
-        this.logger.warn(`Advanced to slot ${currentSlot + 1n}`);
+        this.logger.warn(`Advanced to slot ${nextSlot}`);
         return [
             timestamp,
-            currentSlot + 1n
+            nextSlot
         ];
     }
     /**
@@ -127,8 +129,8 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
    * @param howMany - The number of slots to advance.
    */ async advanceSlots(howMany) {
         const l1Timestamp = (await this.client.getBlock()).timestamp;
-        const slotDuration = await this.rollup.read.getSlotDuration();
-        const timeToWarp = BigInt(howMany) * slotDuration;
+        const slotDuration = Number(await this.rollup.read.getSlotDuration());
+        const timeToWarp = BigInt(howMany) * BigInt(slotDuration);
         await this.ethCheatCodes.warp(l1Timestamp + timeToWarp, {
             silent: true,
             resetBlockInterval: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/ethereum",
-  "version": "3.0.0-nightly.20251128",
+  "version": "3.0.0-nightly.20251202",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -31,10 +31,10 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/blob-lib": "3.0.0-nightly.20251128",
-    "@aztec/constants": "3.0.0-nightly.20251128",
-    "@aztec/foundation": "3.0.0-nightly.20251128",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20251128",
+    "@aztec/blob-lib": "3.0.0-nightly.20251202",
+    "@aztec/constants": "3.0.0-nightly.20251202",
+    "@aztec/foundation": "3.0.0-nightly.20251202",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20251202",
     "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
     "lodash.chunk": "^4.2.0",

package/src/contracts/empire_base.ts

@@ -1,3 +1,4 @@
+import type { SlotNumber } from '@aztec/foundation/branded-types';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { EmpireBaseAbi } from '@aztec/l1-artifacts/EmpireBaseAbi';
@@ -11,12 +12,12 @@ export interface IEmpireBase {
   getRoundInfo(
     rollupAddress: Hex,
     round: bigint,
-  ): Promise<{ lastSignalSlot: bigint; payloadWithMostSignals: Hex; executed: boolean }>;
-  computeRound(slot: bigint): Promise<bigint>;
+  ): Promise<{ lastSignalSlot: SlotNumber; payloadWithMostSignals: Hex; executed: boolean }>;
+  computeRound(slot: SlotNumber): Promise<bigint>;
   createSignalRequest(payload: Hex): L1TxRequest;
   createSignalRequestWithSignature(
     payload: Hex,
-    round: bigint,
+    slot: SlotNumber,
     chainId: number,
     signerAddress: Hex,
     signer: (msg: TypedDataDefinition) => Promise<Hex>,
@@ -51,7 +52,7 @@ export function encodeSignalWithSignature(payload: Hex, signature: Signature) {
 export async function signSignalWithSig(
   signer: (msg: TypedDataDefinition) => Promise<Hex>,
   payload: Hex,
-  slot: bigint,
+  slot: SlotNumber,
   instance: Hex,
   verifyingContract: Hex,
   chainId: number,
@@ -79,7 +80,7 @@ export async function signSignalWithSig(
 
   const message = {
     payload,
-    slot,
+    slot: BigInt(slot),
     instance,
   };
 

package/src/contracts/empire_slashing_proposer.ts

@@ -1,3 +1,4 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { retryUntil } from '@aztec/foundation/retry';
@@ -67,8 +68,8 @@ export class EmpireSlashingProposerContract extends EventEmitter implements IEmp
     return this.proposer.read.getCurrentRound();
   }
 
-  public computeRound(slot: bigint): Promise<bigint> {
-    return this.proposer.read.computeRound([slot]);
+  public computeRound(slot: SlotNumber): Promise<bigint> {
+    return this.proposer.read.computeRound([BigInt(slot)]);
   }
 
   public getInstance() {
@@ -78,8 +79,13 @@ export class EmpireSlashingProposerContract extends EventEmitter implements IEmp
   public async getRoundInfo(
     rollupAddress: Hex,
     round: bigint,
-  ): Promise<{ lastSignalSlot: bigint; payloadWithMostSignals: Hex; executed: boolean }> {
-    return await this.proposer.read.getRoundData([rollupAddress, round]);
+  ): Promise<{ lastSignalSlot: SlotNumber; payloadWithMostSignals: Hex; executed: boolean }> {
+    const result = await this.proposer.read.getRoundData([rollupAddress, round]);
+    return {
+      lastSignalSlot: SlotNumber.fromBigInt(result.lastSignalSlot),
+      payloadWithMostSignals: result.payloadWithMostSignals,
+      executed: result.executed,
+    };
   }
 
   public getPayloadSignals(rollupAddress: Hex, round: bigint, payload: Hex): Promise<bigint> {
@@ -95,7 +101,7 @@ export class EmpireSlashingProposerContract extends EventEmitter implements IEmp
 
   public async createSignalRequestWithSignature(
     payload: Hex,
-    slot: bigint,
+    slot: SlotNumber,
     chainId: number,
     signerAddress: Hex,
     signer: (msg: TypedDataDefinition) => Promise<Hex>,

package/src/contracts/governance_proposer.ts

@@ -1,3 +1,4 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { memoize } from '@aztec/foundation/decorators';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { GovernanceProposerAbi } from '@aztec/l1-artifacts/GovernanceProposerAbi';
@@ -54,15 +55,20 @@ export class GovernanceProposerContract implements IEmpireBase {
     return this.proposer.read.getInstance();
   }
 
-  public computeRound(slot: bigint): Promise<bigint> {
-    return this.proposer.read.computeRound([slot]);
+  public computeRound(slot: SlotNumber): Promise<bigint> {
+    return this.proposer.read.computeRound([BigInt(slot)]);
   }
 
   public async getRoundInfo(
     rollupAddress: Hex,
     round: bigint,
-  ): Promise<{ lastSignalSlot: bigint; payloadWithMostSignals: Hex; executed: boolean }> {
-    return await this.proposer.read.getRoundData([rollupAddress, round]);
+  ): Promise<{ lastSignalSlot: SlotNumber; payloadWithMostSignals: Hex; executed: boolean }> {
+    const result = await this.proposer.read.getRoundData([rollupAddress, round]);
+    return {
+      lastSignalSlot: SlotNumber.fromBigInt(result.lastSignalSlot),
+      payloadWithMostSignals: result.payloadWithMostSignals,
+      executed: result.executed,
+    };
   }
 
   public getPayloadSignals(rollupAddress: Hex, round: bigint, payload: Hex): Promise<bigint> {
@@ -78,7 +84,7 @@ export class GovernanceProposerContract implements IEmpireBase {
 
   public async createSignalRequestWithSignature(
     payload: Hex,
-    slot: bigint,
+    slot: SlotNumber,
     chainId: number,
     signerAddress: Hex,
     signer: (msg: TypedDataDefinition) => Promise<Hex>,

package/src/contracts/rollup.ts

@@ -1,4 +1,4 @@
-import { EpochNumber } from '@aztec/foundation/branded-types';
+import { CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { memoize } from '@aztec/foundation/decorators';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { ViemSignature } from '@aztec/foundation/eth-signature';
@@ -83,22 +83,6 @@ export type ViemGasFees = {
   feePerL2Gas: bigint;
 };
 
-export type ViemStateReference = {
-  l1ToL2MessageTree: ViemAppendOnlyTreeSnapshot;
-  partialStateReference: ViemPartialStateReference;
-};
-
-export type ViemPartialStateReference = {
-  noteHashTree: ViemAppendOnlyTreeSnapshot;
-  nullifierTree: ViemAppendOnlyTreeSnapshot;
-  publicDataTree: ViemAppendOnlyTreeSnapshot;
-};
-
-export type ViemAppendOnlyTreeSnapshot = {
-  root: `0x${string}`;
-  nextAvailableLeafIndex: number;
-};
-
 export enum SlashingProposerType {
   None = 0,
   Tally = 1,
@@ -209,8 +193,8 @@ export class RollupContract {
   }
 
   @memoize
-  getSlotDuration() {
-    return this.rollup.read.getSlotDuration();
+  async getSlotDuration(): Promise<number> {
+    return Number(await this.rollup.read.getSlotDuration());
   }
 
   @memoize
@@ -301,7 +285,7 @@ export class RollupContract {
     return {
       l1StartBlock,
       l1GenesisTime,
-      slotDuration: Number(slotDuration),
+      slotDuration,
       epochDuration: Number(epochDuration),
       proofSubmissionEpochs: Number(proofSubmissionEpochs),
     };
@@ -342,16 +326,16 @@ export class RollupContract {
     return this.rollup.read.getCheckpointReward();
   }
 
-  getCheckpointNumber() {
-    return this.rollup.read.getPendingCheckpointNumber();
+  async getCheckpointNumber(): Promise<CheckpointNumber> {
+    return CheckpointNumber.fromBigInt(await this.rollup.read.getPendingCheckpointNumber());
   }
 
-  getProvenCheckpointNumber() {
-    return this.rollup.read.getProvenCheckpointNumber();
+  async getProvenCheckpointNumber(): Promise<CheckpointNumber> {
+    return CheckpointNumber.fromBigInt(await this.rollup.read.getProvenCheckpointNumber());
   }
 
-  getSlotNumber() {
-    return this.rollup.read.getCurrentSlot();
+  async getSlotNumber(): Promise<SlotNumber> {
+    return SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot());
   }
 
   getL1FeesAt(timestamp: bigint) {
@@ -432,7 +416,7 @@ export class RollupContract {
     return result;
   }
 
-  getCheckpoint(checkpointNumber: bigint | number) {
+  getCheckpoint(checkpointNumber: CheckpointNumber) {
     return this.rollup.read.getCheckpoint([BigInt(checkpointNumber)]);
   }
 
@@ -440,8 +424,8 @@ export class RollupContract {
     return this.rollup.read.getTips();
   }
 
-  getTimestampForSlot(slot: bigint) {
-    return this.rollup.read.getTimestampForSlot([slot]);
+  getTimestampForSlot(slot: SlotNumber) {
+    return this.rollup.read.getTimestampForSlot([BigInt(slot)]);
   }
 
   getEntryQueueLength() {
@@ -460,7 +444,7 @@ export class RollupContract {
     return EpochNumber.fromBigInt(await this.rollup.read.getCurrentEpoch());
   }
 
-  async getEpochNumberForCheckpoint(checkpointNumber: bigint): Promise<EpochNumber> {
+  async getEpochNumberForCheckpoint(checkpointNumber: CheckpointNumber): Promise<EpochNumber> {
     return EpochNumber.fromBigInt(await this.rollup.read.getEpochForCheckpoint([BigInt(checkpointNumber)]));
   }
 
@@ -501,8 +485,8 @@ export class RollupContract {
     return EthAddress.fromString(await this.rollup.read.getFeeAssetPortal());
   }
 
-  public async getEpochNumberForSlotNumber(slotNumber: bigint): Promise<EpochNumber> {
-    return EpochNumber.fromBigInt(await this.rollup.read.getEpochAtSlot([slotNumber]));
+  public async getEpochNumberForSlotNumber(slotNumber: SlotNumber): Promise<EpochNumber> {
+    return EpochNumber.fromBigInt(await this.rollup.read.getEpochAtSlot([BigInt(slotNumber)]));
   }
 
   getEpochProofPublicInputs(
@@ -552,14 +536,11 @@ export class RollupContract {
   public async canProposeAtNextEthBlock(
     archive: Buffer,
     account: `0x${string}` | Account,
-    slotDuration: bigint | number,
-    opts: { forcePendingCheckpointNumber?: number } = {},
-  ): Promise<{ slot: bigint; checkpointNumber: bigint; timeOfNextL1Slot: bigint }> {
-    if (typeof slotDuration === 'number') {
-      slotDuration = BigInt(slotDuration);
-    }
+    slotDuration: number,
+    opts: { forcePendingCheckpointNumber?: CheckpointNumber } = {},
+  ): Promise<{ slot: SlotNumber; checkpointNumber: CheckpointNumber; timeOfNextL1Slot: bigint }> {
     const latestBlock = await this.client.getBlock();
-    const timeOfNextL1Slot = latestBlock.timestamp + slotDuration;
+    const timeOfNextL1Slot = latestBlock.timestamp + BigInt(slotDuration);
     const who = typeof account === 'string' ? account : account.address;
 
     try {
@@ -574,7 +555,11 @@ export class RollupContract {
         stateOverride: await this.makePendingCheckpointNumberOverride(opts.forcePendingCheckpointNumber),
       });
 
-      return { slot, checkpointNumber, timeOfNextL1Slot };
+      return {
+        slot: SlotNumber.fromBigInt(slot),
+        checkpointNumber: CheckpointNumber.fromBigInt(checkpointNumber),
+        timeOfNextL1Slot,
+      };
     } catch (err: unknown) {
       throw formatViemError(err);
     }
@@ -586,7 +571,7 @@ export class RollupContract {
    * stored in the same slot. If the argument is undefined, it returns an empty override.
    */
   public async makePendingCheckpointNumberOverride(
-    forcePendingCheckpointNumber: number | undefined,
+    forcePendingCheckpointNumber: CheckpointNumber | undefined,
   ): Promise<StateOverride> {
     if (forcePendingCheckpointNumber === undefined) {
       return [];
@@ -605,7 +590,7 @@ export class RollupContract {
 
   /** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */
   public buildInvalidateBadAttestationRequest(
-    checkpointNumber: number,
+    checkpointNumber: CheckpointNumber,
     attestationsAndSigners: ViemCommitteeAttestations,
     committee: EthAddress[],
     invalidIndex: number,
@@ -627,7 +612,7 @@ export class RollupContract {
 
   /** Creates a request to Rollup#invalidateInsufficientAttestations to be simulated or sent */
   public buildInvalidateInsufficientAttestationsRequest(
-    checkpointNumber: number,
+    checkpointNumber: CheckpointNumber,
     attestationsAndSigners: ViemCommitteeAttestations,
     committee: EthAddress[],
   ): L1TxRequest {
@@ -653,13 +638,13 @@ export class RollupContract {
     return this.rollup.read.getManaBaseFeeAt([timestamp, inFeeAsset]);
   }
 
-  getSlotAt(timestamp: bigint) {
-    return this.rollup.read.getSlotAt([timestamp]);
+  async getSlotAt(timestamp: bigint): Promise<SlotNumber> {
+    return SlotNumber.fromBigInt(await this.rollup.read.getSlotAt([timestamp]));
   }
 
-  async status(checkpointNumber: bigint, options?: { blockNumber?: bigint }) {
+  async status(checkpointNumber: CheckpointNumber, options?: { blockNumber?: bigint }) {
     await checkBlockTag(options?.blockNumber, this.client);
-    return this.rollup.read.status([checkpointNumber], options);
+    return this.rollup.read.status([BigInt(checkpointNumber)], options);
   }
 
   async canPruneAtTime(timestamp: bigint, options?: { blockNumber?: bigint }) {
@@ -671,8 +656,8 @@ export class RollupContract {
     return this.rollup.read.archive();
   }
 
-  archiveAt(checkpointNumber: bigint) {
-    return this.rollup.read.archiveAt([checkpointNumber]);
+  archiveAt(checkpointNumber: CheckpointNumber) {
+    return this.rollup.read.archiveAt([BigInt(checkpointNumber)]);
   }
 
   getSequencerRewards(address: Hex | EthAddress) {
@@ -714,8 +699,8 @@ export class RollupContract {
     return this.rollup.read.getStatus([address]);
   }
 
-  getBlobCommitmentsHash(checkpointNumber: bigint) {
-    return this.rollup.read.getBlobCommitmentsHash([checkpointNumber]);
+  getBlobCommitmentsHash(checkpointNumber: CheckpointNumber) {
+    return this.rollup.read.getBlobCommitmentsHash([BigInt(checkpointNumber)]);
   }
 
   getCurrentBlobCommitmentsHash() {
@@ -771,7 +756,7 @@ export class RollupContract {
   }
 
   public listenToCheckpointInvalidated(
-    callback: (args: { checkpointNumber: bigint }) => unknown,
+    callback: (args: { checkpointNumber: CheckpointNumber }) => unknown,
   ): WatchContractEventReturnType {
     return this.rollup.watchEvent.CheckpointInvalidated(
       {},
@@ -780,7 +765,7 @@ export class RollupContract {
           for (const log of logs) {
             const args = log.args;
             if (args.checkpointNumber !== undefined) {
-              callback({ checkpointNumber: args.checkpointNumber });
+              callback({ checkpointNumber: CheckpointNumber.fromBigInt(args.checkpointNumber) });
             }
           }
         },

package/src/contracts/tally_slashing_proposer.ts

@@ -1,4 +1,5 @@
 import { type L1TxRequest, type ViemClient, tryExtractEvent } from '@aztec/ethereum';
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
@@ -97,8 +98,8 @@ export class TallySlashingProposerContract {
    * @param slot - The slot number to check at
    * @returns Whether the round is ready to execute
    */
-  public async isRoundReadyToExecute(round: bigint, slot: bigint): Promise<boolean> {
-    return await this.contract.read.isRoundReadyToExecute([round, slot]);
+  public async isRoundReadyToExecute(round: bigint, slot: SlotNumber): Promise<boolean> {
+    return await this.contract.read.isRoundReadyToExecute([round, BigInt(slot)]);
   }
 
   /** Returns the slash actions and payload address for a given round (zero if no slash actions) */
@@ -149,7 +150,7 @@ export class TallySlashingProposerContract {
    */
   public async buildVoteRequestFromSigner(
     votes: Hex,
-    slot: bigint,
+    slot: SlotNumber,
     signer: (msg: TypedDataDefinition) => Promise<Hex>,
   ): Promise<L1TxRequest> {
     const typedData = this.buildVoteTypedData(votes, slot);
@@ -166,7 +167,7 @@ export class TallySlashingProposerContract {
   }
 
   /** Returns the typed data definition to EIP712-sign for voting */
-  public buildVoteTypedData(votes: Hex, slot: bigint): TypedDataDefinition {
+  public buildVoteTypedData(votes: Hex, slot: SlotNumber): TypedDataDefinition {
     const domain = {
       name: 'TallySlashingProposer',
       version: '1',
@@ -187,12 +188,12 @@ export class TallySlashingProposerContract {
       ],
     };
 
-    return { domain, types, primaryType: 'Vote', message: { votes, slot } };
+    return { domain, types, primaryType: 'Vote', message: { votes, slot: BigInt(slot) } };
   }
 
   /** Gets the digest to sign for voting directly from the contract */
-  public async getVoteDataDigest(votes: Hex, slot: bigint): Promise<Buffer32> {
-    return Buffer32.fromString(await this.contract.read.getVoteSignatureDigest([votes, slot]));
+  public async getVoteDataDigest(votes: Hex, slot: SlotNumber): Promise<Buffer32> {
+    return Buffer32.fromString(await this.contract.read.getVoteSignatureDigest([votes, BigInt(slot)]));
   }
 
   /**

package/src/deploy_l1_contracts.ts

@@ -1,4 +1,5 @@
 import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/constants';
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { SecretValue, getActiveNetworkName } from '@aztec/foundation/config';
 import { keccak256String } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -1519,13 +1520,13 @@ export const deployL1Contracts = async (
       // Need to get the time
       const currentSlot = await rollup.getSlotNumber();
 
-      if (BigInt(currentSlot) === 0n) {
-        const ts = Number(await rollup.getTimestampForSlot(1n));
+      if (currentSlot === 0) {
+        const ts = Number(await rollup.getTimestampForSlot(SlotNumber(1)));
         await rpcCall('evm_setNextBlockTimestamp', [ts]);
         await rpcCall('hardhat_mine', [1]);
         const currentSlot = await rollup.getSlotNumber();
 
-        if (BigInt(currentSlot) !== 1n) {
+        if (currentSlot !== 1) {
           throw new Error(`Error jumping time: current slot is ${currentSlot}`);
         }
         logger.info(`Jumped to slot 1`);

package/src/test/chain_monitor.ts

@@ -1,5 +1,5 @@
 import { InboxContract, type RollupContract } from '@aztec/ethereum/contracts';
-import { EpochNumber } from '@aztec/foundation/branded-types';
+import { CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { promiseWithResolvers } from '@aztec/foundation/promise';
@@ -11,11 +11,13 @@ import type { ViemClient } from '../types.js';
 
 export type ChainMonitorEventMap = {
   'l1-block': [{ l1BlockNumber: number; timestamp: bigint }];
-  checkpoint: [{ checkpointNumber: number; l1BlockNumber: number; l2SlotNumber: number; timestamp: bigint }];
-  'checkpoint-proven': [{ provenCheckpointNumber: number; l1BlockNumber: number; timestamp: bigint }];
+  checkpoint: [
+    { checkpointNumber: CheckpointNumber; l1BlockNumber: number; l2SlotNumber: SlotNumber; timestamp: bigint },
+  ];
+  'checkpoint-proven': [{ provenCheckpointNumber: CheckpointNumber; l1BlockNumber: number; timestamp: bigint }];
   'l2-messages': [{ totalL2Messages: number; l1BlockNumber: number }];
   'l2-epoch': [{ l2EpochNumber: EpochNumber; timestamp: bigint; committee: EthAddress[] | undefined }];
-  'l2-slot': [{ l2SlotNumber: number; timestamp: bigint }];
+  'l2-slot': [{ l2SlotNumber: SlotNumber; timestamp: bigint }];
 };
 
 /** Utility class that polls the chain on quick intervals and logs new L1 blocks, L2 blocks, and L2 proofs. */
@@ -29,9 +31,9 @@ export class ChainMonitor extends EventEmitter<ChainMonitorEventMap> {
   /** Current L1 block number */
   public l1BlockNumber!: number;
   /** Current checkpoint number */
-  public checkpointNumber!: number;
+  public checkpointNumber!: CheckpointNumber;
   /** Current proven checkpoint number */
-  public provenCheckpointNumber!: number;
+  public provenCheckpointNumber!: CheckpointNumber;
   /** L1 timestamp for the current checkpoint */
   public checkpointTimestamp!: bigint;
   /** L1 timestamp for the proven checkpoint */
@@ -41,7 +43,7 @@ export class ChainMonitor extends EventEmitter<ChainMonitorEventMap> {
   /** Current L2 epoch number */
   public l2EpochNumber!: EpochNumber;
   /** Current L2 slot number */
-  public l2SlotNumber!: bigint;
+  public l2SlotNumber!: SlotNumber;
 
   constructor(
     private readonly rollup: RollupContract,
@@ -115,23 +117,23 @@ export class ChainMonitor extends EventEmitter<ChainMonitorEventMap> {
     this.emit('l1-block', { l1BlockNumber: newL1BlockNumber, timestamp });
     let msg = `L1 block ${newL1BlockNumber} mined at ${timestampString}`;
 
-    const newCheckpointNumber = Number(await this.rollup.getCheckpointNumber());
+    const newCheckpointNumber = await this.rollup.getCheckpointNumber();
     if (this.checkpointNumber !== newCheckpointNumber) {
-      const epochNumber = await this.rollup.getEpochNumberForCheckpoint(BigInt(newCheckpointNumber));
+      const epochNumber = await this.rollup.getEpochNumberForCheckpoint(newCheckpointNumber);
       msg += ` with new checkpoint ${newCheckpointNumber} for epoch ${epochNumber}`;
       this.checkpointNumber = newCheckpointNumber;
       this.checkpointTimestamp = timestamp;
       this.emit('checkpoint', {
         checkpointNumber: newCheckpointNumber,
         l1BlockNumber: newL1BlockNumber,
-        l2SlotNumber: Number(l2SlotNumber),
+        l2SlotNumber,
         timestamp,
       });
     }
 
-    const newProvenCheckpointNumber = Number(await this.rollup.getProvenCheckpointNumber());
+    const newProvenCheckpointNumber = await this.rollup.getProvenCheckpointNumber();
     if (this.provenCheckpointNumber !== newProvenCheckpointNumber) {
-      const epochNumber = await this.rollup.getEpochNumberForCheckpoint(BigInt(newProvenCheckpointNumber));
+      const epochNumber = await this.rollup.getEpochNumberForCheckpoint(newProvenCheckpointNumber);
       msg += ` with proof up to checkpoint ${newProvenCheckpointNumber} for epoch ${epochNumber}`;
       this.provenCheckpointNumber = newProvenCheckpointNumber;
       this.provenCheckpointTimestamp = timestamp;
@@ -160,7 +162,7 @@ export class ChainMonitor extends EventEmitter<ChainMonitorEventMap> {
 
     if (l2SlotNumber !== this.l2SlotNumber) {
       this.l2SlotNumber = l2SlotNumber;
-      this.emit('l2-slot', { l2SlotNumber: Number(l2SlotNumber), timestamp });
+      this.emit('l2-slot', { l2SlotNumber, timestamp });
     }
 
     this.logger.info(msg, {
@@ -178,14 +180,13 @@ export class ChainMonitor extends EventEmitter<ChainMonitorEventMap> {
     return this;
   }
 
-  public waitUntilL2Slot(slot: number | bigint): Promise<void> {
-    const targetSlot = typeof slot === 'bigint' ? slot.valueOf() : slot;
-    if (this.l2SlotNumber >= targetSlot) {
+  public waitUntilL2Slot(slot: SlotNumber): Promise<void> {
+    if (this.l2SlotNumber >= slot) {
       return Promise.resolve();
     }
     return new Promise(resolve => {
-      const listener = (data: { l2SlotNumber: number; timestamp: bigint }) => {
-        if (data.l2SlotNumber >= targetSlot) {
+      const listener = (data: { l2SlotNumber: SlotNumber; timestamp: bigint }) => {
+        if (data.l2SlotNumber >= slot) {
           this.off('l2-slot', listener);
           resolve();
         }
@@ -226,14 +227,13 @@ export class ChainMonitor extends EventEmitter<ChainMonitorEventMap> {
     });
   }
 
-  public waitUntilCheckpoint(checkpointNumber: number | bigint): Promise<void> {
-    const targetBlock = typeof checkpointNumber === 'bigint' ? checkpointNumber.valueOf() : checkpointNumber;
-    if (this.checkpointNumber >= targetBlock) {
+  public waitUntilCheckpoint(checkpointNumber: CheckpointNumber): Promise<void> {
+    if (this.checkpointNumber >= checkpointNumber) {
       return Promise.resolve();
     }
     return new Promise(resolve => {
-      const listener = (data: { checkpointNumber: number; timestamp: bigint }) => {
-        if (data.checkpointNumber >= targetBlock) {
+      const listener = (data: { checkpointNumber: CheckpointNumber; timestamp: bigint }) => {
+        if (data.checkpointNumber >= checkpointNumber) {
           this.off('checkpoint', listener);
           resolve();
         }