@aztec/slasher 1.2.0 → 2.0.0-nightly.20250813

package/dest/attestations_block_watcher.d.ts

@@ -0,0 +1,34 @@
+import { EpochCache } from '@aztec/epoch-cache';
+import { type L2BlockSourceEventEmitter } from '@aztec/stdlib/block';
+import { type SlasherConfig, type WantToSlashArgs, type Watcher, type WatcherEmitter } from './config.js';
+declare const AttestationsBlockWatcher_base: new () => WatcherEmitter;
+/**
+ * This watcher is responsible for detecting invalid blocks and creating slashing arguments for offenders.
+ * An invalid block is one that doesn't have enough attestations or has incorrect attestations.
+ * The proposer of an invalid block should be slashed.
+ * If there's another block consecutive to the invalid one, its proposer and attestors should also be slashed.
+ */
+export declare class AttestationsBlockWatcher extends AttestationsBlockWatcher_base implements Watcher {
+    private l2BlockSource;
+    private epochCache;
+    private config;
+    private log;
+    private maxInvalidBlocks;
+    private invalidArchiveRoots;
+    private badAttestors;
+    private badProposers;
+    private boundHandleInvalidBlock;
+    constructor(l2BlockSource: L2BlockSourceEventEmitter, epochCache: EpochCache, config: Pick<SlasherConfig, 'slashAttestDescendantOfInvalidPenalty' | 'slashAttestDescendantOfInvalidMaxPenalty' | 'slashProposeInvalidAttestationsPenalty' | 'slashProposeInvalidAttestationsMaxPenalty'>);
+    start(): Promise<void>;
+    stop(): Promise<void>;
+    shouldSlash({ amount, offense, validator }: WantToSlashArgs): Promise<boolean>;
+    private handleInvalidBlock;
+    private slashAttestorsOnAncestorInvalid;
+    private slashProposer;
+    private getOffenseFromInvalidationReason;
+    private getMaxPenalty;
+    private hasOffended;
+    private addInvalidBlock;
+}
+export {};
+//# sourceMappingURL=attestations_block_watcher.d.ts.map

package/dest/attestations_block_watcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"attestations_block_watcher.d.ts","sourceRoot":"","sources":["../src/attestations_block_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAGL,KAAK,yBAAyB,EAI/B,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,eAAe,EACpB,KAAK,OAAO,EACZ,KAAK,cAAc,EACpB,MAAM,aAAa,CAAC;6CAQ0C,UAAU,cAAc;AANvF;;;;;GAKG;AACH,qBAAa,wBAAyB,SAAQ,6BAA2C,YAAW,OAAO;IA0BvG,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;IA3BhB,OAAO,CAAC,GAAG,CAAsD;IAGjE,OAAO,CAAC,gBAAgB,CAAO;IAG/B,OAAO,CAAC,mBAAmB,CAA0B;IAGrD,OAAO,CAAC,YAAY,CAA0B;IAC9C,OAAO,CAAC,YAAY,CAA0B;IAE9C,OAAO,CAAC,uBAAuB,CAU7B;gBAGQ,aAAa,EAAE,yBAAyB,EACxC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,IAAI,CAClB,aAAa,EACX,uCAAuC,GACvC,0CAA0C,GAC1C,wCAAwC,GACxC,2CAA2C,CAC9C;IAMI,KAAK;IAKL,IAAI;IAQJ,WAAW,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IAiBrF,OAAO,CAAC,kBAAkB;IAyB1B,OAAO,CAAC,+BAA+B;IAyBvC,OAAO,CAAC,aAAa;IAwBrB,OAAO,CAAC,gCAAgC;IAaxC,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,eAAe;CASxB"}

package/dest/attestations_block_watcher.js

@@ -0,0 +1,170 @@
+import { createLogger } from '@aztec/foundation/log';
+import { L2BlockSourceEvents } from '@aztec/stdlib/block';
+import { Offense } from '@aztec/stdlib/slashing';
+import EventEmitter from 'node:events';
+import { WANT_TO_SLASH_EVENT } from './config.js';
+/**
+ * This watcher is responsible for detecting invalid blocks and creating slashing arguments for offenders.
+ * An invalid block is one that doesn't have enough attestations or has incorrect attestations.
+ * The proposer of an invalid block should be slashed.
+ * If there's another block consecutive to the invalid one, its proposer and attestors should also be slashed.
+ */ export class AttestationsBlockWatcher extends EventEmitter {
+    l2BlockSource;
+    epochCache;
+    config;
+    log;
+    // Only keep track of the last N invalid blocks
+    maxInvalidBlocks;
+    // All invalid archive roots seen
+    invalidArchiveRoots;
+    // TODO(#16140): Bad validators are never cleared even after slashing
+    badAttestors;
+    badProposers;
+    boundHandleInvalidBlock;
+    constructor(l2BlockSource, epochCache, config){
+        super(), this.l2BlockSource = l2BlockSource, this.epochCache = epochCache, this.config = config, this.log = createLogger('attestations-block-watcher'), this.maxInvalidBlocks = 100, this.invalidArchiveRoots = new Set(), this.badAttestors = new Set(), this.badProposers = new Set(), this.boundHandleInvalidBlock = (event)=>{
+            try {
+                this.handleInvalidBlock(event);
+            } catch (err) {
+                this.log.error('Error handling invalid block', err, {
+                    ...event.validationResult.block.block.toBlockInfo(),
+                    ...event.validationResult.block.l1,
+                    reason: event.validationResult.reason
+                });
+            }
+        };
+        this.log.info('InvalidBlockWatcher initialized');
+    }
+    start() {
+        this.l2BlockSource.on(L2BlockSourceEvents.InvalidAttestationsBlockDetected, this.boundHandleInvalidBlock);
+        return Promise.resolve();
+    }
+    stop() {
+        this.l2BlockSource.removeListener(L2BlockSourceEvents.InvalidAttestationsBlockDetected, this.boundHandleInvalidBlock);
+        return Promise.resolve();
+    }
+    shouldSlash({ amount, offense, validator }) {
+        const maxPenalty = this.getMaxPenalty(offense);
+        const logData = {
+            validator,
+            amount,
+            offense,
+            maxPenalty
+        };
+        if (amount > maxPenalty) {
+            this.log.warn(`Slash amount ${amount} exceeds maximum penalty ${maxPenalty} for offense ${offense}`, logData);
+            return Promise.resolve(false);
+        }
+        if (this.hasOffended(offense, validator)) {
+            this.log.verbose(`Agreeing to slash validator ${validator} for offense ${offense}`, logData);
+            return Promise.resolve(true);
+        }
+        this.log.debug(`Refusing to slash validator ${validator} for offense ${offense}`, logData);
+        return Promise.resolve(false);
+    }
+    handleInvalidBlock(event) {
+        const { validationResult } = event;
+        const block = validationResult.block.block;
+        // Check if we already have processed this block, archiver may emit the same event multiple times
+        if (this.invalidArchiveRoots.has(block.archive.root.toString())) {
+            this.log.trace(`Already processed invalid block ${block.number}`);
+            return;
+        }
+        this.log.verbose(`Detected invalid block ${block.number}`, {
+            ...block.toBlockInfo(),
+            reason: validationResult.valid === false ? validationResult.reason : 'unknown'
+        });
+        // Store the invalid block
+        this.addInvalidBlock(event.validationResult.block);
+        // Slash the proposer of the invalid block
+        this.slashProposer(event.validationResult);
+        // Check if the parent of this block is invalid as well, if so, we will slash its attestors as well
+        this.slashAttestorsOnAncestorInvalid(event.validationResult);
+    }
+    slashAttestorsOnAncestorInvalid(validationResult) {
+        const block = validationResult.block;
+        const parentArchive = block.block.header.lastArchive.root.toString();
+        if (this.invalidArchiveRoots.has(block.block.header.lastArchive.root.toString())) {
+            const attestors = validationResult.attestations.map((a)=>a.getSender());
+            this.log.info(`Want to slash attestors of block ${block.block.number} built on invalid block`, {
+                ...block.block.toBlockInfo(),
+                ...attestors,
+                parentArchive
+            });
+            attestors.forEach((attestor)=>this.badAttestors.add(attestor.toString()));
+            this.emit(WANT_TO_SLASH_EVENT, attestors.map((attestor)=>({
+                    validator: attestor,
+                    amount: this.config.slashAttestDescendantOfInvalidPenalty,
+                    offense: Offense.ATTESTED_DESCENDANT_OF_INVALID
+                })));
+        }
+    }
+    slashProposer(validationResult) {
+        const { reason, block } = validationResult;
+        const blockNumber = block.block.number;
+        const slot = block.block.header.getSlot();
+        const proposer = this.epochCache.getProposerFromEpochCommittee(validationResult, slot);
+        if (!proposer) {
+            this.log.warn(`No proposer found for block ${blockNumber} at slot ${slot}`);
+            return;
+        }
+        const offense = this.getOffenseFromInvalidationReason(reason);
+        const amount = this.config.slashProposeInvalidAttestationsPenalty;
+        const args = {
+            validator: proposer,
+            amount,
+            offense
+        };
+        this.log.info(`Want to slash proposer of block ${blockNumber} due to ${reason}`, {
+            ...block.block.toBlockInfo(),
+            ...args
+        });
+        this.badProposers.add(proposer.toString());
+        this.emit(WANT_TO_SLASH_EVENT, [
+            args
+        ]);
+    }
+    getOffenseFromInvalidationReason(reason) {
+        switch(reason){
+            case 'invalid-attestation':
+                return Offense.PROPOSED_INCORRECT_ATTESTATIONS;
+            case 'insufficient-attestations':
+                return Offense.PROPOSED_INSUFFICIENT_ATTESTATIONS;
+            default:
+                {
+                    const _ = reason;
+                    return Offense.UNKNOWN;
+                }
+        }
+    }
+    getMaxPenalty(offense) {
+        switch(offense){
+            case Offense.PROPOSED_INCORRECT_ATTESTATIONS:
+            case Offense.PROPOSED_INSUFFICIENT_ATTESTATIONS:
+                return this.config.slashProposeInvalidAttestationsMaxPenalty;
+            case Offense.ATTESTED_DESCENDANT_OF_INVALID:
+                return this.config.slashProposeInvalidAttestationsMaxPenalty;
+            default:
+                return 0n;
+        }
+    }
+    hasOffended(offense, validator) {
+        switch(offense){
+            case Offense.PROPOSED_INCORRECT_ATTESTATIONS:
+            case Offense.PROPOSED_INSUFFICIENT_ATTESTATIONS:
+                return this.badProposers.has(validator.toString());
+            case Offense.ATTESTED_DESCENDANT_OF_INVALID:
+                return this.badAttestors.has(validator.toString());
+            default:
+                return false;
+        }
+    }
+    addInvalidBlock(block) {
+        this.invalidArchiveRoots.add(block.block.archive.root.toString());
+        // Prune old entries if we exceed the maximum
+        if (this.invalidArchiveRoots.size > this.maxInvalidBlocks) {
+            const oldestKey = this.invalidArchiveRoots.keys().next().value;
+            this.invalidArchiveRoots.delete(oldestKey);
+        }
+    }
+}

package/dest/config.d.ts

@@ -1,15 +1,9 @@
 import type { ConfigMappingsType } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { TypedEventEmitter } from '@aztec/foundation/types';
-export declare enum Offense {
-    UNKNOWN = 0,
-    DATA_WITHHOLDING = 1,
-    VALID_EPOCH_PRUNED = 2,
-    INACTIVITY = 3,
-    INVALID_BLOCK = 4
-}
-export declare const OffenseToBigInt: Record<Offense, bigint>;
-export declare function bigIntToOffense(offense: bigint): Offense;
+import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
+import { Offense } from '@aztec/stdlib/slashing';
+export type { SlasherConfig };
 export declare const WANT_TO_SLASH_EVENT: "wantToSlash";
 export interface WantToSlashArgs {
     validator: EthAddress;
@@ -26,22 +20,6 @@ export type Watcher = WatcherEmitter & {
     start?: () => Promise<void>;
     stop?: () => Promise<void>;
 };
-export interface SlasherConfig {
-    slashOverridePayload?: EthAddress;
-    slashPayloadTtlSeconds: number;
-    slashPruneEnabled: boolean;
-    slashPrunePenalty: bigint;
-    slashPruneMaxPenalty: bigint;
-    slashInvalidBlockEnabled: boolean;
-    slashInvalidBlockPenalty: bigint;
-    slashInvalidBlockMaxPenalty: bigint;
-    slashInactivityEnabled: boolean;
-    slashInactivityCreateTargetPercentage: number;
-    slashInactivitySignalTargetPercentage: number;
-    slashInactivityCreatePenalty: bigint;
-    slashInactivityMaxPenalty: bigint;
-    slashProposerRoundPollingIntervalSeconds: number;
-}
 export declare const DefaultSlasherConfig: SlasherConfig;
 export declare const slasherConfigMappings: ConfigMappingsType<SlasherConfig>;
 //# sourceMappingURL=config.d.ts.map

package/dest/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAOnE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,oBAAY,OAAO;IACjB,OAAO,IAAI;IACX,gBAAgB,IAAI;IACpB,kBAAkB,IAAI;IACtB,UAAU,IAAI;IACd,aAAa,IAAI;CAClB;AAED,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAMnD,CAAC;AAEF,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAexD;AAED,eAAO,MAAM,mBAAmB,EAAG,aAAsB,CAAC;AAE1D,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,UAAU,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAGD,MAAM,WAAW,eAAe;IAC9B,CAAC,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;CAC1D;AAED,MAAM,MAAM,cAAc,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAC;AAEhE,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAEvE,MAAM,MAAM,OAAO,GAAG,cAAc,GAAG;IACrC,WAAW,EAAE,YAAY,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAEF,MAAM,WAAW,aAAa;IAE5B,oBAAoB,CAAC,EAAE,UAAU,CAAC;IAClC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,wBAAwB,EAAE,OAAO,CAAC;IAClC,wBAAwB,EAAE,MAAM,CAAC;IACjC,2BAA2B,EAAE,MAAM,CAAC;IACpC,sBAAsB,EAAE,OAAO,CAAC;IAChC,qCAAqC,EAAE,MAAM,CAAC;IAC9C,qCAAqC,EAAE,MAAM,CAAC;IAC9C,4BAA4B,EAAE,MAAM,CAAC;IACrC,yBAAyB,EAAE,MAAM,CAAC;IAClC,wCAAwC,EAAE,MAAM,CAAC;CAElD;AAED,eAAO,MAAM,oBAAoB,EAAE,aAelC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,kBAAkB,CAAC,aAAa,CAiFnE,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AASnE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,YAAY,EAAE,aAAa,EAAE,CAAC;AAE9B,eAAO,MAAM,mBAAmB,EAAG,aAAsB,CAAC;AAE1D,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,UAAU,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAGD,MAAM,WAAW,eAAe;IAC9B,CAAC,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;CAC1D;AAED,MAAM,MAAM,cAAc,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAC;AAEhE,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAEvE,MAAM,MAAM,OAAO,GAAG,cAAc,GAAG;IACrC,WAAW,EAAE,YAAY,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAoBlC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,kBAAkB,CAAC,aAAa,CAyGnE,CAAC"}

package/dest/config.js

@@ -1,36 +1,6 @@
-import { bigintConfigHelper, booleanConfigHelper, floatConfigHelper, numberConfigHelper } from '@aztec/foundation/config';
+import { NULL_KEY } from '@aztec/ethereum';
+import { SecretValue, bigintConfigHelper, booleanConfigHelper, floatConfigHelper, numberConfigHelper, secretValueConfigHelper } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
-export var Offense = /*#__PURE__*/ function(Offense) {
-    Offense[Offense["UNKNOWN"] = 0] = "UNKNOWN";
-    Offense[Offense["DATA_WITHHOLDING"] = 1] = "DATA_WITHHOLDING";
-    Offense[Offense["VALID_EPOCH_PRUNED"] = 2] = "VALID_EPOCH_PRUNED";
-    Offense[Offense["INACTIVITY"] = 3] = "INACTIVITY";
-    Offense[Offense["INVALID_BLOCK"] = 4] = "INVALID_BLOCK";
-    return Offense;
-}({});
-export const OffenseToBigInt = {
-    [0]: 0n,
-    [1]: 1n,
-    [2]: 2n,
-    [3]: 3n,
-    [4]: 4n
-};
-export function bigIntToOffense(offense) {
-    switch(offense){
-        case 0n:
-            return 0;
-        case 1n:
-            return 1;
-        case 2n:
-            return 2;
-        case 3n:
-            return 3;
-        case 4n:
-            return 4;
-        default:
-            throw new Error(`Unknown offense: ${offense}`);
-    }
-}
 export const WANT_TO_SLASH_EVENT = 'wantToSlash';
 export const DefaultSlasherConfig = {
     slashPayloadTtlSeconds: 60 * 60 * 24,
@@ -46,7 +16,12 @@ export const DefaultSlasherConfig = {
     slashInactivitySignalTargetPercentage: 0.6,
     slashInactivityCreatePenalty: 1n,
     slashInactivityMaxPenalty: 100n,
-    slashProposerRoundPollingIntervalSeconds: 12
+    slashProposeInvalidAttestationsPenalty: 1n,
+    slashProposeInvalidAttestationsMaxPenalty: 100n,
+    slashAttestDescendantOfInvalidPenalty: 1n,
+    slashAttestDescendantOfInvalidMaxPenalty: 100n,
+    slashProposerRoundPollingIntervalSeconds: 12,
+    slasherPrivateKey: new SecretValue(undefined)
 };
 export const slasherConfigMappings = {
     slashPayloadTtlSeconds: {
@@ -123,8 +98,32 @@ export const slasherConfigMappings = {
         description: 'Maximum penalty amount for slashing an inactive validator.',
         ...bigintConfigHelper(DefaultSlasherConfig.slashInactivityMaxPenalty)
     },
+    slashProposeInvalidAttestationsPenalty: {
+        env: 'SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY',
+        description: 'Penalty amount for slashing a proposer that proposed invalid attestations.',
+        ...bigintConfigHelper(DefaultSlasherConfig.slashProposeInvalidAttestationsPenalty)
+    },
+    slashProposeInvalidAttestationsMaxPenalty: {
+        env: 'SLASH_PROPOSE_INVALID_ATTESTATIONS_MAX_PENALTY',
+        description: 'Maximum penalty amount for slashing a proposer that proposed invalid attestations.',
+        ...bigintConfigHelper(DefaultSlasherConfig.slashProposeInvalidAttestationsMaxPenalty)
+    },
+    slashAttestDescendantOfInvalidPenalty: {
+        env: 'SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY',
+        description: 'Penalty amount for slashing a validator that attested to a descendant of an invalid block.',
+        ...bigintConfigHelper(DefaultSlasherConfig.slashAttestDescendantOfInvalidPenalty)
+    },
+    slashAttestDescendantOfInvalidMaxPenalty: {
+        env: 'SLASH_ATTEST_DESCENDANT_OF_INVALID_MAX_PENALTY',
+        description: 'Maximum penalty amount for slashing a validator that attested to a descendant of an invalid block.',
+        ...bigintConfigHelper(DefaultSlasherConfig.slashAttestDescendantOfInvalidMaxPenalty)
+    },
     slashProposerRoundPollingIntervalSeconds: {
         description: 'Polling interval for slashing proposer round in seconds.',
         ...numberConfigHelper(DefaultSlasherConfig.slashProposerRoundPollingIntervalSeconds)
+    },
+    slasherPrivateKey: {
+        description: 'Private key used for creating slash payloads.',
+        ...secretValueConfigHelper((val)=>val ? `0x${val.replace('0x', '')}` : NULL_KEY)
     }
 };

package/dest/epoch_prune_watcher.d.ts

@@ -1,6 +1,6 @@
 import { EpochCache } from '@aztec/epoch-cache';
 import { L2Block, type L2BlockSourceEventEmitter } from '@aztec/stdlib/block';
-import type { IFullNodeBlockBuilder, ITxCollector, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
+import type { IFullNodeBlockBuilder, ITxProvider, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
 import { type WantToSlashArgs, type Watcher, type WatcherEmitter } from './config.js';
 declare const EpochPruneWatcher_base: new () => WatcherEmitter;
@@ -14,14 +14,15 @@ export declare class EpochPruneWatcher extends EpochPruneWatcher_base implements
     private l2BlockSource;
     private l1ToL2MessageSource;
     private epochCache;
-    private txCollector;
+    private txProvider;
     private blockBuilder;
     private penalty;
     private maxPenalty;
     private log;
     private slashableCommittees;
     private maxSlashableEpochs;
-    constructor(l2BlockSource: L2BlockSourceEventEmitter, l1ToL2MessageSource: L1ToL2MessageSource, epochCache: EpochCache, txCollector: ITxCollector, blockBuilder: IFullNodeBlockBuilder, penalty: bigint, maxPenalty: bigint);
+    private boundHandlePruneL2Blocks;
+    constructor(l2BlockSource: L2BlockSourceEventEmitter, l1ToL2MessageSource: L1ToL2MessageSource, epochCache: EpochCache, txProvider: Pick<ITxProvider, 'getAvailableTxs'>, blockBuilder: IFullNodeBlockBuilder, penalty: bigint, maxPenalty: bigint);
     start(): Promise<void>;
     stop(): Promise<void>;
     private handlePruneL2Blocks;

package/dest/epoch_prune_watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"epoch_prune_watcher.d.ts","sourceRoot":"","sources":["../src/epoch_prune_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAEL,OAAO,EAEP,KAAK,yBAAyB,EAE/B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,qBAAqB,EAAE,YAAY,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AACtH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAUnE,OAAO,EAAgC,KAAK,eAAe,EAAE,KAAK,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;sCAQ5D,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,WAAW;IACnB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAdpB,OAAO,CAAC,GAAG,CAA+C;IAG1D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,kBAAkB,CAAO;gBAGvB,aAAa,EAAE,yBAAyB,EACxC,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,YAAY,EACzB,YAAY,EAAE,qBAAqB,EACnC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM;IAMrB,KAAK;IAKL,IAAI;IAKX,OAAO,CAAC,mBAAmB;IA8Cd,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;IA8BhG,OAAO,CAAC,oBAAoB;YAUd,qBAAqB;IASnC,OAAO,CAAC,wBAAwB;IAQhC,OAAO,CAAC,mBAAmB;IAIpB,WAAW,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;CAS7E"}
+{"version":3,"file":"epoch_prune_watcher.d.ts","sourceRoot":"","sources":["../src/epoch_prune_watcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAEL,OAAO,EAEP,KAAK,yBAAyB,EAE/B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,qBAAqB,EAAE,WAAW,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AACrH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAWnE,OAAO,EAAuB,KAAK,eAAe,EAAE,KAAK,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;sCAQnD,UAAU,cAAc;AANhF;;;;;GAKG;AACH,qBAAa,iBAAkB,SAAQ,sBAA2C,YAAW,OAAO;IAYhG,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAjBpB,OAAO,CAAC,GAAG,CAA+C;IAG1D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,kBAAkB,CAAO;IAGjC,OAAO,CAAC,wBAAwB,CAAuC;gBAG7D,aAAa,EAAE,yBAAyB,EACxC,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,EAChD,YAAY,EAAE,qBAAqB,EACnC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM;IAMrB,KAAK;IAKL,IAAI;IAKX,OAAO,CAAC,mBAAmB;IA8Cd,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;IAgChG,OAAO,CAAC,oBAAoB;YAUd,qBAAqB;IASnC,OAAO,CAAC,wBAAwB;IAQhC,OAAO,CAAC,mBAAmB;IAIpB,WAAW,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;CAS7E"}

package/dest/epoch_prune_watcher.js

@@ -1,8 +1,9 @@
 import { createLogger } from '@aztec/foundation/log';
 import { L2BlockSourceEvents } from '@aztec/stdlib/block';
+import { Offense } from '@aztec/stdlib/slashing';
 import { ReExFailedTxsError, ReExStateMismatchError, TransactionsNotAvailableError, ValidatorError } from '@aztec/stdlib/validators';
 import EventEmitter from 'node:events';
-import { Offense, WANT_TO_SLASH_EVENT } from './config.js';
+import { WANT_TO_SLASH_EVENT } from './config.js';
 /**
  * This watcher is responsible for detecting chain prunes and creating slashing arguments for the committee.
  * It only wants to slash if:
@@ -12,7 +13,7 @@ import { Offense, WANT_TO_SLASH_EVENT } from './config.js';
     l2BlockSource;
     l1ToL2MessageSource;
     epochCache;
-    txCollector;
+    txProvider;
     blockBuilder;
     penalty;
     maxPenalty;
@@ -21,16 +22,18 @@ import { Offense, WANT_TO_SLASH_EVENT } from './config.js';
     slashableCommittees;
     // Only keep track of the last N slashable epochs
     maxSlashableEpochs;
-    constructor(l2BlockSource, l1ToL2MessageSource, epochCache, txCollector, blockBuilder, penalty, maxPenalty){
-        super(), this.l2BlockSource = l2BlockSource, this.l1ToL2MessageSource = l1ToL2MessageSource, this.epochCache = epochCache, this.txCollector = txCollector, this.blockBuilder = blockBuilder, this.penalty = penalty, this.maxPenalty = maxPenalty, this.log = createLogger('epoch-prune-watcher'), this.slashableCommittees = new Map(), this.maxSlashableEpochs = 100;
+    // Store bound function reference for proper listener removal
+    boundHandlePruneL2Blocks;
+    constructor(l2BlockSource, l1ToL2MessageSource, epochCache, txProvider, blockBuilder, penalty, maxPenalty){
+        super(), this.l2BlockSource = l2BlockSource, this.l1ToL2MessageSource = l1ToL2MessageSource, this.epochCache = epochCache, this.txProvider = txProvider, this.blockBuilder = blockBuilder, this.penalty = penalty, this.maxPenalty = maxPenalty, this.log = createLogger('epoch-prune-watcher'), this.slashableCommittees = new Map(), this.maxSlashableEpochs = 100, this.boundHandlePruneL2Blocks = this.handlePruneL2Blocks.bind(this);
         this.log.info('EpochPruneWatcher initialized');
     }
     start() {
-        this.l2BlockSource.on(L2BlockSourceEvents.L2PruneDetected, this.handlePruneL2Blocks.bind(this));
+        this.l2BlockSource.on(L2BlockSourceEvents.L2PruneDetected, this.boundHandlePruneL2Blocks);
         return Promise.resolve();
     }
     stop() {
-        this.l2BlockSource.removeListener(L2BlockSourceEvents.L2PruneDetected, this.handlePruneL2Blocks.bind(this));
+        this.l2BlockSource.removeListener(L2BlockSourceEvents.L2PruneDetected, this.boundHandlePruneL2Blocks);
         return Promise.resolve();
     }
     handlePruneL2Blocks(event) {
@@ -89,9 +92,12 @@ import { Offense, WANT_TO_SLASH_EVENT } from './config.js';
     async validateBlock(blockFromL1, fork) {
         this.log.debug(`Validating pruned block ${blockFromL1.header.globalVariables.blockNumber}`);
         const txHashes = blockFromL1.body.txEffects.map((txEffect)=>txEffect.txHash);
-        const { txs, missing } = await this.txCollector.collectTransactions(txHashes, undefined);
-        if (missing && missing.length > 0) {
-            throw new TransactionsNotAvailableError(missing);
+        // We load txs from the mempool directly, since the TxCollector running in the background has already been
+        // trying to fetch them from nodes or via reqresp. If we haven't managed to collect them by now,
+        // it's likely that they are not available in the network at all.
+        const { txs, missingTxs } = await this.txProvider.getAvailableTxs(txHashes);
+        if (missingTxs && missingTxs.length > 0) {
+            throw new TransactionsNotAvailableError(missingTxs);
         }
         const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(blockFromL1.number);
         const { block, failedTxs, numTxs } = await this.blockBuilder.buildBlock(txs, l1ToL2Messages, blockFromL1.header.globalVariables, {}, fork);

package/dest/index.d.ts

@@ -1,4 +1,6 @@
 export * from './config.js';
 export * from './epoch_prune_watcher.js';
 export * from './slasher_client.js';
+export * from './attestations_block_watcher.js';
+export * from '@aztec/stdlib/slashing';
 //# sourceMappingURL=index.d.ts.map

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iCAAiC,CAAC;AAChD,cAAc,wBAAwB,CAAC"}

package/dest/index.js

@@ -1,3 +1,5 @@
 export * from './config.js';
 export * from './epoch_prune_watcher.js';
 export * from './slasher_client.js';
+export * from './attestations_block_watcher.js';
+export * from '@aztec/stdlib/slashing';

package/dest/slasher_client.d.ts

@@ -1,9 +1,11 @@
-import { type ExtendedViemWalletClient, type L1ReaderConfig, L1TxUtils, SlashingProposerContract } from '@aztec/ethereum';
+import { type L1ReaderConfig, L1TxUtils, SlashingProposerContract, type ViemClient } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { DateProvider } from '@aztec/foundation/timer';
 import { SlashFactoryAbi } from '@aztec/l1-artifacts';
+import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
+import { type Offense } from '@aztec/stdlib/slashing';
 import { type GetContractReturnType } from 'viem';
-import { Offense, type SlasherConfig, type Watcher } from './config.js';
+import { type Watcher } from './config.js';
 type MonitoredSlashPayload = {
     payloadAddress: EthAddress;
     validators: readonly EthAddress[];
@@ -37,8 +39,8 @@ type MonitoredSlashPayload = {
  * - TODO(#14421): Only vote on the proposal if it is possible to reach quorum, e.g., if 6 votes are needed and only 4 slots are left don't vote.
  */
 export declare class SlasherClient {
-    config: SlasherConfig;
-    protected slashFactoryContract: GetContractReturnType<typeof SlashFactoryAbi, ExtendedViemWalletClient>;
+    config: Omit<SlasherConfig, 'slasherPrivateKey'>;
+    protected slashFactoryContract: GetContractReturnType<typeof SlashFactoryAbi, ViemClient>;
     private slashingProposer;
     private l1TxUtils;
     private watchers;
@@ -47,22 +49,21 @@ export declare class SlasherClient {
     private monitoredPayloads;
     private unwatchCallbacks;
     private overridePayloadActive;
-    static new(config: SlasherConfig, l1Contracts: Pick<L1ReaderConfig['l1Contracts'], 'rollupAddress' | 'slashFactoryAddress'>, l1TxUtils: L1TxUtils, watchers: Watcher[], dateProvider: DateProvider): Promise<SlasherClient>;
-    constructor(config: SlasherConfig, slashFactoryContract: GetContractReturnType<typeof SlashFactoryAbi, ExtendedViemWalletClient>, slashingProposer: SlashingProposerContract, l1TxUtils: L1TxUtils, watchers: Watcher[], dateProvider: DateProvider, log?: import("@aztec/foundation/log").Logger);
-    start(): void;
+    private slashingExecutionDelayInRounds;
+    static new(config: Omit<SlasherConfig, 'slasherPrivateKey'>, l1Contracts: Pick<L1ReaderConfig['l1Contracts'], 'rollupAddress' | 'slashFactoryAddress'>, l1TxUtils: L1TxUtils | undefined, l1Client: ViemClient, watchers: Watcher[], dateProvider: DateProvider): Promise<SlasherClient>;
+    constructor(config: Omit<SlasherConfig, 'slasherPrivateKey'>, slashFactoryContract: GetContractReturnType<typeof SlashFactoryAbi, ViemClient>, slashingProposer: SlashingProposerContract, l1TxUtils: L1TxUtils | undefined, watchers: Watcher[], dateProvider: DateProvider, log?: import("@aztec/foundation/log").Logger);
+    start(): Promise<void>;
     /**
      * Allows consumers to stop the instance of the slasher client.
      * 'ready' will now return 'false' and the running promise that keeps the client synced is interrupted.
      */
     stop(): Promise<void>;
     clearMonitoredPayloads(): void;
+    setSlashingProposer(slashingProposer: SlashingProposerContract): Promise<void>;
     /**
      * Update the config of the slasher client
      *
-     * @param config - the new config. Can only update the following fields:
-     * - slashOverridePayload
-     * - slashPayloadTtlSeconds
-     * - slashProposerRoundPollingIntervalSeconds
+     * @param config - the new config. Cannot update the slasher private key.
      */
     updateConfig(config: Partial<SlasherConfig>): void;
     /**
@@ -89,9 +90,9 @@ export declare class SlasherClient {
      *
      * @param {round: bigint; proposal: `0x${string}`} param0
      */
-    protected proposalExecuted({ round, proposal }: {
+    protected payloadSubmitted({ round, payload }: {
         round: bigint;
-        proposal: `0x${string}`;
+        payload: `0x${string}`;
     }): void;
     /**
      * This is called when a watcher emits WANT_TO_SLASH_EVENT.
@@ -144,13 +145,13 @@ export declare class SlasherClient {
      */
     private filterExpiredPayloads;
     /**
-     * Execute a round if we agree with the proposal.
+     * Submit a round to the Slasher if we agree with the payload.
      *
-     * Bound to the slashing proposer contract's listenToExecutableProposals method in the constructor.
+     * Bound to the slashing proposer contract's listenToSubmittablePayloads method in the constructor.
      *
      * @param {proposal: `0x${string}`; round: bigint} param0
      */
-    private executeRoundIfAgree;
+    private submitRoundIfAgree;
     private getAddressAndIsDeployed;
 }
 export {};

package/dest/slasher_client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"slasher_client.d.ts","sourceRoot":"","sources":["../src/slasher_client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,cAAc,EACnB,SAAS,EAGT,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAEL,KAAK,qBAAqB,EAK3B,MAAM,MAAM,CAAC;AAEd,OAAO,EACL,OAAO,EACP,KAAK,aAAa,EAGlB,KAAK,OAAO,EAEb,MAAM,aAAa,CAAC;AAErB,KAAK,qBAAqB,GAAG;IAC3B,cAAc,EAAE,UAAU,CAAC;IAC3B,UAAU,EAAE,SAAS,UAAU,EAAE,CAAC;IAClC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,aAAa;IA+Bf,MAAM,EAAE,aAAa;IAC5B,SAAS,CAAC,oBAAoB,EAAE,qBAAqB,CAAC,OAAO,eAAe,EAAE,wBAAwB,CAAC;IACvG,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,GAAG;IApCb,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,gBAAgB,CAAsB;IAC9C,OAAO,CAAC,qBAAqB,CAAS;WAEzB,GAAG,CACd,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,eAAe,GAAG,qBAAqB,CAAC,EACzF,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,OAAO,EAAE,EACnB,YAAY,EAAE,YAAY;gBAqBnB,MAAM,EAAE,aAAa,EAClB,oBAAoB,EAAE,qBAAqB,CAAC,OAAO,eAAe,EAAE,wBAAwB,CAAC,EAC/F,gBAAgB,EAAE,wBAAwB,EAC1C,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,OAAO,EAAE,EACnB,YAAY,EAAE,YAAY,EAC1B,GAAG,yCAA0B;IAOhC,KAAK;IAoBZ;;;OAGG;IACU,IAAI;IAeV,sBAAsB;IAK7B;;;;;;;OAOG;IACI,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC;IAYlD;;;;;OAKG;IACI,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAoB5E;;;;;;OAMG;IACI,oBAAoB,IAAI,qBAAqB,EAAE;IAMtD;;;;;;;;OAQG;IACH,SAAS,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAA;KAAE;IAiB1F;;;;OAIG;IACH,OAAO,CAAC,WAAW;IA4DnB;;;;;;;;OAQG;IACH,OAAO,CAAC,uBAAuB;IAc/B;;;;;OAKG;IACH,OAAO,CAAE,gCAAgC;IAezC,OAAO,CAAC,8BAA8B;IAgBtC;;;;OAIG;YACW,mBAAmB;IAgBjC;;;;;;;OAOG;YACW,mBAAmB;IAqBjC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAO7B;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAM7B;;;;;;OAMG;YACW,mBAAmB;YAkCnB,uBAAuB;CAUtC"}
+{"version":3,"file":"slasher_client.d.ts","sourceRoot":"","sources":["../src/slasher_client.ts"],"names":[],"mappings":"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"}