@aztec/slasher 2.0.3-rc.17 → 2.0.3-rc.18

package/dest/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAQnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAErE,YAAY,EAAE,aAAa,EAAE,CAAC;AAE9B,eAAO,MAAM,oBAAoB,EAAE,aAmBlC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,kBAAkB,CAAC,aAAa,CAoHnE,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAQnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAErE,YAAY,EAAE,aAAa,EAAE,CAAC;AAE9B,eAAO,MAAM,oBAAoB,EAAE,aAoBlC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,kBAAkB,CAAC,aAAa,CAyHnE,CAAC"}

package/dest/config.js

@@ -19,6 +19,7 @@ export const DefaultSlasherConfig = {
     slashOffenseExpirationRounds: 4,
     slashMaxPayloadSize: 50,
     slashGracePeriodL2Slots: 0,
+    slashExecuteRoundsLookBack: 4,
     slashSelfAllowed: false
 };
 export const slasherConfigMappings = {
@@ -62,7 +63,7 @@ export const slasherConfigMappings = {
     },
     slashBroadcastedInvalidBlockPenalty: {
         env: 'SLASH_INVALID_BLOCK_PENALTY',
-        description: 'Penalty amount for slashing a validator for an invalid block.',
+        description: 'Penalty amount for slashing a validator for an invalid block proposed via p2p.',
         ...bigintConfigHelper(DefaultSlasherConfig.slashBroadcastedInvalidBlockPenalty)
     },
     slashInactivityTargetPercentage: {
@@ -121,6 +122,11 @@ export const slasherConfigMappings = {
         env: 'SLASH_GRACE_PERIOD_L2_SLOTS',
         ...numberConfigHelper(DefaultSlasherConfig.slashGracePeriodL2Slots)
     },
+    slashExecuteRoundsLookBack: {
+        env: 'SLASH_EXECUTE_ROUNDS_LOOK_BACK',
+        description: 'How many rounds to look back when searching for a round to execute.',
+        ...numberConfigHelper(DefaultSlasherConfig.slashExecuteRoundsLookBack)
+    },
     slashSelfAllowed: {
         description: 'Whether to allow slashes to own validators',
         ...booleanConfigHelper(DefaultSlasherConfig.slashSelfAllowed)

package/dest/tally_slasher_client.d.ts

@@ -21,7 +21,7 @@ export type TallySlasherSettings = Prettify<SlashRoundMonitorSettings & SlashOff
     /** Committee size for block proposal */
     targetCommitteeSize: number;
 }>;
-export type TallySlasherClientConfig = SlashOffensesCollectorConfig & Pick<SlasherConfig, 'slashValidatorsAlways' | 'slashValidatorsNever'>;
+export type TallySlasherClientConfig = SlashOffensesCollectorConfig & Pick<SlasherConfig, 'slashValidatorsAlways' | 'slashValidatorsNever' | 'slashExecuteRoundsLookBack'>;
 /**
  * The Tally Slasher client is responsible for managing slashable offenses using
  * the consensus-based slashing model where proposers vote on individual validator offenses.
@@ -87,8 +87,16 @@ export declare class TallySlasherClient implements ProposerSlashActionProvider,
      * @returns The actions to take
      */
     getProposerActions(slotNumber: bigint): Promise<ProposerSlashAction[]>;
-    /** Returns an execute slash action if there are any rounds ready to be executed */
+    /**
+     * Returns an execute slash action if there are any rounds ready to be executed.
+     * Returns the oldest slash action if there are multiple rounds pending execution.
+     */
     protected getExecuteSlashAction(slotNumber: bigint): Promise<ProposerSlashAction | undefined>;
+    /**
+     * Checks if a given round is executable and returns an execute-slash action for it if so.
+     * Assumes round number has already been checked against lifetime and execution delay.
+     */
+    private tryGetRoundExecuteAction;
     /** Returns a vote action based on offenses from the target round (with offset applied) */
     protected getVoteOffensesAction(slotNumber: bigint): Promise<ProposerSlashAction | undefined>;
     /** Returns the committees that were active during the timespan of a given round */

package/dest/tally_slasher_client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tally_slasher_client.d.ts","sourceRoot":"","sources":["../src/tally_slasher_client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tally_slasher_client.d.ts","sourceRoot":"","sources":["../src/tally_slasher_client.ts"],"names":[],"mappings":"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"}

package/dest/tally_slasher_client.js

@@ -1,4 +1,5 @@
 import { EthAddress } from '@aztec/aztec.js';
+import { maxBigint } from '@aztec/foundation/bigint';
 import { compactArray, partition, times } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
@@ -120,19 +121,51 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
             voteAction
         ]);
     }
-    /** Returns an execute slash action if there are any rounds ready to be executed */ async getExecuteSlashAction(slotNumber) {
+    /**
+   * Returns an execute slash action if there are any rounds ready to be executed.
+   * Returns the oldest slash action if there are multiple rounds pending execution.
+   */ async getExecuteSlashAction(slotNumber) {
         const { round: currentRound } = this.roundMonitor.getRoundForSlot(slotNumber);
         const slashingExecutionDelayInRounds = BigInt(this.settings.slashingExecutionDelayInRounds);
         const executableRound = currentRound - slashingExecutionDelayInRounds - 1n;
-        if (executableRound < 0n) {
+        const lookBack = BigInt(this.config.slashExecuteRoundsLookBack);
+        const oldestExecutableRound = maxBigint(0n, executableRound - lookBack);
+        // Check if slashing is enabled at all
+        if (!await this.slasher.isSlashingEnabled()) {
+            this.log.warn(`Slashing is disabled in the Slasher contract (skipping execution)`);
             return undefined;
         }
-        let logData = {
+        this.log.debug(`Checking slashing rounds ${oldestExecutableRound} to ${executableRound} to execute`, {
+            slotNumber,
             currentRound,
+            oldestExecutableRound,
             executableRound,
-            slotNumber
+            slashingExecutionDelayInRounds,
+            lookBack,
+            slashingLifetimeInRounds: this.settings.slashingLifetimeInRounds
+        });
+        // Iterate over all rounds, starting from the oldest, until we find one that is executable
+        for(let roundToCheck = oldestExecutableRound; roundToCheck <= executableRound; roundToCheck++){
+            const action = await this.tryGetRoundExecuteAction(roundToCheck);
+            if (action) {
+                return action;
+            }
+        }
+        // And return nothing if none are found
+        return undefined;
+    }
+    /**
+   * Checks if a given round is executable and returns an execute-slash action for it if so.
+   * Assumes round number has already been checked against lifetime and execution delay.
+   */ async tryGetRoundExecuteAction(executableRound) {
+        let logData = {
+            executableRound
         };
+        this.log.debug(`Testing if slashing round ${executableRound} is executable`, logData);
         try {
+            // Note we do not check isReadyToExecute here, since we already know that based on the
+            // executableRound number. Not just that, but it may be that we are building for the given slot number
+            // that is in the future, so the contract may think it's not yet ready to execute, whereas it is.
             const roundInfo = await this.tallySlashingProposer.getRound(executableRound);
             logData = {
                 ...logData,
@@ -141,9 +174,6 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
             if (roundInfo.isExecuted) {
                 this.log.verbose(`Round ${executableRound} has already been executed`, logData);
                 return undefined;
-            } else if (!roundInfo.readyToExecute) {
-                this.log.verbose(`Round ${executableRound} is not ready to execute yet`, logData);
-                return undefined;
             } else if (roundInfo.voteCount === 0n) {
                 this.log.debug(`Round ${executableRound} received no votes`, logData);
                 return undefined;
@@ -151,6 +181,7 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
                 this.log.verbose(`Round ${executableRound} does not have enough votes to execute`, logData);
                 return undefined;
             }
+            // Check if the round yields any slashing at all
             const { actions: slashActions, committees } = await this.tallySlashingProposer.getTally(executableRound);
             if (slashActions.length === 0) {
                 this.log.verbose(`Round ${executableRound} does not resolve in any slashing`, logData);
@@ -184,8 +215,8 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
             };
         } catch (error) {
             this.log.error(`Error checking round to execute ${executableRound}`, error);
+            return undefined;
         }
-        return undefined;
     }
     /** Returns a vote action based on offenses from the target round (with offset applied) */ async getVoteOffensesAction(slotNumber) {
         // Compute what round we are in based on the slot number and what round will be slashed

package/dest/watchers/epoch_prune_watcher.d.ts

@@ -26,6 +26,8 @@ export declare class EpochPruneWatcher extends EpochPruneWatcher_base implements
     stop(): Promise<void>;
     updateConfig(config: Partial<SlasherConfig>): void;
     private handlePruneL2Blocks;
+    private emitSlashForEpoch;
+    private processPruneL2Blocks;
     validateBlocks(blocks: L2Block[]): Promise<void>;
     validateBlock(blockFromL1: L2Block, fork: MerkleTreeWriteOperations): Promise<void>;
     private getValidatorsForEpoch;

package/dest/watchers/epoch_prune_watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"epoch_prune_watcher.d.ts","sourceRoot":"","sources":["../../src/watchers/epoch_prune_watcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAEL,OAAO,EAEP,KAAK,yBAAyB,EAE/B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EACV,qBAAqB,EACrB,WAAW,EACX,yBAAyB,EACzB,aAAa,EACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAWnE,OAAO,EAA6C,KAAK,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAE7G,QAAA,MAAM,oCAAoC,+DAAgE,CAAC;AAE3G,KAAK,0BAA0B,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,OAAO,oCAAoC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;sCAQrD,UAAU,cAAc;AANhF;;;;;GAKG;AACH,qBAAa,iBAAkB,SAAQ,sBAA2C,YAAW,OAAO;IAShG,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,YAAY;IAZtB,OAAO,CAAC,GAAG,CAA+C;IAG1D,OAAO,CAAC,wBAAwB,CAAuC;IAEvE,OAAO,CAAC,SAAS,CAA6B;gBAGpC,aAAa,EAAE,yBAAyB,EACxC,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,EAChD,YAAY,EAAE,qBAAqB,EAC3C,SAAS,EAAE,0BAA0B;IAShC,KAAK;IAKL,IAAI;IAKJ,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI;IAKzD,OAAO,CAAC,mBAAmB;IA+Cd,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAchD,aAAa,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;YAgClF,qBAAqB;IASnC,OAAO,CAAC,wBAAwB;CAgBjC"}
+{"version":3,"file":"epoch_prune_watcher.d.ts","sourceRoot":"","sources":["../../src/watchers/epoch_prune_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAEL,OAAO,EAEP,KAAK,yBAAyB,EAE/B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EACV,qBAAqB,EACrB,WAAW,EACX,yBAAyB,EACzB,aAAa,EACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAWnE,OAAO,EAA6C,KAAK,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAE7G,QAAA,MAAM,oCAAoC,+DAAgE,CAAC;AAE3G,KAAK,0BAA0B,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,OAAO,oCAAoC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;sCAQrD,UAAU,cAAc;AANhF;;;;;GAKG;AACH,qBAAa,iBAAkB,SAAQ,sBAA2C,YAAW,OAAO;IAShG,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,YAAY;IAZtB,OAAO,CAAC,GAAG,CAA+C;IAG1D,OAAO,CAAC,wBAAwB,CAAuC;IAEvE,OAAO,CAAC,SAAS,CAA6B;gBAGpC,aAAa,EAAE,yBAAyB,EACxC,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,EAChD,YAAY,EAAE,qBAAqB,EAC3C,SAAS,EAAE,0BAA0B;IAShC,KAAK;IAKL,IAAI;IAKJ,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI;IAKzD,OAAO,CAAC,mBAAmB;YAOb,iBAAiB;YAWjB,oBAAoB;IAwBrB,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAchD,aAAa,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;YAgClF,qBAAqB;IASnC,OAAO,CAAC,wBAAwB;CAgBjC"}

package/dest/watchers/epoch_prune_watcher.js

@@ -1,7 +1,8 @@
 import { merge, pick } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
 import { L2BlockSourceEvents } from '@aztec/stdlib/block';
-import { OffenseType } from '@aztec/stdlib/slashing';
+import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
+import { OffenseType, getOffenseTypeName } from '@aztec/stdlib/slashing';
 import { ReExFailedTxsError, ReExStateMismatchError, TransactionsNotAvailableError, ValidatorError } from '@aztec/stdlib/validators';
 import EventEmitter from 'node:events';
 import { WANT_TO_SLASH_EVENT } from '../watcher.js';
@@ -43,44 +44,40 @@ const EpochPruneWatcherPenaltiesConfigKeys = [
     }
     handlePruneL2Blocks(event) {
         const { blocks, epochNumber } = event;
-        this.log.info(`Detected chain prune. Validating epoch ${epochNumber}`);
-        this.validateBlocks(blocks).then(async ()=>{
+        void this.processPruneL2Blocks(blocks, epochNumber).catch((err)=>this.log.error('Error processing pruned L2 blocks', err, {
+                epochNumber
+            }));
+    }
+    async emitSlashForEpoch(offense, epochNumber) {
+        const validators = await this.getValidatorsForEpoch(epochNumber);
+        if (validators.length === 0) {
+            this.log.warn(`No validators found for epoch ${epochNumber} (cannot slash for ${getOffenseTypeName(offense)})`);
+            return;
+        }
+        const args = this.validatorsToSlashingArgs(validators, offense, BigInt(epochNumber));
+        this.log.verbose(`Created slash for ${getOffenseTypeName(offense)} at epoch ${epochNumber}`, args);
+        this.emit(WANT_TO_SLASH_EVENT, args);
+    }
+    async processPruneL2Blocks(blocks, epochNumber) {
+        try {
+            const l1Constants = this.epochCache.getL1Constants();
+            const epochBlocks = blocks.filter((b)=>getEpochAtSlot(b.slot, l1Constants) === epochNumber);
+            this.log.info(`Detected chain prune. Validating epoch ${epochNumber} with blocks ${epochBlocks[0]?.number} to ${epochBlocks[epochBlocks.length - 1]?.number}.`, {
+                blocks: epochBlocks.map((b)=>b.toBlockInfo())
+            });
+            await this.validateBlocks(epochBlocks);
             this.log.info(`Pruned epoch ${epochNumber} was valid. Want to slash committee for not having it proven.`);
-            const validators = await this.getValidatorsForEpoch(epochNumber);
-            // need to specify return type to be able to return offense as undefined later on
-            const result = {
-                validators,
-                offense: OffenseType.VALID_EPOCH_PRUNED
-            };
-            return result;
-        }).catch(async (error)=>{
+            await this.emitSlashForEpoch(OffenseType.VALID_EPOCH_PRUNED, epochNumber);
+        } catch (error) {
             if (error instanceof TransactionsNotAvailableError) {
                 this.log.info(`Data for pruned epoch ${epochNumber} was not available. Will want to slash.`, {
                     message: error.message
                 });
-                const validators = await this.getValidatorsForEpoch(epochNumber);
-                return {
-                    validators,
-                    offense: OffenseType.DATA_WITHHOLDING
-                };
+                await this.emitSlashForEpoch(OffenseType.DATA_WITHHOLDING, epochNumber);
             } else {
                 this.log.error(`Error while validating pruned epoch ${epochNumber}. Will not want to slash.`, error);
-                return {
-                    validators: [],
-                    offense: undefined
-                };
             }
-        }).then(({ validators, offense })=>{
-            if (validators.length === 0 || offense === undefined) {
-                return;
-            }
-            const args = this.validatorsToSlashingArgs(validators, offense, BigInt(epochNumber));
-            this.log.info(`Slash for epoch ${epochNumber} created`, args);
-            this.emit(WANT_TO_SLASH_EVENT, args);
-        }).catch((error)=>{
-            // This can happen if we fail to get the validators for the epoch.
-            this.log.error('Error while creating slash for epoch', error);
-        });
+        }
     }
     async validateBlocks(blocks) {
         if (blocks.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/slasher",
-  "version": "2.0.3-rc.17",
+  "version": "2.0.3-rc.18",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -54,20 +54,20 @@
     ]
   },
   "dependencies": {
-    "@aztec/epoch-cache": "2.0.3-rc.17",
-    "@aztec/ethereum": "2.0.3-rc.17",
-    "@aztec/foundation": "2.0.3-rc.17",
-    "@aztec/kv-store": "2.0.3-rc.17",
-    "@aztec/l1-artifacts": "2.0.3-rc.17",
-    "@aztec/stdlib": "2.0.3-rc.17",
-    "@aztec/telemetry-client": "2.0.3-rc.17",
+    "@aztec/epoch-cache": "2.0.3-rc.18",
+    "@aztec/ethereum": "2.0.3-rc.18",
+    "@aztec/foundation": "2.0.3-rc.18",
+    "@aztec/kv-store": "2.0.3-rc.18",
+    "@aztec/l1-artifacts": "2.0.3-rc.18",
+    "@aztec/stdlib": "2.0.3-rc.18",
+    "@aztec/telemetry-client": "2.0.3-rc.18",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "viem": "2.23.7",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@aztec/aztec.js": "2.0.3-rc.17",
+    "@aztec/aztec.js": "2.0.3-rc.18",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",

package/src/config.ts

@@ -29,6 +29,7 @@ export const DefaultSlasherConfig: SlasherConfig = {
   slashOffenseExpirationRounds: 4,
   slashMaxPayloadSize: 50,
   slashGracePeriodL2Slots: 0,
+  slashExecuteRoundsLookBack: 4,
   slashSelfAllowed: false,
 };
 
@@ -83,7 +84,7 @@ export const slasherConfigMappings: ConfigMappingsType<SlasherConfig> = {
   },
   slashBroadcastedInvalidBlockPenalty: {
     env: 'SLASH_INVALID_BLOCK_PENALTY',
-    description: 'Penalty amount for slashing a validator for an invalid block.',
+    description: 'Penalty amount for slashing a validator for an invalid block proposed via p2p.',
     ...bigintConfigHelper(DefaultSlasherConfig.slashBroadcastedInvalidBlockPenalty),
   },
   slashInactivityTargetPercentage: {
@@ -144,6 +145,11 @@ export const slasherConfigMappings: ConfigMappingsType<SlasherConfig> = {
     env: 'SLASH_GRACE_PERIOD_L2_SLOTS',
     ...numberConfigHelper(DefaultSlasherConfig.slashGracePeriodL2Slots),
   },
+  slashExecuteRoundsLookBack: {
+    env: 'SLASH_EXECUTE_ROUNDS_LOOK_BACK',
+    description: 'How many rounds to look back when searching for a round to execute.',
+    ...numberConfigHelper(DefaultSlasherConfig.slashExecuteRoundsLookBack),
+  },
   slashSelfAllowed: {
     description: 'Whether to allow slashes to own validators',
     ...booleanConfigHelper(DefaultSlasherConfig.slashSelfAllowed),

package/src/tally_slasher_client.ts

@@ -1,6 +1,7 @@
 import { EthAddress } from '@aztec/aztec.js';
 import type { EpochCache } from '@aztec/epoch-cache';
 import { RollupContract, SlasherContract, TallySlashingProposerContract } from '@aztec/ethereum/contracts';
+import { maxBigint } from '@aztec/foundation/bigint';
 import { compactArray, partition, times } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
@@ -45,7 +46,7 @@ export type TallySlasherSettings = Prettify<
 >;
 
 export type TallySlasherClientConfig = SlashOffensesCollectorConfig &
-  Pick<SlasherConfig, 'slashValidatorsAlways' | 'slashValidatorsNever'>;
+  Pick<SlasherConfig, 'slashValidatorsAlways' | 'slashValidatorsNever' | 'slashExecuteRoundsLookBack'>;
 
 /**
  * The Tally Slasher client is responsible for managing slashable offenses using
@@ -177,26 +178,62 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
     return compactArray<ProposerSlashAction>([executeAction, voteAction]);
   }
 
-  /** Returns an execute slash action if there are any rounds ready to be executed */
+  /**
+   * Returns an execute slash action if there are any rounds ready to be executed.
+   * Returns the oldest slash action if there are multiple rounds pending execution.
+   */
   protected async getExecuteSlashAction(slotNumber: bigint): Promise<ProposerSlashAction | undefined> {
     const { round: currentRound } = this.roundMonitor.getRoundForSlot(slotNumber);
     const slashingExecutionDelayInRounds = BigInt(this.settings.slashingExecutionDelayInRounds);
     const executableRound = currentRound - slashingExecutionDelayInRounds - 1n;
-    if (executableRound < 0n) {
+    const lookBack = BigInt(this.config.slashExecuteRoundsLookBack);
+    const oldestExecutableRound = maxBigint(0n, executableRound - lookBack);
+
+    // Check if slashing is enabled at all
+    if (!(await this.slasher.isSlashingEnabled())) {
+      this.log.warn(`Slashing is disabled in the Slasher contract (skipping execution)`);
       return undefined;
     }
 
-    let logData: Record<string, unknown> = { currentRound, executableRound, slotNumber };
+    this.log.debug(`Checking slashing rounds ${oldestExecutableRound} to ${executableRound} to execute`, {
+      slotNumber,
+      currentRound,
+      oldestExecutableRound,
+      executableRound,
+      slashingExecutionDelayInRounds,
+      lookBack,
+      slashingLifetimeInRounds: this.settings.slashingLifetimeInRounds,
+    });
+
+    // Iterate over all rounds, starting from the oldest, until we find one that is executable
+    for (let roundToCheck = oldestExecutableRound; roundToCheck <= executableRound; roundToCheck++) {
+      const action = await this.tryGetRoundExecuteAction(roundToCheck);
+      if (action) {
+        return action;
+      }
+    }
+
+    // And return nothing if none are found
+    return undefined;
+  }
+
+  /**
+   * Checks if a given round is executable and returns an execute-slash action for it if so.
+   * Assumes round number has already been checked against lifetime and execution delay.
+   */
+  private async tryGetRoundExecuteAction(executableRound: bigint): Promise<ProposerSlashAction | undefined> {
+    let logData: Record<string, unknown> = { executableRound };
+    this.log.debug(`Testing if slashing round ${executableRound} is executable`, logData);
 
     try {
+      // Note we do not check isReadyToExecute here, since we already know that based on the
+      // executableRound number. Not just that, but it may be that we are building for the given slot number
+      // that is in the future, so the contract may think it's not yet ready to execute, whereas it is.
       const roundInfo = await this.tallySlashingProposer.getRound(executableRound);
       logData = { ...logData, roundInfo };
       if (roundInfo.isExecuted) {
         this.log.verbose(`Round ${executableRound} has already been executed`, logData);
         return undefined;
-      } else if (!roundInfo.readyToExecute) {
-        this.log.verbose(`Round ${executableRound} is not ready to execute yet`, logData);
-        return undefined;
       } else if (roundInfo.voteCount === 0n) {
         this.log.debug(`Round ${executableRound} received no votes`, logData);
         return undefined;
@@ -205,6 +242,7 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
         return undefined;
       }
 
+      // Check if the round yields any slashing at all
       const { actions: slashActions, committees } = await this.tallySlashingProposer.getTally(executableRound);
       if (slashActions.length === 0) {
         this.log.verbose(`Round ${executableRound} does not resolve in any slashing`, logData);
@@ -239,9 +277,8 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
       return { type: 'execute-slash', round: executableRound, committees: slashedCommittees };
     } catch (error) {
       this.log.error(`Error checking round to execute ${executableRound}`, error);
+      return undefined;
     }
-
-    return undefined;
   }
 
   /** Returns a vote action based on offenses from the target round (with offset applied) */

package/src/watchers/epoch_prune_watcher.ts

@@ -1,4 +1,3 @@
-import type { Tx } from '@aztec/aztec.js';
 import { EpochCache } from '@aztec/epoch-cache';
 import { merge, pick } from '@aztec/foundation/collection';
 import { type Logger, createLogger } from '@aztec/foundation/log';
@@ -9,6 +8,7 @@ import {
   type L2BlockSourceEventEmitter,
   L2BlockSourceEvents,
 } from '@aztec/stdlib/block';
+import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
 import type {
   IFullNodeBlockBuilder,
   ITxProvider,
@@ -16,7 +16,7 @@ import type {
   SlasherConfig,
 } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
-import { OffenseType } from '@aztec/stdlib/slashing';
+import { OffenseType, getOffenseTypeName } from '@aztec/stdlib/slashing';
 import {
   ReExFailedTxsError,
   ReExStateMismatchError,
@@ -78,49 +78,44 @@ export class EpochPruneWatcher extends (EventEmitter as new () => WatcherEmitter
 
   private handlePruneL2Blocks(event: L2BlockPruneEvent): void {
     const { blocks, epochNumber } = event;
-    this.log.info(`Detected chain prune. Validating epoch ${epochNumber}`);
-
-    this.validateBlocks(blocks)
-      .then(async () => {
-        this.log.info(`Pruned epoch ${epochNumber} was valid. Want to slash committee for not having it proven.`);
-        const validators = await this.getValidatorsForEpoch(epochNumber);
-        // need to specify return type to be able to return offense as undefined later on
-        const result: { validators: EthAddress[]; offense: OffenseType | undefined } = {
-          validators,
-          offense: OffenseType.VALID_EPOCH_PRUNED,
-        };
-        return result;
-      })
-      .catch(async error => {
-        if (error instanceof TransactionsNotAvailableError) {
-          this.log.info(`Data for pruned epoch ${epochNumber} was not available. Will want to slash.`, {
-            message: error.message,
-          });
-          const validators = await this.getValidatorsForEpoch(epochNumber);
-          return {
-            validators,
-            offense: OffenseType.DATA_WITHHOLDING,
-          };
-        } else {
-          this.log.error(`Error while validating pruned epoch ${epochNumber}. Will not want to slash.`, error);
-          return {
-            validators: [],
-            offense: undefined,
-          };
-        }
-      })
-      .then(({ validators, offense }) => {
-        if (validators.length === 0 || offense === undefined) {
-          return;
-        }
-        const args = this.validatorsToSlashingArgs(validators, offense, BigInt(epochNumber));
-        this.log.info(`Slash for epoch ${epochNumber} created`, args);
-        this.emit(WANT_TO_SLASH_EVENT, args);
-      })
-      .catch(error => {
-        // This can happen if we fail to get the validators for the epoch.
-        this.log.error('Error while creating slash for epoch', error);
-      });
+    void this.processPruneL2Blocks(blocks, epochNumber).catch(err =>
+      this.log.error('Error processing pruned L2 blocks', err, { epochNumber }),
+    );
+  }
+
+  private async emitSlashForEpoch(offense: OffenseType, epochNumber: bigint): Promise<void> {
+    const validators = await this.getValidatorsForEpoch(epochNumber);
+    if (validators.length === 0) {
+      this.log.warn(`No validators found for epoch ${epochNumber} (cannot slash for ${getOffenseTypeName(offense)})`);
+      return;
+    }
+    const args = this.validatorsToSlashingArgs(validators, offense, BigInt(epochNumber));
+    this.log.verbose(`Created slash for ${getOffenseTypeName(offense)} at epoch ${epochNumber}`, args);
+    this.emit(WANT_TO_SLASH_EVENT, args);
+  }
+
+  private async processPruneL2Blocks(blocks: L2Block[], epochNumber: bigint): Promise<void> {
+    try {
+      const l1Constants = this.epochCache.getL1Constants();
+      const epochBlocks = blocks.filter(b => getEpochAtSlot(b.slot, l1Constants) === epochNumber);
+      this.log.info(
+        `Detected chain prune. Validating epoch ${epochNumber} with blocks ${epochBlocks[0]?.number} to ${epochBlocks[epochBlocks.length - 1]?.number}.`,
+        { blocks: epochBlocks.map(b => b.toBlockInfo()) },
+      );
+
+      await this.validateBlocks(epochBlocks);
+      this.log.info(`Pruned epoch ${epochNumber} was valid. Want to slash committee for not having it proven.`);
+      await this.emitSlashForEpoch(OffenseType.VALID_EPOCH_PRUNED, epochNumber);
+    } catch (error) {
+      if (error instanceof TransactionsNotAvailableError) {
+        this.log.info(`Data for pruned epoch ${epochNumber} was not available. Will want to slash.`, {
+          message: error.message,
+        });
+        await this.emitSlashForEpoch(OffenseType.DATA_WITHHOLDING, epochNumber);
+      } else {
+        this.log.error(`Error while validating pruned epoch ${epochNumber}. Will not want to slash.`, error);
+      }
+    }
   }
 
   public async validateBlocks(blocks: L2Block[]): Promise<void> {
@@ -151,7 +146,7 @@ export class EpochPruneWatcher extends (EventEmitter as new () => WatcherEmitter
 
     const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(blockFromL1.number);
     const { block, failedTxs, numTxs } = await this.blockBuilder.buildBlock(
-      txs as Tx[],
+      txs,
       l1ToL2Messages,
       blockFromL1.header.globalVariables,
       {},