@aztec/slasher 0.0.1-commit.d3ec352c → 0.0.1-commit.d58ff9d0

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,CAM9D;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,27 +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);
-        await this.offenses.set(key, serializeOffense(offense));
         const round = getRoundForOffense(offense, this.settings);
-        await this.roundsOffenses.set(this.getRoundKey(round), key);
-        this.log.trace(`Adding pending offense ${key} for round ${round}`);
+        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;
+        });
+        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) {
@@ -70,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}`;

package/dest/watcher.d.ts

@@ -3,14 +3,21 @@ import type { TypedEventEmitter } from '@aztec/foundation/types';
 import { OffenseType } from '@aztec/stdlib/slashing';
 import type { SlasherConfig } from './config.js';
 export declare const WANT_TO_SLASH_EVENT: "want-to-slash";
+export declare const WANT_TO_CLEAR_SLASH_EVENT: "want-to-clear-slash";
 export interface WantToSlashArgs {
     validator: EthAddress;
     amount: bigint;
     offenseType: OffenseType;
     epochOrSlot: bigint;
 }
+export interface WantToClearSlashArgs {
+    offenseType: OffenseType;
+    epochOrSlot: bigint;
+    validators?: EthAddress[];
+}
 export interface WatcherEventMap {
     [WANT_TO_SLASH_EVENT]: (args: WantToSlashArgs[]) => void;
+    [WANT_TO_CLEAR_SLASH_EVENT]: (args: WantToClearSlashArgs[]) => void;
 }
 export type WatcherEmitter = TypedEventEmitter<WatcherEventMap>;
 export type Watcher = WatcherEmitter & {
@@ -18,4 +25,4 @@ export type Watcher = WatcherEmitter & {
     stop?: () => Promise<void>;
     updateConfig: (config: Partial<SlasherConfig>) => void;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2F0Y2hlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3dhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDakUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRXJELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVqRCxlQUFPLE1BQU0sbUJBQW1CLGlCQUEyQixDQUFDO0FBRTVELE1BQU0sV0FBVyxlQUFlO0lBQzlCLFNBQVMsRUFBRSxVQUFVLENBQUM7SUFDdEIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLFdBQVcsRUFBRSxXQUFXLENBQUM7SUFDekIsV0FBVyxFQUFFLE1BQU0sQ0FBQztDQUNyQjtBQUdELE1BQU0sV0FBVyxlQUFlO0lBQzlCLENBQUMsbUJBQW1CLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRSxlQUFlLEVBQUUsS0FBSyxJQUFJLENBQUM7Q0FDMUQ7QUFFRCxNQUFNLE1BQU0sY0FBYyxHQUFHLGlCQUFpQixDQUFDLGVBQWUsQ0FBQyxDQUFDO0FBRWhFLE1BQU0sTUFBTSxPQUFPLEdBQUcsY0FBYyxHQUFHO0lBQ3JDLEtBQUssQ0FBQyxFQUFFLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzVCLElBQUksQ0FBQyxFQUFFLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzNCLFlBQVksRUFBRSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsYUFBYSxDQUFDLEtBQUssSUFBSSxDQUFDO0NBQ3hELENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2F0Y2hlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3dhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDakUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRXJELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVqRCxlQUFPLE1BQU0sbUJBQW1CLGlCQUEyQixDQUFDO0FBQzVELGVBQU8sTUFBTSx5QkFBeUIsdUJBQWlDLENBQUM7QUFFeEUsTUFBTSxXQUFXLGVBQWU7SUFDOUIsU0FBUyxFQUFFLFVBQVUsQ0FBQztJQUN0QixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsV0FBVyxFQUFFLFdBQVcsQ0FBQztJQUN6QixXQUFXLEVBQUUsTUFBTSxDQUFDO0NBQ3JCO0FBRUQsTUFBTSxXQUFXLG9CQUFvQjtJQUNuQyxXQUFXLEVBQUUsV0FBVyxDQUFDO0lBQ3pCLFdBQVcsRUFBRSxNQUFNLENBQUM7SUFDcEIsVUFBVSxDQUFDLEVBQUUsVUFBVSxFQUFFLENBQUM7Q0FDM0I7QUFHRCxNQUFNLFdBQVcsZUFBZTtJQUM5QixDQUFDLG1CQUFtQixDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsZUFBZSxFQUFFLEtBQUssSUFBSSxDQUFDO0lBQ3pELENBQUMseUJBQXlCLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRSxvQkFBb0IsRUFBRSxLQUFLLElBQUksQ0FBQztDQUNyRTtBQUVELE1BQU0sTUFBTSxjQUFjLEdBQUcsaUJBQWlCLENBQUMsZUFBZSxDQUFDLENBQUM7QUFFaEUsTUFBTSxNQUFNLE9BQU8sR0FBRyxjQUFjLEdBQUc7SUFDckMsS0FBSyxDQUFDLEVBQUUsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDNUIsSUFBSSxDQUFDLEVBQUUsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDM0IsWUFBWSxFQUFFLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxhQUFhLENBQUMsS0FBSyxJQUFJLENBQUM7Q0FDeEQsQ0FBQyJ9

package/dest/watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watcher.d.ts","sourceRoot":"","sources":["../src/watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,eAAO,MAAM,mBAAmB,iBAA2B,CAAC;AAE5D,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,UAAU,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;CACrB;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,OAAO,GAAG,cAAc,GAAG;IACrC,KAAK,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,KAAK,IAAI,CAAC;CACxD,CAAC"}
+{"version":3,"file":"watcher.d.ts","sourceRoot":"","sources":["../src/watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,eAAO,MAAM,mBAAmB,iBAA2B,CAAC;AAC5D,eAAO,MAAM,yBAAyB,uBAAiC,CAAC;AAExE,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,UAAU,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,UAAU,EAAE,CAAC;CAC3B;AAGD,MAAM,WAAW,eAAe;IAC9B,CAAC,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;IACzD,CAAC,yBAAyB,CAAC,EAAE,CAAC,IAAI,EAAE,oBAAoB,EAAE,KAAK,IAAI,CAAC;CACrE;AAED,MAAM,MAAM,cAAc,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAC;AAEhE,MAAM,MAAM,OAAO,GAAG,cAAc,GAAG;IACrC,KAAK,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,KAAK,IAAI,CAAC;CACxD,CAAC"}

package/dest/watcher.js

@@ -1 +1,2 @@
 export const WANT_TO_SLASH_EVENT = 'want-to-slash';
+export const WANT_TO_CLEAR_SLASH_EVENT = 'want-to-clear-slash';

package/dest/watchers/attestations_block_watcher.d.ts

@@ -1,33 +1,47 @@
 import { EpochCache } from '@aztec/epoch-cache';
-import { type L2BlockSourceEventEmitter } from '@aztec/stdlib/block';
+import { type LoggerBindings } from '@aztec/foundation/log';
+import { type DescendentOfInvalidAttestationsCheckpointEvent, type InvalidCheckpointDetectedEvent, type L2BlockSourceEventEmitter } from '@aztec/stdlib/block';
 import type { SlasherConfig } from '../config.js';
 import { type Watcher, type WatcherEmitter } from '../watcher.js';
-declare const AttestationsBlockWatcherConfigKeys: readonly ["slashAttestDescendantOfInvalidPenalty", "slashProposeInvalidAttestationsPenalty"];
+declare const AttestationsBlockWatcherConfigKeys: readonly ["slashProposeDescendantOfCheckpointWithInvalidAttestationsPenalty", "slashProposeInvalidAttestationsPenalty"];
 type AttestationsBlockWatcherConfig = Pick<SlasherConfig, (typeof AttestationsBlockWatcherConfigKeys)[number]>;
 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.
+ * Watches the archiver for checkpoints whose publication is itself a slashable offense.
+ *
+ * Two cases are handled, both targeting the proposer of the offending checkpoint:
+ *
+ * - Invalid-attestations checkpoint: the proposer published a checkpoint to L1 whose
+ *   attestations are either insufficient (below quorum) or incorrect (signature from a
+ *   non-committee member, malformed signature, etc.). Slashed via
+ *   {@link OffenseType.PROPOSED_INSUFFICIENT_ATTESTATIONS} or
+ *   {@link OffenseType.PROPOSED_INCORRECT_ATTESTATIONS}.
+ *
+ * - Descendant of an invalid checkpoint: the proposer published a checkpoint that extends a
+ *   previously-rejected one. The descendant may itself have valid attestations, but it is still
+ *   unusable. Triggered by the archiver's  `CheckpointBuiltOnInvalidAncestorDetected` event
+ *   when the descendant has valid attestations (skipped before ingestion). Slashes the descendant's
+ *   proposer via {@link OffenseType.PROPOSED_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS}.
  */
 export declare class AttestationsBlockWatcher extends AttestationsBlockWatcher_base implements Watcher {
     private l2BlockSource;
     private epochCache;
     private log;
-    private maxInvalidBlocks;
-    private invalidArchiveRoots;
     private config;
-    private boundHandleInvalidBlock;
-    constructor(l2BlockSource: L2BlockSourceEventEmitter, epochCache: EpochCache, config: AttestationsBlockWatcherConfig);
+    private boundHandleInvalidCheckpoint;
+    private boundHandleDescendantOfInvalid;
+    constructor(l2BlockSource: L2BlockSourceEventEmitter, epochCache: EpochCache, config: AttestationsBlockWatcherConfig, bindings?: LoggerBindings);
     updateConfig(newConfig: Partial<AttestationsBlockWatcherConfig>): void;
     start(): Promise<void>;
     stop(): Promise<void>;
-    private handleInvalidBlock;
-    private slashAttestorsOnAncestorInvalid;
-    private slashProposer;
+    /** Event handler for invalid checkpoints as reported by the archiver. Public for testing purposes. */
+    handleInvalidCheckpoint(event: InvalidCheckpointDetectedEvent): void;
+    /**
+     * Event handler for valid-attestations checkpoints that build on a previously-rejected ancestor.
+     * The archiver emits this when ingesting the descendant, and we slash its proposer.
+     */
+    handleDescendantOfInvalid(event: DescendentOfInvalidAttestationsCheckpointEvent): Promise<void>;
     private getOffenseFromInvalidationReason;
-    private addInvalidBlock;
 }
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25zX2Jsb2NrX3dhdGNoZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93YXRjaGVycy9hdHRlc3RhdGlvbnNfYmxvY2tfd2F0Y2hlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFJaEQsT0FBTyxFQUdMLEtBQUsseUJBQXlCLEVBRy9CLE1BQU0scUJBQXFCLENBQUM7QUFLN0IsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ2xELE9BQU8sRUFBNkMsS0FBSyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFN0csUUFBQSxNQUFNLGtDQUFrQyw4RkFHOUIsQ0FBQztBQUVYLEtBQUssOEJBQThCLEdBQUcsSUFBSSxDQUFDLGFBQWEsRUFBRSxDQUFDLE9BQU8sa0NBQWtDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDOztBQUUvRzs7Ozs7R0FLRztBQUNILHFCQUFhLHdCQUF5QixTQUFRLDZCQUEyQyxZQUFXLE9BQU87SUF1QnZHLE9BQU8sQ0FBQyxhQUFhO0lBQ3JCLE9BQU8sQ0FBQyxVQUFVO0lBdkJwQixPQUFPLENBQUMsR0FBRyxDQUFzRDtJQUdqRSxPQUFPLENBQUMsZ0JBQWdCLENBQU87SUFHL0IsT0FBTyxDQUFDLG1CQUFtQixDQUEwQjtJQUVyRCxPQUFPLENBQUMsTUFBTSxDQUFpQztJQUUvQyxPQUFPLENBQUMsdUJBQXVCLENBUzdCO0lBRUYsWUFDVSxhQUFhLEVBQUUseUJBQXlCLEVBQ3hDLFVBQVUsRUFBRSxVQUFVLEVBQzlCLE1BQU0sRUFBRSw4QkFBOEIsRUFLdkM7SUFFTSxZQUFZLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyw4QkFBOEIsQ0FBQyxRQUdyRTtJQUVNLEtBQUssa0JBR1g7SUFFTSxJQUFJLGtCQU1WO0lBRUQsT0FBTyxDQUFDLGtCQUFrQjtJQXlCMUIsT0FBTyxDQUFDLCtCQUErQjtJQXdCdkMsT0FBTyxDQUFDLGFBQWE7SUE0QnJCLE9BQU8sQ0FBQyxnQ0FBZ0M7SUFheEMsT0FBTyxDQUFDLGVBQWU7Q0FTeEIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25zX2Jsb2NrX3dhdGNoZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93YXRjaGVycy9hdHRlc3RhdGlvbnNfYmxvY2tfd2F0Y2hlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFHaEQsT0FBTyxFQUFlLEtBQUssY0FBYyxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBQ3ZGLE9BQU8sRUFDTCxLQUFLLDhDQUE4QyxFQUNuRCxLQUFLLDhCQUE4QixFQUNuQyxLQUFLLHlCQUF5QixFQUcvQixNQUFNLHFCQUFxQixDQUFDO0FBTTdCLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUNsRCxPQUFPLEVBQTZDLEtBQUssT0FBTyxFQUFFLEtBQUssY0FBYyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTdHLFFBQUEsTUFBTSxrQ0FBa0MseUhBRzlCLENBQUM7QUFFWCxLQUFLLDhCQUE4QixHQUFHLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQyxPQUFPLGtDQUFrQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQzs7QUFFL0c7Ozs7Ozs7Ozs7Ozs7Ozs7R0FnQkc7QUFDSCxxQkFBYSx3QkFBeUIsU0FBUSw2QkFBMkMsWUFBVyxPQUFPO0lBeUJ2RyxPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsVUFBVTtJQXpCcEIsT0FBTyxDQUFDLEdBQUcsQ0FBUztJQUNwQixPQUFPLENBQUMsTUFBTSxDQUFpQztJQUUvQyxPQUFPLENBQUMsNEJBQTRCLENBU2xDO0lBRUYsT0FBTyxDQUFDLDhCQUE4QixDQU9wQztJQUVGLFlBQ1UsYUFBYSxFQUFFLHlCQUF5QixFQUN4QyxVQUFVLEVBQUUsVUFBVSxFQUM5QixNQUFNLEVBQUUsOEJBQThCLEVBQ3RDLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFNMUI7SUFFTSxZQUFZLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyw4QkFBOEIsQ0FBQyxRQUdyRTtJQUVNLEtBQUssa0JBVVg7SUFFTSxJQUFJLGtCQVVWO0lBRUQsc0dBQXNHO0lBQy9GLHVCQUF1QixDQUFDLEtBQUssRUFBRSw4QkFBOEIsR0FBRyxJQUFJLENBcUMxRTtJQUVEOzs7T0FHRztJQUNVLHlCQUF5QixDQUFDLEtBQUssRUFBRSw4Q0FBOEMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBaUMzRztJQUVELE9BQU8sQ0FBQyxnQ0FBZ0M7Q0FZekMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"attestations_block_watcher.d.ts","sourceRoot":"","sources":["../../src/watchers/attestations_block_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIhD,OAAO,EAGL,KAAK,yBAAyB,EAG/B,MAAM,qBAAqB,CAAC;AAK7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAA6C,KAAK,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAE7G,QAAA,MAAM,kCAAkC,8FAG9B,CAAC;AAEX,KAAK,8BAA8B,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,OAAO,kCAAkC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;;AAE/G;;;;;GAKG;AACH,qBAAa,wBAAyB,SAAQ,6BAA2C,YAAW,OAAO;IAuBvG,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,UAAU;IAvBpB,OAAO,CAAC,GAAG,CAAsD;IAGjE,OAAO,CAAC,gBAAgB,CAAO;IAG/B,OAAO,CAAC,mBAAmB,CAA0B;IAErD,OAAO,CAAC,MAAM,CAAiC;IAE/C,OAAO,CAAC,uBAAuB,CAS7B;IAEF,YACU,aAAa,EAAE,yBAAyB,EACxC,UAAU,EAAE,UAAU,EAC9B,MAAM,EAAE,8BAA8B,EAKvC;IAEM,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,8BAA8B,CAAC,QAGrE;IAEM,KAAK,kBAGX;IAEM,IAAI,kBAMV;IAED,OAAO,CAAC,kBAAkB;IAyB1B,OAAO,CAAC,+BAA+B;IAwBvC,OAAO,CAAC,aAAa;IA4BrB,OAAO,CAAC,gCAAgC;IAaxC,OAAO,CAAC,eAAe;CASxB"}
+{"version":3,"file":"attestations_block_watcher.d.ts","sourceRoot":"","sources":["../../src/watchers/attestations_block_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AACvF,OAAO,EACL,KAAK,8CAA8C,EACnD,KAAK,8BAA8B,EACnC,KAAK,yBAAyB,EAG/B,MAAM,qBAAqB,CAAC;AAM7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAA6C,KAAK,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAE7G,QAAA,MAAM,kCAAkC,yHAG9B,CAAC;AAEX,KAAK,8BAA8B,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,OAAO,kCAAkC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;;AAE/G;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,wBAAyB,SAAQ,6BAA2C,YAAW,OAAO;IAyBvG,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,UAAU;IAzBpB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,MAAM,CAAiC;IAE/C,OAAO,CAAC,4BAA4B,CASlC;IAEF,OAAO,CAAC,8BAA8B,CAOpC;IAEF,YACU,aAAa,EAAE,yBAAyB,EACxC,UAAU,EAAE,UAAU,EAC9B,MAAM,EAAE,8BAA8B,EACtC,QAAQ,CAAC,EAAE,cAAc,EAM1B;IAEM,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,8BAA8B,CAAC,QAGrE;IAEM,KAAK,kBAUX;IAEM,IAAI,kBAUV;IAED,sGAAsG;IAC/F,uBAAuB,CAAC,KAAK,EAAE,8BAA8B,GAAG,IAAI,CAqC1E;IAED;;;OAGG;IACU,yBAAyB,CAAC,KAAK,EAAE,8CAA8C,GAAG,OAAO,CAAC,IAAI,CAAC,CAiC3G;IAED,OAAO,CAAC,gCAAgC;CAYzC"}

package/dest/watchers/attestations_block_watcher.js

@@ -1,40 +1,57 @@
-import { SlotNumber } from '@aztec/foundation/branded-types';
+import { EpochNumber } from '@aztec/foundation/branded-types';
 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 EventEmitter from 'node:events';
 import { WANT_TO_SLASH_EVENT } from '../watcher.js';
 const AttestationsBlockWatcherConfigKeys = [
-    'slashAttestDescendantOfInvalidPenalty',
+    'slashProposeDescendantOfCheckpointWithInvalidAttestationsPenalty',
     'slashProposeInvalidAttestationsPenalty'
 ];
 /**
- * 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.
+ * Watches the archiver for checkpoints whose publication is itself a slashable offense.
+ *
+ * Two cases are handled, both targeting the proposer of the offending checkpoint:
+ *
+ * - Invalid-attestations checkpoint: the proposer published a checkpoint to L1 whose
+ *   attestations are either insufficient (below quorum) or incorrect (signature from a
+ *   non-committee member, malformed signature, etc.). Slashed via
+ *   {@link OffenseType.PROPOSED_INSUFFICIENT_ATTESTATIONS} or
+ *   {@link OffenseType.PROPOSED_INCORRECT_ATTESTATIONS}.
+ *
+ * - Descendant of an invalid checkpoint: the proposer published a checkpoint that extends a
+ *   previously-rejected one. The descendant may itself have valid attestations, but it is still
+ *   unusable. Triggered by the archiver's  `CheckpointBuiltOnInvalidAncestorDetected` event
+ *   when the descendant has valid attestations (skipped before ingestion). Slashes the descendant's
+ *   proposer via {@link OffenseType.PROPOSED_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS}.
  */ export class AttestationsBlockWatcher extends EventEmitter {
     l2BlockSource;
     epochCache;
     log;
-    // Only keep track of the last N invalid blocks
-    maxInvalidBlocks;
-    // All invalid archive roots seen
-    invalidArchiveRoots;
     config;
-    boundHandleInvalidBlock;
-    constructor(l2BlockSource, epochCache, config){
-        super(), this.l2BlockSource = l2BlockSource, this.epochCache = epochCache, this.log = createLogger('attestations-block-watcher'), this.maxInvalidBlocks = 100, this.invalidArchiveRoots = new Set(), this.boundHandleInvalidBlock = (event)=>{
+    boundHandleInvalidCheckpoint;
+    boundHandleDescendantOfInvalid;
+    constructor(l2BlockSource, epochCache, config, bindings){
+        super(), this.l2BlockSource = l2BlockSource, this.epochCache = epochCache, this.boundHandleInvalidCheckpoint = (event)=>{
             try {
-                this.handleInvalidBlock(event);
+                this.handleInvalidCheckpoint(event);
             } catch (err) {
-                this.log.error('Error handling invalid block', err, {
+                this.log.error('Error handling invalid checkpoint', err, {
                     ...event.validationResult,
                     reason: event.validationResult.reason
                 });
             }
+        }, this.boundHandleDescendantOfInvalid = (event)=>{
+            this.handleDescendantOfInvalid(event).catch((err)=>{
+                this.log.error('Error handling descendant of invalid checkpoint', err, {
+                    checkpointNumber: event.checkpoint.checkpointNumber,
+                    ancestorCheckpointNumber: event.ancestorCheckpointNumber
+                });
+            });
         };
+        this.log = createLogger('slasher:attestations-block-watcher', bindings);
         this.config = pick(config, ...AttestationsBlockWatcherConfigKeys);
         this.log.info('AttestationsBlockWatcher initialized');
     }
@@ -43,57 +60,30 @@ const AttestationsBlockWatcherConfigKeys = [
         this.log.verbose('AttestationsBlockWatcher config updated', this.config);
     }
     start() {
-        this.l2BlockSource.on(L2BlockSourceEvents.InvalidAttestationsBlockDetected, this.boundHandleInvalidBlock);
+        this.l2BlockSource.events.on(L2BlockSourceEvents.InvalidAttestationsCheckpointDetected, this.boundHandleInvalidCheckpoint);
+        this.l2BlockSource.events.on(L2BlockSourceEvents.DescendentOfInvalidAttestationsCheckpointDetected, this.boundHandleDescendantOfInvalid);
         return Promise.resolve();
     }
     stop() {
-        this.l2BlockSource.removeListener(L2BlockSourceEvents.InvalidAttestationsBlockDetected, this.boundHandleInvalidBlock);
+        this.l2BlockSource.events.removeListener(L2BlockSourceEvents.InvalidAttestationsCheckpointDetected, this.boundHandleInvalidCheckpoint);
+        this.l2BlockSource.events.removeListener(L2BlockSourceEvents.DescendentOfInvalidAttestationsCheckpointDetected, this.boundHandleDescendantOfInvalid);
         return Promise.resolve();
     }
-    handleInvalidBlock(event) {
+    /** Event handler for invalid checkpoints as reported by the archiver. Public for testing purposes. */ handleInvalidCheckpoint(event) {
         const { validationResult } = event;
-        const block = validationResult.block;
-        // Check if we already have processed this block, archiver may emit the same event multiple times
-        if (this.invalidArchiveRoots.has(block.archive.toString())) {
-            this.log.trace(`Already processed invalid block ${block.blockNumber}`);
-            return;
-        }
-        this.log.verbose(`Detected invalid block ${block.blockNumber}`, {
-            ...block,
+        const { reason, checkpoint } = validationResult;
+        this.log.verbose(`Detected invalid checkpoint ${checkpoint.checkpointNumber}`, {
+            ...checkpoint,
             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.lastArchive.toString();
-        if (this.invalidArchiveRoots.has(parentArchive)) {
-            const attestors = validationResult.attestors;
-            this.log.info(`Want to slash attestors of block ${block.blockNumber} built on invalid block`, {
-                ...block,
-                ...attestors,
-                parentArchive
-            });
-            this.emit(WANT_TO_SLASH_EVENT, attestors.map((attestor)=>({
-                    validator: attestor,
-                    amount: this.config.slashAttestDescendantOfInvalidPenalty,
-                    offenseType: OffenseType.ATTESTED_DESCENDANT_OF_INVALID,
-                    epochOrSlot: BigInt(SlotNumber(block.slotNumber))
-                })));
-        }
-    }
-    slashProposer(validationResult) {
-        const { reason, block } = validationResult;
-        const blockNumber = block.blockNumber;
-        const slot = block.slotNumber;
-        const proposer = this.epochCache.getProposerFromEpochCommittee(validationResult, slot);
+        const { checkpointNumber, slotNumber: slot } = checkpoint;
+        const epochCommitteeInfo = {
+            ...validationResult,
+            isEscapeHatchOpen: false
+        };
+        const proposer = this.epochCache.getProposerFromEpochCommittee(epochCommitteeInfo, slot);
         if (!proposer) {
-            this.log.warn(`No proposer found for block ${blockNumber} at slot ${slot}`);
+            this.log.warn(`No proposer found for checkpoint ${checkpointNumber} at slot ${slot}`);
             return;
         }
         const offense = this.getOffenseFromInvalidationReason(reason);
@@ -104,9 +94,48 @@ const AttestationsBlockWatcherConfigKeys = [
             offenseType: offense,
             epochOrSlot: BigInt(slot)
         };
-        this.log.info(`Want to slash proposer of block ${blockNumber} due to ${reason}`, {
-            ...block,
-            ...args
+        this.log.info(`Detected invalid attestations checkpoint proposer offense`, {
+            ...checkpoint,
+            reason,
+            validator: args.validator.toString(),
+            amount: args.amount,
+            offenseType: getOffenseTypeName(args.offenseType),
+            epochOrSlot: args.epochOrSlot
+        });
+        this.emit(WANT_TO_SLASH_EVENT, [
+            args
+        ]);
+    }
+    /**
+   * Event handler for valid-attestations checkpoints that build on a previously-rejected ancestor.
+   * The archiver emits this when ingesting the descendant, and we slash its proposer.
+   */ async handleDescendantOfInvalid(event) {
+        const { checkpoint, ancestorCheckpointNumber, ancestorArchiveRoot } = event;
+        const slot = checkpoint.slotNumber;
+        const epoch = EpochNumber(getEpochAtSlot(slot, this.epochCache.getL1Constants()));
+        const epochCommitteeInfo = await this.epochCache.getCommitteeForEpoch(epoch);
+        const proposer = this.epochCache.getProposerFromEpochCommittee({
+            ...epochCommitteeInfo,
+            epoch
+        }, slot);
+        if (!proposer) {
+            this.log.warn(`No proposer found for invalid descendant checkpoint ${checkpoint.checkpointNumber} at slot ${slot}`);
+            return;
+        }
+        const args = {
+            validator: proposer,
+            amount: this.config.slashProposeDescendantOfCheckpointWithInvalidAttestationsPenalty,
+            offenseType: OffenseType.PROPOSED_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS,
+            epochOrSlot: BigInt(slot)
+        };
+        this.log.info(`Detected invalid descendant checkpoint proposer offense`, {
+            ...checkpoint,
+            ancestorCheckpointNumber,
+            ancestorArchiveRoot: ancestorArchiveRoot.toString(),
+            validator: args.validator.toString(),
+            amount: args.amount,
+            offenseType: getOffenseTypeName(args.offenseType),
+            epochOrSlot: args.epochOrSlot
         });
         this.emit(WANT_TO_SLASH_EVENT, [
             args
@@ -125,12 +154,4 @@ const AttestationsBlockWatcherConfigKeys = [
                 }
         }
     }
-    addInvalidBlock(block) {
-        this.invalidArchiveRoots.add(block.archive.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/watchers/attested_invalid_proposal_watcher.d.ts

@@ -0,0 +1,42 @@
+import type { EpochCacheInterface } from '@aztec/epoch-cache';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { type Logger } from '@aztec/foundation/log';
+import type { L2BlockSource } from '@aztec/stdlib/block';
+import type { P2PClient, SlasherConfig } from '@aztec/stdlib/interfaces/server';
+import { type Watcher, type WatcherEmitter } from '../watcher.js';
+declare const AttestedInvalidProposalWatcherConfigKeys: readonly ["slashAttestInvalidCheckpointProposalPenalty"];
+type AttestedInvalidProposalWatcherConfig = Pick<SlasherConfig, (typeof AttestedInvalidProposalWatcherConfigKeys)[number]>;
+type P2PCheckpointAttestationSource = Pick<P2PClient, 'getCheckpointAttestationsForSlot'>;
+type AttestedInvalidProposalWatcherOptions = {
+    scanSlotLookback?: number;
+    log?: Logger;
+};
+export type InvalidProposalSlotSource = {
+    hasInvalidProposals(slot: SlotNumber): boolean;
+    hasProposalEquivocation(slot: SlotNumber): boolean;
+};
+declare const AttestedInvalidProposalWatcher_base: new () => WatcherEmitter;
+export declare class AttestedInvalidProposalWatcher extends AttestedInvalidProposalWatcher_base implements Watcher {
+    private readonly p2pClient;
+    private readonly invalidProposalSlotSource;
+    private readonly l2BlockSource;
+    private readonly epochCache;
+    private readonly log;
+    private readonly runningPromise;
+    private readonly emittedOffenses;
+    private readonly scanSlotLookback;
+    private config;
+    private lastScannedSlot;
+    constructor(p2pClient: P2PCheckpointAttestationSource, invalidProposalSlotSource: InvalidProposalSlotSource, l2BlockSource: Pick<L2BlockSource, 'getSyncedL2SlotNumber'>, epochCache: Pick<EpochCacheInterface, 'getSlotNow' | 'getL1Constants'>, config: AttestedInvalidProposalWatcherConfig, options?: AttestedInvalidProposalWatcherOptions);
+    updateConfig(config: Partial<SlasherConfig>): void;
+    start(): Promise<void>;
+    stop(): Promise<void>;
+    scan(): Promise<void>;
+    /** Scans a single invalid-proposal slot. */
+    scanSlot(slot: SlotNumber): Promise<void>;
+    private getSlashArgs;
+    private getSlashArgsForAttester;
+    private markAsNewOffense;
+}
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0ZWRfaW52YWxpZF9wcm9wb3NhbF93YXRjaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2F0Y2hlcnMvYXR0ZXN0ZWRfaW52YWxpZF9wcm9wb3NhbF93YXRjaGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBSTdELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUVsRSxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsYUFBYSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFNaEYsT0FBTyxFQUE2QyxLQUFLLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUU3RyxRQUFBLE1BQU0sd0NBQXdDLDBEQUEyRCxDQUFDO0FBTTFHLEtBQUssb0NBQW9DLEdBQUcsSUFBSSxDQUM5QyxhQUFhLEVBQ2IsQ0FBQyxPQUFPLHdDQUF3QyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQzFELENBQUM7QUFFRixLQUFLLDhCQUE4QixHQUFHLElBQUksQ0FBQyxTQUFTLEVBQUUsa0NBQWtDLENBQUMsQ0FBQztBQUUxRixLQUFLLHFDQUFxQyxHQUFHO0lBQzNDLGdCQUFnQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQzFCLEdBQUcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNkLENBQUM7QUFFRixNQUFNLE1BQU0seUJBQXlCLEdBQUc7SUFDdEMsbUJBQW1CLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUM7SUFDL0MsdUJBQXVCLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUM7Q0FDcEQsQ0FBQzs7QUFFRixxQkFBYSw4QkFBK0IsU0FBUSxtQ0FBMkMsWUFBVyxPQUFPO0lBUzdHLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLHlCQUF5QjtJQUMxQyxPQUFPLENBQUMsUUFBUSxDQUFDLGFBQWE7SUFDOUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxVQUFVO0lBWDdCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFTO0lBQzdCLE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFpQjtJQUNoRCxPQUFPLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBMkQ7SUFDM0YsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBUztJQUMxQyxPQUFPLENBQUMsTUFBTSxDQUF1QztJQUNyRCxPQUFPLENBQUMsZUFBZSxDQUF5QjtJQUVoRCxZQUNtQixTQUFTLEVBQUUsOEJBQThCLEVBQ3pDLHlCQUF5QixFQUFFLHlCQUF5QixFQUNwRCxhQUFhLEVBQUUsSUFBSSxDQUFDLGFBQWEsRUFBRSx1QkFBdUIsQ0FBQyxFQUMzRCxVQUFVLEVBQUUsSUFBSSxDQUFDLG1CQUFtQixFQUFFLFlBQVksR0FBRyxnQkFBZ0IsQ0FBQyxFQUN2RixNQUFNLEVBQUUsb0NBQW9DLEVBQzVDLE9BQU8sR0FBRSxxQ0FBMEMsRUFXcEQ7SUFFTSxZQUFZLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxhQUFhLENBQUMsR0FBRyxJQUFJLENBR3hEO0lBRU0sS0FBSyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHNUI7SUFFTSxJQUFJLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUUzQjtJQUVZLElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBcUJqQztJQUVELDRDQUE0QztJQUMvQixRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBbUNyRDtJQUVELE9BQU8sQ0FBQyxZQUFZO0lBYXBCLE9BQU8sQ0FBQyx1QkFBdUI7SUFTL0IsT0FBTyxDQUFDLGdCQUFnQjtDQUl6QiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"attested_invalid_proposal_watcher.d.ts","sourceRoot":"","sources":["../../src/watchers/attested_invalid_proposal_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAI7D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAMhF,OAAO,EAA6C,KAAK,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAE7G,QAAA,MAAM,wCAAwC,0DAA2D,CAAC;AAM1G,KAAK,oCAAoC,GAAG,IAAI,CAC9C,aAAa,EACb,CAAC,OAAO,wCAAwC,CAAC,CAAC,MAAM,CAAC,CAC1D,CAAC;AAEF,KAAK,8BAA8B,GAAG,IAAI,CAAC,SAAS,EAAE,kCAAkC,CAAC,CAAC;AAE1F,KAAK,qCAAqC,GAAG;IAC3C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,mBAAmB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC;IAC/C,uBAAuB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC;CACpD,CAAC;;AAEF,qBAAa,8BAA+B,SAAQ,mCAA2C,YAAW,OAAO;IAS7G,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,yBAAyB;IAC1C,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAX7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA2D;IAC3F,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,MAAM,CAAuC;IACrD,OAAO,CAAC,eAAe,CAAyB;IAEhD,YACmB,SAAS,EAAE,8BAA8B,EACzC,yBAAyB,EAAE,yBAAyB,EACpD,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,uBAAuB,CAAC,EAC3D,UAAU,EAAE,IAAI,CAAC,mBAAmB,EAAE,YAAY,GAAG,gBAAgB,CAAC,EACvF,MAAM,EAAE,oCAAoC,EAC5C,OAAO,GAAE,qCAA0C,EAWpD;IAEM,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAGxD;IAEM,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAG5B;IAEM,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAE3B;IAEY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAqBjC;IAED,4CAA4C;IAC/B,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAmCrD;IAED,OAAO,CAAC,YAAY;IAapB,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,gBAAgB;CAIzB"}