@aztec/sequencer-client 0.0.1-commit.e588bc7e5 → 0.0.1-commit.e5a3663dd

package/dest/sequencer/checkpoint_proposal_job.js

@@ -436,13 +436,12 @@ function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
     return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
 }
 var _dec, _dec1, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _initProto;
-import { RollupContract } from '@aztec/ethereum/contracts';
 import { BlockNumber, CheckpointNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
 import { randomInt } from '@aztec/foundation/crypto/random';
 import { flipSignature, generateRecoverableSignature, generateUnrecoverableSignature } from '@aztec/foundation/crypto/secp256k1-signer';
-import { Signature } from '@aztec/foundation/eth-signature';
 import { filter } from '@aztec/foundation/iterator';
 import { createLogger } from '@aztec/foundation/log';
+import { retryUntil } from '@aztec/foundation/retry';
 import { sleep, sleepUntil } from '@aztec/foundation/sleep';
 import { Timer } from '@aztec/foundation/timer';
 import { isErrorClass, unfreeze } from '@aztec/foundation/types';
@@ -456,6 +455,7 @@ import { orderAttestations, trimAttestations } from '@aztec/stdlib/p2p';
 import { AttestationTimeoutError } from '@aztec/stdlib/validators';
 import { Attributes, trackSpan } from '@aztec/telemetry-client';
 import { DutyAlreadySignedError, SlashingProtectionError } from '@aztec/validator-ha-signer/errors';
+import { buildPipelinedParentSimulationOverridesPlan, buildSubmissionSimulationOverridesPlan } from './chain_state_overrides.js';
 import { CheckpointVoter } from './checkpoint_voter.js';
 import { SequencerInterruptedError } from './errors.js';
 import { SequencerState } from './utils.js';
@@ -491,12 +491,14 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
     checkpointsBuilder;
     blockSink;
     l1Constants;
+    signatureContext;
     config;
     timetable;
     slasherClient;
     epochCache;
     dateProvider;
     metrics;
+    checkpointMetrics;
     eventEmitter;
     setStateFn;
     tracer;
@@ -546,10 +548,14 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
         ], []));
     }
     log;
+    checkpointEventLog;
     /** Tracks the fire-and-forget L1 submission promise so it can be awaited during shutdown. */ pendingL1Submission;
-    /** Fee header override computed during proposeCheckpoint, reused in enqueueCheckpointForSubmission. */ computedForceProposedFeeHeader;
+    /** Pipelined parent chain state used while building and later submitting this checkpoint. */ pipelinedParentSimulationOverridesPlan;
+    getSignatureContext() {
+        return this.signatureContext;
+    }
     constructor(slotNow, targetSlot, targetEpoch, checkpointNumber, syncedToBlockNumber, // TODO(palla/mbps): Can we remove the proposer in favor of attestorAddress? Need to check fisherman-node flows.
-    proposer, publisher, attestorAddress, invalidateCheckpoint, validatorClient, globalsBuilder, p2pClient, worldState, l1ToL2MessageSource, l2BlockSource, checkpointsBuilder, blockSink, l1Constants, config, timetable, slasherClient, epochCache, dateProvider, metrics, eventEmitter, setStateFn, tracer, bindings, proposedCheckpointData){
+    proposer, publisher, attestorAddress, invalidateCheckpoint, validatorClient, globalsBuilder, p2pClient, worldState, l1ToL2MessageSource, l2BlockSource, checkpointsBuilder, blockSink, l1Constants, signatureContext, config, timetable, slasherClient, epochCache, dateProvider, metrics, checkpointMetrics, eventEmitter, setStateFn, tracer, bindings, proposedCheckpointData){
         this.slotNow = slotNow;
         this.targetSlot = targetSlot;
         this.targetEpoch = targetEpoch;
@@ -568,12 +574,14 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
         this.checkpointsBuilder = checkpointsBuilder;
         this.blockSink = blockSink;
         this.l1Constants = l1Constants;
+        this.signatureContext = signatureContext;
         this.config = config;
         this.timetable = timetable;
         this.slasherClient = slasherClient;
         this.epochCache = epochCache;
         this.dateProvider = dateProvider;
         this.metrics = metrics;
+        this.checkpointMetrics = checkpointMetrics;
         this.eventEmitter = eventEmitter;
         this.setStateFn = setStateFn;
         this.tracer = tracer;
@@ -583,81 +591,152 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
             ...bindings,
             instanceId: `slot-${this.slotNow}`
         });
+        this.checkpointEventLog = createLogger('sequencer:checkpoint-events', {
+            ...bindings,
+            instanceId: `slot-${this.slotNow}`
+        });
     }
     /** Awaits the pending L1 submission if one is in progress. Call during shutdown. */ async awaitPendingSubmission() {
         this.log.info('Awaiting pending L1 payload submission');
         await this.pendingL1Submission;
     }
+    logCheckpointEvent(eventName, message, fields) {
+        this.checkpointEventLog.debug(message, {
+            eventName: `sequencer-checkpoint-${eventName}`,
+            ...fields
+        });
+    }
     /**
    * Executes the checkpoint proposal job.
-   * Builds blocks, collects attestations, enqueues requests, and schedules L1 submission as a
-   * background task so the work loop can return to IDLE immediately.
+   * Builds blocks, assembles checkpoint, and broadcasts the proposal (blocking).
+   * Attestation collection, signing, and L1 submission are backgrounded so the
+   * work loop can return to IDLE immediately for consecutive slot proposals.
    * Returns the built checkpoint if successful, undefined otherwise.
    */ async execute() {
         // Enqueue governance and slashing votes (returns promises that will be awaited later)
         // In fisherman mode, we simulate slashing but don't actually publish to L1
         // These are constant for the whole slot, so we only enqueue them once
         const votesPromises = new CheckpointVoter(this.targetSlot, this.publisher, this.attestorAddress, this.validatorClient, this.slasherClient, this.l1Constants, this.config, this.metrics, this.log).enqueueVotes();
-        // Build and propose the checkpoint. Builds blocks, broadcasts, collects attestations, and signs.
-        // Does NOT enqueue to L1 yet — that happens after the pipeline sleep.
-        const proposalResult = await this.proposeCheckpoint();
-        const checkpoint = proposalResult?.checkpoint;
-        // Wait until the voting promises have resolved, so all requests are enqueued (not sent)
-        await Promise.all(votesPromises);
-        if (checkpoint) {
-            this.metrics.recordCheckpointProposalSuccess();
+        // Build blocks, assemble checkpoint, and broadcast proposal (BLOCKING).
+        // Returns after broadcast — attestation collection is deferred.
+        const broadcast = await this.proposeCheckpoint();
+        if (!broadcast) {
+            await Promise.all(votesPromises);
+            // Still submit votes even without a checkpoint
+            if (!this.config.fishermanMode) {
+                this.pendingL1Submission = this.publisher.sendRequestsAt(this.dateProvider.nowAsDate()).then(()=>{});
+            }
+            return undefined;
         }
+        const { checkpoint } = broadcast;
+        this.metrics.recordCheckpointProposalSuccess();
         // Do not post anything to L1 if we are fishermen, but do perform L1 fee analysis
         if (this.config.fishermanMode) {
             await this.handleCheckpointEndAsFisherman(checkpoint);
-            return;
+            return checkpoint;
         }
-        // Enqueue the checkpoint for L1 submission
-        if (proposalResult) {
-            try {
-                await this.enqueueCheckpointForSubmission(proposalResult);
-            } catch (err) {
-                this.log.error(`Failed to enqueue checkpoint for L1 submission at slot ${this.targetSlot}`, err);
-            // Continue to sendRequestsAt so votes are still sent
+        // Background the attestation → signing → L1 pipeline so the work loop is unblocked
+        this.pendingL1Submission = this.waitForAttestationsAndEnqueueSubmissionAsync(broadcast, votesPromises);
+        // Return the built checkpoint immediately — the work loop is now unblocked
+        return checkpoint;
+    }
+    /**
+   * Background pipeline: collects attestations, signs them, enqueues the checkpoint, and submits to L1.
+   * Runs as a fire-and-forget task stored in `pendingL1Submission` so the work loop is unblocked.
+   */ async waitForAttestationsAndEnqueueSubmissionAsync(broadcast, votesPromises) {
+        const { checkpoint } = broadcast;
+        const isPipelining = this.epochCache.isProposerPipeliningEnabled();
+        try {
+            // Wait for all votes actions, enqueued at the beginning, to resolve
+            await Promise.all(votesPromises);
+            // Try to collect attestations from the committee
+            const signedAttestations = await this.getSignedCommitteeAttestations(broadcast);
+            // If pipelining, wait for the previous checkpoint to land on L1 before submitting,
+            // so we can check it matches the proposed checkpoint we used as parent, and has valid attestations.
+            if (signedAttestations && (!isPipelining || await this.waitForValidParentCheckpointOnL1())) {
+                await this.enqueueCheckpointForSubmission({
+                    checkpoint,
+                    ...signedAttestations
+                });
             }
-        }
-        // Compute the earliest time to submit: pipeline slot start when pipelining, now otherwise.
-        const submitAfter = this.epochCache.isProposerPipeliningEnabled() ? new Date(Number(getTimestampForSlot(this.targetSlot, this.l1Constants)) * 1000) : new Date(this.dateProvider.now());
-        // TODO(https://github.com/AztecProtocol/aztec-packages/pull/21250): should discard the pending submission if a reorg occurs underneath
-        // Schedule L1 submission in the background so the work loop returns immediately.
-        // The publisher will sleep until submitAfter, then send the bundled requests.
-        // The promise is stored so it can be awaited during shutdown.
-        this.pendingL1Submission = this.publisher.sendRequestsAt(submitAfter).then(async (l1Response)=>{
+            // If we failed to collect attestations, at least check if we need to issue an invalidation
+            // Note that if we are not pipelining, we enqueued the invalidation at the beginning
+            if (!signedAttestations && isPipelining && await this.waitForSyncedL2SlotNumber(this.slotNow)) {
+                const validationStatus = await this.l2BlockSource.getPendingChainValidationStatus();
+                if (!validationStatus.valid) {
+                    this.log.warn(`Checkpoint ${validationStatus.checkpoint.checkpointNumber} has invalid attestations, enqueuing invalidation in spite of attestation collection failure`, {
+                        checkpoint: validationStatus.checkpoint,
+                        reason: validationStatus.reason
+                    });
+                    await this.enqueueInvalidation(validationStatus);
+                }
+            }
+            // Send whatever was enqueued: votes + (propose | invalidation | nothing).
+            // Compute the earliest time to submit: pipeline slot start when pipelining, now otherwise.
+            const submitAfter = isPipelining ? new Date(Number(getTimestampForSlot(this.targetSlot, this.l1Constants)) * 1000) : new Date(this.dateProvider.now());
+            const l1Response = await this.publisher.sendRequestsAt(submitAfter);
             const proposedAction = l1Response?.successfulActions.find((a)=>a === 'propose');
             if (proposedAction) {
+                this.logCheckpointEvent('published', `Checkpoint published for slot ${this.targetSlot}`, {
+                    slot: this.targetSlot,
+                    checkpointNumber: this.checkpointNumber,
+                    successfulActions: l1Response?.successfulActions,
+                    sentActions: l1Response?.sentActions
+                });
                 this.eventEmitter.emit('checkpoint-published', {
                     checkpoint: this.checkpointNumber,
                     slot: this.targetSlot
                 });
-                const coinbase = checkpoint?.header.coinbase;
+                const coinbase = checkpoint.header.coinbase;
                 await this.metrics.incFilledSlot(this.publisher.getSenderAddress().toString(), coinbase);
-            } else if (checkpoint) {
+            } else {
+                this.logCheckpointEvent('publish-failed', `Checkpoint publish failed for slot ${this.targetSlot}`, {
+                    slot: this.targetSlot,
+                    checkpointNumber: this.checkpointNumber,
+                    successfulActions: l1Response?.successfulActions,
+                    failedActions: l1Response?.failedActions,
+                    sentActions: l1Response?.sentActions,
+                    expiredActions: l1Response?.expiredActions,
+                    reason: 'propose_action_not_successful'
+                });
+                this.log.warn(`Checkpoint publish failed for slot ${this.targetSlot}`, {
+                    slot: this.targetSlot,
+                    checkpointNumber: this.checkpointNumber,
+                    successfulActions: l1Response?.successfulActions,
+                    failedActions: l1Response?.failedActions,
+                    sentActions: l1Response?.sentActions,
+                    expiredActions: l1Response?.expiredActions,
+                    reason: 'propose_action_not_successful'
+                });
                 this.eventEmitter.emit('checkpoint-publish-failed', {
                     ...l1Response,
                     slot: this.targetSlot
                 });
-                if (this.epochCache.isProposerPipeliningEnabled()) {
+                if (isPipelining) {
                     this.metrics.recordPipelineDiscard();
                 }
             }
-        }).catch((err)=>{
-            this.log.error(`Background L1 submission failed for slot ${this.targetSlot}`, err);
-            if (checkpoint) {
-                this.eventEmitter.emit('checkpoint-publish-failed', {
-                    slot: this.targetSlot
-                });
-                if (this.epochCache.isProposerPipeliningEnabled()) {
-                    this.metrics.recordPipelineDiscard();
-                }
+        } catch (err) {
+            if (err instanceof SequencerInterruptedError) {
+                return;
             }
-        });
-        // Return the built checkpoint immediately — the work loop is now unblocked
-        return checkpoint;
+            this.logCheckpointEvent('publish-failed', `Checkpoint publish failed for slot ${this.targetSlot}`, {
+                slot: this.targetSlot,
+                checkpointNumber: this.checkpointNumber,
+                reason: err instanceof Error ? err.message : String(err)
+            });
+            this.log.error(`Background attestation/L1 pipeline failed for slot ${this.targetSlot}`, err, {
+                slot: this.targetSlot,
+                checkpointNumber: this.checkpointNumber,
+                reason: err instanceof Error ? err.message : String(err)
+            });
+            this.eventEmitter.emit('checkpoint-publish-failed', {
+                slot: this.targetSlot
+            });
+            if (isPipelining) {
+                this.metrics.recordPipelineDiscard();
+            }
+        }
     }
     /** Enqueues the checkpoint for L1 submission. Called after pipeline sleep in execute(). */ async enqueueCheckpointForSubmission(result) {
         const { checkpoint, attestations, attestationsSignature } = result;
@@ -673,12 +752,135 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                 return;
             }
         }
+        const isPipelining = this.epochCache.isProposerPipeliningEnabled();
+        const submissionSimulationOverridesPlan = buildSubmissionSimulationOverridesPlan({
+            pipelinedParentPlan: this.pipelinedParentSimulationOverridesPlan,
+            invalidateToPendingCheckpointNumber: this.invalidateCheckpoint?.forcePendingCheckpointNumber,
+            lastArchiveRoot: checkpoint.header.lastArchiveRoot,
+            pipeliningEnabled: isPipelining
+        });
         await this.publisher.enqueueProposeCheckpoint(checkpoint, attestations, attestationsSignature, {
             txTimeoutAt,
-            forcePendingCheckpointNumber: this.invalidateCheckpoint?.forcePendingCheckpointNumber,
-            forceProposedFeeHeader: this.computedForceProposedFeeHeader
+            ...submissionSimulationOverridesPlan ? {
+                simulationOverridesPlan: submissionSimulationOverridesPlan
+            } : {}
+        });
+    }
+    /**
+   * Wait until the archiver syncs past the given L2 slot number.
+   * The deadline is the end of `this.targetSlot`, beyond which any pipelined work would miss its
+   * L1 submission window and is no longer useful.
+   */ async waitForSyncedL2SlotNumber(waitForSlot) {
+        const targetSlotStart = Number(getTimestampForSlot(this.targetSlot, this.l1Constants));
+        const targetSlotEndMs = (targetSlotStart + this.l1Constants.slotDuration) * 1000;
+        const syncDelayTolerance = this.l1Constants.ethereumSlotDuration * 2 * 1000;
+        const timeoutSeconds = Math.max(0.1, (targetSlotEndMs + syncDelayTolerance - this.dateProvider.now()) / 1000);
+        try {
+            return await retryUntil(async ()=>{
+                const syncedSlot = await this.l2BlockSource.getSyncedL2SlotNumber();
+                return syncedSlot !== undefined && syncedSlot >= waitForSlot;
+            }, `archiver sync past slot ${waitForSlot}`, timeoutSeconds, 0.2);
+        } catch  {
+            this.log.warn(`Archiver did not sync L1 past slot ${waitForSlot} before slot ${this.targetSlot} expired, discarding pipelined work`, {
+                checkpointNumber: this.checkpointNumber
+            });
+            this.emitPipelinedCheckpointDiscarded('archiver-sync-timeout');
+            return false;
+        }
+    }
+    /**
+   * Waits for the parent checkpoint to land on L1 before submitting a pipelined checkpoint.
+   * Polls until the archiver has synced L1 past the parent's slot, then verifies:
+   * - If we built on a proposed parent: it must have landed on L1 with matching hash and valid attestations.
+   * - If we built without a proposed parent: no new checkpoint must have appeared for that slot.
+   * If the parent has invalid attestations, enqueues an invalidation. Returns whether to proceed with the proposal.
+   */ async waitForValidParentCheckpointOnL1() {
+        const parentCheckpointNumber = CheckpointNumber(this.checkpointNumber - 1);
+        // Wait until archiver has synced L1 past the parent's slot (slotNow)
+        if (!await this.waitForSyncedL2SlotNumber(this.slotNow)) {
+            return false;
+        }
+        const tips = await this.l2BlockSource.getL2Tips();
+        const checkpointedNumber = tips.checkpointed.checkpoint.number;
+        // We built on top of a proposed checkpoint. Verify it landed on L1 as expected.
+        if (this.proposedCheckpointData) {
+            // After syncing from L1 we see the chain tip has invalid attestations. This means the parent checkpoint was posted
+            // with invalid attestations, or it built on top of something with invalid attestations and didnt invalidate them.
+            // Either way, we thought our parent would be valid, so we have to throw away our work. But at least we'll try and
+            // invalidate on L1 so we clean up the chain for the next proposer. And we'll slash them, but that's handled elsewhere.
+            const validationStatus = await this.l2BlockSource.getPendingChainValidationStatus();
+            if (!validationStatus.valid) {
+                this.log.warn(`Parent checkpoint ${parentCheckpointNumber} has invalid attestations, discarding pipelined work`, {
+                    checkpointNumber: this.checkpointNumber,
+                    reason: validationStatus.reason
+                });
+                this.emitPipelinedCheckpointDiscarded('parent-invalid-attestations');
+                await this.enqueueInvalidation(validationStatus);
+                return false;
+            }
+            // The pending chain is valid. But did the parent checkpoint land on L1 at all?
+            if (checkpointedNumber < parentCheckpointNumber) {
+                this.log.warn(`Parent checkpoint ${parentCheckpointNumber} did not land on L1, discarding pipelined work`, {
+                    checkpointNumber: this.checkpointNumber,
+                    checkpointedNumber
+                });
+                this.emitPipelinedCheckpointDiscarded('parent-not-on-l1');
+                return false;
+            }
+            // It landed. But is it the one we were expecting?
+            const expectedHash = this.proposedCheckpointData.header.hash().toString();
+            if (tips.checkpointed.checkpoint.hash !== expectedHash) {
+                this.log.warn(`Parent checkpoint ${parentCheckpointNumber} hash mismatch on L1, discarding pipelined work`, {
+                    checkpointNumber: this.checkpointNumber,
+                    expectedHash,
+                    actualHash: tips.checkpointed.checkpoint.hash
+                });
+                this.emitPipelinedCheckpointDiscarded('parent-hash-mismatch');
+                return false;
+            }
+            return true;
+        } else {
+            // We didn't see a proposed checkpoint at build time, so we built on checkpointed parent from two slots ago.
+            // But if a new checkpoint for the previous slot appeared on L1 in the meantime, our checkpoint assumed the wrong parent,
+            // so we have to discard our work. This can happen if we're somehow cut off from p2p and fail to see the checkpoint
+            // proposal for the previous slot.
+            if (checkpointedNumber > parentCheckpointNumber) {
+                this.log.warn(`Unexpected checkpoint ${checkpointedNumber} landed on L1 after we built on top of parent ${parentCheckpointNumber}, discarding pipelined work`, {
+                    checkpointNumber: this.checkpointNumber,
+                    checkpointedNumber
+                });
+                this.emitPipelinedCheckpointDiscarded('unexpected-parent-appeared');
+                return false;
+            }
+            return true;
+        }
+    }
+    /** Emits the pipelined-checkpoint-discarded event and records the metric. */ emitPipelinedCheckpointDiscarded(reason) {
+        this.metrics.recordPipelineParentCheckpointMismatch(reason);
+        this.eventEmitter.emit('pipelined-checkpoint-discarded', {
+            slot: this.targetSlot,
+            checkpointNumber: this.checkpointNumber,
+            reason
         });
     }
+    /** Simulates and enqueues an invalidation request for the invalid parent checkpoint. */ async enqueueInvalidation(validationStatus) {
+        if (this.config.skipInvalidateBlockAsProposer) {
+            this.log.warn(`Skipping checkpoint invalidation as proposer due to test configuration`);
+            return;
+        }
+        const invalidateRequest = await this.publisher.simulateInvalidateCheckpoint(validationStatus);
+        if (invalidateRequest) {
+            const submissionSlotStart = Number(getTimestampForSlot(this.targetSlot, this.l1Constants));
+            const txTimeoutAt = new Date((submissionSlotStart + this.l1Constants.slotDuration) * 1000);
+            this.publisher.enqueueInvalidateCheckpoint(invalidateRequest, {
+                txTimeoutAt
+            });
+        } else {
+            this.log.info(`Invalidation simulation returned undefined, checkpoint may have been removed already`, {
+                checkpointNumber: this.checkpointNumber
+            });
+        }
+    }
     async proposeCheckpoint() {
         try {
             const env = {
@@ -687,16 +889,29 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                 hasError: false
             };
             try {
+                const now = this.dateProvider.now();
+                if (this.epochCache.isProposerPipeliningEnabled() && this.proposedCheckpointData) {
+                    // Measure against the wall-clock slot whose build window we are currently using.
+                    // In pipelining mode `targetSlot` is intentionally one slot ahead, which makes the
+                    // target-slot boundary a full slot away from the actual build start time.
+                    const slotBoundaryMs = Number(getTimestampForSlot(this.slotNow, this.l1Constants)) * 1000;
+                    this.checkpointMetrics.recordPipelinedCheckpointBuildStartOffsetFromSlotBoundary(now - slotBoundaryMs);
+                }
+                this.checkpointMetrics.startCheckpointTiming(now);
                 // Get operator configured coinbase and fee recipient for this attestor
                 const coinbase = this.validatorClient.getCoinbaseForAttestor(this.attestorAddress);
                 const feeRecipient = this.validatorClient.getFeeRecipientForAttestor(this.attestorAddress);
                 // Start the checkpoint
                 this.setStateFn(SequencerState.INITIALIZING_CHECKPOINT, this.targetSlot);
-                this.log.info(`Starting checkpoint proposal`, {
+                this.logCheckpointEvent('slot-started', `Starting checkpoint proposal for slot ${this.targetSlot}`, {
                     buildSlot: this.slotNow,
                     submissionSlot: this.targetSlot,
+                    slot: this.targetSlot,
+                    checkpointNumber: this.checkpointNumber,
                     pipelining: this.epochCache.isProposerPipeliningEnabled(),
                     proposer: this.proposer?.toString(),
+                    attestorAddress: this.attestorAddress.toString(),
+                    publisherAddress: this.publisher.getSenderAddress().toString(),
                     coinbase: coinbase.toString()
                 });
                 this.metrics.incOpenSlot(this.targetSlot, this.proposer?.toString() ?? 'unknown');
@@ -708,15 +923,13 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                 // When pipelining, force the proposed checkpoint number and fee header to our parent so the
                 // fee computation sees the same chain tip that L1 will see once the previous pipelined checkpoint lands.
                 const isPipelining = this.epochCache.isProposerPipeliningEnabled();
-                const parentCheckpointNumber = isPipelining ? CheckpointNumber(this.checkpointNumber - 1) : undefined;
-                // Compute the parent's fee header override when pipelining
-                if (isPipelining && this.proposedCheckpointData) {
-                    this.computedForceProposedFeeHeader = await this.computeForceProposedFeeHeader(parentCheckpointNumber);
-                }
-                const checkpointGlobalVariables = await this.globalsBuilder.buildCheckpointGlobalVariables(coinbase, feeRecipient, this.targetSlot, {
-                    forcePendingCheckpointNumber: parentCheckpointNumber,
-                    forceProposedFeeHeader: this.computedForceProposedFeeHeader
-                });
+                this.pipelinedParentSimulationOverridesPlan = isPipelining ? await buildPipelinedParentSimulationOverridesPlan({
+                    checkpointNumber: this.checkpointNumber,
+                    proposedCheckpointData: this.proposedCheckpointData,
+                    rollup: this.publisher.rollupContract,
+                    log: this.log
+                }) : undefined;
+                const checkpointGlobalVariables = await this.globalsBuilder.buildCheckpointGlobalVariables(coinbase, feeRecipient, this.targetSlot, this.pipelinedParentSimulationOverridesPlan);
                 // Collect L1 to L2 messages for the checkpoint and compute their hash
                 const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(this.checkpointNumber);
                 const inHash = computeInHashFromL1ToL2Messages(l1ToL2Messages);
@@ -756,8 +969,15 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                     throw err;
                 }
                 if (blocksInCheckpoint.length === 0) {
+                    this.logCheckpointEvent('build-failed', `Checkpoint build failed for slot ${this.targetSlot}`, {
+                        slot: this.targetSlot,
+                        checkpointNumber: this.checkpointNumber,
+                        reason: 'no_blocks_built'
+                    });
                     this.log.warn(`No blocks were built for slot ${this.targetSlot}`, {
-                        slot: this.targetSlot
+                        slot: this.targetSlot,
+                        checkpointNumber: this.checkpointNumber,
+                        reason: 'no_blocks_built'
                     });
                     this.eventEmitter.emit('checkpoint-empty', {
                         slot: this.targetSlot
@@ -766,10 +986,19 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                 }
                 const minBlocksForCheckpoint = this.config.minBlocksForCheckpoint;
                 if (minBlocksForCheckpoint !== undefined && blocksInCheckpoint.length < minBlocksForCheckpoint) {
+                    this.logCheckpointEvent('build-failed', `Checkpoint build failed for slot ${this.targetSlot}`, {
+                        slot: this.targetSlot,
+                        checkpointNumber: this.checkpointNumber,
+                        blocksBuilt: blocksInCheckpoint.length,
+                        minBlocksForCheckpoint,
+                        reason: 'min_blocks_not_met'
+                    });
                     this.log.warn(`Checkpoint has fewer blocks than minimum (${blocksInCheckpoint.length} < ${minBlocksForCheckpoint}), skipping proposal`, {
                         slot: this.targetSlot,
+                        checkpointNumber: this.checkpointNumber,
                         blocksBuilt: blocksInCheckpoint.length,
-                        minBlocksForCheckpoint
+                        minBlocksForCheckpoint,
+                        reason: 'min_blocks_not_met'
                     });
                     return undefined;
                 }
@@ -788,14 +1017,36 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                         maxTxsPerCheckpoint: this.config.maxTxsPerCheckpoint
                     });
                 } catch (err) {
+                    this.logCheckpointEvent('build-failed', `Checkpoint build failed for slot ${this.targetSlot}`, {
+                        slot: this.targetSlot,
+                        checkpointNumber: this.checkpointNumber,
+                        blocksBuilt: blocksInCheckpoint.length,
+                        reason: 'invalid_checkpoint',
+                        checkpoint: checkpoint.header.toInspect()
+                    });
                     this.log.error(`Built an invalid checkpoint at slot ${this.slotNow} (skipping proposal)`, err, {
+                        slot: this.targetSlot,
+                        checkpointNumber: this.checkpointNumber,
+                        blocksBuilt: blocksInCheckpoint.length,
+                        reason: 'invalid_checkpoint',
                         checkpoint: checkpoint.header.toInspect()
                     });
                     return undefined;
                 }
                 // Record checkpoint-level build metrics
-                this.metrics.recordCheckpointBuild(checkpointBuildTimer.ms(), blocksInCheckpoint.length, checkpoint.getStats().txCount, Number(checkpoint.header.totalManaUsed.toBigInt()));
-                // Do not collect attestations nor publish to L1 in fisherman mode
+                this.checkpointMetrics.recordCheckpointBuild(checkpointBuildTimer.ms(), blocksInCheckpoint.length, checkpoint.getStats().txCount, Number(checkpoint.header.totalManaUsed.toBigInt()));
+                this.logCheckpointEvent('built', `Checkpoint built for slot ${this.targetSlot}`, {
+                    slot: this.targetSlot,
+                    buildSlot: this.slotNow,
+                    checkpointNumber: this.checkpointNumber,
+                    proposer: this.proposer?.toString(),
+                    attestorAddress: this.attestorAddress.toString(),
+                    publisherAddress: this.publisher.getSenderAddress().toString(),
+                    blocksBuilt: blocksInCheckpoint.length,
+                    txCount: checkpoint.getStats().txCount,
+                    totalMana: Number(checkpoint.header.totalManaUsed.toBigInt())
+                });
+                // In fisherman mode, return the checkpoint without broadcasting or collecting attestations
                 if (this.config.fishermanMode) {
                     this.log.info(`Built checkpoint for slot ${this.targetSlot} with ${blocksInCheckpoint.length} blocks. ` + `Skipping proposal in fisherman mode.`, {
                         slot: this.targetSlot,
@@ -803,44 +1054,25 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                         blocksBuilt: blocksInCheckpoint.length
                     });
                     this.metrics.recordCheckpointSuccess();
+                    // Return a broadcast result with a dummy proposal — fisherman mode skips attestation collection
                     return {
                         checkpoint,
-                        attestations: CommitteeAttestationsAndSigners.empty(),
-                        attestationsSignature: Signature.empty()
+                        proposal: undefined,
+                        blockProposedAt: this.dateProvider.now()
                     };
                 }
-                // Include the block pending broadcast in the checkpoint proposal if any
-                const lastBlock = blockPendingBroadcast && {
-                    blockHeader: blockPendingBroadcast.block.header,
-                    indexWithinCheckpoint: blockPendingBroadcast.block.indexWithinCheckpoint,
-                    txs: blockPendingBroadcast.txs
-                };
                 // Create the checkpoint proposal and broadcast it
-                const proposal = await this.validatorClient.createCheckpointProposal(checkpoint.header, checkpoint.archive.root, feeAssetPriceModifier, lastBlock, this.proposer, checkpointProposalOptions);
+                const proposal = await this.validatorClient.createCheckpointProposal(checkpoint.header, checkpoint.archive.root, this.checkpointNumber, feeAssetPriceModifier, blockPendingBroadcast, this.proposer, checkpointProposalOptions);
                 const blockProposedAt = this.dateProvider.now();
-                await this.p2pClient.broadcastCheckpointProposal(proposal);
-                this.setStateFn(SequencerState.COLLECTING_ATTESTATIONS, this.targetSlot);
-                const attestations = await this.waitForAttestations(proposal);
-                const blockAttestedAt = this.dateProvider.now();
-                this.metrics.recordCheckpointAttestationDelay(blockAttestedAt - blockProposedAt);
-                // Proposer must sign over the attestations before pushing them to L1
-                const signer = this.proposer ?? this.publisher.getSenderAddress();
-                let attestationsSignature;
-                try {
-                    attestationsSignature = await this.validatorClient.signAttestationsAndSigners(attestations, signer, this.targetSlot, this.checkpointNumber);
-                } catch (err) {
-                    // We shouldn't really get here since we yield to another HA node
-                    // as soon as we see these errors when creating block or checkpoint proposals.
-                    if (this.handleHASigningError(err, 'Attestations signature')) {
-                        return undefined;
-                    }
-                    throw err;
+                if (!this.config.skipBroadcastProposals) {
+                    await this.p2pClient.broadcastCheckpointProposal(proposal);
+                    this.checkpointMetrics.noteCheckpointBroadcast(this.dateProvider.now());
                 }
-                // Return the result for the caller to enqueue after the pipeline sleep
+                // Return immediately after broadcast — attestation collection happens in the background
                 return {
                     checkpoint,
-                    attestations,
-                    attestationsSignature
+                    proposal,
+                    blockProposedAt
                 };
             } catch (e) {
                 env.error = e;
@@ -870,6 +1102,14 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
             const blocksBuilt = blocksInCheckpoint.length;
             const indexWithinCheckpoint = IndexWithinCheckpoint(blocksBuilt);
             const blockNumber = BlockNumber(initialBlockNumber + blocksBuilt);
+            if (blocksBuilt >= this.config.maxBlocksPerCheckpoint) {
+                this.log.debug(`Reached max blocks per checkpoint`, {
+                    slot: this.targetSlot,
+                    blocksBuilt,
+                    maxBlocksPerCheckpoint: this.config.maxBlocksPerCheckpoint
+                });
+                break;
+            }
             const secondsIntoSlot = this.getSecondsIntoSlot();
             const timingInfo = this.timetable.canStartNextBlock(secondsIntoSlot);
             if (!timingInfo.canStart) {
@@ -891,17 +1131,19 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                 indexWithinCheckpoint,
                 txHashesAlreadyIncluded
             });
-            // TODO(palla/mbps): Review these conditions. We may want to keep trying in some scenarios.
-            if (!buildResult && timingInfo.isLastBlock) {
-                break;
-            } else if (!buildResult && timingInfo.deadline !== undefined) {
-                // But if there is still time for more blocks, wait until the next subslot and try again
+            // If we failed to build the block due to insufficient txs, we try again if there is still time left in the slot
+            if ('failure' in buildResult) {
+                // If this was the last subslot, or we're running with a single block per slot, we're done
+                if (timingInfo.isLastBlock || timingInfo.deadline === undefined) {
+                    break;
+                }
+                // Otherwise, if there is still time for more blocks, we wait until the next subslot and try again
                 await this.waitUntilNextSubslot(timingInfo.deadline);
                 continue;
-            } else if (!buildResult) {
-                break;
-            } else if ('error' in buildResult) {
-                // If there was an error building the block, just exit the loop and give up the rest of the slot
+            }
+            // If there was an error building the block, we just exit the loop and give up the rest of the slot.
+            // We don't want to risk building more blocks if something went wrong.
+            if ('error' in buildResult) {
                 if (!(buildResult.error instanceof SequencerInterruptedError)) {
                     this.log.warn(`Halting block building for slot ${this.targetSlot}`, {
                         slot: this.targetSlot,
@@ -912,34 +1154,33 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                 break;
             }
             const { block, usedTxs } = buildResult;
+            this.checkpointMetrics.noteCheckpointBlockBuilt(this.dateProvider.now(), {
+                isFirstBlock: blocksBuilt === 0,
+                isLastBlock: timingInfo.isLastBlock
+            });
             blocksInCheckpoint.push(block);
             usedTxs.forEach((tx)=>txHashesAlreadyIncluded.add(tx.txHash.toString()));
-            // If this is the last block, sync it to the archiver and exit the loop
-            // so we can build the checkpoint and start collecting attestations.
+            // Sign the block proposal. This will throw if HA signing fails.
+            const proposal = await this.createBlockProposal(block, inHash, usedTxs, blockProposalOptions);
+            // Sync the proposed block to the archiver to make it available, only after we've managed to sign the proposal,
+            // so we avoid polluting our archive with a block that would fail.
+            // We wait for the sync to succeed, as this helps catch consistency errors, even if it means we lose some time for block-building.
+            // If this throws, we abort the entire checkpoint.
+            await this.syncProposedBlockToArchiver(block);
+            // If this is the last block, do not broadcast it, since it will be included in the checkpoint proposal.
             if (timingInfo.isLastBlock) {
-                await this.syncProposedBlockToArchiver(block);
                 this.log.verbose(`Completed final block ${blockNumber} for slot ${this.targetSlot}`, {
                     slot: this.targetSlot,
                     blockNumber,
                     blocksBuilt
                 });
-                blockPendingBroadcast = {
-                    block,
-                    txs: usedTxs
-                };
+                blockPendingBroadcast = proposal;
                 break;
             }
-            // Broadcast the block proposal (unless we're in fisherman mode) unless the block is the last one,
-            // in which case we'll broadcast it along with the checkpoint at the end of the loop.
-            // Note that we only send the block to the archiver if we manage to create the proposal, so if there's
-            // a HA error we don't pollute our archiver with a block that won't make it to the chain.
-            const proposal = await this.createBlockProposal(block, inHash, usedTxs, blockProposalOptions);
-            // Sync the proposed block to the archiver to make it available, only after we've managed to sign the proposal.
-            // We wait for the sync to succeed, as this helps catch consistency errors, even if it means we lose some time for block-building.
-            // If this throws, we abort the entire checkpoint.
-            await this.syncProposedBlockToArchiver(block);
             // Once we have a signed proposal and the archiver agreed with our proposed block, then we broadcast it.
-            proposal && await this.p2pClient.broadcastProposal(proposal);
+            if (proposal && !this.config.skipBroadcastProposals) {
+                await this.p2pClient.broadcastProposal(proposal);
+            }
             // Wait until the next block's start time
             await this.waitUntilNextSubslot(timingInfo.deadline);
         }
@@ -957,7 +1198,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
             this.log.info(`Skipping block proposal for block ${block.number} in fisherman mode`);
             return Promise.resolve(undefined);
         }
-        return this.validatorClient.createBlockProposal(block.header, block.indexWithinCheckpoint, inHash, block.archive.root, usedTxs, this.proposer, blockProposalOptions);
+        return this.validatorClient.createBlockProposal(block.header, this.checkpointNumber, block.indexWithinCheckpoint, inHash, block.archive.root, usedTxs, this.proposer, blockProposalOptions);
     }
     /** Sleeps until it is time to produce the next block in the slot */ async waitUntilNextSubslot(nextSubslotStart) {
         this.setStateFn(SequencerState.WAITING_UNTIL_NEXT_BLOCK, this.targetSlot);
@@ -976,10 +1217,23 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
             // Wait until we have enough txs to build the block
             const { availableTxs, canStartBuilding, minTxs } = await this.waitForMinTxs(opts);
             if (!canStartBuilding) {
+                this.logCheckpointEvent('block-build-failed', `Block build failed for slot ${this.targetSlot}`, {
+                    reason: 'insufficient_txs',
+                    blockNumber,
+                    slot: this.targetSlot,
+                    checkpointNumber: this.checkpointNumber,
+                    indexWithinCheckpoint,
+                    availableTxs,
+                    minTxs
+                });
                 this.log.warn(`Not enough txs to build block ${blockNumber} at index ${indexWithinCheckpoint} in slot ${this.targetSlot} (got ${availableTxs} txs but needs ${minTxs})`, {
+                    reason: 'insufficient_txs',
                     blockNumber,
                     slot: this.targetSlot,
-                    indexWithinCheckpoint
+                    checkpointNumber: this.checkpointNumber,
+                    indexWithinCheckpoint,
+                    availableTxs,
+                    minTxs
                 });
                 this.eventEmitter.emit('block-tx-count-check-failed', {
                     minTxs,
@@ -987,7 +1241,9 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                     slot: this.targetSlot
                 });
                 this.metrics.recordBlockProposalFailed('insufficient_txs');
-                return undefined;
+                return {
+                    failure: 'insufficient-txs'
+                };
             }
             // Create iterator to pending txs. We filter out txs already included in previous blocks in the checkpoint
             // just in case p2p failed to sync the provisional block and didn't get to remove those txs from the mempool yet.
@@ -1018,8 +1274,19 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
             // If any txs failed during execution, drop them from the mempool so we don't pick them up again
             await this.dropFailedTxsFromP2P(buildResult.failedTxs);
             if (buildResult.status === 'insufficient-valid-txs') {
+                this.logCheckpointEvent('block-build-failed', `Block build failed for slot ${this.targetSlot}`, {
+                    reason: 'insufficient_valid_txs',
+                    slot: this.targetSlot,
+                    checkpointNumber: this.checkpointNumber,
+                    blockNumber,
+                    numTxs: buildResult.processedCount,
+                    indexWithinCheckpoint,
+                    minValidTxs
+                });
                 this.log.warn(`Block ${blockNumber} at index ${indexWithinCheckpoint} on slot ${this.targetSlot} has too few valid txs to be proposed`, {
+                    reason: 'insufficient_valid_txs',
                     slot: this.targetSlot,
+                    checkpointNumber: this.checkpointNumber,
                     blockNumber,
                     numTxs: buildResult.processedCount,
                     indexWithinCheckpoint,
@@ -1030,7 +1297,9 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                     slot: this.targetSlot
                 });
                 this.metrics.recordBlockProposalFailed('insufficient_valid_txs');
-                return undefined;
+                return {
+                    failure: 'insufficient-valid-txs'
+                };
             }
             // Block creation succeeded, emit stats and metrics
             const { block, publicProcessorDuration, usedTxs, blockBuildDuration, numTxs } = buildResult;
@@ -1056,7 +1325,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                 slot: this.targetSlot,
                 buildSlot: this.slotNow
             });
-            this.metrics.recordBuiltBlock(blockBuildDuration, block.header.totalManaUsed.toNumberUnsafe());
+            this.metrics.recordBuiltBlock(blockBuildDuration, block.header.totalManaUsed.toNumberUnsafe(), this.targetSlot);
             return {
                 block,
                 usedTxs
@@ -1066,9 +1335,17 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                 reason: err.message,
                 slot: this.targetSlot
             });
+            this.logCheckpointEvent('block-build-failed', `Block build failed for slot ${this.targetSlot}`, {
+                reason: err instanceof Error ? err.message : String(err),
+                slot: this.targetSlot,
+                checkpointNumber: this.checkpointNumber,
+                blockNumber
+            });
             this.log.error(`Error building block`, err, {
-                blockNumber,
-                slot: this.targetSlot
+                reason: err instanceof Error ? err.message : String(err),
+                slot: this.targetSlot,
+                checkpointNumber: this.checkpointNumber,
+                blockNumber
             });
             this.metrics.recordBlockProposalFailed(err.name || 'unknown_error');
             this.metrics.recordFailedBlock();
@@ -1131,13 +1408,37 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
             minTxs
         };
     }
+    async getSignedCommitteeAttestations(broadcast) {
+        const { proposal, blockProposedAt } = broadcast;
+        this.setStateFn(SequencerState.COLLECTING_ATTESTATIONS, this.targetSlot);
+        const attestations = await this.waitForAttestations(proposal);
+        if (!attestations) {
+            return undefined;
+        }
+        this.checkpointMetrics.recordCheckpointAttestationDelay(this.dateProvider.now() - blockProposedAt);
+        // Proposer must sign over the attestations before pushing them to L1
+        const signer = this.proposer ?? this.publisher.getSenderAddress();
+        try {
+            const attestationsSignature = await this.validatorClient.signAttestationsAndSigners(attestations, signer, this.targetSlot, this.checkpointNumber);
+            return {
+                attestations,
+                attestationsSignature
+            };
+        } catch (err) {
+            if (this.handleHASigningError(err, 'Attestations signature')) {
+                return;
+            }
+            this.log.error(`Error signing attestations for checkpoint proposal at slot ${proposal.slotNumber}`, err);
+            return undefined;
+        }
+    }
     /**
    * Waits for enough attestations to be collected via p2p.
    * This is run after all blocks for the checkpoint have been built.
    */ async waitForAttestations(proposal) {
         if (this.config.fishermanMode) {
             this.log.debug('Skipping attestation collection in fisherman mode');
-            return CommitteeAttestationsAndSigners.empty();
+            return CommitteeAttestationsAndSigners.empty(this.getSignatureContext());
         }
         const slotNumber = proposal.slotNumber;
         const { committee, seed, epoch } = await this.epochCache.getCommittee(slotNumber);
@@ -1145,7 +1446,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
             throw new Error('No committee when collecting attestations');
         } else if (committee.length === 0) {
             this.log.verbose(`Attesting committee is empty`);
-            return CommitteeAttestationsAndSigners.empty();
+            return CommitteeAttestationsAndSigners.empty(this.getSignatureContext());
         } else {
             this.log.debug(`Attesting committee length is ${committee.length}`, {
                 committee
@@ -1154,16 +1455,19 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
         const numberOfRequiredAttestations = computeQuorum(committee.length);
         if (this.config.skipCollectingAttestations) {
             this.log.warn('Skipping attestation collection as per config (attesting with own keys only)');
-            const attestations = await this.validatorClient?.collectOwnAttestations(proposal);
-            return new CommitteeAttestationsAndSigners(orderAttestations(attestations ?? [], committee));
+            const attestations = await this.validatorClient?.collectOwnAttestations(proposal, this.checkpointNumber);
+            this.logCheckpointAttestations('collected', committee, attestations ?? [], numberOfRequiredAttestations, {
+                reason: 'collect_own_only'
+            });
+            return new CommitteeAttestationsAndSigners(orderAttestations(attestations ?? [], committee), this.getSignatureContext());
         }
-        const attestationTimeAllowed = this.config.enforceTimeTable ? this.timetable.getMaxAllowedTime(SequencerState.PUBLISHING_CHECKPOINT) : this.l1Constants.slotDuration;
+        const attestationTimeAllowed = this.config.enforceTimeTable ? this.timetable.getCheckpointAttestationDeadline() : this.l1Constants.slotDuration;
         const attestationDeadline = new Date((this.getSlotStartBuildTimestamp() + attestationTimeAllowed) * 1000);
         this.metrics.recordRequiredAttestations(numberOfRequiredAttestations, attestationTimeAllowed);
         const collectAttestationsTimer = new Timer();
         let collectedAttestationsCount = 0;
         try {
-            const attestations = await this.validatorClient.collectAttestations(proposal, numberOfRequiredAttestations, attestationDeadline);
+            const attestations = await this.validatorClient.collectAttestations(proposal, numberOfRequiredAttestations, attestationDeadline, this.checkpointNumber);
             collectedAttestationsCount = attestations.length;
             // Trim attestations to minimum required to save L1 calldata gas
             const localAddresses = this.validatorClient.getValidatorAddresses();
@@ -1173,20 +1477,55 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
             }
             // Rollup contract requires that the signatures are provided in the order of the committee
             const sorted = orderAttestations(trimmed, committee);
+            this.logCheckpointAttestations('collected', committee, attestations, numberOfRequiredAttestations, {
+                submittedCount: trimmed.length
+            });
             // Manipulate the attestations if we've been configured to do so
             if (this.config.injectFakeAttestation || this.config.injectHighSValueAttestation || this.config.injectUnrecoverableSignatureAttestation || this.config.shuffleAttestationOrdering) {
                 return this.manipulateAttestations(proposal.slotNumber, epoch, seed, committee, sorted);
             }
-            return new CommitteeAttestationsAndSigners(sorted);
+            return new CommitteeAttestationsAndSigners(sorted, this.getSignatureContext());
         } catch (err) {
             if (err && err instanceof AttestationTimeoutError) {
                 collectedAttestationsCount = err.collectedCount;
+                this.logCheckpointAttestations('failed', committee, undefined, numberOfRequiredAttestations, {
+                    collectedCount: collectedAttestationsCount,
+                    reason: 'timeout'
+                });
+                this.log.error(`Timeout while waiting for attestations for checkpoint proposal at slot ${proposal.slotNumber} (collected ${collectedAttestationsCount}/${numberOfRequiredAttestations})`, err);
+            } else {
+                this.logCheckpointAttestations('failed', committee, undefined, numberOfRequiredAttestations, {
+                    collectedCount: collectedAttestationsCount,
+                    reason: err instanceof Error ? err.message : String(err)
+                });
+                this.log.error(`Error collecting attestations for checkpoint proposal at slot ${proposal.slotNumber}`, err);
             }
-            throw err;
+            return undefined;
         } finally{
             this.metrics.recordCollectedAttestations(collectedAttestationsCount, collectAttestationsTimer.ms());
         }
     }
+    logCheckpointAttestations(status, committee, attestations, requiredAttestations, opts = {}) {
+        const signedValidators = attestations?.map((attestation)=>attestation.getSender()?.toString()).filter((address)=>address !== undefined) ?? [];
+        const collectedCount = opts.collectedCount ?? new Set(signedValidators).size;
+        const missingValidatorCount = status === 'failed' ? Math.max(0, requiredAttestations - collectedCount) : undefined;
+        this.logCheckpointEvent(`attestations-${status}`, `Checkpoint attestations ${status} for slot ${this.targetSlot}`, {
+            slot: this.targetSlot,
+            checkpointNumber: this.checkpointNumber,
+            committeeSize: committee.length,
+            requiredAttestations,
+            collectedAttestations: collectedCount,
+            ...opts.submittedCount !== undefined && {
+                submittedAttestations: opts.submittedCount
+            },
+            ...missingValidatorCount !== undefined && {
+                missingValidatorCount
+            },
+            ...opts.reason !== undefined && {
+                reason: opts.reason
+            }
+        });
+    }
     /** Breaks the attestations before publishing based on attack configs */ manipulateAttestations(slotNumber, epoch, seed, committee, attestations) {
         // Compute the proposer index in the committee, since we dont want to tweak it.
         // Otherwise, the L1 rollup contract will reject the block outright.
@@ -1212,7 +1551,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                     unfreeze(attestations[targetIndex]).signature = generateRecoverableSignature();
                 }
             }
-            return new CommitteeAttestationsAndSigners(attestations);
+            return new CommitteeAttestationsAndSigners(attestations, this.getSignatureContext());
         }
         if (this.config.shuffleAttestationOrdering) {
             this.log.warn(`Shuffling attestation ordering in checkpoint for slot ${slotNumber} (proposer #${proposerIndex})`);
@@ -1238,10 +1577,10 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                     shuffled[i]
                 ];
             }
-            const signers = new CommitteeAttestationsAndSigners(attestations).getSigners();
-            return new MaliciousCommitteeAttestationsAndSigners(shuffled, signers);
+            const signers = new CommitteeAttestationsAndSigners(attestations, this.getSignatureContext()).getSigners();
+            return new MaliciousCommitteeAttestationsAndSigners(shuffled, signers, this.getSignatureContext());
         }
-        return new CommitteeAttestationsAndSigners(attestations);
+        return new CommitteeAttestationsAndSigners(attestations, this.getSignatureContext());
     }
     async dropFailedTxsFromP2P(failedTxs) {
         if (failedTxs.length === 0) {
@@ -1256,8 +1595,12 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
    * Adds the proposed block to the archiver so it's available via P2P.
    * Gossip doesn't echo messages back to the sender, so the proposer's archiver/world-state
    * would never receive its own block without this explicit sync.
+   *
+   * In fisherman mode we skip this push: the fisherman builds blocks locally for validation
+   * and fee analysis only, and pushing them to the archiver causes spurious reorg cascades
+   * whenever the real proposer's block arrives from L1.
    */ async syncProposedBlockToArchiver(block) {
-        if (this.config.skipPushProposedBlocksToArchiver) {
+        if (this.config.skipPushProposedBlocksToArchiver || this.config.fishermanMode) {
             this.log.warn(`Skipping push of proposed block ${block.number} to archiver`, {
                 blockNumber: block.number,
                 slot: block.header.globalVariables.slotNumber
@@ -1309,40 +1652,6 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
         }
         return false;
     }
-    /**
-   * In times of congestion we need to simulate using the correct fee header override for the previous block
-   * We calculate the correct fee header values.
-   *
-   * If we are in block 1, or the checkpoint we are querying does not exist, we return undefined. However
-   * If we are pipelining - where this function is called, the grandparentCheckpointNumber should always exist
-   * @param parentCheckpointNumber
-   * @returns
-   */ async computeForceProposedFeeHeader(parentCheckpointNumber) {
-        if (!this.proposedCheckpointData) {
-            return undefined;
-        }
-        const rollup = this.publisher.rollupContract;
-        const grandparentCheckpointNumber = CheckpointNumber(this.checkpointNumber - 2);
-        try {
-            const [grandparentCheckpoint, manaTarget] = await Promise.all([
-                rollup.getCheckpoint(grandparentCheckpointNumber),
-                rollup.getManaTarget()
-            ]);
-            if (!grandparentCheckpoint || !grandparentCheckpoint.feeHeader) {
-                this.log.error(`Grandparent checkpoint or its feeHeader is undefined for checkpointNumber=${grandparentCheckpointNumber.toString()}`);
-                return undefined;
-            } else {
-                const parentFeeHeader = RollupContract.computeChildFeeHeader(grandparentCheckpoint.feeHeader, this.proposedCheckpointData.totalManaUsed, this.proposedCheckpointData.feeAssetPriceModifier, manaTarget);
-                return {
-                    checkpointNumber: parentCheckpointNumber,
-                    feeHeader: parentFeeHeader
-                };
-            }
-        } catch (err) {
-            this.log.error(`Failed to fetch grandparent checkpoint or mana target for checkpointNumber=${grandparentCheckpointNumber.toString()}: ${err}`);
-            return undefined;
-        }
-    }
     /** Waits until a specific time within the current slot */ async waitUntilTimeInSlot(targetSecondsIntoSlot) {
         const slotStartTimestamp = this.getSlotStartBuildTimestamp();
         const targetTimestamp = slotStartTimestamp + targetSecondsIntoSlot;