@aztec/validator-client 0.0.1-commit.03f7ef2 → 0.0.1-commit.0658669b3

package/dest/validator.js

@@ -1,15 +1,24 @@
 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 { 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 { AttestationTimeoutError } from '@aztec/stdlib/validators';
 import { getTelemetryClient } from '@aztec/telemetry-client';
+import { createHASigner } 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';
 // We maintain a set of proposers who have proposed invalid blocks.
@@ -27,8 +36,13 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
     epochCache;
     p2pClient;
     blockProposalHandler;
+    blockSource;
+    checkpointsBuilder;
+    worldState;
+    l1ToL2MessageSource;
     config;
-    fileStoreBlobUploadClient;
+    blobClient;
+    haSigner;
     dateProvider;
     tracer;
     validationService;
@@ -36,13 +50,14 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
     log;
     // Whether it has already registered handlers on the p2p client
     hasRegisteredHandlers;
-    // Used to check if we are sending the same proposal twice
-    previousProposal;
+    /** Tracks the last block proposal we created, to detect duplicate proposal attempts. */ lastProposedBlock;
+    /** Tracks the last checkpoint proposal we created. */ lastProposedCheckpoint;
     lastEpochForCommitteeUpdateLoop;
     epochCacheUpdateLoop;
     proposersOfInvalidBlocks;
-    constructor(keyStore, epochCache, p2pClient, blockProposalHandler, config, fileStoreBlobUploadClient, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator')){
-        super(), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.blockProposalHandler = blockProposalHandler, this.config = config, this.fileStoreBlobUploadClient = fileStoreBlobUploadClient, this.dateProvider = dateProvider, this.hasRegisteredHandlers = false, this.proposersOfInvalidBlocks = new Set();
+    /** 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();
         // Create child logger with fisherman prefix if in fisherman mode
         this.log = config.fishermanMode ? log.createChild('[FISHERMAN]') : log;
         this.tracer = telemetry.getTracer('Validator');
@@ -96,13 +111,29 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             this.log.error(`Error updating epoch committee`, err);
         }
     }
-    static new(config, blockBuilder, epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, keyStoreManager, fileStoreBlobUploadClient, dateProvider = new DateProvider(), telemetry = getTelemetryClient()) {
+    static async new(config, checkpointsBuilder, worldState, epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, keyStoreManager, blobClient, dateProvider = new DateProvider(), telemetry = getTelemetryClient()) {
         const metrics = new ValidatorMetrics(telemetry);
         const blockProposalValidator = new BlockProposalValidator(epochCache, {
             txsPermitted: !config.disableTransactions
         });
-        const blockProposalHandler = new BlockProposalHandler(blockBuilder, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, config, metrics, dateProvider, telemetry);
-        const validator = new ValidatorClient(NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager), epochCache, p2pClient, blockProposalHandler, config, fileStoreBlobUploadClient, dateProvider, telemetry);
+        const blockProposalHandler = new BlockProposalHandler(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, config, metrics, dateProvider, telemetry);
+        const nodeKeystoreAdapter = NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager);
+        let validatorKeyStore = nodeKeystoreAdapter;
+        let haSigner;
+        if (config.haSigningEnabled) {
+            // 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, {
+                telemetryClient: telemetry,
+                dateProvider
+            });
+            haSigner = signer;
+            validatorKeyStore = new HAKeyStore(nodeKeystoreAdapter, signer);
+        }
+        const validator = new ValidatorClient(validatorKeyStore, epochCache, p2pClient, blockProposalHandler, blockSource, checkpointsBuilder, worldState, l1ToL2MessageSource, config, blobClient, haSigner, dateProvider, telemetry);
         return validator;
     }
     getValidatorAddresses() {
@@ -111,12 +142,8 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
     getBlockProposalHandler() {
         return this.blockProposalHandler;
     }
-    // Proxy method for backwards compatibility with tests
-    reExecuteTransactions(proposal, blockNumber, txs, l1ToL2Messages) {
-        return this.blockProposalHandler.reexecuteTransactions(proposal, blockNumber, txs, l1ToL2Messages);
-    }
-    signWithAddress(addr, msg) {
-        return this.keyStore.signTypedDataWithAddress(addr, msg);
+    signWithAddress(addr, msg, context) {
+        return this.keyStore.signTypedDataWithAddress(addr, msg, context);
     }
     getCoinbaseForAttestor(attestor) {
         return this.keyStore.getCoinbaseAddress(attestor);
@@ -133,11 +160,26 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             ...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'));
+    }
     async start() {
         if (this.epochCacheUpdateLoop.isRunning()) {
             this.log.warn(`Validator client already started`);
             return;
         }
+        await this.keyStore.start();
         await this.registerHandlers();
         const myAddresses = this.getValidatorAddresses();
         const inCommittee = await this.epochCache.filterInCommittee('now', myAddresses);
@@ -150,46 +192,75 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
     }
     async stop() {
         await this.epochCacheUpdateLoop.stop();
+        await this.keyStore.stop();
     }
     /** Register handlers on the p2p client */ async registerHandlers() {
         if (!this.hasRegisteredHandlers) {
             this.hasRegisteredHandlers = true;
             this.log.debug(`Registering validator handlers for p2p client`);
-            const handler = (block, proposalSender)=>this.attestToProposal(block, proposalSender);
-            this.p2pClient.registerBlockProposalHandler(handler);
+            // Block proposal handler - validates but does NOT attest (validators only attest to checkpoints)
+            const blockHandler = (block, proposalSender)=>this.validateBlockProposal(block, proposalSender);
+            this.p2pClient.registerBlockProposalHandler(blockHandler);
+            // Checkpoint proposal handler - validates and creates attestations
+            // 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);
+            // Duplicate proposal handler - triggers slashing for equivocation
+            this.p2pClient.registerDuplicateProposalCallback((info)=>{
+                this.handleDuplicateProposal(info);
+            });
+            // Duplicate attestation handler - triggers slashing for attestation equivocation
+            this.p2pClient.registerDuplicateAttestationCallback((info)=>{
+                this.handleDuplicateAttestation(info);
+            });
             const myAddresses = this.getValidatorAddresses();
             this.p2pClient.registerThisValidatorAddresses(myAddresses);
             await this.p2pClient.addReqRespSubProtocol(ReqRespSubProtocol.AUTH, this.handleAuthRequest.bind(this));
         }
     }
-    async attestToProposal(proposal, proposalSender) {
+    /**
+   * Validate a block proposal from a peer.
+   * Note: Validators do NOT attest to individual blocks - attestations are only for checkpoint proposals.
+   * @returns true if the proposal is valid, false otherwise
+   */ async validateBlockProposal(proposal, proposalSender) {
         const slotNumber = proposal.slotNumber;
+        // Note: During escape hatch, we still want to "validate" proposals for observability,
+        // but we intentionally reject them and disable slashing invalid block and attestation flow.
+        const escapeHatchOpen = await this.epochCache.isEscapeHatchOpenAtSlot(slotNumber);
         const proposer = proposal.getSender();
         // Reject proposals with invalid signatures
         if (!proposer) {
-            this.log.warn(`Received proposal with invalid signature for slot ${slotNumber}`);
-            return undefined;
+            this.log.warn(`Received block proposal with invalid signature for slot ${slotNumber}`);
+            return false;
         }
-        // Check that I have any address in current committee before attesting
+        // 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}`, {
+                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());
         const partOfCommittee = inCommittee.length > 0;
         const proposalInfo = {
             ...proposal.toBlockInfo(),
             proposer: proposer.toString()
         };
-        this.log.info(`Received proposal for slot ${slotNumber}`, {
+        this.log.info(`Received block proposal for slot ${slotNumber}`, {
             ...proposalInfo,
             txHashes: proposal.txHashes.map((t)=>t.toString()),
             fishermanMode: this.config.fishermanMode || false
         });
-        // Reexecute txs if we are part of the committee so we can attest, or if slashing is enabled so we can slash
-        // invalid proposals even when not in the committee, or if we are configured to always reexecute for monitoring purposes.
+        // 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.fileStoreBlobUploadClient;
-        const validationResult = await this.blockProposalHandler.handleBlockProposal(proposal, proposalSender, !!shouldReexecute);
+        const shouldReexecute = fishermanMode || slashBroadcastedInvalidBlockPenalty > 0n && validatorReexecute || partOfCommittee && validatorReexecute || alwaysReexecuteBlockProposals || this.blobClient.canUpload();
+        const validationResult = await this.blockProposalHandler.handleBlockProposal(proposal, proposalSender, !!shouldReexecute && !escapeHatchOpen);
         if (!validationResult.isValid) {
-            this.log.warn(`Proposal validation failed: ${validationResult.reason}`, proposalInfo);
+            this.log.warn(`Block proposal validation failed: ${validationResult.reason}`, proposalInfo);
             const reason = validationResult.reason || 'unknown';
             // Classify failure reason: bad proposal vs node issue
             const badProposalReasons = [
@@ -202,43 +273,100 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             if (badProposalReasons.includes(reason)) {
                 this.metrics.incFailedAttestationsBadProposal(1, reason, partOfCommittee);
             } else {
-                // Node issues so we can't attest
+                // 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 (validationResult.reason && SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT.includes(validationResult.reason) && slashBroadcastedInvalidBlockPenalty > 0n) {
+            if (!escapeHatchOpen && validationResult.reason && SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT.includes(validationResult.reason) && slashBroadcastedInvalidBlockPenalty > 0n) {
                 this.log.warn(`Slashing proposer for invalid block proposal`, proposalInfo);
                 this.slashInvalidBlock(proposal);
             }
+            return false;
+        }
+        this.log.info(`Validated block proposal for slot ${slotNumber}`, {
+            ...proposalInfo,
+            inCommittee: partOfCommittee,
+            fishermanMode: this.config.fishermanMode || false,
+            escapeHatchOpen
+        });
+        if (escapeHatchOpen) {
+            this.log.warn(`Escape hatch open for slot ${slotNumber}, rejecting block proposal`, proposalInfo);
+            return false;
+        }
+        return true;
+    }
+    /**
+   * Validate and attest to a checkpoint proposal from a peer.
+   * The proposal is received as CheckpointProposalCore (without lastBlock) since
+   * 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 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`);
+            return undefined;
+        }
+        // Reject proposals with invalid signatures
+        if (!proposer) {
+            this.log.warn(`Received checkpoint proposal with invalid signature for slot ${slotNumber}`);
+            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}`, {
+                proposer: proposer.toString(),
+                slotNumber
+            });
+            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());
+        const partOfCommittee = inCommittee.length > 0;
+        const proposalInfo = {
+            slotNumber,
+            archive: proposal.archive.toString(),
+            proposer: proposer.toString(),
+            txCount: proposal.txHashes.length
+        };
+        this.log.info(`Received checkpoint proposal for slot ${slotNumber}`, {
+            ...proposalInfo,
+            txHashes: proposal.txHashes.map((t)=>t.toString()),
+            fishermanMode: this.config.fishermanMode || false
+        });
+        // Validate the checkpoint proposal before attesting (unless skipCheckpointProposalValidation is set)
+        if (this.config.skipCheckpointProposalValidation) {
+            this.log.warn(`Skipping checkpoint proposal validation for slot ${slotNumber}`, proposalInfo);
+        } else {
+            const validationResult = await this.validateCheckpointProposal(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);
+        }
+        // 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
         if (!partOfCommittee && !this.config.fishermanMode) {
             this.log.verbose(`No validator in the current committee, skipping attestation`, proposalInfo);
             return undefined;
         }
         // Provided all of the above checks pass, we can attest to the proposal
-        this.log.info(`${partOfCommittee ? 'Attesting to' : 'Validated'} proposal for slot ${slotNumber}`, {
+        this.log.info(`${partOfCommittee ? 'Attesting to' : 'Validated'} checkpoint proposal for slot ${slotNumber}`, {
             ...proposalInfo,
             inCommittee: partOfCommittee,
             fishermanMode: this.config.fishermanMode || false
         });
         this.metrics.incSuccessfulAttestations(inCommittee.length);
-        // Upload blobs to filestore after successful re-execution (fire-and-forget)
-        if (validationResult.reexecutionResult?.block && this.fileStoreBlobUploadClient) {
-            void Promise.resolve().then(async ()=>{
-                try {
-                    const blobFields = validationResult.reexecutionResult.block.getCheckpointBlobFields();
-                    const blobs = getBlobsPerL1Block(blobFields);
-                    await this.fileStoreBlobUploadClient.saveBlobs(blobs, true);
-                    this.log.debug(`Uploaded ${blobs.length} blobs to filestore from re-execution`, proposalInfo);
-                } catch (err) {
-                    this.log.warn(`Failed to upload blobs from re-execution`, err);
-                }
-            });
-        }
-        // If the above function does not throw an error, then we can attest to the proposal
         // Determine which validators should attest
         let attestors;
         if (partOfCommittee) {
@@ -255,13 +383,206 @@ 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 attestations for proposal for slot ${slotNumber}`, {
+            this.log.info(`Creating checkpoint attestations for slot ${slotNumber}`, {
                 ...proposalInfo,
                 attestors: attestors.map((a)=>a.toString())
             });
             return undefined;
         }
-        return this.createBlockAttestationsFromProposal(proposal, attestors);
+        return await this.createCheckpointAttestationsFromProposal(proposal, attestors);
+    }
+    /**
+   * Checks if we should attest to a slot based on equivocation prevention rules.
+   * @returns true if we should attest, false if we should skip
+   */ shouldAttestToSlot(slotNumber) {
+        // If attestToEquivocatedProposals is true, always allow
+        if (this.config.attestToEquivocatedProposals) {
+            return true;
+        }
+        // Check if incoming slot is strictly greater than last attested
+        if (this.lastAttestedProposal && slotNumber <= this.lastAttestedProposal.slotNumber) {
+            this.log.warn(`Refusing to process a proposal for slot ${slotNumber} given we already attested to a proposal for slot ${this.lastAttestedProposal.slotNumber}`);
+            return false;
+        }
+        return true;
+    }
+    async createCheckpointAttestationsFromProposal(proposal, attestors = []) {
+        // 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);
+        // 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);
+            if (!lastBlockHeader) {
+                this.log.warn(`Failed to get last block header for blob upload`, proposalInfo);
+                return;
+            }
+            const blocks = await this.blockSource.getBlocksForSlot(proposal.slotNumber);
+            if (blocks.length === 0) {
+                this.log.warn(`No blocks found for blob upload`, proposalInfo);
+                return;
+            }
+            const blobFields = blocks.flatMap((b)=>b.toBlobFields());
+            const blobs = await getBlobsPerL1Block(blobFields);
+            await this.blobClient.sendBlobsToFilestore(blobs);
+            this.log.debug(`Uploaded ${blobs.length} blobs to filestore for checkpoint at slot ${proposal.slotNumber}`, {
+                ...proposalInfo,
+                numBlobs: blobs.length
+            });
+        } catch (err) {
+            this.log.warn(`Failed to upload blobs for checkpoint: ${err}`, proposalInfo);
+        }
     }
     slashInvalidBlock(proposal) {
         const proposer = proposal.getSender();
@@ -285,50 +606,103 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             }
         ]);
     }
-    // TODO(palla/mbps): Block proposal should not require a checkpoint proposal
-    async createBlockProposal(blockNumber, header, archive, txs, proposerAddress, options) {
-        // TODO(palla/mbps): Prevent double proposals properly
-        // if (this.previousProposal?.slotNumber === header.slotNumber) {
-        //   this.log.verbose(`Already made a proposal for the same slot, skipping proposal`);
-        //   return Promise.resolve(undefined);
-        // }
-        this.log.info(`Assembling block proposal for block ${blockNumber} slot ${header.slotNumber}`);
-        const newProposal = await this.validationService.createBlockProposal(header, archive, txs, proposerAddress, {
+    /**
+   * 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}`, {
+            proposer: proposer.toString(),
+            slot,
+            type
+        });
+        // Emit slash event
+        this.emit(WANT_TO_SLASH_EVENT, [
+            {
+                validator: proposer,
+                amount: this.config.slashDuplicateProposalPenalty,
+                offenseType: OffenseType.DUPLICATE_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}`, {
+            attester: attester.toString(),
+            slot
+        });
+        this.emit(WANT_TO_SLASH_EVENT, [
+            {
+                validator: attester,
+                amount: this.config.slashDuplicateAttestationPenalty,
+                offenseType: OffenseType.DUPLICATE_ATTESTATION,
+                epochOrSlot: BigInt(slot)
+            }
+        ]);
+    }
+    async createBlockProposal(blockHeader, 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;
+            const lastIndex = this.lastProposedBlock.indexWithinCheckpoint;
+            const newSlot = blockHeader.globalVariables.slotNumber;
+            if (newSlot < lastSlot || newSlot === lastSlot && indexWithinCheckpoint <= lastIndex) {
+                throw new Error(`Cannot create block proposal for slot ${newSlot} index ${indexWithinCheckpoint}: ` + `already proposed block for slot ${lastSlot} index ${lastIndex}`);
+            }
+        }
+        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, {
             ...options,
             broadcastInvalidBlockProposal: this.config.broadcastInvalidBlockProposal
         });
-        this.previousProposal = newProposal;
+        this.lastProposedBlock = newProposal;
         return newProposal;
     }
-    // TODO(palla/mbps): Effectively create a checkpoint proposal different from a block proposal
-    createCheckpointProposal(header, archive, txs, proposerAddress, options) {
-        this.log.info(`Assembling checkpoint proposal for slot ${header.slotNumber}`);
-        return this.createBlockProposal(0, header, archive, txs, proposerAddress, options);
+    async createCheckpointProposal(checkpointHeader, archive, feeAssetPriceModifier, lastBlockInfo, proposerAddress, options = {}) {
+        // Validate that we're not creating a proposal for an older or equal slot
+        if (this.lastProposedCheckpoint) {
+            const lastSlot = this.lastProposedCheckpoint.slotNumber;
+            const newSlot = checkpointHeader.slotNumber;
+            if (newSlot <= lastSlot) {
+                throw new Error(`Cannot create checkpoint proposal for slot ${newSlot}: ` + `already proposed checkpoint for slot ${lastSlot}`);
+            }
+        }
+        this.log.info(`Assembling checkpoint proposal for slot ${checkpointHeader.slotNumber}`);
+        const newProposal = await this.validationService.createCheckpointProposal(checkpointHeader, archive, feeAssetPriceModifier, lastBlockInfo, proposerAddress, options);
+        this.lastProposedCheckpoint = newProposal;
+        return newProposal;
     }
     async broadcastBlockProposal(proposal) {
         await this.p2pClient.broadcastProposal(proposal);
     }
-    async signAttestationsAndSigners(attestationsAndSigners, proposer) {
-        return await this.validationService.signAttestationsAndSigners(attestationsAndSigners, proposer);
+    async signAttestationsAndSigners(attestationsAndSigners, proposer, slot, blockNumber) {
+        return await this.validationService.signAttestationsAndSigners(attestationsAndSigners, proposer, slot, blockNumber);
     }
     async collectOwnAttestations(proposal) {
-        const slot = proposal.payload.header.slotNumber;
+        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.createBlockAttestationsFromProposal(proposal, inCommittee);
+        const attestations = await this.createCheckpointAttestationsFromProposal(proposal, inCommittee);
+        if (!attestations) {
+            return [];
+        }
         // We broadcast our own attestations to our peers so, in case our block does not get mined on L1,
         // other nodes can see that our validators did attest to this block proposal, and do not slash us
         // due to inactivity for missed attestations.
-        void this.p2pClient.broadcastAttestations(attestations).catch((err)=>{
+        void this.p2pClient.broadcastCheckpointAttestations(attestations).catch((err)=>{
             this.log.error(`Failed to broadcast self-attestations for slot ${slot}`, err);
         });
         return attestations;
     }
     async collectAttestations(proposal, required, deadline) {
-        // Wait and poll the p2pClient's attestation pool for this block until we have enough attestations
-        const slot = proposal.payload.header.slotNumber;
+        // 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()}`);
         if (+deadline < this.dateProvider.now()) {
             this.log.error(`Deadline ${deadline.toISOString()} for collecting ${required} attestations for slot ${slot} is in the past`);
@@ -339,13 +713,13 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
         const myAddresses = this.getValidatorAddresses();
         let attestations = [];
         while(true){
-            // Filter out attestations with a mismatching payload. This should NOT happen since we have verified
+            // 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.getAttestationsForSlot(slot, proposalId)).filter((attestation)=>{
-                if (!attestation.payload.equals(proposal.payload)) {
-                    this.log.warn(`Received attestation for slot ${slot} with mismatched payload from ${attestation.getSender()?.toString()}`, {
-                        attestationPayload: attestation.payload,
-                        proposalPayload: proposal.payload
+            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;
                 }
@@ -377,11 +751,6 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             await sleep(this.config.attestationPollingIntervalMs);
         }
     }
-    async createBlockAttestationsFromProposal(proposal, attestors = []) {
-        const attestations = await this.validationService.attestToProposal(proposal, attestors);
-        await this.p2pClient.addAttestations(attestations);
-        return attestations;
-    }
     async handleAuthRequest(peer, msg) {
         const authRequest = AuthRequest.fromBuffer(msg);
         const statusMessage = await this.p2pClient.handleAuthRequestFromPeer(authRequest, peer).catch((_)=>undefined);
@@ -396,7 +765,11 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             return Buffer.alloc(0);
         }
         const payloadToSign = authRequest.getPayloadToSign();
-        const signature = await this.keyStore.signMessageWithAddress(addressToUse, payloadToSign);
+        // AUTH_REQUEST doesn't require HA protection - multiple signatures are safe
+        const context = {
+            dutyType: DutyType.AUTH_REQUEST
+        };
+        const signature = await this.keyStore.signMessageWithAddress(addressToUse, payloadToSign, context);
         const authResponse = new AuthResponse(statusMessage, signature);
         return authResponse.toBuffer();
     }