@aztec/slasher 0.0.1-commit.e2b2873ed → 0.0.1-commit.e304674f1

package/src/slash_offenses_collector.ts

@@ -1,15 +1,20 @@
+import type { SlotNumber } from '@aztec/foundation/branded-types';
 import { createLogger } from '@aztec/foundation/log';
 import type { Prettify } from '@aztec/foundation/types';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
-import { type Offense, type OffenseIdentifier, getSlotForOffense } from '@aztec/stdlib/slashing';
+import { type Offense, getSlotForOffense } from '@aztec/stdlib/slashing';
 
 import type { SlasherOffensesStore } from './stores/offenses_store.js';
 import { WANT_TO_SLASH_EVENT, type WantToSlashArgs, type Watcher } from './watcher.js';
 
 export type SlashOffensesCollectorConfig = Prettify<Pick<SlasherConfig, 'slashGracePeriodL2Slots'>>;
 export type SlashOffensesCollectorSettings = Prettify<
-  Pick<L1RollupConstants, 'epochDuration'> & { slashingAmounts: [bigint, bigint, bigint] | undefined }
+  Pick<L1RollupConstants, 'epochDuration'> & {
+    slashingAmounts: [bigint, bigint, bigint] | undefined;
+    /** L2 slot at which the rollup was registered as canonical in the Registry. Used to anchor the slash grace period. */
+    rollupRegisteredAtL2Slot: SlotNumber;
+  }
 >;
 
 /**
@@ -61,20 +66,20 @@ export class SlashOffensesCollector {
    */
   public async handleWantToSlash(args: WantToSlashArgs[]) {
     for (const arg of args) {
-      const pendingOffense: Offense = {
+      const offense: Offense = {
         validator: arg.validator,
         amount: arg.amount,
         offenseType: arg.offenseType,
         epochOrSlot: arg.epochOrSlot,
       };
 
-      if (this.shouldSkipOffense(pendingOffense)) {
-        this.log.verbose('Skipping offense during grace period', pendingOffense);
+      if (this.shouldSkipOffense(offense)) {
+        this.log.verbose('Skipping offense during grace period', offense);
         continue;
       }
 
-      if (await this.offensesStore.hasOffense(pendingOffense)) {
-        this.log.debug('Skipping repeated offense', pendingOffense);
+      if (await this.offensesStore.hasOffense(offense)) {
+        this.log.debug('Skipping repeated offense', offense);
         continue;
       }
 
@@ -85,12 +90,8 @@ export class SlashOffensesCollector {
         }
       }
 
-      this.log.info(`Adding pending offense for validator ${arg.validator}`, {
-        ...pendingOffense,
-        epochOrSlot: pendingOffense.epochOrSlot.toString(),
-        amount: pendingOffense.amount.toString(),
-      });
-      await this.offensesStore.addPendingOffense(pendingOffense);
+      this.log.info(`Adding pending offense for validator ${arg.validator}`, offense);
+      await this.offensesStore.addOffense(offense);
     }
   }
 
@@ -105,18 +106,9 @@ export class SlashOffensesCollector {
     }
   }
 
-  /**
-   * Marks offenses as slashed (no longer pending)
-   * @param offenses - The offenses to mark as slashed
-   */
-  public markAsSlashed(offenses: OffenseIdentifier[]) {
-    this.log.verbose(`Marking offenses as slashed`, { offenses });
-    return this.offensesStore.markAsSlashed(offenses);
-  }
-
-  /** Returns whether to skip an offense if it happened during the grace period at the beginning of the chain */
+  /** Returns whether to skip an offense if it happened during the grace period after the network upgrade */
   private shouldSkipOffense(offense: Offense): boolean {
     const offenseSlot = getSlotForOffense(offense, this.settings);
-    return offenseSlot < this.config.slashGracePeriodL2Slots;
+    return offenseSlot < this.settings.rollupRegisteredAtL2Slot + this.config.slashGracePeriodL2Slots;
   }
 }

package/src/{tally_slasher_client.ts → slasher_client.ts}

@@ -1,6 +1,6 @@
 import { EthAddress } from '@aztec/aztec.js/addresses';
 import type { EpochCache } from '@aztec/epoch-cache';
-import { RollupContract, SlasherContract, TallySlashingProposerContract } from '@aztec/ethereum/contracts';
+import { RollupContract, SlasherContract, SlashingProposerContract } from '@aztec/ethereum/contracts';
 import { maxBigint } from '@aztec/foundation/bigint';
 import { SlotNumber } from '@aztec/foundation/branded-types';
 import { compactArray, partition, times } from '@aztec/foundation/collection';
@@ -13,7 +13,6 @@ import {
   OffenseType,
   type ProposerSlashAction,
   type ProposerSlashActionProvider,
-  type SlashPayloadRound,
   getEpochsForRound,
   getSlashConsensusVotesFromOffenses,
 } from '@aztec/stdlib/slashing';
@@ -30,8 +29,8 @@ import type { SlasherClientInterface } from './slasher_client_interface.js';
 import type { SlasherOffensesStore } from './stores/offenses_store.js';
 import type { Watcher } from './watcher.js';
 
-/** Settings used in the tally slasher client, loaded from the L1 contracts during initialization */
-export type TallySlasherSettings = Prettify<
+/** Settings used in the slasher client, loaded from the L1 contracts during initialization */
+export type SlasherSettings = Prettify<
   SlashRoundMonitorSettings &
     SlashOffensesCollectorSettings & {
       slashingLifetimeInRounds: number;
@@ -45,11 +44,14 @@ export type TallySlasherSettings = Prettify<
     }
 >;
 
-export type TallySlasherClientConfig = SlashOffensesCollectorConfig &
-  Pick<SlasherConfig, 'slashValidatorsAlways' | 'slashValidatorsNever' | 'slashExecuteRoundsLookBack'>;
+export type SlasherClientConfig = SlashOffensesCollectorConfig &
+  Pick<
+    SlasherConfig,
+    'slashValidatorsAlways' | 'slashValidatorsNever' | 'slashExecuteRoundsLookBack' | 'slashMaxPayloadSize'
+  >;
 
 /**
- * The Tally Slasher client is responsible for managing slashable offenses using
+ * The Slasher client is responsible for managing slashable offenses using
  * the consensus-based slashing model where proposers vote on individual validator offenses.
  *
  * The client subscribes to several slash watchers that emit offenses and tracks them. When the slasher is the
@@ -73,22 +75,16 @@ export type TallySlasherClientConfig = SlashOffensesCollectorConfig &
  * - Validators that reach the quorum threshold are slashed. A vote for slashing N units is also considered
  * a vote for slashing N-1, N-2, ..., 1 units. The system slashes for the largest amount that reaches quorum.
  * - The client monitors executable rounds and triggers execution when appropriate.
- *
- * Differences from Empire model
- * - No fixed slash payloads - votes are for individual validator offenses encoded in bytes
- * - The L1 contract determines which offenses reach quorum rather than nodes agreeing on a payload
- * - Proposers vote directly on which validators to slash and by how much
- * - Uses a slash offset to vote on validators from past rounds (e.g., round N votes on round N-2)
  */
-export class TallySlasherClient implements ProposerSlashActionProvider, SlasherClientInterface {
+export class SlasherClient implements ProposerSlashActionProvider, SlasherClientInterface {
   protected unwatchCallbacks: (() => void)[] = [];
   protected roundMonitor: SlashRoundMonitor;
   protected offensesCollector: SlashOffensesCollector;
 
   constructor(
-    private config: TallySlasherClientConfig,
-    private settings: TallySlasherSettings,
-    private tallySlashingProposer: TallySlashingProposerContract,
+    private config: SlasherClientConfig,
+    private settings: SlasherSettings,
+    private slashingProposer: SlashingProposerContract,
     private slasher: SlasherContract,
     private rollup: RollupContract,
     watchers: Watcher[],
@@ -102,14 +98,14 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
   }
 
   public async start() {
-    this.log.debug('Starting Tally Slasher client...');
+    this.log.debug('Starting slasher client...');
 
     this.roundMonitor.start();
     await this.offensesCollector.start();
 
     // Listen for RoundExecuted events
     this.unwatchCallbacks.push(
-      this.tallySlashingProposer.listenToRoundExecuted(
+      this.slashingProposer.listenToRoundExecuted(
         ({ round, slashCount, l1BlockHash }) =>
           void this.handleRoundExecuted(round, slashCount, l1BlockHash).catch(err =>
             this.log.error('Error handling round executed', err),
@@ -120,15 +116,13 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
     // Check for round changes
     this.unwatchCallbacks.push(this.roundMonitor.listenToNewRound(round => this.handleNewRound(round)));
 
-    this.log.info(`Started tally slasher client`);
+    this.log.info(`Started slasher client`);
     return Promise.resolve();
   }
 
-  /**
-   * Stop the tally slasher client
-   */
+  /** Stop the slasher client */
   public async stop() {
-    this.log.debug('Stopping Tally Slasher client...');
+    this.log.debug('Stopping slasher client...');
 
     for (const unwatchCallback of this.unwatchCallbacks) {
       unwatchCallback();
@@ -137,7 +131,7 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
     this.roundMonitor.stop();
     await this.offensesCollector.stop();
 
-    this.log.info('Tally Slasher client stopped');
+    this.log.info('Slasher client stopped');
   }
 
   /** Returns the current config */
@@ -152,11 +146,11 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
 
   /** Triggered on a time basis when we enter a new slashing round. Clears expired offenses. */
   protected async handleNewRound(round: bigint) {
-    this.log.info(`Starting new tally slashing round ${round}`);
+    this.log.info(`Starting new slashing round ${round}`);
     await this.offensesCollector.handleNewRound(round);
   }
 
-  /** Called when we see a RoundExecuted event on the TallySlashingProposer (just for logging). */
+  /** Called when we see a RoundExecuted event on the SlashingProposer (just for logging). */
   protected async handleRoundExecuted(round: bigint, slashCount: bigint, l1BlockHash: Hex) {
     const slashes = await this.rollup.getSlashEvents(l1BlockHash);
     this.log.info(`Slashing round ${round} has been executed with ${slashCount} slashes`, { slashes });
@@ -237,7 +231,7 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
     this.log.debug(`Testing if slashing round ${executableRound} is executable`, logData);
 
     try {
-      const roundInfo = await this.tallySlashingProposer.getRound(executableRound);
+      const roundInfo = await this.slashingProposer.getRound(executableRound);
       logData = { ...logData, roundInfo };
       if (roundInfo.isExecuted) {
         this.log.verbose(`Round ${executableRound} has already been executed`, logData);
@@ -251,7 +245,7 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
       }
 
       // Check if round is ready to execute at the given slot
-      const isReadyToExecute = await this.tallySlashingProposer.isRoundReadyToExecute(executableRound, slotNumber);
+      const isReadyToExecute = await this.slashingProposer.isRoundReadyToExecute(executableRound, slotNumber);
       if (!isReadyToExecute) {
         this.log.warn(
           `Round ${executableRound} is not ready to execute at slot ${slotNumber} according to contract check`,
@@ -261,14 +255,14 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
       }
 
       // Check if the round yields any slashing at all
-      const { actions: slashActions, committees } = await this.tallySlashingProposer.getTally(executableRound);
+      const { actions: slashActions, committees } = await this.slashingProposer.getTally(executableRound);
       if (slashActions.length === 0) {
         this.log.verbose(`Round ${executableRound} does not resolve in any slashing`, logData);
         return undefined;
       }
 
       // Check if the slash payload is vetoed
-      const payload = await this.tallySlashingProposer.getPayload(executableRound);
+      const payload = await this.slashingProposer.getPayload(executableRound);
       const isVetoed = await this.slasher.isPayloadVetoed(payload.address);
       if (isVetoed) {
         this.log.warn(`Round ${executableRound} payload is vetoed (skipping execution)`, {
@@ -349,24 +343,22 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
       return undefined;
     }
 
-    const offensesToSlashLog = offensesToSlash.map(offense => ({
-      ...offense,
-      amount: offense.amount.toString(),
-    }));
     this.log.info(`Voting to slash ${offensesToSlash.length} offenses`, {
       slotNumber,
       currentRound,
       slashedRound,
-      offensesToSlash: offensesToSlashLog,
+      offensesToSlash,
     });
 
     const committees = await this.collectCommitteesActiveDuringRound(slashedRound);
     const epochsForCommittees = getEpochsForRound(slashedRound, this.settings);
+    const { slashMaxPayloadSize } = this.config;
     const votes = getSlashConsensusVotesFromOffenses(
       offensesToSlash,
       committees,
       epochsForCommittees.map(e => BigInt(e)),
-      this.settings,
+      { ...this.settings, maxSlashedValidators: slashMaxPayloadSize },
+      this.log,
     );
     if (votes.every(v => v === 0)) {
       this.log.warn(`Computed votes for offenses are all zero. Skipping vote.`, {
@@ -404,17 +396,9 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
     );
   }
 
-  /**
-   * Get slash payloads is NOT SUPPORTED in tally model
-   * @throws Error indicating this operation is not supported
-   */
-  public getSlashPayloads(): Promise<SlashPayloadRound[]> {
-    return Promise.reject(new Error('Tally slashing model does not support slash payloads'));
-  }
-
   /**
    * Gather offenses to be slashed on a given round.
-   * In tally slashing, round N slashes validators from round N - slashOffsetInRounds.
+   * Round N slashes validators from round N - slashOffsetInRounds.
    * @param round - The round to get offenses for, defaults to current round
    * @returns Array of pending offenses for the round with offset applied
    */
@@ -427,9 +411,9 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
     return await this.offensesStore.getOffensesForRound(targetRound);
   }
 
-  /** Returns all pending offenses stored */
-  public getPendingOffenses(): Promise<Offense[]> {
-    return this.offensesStore.getPendingOffenses();
+  /** Returns all offenses stored */
+  public getOffenses(): Promise<Offense[]> {
+    return this.offensesStore.getOffenses();
   }
 
   /**

package/src/slasher_client_facade.ts

@@ -2,13 +2,12 @@ import { EpochCache } from '@aztec/epoch-cache';
 import { RollupContract } from '@aztec/ethereum/contracts';
 import type { ViemClient } from '@aztec/ethereum/types';
 import type { SlotNumber } from '@aztec/foundation/branded-types';
-import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { AztecLMDBStoreV2 } from '@aztec/kv-store/lmdb-v2';
 import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
-import type { Offense, ProposerSlashAction, SlashPayloadRound } from '@aztec/stdlib/slashing';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
+import type { Offense, ProposerSlashAction } from '@aztec/stdlib/slashing';
 
 import { createSlasherImplementation } from './factory/create_implementation.js';
 import type { SlasherClientInterface } from './slasher_client_interface.js';
@@ -27,11 +26,11 @@ export class SlasherClientFacade implements SlasherClientInterface {
     private config: SlasherConfig & DataStoreConfig & { ethereumSlotDuration: number },
     private rollup: RollupContract,
     private l1Client: ViemClient,
-    private slashFactoryAddress: EthAddress | undefined,
     private watchers: Watcher[],
     private epochCache: EpochCache,
     private dateProvider: DateProvider,
     private kvStore: AztecLMDBStoreV2,
+    private rollupRegisteredAtL2Slot: SlotNumber,
     private logger = createLogger('slasher'),
   ) {}
 
@@ -62,16 +61,12 @@ export class SlasherClientFacade implements SlasherClientInterface {
     this.watchers.forEach(watcher => watcher.updateConfig?.(config));
   }
 
-  public getSlashPayloads(): Promise<SlashPayloadRound[]> {
-    return this.client?.getSlashPayloads() ?? Promise.reject(new Error('Slasher client not initialized'));
-  }
-
   public gatherOffensesForRound(round?: bigint): Promise<Offense[]> {
     return this.client?.gatherOffensesForRound(round) ?? Promise.reject(new Error('Slasher client not initialized'));
   }
 
-  public getPendingOffenses(): Promise<Offense[]> {
-    return this.client?.getPendingOffenses() ?? Promise.reject(new Error('Slasher client not initialized'));
+  public getOffenses(): Promise<Offense[]> {
+    return this.client?.getOffenses() ?? Promise.reject(new Error('Slasher client not initialized'));
   }
 
   public getProposerActions(slotNumber: SlotNumber): Promise<ProposerSlashAction[]> {
@@ -83,11 +78,11 @@ export class SlasherClientFacade implements SlasherClientInterface {
       this.config,
       this.rollup,
       this.l1Client,
-      this.slashFactoryAddress,
       this.watchers,
       this.epochCache,
       this.dateProvider,
       this.kvStore,
+      this.rollupRegisteredAtL2Slot,
       this.logger,
     );
   }

package/src/slasher_client_interface.ts

@@ -1,11 +1,8 @@
 import type { SlotNumber } from '@aztec/foundation/branded-types';
 import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
-import type { Offense, ProposerSlashAction, SlashPayloadRound } from '@aztec/stdlib/slashing';
+import type { Offense, ProposerSlashAction } from '@aztec/stdlib/slashing';
 
-/**
- * Common interface for slasher clients used by the Aztec node.
- * Both Empire and Consensus slasher clients implement this interface.
- */
+/** Common interface for slasher clients used by the Aztec node. */
 export interface SlasherClientInterface {
   /** Start the slasher client */
   start(): Promise<void>;
@@ -13,25 +10,13 @@ export interface SlasherClientInterface {
   /** Stop the slasher client */
   stop(): Promise<void>;
 
-  /**
-   * Get slash payloads for the Empire model.
-   * The Consensus model should throw an error when this is called.
-   */
-  getSlashPayloads(): Promise<SlashPayloadRound[]>;
-
-  /**
-   * Gather offenses for a given round, defaults to current.
-   * Used by both Empire and Consensus models.
-   */
+  /** Gather offenses for a given round, defaults to current. */
   gatherOffensesForRound(round?: bigint): Promise<Offense[]>;
 
-  /** Returns all pending offenses */
-  getPendingOffenses(): Promise<Offense[]>;
+  /** Returns all offenses */
+  getOffenses(): Promise<Offense[]>;
 
-  /**
-   * Update the configuration.
-   * Used by both Empire and Consensus models.
-   */
+  /** Update the configuration. */
   updateConfig(config: Partial<SlasherConfig>): void;
 
   /**

package/src/stores/offenses_store.ts

@@ -1,5 +1,5 @@
 import { createLogger } from '@aztec/aztec.js/log';
-import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncMultiMap, AztecAsyncSet } from '@aztec/kv-store';
+import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncMultiMap } from '@aztec/kv-store';
 import {
   type Offense,
   type OffenseIdentifier,
@@ -14,10 +14,7 @@ export class SlasherOffensesStore {
   /** Map from offense key to offense data */
   private offenses: AztecAsyncMap<string, Buffer>;
 
-  /** Map from offense key to whether the offense has been executed (only used for empire based slashing) */
-  private offensesSlashed: AztecAsyncSet<string>;
-
-  /** Multimap from round to offense keys (only used for consensus based slashing) */
+  /** Multimap from round to offense keys */
   private roundsOffenses: AztecAsyncMultiMap<string, string>;
 
   private log = createLogger('slasher:store:offenses');
@@ -32,18 +29,13 @@ export class SlasherOffensesStore {
   ) {
     this.offenses = kvStore.openMap('offenses');
     this.roundsOffenses = kvStore.openMultiMap('rounds-offenses');
-    this.offensesSlashed = kvStore.openSet('offenses-slashed');
   }
 
-  /** Returns all offenses not marked as slashed */
-  public async getPendingOffenses(): Promise<Offense[]> {
+  /** Returns all offenses */
+  public async getOffenses(): Promise<Offense[]> {
     const offenses: Offense[] = [];
-    for await (const [key, buffer] of this.offenses.entriesAsync()) {
-      if (await this.offensesSlashed.hasAsync(key)) {
-        continue; // Skip executed offenses
-      }
-      const offense = deserializeOffense(buffer);
-      offenses.push(offense);
+    for await (const [, buffer] of this.offenses.entriesAsync()) {
+      offenses.push(deserializeOffense(buffer));
     }
     return offenses;
   }
@@ -61,20 +53,14 @@ export class SlasherOffensesStore {
     return offenses;
   }
 
-  /** Returns whether an offense is pending (ie not marked as slashed) */
-  public async hasPendingOffense(offense: OffenseIdentifier): Promise<boolean> {
-    const key = this.getOffenseKey(offense);
-    return (await this.offenses.getAsync(key)) !== undefined && !(await this.offensesSlashed.hasAsync(key));
-  }
-
   /** Returns whether we have seen this offense */
   public async hasOffense(offense: OffenseIdentifier): Promise<boolean> {
     const key = this.getOffenseKey(offense);
     return (await this.offenses.getAsync(key)) !== undefined;
   }
 
-  /** Adds a new offense (defaults to pending, but will be slashed if markAsSlashed had been called for it) */
-  public async addPendingOffense(offense: Offense): Promise<void> {
+  /** Adds a new offense */
+  public async addOffense(offense: Offense): Promise<void> {
     const key = this.getOffenseKey(offense);
     const round = getRoundForOffense(offense, this.settings);
     await this.kvStore.transactionAsync(async () => {
@@ -84,16 +70,6 @@ export class SlasherOffensesStore {
     this.log.trace(`Adding pending offense ${key} for round ${round}`);
   }
 
-  /** Marks the given offenses as slashed (regardless of whether they are known or not)  */
-  public async markAsSlashed(offenses: OffenseIdentifier[]): Promise<void> {
-    await this.kvStore.transactionAsync(async () => {
-      for (const offense of offenses) {
-        const key = this.getOffenseKey(offense);
-        await this.offensesSlashed.add(key);
-      }
-    });
-  }
-
   /** Prunes all offenses expired from the store */
   public async clearExpiredOffenses(currentRound: bigint): Promise<number> {
     const expirationRounds = this.settings.slashOffenseExpirationRounds ?? 0;
@@ -125,7 +101,6 @@ export class SlasherOffensesStore {
       for (const key of expiredOffenseKeys) {
         this.log.trace(`Deleting offense ${key}`);
         await this.offenses.delete(key);
-        await this.offensesSlashed.delete(key);
       }
       for (const roundKey of expiredRoundKeys) {
         this.log.trace(`Deleting round info for ${roundKey}`);

package/src/watchers/epoch_prune_watcher.ts

@@ -132,9 +132,9 @@ export class EpochPruneWatcher extends (EventEmitter as new () => WatcherEmitter
     const blocksByCheckpoint = chunkBy(sortedBlocks, b => b.checkpointNumber);
 
     // Get prior checkpoints in the epoch (in case this was a partial prune) to extract the out hashes
-    const priorCheckpointOutHashes = (await this.l2BlockSource.getCheckpointsForEpoch(epochNumber))
-      .filter(c => c.number < sortedBlocks[0].checkpointNumber)
-      .map(c => c.getCheckpointOutHash());
+    const priorCheckpointOutHashes = (await this.l2BlockSource.getCheckpointsDataForEpoch(epochNumber))
+      .filter(c => c.checkpointNumber < sortedBlocks[0].checkpointNumber)
+      .map(c => c.checkpointOutHash);
     let previousCheckpointOutHashes: Fr[] = [...priorCheckpointOutHashes];
 
     const fork = await this.checkpointsBuilder.getFork(
@@ -172,6 +172,7 @@ export class EpochPruneWatcher extends (EventEmitter as new () => WatcherEmitter
       chainId: gv.chainId,
       version: gv.version,
       slotNumber: gv.slotNumber,
+      timestamp: gv.timestamp,
       coinbase: gv.coinbase,
       feeRecipient: gv.feeRecipient,
       gasFees: gv.gasFees,
@@ -181,6 +182,7 @@ export class EpochPruneWatcher extends (EventEmitter as new () => WatcherEmitter
     const checkpointBuilder = await this.checkpointsBuilder.startCheckpoint(
       checkpointNumber,
       constants,
+      0n, // feeAssetPriceModifier is not used for validation of the checkpoint content
       l1ToL2Messages,
       previousCheckpointOutHashes,
       fork,
@@ -209,7 +211,10 @@ export class EpochPruneWatcher extends (EventEmitter as new () => WatcherEmitter
     }
 
     const gv = blockFromL1.header.globalVariables;
-    const { block, failedTxs, numTxs } = await checkpointBuilder.buildBlock(txs, gv.blockNumber, gv.timestamp, {});
+    const { block, failedTxs, numTxs } = await checkpointBuilder.buildBlock(txs, gv.blockNumber, gv.timestamp, {
+      isBuildingProposal: false,
+      minValidTxs: 0,
+    });
 
     if (numTxs !== txs.length) {
       // This should be detected by state mismatch, but this makes it easier to debug.