@aztec/slasher 0.0.1-commit.e558bd1c → 0.0.1-commit.e57c76e

package/dest/{tally_slasher_client.js → slasher_client.js}

@@ -2,11 +2,11 @@ import { EthAddress } from '@aztec/aztec.js/addresses';
 import { maxBigint } from '@aztec/foundation/bigint';
 import { compactArray, partition, times } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
-import { OffenseType, getEpochsForRound, getSlashConsensusVotesFromOffenses } from '@aztec/stdlib/slashing';
+import { OffenseType, getEpochsForRound, getOffenseTypeName, getSlashConsensusVotesFromOffenses } from '@aztec/stdlib/slashing';
 import { SlashOffensesCollector } from './slash_offenses_collector.js';
 import { SlashRoundMonitor } from './slash_round_monitor.js';
 /**
- * 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
@@ -30,16 +30,10 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
  * - 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 {
+ */ export class SlasherClient {
     config;
     settings;
-    tallySlashingProposer;
+    slashingProposer;
     slasher;
     rollup;
     epochCache;
@@ -49,10 +43,10 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
     unwatchCallbacks;
     roundMonitor;
     offensesCollector;
-    constructor(config, settings, tallySlashingProposer, slasher, rollup, watchers, epochCache, dateProvider, offensesStore, log = createLogger('slasher:consensus')){
+    constructor(config, settings, slashingProposer, slasher, rollup, watchers, epochCache, dateProvider, offensesStore, log = createLogger('slasher:consensus')){
         this.config = config;
         this.settings = settings;
-        this.tallySlashingProposer = tallySlashingProposer;
+        this.slashingProposer = slashingProposer;
         this.slasher = slasher;
         this.rollup = rollup;
         this.epochCache = epochCache;
@@ -64,26 +58,24 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
         this.offensesCollector = new SlashOffensesCollector(config, settings, watchers, offensesStore);
     }
     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(({ round, slashCount, l1BlockHash })=>void this.handleRoundExecuted(round, slashCount, l1BlockHash).catch((err)=>this.log.error('Error handling round executed', err))));
+        this.unwatchCallbacks.push(this.slashingProposer.listenToRoundExecuted(({ round, slashCount, l1BlockHash })=>void this.handleRoundExecuted(round, slashCount, l1BlockHash).catch((err)=>this.log.error('Error handling round executed', err))));
         // 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
-   */ async stop() {
-        this.log.debug('Stopping Tally Slasher client...');
+    /** Stop the slasher client */ async stop() {
+        this.log.debug('Stopping slasher client...');
         for (const unwatchCallback of this.unwatchCallbacks){
             unwatchCallback();
         }
         this.roundMonitor.stop();
         await this.offensesCollector.stop();
-        this.log.info('Tally Slasher client stopped');
+        this.log.info('Slasher client stopped');
     }
     /** Returns the current config */ getConfig() {
         return this.config;
@@ -95,10 +87,10 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
         };
     }
     /** Triggered on a time basis when we enter a new slashing round. Clears expired offenses. */ async handleNewRound(round) {
-        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). */ async handleRoundExecuted(round, slashCount, l1BlockHash) {
+    /** Called when we see a RoundExecuted event on the SlashingProposer (just for logging). */ async handleRoundExecuted(round, slashCount, l1BlockHash) {
         const slashes = await this.rollup.getSlashEvents(l1BlockHash);
         this.log.info(`Slashing round ${round} has been executed with ${slashCount} slashes`, {
             slashes
@@ -170,7 +162,7 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
         };
         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
@@ -186,19 +178,19 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
                 return undefined;
             }
             // 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`, logData);
                 return undefined;
             }
             // 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)`, {
@@ -256,7 +248,7 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
                 slotNumber,
                 currentRound,
                 slashedRound,
-                offensesToForgive,
+                offensesFromAlwaysSlash: offensesFromAlwaysSlash.map(getOffenseLogData),
                 slashValidatorsAlways: this.config.slashValidatorsAlways
             });
         }
@@ -265,7 +257,7 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
                 slotNumber,
                 currentRound,
                 slashedRound,
-                offensesToForgive,
+                offensesToForgive: offensesToForgive.map(getOffenseLogData),
                 slashValidatorsNever: this.config.slashValidatorsNever
             });
         }
@@ -277,29 +269,36 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
             });
             return undefined;
         }
-        const offensesToSlashLog = offensesToSlash.map((offense)=>({
-                ...offense,
-                amount: offense.amount.toString()
-            }));
-        this.log.info(`Voting to slash ${offensesToSlash.length} offenses`, {
+        this.log.debug(`Computing slash votes for ${offensesToSlash.length} offenses`, {
             slotNumber,
             currentRound,
             slashedRound,
-            offensesToSlash: offensesToSlashLog
+            offensesToSlash: offensesToSlash.map(getOffenseLogData)
         });
         const committees = await this.collectCommitteesActiveDuringRound(slashedRound);
         const epochsForCommittees = getEpochsForRound(slashedRound, this.settings);
-        const votes = getSlashConsensusVotesFromOffenses(offensesToSlash, committees, epochsForCommittees.map((e)=>BigInt(e)), this.settings);
+        const { slashMaxPayloadSize } = this.config;
+        const votes = getSlashConsensusVotesFromOffenses(offensesToSlash, committees, epochsForCommittees.map((e)=>BigInt(e)), {
+            ...this.settings,
+            maxSlashedValidators: slashMaxPayloadSize
+        }, this.log);
         if (votes.every((v)=>v === 0)) {
             this.log.warn(`Computed votes for offenses are all zero. Skipping vote.`, {
                 slotNumber,
                 currentRound,
                 slashedRound,
-                offensesToSlash,
+                offensesToSlash: offensesToSlash.map(getOffenseLogData),
                 committees
             });
             return undefined;
         }
+        this.log.info(`Voting to slash ${offensesToSlash.length} offenses`, {
+            slotNumber,
+            slashedRound,
+            currentRound,
+            votes,
+            offensesToSlash: offensesToSlash.map(getOffenseLogData)
+        });
         this.log.debug(`Computed votes for slashing ${offensesToSlash.length} offenses`, {
             slashedRound,
             currentRound,
@@ -320,14 +319,8 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
         return Promise.all(epochsToSlash.map((epoch)=>this.epochCache.getCommitteeForEpoch(epoch).then((c)=>c.committee ?? emptyCommittee)));
     }
     /**
-   * Get slash payloads is NOT SUPPORTED in tally model
-   * @throws Error indicating this operation is not supported
-   */ getSlashPayloads() {
-        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
    */ async gatherOffensesForRound(round) {
@@ -337,8 +330,8 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
         }
         return await this.offensesStore.getOffensesForRound(targetRound);
     }
-    /** Returns all pending offenses stored */ getPendingOffenses() {
-        return this.offensesStore.getPendingOffenses();
+    /** Returns all offenses stored */ getOffenses() {
+        return this.offensesStore.getOffenses();
     }
     /**
    * Returns the round to be slashed given the current round by applying the slash offset.
@@ -352,3 +345,10 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
         return round - BigInt(this.settings.slashingOffsetInRounds);
     }
 }
+function getOffenseLogData(offense) {
+    return {
+        ...offense,
+        validator: offense.validator.toString(),
+        offenseType: getOffenseTypeName(offense.offenseType)
+    };
+}

package/dest/slasher_client_facade.d.ts

@@ -2,12 +2,11 @@ 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 { 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 type { SlasherClientInterface } from './slasher_client_interface.js';
 import type { Watcher } from './watcher.js';
 /**
@@ -19,26 +18,25 @@ export declare class SlasherClientFacade implements SlasherClientInterface {
     private config;
     private rollup;
     private l1Client;
-    private slashFactoryAddress;
     private watchers;
     private epochCache;
     private dateProvider;
     private kvStore;
+    private rollupRegisteredAtL2Slot;
     private logger;
     private client;
     private unwatch;
     constructor(config: SlasherConfig & DataStoreConfig & {
         ethereumSlotDuration: number;
-    }, rollup: RollupContract, l1Client: ViemClient, slashFactoryAddress: EthAddress | undefined, watchers: Watcher[], epochCache: EpochCache, dateProvider: DateProvider, kvStore: AztecLMDBStoreV2, logger?: import("@aztec/foundation/log").Logger);
+    }, rollup: RollupContract, l1Client: ViemClient, watchers: Watcher[], epochCache: EpochCache, dateProvider: DateProvider, kvStore: AztecLMDBStoreV2, rollupRegisteredAtL2Slot: SlotNumber, logger?: import("@aztec/foundation/log").Logger);
     start(): Promise<void>;
     stop(): Promise<void>;
     getConfig(): SlasherConfig;
     updateConfig(config: Partial<SlasherConfig>): void;
-    getSlashPayloads(): Promise<SlashPayloadRound[]>;
     gatherOffensesForRound(round?: bigint): Promise<Offense[]>;
-    getPendingOffenses(): Promise<Offense[]>;
+    getOffenses(): Promise<Offense[]>;
     getProposerActions(slotNumber: SlotNumber): Promise<ProposerSlashAction[]>;
     private createSlasherClient;
     private handleSlasherChange;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xhc2hlcl9jbGllbnRfZmFjYWRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc2xhc2hlcl9jbGllbnRfZmFjYWRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTNELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUc5RixPQUFPLEtBQUssRUFBRSxzQkFBc0IsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzVFLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUU1Qzs7OztHQUlHO0FBQ0gscUJBQWEsbUJBQW9CLFlBQVcsc0JBQXNCO0lBSzlELE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsUUFBUTtJQUNoQixPQUFPLENBQUMsbUJBQW1CO0lBQzNCLE9BQU8sQ0FBQyxRQUFRO0lBQ2hCLE9BQU8sQ0FBQyxVQUFVO0lBQ2xCLE9BQU8sQ0FBQyxZQUFZO0lBQ3BCLE9BQU8sQ0FBQyxPQUFPO0lBQ2YsT0FBTyxDQUFDLE1BQU07SUFaaEIsT0FBTyxDQUFDLE1BQU0sQ0FBcUM7SUFDbkQsT0FBTyxDQUFDLE9BQU8sQ0FBMkI7SUFFMUMsWUFDVSxNQUFNLEVBQUUsYUFBYSxHQUFHLGVBQWUsR0FBRztRQUFFLG9CQUFvQixFQUFFLE1BQU0sQ0FBQTtLQUFFLEVBQzFFLE1BQU0sRUFBRSxjQUFjLEVBQ3RCLFFBQVEsRUFBRSxVQUFVLEVBQ3BCLG1CQUFtQixFQUFFLFVBQVUsR0FBRyxTQUFTLEVBQzNDLFFBQVEsRUFBRSxPQUFPLEVBQUUsRUFDbkIsVUFBVSxFQUFFLFVBQVUsRUFDdEIsWUFBWSxFQUFFLFlBQVksRUFDMUIsT0FBTyxFQUFFLGdCQUFnQixFQUN6QixNQUFNLHlDQUEwQixFQUN0QztJQUVTLEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBU2xDO0lBRVksSUFBSSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJakM7SUFFTSxTQUFTLElBQUksYUFBYSxDQUVoQztJQUVNLFlBQVksQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLGFBQWEsQ0FBQyxHQUFHLElBQUksQ0FJeEQ7SUFFTSxnQkFBZ0IsSUFBSSxPQUFPLENBQUMsaUJBQWlCLEVBQUUsQ0FBQyxDQUV0RDtJQUVNLHNCQUFzQixDQUFDLEtBQUssQ0FBQyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FFaEU7SUFFTSxrQkFBa0IsSUFBSSxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FFOUM7SUFFTSxrQkFBa0IsQ0FBQyxVQUFVLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsRUFBRSxDQUFDLENBRWhGO0lBRUQsT0FBTyxDQUFDLG1CQUFtQjtZQWNiLG1CQUFtQjtDQU1sQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xhc2hlcl9jbGllbnRfZmFjYWRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc2xhc2hlcl9jbGllbnRfZmFjYWRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRzNFLE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDNUUsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRTVDOzs7O0dBSUc7QUFDSCxxQkFBYSxtQkFBb0IsWUFBVyxzQkFBc0I7SUFLOUQsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxRQUFRO0lBQ2hCLE9BQU8sQ0FBQyxRQUFRO0lBQ2hCLE9BQU8sQ0FBQyxVQUFVO0lBQ2xCLE9BQU8sQ0FBQyxZQUFZO0lBQ3BCLE9BQU8sQ0FBQyxPQUFPO0lBQ2YsT0FBTyxDQUFDLHdCQUF3QjtJQUNoQyxPQUFPLENBQUMsTUFBTTtJQVpoQixPQUFPLENBQUMsTUFBTSxDQUFxQztJQUNuRCxPQUFPLENBQUMsT0FBTyxDQUEyQjtJQUUxQyxZQUNVLE1BQU0sRUFBRSxhQUFhLEdBQUcsZUFBZSxHQUFHO1FBQUUsb0JBQW9CLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFDMUUsTUFBTSxFQUFFLGNBQWMsRUFDdEIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsUUFBUSxFQUFFLE9BQU8sRUFBRSxFQUNuQixVQUFVLEVBQUUsVUFBVSxFQUN0QixZQUFZLEVBQUUsWUFBWSxFQUMxQixPQUFPLEVBQUUsZ0JBQWdCLEVBQ3pCLHdCQUF3QixFQUFFLFVBQVUsRUFDcEMsTUFBTSx5Q0FBMEIsRUFDdEM7SUFFUyxLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQVNsQztJQUVZLElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBSWpDO0lBRU0sU0FBUyxJQUFJLGFBQWEsQ0FFaEM7SUFFTSxZQUFZLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxhQUFhLENBQUMsR0FBRyxJQUFJLENBSXhEO0lBRU0sc0JBQXNCLENBQUMsS0FBSyxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUVoRTtJQUVNLFdBQVcsSUFBSSxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FFdkM7SUFFTSxrQkFBa0IsQ0FBQyxVQUFVLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsRUFBRSxDQUFDLENBRWhGO0lBRUQsT0FBTyxDQUFDLG1CQUFtQjtZQWNiLG1CQUFtQjtDQU1sQyJ9

package/dest/slasher_client_facade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"slasher_client_facade.d.ts","sourceRoot":"","sources":["../src/slasher_client_facade.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG9F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C;;;;GAIG;AACH,qBAAa,mBAAoB,YAAW,sBAAsB;IAK9D,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM;IAZhB,OAAO,CAAC,MAAM,CAAqC;IACnD,OAAO,CAAC,OAAO,CAA2B;IAE1C,YACU,MAAM,EAAE,aAAa,GAAG,eAAe,GAAG;QAAE,oBAAoB,EAAE,MAAM,CAAA;KAAE,EAC1E,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,UAAU,EACpB,mBAAmB,EAAE,UAAU,GAAG,SAAS,EAC3C,QAAQ,EAAE,OAAO,EAAE,EACnB,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,gBAAgB,EACzB,MAAM,yCAA0B,EACtC;IAES,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CASlC;IAEY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAIjC;IAEM,SAAS,IAAI,aAAa,CAEhC;IAEM,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAIxD;IAEM,gBAAgB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAEtD;IAEM,sBAAsB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAEhE;IAEM,kBAAkB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAE9C;IAEM,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAEhF;IAED,OAAO,CAAC,mBAAmB;YAcb,mBAAmB;CAMlC"}
+{"version":3,"file":"slasher_client_facade.d.ts","sourceRoot":"","sources":["../src/slasher_client_facade.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG3E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C;;;;GAIG;AACH,qBAAa,mBAAoB,YAAW,sBAAsB;IAK9D,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,wBAAwB;IAChC,OAAO,CAAC,MAAM;IAZhB,OAAO,CAAC,MAAM,CAAqC;IACnD,OAAO,CAAC,OAAO,CAA2B;IAE1C,YACU,MAAM,EAAE,aAAa,GAAG,eAAe,GAAG;QAAE,oBAAoB,EAAE,MAAM,CAAA;KAAE,EAC1E,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,UAAU,EACpB,QAAQ,EAAE,OAAO,EAAE,EACnB,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,gBAAgB,EACzB,wBAAwB,EAAE,UAAU,EACpC,MAAM,yCAA0B,EACtC;IAES,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CASlC;IAEY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAIjC;IAEM,SAAS,IAAI,aAAa,CAEhC;IAEM,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAIxD;IAEM,sBAAsB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAEhE;IAEM,WAAW,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAEvC;IAEM,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAEhF;IAED,OAAO,CAAC,mBAAmB;YAcb,mBAAmB;CAMlC"}

package/dest/slasher_client_facade.js

@@ -8,23 +8,23 @@ import { createSlasherImplementation } from './factory/create_implementation.js'
     config;
     rollup;
     l1Client;
-    slashFactoryAddress;
     watchers;
     epochCache;
     dateProvider;
     kvStore;
+    rollupRegisteredAtL2Slot;
     logger;
     client;
     unwatch;
-    constructor(config, rollup, l1Client, slashFactoryAddress, watchers, epochCache, dateProvider, kvStore, logger = createLogger('slasher')){
+    constructor(config, rollup, l1Client, watchers, epochCache, dateProvider, kvStore, rollupRegisteredAtL2Slot, logger = createLogger('slasher')){
         this.config = config;
         this.rollup = rollup;
         this.l1Client = l1Client;
-        this.slashFactoryAddress = slashFactoryAddress;
         this.watchers = watchers;
         this.epochCache = epochCache;
         this.dateProvider = dateProvider;
         this.kvStore = kvStore;
+        this.rollupRegisteredAtL2Slot = rollupRegisteredAtL2Slot;
         this.logger = logger;
     }
     async start() {
@@ -52,20 +52,17 @@ import { createSlasherImplementation } from './factory/create_implementation.js'
         this.client?.updateConfig(config);
         this.watchers.forEach((watcher)=>watcher.updateConfig?.(config));
     }
-    getSlashPayloads() {
-        return this.client?.getSlashPayloads() ?? Promise.reject(new Error('Slasher client not initialized'));
-    }
     gatherOffensesForRound(round) {
         return this.client?.gatherOffensesForRound(round) ?? Promise.reject(new Error('Slasher client not initialized'));
     }
-    getPendingOffenses() {
-        return this.client?.getPendingOffenses() ?? Promise.reject(new Error('Slasher client not initialized'));
+    getOffenses() {
+        return this.client?.getOffenses() ?? Promise.reject(new Error('Slasher client not initialized'));
     }
     getProposerActions(slotNumber) {
         return this.client?.getProposerActions(slotNumber) ?? Promise.reject(new Error('Slasher client not initialized'));
     }
     createSlasherClient() {
-        return createSlasherImplementation(this.config, this.rollup, this.l1Client, this.slashFactoryAddress, this.watchers, this.epochCache, this.dateProvider, this.kvStore, this.logger);
+        return createSlasherImplementation(this.config, this.rollup, this.l1Client, this.watchers, this.epochCache, this.dateProvider, this.kvStore, this.rollupRegisteredAtL2Slot, this.logger);
     }
     async handleSlasherChange() {
         this.logger.warn('Slasher contract changed, recreating slasher client');

package/dest/slasher_client_interface.d.ts

@@ -1,31 +1,17 @@
 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';
-/**
- * Common interface for slasher clients used by the Aztec node.
- * Both Empire and Consensus slasher clients implement this interface.
- */
+import type { Offense, ProposerSlashAction } from '@aztec/stdlib/slashing';
+/** Common interface for slasher clients used by the Aztec node. */
 export interface SlasherClientInterface {
     /** Start the slasher client */
     start(): Promise<void>;
     /** 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[]>;
-    /**
-     * Update the configuration.
-     * Used by both Empire and Consensus models.
-     */
+    /** Returns all offenses */
+    getOffenses(): Promise<Offense[]>;
+    /** Update the configuration. */
     updateConfig(config: Partial<SlasherConfig>): void;
     /**
      * Get the actions the proposer should take for slashing.
@@ -36,4 +22,4 @@ export interface SlasherClientInterface {
     /** Returns the current config */
     getConfig(): SlasherConfig;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xhc2hlcl9jbGllbnRfaW50ZXJmYWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc2xhc2hlcl9jbGllbnRfaW50ZXJmYWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2xFLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlGOzs7R0FHRztBQUNILE1BQU0sV0FBVyxzQkFBc0I7SUFDckMsK0JBQStCO0lBQy9CLEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFdkIsOEJBQThCO0lBQzlCLElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFdEI7OztPQUdHO0lBQ0gsZ0JBQWdCLElBQUksT0FBTyxDQUFDLGlCQUFpQixFQUFFLENBQUMsQ0FBQztJQUVqRDs7O09BR0c7SUFDSCxzQkFBc0IsQ0FBQyxLQUFLLENBQUMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7SUFFM0QsbUNBQW1DO0lBQ25DLGtCQUFrQixJQUFJLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBRXpDOzs7T0FHRztJQUNILFlBQVksQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLGFBQWEsQ0FBQyxHQUFHLElBQUksQ0FBQztJQUVuRDs7OztPQUlHO0lBQ0gsa0JBQWtCLENBQUMsVUFBVSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsbUJBQW1CLEVBQUUsQ0FBQyxDQUFDO0lBRTNFLGlDQUFpQztJQUNqQyxTQUFTLElBQUksYUFBYSxDQUFDO0NBQzVCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xhc2hlcl9jbGllbnRfaW50ZXJmYWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc2xhc2hlcl9jbGllbnRfaW50ZXJmYWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2xFLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTNFLG1FQUFtRTtBQUNuRSxNQUFNLFdBQVcsc0JBQXNCO0lBQ3JDLCtCQUErQjtJQUMvQixLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXZCLDhCQUE4QjtJQUM5QixJQUFJLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXRCLDhEQUE4RDtJQUM5RCxzQkFBc0IsQ0FBQyxLQUFLLENBQUMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7SUFFM0QsMkJBQTJCO0lBQzNCLFdBQVcsSUFBSSxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztJQUVsQyxnQ0FBZ0M7SUFDaEMsWUFBWSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsYUFBYSxDQUFDLEdBQUcsSUFBSSxDQUFDO0lBRW5EOzs7O09BSUc7SUFDSCxrQkFBa0IsQ0FBQyxVQUFVLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsRUFBRSxDQUFDLENBQUM7SUFFM0UsaUNBQWlDO0lBQ2pDLFNBQVMsSUFBSSxhQUFhLENBQUM7Q0FDNUIifQ==

package/dest/slasher_client_interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"slasher_client_interface.d.ts","sourceRoot":"","sources":["../src/slasher_client_interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE9F;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC,+BAA+B;IAC/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB,8BAA8B;IAC9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB;;;OAGG;IACH,gBAAgB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAEjD;;;OAGG;IACH,sBAAsB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAE3D,mCAAmC;IACnC,kBAAkB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAEzC;;;OAGG;IACH,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;IAEnD;;;;OAIG;IACH,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;IAE3E,iCAAiC;IACjC,SAAS,IAAI,aAAa,CAAC;CAC5B"}
+{"version":3,"file":"slasher_client_interface.d.ts","sourceRoot":"","sources":["../src/slasher_client_interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE3E,mEAAmE;AACnE,MAAM,WAAW,sBAAsB;IACrC,+BAA+B;IAC/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB,8BAA8B;IAC9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB,8DAA8D;IAC9D,sBAAsB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAE3D,2BAA2B;IAC3B,WAAW,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAElC,gCAAgC;IAChC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;IAEnD;;;;OAIG;IACH,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;IAE3E,iCAAiC;IACjC,SAAS,IAAI,aAAa,CAAC;CAC5B"}

package/dest/slasher_client_interface.js

@@ -1,4 +1 @@
-/**
- * Common interface for slasher clients used by the Aztec node.
- * Both Empire and Consensus slasher clients implement this interface.
- */ export { };
+/** Common interface for slasher clients used by the Aztec node. */ export { };

package/dest/stores/offenses_store.d.ts

@@ -1,14 +1,15 @@
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import { type Offense, type OffenseIdentifier } from '@aztec/stdlib/slashing';
 export declare const SCHEMA_VERSION = 1;
+type ClearOffensesFilter = Pick<Offense, 'offenseType' | 'epochOrSlot'> & {
+    validators?: Offense['validator'][];
+};
 export declare class SlasherOffensesStore {
     private kvStore;
     private settings;
     /** Map from offense key to offense data */
     private offenses;
-    /** Map from offense key to whether the offense has been executed (only used for empire based slashing) */
-    private offensesSlashed;
-    /** Multimap from round to offense keys (only used for consensus based slashing) */
+    /** Multimap from round to offense keys */
     private roundsOffenses;
     private log;
     constructor(kvStore: AztecAsyncKVStore, settings: {
@@ -16,22 +17,21 @@ export declare class SlasherOffensesStore {
         epochDuration: number;
         slashOffenseExpirationRounds?: number;
     });
-    /** Returns all offenses not marked as slashed */
-    getPendingOffenses(): Promise<Offense[]>;
+    /** Returns all offenses */
+    getOffenses(): Promise<Offense[]>;
     /** Returns all offenses tracked for the given round */
     getOffensesForRound(round: bigint): Promise<Offense[]>;
-    /** Returns whether an offense is pending (ie not marked as slashed) */
-    hasPendingOffense(offense: OffenseIdentifier): Promise<boolean>;
     /** Returns whether we have seen this offense */
     hasOffense(offense: OffenseIdentifier): Promise<boolean>;
-    /** Adds a new offense (defaults to pending, but will be slashed if markAsSlashed had been called for it) */
-    addPendingOffense(offense: Offense): Promise<void>;
-    /** Marks the given offenses as slashed (regardless of whether they are known or not)  */
-    markAsSlashed(offenses: OffenseIdentifier[]): Promise<void>;
+    /** Adds a new offense. Returns false if the offense is already pending. */
+    addOffense(offense: Offense): Promise<boolean>;
+    /** Removes pending offenses matching the given offense type, epoch/slot, and optional validators. */
+    clearOffenses(filter: ClearOffensesFilter): Promise<number>;
     /** Prunes all offenses expired from the store */
     clearExpiredOffenses(currentRound: bigint): Promise<number>;
     /** Generate a unique key for an offense */
     private getOffenseKey;
     private getRoundKey;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2ZmZW5zZXNfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZXMvb2ZmZW5zZXNfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQW9ELE1BQU0saUJBQWlCLENBQUM7QUFDM0csT0FBTyxFQUNMLEtBQUssT0FBTyxFQUNaLEtBQUssaUJBQWlCLEVBSXZCLE1BQU0sd0JBQXdCLENBQUM7QUFFaEMsZUFBTyxNQUFNLGNBQWMsSUFBSSxDQUFDO0FBRWhDLHFCQUFhLG9CQUFvQjtJQWE3QixPQUFPLENBQUMsT0FBTztJQUNmLE9BQU8sQ0FBQyxRQUFRO0lBYmxCLDJDQUEyQztJQUMzQyxPQUFPLENBQUMsUUFBUSxDQUFnQztJQUVoRCwwR0FBMEc7SUFDMUcsT0FBTyxDQUFDLGVBQWUsQ0FBd0I7SUFFL0MsbUZBQW1GO0lBQ25GLE9BQU8sQ0FBQyxjQUFjLENBQXFDO0lBRTNELE9BQU8sQ0FBQyxHQUFHLENBQTBDO0lBRXJELFlBQ1UsT0FBTyxFQUFFLGlCQUFpQixFQUMxQixRQUFRLEVBQUU7UUFDaEIsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO1FBQzFCLGFBQWEsRUFBRSxNQUFNLENBQUM7UUFDdEIsNEJBQTRCLENBQUMsRUFBRSxNQUFNLENBQUM7S0FDdkMsRUFLRjtJQUVELGlEQUFpRDtJQUNwQyxrQkFBa0IsSUFBSSxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FVcEQ7SUFFRCx1REFBdUQ7SUFDMUMsbUJBQW1CLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FVbEU7SUFFRCx1RUFBdUU7SUFDMUQsaUJBQWlCLENBQUMsT0FBTyxFQUFFLGlCQUFpQixHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FHM0U7SUFFRCxnREFBZ0Q7SUFDbkMsVUFBVSxDQUFDLE9BQU8sRUFBRSxpQkFBaUIsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBR3BFO0lBRUQsNEdBQTRHO0lBQy9GLGlCQUFpQixDQUFDLE9BQU8sRUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVE5RDtJQUVELHlGQUF5RjtJQUM1RSxhQUFhLENBQUMsUUFBUSxFQUFFLGlCQUFpQixFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU92RTtJQUVELGlEQUFpRDtJQUNwQyxvQkFBb0IsQ0FBQyxZQUFZLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0F1Q3ZFO0lBRUQsMkNBQTJDO0lBQzNDLE9BQU8sQ0FBQyxhQUFhO0lBSXJCLE9BQU8sQ0FBQyxXQUFXO0NBR3BCIn0=
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2ZmZW5zZXNfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZXMvb2ZmZW5zZXNfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQXFDLE1BQU0saUJBQWlCLENBQUM7QUFDNUYsT0FBTyxFQUNMLEtBQUssT0FBTyxFQUNaLEtBQUssaUJBQWlCLEVBSXZCLE1BQU0sd0JBQXdCLENBQUM7QUFFaEMsZUFBTyxNQUFNLGNBQWMsSUFBSSxDQUFDO0FBRWhDLEtBQUssbUJBQW1CLEdBQUcsSUFBSSxDQUFDLE9BQU8sRUFBRSxhQUFhLEdBQUcsYUFBYSxDQUFDLEdBQUc7SUFDeEUsVUFBVSxDQUFDLEVBQUUsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUM7Q0FDckMsQ0FBQztBQUVGLHFCQUFhLG9CQUFvQjtJQVU3QixPQUFPLENBQUMsT0FBTztJQUNmLE9BQU8sQ0FBQyxRQUFRO0lBVmxCLDJDQUEyQztJQUMzQyxPQUFPLENBQUMsUUFBUSxDQUFnQztJQUVoRCwwQ0FBMEM7SUFDMUMsT0FBTyxDQUFDLGNBQWMsQ0FBcUM7SUFFM0QsT0FBTyxDQUFDLEdBQUcsQ0FBMEM7SUFFckQsWUFDVSxPQUFPLEVBQUUsaUJBQWlCLEVBQzFCLFFBQVEsRUFBRTtRQUNoQixpQkFBaUIsRUFBRSxNQUFNLENBQUM7UUFDMUIsYUFBYSxFQUFFLE1BQU0sQ0FBQztRQUN0Qiw0QkFBNEIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztLQUN2QyxFQUlGO0lBRUQsMkJBQTJCO0lBQ2QsV0FBVyxJQUFJLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQU03QztJQUVELHVEQUF1RDtJQUMxQyxtQkFBbUIsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQVVsRTtJQUVELGdEQUFnRDtJQUNuQyxVQUFVLENBQUMsT0FBTyxFQUFFLGlCQUFpQixHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FHcEU7SUFFRCwyRUFBMkU7SUFDOUQsVUFBVSxDQUFDLE9BQU8sRUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQWtCMUQ7SUFFRCxxR0FBcUc7SUFDeEYsYUFBYSxDQUFDLE1BQU0sRUFBRSxtQkFBbUIsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBbUN2RTtJQUVELGlEQUFpRDtJQUNwQyxvQkFBb0IsQ0FBQyxZQUFZLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FxQ3ZFO0lBRUQsMkNBQTJDO0lBQzNDLE9BQU8sQ0FBQyxhQUFhO0lBSXJCLE9BQU8sQ0FBQyxXQUFXO0NBR3BCIn0=

package/dest/stores/offenses_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"offenses_store.d.ts","sourceRoot":"","sources":["../../src/stores/offenses_store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAoD,MAAM,iBAAiB,CAAC;AAC3G,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,iBAAiB,EAIvB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,cAAc,IAAI,CAAC;AAEhC,qBAAa,oBAAoB;IAa7B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,QAAQ;IAblB,2CAA2C;IAC3C,OAAO,CAAC,QAAQ,CAAgC;IAEhD,0GAA0G;IAC1G,OAAO,CAAC,eAAe,CAAwB;IAE/C,mFAAmF;IACnF,OAAO,CAAC,cAAc,CAAqC;IAE3D,OAAO,CAAC,GAAG,CAA0C;IAErD,YACU,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE;QAChB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,aAAa,EAAE,MAAM,CAAC;QACtB,4BAA4B,CAAC,EAAE,MAAM,CAAC;KACvC,EAKF;IAED,iDAAiD;IACpC,kBAAkB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAUpD;IAED,uDAAuD;IAC1C,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAUlE;IAED,uEAAuE;IAC1D,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,CAG3E;IAED,gDAAgD;IACnC,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,CAGpE;IAED,4GAA4G;IAC/F,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ9D;IAED,yFAAyF;IAC5E,aAAa,CAAC,QAAQ,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAOvE;IAED,iDAAiD;IACpC,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAuCvE;IAED,2CAA2C;IAC3C,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,WAAW;CAGpB"}
+{"version":3,"file":"offenses_store.d.ts","sourceRoot":"","sources":["../../src/stores/offenses_store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,iBAAiB,EAIvB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,cAAc,IAAI,CAAC;AAEhC,KAAK,mBAAmB,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,CAAC,GAAG;IACxE,UAAU,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;CACrC,CAAC;AAEF,qBAAa,oBAAoB;IAU7B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,QAAQ;IAVlB,2CAA2C;IAC3C,OAAO,CAAC,QAAQ,CAAgC;IAEhD,0CAA0C;IAC1C,OAAO,CAAC,cAAc,CAAqC;IAE3D,OAAO,CAAC,GAAG,CAA0C;IAErD,YACU,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE;QAChB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,aAAa,EAAE,MAAM,CAAC;QACtB,4BAA4B,CAAC,EAAE,MAAM,CAAC;KACvC,EAIF;IAED,2BAA2B;IACd,WAAW,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAM7C;IAED,uDAAuD;IAC1C,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAUlE;IAED,gDAAgD;IACnC,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,CAGpE;IAED,2EAA2E;IAC9D,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAkB1D;IAED,qGAAqG;IACxF,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,CAmCvE;IAED,iDAAiD;IACpC,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAqCvE;IAED,2CAA2C;IAC3C,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,WAAW;CAGpB"}

package/dest/stores/offenses_store.js

@@ -5,8 +5,7 @@ export class SlasherOffensesStore {
     kvStore;
     settings;
     /** Map from offense key to offense data */ offenses;
-    /** Map from offense key to whether the offense has been executed (only used for empire based slashing) */ offensesSlashed;
-    /** Multimap from round to offense keys (only used for consensus based slashing) */ roundsOffenses;
+    /** Multimap from round to offense keys */ roundsOffenses;
     log;
     constructor(kvStore, settings){
         this.kvStore = kvStore;
@@ -14,16 +13,11 @@ export class SlasherOffensesStore {
         this.log = createLogger('slasher:store:offenses');
         this.offenses = kvStore.openMap('offenses');
         this.roundsOffenses = kvStore.openMultiMap('rounds-offenses');
-        this.offensesSlashed = kvStore.openSet('offenses-slashed');
     }
-    /** Returns all offenses not marked as slashed */ async getPendingOffenses() {
+    /** Returns all offenses */ async getOffenses() {
         const offenses = [];
-        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;
     }
@@ -38,29 +32,60 @@ export class SlasherOffensesStore {
         }
         return offenses;
     }
-    /** Returns whether an offense is pending (ie not marked as slashed) */ async hasPendingOffense(offense) {
-        const key = this.getOffenseKey(offense);
-        return await this.offenses.getAsync(key) !== undefined && !await this.offensesSlashed.hasAsync(key);
-    }
     /** Returns whether we have seen this offense */ async hasOffense(offense) {
         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) */ async addPendingOffense(offense) {
+    /** Adds a new offense. Returns false if the offense is already pending. */ async addOffense(offense) {
         const key = this.getOffenseKey(offense);
         const round = getRoundForOffense(offense, this.settings);
-        await this.kvStore.transactionAsync(async ()=>{
+        const added = await this.kvStore.transactionAsync(async ()=>{
+            if (await this.offenses.getAsync(key) !== undefined) {
+                return false;
+            }
             await this.offenses.set(key, serializeOffense(offense));
             await this.roundsOffenses.set(this.getRoundKey(round), key);
+            return true;
         });
-        this.log.trace(`Adding pending offense ${key} for round ${round}`);
+        if (added) {
+            this.log.trace(`Adding pending offense ${key} for round ${round}`);
+        }
+        return added;
     }
-    /** Marks the given offenses as slashed (regardless of whether they are known or not)  */ async markAsSlashed(offenses) {
-        await this.kvStore.transactionAsync(async ()=>{
-            for (const offense of offenses){
-                const key = this.getOffenseKey(offense);
-                await this.offensesSlashed.add(key);
+    /** Removes pending offenses matching the given offense type, epoch/slot, and optional validators. */ async clearOffenses(filter) {
+        return await this.kvStore.transactionAsync(async ()=>{
+            const offensesToClear = new Map();
+            if (filter.validators && filter.validators.length > 0) {
+                for (const validator of filter.validators){
+                    const identifier = {
+                        validator,
+                        offenseType: filter.offenseType,
+                        epochOrSlot: filter.epochOrSlot
+                    };
+                    const key = this.getOffenseKey(identifier);
+                    const buffer = await this.offenses.getAsync(key);
+                    if (buffer) {
+                        offensesToClear.set(key, deserializeOffense(buffer));
+                    }
+                }
+            } else {
+                for await (const [key, buffer] of this.offenses.entriesAsync()){
+                    const offense = deserializeOffense(buffer);
+                    if (offense.offenseType === filter.offenseType && offense.epochOrSlot === filter.epochOrSlot) {
+                        offensesToClear.set(key, offense);
+                    }
+                }
+            }
+            if (offensesToClear.size === 0) {
+                return 0;
             }
+            for (const [key, offense] of offensesToClear){
+                const round = getRoundForOffense(offense, this.settings);
+                await this.offenses.delete(key);
+                await this.roundsOffenses.deleteValue(this.getRoundKey(round), key);
+                this.log.trace(`Cleared pending offense ${key} for round ${round}`);
+            }
+            return offensesToClear.size;
         });
     }
     /** Prunes all offenses expired from the store */ async clearExpiredOffenses(currentRound) {
@@ -72,31 +97,29 @@ export class SlasherOffensesStore {
         if (expiredBefore < 0) {
             return 0; // Not enough rounds have passed to expire anything
         }
-        // Collect expired offenses and rounds
-        const expiredRoundKeys = new Set();
-        const expiredOffenseKeys = new Set();
-        for await (const [roundKey, offenseKey] of this.roundsOffenses.entriesAsync({
-            end: this.getRoundKey(expiredBefore)
-        })){
-            expiredOffenseKeys.add(offenseKey);
-            expiredRoundKeys.add(roundKey);
-        }
-        if (expiredOffenseKeys.size === 0 && expiredRoundKeys.size === 0) {
-            return 0; // Nothing to clean up
-        }
-        // Remove expired stuff in a transaction
-        await this.kvStore.transactionAsync(async ()=>{
+        return await this.kvStore.transactionAsync(async ()=>{
+            // Collect expired offenses and rounds
+            const expiredRoundKeys = new Set();
+            const expiredOffenseKeys = new Set();
+            for await (const [roundKey, offenseKey] of this.roundsOffenses.entriesAsync({
+                end: this.getRoundKey(expiredBefore)
+            })){
+                expiredOffenseKeys.add(offenseKey);
+                expiredRoundKeys.add(roundKey);
+            }
+            if (expiredOffenseKeys.size === 0 && expiredRoundKeys.size === 0) {
+                return 0; // Nothing to clean up
+            }
             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}`);
                 await this.roundsOffenses.delete(roundKey);
             }
+            return expiredOffenseKeys.size;
         });
-        return expiredOffenseKeys.size;
     }
     /** Generate a unique key for an offense */ getOffenseKey(offense) {
         return `${offense.validator.toString()}:${offense.offenseType}:${offense.epochOrSlot}`;