@aztec/ethereum 0.0.0-test.1 → 0.0.1-commit.1142ef1

package/src/contracts/rollup.ts

@@ -1,17 +1,48 @@
+import { CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { memoize } from '@aztec/foundation/decorators';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { ViemSignature } from '@aztec/foundation/eth-signature';
-import { RollupAbi, RollupStorage, SlasherAbi } from '@aztec/l1-artifacts';
-
-import { type Account, type GetContractReturnType, type Hex, getAddress, getContract } from 'viem';
+import { makeBackoff, retry } from '@aztec/foundation/retry';
+import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
+import { RollupStorage } from '@aztec/l1-artifacts/RollupStorage';
+
+import chunk from 'lodash.chunk';
+import {
+  type Account,
+  type GetContractReturnType,
+  type Hex,
+  type StateOverride,
+  type WatchContractEventReturnType,
+  encodeFunctionData,
+  getContract,
+  hexToBigInt,
+  keccak256,
+} from 'viem';
 
 import { getPublicClient } from '../client.js';
-import type { DeployL1ContractsReturnType } from '../deploy_l1_contracts.js';
+import type { DeployAztecL1ContractsReturnType } from '../deploy_aztec_l1_contracts.js';
 import type { L1ContractAddresses } from '../l1_contract_addresses.js';
 import type { L1ReaderConfig } from '../l1_reader.js';
-import type { ViemPublicClient } from '../types.js';
+import type { L1TxRequest, L1TxUtils } from '../l1_tx_utils/index.js';
+import type { ViemClient } from '../types.js';
 import { formatViemError } from '../utils.js';
-import { SlashingProposerContract } from './slashing_proposer.js';
+import { EmpireSlashingProposerContract } from './empire_slashing_proposer.js';
+import { GSEContract } from './gse.js';
+import { SlasherContract } from './slasher_contract.js';
+import { TallySlashingProposerContract } from './tally_slashing_proposer.js';
+import { checkBlockTag } from './utils.js';
+
+export type ViemCommitteeAttestation = {
+  addr: `0x${string}`;
+  signature: ViemSignature;
+};
+
+export type ViemCommitteeAttestations = {
+  signatureIndices: `0x${string}`;
+  signaturesOrAddresses: `0x${string}`;
+};
 
 export type L1RollupContractAddresses = Pick<
   L1ContractAddresses,
@@ -23,20 +54,141 @@ export type L1RollupContractAddresses = Pick<
   | 'stakingAssetAddress'
   | 'rewardDistributorAddress'
   | 'slashFactoryAddress'
+  | 'gseAddress'
 >;
 
 export type EpochProofPublicInputArgs = {
   previousArchive: `0x${string}`;
   endArchive: `0x${string}`;
-  previousBlockHash: `0x${string}`;
-  endBlockHash: `0x${string}`;
-  endTimestamp: bigint;
   outHash: `0x${string}`;
   proverId: `0x${string}`;
 };
 
+export type ViemHeader = {
+  lastArchiveRoot: `0x${string}`;
+  blockHeadersHash: `0x${string}`;
+  blobsHash: `0x${string}`;
+  inHash: `0x${string}`;
+  slotNumber: bigint;
+  timestamp: bigint;
+  coinbase: `0x${string}`;
+  feeRecipient: `0x${string}`;
+  gasFees: ViemGasFees;
+  totalManaUsed: bigint;
+};
+
+export type ViemGasFees = {
+  feePerDaGas: bigint;
+  feePerL2Gas: bigint;
+};
+
+export enum SlashingProposerType {
+  None = 0,
+  Tally = 1,
+  Empire = 2,
+}
+
+/**
+ * Status of a validator/attester in the staking system.
+ * Matches the Status enum in StakingLib.sol
+ */
+export enum AttesterStatus {
+  NONE = 0,
+  VALIDATING = 1,
+  ZOMBIE = 2,
+  EXITING = 3,
+}
+
+/**
+ * Fee header data for a checkpoint
+ */
+export type FeeHeader = {
+  excessMana: bigint;
+  manaUsed: bigint;
+  feeAssetPriceNumerator: bigint;
+  congestionCost: bigint;
+  proverCost: bigint;
+};
+
+/**
+ * Checkpoint log data returned from the rollup contract
+ */
+export type CheckpointLog = {
+  archive: Fr;
+  headerHash: Buffer32;
+  blobCommitmentsHash: Buffer32;
+  attestationsHash: Buffer32;
+  payloadDigest: Buffer32;
+  slotNumber: SlotNumber;
+  feeHeader: FeeHeader;
+};
+
+/**
+ * L1 fee data (base fee and blob fee)
+ */
+export type L1FeeData = {
+  baseFee: bigint;
+  blobFee: bigint;
+};
+
+/**
+ * Reward configuration for the rollup
+ */
+export type RewardConfig = {
+  rewardDistributor: EthAddress;
+  sequencerBps: bigint;
+  booster: EthAddress;
+  checkpointReward: bigint;
+};
+
+/**
+ * Exit information for a validator
+ */
+export type Exit = {
+  withdrawalId: bigint;
+  amount: bigint;
+  exitableAt: bigint;
+  recipientOrWithdrawer: EthAddress;
+  isRecipient: boolean;
+  exists: boolean;
+};
+
+/**
+ * Attester configuration including public key and withdrawer
+ */
+export type AttesterConfig = {
+  publicKey: {
+    x: bigint;
+    y: bigint;
+  };
+  withdrawer: EthAddress;
+};
+
+/**
+ * Complete view of an attester's state
+ */
+export type AttesterView = {
+  status: AttesterStatus;
+  effectiveBalance: bigint;
+  exit: Exit;
+  config: AttesterConfig;
+};
+
+/**
+ * Return for a status call
+ */
+export type RollupStatusResponse = {
+  provenCheckpointNumber: CheckpointNumber;
+  provenArchive: Fr;
+  pendingCheckpointNumber: CheckpointNumber;
+  pendingArchive: Fr;
+  archiveOfMyCheckpoint: Fr;
+};
+
 export class RollupContract {
-  private readonly rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>;
+  private readonly rollup: GetContractReturnType<typeof RollupAbi, ViemClient>;
+
+  private static cachedStfStorageSlot: Hex | undefined;
 
   static get checkBlobStorageSlot(): bigint {
     const asString = RollupStorage.find(storage => storage.label === 'checkBlob')?.slot;
@@ -46,12 +198,16 @@ export class RollupContract {
     return BigInt(asString);
   }
 
-  static getFromL1ContractsValues(deployL1ContractsValues: DeployL1ContractsReturnType) {
+  static get stfStorageSlot(): Hex {
+    return (RollupContract.cachedStfStorageSlot ??= keccak256(Buffer.from('aztec.stf.storage', 'utf-8')));
+  }
+
+  static getFromL1ContractsValues(deployL1ContractsValues: DeployAztecL1ContractsReturnType) {
     const {
-      publicClient,
+      l1Client,
       l1ContractAddresses: { rollupAddress },
     } = deployL1ContractsValues;
-    return new RollupContract(publicClient, rollupAddress.toString());
+    return new RollupContract(l1Client, rollupAddress.toString());
   }
 
   static getFromConfig(config: L1ReaderConfig) {
@@ -60,121 +216,370 @@ export class RollupContract {
     return new RollupContract(client, address);
   }
 
-  constructor(public readonly client: ViemPublicClient, address: Hex | EthAddress) {
+  constructor(
+    public readonly client: ViemClient,
+    address: Hex | EthAddress,
+  ) {
     if (address instanceof EthAddress) {
       address = address.toString();
     }
     this.rollup = getContract({ address, abi: RollupAbi, client });
   }
 
+  async getGSE(): Promise<EthAddress> {
+    return EthAddress.fromString(await this.rollup.read.getGSE());
+  }
+
   public get address() {
     return this.rollup.address;
   }
 
-  @memoize
-  public async getSlashingProposer() {
-    const slasherAddress = await this.rollup.read.getSlasher();
-    const slasher = getContract({ address: slasherAddress, abi: SlasherAbi, client: this.client });
-    const proposerAddress = await slasher.read.PROPOSER();
-    return new SlashingProposerContract(this.client, proposerAddress);
+  getContract(): GetContractReturnType<typeof RollupAbi, ViemClient> {
+    return this.rollup;
+  }
+
+  public async getSlashingProposer(): Promise<
+    EmpireSlashingProposerContract | TallySlashingProposerContract | undefined
+  > {
+    const slasher = await this.getSlasherContract();
+    if (!slasher) {
+      return undefined;
+    }
+
+    const proposerAddress = await slasher.getProposer();
+    const proposerAbi = [
+      {
+        type: 'function',
+        name: 'SLASHING_PROPOSER_TYPE',
+        inputs: [],
+        outputs: [{ name: '', type: 'uint8', internalType: 'enum SlasherFlavor' }],
+        stateMutability: 'view',
+      },
+    ] as const;
+
+    const proposer = getContract({ address: proposerAddress.toString(), abi: proposerAbi, client: this.client });
+    const proposerType = await proposer.read.SLASHING_PROPOSER_TYPE();
+    if (proposerType === SlashingProposerType.Tally.valueOf()) {
+      return new TallySlashingProposerContract(this.client, proposerAddress);
+    } else if (proposerType === SlashingProposerType.Empire.valueOf()) {
+      return new EmpireSlashingProposerContract(this.client, proposerAddress);
+    } else {
+      throw new Error(`Unknown slashing proposer type: ${proposerType}`);
+    }
   }
 
   @memoize
-  getL1StartBlock() {
+  getL1StartBlock(): Promise<bigint> {
     return this.rollup.read.L1_BLOCK_AT_GENESIS();
   }
 
   @memoize
-  getL1GenesisTime() {
+  getL1GenesisTime(): Promise<bigint> {
     return this.rollup.read.getGenesisTime();
   }
 
   @memoize
-  getProofSubmissionWindow() {
-    return this.rollup.read.getProofSubmissionWindow();
+  async getProofSubmissionEpochs(): Promise<number> {
+    return Number(await this.rollup.read.getProofSubmissionEpochs());
+  }
+
+  @memoize
+  async getEpochDuration(): Promise<number> {
+    return Number(await this.rollup.read.getEpochDuration());
+  }
+
+  @memoize
+  async getSlotDuration(): Promise<number> {
+    return Number(await this.rollup.read.getSlotDuration());
+  }
+
+  @memoize
+  async getTargetCommitteeSize(): Promise<number> {
+    return Number(await this.rollup.read.getTargetCommitteeSize());
+  }
+
+  @memoize
+  getEjectionThreshold(): Promise<bigint> {
+    return this.rollup.read.getEjectionThreshold();
+  }
+
+  @memoize
+  getLocalEjectionThreshold(): Promise<bigint> {
+    return this.rollup.read.getLocalEjectionThreshold();
+  }
+
+  @memoize
+  async getLagInEpochsForValidatorSet(): Promise<number> {
+    return Number(await this.rollup.read.getLagInEpochsForValidatorSet());
+  }
+
+  @memoize
+  async getLagInEpochsForRandao(): Promise<number> {
+    return Number(await this.rollup.read.getLagInEpochsForRandao());
+  }
+
+  @memoize
+  getActivationThreshold(): Promise<bigint> {
+    return this.rollup.read.getActivationThreshold();
+  }
+
+  @memoize
+  async getExitDelay(): Promise<number> {
+    return Number(await this.rollup.read.getExitDelay());
   }
 
   @memoize
-  getEpochDuration() {
-    return this.rollup.read.getEpochDuration();
+  getManaTarget(): Promise<bigint> {
+    return this.rollup.read.getManaTarget();
   }
 
   @memoize
-  getSlotDuration() {
-    return this.rollup.read.getSlotDuration();
+  getProvingCostPerMana(): Promise<bigint> {
+    return this.rollup.read.getProvingCostPerManaInEth();
   }
 
   @memoize
-  getTargetCommitteeSize() {
-    return this.rollup.read.getTargetCommitteeSize();
+  getProvingCostPerManaInFeeAsset(): Promise<bigint> {
+    return this.rollup.read.getProvingCostPerManaInFeeAsset();
   }
 
   @memoize
-  getMinimumStake() {
-    return this.rollup.read.getMinimumStake();
+  getManaLimit(): Promise<bigint> {
+    return this.rollup.read.getManaLimit();
+  }
+
+  @memoize
+  getVersion(): Promise<bigint> {
+    return this.rollup.read.getVersion();
+  }
+
+  @memoize
+  async getGenesisArchiveTreeRoot(): Promise<Fr> {
+    return Fr.fromString(await this.rollup.read.archiveAt([0n]));
+  }
+
+  /**
+   * Returns rollup constants used for epoch queries.
+   * Return type is `L1RollupConstants` which is defined in stdlib,
+   * so we cant reference it until we move this contract to that package.
+   */
+  @memoize
+  public async getRollupConstants(): Promise<{
+    l1StartBlock: bigint;
+    l1GenesisTime: bigint;
+    slotDuration: number;
+    epochDuration: number;
+    proofSubmissionEpochs: number;
+  }> {
+    const [l1StartBlock, l1GenesisTime, slotDuration, epochDuration, proofSubmissionEpochs] = await Promise.all([
+      this.getL1StartBlock(),
+      this.getL1GenesisTime(),
+      this.getSlotDuration(),
+      this.getEpochDuration(),
+      this.getProofSubmissionEpochs(),
+    ]);
+    return {
+      l1StartBlock,
+      l1GenesisTime,
+      slotDuration,
+      epochDuration: Number(epochDuration),
+      proofSubmissionEpochs: Number(proofSubmissionEpochs),
+    };
+  }
+
+  async getSlasherAddress(): Promise<EthAddress> {
+    return EthAddress.fromString(await this.rollup.read.getSlasher());
+  }
+
+  /**
+   * Returns a SlasherContract instance for interacting with the slasher contract.
+   */
+  async getSlasherContract(): Promise<SlasherContract | undefined> {
+    const slasherAddress = await this.getSlasherAddress();
+    if (slasherAddress.isZero()) {
+      return undefined;
+    }
+    return new SlasherContract(this.client, slasherAddress);
+  }
+
+  async getOwner(): Promise<EthAddress> {
+    return EthAddress.fromString(await this.rollup.read.owner());
+  }
+
+  async getActiveAttesterCount(): Promise<number> {
+    return Number(await this.rollup.read.getActiveAttesterCount());
   }
 
   public async getSlashingProposerAddress() {
-    const slasherAddress = await this.rollup.read.getSlasher();
-    const slasher = getContract({
-      address: getAddress(slasherAddress.toString()),
-      abi: SlasherAbi,
-      client: this.client,
-    });
-    return EthAddress.fromString(await slasher.read.PROPOSER());
+    const slasher = await this.getSlasherContract();
+    if (!slasher) {
+      return EthAddress.ZERO;
+    }
+    return await slasher.getProposer();
   }
 
-  getBlockNumber() {
-    return this.rollup.read.getPendingBlockNumber();
+  getCheckpointReward(): Promise<bigint> {
+    return this.rollup.read.getCheckpointReward();
   }
 
-  getProvenBlockNumber() {
-    return this.rollup.read.getProvenBlockNumber();
+  async getCheckpointNumber(): Promise<CheckpointNumber> {
+    return CheckpointNumber.fromBigInt(await this.rollup.read.getPendingCheckpointNumber());
   }
 
-  getSlotNumber() {
-    return this.rollup.read.getCurrentSlot();
+  async getProvenCheckpointNumber(): Promise<CheckpointNumber> {
+    return CheckpointNumber.fromBigInt(await this.rollup.read.getProvenCheckpointNumber());
   }
 
-  getCommitteeAt(timestamp: bigint) {
-    return this.rollup.read.getCommitteeAt([timestamp]);
+  async getSlotNumber(): Promise<SlotNumber> {
+    return SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot());
   }
 
-  getSampleSeedAt(timestamp: bigint) {
-    return this.rollup.read.getSampleSeedAt([timestamp]);
+  async getL1FeesAt(timestamp: bigint): Promise<L1FeeData> {
+    const result = await this.rollup.read.getL1FeesAt([timestamp]);
+    return {
+      baseFee: result.baseFee,
+      blobFee: result.blobFee,
+    };
   }
 
-  getCurrentSampleSeed() {
-    return this.rollup.read.getCurrentSampleSeed();
+  getFeeAssetPerEth(): Promise<bigint> {
+    return this.rollup.read.getFeeAssetPerEth();
   }
 
-  getCurrentEpochCommittee() {
-    return this.rollup.read.getCurrentEpochCommittee();
+  async getCommitteeAt(timestamp: bigint): Promise<EthAddress[] | undefined> {
+    const { result } = await this.client
+      .simulateContract({
+        address: this.address,
+        abi: RollupAbi,
+        functionName: 'getCommitteeAt',
+        args: [timestamp],
+      })
+      .catch(e => {
+        if (e instanceof Error && e.message.includes('ValidatorSelection__InsufficientValidatorSetSize')) {
+          return { result: undefined };
+        }
+        throw e;
+      });
+
+    return result ? result.map(addr => EthAddress.fromString(addr)) : undefined;
   }
 
-  getCurrentProposer() {
-    return this.rollup.read.getCurrentProposer();
+  async getSampleSeedAt(timestamp: bigint): Promise<Buffer32> {
+    return Buffer32.fromBigInt(await this.rollup.read.getSampleSeedAt([timestamp]));
   }
 
-  getProposerAt(timestamp: bigint) {
-    return this.rollup.read.getProposerAt([timestamp]);
+  async getCurrentSampleSeed(): Promise<Buffer32> {
+    return Buffer32.fromBigInt(await this.rollup.read.getCurrentSampleSeed());
   }
 
-  getBlock(blockNumber: bigint) {
-    return this.rollup.read.getBlock([blockNumber]);
+  async getCurrentEpoch(): Promise<EpochNumber> {
+    return EpochNumber.fromBigInt(await this.rollup.read.getCurrentEpoch());
   }
 
-  getTips() {
-    return this.rollup.read.getTips();
+  async getCurrentEpochCommittee(): Promise<EthAddress[] | undefined> {
+    const { result } = await this.client
+      .simulateContract({
+        address: this.address,
+        abi: RollupAbi,
+        functionName: 'getCurrentEpochCommittee',
+        args: [],
+      })
+      .catch(e => {
+        if (e instanceof Error && e.message.includes('ValidatorSelection__InsufficientValidatorSetSize')) {
+          return { result: undefined };
+        }
+        throw e;
+      });
+
+    return result ? result.map(addr => EthAddress.fromString(addr)) : undefined;
   }
 
-  getTimestampForSlot(slot: bigint) {
-    return this.rollup.read.getTimestampForSlot([slot]);
+  async getCurrentProposer(): Promise<EthAddress> {
+    const { result } = await this.client.simulateContract({
+      address: this.address,
+      abi: RollupAbi,
+      functionName: 'getCurrentProposer',
+      args: [],
+    });
+
+    return EthAddress.fromString(result);
   }
 
-  async getEpochNumber(blockNumber?: bigint) {
-    blockNumber ??= await this.getBlockNumber();
-    return this.rollup.read.getEpochForBlock([BigInt(blockNumber)]);
+  async getProposerAt(timestamp: bigint): Promise<EthAddress> {
+    const { result } = await this.client.simulateContract({
+      address: this.address,
+      abi: RollupAbi,
+      functionName: 'getProposerAt',
+      args: [timestamp],
+    });
+
+    return EthAddress.fromString(result);
+  }
+
+  async getCheckpoint(checkpointNumber: CheckpointNumber): Promise<CheckpointLog> {
+    const result = await this.rollup.read.getCheckpoint([BigInt(checkpointNumber)]);
+    return {
+      archive: Fr.fromString(result.archive),
+      headerHash: Buffer32.fromString(result.headerHash),
+      blobCommitmentsHash: Buffer32.fromString(result.blobCommitmentsHash),
+      attestationsHash: Buffer32.fromString(result.attestationsHash),
+      payloadDigest: Buffer32.fromString(result.payloadDigest),
+      slotNumber: SlotNumber.fromBigInt(result.slotNumber),
+      feeHeader: {
+        excessMana: result.feeHeader.excessMana,
+        manaUsed: result.feeHeader.manaUsed,
+        feeAssetPriceNumerator: result.feeHeader.feeAssetPriceNumerator,
+        congestionCost: result.feeHeader.congestionCost,
+        proverCost: result.feeHeader.proverCost,
+      },
+    };
+  }
+
+  /** Returns the pending checkpoint from the rollup contract */
+  getPendingCheckpoint() {
+    // We retry because of race conditions during prunes: we may get a pending checkpoint number which is immediately
+    // reorged out due to a prune happening, causing the subsequent getCheckpoint call to fail. So we try again in that case.
+    return retry(
+      async () => {
+        const pendingCheckpointNumber = await this.getCheckpointNumber();
+        const pendingCheckpoint = await this.getCheckpoint(pendingCheckpointNumber);
+        return pendingCheckpoint;
+      },
+      'getting pending checkpoint',
+      makeBackoff([0.5, 0.5, 0.5]),
+    );
+  }
+
+  async getTips(): Promise<{ pending: CheckpointNumber; proven: CheckpointNumber }> {
+    const { pending, proven } = await this.rollup.read.getTips();
+    return {
+      pending: CheckpointNumber.fromBigInt(pending),
+      proven: CheckpointNumber.fromBigInt(proven),
+    };
+  }
+
+  getTimestampForSlot(slot: SlotNumber): Promise<bigint> {
+    return this.rollup.read.getTimestampForSlot([BigInt(slot)]);
+  }
+
+  async getEntryQueueLength(): Promise<number> {
+    return Number(await this.rollup.read.getEntryQueueLength());
+  }
+
+  async getAvailableValidatorFlushes(): Promise<number> {
+    return Number(await this.rollup.read.getAvailableValidatorFlushes());
+  }
+
+  async getNextFlushableEpoch(): Promise<EpochNumber> {
+    return EpochNumber.fromBigInt(await this.rollup.read.getNextFlushableEpoch());
+  }
+
+  async getCurrentEpochNumber(): Promise<EpochNumber> {
+    return EpochNumber.fromBigInt(await this.rollup.read.getCurrentEpoch());
+  }
+
+  async getEpochNumberForCheckpoint(checkpointNumber: CheckpointNumber): Promise<EpochNumber> {
+    return EpochNumber.fromBigInt(await this.rollup.read.getEpochForCheckpoint([BigInt(checkpointNumber)]));
   }
 
   async getRollupAddresses(): Promise<L1RollupContractAddresses> {
@@ -185,6 +590,7 @@ export class RollupContract {
       rewardDistributorAddress,
       feeJuiceAddress,
       stakingAssetAddress,
+      gseAddress,
     ] = (
       await Promise.all([
         this.rollup.read.getInbox(),
@@ -193,6 +599,7 @@ export class RollupContract {
         this.rollup.read.getRewardDistributor(),
         this.rollup.read.getFeeAsset(),
         this.rollup.read.getStakingAsset(),
+        this.rollup.read.getGSE(),
       ] as const)
     ).map(EthAddress.fromString);
 
@@ -204,25 +611,32 @@ export class RollupContract {
       feeJuiceAddress,
       stakingAssetAddress,
       rewardDistributorAddress,
+      gseAddress,
     };
   }
 
-  public async getEpochNumberForSlotNumber(slotNumber: bigint): Promise<bigint> {
-    return await this.rollup.read.getEpochAtSlot([slotNumber]);
+  public async getFeeJuicePortal() {
+    return EthAddress.fromString(await this.rollup.read.getFeeAssetPortal());
   }
 
-  getEpochProofPublicInputs(
-    args: readonly [bigint, bigint, EpochProofPublicInputArgs, readonly `0x${string}`[], `0x${string}`, `0x${string}`],
-  ) {
-    return this.rollup.read.getEpochProofPublicInputs(args);
+  public async getEpochNumberForSlotNumber(slotNumber: SlotNumber): Promise<EpochNumber> {
+    return EpochNumber.fromBigInt(await this.rollup.read.getEpochAtSlot([BigInt(slotNumber)]));
+  }
+
+  async getEpochProofPublicInputs(
+    args: readonly [bigint, bigint, EpochProofPublicInputArgs, readonly `0x${string}`[], `0x${string}`],
+  ): Promise<Fr[]> {
+    const result = await this.rollup.read.getEpochProofPublicInputs(args);
+    return result.map(Fr.fromString);
   }
 
   public async validateHeader(
     args: readonly [
+      ViemHeader,
+      ViemCommitteeAttestations,
+      `0x${string}`[],
+      ViemSignature,
       `0x${string}`,
-      ViemSignature[],
-      `0x${string}`,
-      bigint,
       `0x${string}`,
       {
         ignoreDA: boolean;
@@ -232,7 +646,13 @@ export class RollupContract {
     account: `0x${string}` | Account,
   ): Promise<void> {
     try {
-      await this.rollup.read.validateHeader(args, { account });
+      await this.client.simulateContract({
+        address: this.address,
+        abi: RollupAbi,
+        functionName: 'validateHeaderWithAttestations',
+        args,
+        account,
+      });
     } catch (error: unknown) {
       throw formatViemError(error);
     }
@@ -244,31 +664,305 @@ export class RollupContract {
    * @dev     Throws if unable to propose
    *
    * @param archive - The archive that we expect to be current state
-   * @return [slot, blockNumber] - If you can propose, the L2 slot number and L2 block number of the next Ethereum block,
+   * @return [slot, checkpointNumber, timeOfNextL1Slot] - If you can propose, the L2 slot number, checkpoint number and
+   * timestamp of the next L1 block
    * @throws otherwise
    */
   public async canProposeAtNextEthBlock(
     archive: Buffer,
     account: `0x${string}` | Account,
-    slotDuration: bigint | number,
-  ): Promise<[bigint, bigint]> {
-    if (typeof slotDuration === 'number') {
-      slotDuration = BigInt(slotDuration);
-    }
-    const timeOfNextL1Slot = (await this.client.getBlock()).timestamp + slotDuration;
+    slotDuration: number,
+    opts: { forcePendingCheckpointNumber?: CheckpointNumber } = {},
+  ): Promise<{ slot: SlotNumber; checkpointNumber: CheckpointNumber; timeOfNextL1Slot: bigint }> {
+    const latestBlock = await this.client.getBlock();
+    const timeOfNextL1Slot = latestBlock.timestamp + BigInt(slotDuration);
+    const who = typeof account === 'string' ? account : account.address;
+
     try {
-      const [slot, blockNumber] = await this.rollup.read.canProposeAtTime(
-        [timeOfNextL1Slot, `0x${archive.toString('hex')}`],
-        { account },
-      );
-      return [slot, blockNumber];
+      const {
+        result: [slot, checkpointNumber],
+      } = await this.client.simulateContract({
+        address: this.address,
+        abi: RollupAbi,
+        functionName: 'canProposeAtTime',
+        args: [timeOfNextL1Slot, `0x${archive.toString('hex')}`, who],
+        account,
+        stateOverride: await this.makePendingCheckpointNumberOverride(opts.forcePendingCheckpointNumber),
+      });
+
+      return {
+        slot: SlotNumber.fromBigInt(slot),
+        checkpointNumber: CheckpointNumber.fromBigInt(checkpointNumber),
+        timeOfNextL1Slot,
+      };
     } catch (err: unknown) {
       throw formatViemError(err);
     }
   }
 
+  /**
+   * Returns a state override that sets the pending checkpoint number to the specified value. Useful for simulations.
+   * Requires querying the current state of the contract to get the current proven checkpoint number, as they are both
+   * stored in the same slot. If the argument is undefined, it returns an empty override.
+   */
+  public async makePendingCheckpointNumberOverride(
+    forcePendingCheckpointNumber: CheckpointNumber | undefined,
+  ): Promise<StateOverride> {
+    if (forcePendingCheckpointNumber === undefined) {
+      return [];
+    }
+    const slot = RollupContract.stfStorageSlot;
+    const currentValue = await this.client.getStorageAt({ address: this.address, slot });
+    const currentProvenCheckpointNumber = currentValue ? hexToBigInt(currentValue) & ((1n << 128n) - 1n) : 0n;
+    const newValue = (BigInt(forcePendingCheckpointNumber) << 128n) | currentProvenCheckpointNumber;
+    return [
+      {
+        address: this.address,
+        stateDiff: [{ slot, value: `0x${newValue.toString(16).padStart(64, '0')}` }],
+      },
+    ];
+  }
+
+  /** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */
+  public buildInvalidateBadAttestationRequest(
+    checkpointNumber: CheckpointNumber,
+    attestationsAndSigners: ViemCommitteeAttestations,
+    committee: EthAddress[],
+    invalidIndex: number,
+  ): L1TxRequest {
+    return {
+      to: this.address,
+      data: encodeFunctionData({
+        abi: RollupAbi,
+        functionName: 'invalidateBadAttestation',
+        args: [
+          BigInt(checkpointNumber),
+          attestationsAndSigners,
+          committee.map(addr => addr.toString()),
+          BigInt(invalidIndex),
+        ],
+      }),
+    };
+  }
+
+  /** Creates a request to Rollup#invalidateInsufficientAttestations to be simulated or sent */
+  public buildInvalidateInsufficientAttestationsRequest(
+    checkpointNumber: CheckpointNumber,
+    attestationsAndSigners: ViemCommitteeAttestations,
+    committee: EthAddress[],
+  ): L1TxRequest {
+    return {
+      to: this.address,
+      data: encodeFunctionData({
+        abi: RollupAbi,
+        functionName: 'invalidateInsufficientAttestations',
+        args: [BigInt(checkpointNumber), attestationsAndSigners, committee.map(addr => addr.toString())],
+      }),
+    };
+  }
+
   /** Calls getHasSubmitted directly. Returns whether the given prover has submitted a proof with the given length for the given epoch. */
-  public getHasSubmittedProof(epochNumber: number, numberOfBlocksInEpoch: number, prover: EthAddress) {
-    return this.rollup.read.getHasSubmitted([BigInt(epochNumber), BigInt(numberOfBlocksInEpoch), prover.toString()]);
+  public getHasSubmittedProof(epochNumber: EpochNumber, numberOfCheckpointsInEpoch: number, prover: Hex | EthAddress) {
+    if (prover instanceof EthAddress) {
+      prover = prover.toString();
+    }
+    return this.rollup.read.getHasSubmitted([BigInt(epochNumber), BigInt(numberOfCheckpointsInEpoch), prover]);
+  }
+
+  getManaMinFeeAt(timestamp: bigint, inFeeAsset: boolean): Promise<bigint> {
+    return this.rollup.read.getManaMinFeeAt([timestamp, inFeeAsset]);
+  }
+
+  async getSlotAt(timestamp: bigint): Promise<SlotNumber> {
+    return SlotNumber.fromBigInt(await this.rollup.read.getSlotAt([timestamp]));
+  }
+
+  async status(checkpointNumber: CheckpointNumber, options?: { blockNumber?: bigint }): Promise<RollupStatusResponse> {
+    await checkBlockTag(options?.blockNumber, this.client);
+    const result = await this.rollup.read.status([BigInt(checkpointNumber)], options);
+    return {
+      provenCheckpointNumber: CheckpointNumber.fromBigInt(result[0]),
+      provenArchive: Fr.fromString(result[1]),
+      pendingCheckpointNumber: CheckpointNumber.fromBigInt(result[2]),
+      pendingArchive: Fr.fromString(result[3]),
+      archiveOfMyCheckpoint: Fr.fromString(result[4]),
+    };
+  }
+
+  async canPruneAtTime(timestamp: bigint, options?: { blockNumber?: bigint }): Promise<boolean> {
+    await checkBlockTag(options?.blockNumber, this.client);
+    return this.rollup.read.canPruneAtTime([timestamp], options);
+  }
+
+  async archive(): Promise<Fr> {
+    return Fr.fromString(await this.rollup.read.archive());
+  }
+
+  async archiveAt(checkpointNumber: CheckpointNumber): Promise<Fr> {
+    return Fr.fromString(await this.rollup.read.archiveAt([BigInt(checkpointNumber)]));
+  }
+
+  getSequencerRewards(address: Hex | EthAddress): Promise<bigint> {
+    if (address instanceof EthAddress) {
+      address = address.toString();
+    }
+    return this.rollup.read.getSequencerRewards([address]);
+  }
+
+  getSpecificProverRewardsForEpoch(epoch: bigint, prover: Hex | EthAddress): Promise<bigint> {
+    if (prover instanceof EthAddress) {
+      prover = prover.toString();
+    }
+    return this.rollup.read.getSpecificProverRewardsForEpoch([epoch, prover]);
+  }
+
+  async getAttesters(): Promise<EthAddress[]> {
+    const attesterSize = await this.getActiveAttesterCount();
+    const gse = new GSEContract(this.client, await this.getGSE());
+    const ts = (await this.client.getBlock()).timestamp;
+
+    const indices = Array.from({ length: attesterSize }, (_, i) => BigInt(i));
+    const chunks = chunk(indices, 1000);
+
+    const results = await Promise.all(chunks.map(chunk => gse.getAttestersFromIndicesAtTime(this.address, ts, chunk)));
+    return results.flat().map(addr => EthAddress.fromString(addr));
+  }
+
+  async getAttesterView(address: Hex | EthAddress): Promise<AttesterView> {
+    if (address instanceof EthAddress) {
+      address = address.toString();
+    }
+    const result = await this.rollup.read.getAttesterView([address]);
+    return {
+      status: result.status as AttesterStatus,
+      effectiveBalance: result.effectiveBalance,
+      exit: {
+        withdrawalId: result.exit.withdrawalId,
+        amount: result.exit.amount,
+        exitableAt: result.exit.exitableAt,
+        recipientOrWithdrawer: EthAddress.fromString(result.exit.recipientOrWithdrawer),
+        isRecipient: result.exit.isRecipient,
+        exists: result.exit.exists,
+      },
+      config: {
+        publicKey: {
+          x: result.config.publicKey.x,
+          y: result.config.publicKey.y,
+        },
+        withdrawer: EthAddress.fromString(result.config.withdrawer),
+      },
+    };
+  }
+
+  async getStatus(address: Hex | EthAddress): Promise<AttesterStatus> {
+    if (address instanceof EthAddress) {
+      address = address.toString();
+    }
+    return (await this.rollup.read.getStatus([address])) as AttesterStatus;
+  }
+
+  async getBlobCommitmentsHash(checkpointNumber: CheckpointNumber): Promise<Buffer32> {
+    return Buffer32.fromString(await this.rollup.read.getBlobCommitmentsHash([BigInt(checkpointNumber)]));
+  }
+
+  async getCurrentBlobCommitmentsHash(): Promise<Buffer32> {
+    return Buffer32.fromString(await this.rollup.read.getCurrentBlobCommitmentsHash());
+  }
+
+  async getStakingAsset(): Promise<EthAddress> {
+    return EthAddress.fromString(await this.rollup.read.getStakingAsset());
+  }
+
+  async getRewardConfig(): Promise<RewardConfig> {
+    const result = await this.rollup.read.getRewardConfig();
+    return {
+      rewardDistributor: EthAddress.fromString(result.rewardDistributor),
+      sequencerBps: BigInt(result.sequencerBps),
+      booster: EthAddress.fromString(result.booster),
+      checkpointReward: result.checkpointReward,
+    };
+  }
+
+  setupEpoch(l1TxUtils: L1TxUtils) {
+    return l1TxUtils.sendAndMonitorTransaction({
+      to: this.address,
+      data: encodeFunctionData({
+        abi: RollupAbi,
+        functionName: 'setupEpoch',
+        args: [],
+      }),
+    });
+  }
+
+  vote(l1TxUtils: L1TxUtils, proposalId: bigint) {
+    return l1TxUtils.sendAndMonitorTransaction({
+      to: this.address,
+      data: encodeFunctionData({
+        abi: RollupAbi,
+        functionName: 'vote',
+        args: [proposalId],
+      }),
+    });
+  }
+
+  public listenToSlasherChanged(
+    callback: (args: { oldSlasher: `0x${string}`; newSlasher: `0x${string}` }) => unknown,
+  ): WatchContractEventReturnType {
+    return this.rollup.watchEvent.SlasherUpdated(
+      {},
+      {
+        onLogs: logs => {
+          for (const log of logs) {
+            const args = log.args;
+            if (args.oldSlasher && args.newSlasher) {
+              callback(args as { oldSlasher: `0x${string}`; newSlasher: `0x${string}` });
+            }
+          }
+        },
+      },
+    );
+  }
+
+  public listenToCheckpointInvalidated(
+    callback: (args: { checkpointNumber: CheckpointNumber }) => unknown,
+  ): WatchContractEventReturnType {
+    return this.rollup.watchEvent.CheckpointInvalidated(
+      {},
+      {
+        onLogs: logs => {
+          for (const log of logs) {
+            const args = log.args;
+            if (args.checkpointNumber !== undefined) {
+              callback({ checkpointNumber: CheckpointNumber.fromBigInt(args.checkpointNumber) });
+            }
+          }
+        },
+      },
+    );
+  }
+
+  public async getSlashEvents(l1BlockHash: Hex): Promise<{ amount: bigint; attester: EthAddress }[]> {
+    const events = await this.rollup.getEvents.Slashed({}, { blockHash: l1BlockHash, strict: true });
+    return events.map(event => ({
+      amount: event.args.amount!,
+      attester: EthAddress.fromString(event.args.attester!),
+    }));
+  }
+
+  public listenToSlash(
+    callback: (args: { amount: bigint; attester: EthAddress }) => unknown,
+  ): WatchContractEventReturnType {
+    return this.rollup.watchEvent.Slashed(
+      {},
+      {
+        strict: true,
+        onLogs: logs => {
+          for (const log of logs) {
+            const args = log.args;
+            callback({ amount: args.amount!, attester: EthAddress.fromString(args.attester!) });
+          }
+        },
+      },
+    );
   }
 }