@aztec/aztec-node 2.0.0-nightly.20250903 → 2.0.0-rc.2

package/dest/aztec-node/server.js

@@ -788,7 +788,7 @@ import { NodeMetrics } from './node_metrics.js';
             ...this.config,
             ...config
         };
-        this.sequencer?.updateSequencerConfig(config);
+        this.sequencer?.updateConfig(config);
         this.slasherClient?.updateConfig(config);
         this.validatorsSentinel?.updateConfig(config);
         // this.blockBuilder.updateConfig(config); // TODO: Spyros has a PR to add the builder to `this`, so we can do this

package/dest/sentinel/sentinel.d.ts

@@ -14,7 +14,7 @@ export declare class Sentinel extends Sentinel_base implements L2BlockStreamEven
     protected archiver: L2BlockSource;
     protected p2p: P2PClient;
     protected store: SentinelStore;
-    protected config: Pick<SlasherConfig, 'slashInactivityTargetPercentage' | 'slashInactivityPenalty'>;
+    protected config: Pick<SlasherConfig, 'slashInactivityTargetPercentage' | 'slashInactivityPenalty' | 'slashInactivityConsecutiveEpochThreshold'>;
     protected logger: import("@aztec/foundation/log").Logger;
     protected runningPromise: RunningPromise;
     protected blockStream: L2BlockStream;
@@ -26,7 +26,7 @@ export declare class Sentinel extends Sentinel_base implements L2BlockStreamEven
         archive: string;
         attestors: EthAddress[];
     }>;
-    constructor(epochCache: EpochCache, archiver: L2BlockSource, p2p: P2PClient, store: SentinelStore, config: Pick<SlasherConfig, 'slashInactivityTargetPercentage' | 'slashInactivityPenalty'>, logger?: import("@aztec/foundation/log").Logger);
+    constructor(epochCache: EpochCache, archiver: L2BlockSource, p2p: P2PClient, store: SentinelStore, config: Pick<SlasherConfig, 'slashInactivityTargetPercentage' | 'slashInactivityPenalty' | 'slashInactivityConsecutiveEpochThreshold'>, logger?: import("@aztec/foundation/log").Logger);
     updateConfig(config: Partial<SlasherConfig>): void;
     start(): Promise<void>;
     /** Loads initial slot and initializes blockstream. We will not process anything at or before the initial slot. */
@@ -35,8 +35,14 @@ export declare class Sentinel extends Sentinel_base implements L2BlockStreamEven
     handleBlockStreamEvent(event: L2BlockStreamEvent): Promise<void>;
     protected handleChainProven(event: L2BlockStreamEvent): Promise<void>;
     protected computeProvenPerformance(epoch: bigint): Promise<ValidatorsEpochPerformance>;
-    protected updateProvenPerformance(epoch: bigint, performance: ValidatorsEpochPerformance): Promise<void>;
-    protected handleProvenPerformance(epoch: bigint, performance: ValidatorsEpochPerformance): void;
+    /**
+     * Checks if a validator has been inactive for the specified number of consecutive epochs for which we have data on it.
+     * @param validator The validator address to check
+     * @param currentEpoch Epochs strictly before the current one are evaluated only
+     * @param requiredConsecutiveEpochs Number of consecutive epochs required for slashing
+     */
+    protected checkPastInactivity(validator: EthAddress, currentEpoch: bigint, requiredConsecutiveEpochs: number): Promise<boolean>;
+    protected handleProvenPerformance(epoch: bigint, performance: ValidatorsEpochPerformance): Promise<void>;
     /**
      * Process data for two L2 slots ago.
      * Note that we do not process historical data, since we rely on p2p data for processing,
@@ -61,17 +67,19 @@ export declare class Sentinel extends Sentinel_base implements L2BlockStreamEven
     /** Push the status for each slot for each validator. */
     protected updateValidators(slot: bigint, stats: Record<`0x${string}`, ValidatorStatusInSlot | undefined>): Promise<void>;
     /** Computes stats to be returned based on stored data. */
-    computeStats({ fromSlot: _fromSlot, toSlot: _toSlot, }?: {
+    computeStats({ fromSlot, toSlot, validators, }?: {
         fromSlot?: bigint;
         toSlot?: bigint;
+        validators?: EthAddress[];
     }): Promise<ValidatorsStats>;
     /** Computes stats for a single validator. */
     getValidatorStats(validatorAddress: EthAddress, fromSlot?: bigint, toSlot?: bigint): Promise<SingleValidatorStats | undefined>;
     protected computeStatsForValidator(address: `0x${string}`, allHistory: ValidatorStatusHistory, fromSlot?: bigint, toSlot?: bigint): ValidatorStats;
-    protected computeMissed(history: ValidatorStatusHistory, computeOverPrefix: ValidatorStatusType, filter: ValidatorStatusInSlot): {
+    protected computeMissed(history: ValidatorStatusHistory, computeOverPrefix: ValidatorStatusType | undefined, filter: ValidatorStatusInSlot[]): {
         currentStreak: number;
         rate: number | undefined;
         count: number;
+        total: number;
     };
     protected computeFromSlot(slot: bigint | undefined): {
         timestamp: bigint;

package/dest/sentinel/sentinel.d.ts.map

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

package/dest/sentinel/sentinel.js

@@ -1,11 +1,11 @@
-import { countWhile } from '@aztec/foundation/collection';
+import { countWhile, filterAsync, fromEntries, getEntries, mapValues } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { L2TipsMemoryStore } from '@aztec/kv-store/stores';
 import { OffenseType, WANT_TO_SLASH_EVENT } from '@aztec/slasher';
 import { L2BlockStream, getAttestationsFromPublishedL2Block } from '@aztec/stdlib/block';
-import { getEpochAtSlot, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
+import { getEpochAtSlot, getSlotRangeForEpoch, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import EventEmitter from 'node:events';
 export class Sentinel extends EventEmitter {
     epochCache;
@@ -82,18 +82,17 @@ export class Sentinel extends EventEmitter {
             });
             return;
         }
-        const epoch = getEpochAtSlot(block.header.getSlot(), await this.archiver.getL1Constants());
+        // TODO(palla/slash): We should only be computing proven performance if this is
+        // a full proof epoch and not a partial one, otherwise we'll end up with skewed stats.
+        const epoch = getEpochAtSlot(block.header.getSlot(), this.epochCache.getL1Constants());
         this.logger.debug(`Computing proven performance for epoch ${epoch}`);
         const performance = await this.computeProvenPerformance(epoch);
         this.logger.info(`Computed proven performance for epoch ${epoch}`, performance);
-        await this.updateProvenPerformance(epoch, performance);
-        this.handleProvenPerformance(epoch, performance);
+        await this.store.updateProvenPerformance(epoch, performance);
+        await this.handleProvenPerformance(epoch, performance);
     }
     async computeProvenPerformance(epoch) {
-        const headers = await this.archiver.getBlockHeadersForEpoch(epoch);
-        const provenSlots = headers.map((h)=>h.getSlot());
-        const fromSlot = provenSlots[0];
-        const toSlot = provenSlots[provenSlots.length - 1];
+        const [fromSlot, toSlot] = getSlotRangeForEpoch(epoch, this.epochCache.getL1Constants());
         const { committee } = await this.epochCache.getCommittee(fromSlot);
         if (!committee) {
             this.logger.trace(`No committee found for slot ${fromSlot}`);
@@ -101,41 +100,54 @@ export class Sentinel extends EventEmitter {
         }
         const stats = await this.computeStats({
             fromSlot,
-            toSlot
+            toSlot,
+            validators: committee
         });
-        this.logger.debug(`Stats for epoch ${epoch}`, stats);
-        const performance = {};
-        for (const validator of Object.keys(stats.stats)){
-            let address;
-            try {
-                address = EthAddress.fromString(validator);
-            } catch (e) {
-                this.logger.error(`Invalid validator address ${validator}`, e);
-                continue;
-            }
-            if (!committee.find((v)=>v.equals(address))) {
-                continue;
-            }
-            let missed = 0;
-            for (const history of stats.stats[validator].history){
-                if (provenSlots.includes(history.slot) && history.status === 'attestation-missed') {
-                    missed++;
-                }
-            }
-            performance[address.toString()] = {
-                missed,
-                total: provenSlots.length
-            };
-        }
-        return performance;
+        this.logger.debug(`Stats for epoch ${epoch}`, {
+            ...stats,
+            fromSlot,
+            toSlot,
+            epoch
+        });
+        // Note that we are NOT using the total slots in the epoch as `total` here, since we only
+        // compute missed attestations over the blocks that had a proposal in them. So, let's say
+        // we have an epoch with 10 slots, but only 5 had a block proposal. A validator that was
+        // offline, assuming they were not picked as proposer, will then be reported as having missed
+        // 5/5 attestations. If we used the total, they'd be reported as 5/10, which would probably
+        // allow them to avoid being slashed.
+        return mapValues(stats.stats, (stat)=>({
+                missed: stat.missedAttestations.count + stat.missedProposals.count,
+                total: stat.missedAttestations.total + stat.missedProposals.total
+            }));
     }
-    updateProvenPerformance(epoch, performance) {
-        return this.store.updateProvenPerformance(epoch, performance);
+    /**
+   * Checks if a validator has been inactive for the specified number of consecutive epochs for which we have data on it.
+   * @param validator The validator address to check
+   * @param currentEpoch Epochs strictly before the current one are evaluated only
+   * @param requiredConsecutiveEpochs Number of consecutive epochs required for slashing
+   */ async checkPastInactivity(validator, currentEpoch, requiredConsecutiveEpochs) {
+        if (requiredConsecutiveEpochs === 0) {
+            return true;
+        }
+        // Get all historical performance for this validator
+        const allPerformance = await this.store.getProvenPerformance(validator);
+        // If we don't have enough historical data, don't slash
+        if (allPerformance.length < requiredConsecutiveEpochs) {
+            this.logger.debug(`Not enough historical data for slashing ${validator} for inactivity (${allPerformance.length} epochs < ${requiredConsecutiveEpochs} required)`);
+            return false;
+        }
+        // Sort by epoch descending to get most recent first, keep only epochs strictly before the current one, and get the first N
+        return allPerformance.sort((a, b)=>Number(b.epoch - a.epoch)).filter((p)=>p.epoch < currentEpoch).slice(0, requiredConsecutiveEpochs).every((p)=>p.missed / p.total >= this.config.slashInactivityTargetPercentage);
     }
-    handleProvenPerformance(epoch, performance) {
-        const criminals = Object.entries(performance).filter(([_, { missed, total }])=>{
-            return missed / total >= this.config.slashInactivityTargetPercentage;
-        }).map(([address])=>address);
+    async handleProvenPerformance(epoch, performance) {
+        const inactiveValidators = getEntries(performance).filter(([_, { missed, total }])=>missed / total >= this.config.slashInactivityTargetPercentage).map(([address])=>address);
+        this.logger.debug(`Found ${inactiveValidators.length} inactive validators in epoch ${epoch}`, {
+            inactiveValidators,
+            epoch,
+            inactivityTargetPercentage: this.config.slashInactivityTargetPercentage
+        });
+        const epochThreshold = this.config.slashInactivityConsecutiveEpochThreshold;
+        const criminals = await filterAsync(inactiveValidators, (address)=>this.checkPastInactivity(EthAddress.fromString(address), epoch, epochThreshold - 1));
         const args = criminals.map((address)=>({
                 validator: EthAddress.fromString(address),
                 amount: this.config.slashInactivityPenalty,
@@ -143,8 +155,9 @@ export class Sentinel extends EventEmitter {
                 epochOrSlot: epoch
             }));
         if (criminals.length > 0) {
-            this.logger.info(`Identified ${criminals.length} validators to slash due to inactivity`, {
-                args
+            this.logger.info(`Identified ${criminals.length} validators to slash due to inactivity in at least ${epochThreshold} consecutive epochs`, {
+                ...args,
+                epochThreshold
             });
             this.emit(WANT_TO_SLASH_EVENT, args);
         }
@@ -243,11 +256,13 @@ export class Sentinel extends EventEmitter {
         const attestors = new Set([
             ...p2pAttested.map((a)=>a.getSender().toString()),
             ...block?.attestors.map((a)=>a.toString()) ?? []
-        ]);
-        // We assume that there was a block proposal if at least one of the validators attested to it.
+        ].filter((addr)=>proposer.toString() !== addr));
+        // We assume that there was a block proposal if at least one of the validators (other than the proposer) attested to it.
         // It could be the case that every single validator failed, and we could differentiate it by having
         // this node re-execute every block proposal it sees and storing it in the attestation pool.
         // But we'll leave that corner case out to reduce pressure on the node.
+        // TODO(palla/slash): This breaks if a given node has more than one validator in the current committee,
+        // since they will attest to their own proposal it even if it's not re-executable.
         const blockStatus = block ? 'mined' : attestors.size > 0 ? 'proposed' : 'missed';
         this.logger.debug(`Block for slot ${slot} was ${blockStatus}`, {
             ...block,
@@ -288,18 +303,17 @@ export class Sentinel extends EventEmitter {
     /** Push the status for each slot for each validator. */ updateValidators(slot, stats) {
         return this.store.updateValidators(slot, stats);
     }
-    /** Computes stats to be returned based on stored data. */ async computeStats({ fromSlot: _fromSlot, toSlot: _toSlot } = {}) {
-        const histories = await this.store.getHistories();
+    /** Computes stats to be returned based on stored data. */ async computeStats({ fromSlot, toSlot, validators } = {}) {
+        const histories = validators ? fromEntries(await Promise.all(validators.map(async (v)=>[
+                v.toString(),
+                await this.store.getHistory(v)
+            ]))) : await this.store.getHistories();
         const slotNow = this.epochCache.getEpochAndSlotNow().slot;
-        const fromSlot = _fromSlot ?? (this.lastProcessedSlot ?? slotNow) - BigInt(this.store.getHistoryLength());
-        const toSlot = _toSlot ?? this.lastProcessedSlot ?? slotNow;
-        const result = {};
-        for (const [address, history] of Object.entries(histories)){
-            const validatorAddress = address;
-            result[validatorAddress] = this.computeStatsForValidator(validatorAddress, history, fromSlot, toSlot);
-        }
+        fromSlot ??= (this.lastProcessedSlot ?? slotNow) - BigInt(this.store.getHistoryLength());
+        toSlot ??= this.lastProcessedSlot ?? slotNow;
+        const stats = mapValues(histories, (history, address)=>this.computeStatsForValidator(address, history ?? [], fromSlot, toSlot));
         return {
-            stats: result,
+            stats,
             lastProcessedSlot: this.lastProcessedSlot,
             initialSlot: this.initialSlot,
             slotWindow: this.store.getHistoryLength()
@@ -330,25 +344,32 @@ export class Sentinel extends EventEmitter {
     computeStatsForValidator(address, allHistory, fromSlot, toSlot) {
         let history = fromSlot ? allHistory.filter((h)=>h.slot >= fromSlot) : allHistory;
         history = toSlot ? history.filter((h)=>h.slot <= toSlot) : history;
+        const lastProposal = history.filter((h)=>h.status === 'block-proposed' || h.status === 'block-mined').at(-1);
+        const lastAttestation = history.filter((h)=>h.status === 'attestation-sent').at(-1);
         return {
             address: EthAddress.fromString(address),
-            lastProposal: this.computeFromSlot(history.filter((h)=>h.status === 'block-proposed' || h.status === 'block-mined').at(-1)?.slot),
-            lastAttestation: this.computeFromSlot(history.filter((h)=>h.status === 'attestation-sent').at(-1)?.slot),
+            lastProposal: this.computeFromSlot(lastProposal?.slot),
+            lastAttestation: this.computeFromSlot(lastAttestation?.slot),
             totalSlots: history.length,
-            missedProposals: this.computeMissed(history, 'block', 'block-missed'),
-            missedAttestations: this.computeMissed(history, 'attestation', 'attestation-missed'),
+            missedProposals: this.computeMissed(history, 'block', [
+                'block-missed'
+            ]),
+            missedAttestations: this.computeMissed(history, 'attestation', [
+                'attestation-missed'
+            ]),
             history
         };
     }
     computeMissed(history, computeOverPrefix, filter) {
-        const relevantHistory = history.filter((h)=>h.status.startsWith(computeOverPrefix));
-        const filteredHistory = relevantHistory.filter((h)=>h.status === filter);
+        const relevantHistory = history.filter((h)=>!computeOverPrefix || h.status.startsWith(computeOverPrefix));
+        const filteredHistory = relevantHistory.filter((h)=>filter.includes(h.status));
         return {
             currentStreak: countWhile([
                 ...relevantHistory
-            ].reverse(), (h)=>h.status === filter),
+            ].reverse(), (h)=>filter.includes(h.status)),
             rate: relevantHistory.length === 0 ? undefined : filteredHistory.length / relevantHistory.length,
-            count: filteredHistory.length
+            count: filteredHistory.length,
+            total: relevantHistory.length
         };
     }
     computeFromSlot(slot) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec-node",
-  "version": "2.0.0-nightly.20250903",
+  "version": "2.0.0-rc.2",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
@@ -66,29 +66,29 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "2.0.0-nightly.20250903",
-    "@aztec/bb-prover": "2.0.0-nightly.20250903",
-    "@aztec/blob-sink": "2.0.0-nightly.20250903",
-    "@aztec/constants": "2.0.0-nightly.20250903",
-    "@aztec/epoch-cache": "2.0.0-nightly.20250903",
-    "@aztec/ethereum": "2.0.0-nightly.20250903",
-    "@aztec/foundation": "2.0.0-nightly.20250903",
-    "@aztec/kv-store": "2.0.0-nightly.20250903",
-    "@aztec/l1-artifacts": "2.0.0-nightly.20250903",
-    "@aztec/merkle-tree": "2.0.0-nightly.20250903",
-    "@aztec/node-keystore": "2.0.0-nightly.20250903",
-    "@aztec/node-lib": "2.0.0-nightly.20250903",
-    "@aztec/noir-protocol-circuits-types": "2.0.0-nightly.20250903",
-    "@aztec/p2p": "2.0.0-nightly.20250903",
-    "@aztec/protocol-contracts": "2.0.0-nightly.20250903",
-    "@aztec/prover-client": "2.0.0-nightly.20250903",
-    "@aztec/sequencer-client": "2.0.0-nightly.20250903",
-    "@aztec/simulator": "2.0.0-nightly.20250903",
-    "@aztec/slasher": "2.0.0-nightly.20250903",
-    "@aztec/stdlib": "2.0.0-nightly.20250903",
-    "@aztec/telemetry-client": "2.0.0-nightly.20250903",
-    "@aztec/validator-client": "2.0.0-nightly.20250903",
-    "@aztec/world-state": "2.0.0-nightly.20250903",
+    "@aztec/archiver": "2.0.0-rc.2",
+    "@aztec/bb-prover": "2.0.0-rc.2",
+    "@aztec/blob-sink": "2.0.0-rc.2",
+    "@aztec/constants": "2.0.0-rc.2",
+    "@aztec/epoch-cache": "2.0.0-rc.2",
+    "@aztec/ethereum": "2.0.0-rc.2",
+    "@aztec/foundation": "2.0.0-rc.2",
+    "@aztec/kv-store": "2.0.0-rc.2",
+    "@aztec/l1-artifacts": "2.0.0-rc.2",
+    "@aztec/merkle-tree": "2.0.0-rc.2",
+    "@aztec/node-keystore": "2.0.0-rc.2",
+    "@aztec/node-lib": "2.0.0-rc.2",
+    "@aztec/noir-protocol-circuits-types": "2.0.0-rc.2",
+    "@aztec/p2p": "2.0.0-rc.2",
+    "@aztec/protocol-contracts": "2.0.0-rc.2",
+    "@aztec/prover-client": "2.0.0-rc.2",
+    "@aztec/sequencer-client": "2.0.0-rc.2",
+    "@aztec/simulator": "2.0.0-rc.2",
+    "@aztec/slasher": "2.0.0-rc.2",
+    "@aztec/stdlib": "2.0.0-rc.2",
+    "@aztec/telemetry-client": "2.0.0-rc.2",
+    "@aztec/validator-client": "2.0.0-rc.2",
+    "@aztec/world-state": "2.0.0-rc.2",
     "koa": "^2.16.1",
     "koa-router": "^12.0.0",
     "tslib": "^2.4.0",

package/src/aztec-node/server.ts

@@ -1122,7 +1122,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
 
   public async setConfig(config: Partial<AztecNodeAdminConfig>): Promise<void> {
     const newConfig = { ...this.config, ...config };
-    this.sequencer?.updateSequencerConfig(config);
+    this.sequencer?.updateConfig(config);
     this.slasherClient?.updateConfig(config);
     this.validatorsSentinel?.updateConfig(config);
     // this.blockBuilder.updateConfig(config); // TODO: Spyros has a PR to add the builder to `this`, so we can do this

package/src/sentinel/sentinel.ts

@@ -1,11 +1,17 @@
 import type { EpochCache } from '@aztec/epoch-cache';
-import { countWhile } from '@aztec/foundation/collection';
+import { countWhile, filterAsync, fromEntries, getEntries, mapValues } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { L2TipsMemoryStore, type L2TipsStore } from '@aztec/kv-store/stores';
 import type { P2PClient } from '@aztec/p2p';
-import { OffenseType, WANT_TO_SLASH_EVENT, type Watcher, type WatcherEmitter } from '@aztec/slasher';
+import {
+  OffenseType,
+  WANT_TO_SLASH_EVENT,
+  type WantToSlashArgs,
+  type Watcher,
+  type WatcherEmitter,
+} from '@aztec/slasher';
 import type { SlasherConfig } from '@aztec/slasher/config';
 import {
   type L2BlockSource,
@@ -14,7 +20,7 @@ import {
   type L2BlockStreamEventHandler,
   getAttestationsFromPublishedL2Block,
 } from '@aztec/stdlib/block';
-import { getEpochAtSlot, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
+import { getEpochAtSlot, getSlotRangeForEpoch, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import type {
   SingleValidatorStats,
   ValidatorStats,
@@ -44,7 +50,10 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
     protected archiver: L2BlockSource,
     protected p2p: P2PClient,
     protected store: SentinelStore,
-    protected config: Pick<SlasherConfig, 'slashInactivityTargetPercentage' | 'slashInactivityPenalty'>,
+    protected config: Pick<
+      SlasherConfig,
+      'slashInactivityTargetPercentage' | 'slashInactivityPenalty' | 'slashInactivityConsecutiveEpochThreshold'
+    >,
     protected logger = createLogger('node:sentinel'),
   ) {
     super();
@@ -112,63 +121,91 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
       return;
     }
 
-    const epoch = getEpochAtSlot(block.header.getSlot(), await this.archiver.getL1Constants());
+    // TODO(palla/slash): We should only be computing proven performance if this is
+    // a full proof epoch and not a partial one, otherwise we'll end up with skewed stats.
+    const epoch = getEpochAtSlot(block.header.getSlot(), this.epochCache.getL1Constants());
     this.logger.debug(`Computing proven performance for epoch ${epoch}`);
     const performance = await this.computeProvenPerformance(epoch);
     this.logger.info(`Computed proven performance for epoch ${epoch}`, performance);
 
-    await this.updateProvenPerformance(epoch, performance);
-    this.handleProvenPerformance(epoch, performance);
+    await this.store.updateProvenPerformance(epoch, performance);
+    await this.handleProvenPerformance(epoch, performance);
   }
 
-  protected async computeProvenPerformance(epoch: bigint) {
-    const headers = await this.archiver.getBlockHeadersForEpoch(epoch);
-    const provenSlots = headers.map(h => h.getSlot());
-    const fromSlot = provenSlots[0];
-    const toSlot = provenSlots[provenSlots.length - 1];
+  protected async computeProvenPerformance(epoch: bigint): Promise<ValidatorsEpochPerformance> {
+    const [fromSlot, toSlot] = getSlotRangeForEpoch(epoch, this.epochCache.getL1Constants());
     const { committee } = await this.epochCache.getCommittee(fromSlot);
     if (!committee) {
       this.logger.trace(`No committee found for slot ${fromSlot}`);
       return {};
     }
-    const stats = await this.computeStats({ fromSlot, toSlot });
-    this.logger.debug(`Stats for epoch ${epoch}`, stats);
-
-    const performance: ValidatorsEpochPerformance = {};
-    for (const validator of Object.keys(stats.stats)) {
-      let address;
-      try {
-        address = EthAddress.fromString(validator);
-      } catch (e) {
-        this.logger.error(`Invalid validator address ${validator}`, e);
-        continue;
-      }
-      if (!committee.find(v => v.equals(address))) {
-        continue;
-      }
-      let missed = 0;
-      for (const history of stats.stats[validator].history) {
-        if (provenSlots.includes(history.slot) && history.status === 'attestation-missed') {
-          missed++;
-        }
-      }
-      performance[address.toString()] = { missed, total: provenSlots.length };
-    }
-    return performance;
+
+    const stats = await this.computeStats({ fromSlot, toSlot, validators: committee });
+    this.logger.debug(`Stats for epoch ${epoch}`, { ...stats, fromSlot, toSlot, epoch });
+
+    // Note that we are NOT using the total slots in the epoch as `total` here, since we only
+    // compute missed attestations over the blocks that had a proposal in them. So, let's say
+    // we have an epoch with 10 slots, but only 5 had a block proposal. A validator that was
+    // offline, assuming they were not picked as proposer, will then be reported as having missed
+    // 5/5 attestations. If we used the total, they'd be reported as 5/10, which would probably
+    // allow them to avoid being slashed.
+    return mapValues(stats.stats, stat => ({
+      missed: stat.missedAttestations.count + stat.missedProposals.count,
+      total: stat.missedAttestations.total + stat.missedProposals.total,
+    }));
   }
 
-  protected updateProvenPerformance(epoch: bigint, performance: ValidatorsEpochPerformance) {
-    return this.store.updateProvenPerformance(epoch, performance);
+  /**
+   * Checks if a validator has been inactive for the specified number of consecutive epochs for which we have data on it.
+   * @param validator The validator address to check
+   * @param currentEpoch Epochs strictly before the current one are evaluated only
+   * @param requiredConsecutiveEpochs Number of consecutive epochs required for slashing
+   */
+  protected async checkPastInactivity(
+    validator: EthAddress,
+    currentEpoch: bigint,
+    requiredConsecutiveEpochs: number,
+  ): Promise<boolean> {
+    if (requiredConsecutiveEpochs === 0) {
+      return true;
+    }
+
+    // Get all historical performance for this validator
+    const allPerformance = await this.store.getProvenPerformance(validator);
+
+    // If we don't have enough historical data, don't slash
+    if (allPerformance.length < requiredConsecutiveEpochs) {
+      this.logger.debug(
+        `Not enough historical data for slashing ${validator} for inactivity (${allPerformance.length} epochs < ${requiredConsecutiveEpochs} required)`,
+      );
+      return false;
+    }
+
+    // Sort by epoch descending to get most recent first, keep only epochs strictly before the current one, and get the first N
+    return allPerformance
+      .sort((a, b) => Number(b.epoch - a.epoch))
+      .filter(p => p.epoch < currentEpoch)
+      .slice(0, requiredConsecutiveEpochs)
+      .every(p => p.missed / p.total >= this.config.slashInactivityTargetPercentage);
   }
 
-  protected handleProvenPerformance(epoch: bigint, performance: ValidatorsEpochPerformance) {
-    const criminals = Object.entries(performance)
-      .filter(([_, { missed, total }]) => {
-        return missed / total >= this.config.slashInactivityTargetPercentage;
-      })
-      .map(([address]) => address as `0x${string}`);
+  protected async handleProvenPerformance(epoch: bigint, performance: ValidatorsEpochPerformance) {
+    const inactiveValidators = getEntries(performance)
+      .filter(([_, { missed, total }]) => missed / total >= this.config.slashInactivityTargetPercentage)
+      .map(([address]) => address);
+
+    this.logger.debug(`Found ${inactiveValidators.length} inactive validators in epoch ${epoch}`, {
+      inactiveValidators,
+      epoch,
+      inactivityTargetPercentage: this.config.slashInactivityTargetPercentage,
+    });
+
+    const epochThreshold = this.config.slashInactivityConsecutiveEpochThreshold;
+    const criminals: string[] = await filterAsync(inactiveValidators, address =>
+      this.checkPastInactivity(EthAddress.fromString(address), epoch, epochThreshold - 1),
+    );
 
-    const args = criminals.map(address => ({
+    const args: WantToSlashArgs[] = criminals.map(address => ({
       validator: EthAddress.fromString(address),
       amount: this.config.slashInactivityPenalty,
       offenseType: OffenseType.INACTIVITY,
@@ -176,7 +213,10 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
     }));
 
     if (criminals.length > 0) {
-      this.logger.info(`Identified ${criminals.length} validators to slash due to inactivity`, { args });
+      this.logger.info(
+        `Identified ${criminals.length} validators to slash due to inactivity in at least ${epochThreshold} consecutive epochs`,
+        { ...args, epochThreshold },
+      );
       this.emit(WANT_TO_SLASH_EVENT, args);
     }
   }
@@ -275,15 +315,18 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
     // (contains the ones synced from mined blocks, which we may have missed from p2p).
     const block = this.slotNumberToBlock.get(slot);
     const p2pAttested = await this.p2p.getAttestationsForSlot(slot, block?.archive);
-    const attestors = new Set([
-      ...p2pAttested.map(a => a.getSender().toString()),
-      ...(block?.attestors.map(a => a.toString()) ?? []),
-    ]);
+    const attestors = new Set(
+      [...p2pAttested.map(a => a.getSender().toString()), ...(block?.attestors.map(a => a.toString()) ?? [])].filter(
+        addr => proposer.toString() !== addr, // Exclude the proposer from the attestors
+      ),
+    );
 
-    // We assume that there was a block proposal if at least one of the validators attested to it.
+    // We assume that there was a block proposal if at least one of the validators (other than the proposer) attested to it.
     // It could be the case that every single validator failed, and we could differentiate it by having
     // this node re-execute every block proposal it sees and storing it in the attestation pool.
     // But we'll leave that corner case out to reduce pressure on the node.
+    // TODO(palla/slash): This breaks if a given node has more than one validator in the current committee,
+    // since they will attest to their own proposal it even if it's not re-executable.
     const blockStatus = block ? 'mined' : attestors.size > 0 ? 'proposed' : 'missed';
     this.logger.debug(`Block for slot ${slot} was ${blockStatus}`, { ...block, slot });
 
@@ -327,20 +370,24 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
 
   /** Computes stats to be returned based on stored data. */
   public async computeStats({
-    fromSlot: _fromSlot,
-    toSlot: _toSlot,
-  }: { fromSlot?: bigint; toSlot?: bigint } = {}): Promise<ValidatorsStats> {
-    const histories = await this.store.getHistories();
+    fromSlot,
+    toSlot,
+    validators,
+  }: { fromSlot?: bigint; toSlot?: bigint; validators?: EthAddress[] } = {}): Promise<ValidatorsStats> {
+    const histories = validators
+      ? fromEntries(await Promise.all(validators.map(async v => [v.toString(), await this.store.getHistory(v)])))
+      : await this.store.getHistories();
+
     const slotNow = this.epochCache.getEpochAndSlotNow().slot;
-    const fromSlot = _fromSlot ?? (this.lastProcessedSlot ?? slotNow) - BigInt(this.store.getHistoryLength());
-    const toSlot = _toSlot ?? this.lastProcessedSlot ?? slotNow;
-    const result: Record<`0x${string}`, ValidatorStats> = {};
-    for (const [address, history] of Object.entries(histories)) {
-      const validatorAddress = address as `0x${string}`;
-      result[validatorAddress] = this.computeStatsForValidator(validatorAddress, history, fromSlot, toSlot);
-    }
+    fromSlot ??= (this.lastProcessedSlot ?? slotNow) - BigInt(this.store.getHistoryLength());
+    toSlot ??= this.lastProcessedSlot ?? slotNow;
+
+    const stats = mapValues(histories, (history, address) =>
+      this.computeStatsForValidator(address, history ?? [], fromSlot, toSlot),
+    );
+
     return {
-      stats: result,
+      stats,
       lastProcessedSlot: this.lastProcessedSlot,
       initialSlot: this.initialSlot,
       slotWindow: this.store.getHistoryLength(),
@@ -396,30 +443,31 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
   ): ValidatorStats {
     let history = fromSlot ? allHistory.filter(h => h.slot >= fromSlot) : allHistory;
     history = toSlot ? history.filter(h => h.slot <= toSlot) : history;
+    const lastProposal = history.filter(h => h.status === 'block-proposed' || h.status === 'block-mined').at(-1);
+    const lastAttestation = history.filter(h => h.status === 'attestation-sent').at(-1);
     return {
       address: EthAddress.fromString(address),
-      lastProposal: this.computeFromSlot(
-        history.filter(h => h.status === 'block-proposed' || h.status === 'block-mined').at(-1)?.slot,
-      ),
-      lastAttestation: this.computeFromSlot(history.filter(h => h.status === 'attestation-sent').at(-1)?.slot),
+      lastProposal: this.computeFromSlot(lastProposal?.slot),
+      lastAttestation: this.computeFromSlot(lastAttestation?.slot),
       totalSlots: history.length,
-      missedProposals: this.computeMissed(history, 'block', 'block-missed'),
-      missedAttestations: this.computeMissed(history, 'attestation', 'attestation-missed'),
+      missedProposals: this.computeMissed(history, 'block', ['block-missed']),
+      missedAttestations: this.computeMissed(history, 'attestation', ['attestation-missed']),
       history,
     };
   }
 
   protected computeMissed(
     history: ValidatorStatusHistory,
-    computeOverPrefix: ValidatorStatusType,
-    filter: ValidatorStatusInSlot,
+    computeOverPrefix: ValidatorStatusType | undefined,
+    filter: ValidatorStatusInSlot[],
   ) {
-    const relevantHistory = history.filter(h => h.status.startsWith(computeOverPrefix));
-    const filteredHistory = relevantHistory.filter(h => h.status === filter);
+    const relevantHistory = history.filter(h => !computeOverPrefix || h.status.startsWith(computeOverPrefix));
+    const filteredHistory = relevantHistory.filter(h => filter.includes(h.status));
     return {
-      currentStreak: countWhile([...relevantHistory].reverse(), h => h.status === filter),
+      currentStreak: countWhile([...relevantHistory].reverse(), h => filter.includes(h.status)),
       rate: relevantHistory.length === 0 ? undefined : filteredHistory.length / relevantHistory.length,
       count: filteredHistory.length,
+      total: relevantHistory.length,
     };
   }