@aztec/validator-client 0.0.1-commit.7b97ef96e → 0.0.1-commit.7cbc774

package/dest/validator.js

@@ -1,48 +1,70 @@
 import { getBlobsPerL1Block } from '@aztec/blob-lib';
-import { validateFeeAssetPriceModifier } from '@aztec/ethereum/contracts';
-import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
-import { TimeoutError } from '@aztec/foundation/error';
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
+import { FifoSet } from '@aztec/foundation/fifo-set';
 import { createLogger } from '@aztec/foundation/log';
-import { retryUntil } from '@aztec/foundation/retry';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { sleep } from '@aztec/foundation/sleep';
 import { DateProvider } from '@aztec/foundation/timer';
 import { AuthRequest, AuthResponse, BlockProposalValidator, ReqRespSubProtocol } from '@aztec/p2p';
-import { OffenseType, WANT_TO_SLASH_EVENT } from '@aztec/slasher';
-import { getEpochAtSlot, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
-import { accumulateCheckpointOutHashes } from '@aztec/stdlib/messaging';
+import { OffenseType, WANT_TO_CLEAR_SLASH_EVENT, WANT_TO_SLASH_EVENT, getOffenseTypeName } from '@aztec/slasher';
+import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
 import { AttestationTimeoutError } from '@aztec/stdlib/validators';
 import { getTelemetryClient } from '@aztec/telemetry-client';
-import { createHASigner } from '@aztec/validator-ha-signer/factory';
+import { createHASigner, createLocalSignerWithProtection, createSignerFromSharedDb } from '@aztec/validator-ha-signer/factory';
 import { DutyType } from '@aztec/validator-ha-signer/types';
 import { EventEmitter } from 'events';
-import { BlockProposalHandler } from './block_proposal_handler.js';
 import { ValidationService } from './duties/validation_service.js';
 import { HAKeyStore } from './key_store/ha_key_store.js';
 import { NodeKeystoreAdapter } from './key_store/node_keystore_adapter.js';
 import { ValidatorMetrics } from './metrics.js';
+import { ProposalHandler } from './proposal_handler.js';
 // We maintain a set of proposers who have proposed invalid blocks.
 // Just cap the set to avoid unbounded growth.
 const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
+const MAX_TRACKED_INVALID_PROPOSAL_SLOTS = 1000;
+const MAX_TRACKED_INVALID_CHECKPOINT_PROPOSALS = 1000;
+const MAX_TRACKED_BAD_ATTESTATIONS = 10_000;
 // What errors from the block proposal handler result in slashing
 const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
     'state_mismatch',
-    'failed_txs'
+    'failed_txs',
+    'global_variables_mismatch',
+    'invalid_proposal',
+    'parent_block_wrong_slot',
+    'in_hash_mismatch'
 ];
+const SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT = {
+    // enabled
+    ['invalid_fee_asset_price_modifier']: true,
+    ['checkpoint_header_mismatch']: true,
+    // These late mismatches should normally be caught by earlier checks, but if reached after validating the local
+    // checkpoint inputs, the proposer-signed payload disagrees with deterministic recomputation.
+    ['archive_mismatch']: true,
+    ['out_hash_mismatch']: true,
+    ['no_blocks_for_slot']: true,
+    ['too_many_blocks_in_checkpoint']: true,
+    ['checkpoint_validation_failed']: true,
+    ['last_block_archive_mismatch']: true,
+    // disabled
+    ['invalid_signature']: false,
+    ['last_block_not_found']: false,
+    ['block_fetch_error']: false,
+    ['checkpoint_already_published']: false
+};
 /**
  * Validator Client
  */ export class ValidatorClient extends EventEmitter {
     keyStore;
     epochCache;
     p2pClient;
-    blockProposalHandler;
+    proposalHandler;
     blockSource;
     checkpointsBuilder;
     worldState;
     l1ToL2MessageSource;
     config;
     blobClient;
-    haSigner;
+    slashingProtectionSigner;
     dateProvider;
     tracer;
     validationService;
@@ -54,15 +76,21 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
     /** Tracks the last checkpoint proposal we created. */ lastProposedCheckpoint;
     lastEpochForCommitteeUpdateLoop;
     epochCacheUpdateLoop;
+    /** Tracks the last epoch in which each attester successfully submitted at least one attestation. */ lastAttestedEpochByAttester;
     proposersOfInvalidBlocks;
+    slotsWithInvalidProposals;
+    invalidCheckpointProposalOffenseKeys;
+    badAttestationOffenseKeys;
+    slotsWithProposalEquivocation;
     /** Tracks the last checkpoint proposal we attested to, to prevent equivocation. */ lastAttestedProposal;
-    constructor(keyStore, epochCache, p2pClient, blockProposalHandler, blockSource, checkpointsBuilder, worldState, l1ToL2MessageSource, config, blobClient, haSigner, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator')){
-        super(), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.blockProposalHandler = blockProposalHandler, this.blockSource = blockSource, this.checkpointsBuilder = checkpointsBuilder, this.worldState = worldState, this.l1ToL2MessageSource = l1ToL2MessageSource, this.config = config, this.blobClient = blobClient, this.haSigner = haSigner, this.dateProvider = dateProvider, this.hasRegisteredHandlers = false, this.proposersOfInvalidBlocks = new Set();
+    constructor(keyStore, epochCache, p2pClient, proposalHandler, blockSource, checkpointsBuilder, worldState, l1ToL2MessageSource, config, blobClient, slashingProtectionSigner, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator')){
+        super(), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.proposalHandler = proposalHandler, this.blockSource = blockSource, this.checkpointsBuilder = checkpointsBuilder, this.worldState = worldState, this.l1ToL2MessageSource = l1ToL2MessageSource, this.config = config, this.blobClient = blobClient, this.slashingProtectionSigner = slashingProtectionSigner, this.dateProvider = dateProvider, this.hasRegisteredHandlers = false, this.lastAttestedEpochByAttester = new Map(), this.proposersOfInvalidBlocks = FifoSet.withLimit(MAX_PROPOSERS_OF_INVALID_BLOCKS), this.slotsWithInvalidProposals = FifoSet.withLimit(MAX_TRACKED_INVALID_PROPOSAL_SLOTS), this.invalidCheckpointProposalOffenseKeys = FifoSet.withLimit(MAX_TRACKED_INVALID_CHECKPOINT_PROPOSALS), this.badAttestationOffenseKeys = FifoSet.withLimit(MAX_TRACKED_BAD_ATTESTATIONS), this.slotsWithProposalEquivocation = FifoSet.withLimit(MAX_TRACKED_INVALID_PROPOSAL_SLOTS);
         // Create child logger with fisherman prefix if in fisherman mode
         this.log = config.fishermanMode ? log.createChild('[FISHERMAN]') : log;
         this.tracer = telemetry.getTracer('Validator');
         this.metrics = new ValidatorMetrics(telemetry);
-        this.validationService = new ValidationService(keyStore, this.log.createChild('validation-service'));
+        this.validationService = new ValidationService(keyStore, this.getSignatureContext(), this.log.createChild('validation-service'));
+        this.proposalHandler.setCheckpointProposalValidationFailureCallback((proposal, result, proposalInfo)=>this.handleInvalidCheckpointProposal(proposal, result, proposalInfo));
         // Refresh epoch cache every second to trigger alert if participation in committee changes
         this.epochCacheUpdateLoop = new RunningPromise(this.handleEpochCommitteeUpdate.bind(this), this.log, 1000);
         const myAddresses = this.getValidatorAddresses();
@@ -96,6 +124,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
                 this.log.trace(`No committee found for slot`);
                 return;
             }
+            this.metrics.setCurrentEpoch(epoch);
             if (epoch !== this.lastEpochForCommitteeUpdateLoop) {
                 const me = this.getValidatorAddresses();
                 const committeeSet = new Set(committee.map((v)=>v.toString()));
@@ -111,37 +140,65 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             this.log.error(`Error updating epoch committee`, err);
         }
     }
-    static async new(config, checkpointsBuilder, worldState, epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, keyStoreManager, blobClient, dateProvider = new DateProvider(), telemetry = getTelemetryClient()) {
+    static async new(config, checkpointsBuilder, worldState, epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, keyStoreManager, blobClient, reexecutionTracker, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), slashingProtectionDb) {
         const metrics = new ValidatorMetrics(telemetry);
         const blockProposalValidator = new BlockProposalValidator(epochCache, {
-            txsPermitted: !config.disableTransactions
+            txsPermitted: !config.disableTransactions,
+            maxTxsPerBlock: config.validateMaxTxsPerBlock,
+            maxBlocksPerCheckpoint: config.maxBlocksPerCheckpoint,
+            skipSlotValidation: config.skipProposalSlotValidation,
+            signatureContext: {
+                chainId: config.l1ChainId,
+                rollupAddress: config.rollupAddress
+            }
         });
-        const blockProposalHandler = new BlockProposalHandler(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, config, metrics, dateProvider, telemetry);
+        const proposalHandler = new ProposalHandler(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, config, blobClient, reexecutionTracker, metrics, dateProvider, telemetry, undefined);
         const nodeKeystoreAdapter = NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager);
-        let validatorKeyStore = nodeKeystoreAdapter;
-        let haSigner;
-        if (config.haSigningEnabled) {
+        let slashingProtectionSigner;
+        if (slashingProtectionDb) {
+            // Shared database mode: use a pre-existing database (e.g. for testing HA setups).
+            ({ signer: slashingProtectionSigner } = createSignerFromSharedDb(slashingProtectionDb, config, {
+                telemetryClient: telemetry,
+                dateProvider
+            }));
+        } else if (config.haSigningEnabled) {
+            // Multi-node HA mode: use PostgreSQL-backed distributed locking.
             // If maxStuckDutiesAgeMs is not explicitly set, compute it from Aztec slot duration
             const haConfig = {
                 ...config,
                 maxStuckDutiesAgeMs: config.maxStuckDutiesAgeMs ?? epochCache.getL1Constants().slotDuration * 2 * 1000
             };
-            const { signer } = await createHASigner(haConfig);
-            haSigner = signer;
-            validatorKeyStore = new HAKeyStore(nodeKeystoreAdapter, signer);
-        }
-        const validator = new ValidatorClient(validatorKeyStore, epochCache, p2pClient, blockProposalHandler, blockSource, checkpointsBuilder, worldState, l1ToL2MessageSource, config, blobClient, haSigner, dateProvider, telemetry);
+            ({ signer: slashingProtectionSigner } = await createHASigner(haConfig, {
+                telemetryClient: telemetry,
+                dateProvider
+            }));
+        } else {
+            // Single-node mode: use LMDB-backed local signing protection.
+            // This prevents double-signing if the node crashes and restarts mid-proposal.
+            ({ signer: slashingProtectionSigner } = await createLocalSignerWithProtection(config, {
+                telemetryClient: telemetry,
+                dateProvider
+            }));
+        }
+        const validatorKeyStore = new HAKeyStore(nodeKeystoreAdapter, slashingProtectionSigner);
+        const validator = new ValidatorClient(validatorKeyStore, epochCache, p2pClient, proposalHandler, blockSource, checkpointsBuilder, worldState, l1ToL2MessageSource, config, blobClient, slashingProtectionSigner, dateProvider, telemetry);
         return validator;
     }
     getValidatorAddresses() {
         return this.keyStore.getAddresses().filter((addr)=>!this.config.disabledValidators.some((disabled)=>disabled.equals(addr)));
     }
-    getBlockProposalHandler() {
-        return this.blockProposalHandler;
+    getProposalHandler() {
+        return this.proposalHandler;
     }
     signWithAddress(addr, msg, context) {
         return this.keyStore.signTypedDataWithAddress(addr, msg, context);
     }
+    getSignatureContext() {
+        return {
+            chainId: this.config.l1ChainId,
+            rollupAddress: this.config.rollupAddress
+        };
+    }
     getCoinbaseForAttestor(attestor) {
         return this.keyStore.getCoinbaseAddress(attestor);
     }
@@ -151,25 +208,23 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
     getConfig() {
         return this.config;
     }
+    hasProposalEquivocation(slotNumber) {
+        return this.slotsWithProposalEquivocation.has(slotNumber);
+    }
+    hasInvalidProposals(slotNumber) {
+        return this.slotsWithInvalidProposals.has(slotNumber);
+    }
     updateConfig(config) {
         this.config = {
             ...this.config,
             ...config
         };
+        this.proposalHandler.updateConfig(config);
     }
     reloadKeystore(newManager) {
-        if (this.config.haSigningEnabled && !this.haSigner) {
-            this.log.warn('HA signing is enabled in config but was not initialized at startup. ' + 'Restart the node to enable HA signing.');
-        } else if (!this.config.haSigningEnabled && this.haSigner) {
-            this.log.warn('HA signing was disabled via config update but the HA signer is still active. ' + 'Restart the node to fully disable HA signing.');
-        }
         const newAdapter = NodeKeystoreAdapter.fromKeyStoreManager(newManager);
-        if (this.haSigner) {
-            this.keyStore = new HAKeyStore(newAdapter, this.haSigner);
-        } else {
-            this.keyStore = newAdapter;
-        }
-        this.validationService = new ValidationService(this.keyStore, this.log.createChild('validation-service'));
+        this.keyStore = new HAKeyStore(newAdapter, this.slashingProtectionSigner);
+        this.validationService = new ValidationService(this.keyStore, this.getSignatureContext(), this.log.createChild('validation-service'));
     }
     async start() {
         if (this.epochCacheUpdateLoop.isRunning()) {
@@ -202,7 +257,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             // The checkpoint is received as CheckpointProposalCore since the lastBlock is extracted
             // and processed separately via the block handler above.
             const checkpointHandler = (checkpoint, proposalSender)=>this.attestToCheckpointProposal(checkpoint, proposalSender);
-            this.p2pClient.registerCheckpointProposalHandler(checkpointHandler);
+            this.p2pClient.registerValidatorCheckpointProposalHandler(checkpointHandler);
             // Duplicate proposal handler - triggers slashing for equivocation
             this.p2pClient.registerDuplicateProposalCallback((info)=>{
                 this.handleDuplicateProposal(info);
@@ -211,6 +266,9 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             this.p2pClient.registerDuplicateAttestationCallback((info)=>{
                 this.handleDuplicateAttestation(info);
             });
+            this.p2pClient.registerCheckpointAttestationCallback((attestation)=>{
+                this.handleCheckpointAttestation(attestation);
+            });
             const myAddresses = this.getValidatorAddresses();
             this.p2pClient.registerThisValidatorAddresses(myAddresses);
             await this.p2pClient.addReqRespSubProtocol(ReqRespSubProtocol.AUTH, this.handleAuthRequest.bind(this));
@@ -231,13 +289,12 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             this.log.warn(`Received block proposal with invalid signature for slot ${slotNumber}`);
             return false;
         }
-        // Ignore proposals from ourselves (may happen in HA setups)
+        // Log self-proposals from HA peers (same validator key on different nodes)
         if (this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
-            this.log.warn(`Ignoring block proposal from self for slot ${slotNumber}`, {
+            this.log.verbose(`Processing block proposal from HA peer for slot ${slotNumber}`, {
                 proposer: proposer.toString(),
                 slotNumber
             });
-            return false;
         }
         // Check if we're in the committee (for metrics purposes)
         const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
@@ -251,14 +308,11 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             txHashes: proposal.txHashes.map((t)=>t.toString()),
             fishermanMode: this.config.fishermanMode || false
         });
-        // Reexecute txs if we are part of the committee, or if slashing is enabled, or if we are configured to always reexecute.
-        // In fisherman mode, we always reexecute to validate proposals.
-        const { validatorReexecute, slashBroadcastedInvalidBlockPenalty, alwaysReexecuteBlockProposals, fishermanMode } = this.config;
-        const shouldReexecute = fishermanMode || slashBroadcastedInvalidBlockPenalty > 0n && validatorReexecute || partOfCommittee && validatorReexecute || alwaysReexecuteBlockProposals || this.blobClient.canUpload();
-        const validationResult = await this.blockProposalHandler.handleBlockProposal(proposal, proposalSender, !!shouldReexecute && !escapeHatchOpen);
+        // Reexecute outside the escape hatch so slashing observers can detect invalid proposals even when penalties are 0.
+        const validationResult = await this.proposalHandler.handleBlockProposal(proposal, proposalSender, !escapeHatchOpen);
         if (!validationResult.isValid) {
-            this.log.warn(`Block proposal validation failed: ${validationResult.reason}`, proposalInfo);
             const reason = validationResult.reason || 'unknown';
+            this.log.warn(`Block proposal validation failed: ${reason}`, proposalInfo);
             // Classify failure reason: bad proposal vs node issue
             const badProposalReasons = [
                 'invalid_proposal',
@@ -273,10 +327,14 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
                 // Node issues so we can't validate
                 this.metrics.incFailedAttestationsNodeIssue(1, reason, partOfCommittee);
             }
-            // Slash invalid block proposals (can happen even when not in committee)
-            if (!escapeHatchOpen && validationResult.reason && SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT.includes(validationResult.reason) && slashBroadcastedInvalidBlockPenalty > 0n) {
-                this.log.warn(`Slashing proposer for invalid block proposal`, proposalInfo);
+            if (!escapeHatchOpen && validationResult.reason && SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT.includes(validationResult.reason)) {
+                this.log.info(`Detected invalid block proposal offense`, {
+                    ...proposalInfo,
+                    amount: this.config.slashBroadcastedInvalidBlockPenalty,
+                    offenseType: getOffenseTypeName(OffenseType.BROADCASTED_INVALID_BLOCK_PROPOSAL)
+                });
                 this.slashInvalidBlock(proposal);
+                this.markInvalidProposalSlot(proposal.slotNumber);
             }
             return false;
         }
@@ -298,58 +356,50 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
    * the lastBlock is extracted and processed separately via the block handler.
    * @returns Checkpoint attestations if valid, undefined otherwise
    */ async attestToCheckpointProposal(proposal, _proposalSender) {
-        const slotNumber = proposal.slotNumber;
+        const proposalSlotNumber = proposal.slotNumber;
         const proposer = proposal.getSender();
         // If escape hatch is open for this slot's epoch, do not attest.
-        if (await this.epochCache.isEscapeHatchOpenAtSlot(slotNumber)) {
-            this.log.warn(`Escape hatch open for slot ${slotNumber}, skipping checkpoint attestation handling`);
+        if (await this.epochCache.isEscapeHatchOpenAtSlot(proposalSlotNumber)) {
+            this.log.warn(`Escape hatch open for slot ${proposalSlotNumber}, skipping checkpoint attestation handling`);
             return undefined;
         }
-        // Reject proposals with invalid signatures
-        if (!proposer) {
-            this.log.warn(`Received checkpoint proposal with invalid signature for slot ${slotNumber}`);
+        // Early-out for equivocation: refuses if we've already attested to a higher slot.
+        if (!this.shouldAttestToSlot(proposalSlotNumber)) {
             return undefined;
         }
         // Ignore proposals from ourselves (may happen in HA setups)
-        if (this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
-            this.log.warn(`Ignoring block proposal from self for slot ${slotNumber}`, {
+        if (proposer && this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
+            this.log.debug(`Ignoring block proposal from self for slot ${proposalSlotNumber}`, {
                 proposer: proposer.toString(),
-                slotNumber
+                proposalSlotNumber
             });
             return undefined;
         }
-        // Validate fee asset price modifier is within allowed range
-        if (!validateFeeAssetPriceModifier(proposal.feeAssetPriceModifier)) {
-            this.log.warn(`Received checkpoint proposal with invalid feeAssetPriceModifier ${proposal.feeAssetPriceModifier} for slot ${slotNumber}`);
-            return undefined;
-        }
-        // Check that I have any address in current committee before attesting
-        const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
+        // Check that I have any address in the committee where this checkpoint will land before attesting
+        const inCommittee = await this.epochCache.filterInCommittee(proposalSlotNumber, this.getValidatorAddresses());
         const partOfCommittee = inCommittee.length > 0;
         const proposalInfo = {
-            slotNumber,
+            proposalSlotNumber,
             archive: proposal.archive.toString(),
-            proposer: proposer.toString(),
-            txCount: proposal.txHashes.length
+            proposer: proposer?.toString()
         };
-        this.log.info(`Received checkpoint proposal for slot ${slotNumber}`, {
+        this.log.info(`Received checkpoint proposal for slot ${proposalSlotNumber}`, {
             ...proposalInfo,
-            txHashes: proposal.txHashes.map((t)=>t.toString()),
             fishermanMode: this.config.fishermanMode || false
         });
-        // Validate the checkpoint proposal before attesting (unless skipCheckpointProposalValidation is set)
+        // Validate the checkpoint proposal before attesting (unless skipCheckpointProposalValidation is set).
+        // Uses the cached result from the all-nodes callback if available (avoids double validation).
+        let checkpointNumber;
         if (this.config.skipCheckpointProposalValidation) {
-            this.log.warn(`Skipping checkpoint proposal validation for slot ${slotNumber}`, proposalInfo);
+            this.log.warn(`Skipping checkpoint proposal validation for slot ${proposalSlotNumber}`, proposalInfo);
+            checkpointNumber = CheckpointNumber(0);
         } else {
-            const validationResult = await this.validateCheckpointProposal(proposal, proposalInfo);
+            const validationResult = await this.proposalHandler.handleCheckpointProposal(proposal, proposalInfo);
             if (!validationResult.isValid) {
                 this.log.warn(`Checkpoint proposal validation failed: ${validationResult.reason}`, proposalInfo);
                 return undefined;
             }
-        }
-        // Upload blobs to filestore if we can (fire and forget)
-        if (this.blobClient.canUpload()) {
-            void this.uploadBlobsForCheckpoint(proposal, proposalInfo);
+            checkpointNumber = validationResult.checkpointNumber;
         }
         // Check that I have any address in current committee before attesting
         // In fisherman mode, we still create attestations for validation even if not in committee
@@ -358,12 +408,22 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             return undefined;
         }
         // Provided all of the above checks pass, we can attest to the proposal
-        this.log.info(`${partOfCommittee ? 'Attesting to' : 'Validated'} checkpoint proposal for slot ${slotNumber}`, {
+        this.log.info(`${partOfCommittee ? 'Attesting to' : 'Validated'} checkpoint proposal for slot ${proposalSlotNumber}`, {
             ...proposalInfo,
             inCommittee: partOfCommittee,
             fishermanMode: this.config.fishermanMode || false
         });
         this.metrics.incSuccessfulAttestations(inCommittee.length);
+        // Track epoch participation per attester: count each (attester, epoch) pair at most once
+        const proposalEpoch = getEpochAtSlot(proposalSlotNumber, this.epochCache.getL1Constants());
+        for (const attester of inCommittee){
+            const key = attester.toString();
+            const lastEpoch = this.lastAttestedEpochByAttester.get(key);
+            if (lastEpoch === undefined || proposalEpoch > lastEpoch) {
+                this.lastAttestedEpochByAttester.set(key, proposalEpoch);
+                this.metrics.incAttestedEpochCount(attester);
+            }
+        }
         // Determine which validators should attest
         let attestors;
         if (partOfCommittee) {
@@ -380,13 +440,13 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
         }
         if (this.config.fishermanMode) {
             // bail out early and don't save attestations to the pool in fisherman mode
-            this.log.info(`Creating checkpoint attestations for slot ${slotNumber}`, {
+            this.log.info(`Creating checkpoint attestations for slot ${proposalSlotNumber}`, {
                 ...proposalInfo,
                 attestors: attestors.map((a)=>a.toString())
             });
             return undefined;
         }
-        return await this.createCheckpointAttestationsFromProposal(proposal, attestors);
+        return await this.createCheckpointAttestationsFromProposal(proposal, attestors, checkpointNumber);
     }
     /**
    * Checks if we should attest to a slot based on equivocation prevention rules.
@@ -403,164 +463,24 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
         }
         return true;
     }
-    async createCheckpointAttestationsFromProposal(proposal, attestors = []) {
+    async createCheckpointAttestationsFromProposal(proposal, attestors = [], checkpointNumber) {
         // Equivocation check: must happen right before signing to minimize the race window
         if (!this.shouldAttestToSlot(proposal.slotNumber)) {
             return undefined;
         }
-        const attestations = await this.validationService.attestToCheckpointProposal(proposal, attestors);
+        const attestations = await this.validationService.attestToCheckpointProposal(proposal, attestors, checkpointNumber);
         // Track the proposal we attested to (to prevent equivocation)
         this.lastAttestedProposal = proposal;
         await this.p2pClient.addOwnCheckpointAttestations(attestations);
         return attestations;
     }
     /**
-   * Validates a checkpoint proposal by building the full checkpoint and comparing it with the proposal.
-   * @returns Validation result with isValid flag and reason if invalid.
-   */ async validateCheckpointProposal(proposal, proposalInfo) {
-        const slot = proposal.slotNumber;
-        // Timeout block syncing at the start of the next slot
-        const config = this.checkpointsBuilder.getConfig();
-        const nextSlotTimestampSeconds = Number(getTimestampForSlot(SlotNumber(slot + 1), config));
-        const timeoutSeconds = Math.max(1, nextSlotTimestampSeconds - Math.floor(this.dateProvider.now() / 1000));
-        // Wait for last block to sync by archive
-        let lastBlockHeader;
-        try {
-            lastBlockHeader = await retryUntil(async ()=>{
-                await this.blockSource.syncImmediate();
-                return this.blockSource.getBlockHeaderByArchive(proposal.archive);
-            }, `waiting for block with archive ${proposal.archive.toString()} for slot ${slot}`, timeoutSeconds, 0.5);
-        } catch (err) {
-            if (err instanceof TimeoutError) {
-                this.log.warn(`Timed out waiting for block with archive matching checkpoint proposal`, proposalInfo);
-                return {
-                    isValid: false,
-                    reason: 'last_block_not_found'
-                };
-            }
-            this.log.error(`Error fetching last block for checkpoint proposal`, err, proposalInfo);
-            return {
-                isValid: false,
-                reason: 'block_fetch_error'
-            };
-        }
-        if (!lastBlockHeader) {
-            this.log.warn(`Last block not found for checkpoint proposal`, proposalInfo);
-            return {
-                isValid: false,
-                reason: 'last_block_not_found'
-            };
-        }
-        // Get all full blocks for the slot and checkpoint
-        const blocks = await this.blockSource.getBlocksForSlot(slot);
-        if (blocks.length === 0) {
-            this.log.warn(`No blocks found for slot ${slot}`, proposalInfo);
-            return {
-                isValid: false,
-                reason: 'no_blocks_for_slot'
-            };
-        }
-        // Ensure the last block for this slot matches the archive in the checkpoint proposal
-        if (!blocks.at(-1)?.archive.root.equals(proposal.archive)) {
-            this.log.warn(`Last block archive mismatch for checkpoint proposal`, proposalInfo);
-            return {
-                isValid: false,
-                reason: 'last_block_archive_mismatch'
-            };
-        }
-        this.log.debug(`Found ${blocks.length} blocks for slot ${slot}`, {
-            ...proposalInfo,
-            blockNumbers: blocks.map((b)=>b.number)
-        });
-        // Get checkpoint constants from first block
-        const firstBlock = blocks[0];
-        const constants = this.extractCheckpointConstants(firstBlock);
-        const checkpointNumber = firstBlock.checkpointNumber;
-        // Get L1-to-L2 messages for this checkpoint
-        const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(checkpointNumber);
-        // Collect the out hashes of all the checkpoints before this one in the same epoch
-        const epoch = getEpochAtSlot(slot, this.epochCache.getL1Constants());
-        const previousCheckpointOutHashes = (await this.blockSource.getCheckpointsDataForEpoch(epoch)).filter((c)=>c.checkpointNumber < checkpointNumber).map((c)=>c.checkpointOutHash);
-        // Fork world state at the block before the first block
-        const parentBlockNumber = BlockNumber(firstBlock.number - 1);
-        const fork = await this.worldState.fork(parentBlockNumber);
-        try {
-            // Create checkpoint builder with all existing blocks
-            const checkpointBuilder = await this.checkpointsBuilder.openCheckpoint(checkpointNumber, constants, proposal.feeAssetPriceModifier, l1ToL2Messages, previousCheckpointOutHashes, fork, blocks, this.log.getBindings());
-            // Complete the checkpoint to get computed values
-            const computedCheckpoint = await checkpointBuilder.completeCheckpoint();
-            // Compare checkpoint header with proposal
-            if (!computedCheckpoint.header.equals(proposal.checkpointHeader)) {
-                this.log.warn(`Checkpoint header mismatch`, {
-                    ...proposalInfo,
-                    computed: computedCheckpoint.header.toInspect(),
-                    proposal: proposal.checkpointHeader.toInspect()
-                });
-                return {
-                    isValid: false,
-                    reason: 'checkpoint_header_mismatch'
-                };
-            }
-            // Compare archive root with proposal
-            if (!computedCheckpoint.archive.root.equals(proposal.archive)) {
-                this.log.warn(`Archive root mismatch`, {
-                    ...proposalInfo,
-                    computed: computedCheckpoint.archive.root.toString(),
-                    proposal: proposal.archive.toString()
-                });
-                return {
-                    isValid: false,
-                    reason: 'archive_mismatch'
-                };
-            }
-            // Check that the accumulated epoch out hash matches the value in the proposal.
-            // The epoch out hash is the accumulated hash of all checkpoint out hashes in the epoch.
-            const checkpointOutHash = computedCheckpoint.getCheckpointOutHash();
-            const computedEpochOutHash = accumulateCheckpointOutHashes([
-                ...previousCheckpointOutHashes,
-                checkpointOutHash
-            ]);
-            const proposalEpochOutHash = proposal.checkpointHeader.epochOutHash;
-            if (!computedEpochOutHash.equals(proposalEpochOutHash)) {
-                this.log.warn(`Epoch out hash mismatch`, {
-                    proposalEpochOutHash: proposalEpochOutHash.toString(),
-                    computedEpochOutHash: computedEpochOutHash.toString(),
-                    checkpointOutHash: checkpointOutHash.toString(),
-                    previousCheckpointOutHashes: previousCheckpointOutHashes.map((h)=>h.toString()),
-                    ...proposalInfo
-                });
-                return {
-                    isValid: false,
-                    reason: 'out_hash_mismatch'
-                };
-            }
-            this.log.verbose(`Checkpoint proposal validation successful for slot ${slot}`, proposalInfo);
-            return {
-                isValid: true
-            };
-        } finally{
-            await fork.close();
-        }
-    }
-    /**
-   * Extract checkpoint global variables from a block.
-   */ extractCheckpointConstants(block) {
-        const gv = block.header.globalVariables;
-        return {
-            chainId: gv.chainId,
-            version: gv.version,
-            slotNumber: gv.slotNumber,
-            timestamp: gv.timestamp,
-            coinbase: gv.coinbase,
-            feeRecipient: gv.feeRecipient,
-            gasFees: gv.gasFees
-        };
-    }
-    /**
    * Uploads blobs for a checkpoint to the filestore (fire and forget).
    */ async uploadBlobsForCheckpoint(proposal, proposalInfo) {
         try {
-            const lastBlockHeader = await this.blockSource.getBlockHeaderByArchive(proposal.archive);
+            const lastBlockHeader = (await this.blockSource.getBlockData({
+                archive: proposal.archive
+            }))?.header;
             if (!lastBlockHeader) {
                 this.log.warn(`Failed to get last block header for blob upload`, proposalInfo);
                 return;
@@ -588,11 +508,6 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             this.log.warn(`Cannot slash proposal with invalid signature`);
             return;
         }
-        // Trim the set if it's too big.
-        if (this.proposersOfInvalidBlocks.size > MAX_PROPOSERS_OF_INVALID_BLOCKS) {
-            // remove oldest proposer. `values` is guaranteed to be in insertion order.
-            this.proposersOfInvalidBlocks.delete(this.proposersOfInvalidBlocks.values().next().value);
-        }
         this.proposersOfInvalidBlocks.add(proposer.toString());
         this.emit(WANT_TO_SLASH_EVENT, [
             {
@@ -603,17 +518,95 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             }
         ]);
     }
+    handleInvalidCheckpointProposal(proposal, result, proposalInfo) {
+        if (!SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT[result.reason]) {
+            return;
+        }
+        this.markInvalidProposalSlot(proposal.slotNumber);
+        if (this.slashInvalidCheckpointProposal(proposal)) {
+            this.log.info(`Detected invalid checkpoint proposal offense`, {
+                ...proposalInfo,
+                reason: result.reason,
+                amount: this.config.slashBroadcastedInvalidCheckpointProposalPenalty,
+                offenseType: getOffenseTypeName(OffenseType.BROADCASTED_INVALID_CHECKPOINT_PROPOSAL)
+            });
+        }
+    }
+    slashInvalidCheckpointProposal(proposal) {
+        const proposer = proposal.getSender();
+        if (!proposer) {
+            this.log.warn(`Cannot slash checkpoint proposal with invalid signature`, {
+                slotNumber: proposal.slotNumber,
+                archive: proposal.archive.toString()
+            });
+            return false;
+        }
+        const offenseType = OffenseType.BROADCASTED_INVALID_CHECKPOINT_PROPOSAL;
+        const offenseKey = `${proposer.toString()}:${offenseType}:${proposal.slotNumber}`;
+        if (!this.invalidCheckpointProposalOffenseKeys.addIfAbsent(offenseKey)) {
+            return false;
+        }
+        this.emit(WANT_TO_SLASH_EVENT, [
+            {
+                validator: proposer,
+                amount: this.config.slashBroadcastedInvalidCheckpointProposalPenalty,
+                offenseType,
+                epochOrSlot: BigInt(proposal.slotNumber)
+            }
+        ]);
+        return true;
+    }
+    markInvalidProposalSlot(slotNumber) {
+        this.slotsWithInvalidProposals.add(slotNumber);
+    }
+    handleCheckpointAttestation(attestation) {
+        const slotNumber = attestation.slotNumber;
+        if (!this.slotsWithInvalidProposals.has(slotNumber) || this.slotsWithProposalEquivocation.has(slotNumber)) {
+            return;
+        }
+        const attester = attestation.getSender();
+        if (!attester) {
+            this.log.warn(`Cannot slash checkpoint attestation with invalid signature`, {
+                slotNumber,
+                archive: attestation.archive.toString()
+            });
+            return;
+        }
+        this.slashAttestedToInvalidCheckpointProposal(slotNumber, attester);
+    }
+    slashAttestedToInvalidCheckpointProposal(slotNumber, attester) {
+        const offenseKey = `${attester.toString()}:${OffenseType.ATTESTED_TO_INVALID_CHECKPOINT_PROPOSAL}:${slotNumber}`;
+        if (!this.badAttestationOffenseKeys.addIfAbsent(offenseKey)) {
+            return;
+        }
+        this.log.info(`Detected attestation to invalid checkpoint proposal offense`, {
+            attester: attester.toString(),
+            slotNumber,
+            amount: this.config.slashAttestInvalidCheckpointProposalPenalty,
+            offenseType: getOffenseTypeName(OffenseType.ATTESTED_TO_INVALID_CHECKPOINT_PROPOSAL)
+        });
+        this.emit(WANT_TO_SLASH_EVENT, [
+            {
+                validator: attester,
+                amount: this.config.slashAttestInvalidCheckpointProposalPenalty,
+                offenseType: OffenseType.ATTESTED_TO_INVALID_CHECKPOINT_PROPOSAL,
+                epochOrSlot: BigInt(slotNumber)
+            }
+        ]);
+    }
     /**
    * Handle detection of a duplicate proposal (equivocation).
    * Emits a slash event when a proposer sends multiple proposals for the same position.
    */ handleDuplicateProposal(info) {
         const { slot, proposer, type } = info;
-        this.log.warn(`Triggering slash event for duplicate ${type} proposal from ${proposer.toString()} at slot ${slot}`, {
+        this.slotsWithProposalEquivocation.add(slot);
+        this.log.info(`Detected duplicate ${type} proposal offense from ${proposer.toString()} at slot ${slot}`, {
             proposer: proposer.toString(),
             slot,
-            type
+            type,
+            amount: this.config.slashDuplicateProposalPenalty,
+            offenseType: getOffenseTypeName(OffenseType.DUPLICATE_PROPOSAL)
         });
-        // Emit slash event
         this.emit(WANT_TO_SLASH_EVENT, [
             {
                 validator: proposer,
@@ -622,15 +615,23 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
                 epochOrSlot: BigInt(slot)
             }
         ]);
+        this.emit(WANT_TO_CLEAR_SLASH_EVENT, [
+            {
+                offenseType: OffenseType.ATTESTED_TO_INVALID_CHECKPOINT_PROPOSAL,
+                epochOrSlot: BigInt(slot)
+            }
+        ]);
     }
     /**
    * Handle detection of a duplicate attestation (equivocation).
    * Emits a slash event when an attester signs attestations for different proposals at the same slot.
    */ handleDuplicateAttestation(info) {
         const { slot, attester } = info;
-        this.log.warn(`Triggering slash event for duplicate attestation from ${attester.toString()} at slot ${slot}`, {
+        this.log.info(`Detected duplicate attestation offense from ${attester.toString()} at slot ${slot}`, {
             attester: attester.toString(),
-            slot
+            slot,
+            amount: this.config.slashDuplicateAttestationPenalty,
+            offenseType: getOffenseTypeName(OffenseType.DUPLICATE_ATTESTATION)
         });
         this.emit(WANT_TO_SLASH_EVENT, [
             {
@@ -641,7 +642,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             }
         ]);
     }
-    async createBlockProposal(blockHeader, indexWithinCheckpoint, inHash, archive, txs, proposerAddress, options = {}) {
+    async createBlockProposal(blockHeader, checkpointNumber, indexWithinCheckpoint, inHash, archive, txs, proposerAddress, options = {}) {
         // Validate that we're not creating a proposal for an older or equal position
         if (this.lastProposedBlock) {
             const lastSlot = this.lastProposedBlock.slotNumber;
@@ -652,14 +653,14 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             }
         }
         this.log.info(`Assembling block proposal for block ${blockHeader.globalVariables.blockNumber} slot ${blockHeader.globalVariables.slotNumber}`);
-        const newProposal = await this.validationService.createBlockProposal(blockHeader, indexWithinCheckpoint, inHash, archive, txs, proposerAddress, {
+        const newProposal = await this.validationService.createBlockProposal(blockHeader, checkpointNumber, indexWithinCheckpoint, inHash, archive, txs, proposerAddress, {
             ...options,
-            broadcastInvalidBlockProposal: this.config.broadcastInvalidBlockProposal
+            broadcastInvalidBlockProposal: options.broadcastInvalidBlockProposal || this.config.broadcastInvalidBlockProposal
         });
         this.lastProposedBlock = newProposal;
         return newProposal;
     }
-    async createCheckpointProposal(checkpointHeader, archive, feeAssetPriceModifier, lastBlockInfo, proposerAddress, options = {}) {
+    async createCheckpointProposal(checkpointHeader, archive, checkpointNumber, feeAssetPriceModifier, lastBlockProposal, proposerAddress, options = {}) {
         // Validate that we're not creating a proposal for an older or equal slot
         if (this.lastProposedCheckpoint) {
             const lastSlot = this.lastProposedCheckpoint.slotNumber;
@@ -669,23 +670,30 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             }
         }
         this.log.info(`Assembling checkpoint proposal for slot ${checkpointHeader.slotNumber}`);
-        const newProposal = await this.validationService.createCheckpointProposal(checkpointHeader, archive, feeAssetPriceModifier, lastBlockInfo, proposerAddress, options);
+        const newProposal = await this.validationService.createCheckpointProposal(checkpointHeader, archive, checkpointNumber, feeAssetPriceModifier, lastBlockProposal, proposerAddress, options);
         this.lastProposedCheckpoint = newProposal;
+        // Self-record this slot's outcome on the re-execution tracker. Proposers don't run their
+        // own proposals through `handleCheckpointProposal`, so without this call the proposer's
+        // sentinel would see no outcome for slots it proposed and would mis-attribute itself as
+        // inactive. We pass the locally-computed `archive` (not `newProposal.archive`, which may
+        // be intentionally corrupted under test-only flags); from the proposer's local-view
+        // perspective the work it just completed is valid by definition.
+        this.proposalHandler.recordOwnCheckpointProposalAsValid(checkpointHeader.slotNumber, archive, checkpointNumber);
         return newProposal;
     }
     async broadcastBlockProposal(proposal) {
         await this.p2pClient.broadcastProposal(proposal);
     }
-    async signAttestationsAndSigners(attestationsAndSigners, proposer, slot, blockNumber) {
-        return await this.validationService.signAttestationsAndSigners(attestationsAndSigners, proposer, slot, blockNumber);
+    async signAttestationsAndSigners(attestationsAndSigners, proposer, slot, checkpointNumber) {
+        return await this.validationService.signAttestationsAndSigners(attestationsAndSigners, proposer, slot, checkpointNumber);
     }
-    async collectOwnAttestations(proposal) {
+    async collectOwnAttestations(proposal, checkpointNumber) {
         const slot = proposal.slotNumber;
         const inCommittee = await this.epochCache.filterInCommittee(slot, this.getValidatorAddresses());
         this.log.debug(`Collecting ${inCommittee.length} self-attestations for slot ${slot}`, {
             inCommittee
         });
-        const attestations = await this.createCheckpointAttestationsFromProposal(proposal, inCommittee);
+        const attestations = await this.createCheckpointAttestationsFromProposal(proposal, inCommittee, checkpointNumber);
         if (!attestations) {
             return [];
         }
@@ -697,7 +705,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
         });
         return attestations;
     }
-    async collectAttestations(proposal, required, deadline) {
+    async collectAttestations(proposal, required, deadline, checkpointNumber) {
         // Wait and poll the p2pClient's attestation pool for this checkpoint until we have enough attestations
         const slot = proposal.slotNumber;
         this.log.debug(`Collecting ${required} attestations for slot ${slot} with deadline ${deadline.toISOString()}`);
@@ -705,28 +713,20 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             this.log.error(`Deadline ${deadline.toISOString()} for collecting ${required} attestations for slot ${slot} is in the past`);
             throw new AttestationTimeoutError(0, required, slot);
         }
-        await this.collectOwnAttestations(proposal);
-        const proposalId = proposal.archive.toString();
+        await this.collectOwnAttestations(proposal, checkpointNumber);
+        const proposalPayloadHash = proposal.getPayloadHash();
         const myAddresses = this.getValidatorAddresses();
         let attestations = [];
         while(true){
-            // Filter out attestations with a mismatching archive. This should NOT happen since we have verified
-            // the proposer signature (ie our own) before accepting the attestation into the pool via the p2p client.
-            const collectedAttestations = (await this.p2pClient.getCheckpointAttestationsForSlot(slot, proposalId)).filter((attestation)=>{
-                if (!attestation.archive.equals(proposal.archive)) {
-                    this.log.warn(`Received attestation for slot ${slot} with mismatched archive from ${attestation.getSender()?.toString()}`, {
-                        attestationArchive: attestation.archive.toString(),
-                        proposalArchive: proposal.archive.toString()
-                    });
-                    return false;
-                }
-                return true;
-            });
+            // The pool already filters by proposal payload hash; if any attestation slips through with a
+            // mismatched payload hash, drop it defensively. Equivocations are emitted as separate slash
+            // events from libp2p_service.
+            const collectedAttestations = await this.p2pClient.getCheckpointAttestationsForSlot(slot, proposalPayloadHash);
             // Log new attestations we collected
             const oldSenders = attestations.map((attestation)=>attestation.getSender());
             for (const collected of collectedAttestations){
                 const collectedSender = collected.getSender();
-                // Skip attestations with invalid signatures
+                // Skip attestations with invalid signatures. Should not happen as we don't add invalid attestations to our pool.
                 if (!collectedSender) {
                     this.log.warn(`Skipping attestation with invalid signature for slot ${slot}`);
                     continue;