@aztec/validator-client 0.0.1-commit.42ee6df9b → 0.0.1-commit.431c48d

package/dest/proposal_handler.js

@@ -66,62 +66,168 @@ function _ts_dispose_resources(env) {
 import { encodeCheckpointBlobDataFromBlocks, getBlobsPerL1Block } from '@aztec/blob-lib';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { validateFeeAssetPriceModifier } from '@aztec/ethereum/contracts';
-import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import { pick } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { TimeoutError } from '@aztec/foundation/error';
+import { FifoSet } from '@aztec/foundation/fifo-set';
 import { createLogger } from '@aztec/foundation/log';
 import { retryUntil } from '@aztec/foundation/retry';
 import { DateProvider, Timer } from '@aztec/foundation/timer';
-import { validateCheckpoint } from '@aztec/stdlib/checkpoint';
-import { getEpochAtSlot, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
+import { isErrorClass } from '@aztec/foundation/types';
+import { getPreviousCheckpointOutHashes, validateCheckpoint } from '@aztec/stdlib/checkpoint';
+import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
 import { Gas } from '@aztec/stdlib/gas';
 import { accumulateCheckpointOutHashes, computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
-import { ReExFailedTxsError, ReExInitialStateMismatchError, ReExStateMismatchError, ReExTimeoutError, TransactionsNotAvailableError } from '@aztec/stdlib/validators';
+import { InvalidBlockProposalTxsError, ReExFailedTxsError, ReExInitialStateMismatchError, ReExStateMismatchError, ReExTimeoutError, TransactionsNotAvailableError } from '@aztec/stdlib/validators';
 import { getTelemetryClient } from '@aztec/telemetry-client';
-/** Handles block and checkpoint proposals for both validator and non-validator nodes. */ export class ProposalHandler {
+/**
+ * Mapping from a checkpoint-proposal validation failure reason to the tracker outcome that
+ * `handleCheckpointProposal` should record. `undefined` means do not record (signature
+ * couldn't be verified, or the checkpoint is already on L1 so the question is moot).
+ */ /* eslint-disable camelcase */ const CHECKPOINT_VALIDATION_REASON_TO_OUTCOME = {
+    invalid_signature: undefined,
+    invalid_fee_asset_price_modifier: 'invalid',
+    checkpoint_already_published: undefined,
+    last_block_not_found: 'unvalidated',
+    block_fetch_error: 'unvalidated',
+    world_state_not_synced: 'unvalidated',
+    initial_archive_mismatch: 'unvalidated',
+    no_blocks_for_slot: 'unvalidated',
+    last_block_archive_mismatch: 'invalid',
+    too_many_blocks_in_checkpoint: 'invalid',
+    checkpoint_header_mismatch: 'invalid',
+    archive_mismatch: 'invalid',
+    out_hash_mismatch: 'invalid',
+    checkpoint_validation_failed: 'invalid'
+};
+const MAX_TRACKED_INVALID_PROPOSAL_SLOTS = 1000;
+/** Block-proposal validation failures that constitute a slashable invalid-block offense. */ export const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
+    'state_mismatch',
+    'failed_txs',
+    'global_variables_mismatch',
+    'invalid_proposal',
+    'parent_block_wrong_slot',
+    'in_hash_mismatch',
+    'duplicate_txs',
+    'invalid_embedded_txs'
+];
+/** Checkpoint-proposal validation failures that constitute a slashable invalid-checkpoint offense. */ export 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,
+    ['world_state_not_synced']: false,
+    // A reorg / divergent local chain, not a proposer offense (mirrors the block path's initial_state_mismatch).
+    ['initial_archive_mismatch']: false,
+    ['checkpoint_already_published']: false
+};
+/**
+ * Handles block and checkpoint proposals for both validator and non-validator nodes. Also tracks which slots
+ * had a slashable invalid proposal or a proposal equivocation, exposing them via the
+ * `InvalidProposalSlotSource` interface consumed by the attested-invalid-proposal slashing watcher. The
+ * tracking is populated as a side effect of validating/re-executing proposals, so any node that re-executes
+ * proposals (the default) can serve it — not only validators.
+ */ export class ProposalHandler {
     checkpointsBuilder;
     worldState;
     blockSource;
     l1ToL2MessageSource;
     txProvider;
-    blockProposalValidator;
     epochCache;
+    timetable;
     config;
     blobClient;
+    reexecutionTracker;
     metrics;
     dateProvider;
     log;
     tracer;
-    /** Cached last checkpoint validation result to avoid double-validation on validator nodes. */ lastCheckpointValidationResult;
+    /** Cached last checkpoint validation result to avoid double-validation on validator nodes.
+   *  Keyed by signed-payload hash so two proposals at the same (slot, archive) but with a
+   *  different `feeAssetPriceModifier` (or any other signed field) are validated independently. */ lastCheckpointValidationResult;
     /** Archiver reference for setting proposed checkpoints (pipelining). Set via register(). */ archiver;
     /** Returns current validator addresses for own-proposal detection. Set via register(). */ getOwnValidatorAddresses;
-    constructor(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, config, blobClient, metrics, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator:proposal-handler')){
+    /** P2P proposal pool access for deciding when retained proposals should block archiver processing. */ p2pClient;
+    checkpointProposalValidationFailureCallback;
+    /** Slots at which a slashable invalid block or checkpoint proposal was observed. */ slotsWithInvalidProposals;
+    /** Slots at which a proposal equivocation was observed; suppresses attested-to-invalid-proposal slashing. */ slotsWithProposalEquivocation;
+    constructor(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, epochCache, timetable, config, blobClient, reexecutionTracker, metrics, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator:proposal-handler')){
         this.checkpointsBuilder = checkpointsBuilder;
         this.worldState = worldState;
         this.blockSource = blockSource;
         this.l1ToL2MessageSource = l1ToL2MessageSource;
         this.txProvider = txProvider;
-        this.blockProposalValidator = blockProposalValidator;
         this.epochCache = epochCache;
+        this.timetable = timetable;
         this.config = config;
         this.blobClient = blobClient;
+        this.reexecutionTracker = reexecutionTracker;
         this.metrics = metrics;
         this.dateProvider = dateProvider;
         this.log = log;
+        this.slotsWithInvalidProposals = FifoSet.withLimit(MAX_TRACKED_INVALID_PROPOSAL_SLOTS);
+        this.slotsWithProposalEquivocation = FifoSet.withLimit(MAX_TRACKED_INVALID_PROPOSAL_SLOTS);
         if (config.fishermanMode) {
             this.log = this.log.createChild('[FISHERMAN]');
         }
         this.tracer = telemetry.getTracer('ProposalHandler');
     }
+    updateConfig(config) {
+        this.config = {
+            ...this.config,
+            ...config
+        };
+    }
+    setCheckpointProposalValidationFailureCallback(callback) {
+        this.checkpointProposalValidationFailureCallback = callback;
+    }
+    /**
+   * Records the proposer's own checkpoint proposal as a `valid` outcome in the re-execution
+   * tracker. Without this, the node's own checkpoint proposals never flow through
+   * `handleCheckpointProposal` (proposers don't validate their own proposals), so its sentinel
+   * sees no outcome for slots where it was the proposer and reports itself as inactive.
+   *
+   * `archive` should be the locally-computed archive (NOT the broadcast archive, which may have
+   * been deliberately corrupted in tests via `broadcastInvalidBlockProposal` /
+   * `broadcastInvalidCheckpointProposalOnly`). Recording the local archive correctly models the
+   * proposer's own view of its own work.
+   */ recordOwnCheckpointProposalAsValid(slot, archive, checkpointNumber) {
+        this.reexecutionTracker.recordOutcome(slot, archive, 'valid', checkpointNumber);
+    }
+    /** Whether a slashable invalid block or checkpoint proposal was observed at the given slot (InvalidProposalSlotSource). */ hasInvalidProposals(slotNumber) {
+        return this.slotsWithInvalidProposals.has(slotNumber);
+    }
+    /** Whether a proposal equivocation was observed at the given slot (InvalidProposalSlotSource). */ hasProposalEquivocation(slotNumber) {
+        return this.slotsWithProposalEquivocation.has(slotNumber);
+    }
+    /** Records a slot as having a slashable invalid proposal, for offense observers (sentinel/slasher watchers). */ markInvalidProposalSlot(slotNumber) {
+        this.slotsWithInvalidProposals.add(slotNumber);
+    }
+    /** Records a slot as having a proposal equivocation, which suppresses attested-to-invalid-proposal slashing. */ markProposalEquivocation(slotNumber) {
+        this.slotsWithProposalEquivocation.add(slotNumber);
+    }
     /**
    * Registers handlers for block and checkpoint proposals on the p2p client.
+   * Records the p2p client so validation can inspect retained proposals.
    * Block proposals are registered for non-validator nodes (validators register their own enhanced handler).
    * The all-nodes checkpoint proposal handler is always registered for validation, caching, and pipelining.
    * @param archiver - Archiver reference for setting proposed checkpoints (pipelining)
    * @param getOwnValidatorAddresses - Returns current validator addresses for own-proposal detection
    */ register(p2pClient, shouldReexecute, archiver, getOwnValidatorAddresses) {
+        this.p2pClient = p2pClient;
         this.archiver = archiver;
         this.getOwnValidatorAddresses = getOwnValidatorAddresses;
         // Non-validator handler that processes or re-executes for monitoring but does not attest.
@@ -141,6 +247,15 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
                     });
                     return true;
                 } else {
+                    // Track invalid proposals / equivocations so offense observers (the attested-invalid-proposal
+                    // watcher) work on non-validator nodes too. Validators populate these via their own handlers.
+                    // Skip invalid-proposal marking while the escape hatch is open, matching the validator path,
+                    // which intentionally disables invalid-block slashing then.
+                    if (result.reason === 'checkpoint_proposal_equivocation') {
+                        this.markProposalEquivocation(slotNumber);
+                    } else if (SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT.includes(result.reason) && !await this.epochCache.isEscapeHatchOpenAtSlot(slotNumber)) {
+                        this.markInvalidProposalSlot(slotNumber);
+                    }
                     this.log.warn(`Non-validator block proposal ${blockNumber} at slot ${slotNumber} failed processing with ${result.reason}`, {
                         blockNumber: result.blockNumber,
                         slotNumber,
@@ -154,30 +269,61 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
             }
         };
         p2pClient.registerBlockProposalHandler(blockHandler);
+        // p2p detects duplicate (equivocated) proposals without routing them through the handlers above, so mark
+        // the slot as equivocated here. This suppresses false-positive attested-to-invalid-proposal slashing on
+        // non-validator offense collectors. Validators overwrite this with their own richer handler.
+        p2pClient.registerDuplicateProposalCallback((info)=>this.markProposalEquivocation(info.slot));
         // All-nodes checkpoint proposal handler: validates, caches, and sets proposed checkpoint for pipelining.
         // Runs for all nodes (validators and non-validators). Validators get the cached result in the
         // validator-specific callback (attestToCheckpointProposal) which runs after this one.
         const checkpointHandler = async (proposal, _sender)=>{
             try {
+                const pipeliningTimer = new Timer();
                 const proposalInfo = {
                     slot: proposal.slotNumber,
                     archive: proposal.archive.toString(),
                     proposer: proposal.getSender()?.toString()
                 };
-                // For own proposals, skip validation — the proposer already built and validated the checkpoint
+                if (this.config.skipCheckpointProposalValidation) {
+                    this.log.warn(`Skipping checkpoint proposal validation for slot ${proposal.slotNumber}`, proposalInfo);
+                    return undefined;
+                }
+                if (await this.epochCache.isEscapeHatchOpenAtSlot(proposal.slotNumber)) {
+                    this.log.warn(`Escape hatch open for slot ${proposal.slotNumber}, skipping checkpoint proposal validation`, proposalInfo);
+                    return undefined;
+                }
+                // A proposal is "own" when it was signed by a validator key this node also owns. The true local
+                // proposer already built, validated, and stored this checkpoint before broadcasting, so a matching
+                // proposed checkpoint is already in its archiver — skip the redundant re-validation. An HA peer that
+                // shares the proposer's keys sees the same "own" proposal over gossip but never built it, so it has
+                // nothing stored; it falls through to the normal validate-and-persist path below to hydrate the
+                // proposed-checkpoint metadata it needs to build the next slot on top of this checkpoint.
                 const proposer = proposal.getSender();
                 const ownAddresses = this.getOwnValidatorAddresses?.();
                 const isOwnProposal = proposer && ownAddresses?.some((addr)=>addr === proposer.toString());
                 if (isOwnProposal) {
-                    this.log.debug(`Skipping validation for own checkpoint proposal at slot ${proposal.slotNumber}`);
-                    if (this.archiver && this.epochCache.isProposerPipeliningEnabled()) {
-                        await this.setProposedCheckpointFromBlocks(proposal);
+                    const existing = await this.archiver?.getProposedCheckpointData({
+                        slot: proposal.slotNumber
+                    });
+                    if (existing?.archive.root.equals(proposal.archive)) {
+                        this.log.debug(`Skipping sync for existing own checkpoint proposal at slot ${proposal.slotNumber}`);
+                        return undefined;
                     }
-                    return undefined;
                 }
                 const result = await this.handleCheckpointProposal(proposal, proposalInfo);
-                if (result.isValid && this.archiver && this.epochCache.isProposerPipeliningEnabled()) {
-                    await this.setProposedCheckpointFromValidation(proposal);
+                if (!result.isValid) {
+                    // Track invalid checkpoint proposals so offense observers (the attested-invalid-proposal watcher)
+                    // work on non-validator nodes too. This handler runs for all nodes; validators also mark via the
+                    // failure callback below (idempotent).
+                    if (SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT[result.reason]) {
+                        this.markInvalidProposalSlot(proposal.slotNumber);
+                    }
+                    await this.checkpointProposalValidationFailureCallback?.(proposal, result, proposalInfo);
+                } else if (this.archiver) {
+                    const set = await this.setProposedCheckpoint(proposal);
+                    if (set) {
+                        this.metrics?.recordCheckpointProposalToPipelinedStateDuration(pipeliningTimer.ms());
+                    }
                 }
             } catch (err) {
                 this.log.warn(`Error handling checkpoint proposal for slot ${proposal.slotNumber}`, {
@@ -189,16 +335,21 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
         p2pClient.registerAllNodesCheckpointProposalHandler(checkpointHandler);
         return this;
     }
-    async handleBlockProposal(proposal, proposalSender, shouldReexecute) {
+    /**
+   * Processes a block proposal: collects its txs and, if requested, re-executes them to check the resulting
+   * block against the proposal. Expects the proposal to have already passed p2p ingress validation (signature
+   * context, signature, expected proposer, index within checkpoint, tx field checks, and the receive-window
+   * timeliness check) — none of those are re-applied here, and only deterministic properties of the payload
+   * are validated before processing.
+   */ async handleBlockProposal(proposal, proposalSender, shouldReexecute) {
         const slotNumber = proposal.slotNumber;
         const proposer = proposal.getSender();
-        const config = this.checkpointsBuilder.getConfig();
         // Reject proposals with invalid signatures
         if (!proposer) {
             this.log.warn(`Received proposal with invalid signature for slot ${slotNumber}`);
             return {
                 isValid: false,
-                reason: 'invalid_proposal'
+                reason: 'invalid_signature'
             };
         }
         const proposalInfo = {
@@ -211,33 +362,41 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
             ...proposalInfo,
             txHashes: proposal.txHashes.map((t)=>t.toString())
         });
-        // Check that the proposal is from the current proposer, or the next proposer
-        // This should have been handled by the p2p layer, but we double check here out of caution
-        const validationResult = await this.blockProposalValidator.validate(proposal);
-        if (validationResult.result !== 'accept') {
-            this.log.warn(`Proposal is not valid, skipping processing`, proposalInfo);
+        // The receive-window check from p2p ingress is deliberately not re-applied here: its outcome depends on
+        // the wall clock at evaluation time, so re-running it turned node-local processing latency into an
+        // invalid-proposal verdict against an honest proposer, which then fed the invalid-block slashing path.
+        // A tx can only appear once in a block: the second copy would emit nullifiers already emitted by the
+        // first. This is not a relaying-peer fault, so it passes gossip validation and is classified here as
+        // proposer misbehavior. Tx collection also reconciles a deduplicated hash set against the full list,
+        // so it must not be handed a proposal with repeated hashes.
+        const uniqueTxHashes = new Set(proposal.txHashes.map((txHash)=>txHash.toString()));
+        if (uniqueTxHashes.size !== proposal.txHashes.length) {
+            this.log.warn(`Proposal lists duplicate tx hashes, skipping processing`, {
+                ...proposalInfo,
+                txCount: proposal.txHashes.length,
+                uniqueTxCount: uniqueTxHashes.size
+            });
             return {
                 isValid: false,
-                reason: 'invalid_proposal'
+                reason: 'duplicate_txs'
             };
         }
-        // Ensure the block source is synced before checking for existing blocks,
-        // since a proposed checkpoint prune may remove blocks we'd otherwise find.
-        // This affects mostly the block_number_already_exists check, since a pending
-        // checkpoint prune could remove a block that would conflict with this proposal.
-        // When pipelining is enabled, the proposer builds ahead of L1 submission, so the
-        // block source won't have synced to the proposed slot yet. Skip the sync wait to
-        // avoid eating into the attestation window.
-        if (!this.epochCache.isProposerPipeliningEnabled()) {
-            const blockSourceSync = await this.waitForBlockSourceSync(slotNumber);
-            if (!blockSourceSync) {
-                this.log.warn(`Block source is not synced, skipping processing`, proposalInfo);
-                return {
-                    isValid: false,
-                    reason: 'block_source_not_synced'
-                };
-            }
+        const retainedSlotValidation = await this.validateNewBlockInSlot(proposal);
+        if (!retainedSlotValidation.isValid) {
+            this.log.info(`Block proposal conflicts with retained proposals, skipping archiver processing`, {
+                ...proposalInfo,
+                indexWithinCheckpoint: proposal.indexWithinCheckpoint,
+                reason: retainedSlotValidation.reason
+            });
+            return {
+                isValid: false,
+                blockNumber: proposal.blockNumber,
+                reason: retainedSlotValidation.reason
+            };
         }
+        // The proposer builds ahead of L1 submission under pipelining, so the block source won't have
+        // synced to the proposed slot yet. We deliberately do not wait for it to sync here, to avoid
+        // eating into the attestation window.
         // Check that the parent proposal is a block we know, otherwise reexecution would fail.
         // If we don't find it immediately, we keep retrying for a while; it may be we still
         // need to process other block proposals to get to it.
@@ -264,8 +423,12 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
         // Compute the block number based on the parent block
         const blockNumber = parentBlock === 'genesis' ? BlockNumber(INITIAL_L2_BLOCK_NUM) : BlockNumber(parentBlock.header.getBlockNumber() + 1);
         proposalInfo.blockNumber = blockNumber;
-        // Check that this block number does not exist already
-        const existingBlock = await this.blockSource.getBlockHeader(blockNumber);
+        // Check that this block number does not exist already. During a reorg the archiver can still hold a
+        // stale block at this number (a different archive, about to be pruned) while the proposal carries the
+        // rebuilt replacement; resolveExistingBlockAtNumber waits for the local prune in that case so the
+        // rebuilt block is processed in time to attest, rather than being permanently dropped on a bare
+        // number collision.
+        const existingBlock = await this.resolveExistingBlockAtNumber(blockNumber, proposal.archive, slotNumber);
         if (existingBlock) {
             this.log.warn(`Block number ${blockNumber} already exists, skipping processing`, proposalInfo);
             return {
@@ -276,10 +439,17 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
         }
         // Collect txs from the proposal. We start doing this as early as possible,
         // and we do it even if we don't plan to re-execute the txs, so that we have them if another node needs them.
-        const { txs, missingTxs } = await this.txProvider.getTxsForBlockProposal(proposal, blockNumber, {
-            pinnedPeer: proposalSender,
-            deadline: this.getReexecutionDeadline(slotNumber, config)
-        });
+        const collected = await this.collectProposalTxs(proposal, blockNumber, proposalSender, proposalInfo);
+        if (collected === 'invalid_embedded_txs') {
+            return {
+                isValid: false,
+                blockNumber,
+                reason: collected
+            };
+        }
+        const { txs, missingTxs } = collected;
+        // Record the tx-collection outcome on the re-execution tracker
+        this.reexecutionTracker.recordTxsCollected(slotNumber, proposal.indexWithinCheckpoint, missingTxs.length === 0);
         // If reexecution is disabled, bail. We were just interested in triggering tx collection.
         if (!shouldReexecute) {
             this.log.info(`Received valid block ${blockNumber} proposal at index ${proposal.indexWithinCheckpoint} on slot ${slotNumber}`, proposalInfo);
@@ -327,9 +497,18 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
                 reason: 'txs_not_available'
             };
         }
-        // Collect the out hashes of all the checkpoints before this one in the same epoch
+        // Collect the out hashes of all the checkpoints before this one in the same epoch.
+        // Mirror the proposer-side fallback: under pipelining the immediately-preceding cp may not
+        // yet be on L1, in which case the helper grafts the locally-known proposed cp's outHash.
         const epoch = getEpochAtSlot(slotNumber, this.epochCache.getL1Constants());
-        const previousCheckpointOutHashes = (await this.blockSource.getCheckpointsDataForEpoch(epoch)).filter((c)=>c.checkpointNumber < checkpointNumber).map((c)=>c.checkpointOutHash);
+        const previousCheckpointOutHashes = await getPreviousCheckpointOutHashes({
+            blockSource: this.blockSource,
+            epoch,
+            checkpointNumber,
+            l1Constants: this.epochCache.getL1Constants(),
+            pipeliningEnabled: true,
+            log: this.log
+        });
         // Try re-executing the transactions in the proposal if needed
         let reexecutionResult;
         try {
@@ -346,7 +525,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
             };
         }
         // If we succeeded, push this block into the archiver (unless disabled)
-        if (reexecutionResult?.block && this.config.skipPushProposedBlocksToArchiver === false) {
+        if (reexecutionResult?.block && !this.config.skipPushProposedBlocksToArchiver) {
             await this.blockSource.addBlock(reexecutionResult.block);
         }
         this.log.info(`Successfully re-executed block ${blockNumber} proposal at index ${proposal.indexWithinCheckpoint} on slot ${slotNumber}`, {
@@ -359,19 +538,76 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
             reexecutionResult
         };
     }
+    /**
+   * Collects the txs for a proposal, returning `invalid_embedded_txs` if the proposal carries a tx that fails
+   * minimum integrity validation. That is proposer misbehavior — the proposal signs both the tx hashes and the
+   * tx objects — so the caller turns it into an invalid-proposal result that reaches slashing and invalid-slot
+   * accounting, rather than letting it escape as an exception. Any other collection error is a local failure
+   * and keeps propagating.
+   */ async collectProposalTxs(proposal, blockNumber, proposalSender, proposalInfo) {
+        try {
+            return await this.txProvider.getTxsForBlockProposal(proposal, blockNumber, {
+                pinnedPeer: proposalSender,
+                deadline: this.getReexecutionDeadline(proposal.slotNumber)
+            });
+        } catch (error) {
+            if (!isErrorClass(error, InvalidBlockProposalTxsError)) {
+                throw error;
+            }
+            this.log.warn(`Block proposal carries ${error.invalidTxs.length} invalid txs`, {
+                ...proposalInfo,
+                invalidTxs: error.invalidTxs.map(({ txHash, reasons })=>({
+                        txHash: txHash.toString(),
+                        reasons
+                    }))
+            });
+            return 'invalid_embedded_txs';
+        }
+    }
+    async validateNewBlockInSlot(blockProposal) {
+        if (!this.p2pClient) {
+            return {
+                isValid: true
+            };
+        }
+        const { blockProposals, checkpointProposals } = await this.p2pClient.getProposalsForSlot(blockProposal.slotNumber);
+        if (checkpointProposals.length === 0) {
+            return {
+                isValid: true
+            };
+        } else if (checkpointProposals.length > 1) {
+            return {
+                isValid: false,
+                reason: 'checkpoint_proposal_equivocation'
+            };
+        } else {
+            const checkpointProposal = checkpointProposals[0];
+            const terminalBlock = blockProposals.find((block)=>block.archive.equals(checkpointProposal.archive));
+            return terminalBlock !== undefined && blockProposal.indexWithinCheckpoint > terminalBlock.indexWithinCheckpoint ? {
+                isValid: false,
+                reason: 'block_proposal_beyond_checkpoint'
+            } : {
+                isValid: true
+            };
+        }
+    }
     async getParentBlock(proposal) {
         const parentArchive = proposal.blockHeader.lastArchive.root;
-        const slot = proposal.slotNumber;
-        const config = this.checkpointsBuilder.getConfig();
         const { genesisArchiveRoot } = await this.blockSource.getGenesisValues();
         if (parentArchive.equals(genesisArchiveRoot)) {
             return 'genesis';
         }
-        const deadline = this.getReexecutionDeadline(slot, config);
-        const currentTime = this.dateProvider.now();
-        const timeoutDurationMs = deadline.getTime() - currentTime;
+        const deadline = this.getReexecutionDeadline(proposal.slotNumber);
+        const timeoutDurationMs = deadline.getTime() - this.dateProvider.now();
         try {
-            return await this.blockSource.getBlockDataByArchive(parentArchive) ?? (timeoutDurationMs <= 0 ? undefined : await retryUntil(()=>this.blockSource.syncImmediate().then(()=>this.blockSource.getBlockDataByArchive(parentArchive)), 'force archiver sync', timeoutDurationMs / 1000, 0.5));
+            return await this.blockSource.getBlockData({
+                archive: parentArchive
+            }) ?? (timeoutDurationMs <= 0 ? undefined : await retryUntil(()=>this.blockSource.syncImmediate().then(()=>this.blockSource.getBlockData({
+                        archive: parentArchive
+                    })), 'force archiver sync', {
+                deadline,
+                dateProvider: this.dateProvider
+            }, 0.5));
         } catch (err) {
             if (err instanceof TimeoutError) {
                 this.log.debug(`Timed out getting parent block by archive root`, {
@@ -385,6 +621,60 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
             return undefined;
         }
     }
+    /**
+   * Resolves whether a block genuinely already exists at `blockNumber`. Returns the existing block only if
+   * it is a true duplicate of the proposal (matching archive). During a reorg the archiver can still hold a
+   * stale fork at this number (different archive) that is about to be pruned; in that case this forces L1
+   * sync and waits, bounded by the re-execution deadline, for the prune to land, then returns `undefined` so
+   * the rebuilt block proposal can be processed in time to attest. If the prune does not complete before the
+   * deadline it returns the stale block, so the caller falls back to the safe `block_number_already_exists`
+   * rejection.
+   */ async resolveExistingBlockAtNumber(blockNumber, proposalArchive, slotNumber) {
+        const existingBlock = await this.blockSource.getBlockData({
+            number: blockNumber
+        });
+        if (!existingBlock || existingBlock.archive.root.equals(proposalArchive)) {
+            return existingBlock;
+        }
+        // A different block already occupies this number: it may be a stale fork being pruned during a reorg, not a
+        // genuine duplicate. Wait for the local prune rather than permanently rejecting the proposal.
+        const deadline = this.getReexecutionDeadline(slotNumber);
+        if (deadline.getTime() - this.dateProvider.now() <= 0) {
+            return existingBlock;
+        }
+        this.log.warn(`Block number ${blockNumber} already exists, awaiting potential prune`, {
+            blockNumber,
+            existingArchive: existingBlock.archive.root.toString(),
+            proposalArchive: proposalArchive.toString()
+        });
+        try {
+            const { block } = await retryUntil(async ()=>{
+                await this.blockSource.syncImmediate();
+                const block = await this.blockSource.getBlockData({
+                    number: blockNumber
+                });
+                // Resolve once the existing block is gone (pruned) or has been replaced by one matching the
+                // proposal — the same condition as the early return above. A matching block is returned so the
+                // caller still treats it as a genuine duplicate; an `undefined` (pruned) block lets the proposal
+                // be processed. Wrap in an object so the `undefined` case is still a truthy retry result.
+                return block === undefined || block.archive.root.equals(proposalArchive) ? {
+                    block
+                } : undefined;
+            }, `prune of stale block ${blockNumber}`, {
+                deadline,
+                dateProvider: this.dateProvider
+            }, 0.5);
+            return block;
+        } catch (err) {
+            if (err instanceof TimeoutError) {
+                this.log.warn(`Timed out waiting for stale block ${blockNumber} to be pruned`, {
+                    blockNumber
+                });
+                return existingBlock;
+            }
+            throw err;
+        }
+    }
     computeCheckpointNumber(proposal, parentBlock, proposalInfo) {
         if (parentBlock === 'genesis') {
             // First block is in checkpoint 1
@@ -513,36 +803,13 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
         }
         return undefined;
     }
-    getReexecutionDeadline(slot, config) {
-        const nextSlotTimestampSeconds = Number(getTimestampForSlot(SlotNumber(slot + 1), config));
-        return new Date(nextSlotTimestampSeconds * 1000);
-    }
-    /** Waits for the block source to sync L1 data up to at least the slot before the given one. */ async waitForBlockSourceSync(slot) {
-        const deadline = this.getReexecutionDeadline(slot, this.checkpointsBuilder.getConfig());
-        const timeoutMs = deadline.getTime() - this.dateProvider.now();
-        if (slot === 0) {
-            return true;
-        }
-        // Make a quick check before triggering an archiver sync
-        const syncedSlot = await this.blockSource.getSyncedL2SlotNumber();
-        if (syncedSlot !== undefined && syncedSlot + 1 >= slot) {
-            return true;
-        }
-        try {
-            // Trigger an immediate sync of the block source, and wait until it reports being synced to the required slot
-            return await retryUntil(async ()=>{
-                await this.blockSource.syncImmediate();
-                const syncedSlot = await this.blockSource.getSyncedL2SlotNumber();
-                return syncedSlot !== undefined && syncedSlot + 1 >= slot;
-            }, 'wait for block source sync', timeoutMs / 1000, 0.5);
-        } catch (err) {
-            if (err instanceof TimeoutError) {
-                this.log.warn(`Timed out waiting for block source to sync to slot ${slot}`);
-                return false;
-            } else {
-                throw err;
-            }
-        }
+    /**
+   * Hard re-execution/validation deadline for any block or checkpoint proposal targeting `slotNumber`:
+   * the single consensus `attestation_deadline` (`target_slot_start + S - 2E`). This is the latest the
+   * checkpoint can land on L1 in the target slot; all nodes agree on it. Loosened from the previous
+   * next-wall-clock-slot-boundary bound (see the timetable spec / refactor notes).
+   */ getReexecutionDeadline(slotNumber) {
+        return new Date(this.timetable.getAttestationDeadline(slotNumber) * 1000);
     }
     getReexecuteFailureReason(err) {
         if (err instanceof TransactionsNotAvailableError) {
@@ -570,7 +837,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
             // If we do not have all of the transactions, then we should fail
             if (txs.length !== txHashes.length) {
                 const foundTxHashes = txs.map((tx)=>tx.getTxHash());
-                const missingTxHashes = txHashes.filter((txHash)=>!foundTxHashes.includes(txHash));
+                const missingTxHashes = txHashes.filter((txHash)=>!foundTxHashes.some((h)=>h.equals(txHash)));
                 throw new TransactionsNotAvailableError(missingTxHashes);
             }
             const timer = new Timer();
@@ -602,7 +869,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
             // Create checkpoint builder with prior blocks
             const checkpointBuilder = await this.checkpointsBuilder.openCheckpoint(checkpointNumber, constants, 0n, l1ToL2Messages, previousCheckpointOutHashes, fork, priorBlocks, this.log.getBindings());
             // Build the new block
-            const deadline = this.getReexecutionDeadline(slot, config);
+            const deadline = this.getReexecutionDeadline(slot);
             const maxBlockGas = this.config.validateMaxL2BlockGas !== undefined || this.config.validateMaxDABlockGas !== undefined ? new Gas(this.config.validateMaxDABlockGas ?? Infinity, this.config.validateMaxL2BlockGas ?? Infinity) : undefined;
             const result = await checkpointBuilder.buildBlock(txs, blockNumber, blockHeader.globalVariables.timestamp, {
                 isBuildingProposal: false,
@@ -664,46 +931,52 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
    * Validates a checkpoint proposal, caches the result, and uploads blobs if configured.
    * Returns a cached result if the same proposal (archive + slot) was already validated.
    * Used by both the all-nodes callback (via register) and the validator client (via delegation).
+   * Expects the proposal to have already passed p2p ingress validation (expected proposer and receive-window
+   * timeliness); only deterministic properties of the signed payload are checked here.
    */ async handleCheckpointProposal(proposal, proposalInfo) {
         const slot = proposal.slotNumber;
-        // Check cache: same archive+slot means we already validated this proposal
-        if (this.lastCheckpointValidationResult && this.lastCheckpointValidationResult.archive.equals(proposal.archive) && this.lastCheckpointValidationResult.slotNumber === slot) {
+        const payloadHash = proposal.getPayloadHash();
+        // Check cache: same signed-payload hash means we already validated this exact proposal.
+        if (this.lastCheckpointValidationResult && this.lastCheckpointValidationResult.payloadHash === payloadHash) {
             this.log.debug(`Returning cached validation result for checkpoint proposal at slot ${slot}`, proposalInfo);
             return this.lastCheckpointValidationResult.result;
         }
         const proposer = proposal.getSender();
+        let result;
         if (!proposer) {
             this.log.warn(`Received checkpoint proposal with invalid signature for slot ${proposal.slotNumber}`);
-            const result = {
+            result = {
                 isValid: false,
                 reason: 'invalid_signature'
             };
-            this.lastCheckpointValidationResult = {
-                archive: proposal.archive,
-                slotNumber: slot,
-                result
-            };
-            return result;
-        }
-        if (!validateFeeAssetPriceModifier(proposal.feeAssetPriceModifier)) {
+        } else if (!validateFeeAssetPriceModifier(proposal.feeAssetPriceModifier)) {
             this.log.warn(`Received checkpoint proposal with invalid feeAssetPriceModifier ${proposal.feeAssetPriceModifier} for slot ${proposal.slotNumber}`);
-            const result = {
+            result = {
                 isValid: false,
                 reason: 'invalid_fee_asset_price_modifier'
             };
-            this.lastCheckpointValidationResult = {
-                archive: proposal.archive,
-                slotNumber: slot,
-                result
-            };
-            return result;
+        } else {
+            result = await this.validateCheckpointProposal(proposal, proposalInfo);
         }
-        const result = await this.validateCheckpointProposal(proposal, proposalInfo);
         this.lastCheckpointValidationResult = {
-            archive: proposal.archive,
-            slotNumber: slot,
+            payloadHash,
             result
         };
+        // Record the outcome on the re-execution tracker.
+        const outcome = result.isValid ? 'valid' : CHECKPOINT_VALIDATION_REASON_TO_OUTCOME[result.reason];
+        if (outcome !== undefined) {
+            this.reexecutionTracker.recordOutcome(slot, proposal.archive, outcome, result.checkpointNumber);
+        }
+        // Drop tracker entries for checkpoints that have reached L1 finality.
+        try {
+            const tips = await this.blockSource.getL2Tips();
+            const finalizedCheckpointNumber = tips.finalized.checkpoint.number;
+            if (finalizedCheckpointNumber > 0) {
+                this.reexecutionTracker.removeBefore(CheckpointNumber(finalizedCheckpointNumber + 1));
+            }
+        } catch (err) {
+            this.log.error(`Error pruning reexecution tracker`, err, proposalInfo);
+        }
         // Upload blobs to filestore if validation passed (fire and forget)
         if (result.isValid) {
             this.tryUploadBlobsForCheckpoint(proposal, proposalInfo);
@@ -721,17 +994,25 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
         };
         try {
             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;
+            // Block-sync/validation deadline = the single consensus attestation_deadline (target_slot_start + S
+            // - 2E): the latest moment the proposer can submit this checkpoint and still have it land on L1 in
+            // the target slot. Keeping validation/attestation alive until then lets validators keep attesting
+            // right up to the proposer's real publish cutoff.
+            const deadline = this.getReexecutionDeadline(slot);
+            // Wait for last block to sync by archive. The deadline is passed to retryUntil as an absolute date so
+            // the remaining budget is derived from the date provider; a deadline already in the past times out
+            // after a single attempt instead of looping (the immediate-timeout semantics of the deadline overload).
+            let lastBlockData;
             try {
-                lastBlockHeader = await retryUntil(async ()=>{
+                lastBlockData = 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);
+                    return await this.blockSource.getBlockData({
+                        archive: proposal.archive
+                    });
+                }, `waiting for block with archive ${proposal.archive.toString()} for slot ${slot}`, {
+                    deadline,
+                    dateProvider: this.dateProvider
+                }, 0.5);
             } catch (err) {
                 if (err instanceof TimeoutError) {
                     this.log.warn(`Timed out waiting for block with archive matching checkpoint proposal`, proposalInfo);
@@ -746,20 +1027,36 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
                     reason: 'block_fetch_error'
                 };
             }
-            if (!lastBlockHeader) {
+            if (!lastBlockData) {
                 this.log.warn(`Last block not found for checkpoint proposal`, proposalInfo);
                 return {
                     isValid: false,
                     reason: 'last_block_not_found'
                 };
             }
+            // Refuse to attest if the block's enclosing checkpoint has already been published to L1.
+            const existingCheckpoint = await this.blockSource.getCheckpointData({
+                number: lastBlockData.checkpointNumber
+            });
+            if (existingCheckpoint) {
+                this.log.warn(`Refusing to attest to checkpoint proposal whose checkpoint is already on L1`, {
+                    ...proposalInfo,
+                    checkpointNumber: lastBlockData.checkpointNumber
+                });
+                return {
+                    isValid: false,
+                    reason: 'checkpoint_already_published',
+                    checkpointNumber: lastBlockData.checkpointNumber
+                };
+            }
             // 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'
+                    reason: 'no_blocks_for_slot',
+                    checkpointNumber: lastBlockData.checkpointNumber
                 };
             }
             // Ensure the last block for this slot matches the archive in the checkpoint proposal
@@ -767,7 +1064,22 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
                 this.log.warn(`Last block archive mismatch for checkpoint proposal`, proposalInfo);
                 return {
                     isValid: false,
-                    reason: 'last_block_archive_mismatch'
+                    reason: 'last_block_archive_mismatch',
+                    checkpointNumber: lastBlockData.checkpointNumber
+                };
+            }
+            // Note this condition should never trigger, since we dont process block proposals that exceed indexWithinCheckpoint
+            const maxBlocksPerCheckpoint = this.config.maxBlocksPerCheckpoint;
+            if (maxBlocksPerCheckpoint !== undefined && blocks.length > maxBlocksPerCheckpoint) {
+                this.log.warn(`Checkpoint proposal exceeds maxBlocksPerCheckpoint`, {
+                    ...proposalInfo,
+                    blocksInProposal: blocks.length,
+                    maxBlocksPerCheckpoint
+                });
+                return {
+                    isValid: false,
+                    reason: 'too_many_blocks_in_checkpoint',
+                    checkpointNumber: lastBlockData.checkpointNumber
                 };
             }
             this.log.debug(`Found ${blocks.length} blocks for slot ${slot}`, {
@@ -780,12 +1092,61 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
             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
+            // Collect the out hashes of all the checkpoints before this one in the same epoch.
+            // See note on the analogous block-proposal site: the helper handles pipelining lag.
             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 previousCheckpointOutHashes = await getPreviousCheckpointOutHashes({
+                blockSource: this.blockSource,
+                epoch,
+                checkpointNumber,
+                l1Constants: this.epochCache.getL1Constants(),
+                pipeliningEnabled: true,
+                log: this.log
+            });
+            // Fork world state at the block before the first block. getFork syncs world state to the parent block
+            // first (see its doc): the block source (archiver) can already hold the block while world state still
+            // trails it by one, and forking a not-yet-applied block throws a raw tree error that would otherwise
+            // escape as an uncaught gossipsub error. We pass the parent's expected block hash so the sync detects a
+            // world-state reorg (undefined for the genesis parent, where no block exists to pin). On failure we map
+            // to a clean validation result rather than letting it escape.
             const parentBlockNumber = BlockNumber(firstBlock.number - 1);
-            const fork = _ts_add_disposable_resource(env, await this.checkpointsBuilder.getFork(parentBlockNumber), true);
+            let forkResult;
+            try {
+                const parentBlockHash = (await this.blockSource.getBlockData({
+                    number: parentBlockNumber
+                }))?.blockHash;
+                forkResult = await this.checkpointsBuilder.getFork(parentBlockNumber, parentBlockHash);
+            } catch (err) {
+                this.log.warn(`Failed to fork world state at block ${parentBlockNumber} for checkpoint proposal`, {
+                    ...proposalInfo,
+                    parentBlockNumber,
+                    err
+                });
+                return {
+                    isValid: false,
+                    reason: 'world_state_not_synced',
+                    checkpointNumber
+                };
+            }
+            const fork = _ts_add_disposable_resource(env, forkResult, true);
+            // Verify the fork's archive root matches the checkpoint's expected starting archive (the archive after
+            // the parent block). A mismatch means world state forked from a different chain than the proposal was
+            // built on (e.g. a reorg), so recomputing the checkpoint against it would be meaningless. This mirrors
+            // the block-proposal re-execution check and fails fast with a clean, non-slashable result instead of a
+            // confusing downstream mismatch.
+            const forkArchiveRoot = new Fr((await fork.getTreeInfo(MerkleTreeId.ARCHIVE)).root);
+            if (!forkArchiveRoot.equals(proposal.checkpointHeader.lastArchiveRoot)) {
+                this.log.warn(`Fork archive root does not match checkpoint proposal's last archive`, {
+                    ...proposalInfo,
+                    forkArchiveRoot: forkArchiveRoot.toString(),
+                    expectedLastArchiveRoot: proposal.checkpointHeader.lastArchiveRoot.toString()
+                });
+                return {
+                    isValid: false,
+                    reason: 'initial_archive_mismatch',
+                    checkpointNumber
+                };
+            }
             // 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
@@ -799,7 +1160,8 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
                 });
                 return {
                     isValid: false,
-                    reason: 'checkpoint_header_mismatch'
+                    reason: 'checkpoint_header_mismatch',
+                    checkpointNumber
                 };
             }
             // Compare archive root with proposal
@@ -811,7 +1173,8 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
                 });
                 return {
                     isValid: false,
-                    reason: 'archive_mismatch'
+                    reason: 'archive_mismatch',
+                    checkpointNumber
                 };
             }
             // Check that the accumulated epoch out hash matches the value in the proposal.
@@ -832,7 +1195,8 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
                 });
                 return {
                     isValid: false,
-                    reason: 'out_hash_mismatch'
+                    reason: 'out_hash_mismatch',
+                    checkpointNumber
                 };
             }
             // Final round of validations on the checkpoint, just in case.
@@ -848,12 +1212,14 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
                 this.log.warn(`Checkpoint validation failed: ${err}`, proposalInfo);
                 return {
                     isValid: false,
-                    reason: 'checkpoint_validation_failed'
+                    reason: 'checkpoint_validation_failed',
+                    checkpointNumber
                 };
             }
             this.log.verbose(`Checkpoint proposal validation successful for slot ${slot}`, proposalInfo);
             return {
-                isValid: true
+                isValid: true,
+                checkpointNumber
             };
         } catch (e) {
             env.error = e;
@@ -882,7 +1248,9 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
     }
     /** Uploads blobs for a checkpoint to the filestore. */ 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;
@@ -905,21 +1273,23 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
         }
     }
     /**
-   * Derives proposed checkpoint data from validated blocks and sets it on the archiver.
-   * Used after successful validation of a foreign proposal.
-   * Does not retry since we already waited for the block during validation.
-   */ async setProposedCheckpointFromValidation(proposal) {
+   * Derives proposed checkpoint data from validated blocks and sets it on the archiver, so this node can
+   * pipeline building on top of the checkpoint. Does not retry, since validation already waited for the
+   * last block to sync.
+   */ async setProposedCheckpoint(proposal) {
         if (!this.archiver) {
-            return;
+            return false;
         }
-        const blockData = await this.blockSource.getBlockDataByArchive(proposal.archive);
+        const blockData = await this.blockSource.getBlockData({
+            archive: proposal.archive
+        });
         if (!blockData) {
             this.log.debug(`Block data not found for checkpoint proposal archive, cannot set proposed checkpoint`, {
                 archive: proposal.archive.toString()
             });
-            return;
+            return false;
         }
-        await this.archiver.setProposedCheckpoint({
+        await this.archiver.addProposedCheckpoint({
             header: proposal.checkpointHeader,
             checkpointNumber: blockData.checkpointNumber,
             startBlock: BlockNumber(blockData.header.getBlockNumber() - blockData.indexWithinCheckpoint),
@@ -927,37 +1297,6 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
             totalManaUsed: proposal.checkpointHeader.totalManaUsed.toBigInt(),
             feeAssetPriceModifier: proposal.feeAssetPriceModifier
         });
-    }
-    /**
-   * Sets proposed checkpoint from blocks for own proposals (skips full validation).
-   * Retries fetching block data since the checkpoint proposal often arrives before the last block
-   * finishes re-execution.
-   */ async setProposedCheckpointFromBlocks(proposal) {
-        if (!this.archiver) {
-            return;
-        }
-        let blockData = await this.blockSource.getBlockDataByArchive(proposal.archive);
-        if (!blockData) {
-            // The checkpoint proposal often arrives before the last block finishes re-execution.
-            // Retry until we find the data or give up at the end of the slot.
-            const nextSlot = this.epochCache.getSlotNow() + 1;
-            const timeOfNextSlot = getTimestampForSlot(SlotNumber(nextSlot), await this.archiver.getL1Constants());
-            const timeoutSeconds = Math.max(1, Number(timeOfNextSlot) - Math.floor(this.dateProvider.now() / 1000));
-            blockData = await retryUntil(()=>this.blockSource.getBlockDataByArchive(proposal.archive), 'block data for own checkpoint proposal', timeoutSeconds, 0.25).catch(()=>undefined);
-        }
-        if (blockData) {
-            await this.archiver.setProposedCheckpoint({
-                header: proposal.checkpointHeader,
-                checkpointNumber: blockData.checkpointNumber,
-                startBlock: BlockNumber(blockData.header.getBlockNumber() - blockData.indexWithinCheckpoint),
-                blockCount: blockData.indexWithinCheckpoint + 1,
-                totalManaUsed: proposal.checkpointHeader.totalManaUsed.toBigInt(),
-                feeAssetPriceModifier: proposal.feeAssetPriceModifier
-            });
-        } else {
-            this.log.debug(`Block data not found for own checkpoint proposal archive, cannot set proposed checkpoint`, {
-                archive: proposal.archive.toString()
-            });
-        }
+        return true;
     }
 }