@aztec/sequencer-client 0.0.1-commit.29c6b1a3 → 0.0.1-commit.2c0ee1788

package/dest/sequencer/sequencer.js

@@ -373,14 +373,14 @@ function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
 var _dec, _dec1, _dec2, _dec3, _initProto;
 import { getKzg } from '@aztec/blob-lib';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
-import { NoCommitteeError } from '@aztec/ethereum/contracts';
+import { NoCommitteeError, SimulationOverridesBuilder } from '@aztec/ethereum/contracts';
 import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import { merge, omit, pick } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
-import { getSlotAtTimestamp, getSlotStartBuildTimestamp } from '@aztec/stdlib/epoch-helpers';
+import { getSlotStartBuildTimestamp } from '@aztec/stdlib/epoch-helpers';
 import { SequencerConfigSchema } from '@aztec/stdlib/interfaces/server';
 import { pickFromSchema } from '@aztec/stdlib/schemas';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
@@ -388,6 +388,7 @@ import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-clie
 import EventEmitter from 'node:events';
 import { DefaultSequencerConfig } from '../config.js';
 import { CheckpointProposalJob } from './checkpoint_proposal_job.js';
+import { CheckpointProposalJobMetrics } from './checkpoint_proposal_job_metrics.js';
 import { CheckpointVoter } from './checkpoint_voter.js';
 import { SequencerInterruptedError, SequencerTooSlowError } from './errors.js';
 import { SequencerMetrics } from './metrics.js';
@@ -448,45 +449,52 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
     }
     runningPromise;
     state;
+    stateSlotNumber;
+    stateEnteredAtMs;
     metrics;
+    checkpointProposalJobMetrics;
+    stateLog;
     /** The last slot for which we attempted to perform our voting duties with degraded block production */ lastSlotForFallbackVote;
+    /** The last slot for which we logged "no committee" warning, to avoid spam */ lastSlotForNoCommitteeWarning;
     /** The last slot for which we triggered a checkpoint proposal job, to prevent duplicate attempts. */ lastSlotForCheckpointProposalJob;
     /** Last successful checkpoint proposed */ lastCheckpointProposed;
     /** The last epoch for which we logged strategy comparison in fisherman mode. */ lastEpochForStrategyComparison;
+    /** The last checkpoint proposal job, tracked so we can await its pending L1 submission during shutdown. */ lastCheckpointProposalJob;
     /** The maximum number of seconds that the sequencer can be into a slot to transition to a particular state. */ timetable;
-    // This shouldn't be here as this gets re-created each time we build/propose a block.
-    // But we have a number of tests that abuse/rely on this class having a permanent publisher.
-    // As long as those tests only configure a single publisher they will continue to work.
-    // This will get re-assigned every time the sequencer goes to build a new block to a publisher that is valid
-    // for the block proposer.
-    // TODO(palla/mbps): Remove this field and fix tests
-    publisher;
     /** Config for the sequencer */ config;
+    signatureContext;
     constructor(publisherFactory, validatorClient, globalsBuilder, p2pClient, worldState, slasherClient, l2BlockSource, l1ToL2MessageSource, checkpointsBuilder, l1Constants, dateProvider, epochCache, rollupContract, config, telemetry = getTelemetryClient(), log = createLogger('sequencer')){
-        super(), this.publisherFactory = publisherFactory, this.validatorClient = validatorClient, this.globalsBuilder = globalsBuilder, this.p2pClient = p2pClient, this.worldState = worldState, this.slasherClient = slasherClient, this.l2BlockSource = l2BlockSource, this.l1ToL2MessageSource = l1ToL2MessageSource, this.checkpointsBuilder = checkpointsBuilder, this.l1Constants = l1Constants, this.dateProvider = dateProvider, this.epochCache = epochCache, this.rollupContract = rollupContract, this.telemetry = telemetry, this.log = log, this.state = (_initProto(this), SequencerState.STOPPED), this.config = DefaultSequencerConfig;
+        super(), this.publisherFactory = publisherFactory, this.validatorClient = validatorClient, this.globalsBuilder = globalsBuilder, this.p2pClient = p2pClient, this.worldState = worldState, this.slasherClient = slasherClient, this.l2BlockSource = l2BlockSource, this.l1ToL2MessageSource = l1ToL2MessageSource, this.checkpointsBuilder = checkpointsBuilder, this.l1Constants = l1Constants, this.dateProvider = dateProvider, this.epochCache = epochCache, this.rollupContract = rollupContract, this.telemetry = telemetry, this.log = log, this.state = (_initProto(this), SequencerState.STOPPED), this.stateEnteredAtMs = performance.now(), this.config = DefaultSequencerConfig;
+        this.stateLog = log.createChild('state');
         // Add [FISHERMAN] prefix to logger if in fisherman mode
         if (config.fishermanMode) {
             this.log = log.createChild('[FISHERMAN]');
         }
+        this.signatureContext = {
+            chainId: config.l1ChainId,
+            rollupAddress: config.l1Contracts.rollupAddress
+        };
         this.metrics = new SequencerMetrics(telemetry, this.rollupContract, 'Sequencer');
+        this.checkpointProposalJobMetrics = new CheckpointProposalJobMetrics(telemetry);
         this.updateConfig(config);
     }
     /** Updates sequencer config by the defined values and updates the timetable */ updateConfig(config) {
         const filteredConfig = pickFromSchema(config, SequencerConfigSchema);
-        this.log.info(`Updated sequencer config`, omit(filteredConfig, 'txPublicSetupAllowList'));
+        this.log.info(`Updated sequencer config`, omit(filteredConfig, 'txPublicSetupAllowListExtend'));
         this.config = merge(this.config, filteredConfig);
+        const p2pPropagationTime = this.config.attestationPropagationTime;
         this.timetable = new SequencerTimetable({
             ethereumSlotDuration: this.l1Constants.ethereumSlotDuration,
             aztecSlotDuration: this.aztecSlotDuration,
             l1PublishingTime: this.l1PublishingTime,
-            p2pPropagationTime: this.config.attestationPropagationTime,
+            p2pPropagationTime,
             blockDurationMs: this.config.blockDurationMs,
-            enforce: this.config.enforceTimeTable
+            enforce: this.config.enforceTimeTable,
+            pipelining: this.epochCache.isProposerPipeliningEnabled()
         }, this.metrics, this.log);
     }
-    /** Initializes the sequencer (precomputes tables and creates a publisher). Takes about 3s. */ async init() {
+    /** Initializes the sequencer (precomputes tables). Takes about 3s. */ init() {
         getKzg();
-        this.publisher = (await this.publisherFactory.create(undefined)).publisher;
     }
     /** Starts the sequencer and moves to IDLE state. */ start() {
         this.runningPromise = new RunningPromise(this.safeWork.bind(this), this.log, this.config.sequencerPollingIntervalMS);
@@ -496,13 +504,17 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
         this.runningPromise.start();
         this.log.info('Started sequencer');
     }
+    /** Triggers an immediate run of the sequencer, bypassing the polling interval. */ trigger() {
+        return this.runningPromise?.trigger();
+    }
     /** Stops the sequencer from building blocks and moves to STOPPED state. */ async stop() {
         this.log.info(`Stopping sequencer`);
         this.setState(SequencerState.STOPPING, undefined, {
             force: true
         });
-        this.publisher?.interrupt();
+        await this.publisherFactory.stopAll();
         await this.runningPromise?.stop();
+        await this.lastCheckpointProposalJob?.awaitPendingSubmission();
         this.setState(SequencerState.STOPPED, undefined, {
             force: true
         });
@@ -516,7 +528,6 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
                 error: err
             });
             if (err instanceof SequencerTooSlowError) {
-                // TODO(palla/mbps): Add missing states
                 // Log as warn only if we had to abort halfway through the block proposal
                 const logLvl = [
                     SequencerState.INITIALIZING_CHECKPOINT,
@@ -547,22 +558,25 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
    * - Submit checkpoint
    */ async work() {
         this.setState(SequencerState.SYNCHRONIZING, undefined);
-        const { slot, ts, now, epoch } = this.epochCache.getEpochAndSlotInNextL1Slot();
+        const { slot, ts, nowSeconds, epoch } = this.epochCache.getEpochAndSlotInNextL1Slot();
+        const { slot: targetSlot, epoch: targetEpoch } = this.epochCache.getTargetEpochAndSlotInNextL1Slot();
         // Check if we are synced and it's our slot, grab a publisher, check previous block invalidation, etc
-        const checkpointProposalJob = await this.prepareCheckpointProposal(epoch, slot, ts, now);
+        const checkpointProposalJob = await this.prepareCheckpointProposal(slot, targetSlot, epoch, targetEpoch, ts, nowSeconds);
         if (!checkpointProposalJob) {
             return;
         }
+        // Track the job so we can await its pending L1 submission during shutdown
+        this.lastCheckpointProposalJob = checkpointProposalJob;
         // Execute the checkpoint proposal job
         const checkpoint = await checkpointProposalJob.execute();
         // Update last checkpoint proposed (currently unused)
         if (checkpoint) {
             this.lastCheckpointProposed = checkpoint;
         }
-        // Log fee strategy comparison if on fisherman
-        if (this.config.fishermanMode && (this.lastEpochForStrategyComparison === undefined || epoch > this.lastEpochForStrategyComparison)) {
-            this.logStrategyComparison(epoch, checkpointProposalJob.getPublisher());
-            this.lastEpochForStrategyComparison = epoch;
+        // Log fee strategy comparison if on fisherman (uses target epoch since we mirror the proposer's perspective)
+        if (this.config.fishermanMode && (this.lastEpochForStrategyComparison === undefined || targetEpoch > this.lastEpochForStrategyComparison)) {
+            this.logStrategyComparison(targetEpoch, checkpointProposalJob.getPublisher());
+            this.lastEpochForStrategyComparison = targetEpoch;
         }
         return checkpoint;
     }
@@ -570,17 +584,17 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
    * Prepares the checkpoint proposal by performing all necessary checks and setup.
    * This is the initial step in the main loop.
    * @returns CheckpointProposalJob if successful, undefined if we are not yet synced or are not the proposer.
-   */ async prepareCheckpointProposal(epoch, slot, ts, now) {
-        // Check we have not already processed this slot (cheapest check)
+   */ async prepareCheckpointProposal(slot, targetSlot, epoch, targetEpoch, ts, nowSeconds) {
+        // Check we have not already processed this target slot (cheapest check)
         // We only check this if enforce timetable is set, since we want to keep processing the same slot if we are not
         // running against actual time (eg when we use sandbox-style automining)
-        if (this.lastSlotForCheckpointProposalJob && this.lastSlotForCheckpointProposalJob >= slot && this.config.enforceTimeTable) {
-            this.log.trace(`Slot ${slot} has already been processed`);
+        if (this.lastSlotForCheckpointProposalJob && this.lastSlotForCheckpointProposalJob >= targetSlot && this.config.enforceTimeTable) {
+            this.log.trace(`Target slot ${targetSlot} has already been processed`);
             return undefined;
         }
-        // But if we have already proposed for this slot, the we definitely have to skip it, automining or not
-        if (this.lastCheckpointProposed && this.lastCheckpointProposed.header.slotNumber >= slot) {
-            this.log.trace(`Slot ${slot} has already been published as checkpoint ${this.lastCheckpointProposed.number}`);
+        // But if we have already proposed for this slot, then we definitely have to skip it, automining or not
+        if (this.lastCheckpointProposed && this.lastCheckpointProposed.header.slotNumber >= targetSlot) {
+            this.log.trace(`Slot ${targetSlot} has already been published as checkpoint ${this.lastCheckpointProposed.number}`);
             return undefined;
         }
         // Check all components are synced to latest as seen by the archiver (queries all subsystems)
@@ -591,16 +605,18 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
         if (!syncedTo) {
             await this.tryVoteWhenSyncFails({
                 slot,
+                targetSlot,
                 ts
             });
             return undefined;
         }
-        // If escape hatch is open for this epoch, do not start checkpoint proposal work and do not attempt invalidations.
+        // If escape hatch is open for the target epoch, do not start checkpoint proposal work and do not attempt invalidations.
         // Still perform governance/slashing voting (as proposer) once per slot.
-        const isEscapeHatchOpen = await this.epochCache.isEscapeHatchOpen(epoch);
+        // When pipelining, we check the target epoch (slot+1's epoch) since that's the epoch we're building for.
+        const isEscapeHatchOpen = await this.epochCache.isEscapeHatchOpen(targetEpoch);
         if (isEscapeHatchOpen) {
             this.setState(SequencerState.PROPOSER_CHECK, slot);
-            const [canPropose, proposer] = await this.checkCanPropose(slot);
+            const [canPropose, proposer] = await this.checkCanPropose(targetSlot);
             if (canPropose) {
                 await this.tryVoteWhenEscapeHatchOpen({
                     slot,
@@ -618,29 +634,36 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
         // Next checkpoint follows from the last synced one
         const checkpointNumber = CheckpointNumber(syncedTo.checkpointNumber + 1);
         const logCtx = {
-            now,
-            syncedToL1Ts: syncedTo.l1Timestamp,
-            syncedToL2Slot: getSlotAtTimestamp(syncedTo.l1Timestamp, this.l1Constants),
+            nowSeconds,
+            syncedToL2Slot: syncedTo.syncedL2Slot,
             slot,
+            targetSlot,
             slotTs: ts,
             checkpointNumber,
             isPendingChainValid: pick(syncedTo.pendingChainValidationStatus, 'valid', 'reason', 'invalidIndex')
         };
-        // Check that we are a proposer for the next slot
+        // Check that we are a proposer for the target slot.
         this.setState(SequencerState.PROPOSER_CHECK, slot);
-        const [canPropose, proposer] = await this.checkCanPropose(slot);
+        const [canPropose, proposer] = await this.checkCanPropose(targetSlot);
         // If we are not a proposer check if we should invalidate an invalid checkpoint, and bail
         if (!canPropose) {
             await this.considerInvalidatingCheckpoint(syncedTo, slot);
             return undefined;
         }
-        // Check that the slot is not taken by a block already (should never happen, since only us can propose for this slot)
-        if (syncedTo.block && syncedTo.block.header.getSlot() >= slot) {
-            this.log.warn(`Cannot propose block at next L2 slot ${slot} since that slot was taken by block ${syncedTo.blockNumber}`, {
+        // Guard: don't exceed 1-deep pipeline. Without a proposed checkpoint, we can only build
+        // confirmed + 1. With a proposed checkpoint, we can build confirmed + 2.
+        const confirmedCkpt = syncedTo.checkpointedCheckpointNumber;
+        if (checkpointNumber > confirmedCkpt + 2) {
+            this.log.verbose(`Skipping slot ${targetSlot}: checkpoint ${checkpointNumber} exceeds max pipeline depth (confirmed=${confirmedCkpt})`);
+            return undefined;
+        }
+        // Check that the target slot is not taken by a block already (should never happen, since only us can propose for this slot)
+        if (syncedTo.blockData && syncedTo.blockData.header.getSlot() >= targetSlot) {
+            this.log.warn(`Cannot propose block at target slot ${targetSlot} since that slot was taken by block ${syncedTo.blockNumber}`, {
                 ...logCtx,
-                block: syncedTo.block.header.toInspect()
+                block: syncedTo.blockData.header.toInspect()
             });
-            this.metrics.recordBlockProposalPrecheckFailed('slot_already_taken');
+            this.metrics.recordCheckpointPrecheckFailed('slot_already_taken');
             return undefined;
         }
         // We now need to get ourselves a publisher.
@@ -650,37 +673,58 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
         const proposerForPublisher = this.config.fishermanMode ? undefined : proposer;
         const { attestorAddress, publisher } = await this.publisherFactory.create(proposerForPublisher);
         this.log.verbose(`Created publisher at address ${publisher.getSenderAddress()} for attestor ${attestorAddress}`);
-        this.publisher = publisher;
         // In fisherman mode, set the actual proposer's address for simulations
         if (this.config.fishermanMode && proposer) {
             publisher.setProposerAddressForSimulation(proposer);
             this.log.debug(`Set proposer address ${proposer} for simulation in fisherman mode`);
         }
         // Prepare invalidation request if the pending chain is invalid (returns undefined if no need)
-        const invalidateCheckpoint = await publisher.simulateInvalidateCheckpoint(syncedTo.pendingChainValidationStatus);
-        // Check with the rollup contract if we can indeed propose at the next L2 slot. This check should not fail
-        // if all the previous checks are good, but we do it just in case.
-        const canProposeCheck = await publisher.canProposeAtNextEthBlock(syncedTo.archive, proposer ?? EthAddress.ZERO, invalidateCheckpoint);
+        let invalidateCheckpoint = await publisher.simulateInvalidateCheckpoint(syncedTo.pendingChainValidationStatus);
+        // Determine the correct archive and L1 state overrides for the canProposeAt check.
+        // The L1 contract reads archives[proposedCheckpointNumber] and compares it with the provided archive.
+        // When invalidating or pipelining, the local archive may differ from L1's, so we adjust accordingly.
+        let archiveForCheck = syncedTo.archive;
+        const l1SimulationOverridesBuilder = new SimulationOverridesBuilder();
+        if (this.epochCache.isProposerPipeliningEnabled() && syncedTo.hasProposedCheckpoint) {
+            // Parent checkpoint hasn't landed on L1 yet. Override both the proposed checkpoint number
+            // and the archive at that checkpoint so L1 simulation sees the correct chain tip.
+            const parentCheckpointNumber = CheckpointNumber(checkpointNumber - 1);
+            l1SimulationOverridesBuilder.forPendingCheckpoint(parentCheckpointNumber).withPendingArchive(syncedTo.archive);
+            this.metrics.recordPipelineDepth(syncedTo.checkpointNumber - syncedTo.checkpointedCheckpointNumber);
+            this.log.verbose(`Building on top of proposed checkpoint (pending=${syncedTo.proposedCheckpointData?.checkpointNumber})`);
+            // Clear the invalidation - the proposed checkpoint should handle it.
+            invalidateCheckpoint = undefined;
+        } else if (invalidateCheckpoint) {
+            // After invalidation, L1 will roll back to checkpoint N-1. The archive at N-1 already
+            // exists on L1, so we just pass the matching archive (the lastArchive of the invalid checkpoint).
+            archiveForCheck = invalidateCheckpoint.lastArchive;
+            l1SimulationOverridesBuilder.forPendingCheckpoint(invalidateCheckpoint.forcePendingCheckpointNumber);
+            this.metrics.recordPipelineDepth(0);
+        } else {
+            this.metrics.recordPipelineDepth(0);
+        }
+        const simulationOverridesPlan = l1SimulationOverridesBuilder.build();
+        const canProposeCheck = await publisher.canProposeAt(archiveForCheck, proposer ?? EthAddress.ZERO, simulationOverridesPlan);
         if (canProposeCheck === undefined) {
             this.log.warn(`Cannot propose checkpoint ${checkpointNumber} at slot ${slot} due to failed rollup contract check`, logCtx);
             this.emit('proposer-rollup-check-failed', {
                 reason: 'Rollup contract check failed',
                 slot
             });
-            this.metrics.recordBlockProposalPrecheckFailed('rollup_contract_check_failed');
+            this.metrics.recordCheckpointPrecheckFailed('rollup_contract_check_failed');
             return undefined;
         }
-        if (canProposeCheck.slot !== slot) {
-            this.log.warn(`Cannot propose block due to slot mismatch with rollup contract (this can be caused by a clock out of sync). Expected slot ${slot} but got ${canProposeCheck.slot}.`, {
+        if (canProposeCheck.slot !== targetSlot) {
+            this.log.warn(`Cannot propose block due to slot mismatch with rollup contract (this can be caused by a clock out of sync). Expected slot ${targetSlot} but got ${canProposeCheck.slot}.`, {
                 ...logCtx,
                 rollup: canProposeCheck,
-                expectedSlot: slot
+                expectedSlot: targetSlot
             });
             this.emit('proposer-rollup-check-failed', {
                 reason: 'Slot mismatch',
                 slot
             });
-            this.metrics.recordBlockProposalPrecheckFailed('slot_mismatch');
+            this.metrics.recordCheckpointPrecheckFailed('slot_mismatch');
             return undefined;
         }
         if (canProposeCheck.checkpointNumber !== checkpointNumber) {
@@ -693,19 +737,26 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
                 reason: 'Block mismatch',
                 slot
             });
-            this.metrics.recordBlockProposalPrecheckFailed('block_number_mismatch');
+            this.metrics.recordCheckpointPrecheckFailed('block_number_mismatch');
             return undefined;
         }
-        this.lastSlotForCheckpointProposalJob = slot;
-        this.log.info(`Preparing checkpoint proposal ${checkpointNumber} at slot ${slot}`, {
+        this.lastSlotForCheckpointProposalJob = targetSlot;
+        await this.p2pClient.prepareForSlot(targetSlot);
+        this.log.info(`Preparing checkpoint proposal ${checkpointNumber} for target slot ${targetSlot} during wall-clock slot ${slot}`, {
             ...logCtx,
-            proposer
+            proposer,
+            pipeliningEnabled: this.epochCache.isProposerPipeliningEnabled()
         });
         // Create and return the checkpoint proposal job
-        return this.createCheckpointProposalJob(epoch, slot, checkpointNumber, syncedTo.blockNumber, proposer, publisher, attestorAddress, invalidateCheckpoint);
+        return this.createCheckpointProposalJob(slot, targetSlot, targetEpoch, checkpointNumber, syncedTo.blockNumber, proposer, publisher, attestorAddress, invalidateCheckpoint, syncedTo.proposedCheckpointData);
+    }
+    createCheckpointProposalJob(slot, targetSlot, targetEpoch, checkpointNumber, syncedToBlockNumber, proposer, publisher, attestorAddress, invalidateCheckpoint, proposedCheckpointData) {
+        return new CheckpointProposalJob(slot, targetSlot, targetEpoch, checkpointNumber, syncedToBlockNumber, proposer, publisher, attestorAddress, invalidateCheckpoint, this.validatorClient, this.globalsBuilder, this.p2pClient, this.worldState, this.l1ToL2MessageSource, this.l2BlockSource, this.checkpointsBuilder, this.l2BlockSource, this.l1Constants, this.signatureContext, this.config, this.timetable, this.slasherClient, this.epochCache, this.dateProvider, this.metrics, this.checkpointProposalJobMetrics.createRecorder(), this, this.setState.bind(this), this.tracer, this.log.getBindings(), proposedCheckpointData);
     }
-    createCheckpointProposalJob(epoch, slot, checkpointNumber, syncedToBlockNumber, proposer, publisher, attestorAddress, invalidateCheckpoint) {
-        return new CheckpointProposalJob(epoch, slot, checkpointNumber, syncedToBlockNumber, proposer, publisher, attestorAddress, invalidateCheckpoint, this.validatorClient, this.globalsBuilder, this.p2pClient, this.worldState, this.l1ToL2MessageSource, this.l2BlockSource, this.checkpointsBuilder, this.l2BlockSource, this.l1Constants, this.config, this.timetable, this.slasherClient, this.epochCache, this.dateProvider, this.metrics, this, this.setState.bind(this), this.log, this.tracer);
+    /**
+   * Returns the current sequencer state.
+   */ getState() {
+        return this.state;
     }
     /**
    * Internal helper for setting the sequencer state and checks if we have enough time left in the slot to transition to the new state.
@@ -726,37 +777,52 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
             secondsIntoSlot = this.getSecondsIntoSlot(slotNumber);
             this.timetable.assertTimeLeft(proposedState, secondsIntoSlot);
         }
+        const oldState = this.state;
+        const oldStateSlotNumber = this.stateSlotNumber;
+        const stateChanged = proposedState !== oldState;
+        const transitionAtMs = performance.now();
+        const stateDurationMs = transitionAtMs - this.stateEnteredAtMs;
         const boringStates = [
             SequencerState.IDLE,
             SequencerState.SYNCHRONIZING
         ];
-        const logLevel = boringStates.includes(proposedState) && boringStates.includes(this.state) ? 'trace' : 'debug';
-        this.log[logLevel](`Transitioning from ${this.state} to ${proposedState}`, {
+        const logLevel = boringStates.includes(proposedState) && boringStates.includes(oldState) ? 'trace' : 'debug';
+        this.stateLog[logLevel](`Transitioning from ${oldState} to ${proposedState}`, {
+            oldState,
+            newState: proposedState,
             slotNumber,
-            secondsIntoSlot
+            stateSlotNumber: oldStateSlotNumber,
+            secondsIntoSlot,
+            ...stateChanged && {
+                stateDurationMs: Math.ceil(stateDurationMs)
+            }
         });
         this.emit('state-changed', {
-            oldState: this.state,
+            oldState,
             newState: proposedState,
             secondsIntoSlot,
             slot: slotNumber
         });
+        if (stateChanged) {
+            this.metrics.recordStateDuration(stateDurationMs, oldState);
+            this.stateEnteredAtMs = transitionAtMs;
+            this.stateSlotNumber = slotNumber;
+        }
         this.state = proposedState;
     }
     /**
    * Returns whether all dependencies have caught up.
    * We don't check against the previous block submitted since it may have been reorg'd out.
    */ async checkSync(args) {
-        // Check that the archiver and dependencies have synced to the previous L1 slot at least
-        // TODO(#14766): Archiver reports L1 timestamp based on L1 blocks seen, which means that a missed L1 block will
-        // cause the archiver L1 timestamp to fall behind, and cause this sequencer to start processing one L1 slot later.
-        const l1Timestamp = await this.l2BlockSource.getL1Timestamp();
-        const { slot, ts } = args;
-        if (l1Timestamp === undefined || l1Timestamp + BigInt(this.l1Constants.ethereumSlotDuration) < ts) {
+        // Check that the archiver has fully synced the L2 slot before the one we want to propose in.
+        // The archiver reports sync progress via L1 block timestamps and synced checkpoint slots.
+        // See getSyncedL2SlotNumber for how missed L1 blocks are handled.
+        const syncedL2Slot = await this.l2BlockSource.getSyncedL2SlotNumber();
+        const { slot } = args;
+        if (syncedL2Slot === undefined || syncedL2Slot + 1 < slot) {
             this.log.debug(`Cannot propose block at next L2 slot ${slot} due to pending sync from L1`, {
                 slot,
-                ts,
-                l1Timestamp
+                syncedL2Slot
             });
             return undefined;
         }
@@ -765,22 +831,30 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
                     number: syncSummary.latestBlockNumber,
                     hash: syncSummary.latestBlockHash
                 })),
-            this.l2BlockSource.getL2Tips().then((t)=>t.proposed),
+            this.l2BlockSource.getL2Tips().then((t)=>({
+                    proposed: t.proposed,
+                    checkpointed: t.checkpointed,
+                    proposedCheckpoint: t.proposedCheckpoint
+                })),
             this.p2pClient.getStatus().then((p2p)=>p2p.syncedToL2Block),
-            this.l1ToL2MessageSource.getL2Tips().then((t)=>t.proposed),
-            this.l2BlockSource.getPendingChainValidationStatus()
+            this.l1ToL2MessageSource.getL2Tips().then((t)=>({
+                    proposed: t.proposed,
+                    checkpointed: t.checkpointed
+                })),
+            this.l2BlockSource.getPendingChainValidationStatus(),
+            this.l2BlockSource.getLastProposedCheckpoint()
         ]);
-        const [worldState, l2BlockSource, p2p, l1ToL2MessageSource, pendingChainValidationStatus] = syncedBlocks;
+        const [worldState, l2Tips, p2p, l1ToL2MessageSourceTips, pendingChainValidationStatus, proposedCheckpointData] = syncedBlocks;
         // Handle zero as a special case, since the block hash won't match across services if we're changing the prefilled data for the genesis block,
         // as the world state can compute the new genesis block hash, but other components use the hardcoded constant.
         // TODO(palla/mbps): Fix the above. All components should be able to handle dynamic genesis block hashes.
-        const result = l2BlockSource.number === 0 && worldState.number === 0 && p2p.number === 0 && l1ToL2MessageSource.number === 0 || worldState.hash === l2BlockSource.hash && p2p.hash === l2BlockSource.hash && l1ToL2MessageSource.hash === l2BlockSource.hash;
+        const result = l2Tips.proposed.number === 0 && l2Tips.checkpointed.block.number === 0 && l2Tips.checkpointed.checkpoint.number === 0 && worldState.number === 0 && p2p.number === 0 && l1ToL2MessageSourceTips.proposed.number === 0 && l1ToL2MessageSourceTips.checkpointed.block.number === 0 && l1ToL2MessageSourceTips.checkpointed.checkpoint.number === 0 || worldState.hash === l2Tips.proposed.hash && p2p.hash === l2Tips.proposed.hash && l1ToL2MessageSourceTips.proposed.hash === l2Tips.proposed.hash && l1ToL2MessageSourceTips.checkpointed.block.hash === l2Tips.checkpointed.block.hash && l1ToL2MessageSourceTips.checkpointed.checkpoint.hash === l2Tips.checkpointed.checkpoint.hash;
         if (!result) {
             this.log.debug(`Sequencer sync check failed`, {
                 worldState,
-                l2BlockSource,
+                l2BlockSource: l2Tips.proposed,
                 p2p,
-                l1ToL2MessageSource
+                l1ToL2MessageSourceTips
             });
             return undefined;
         }
@@ -790,43 +864,52 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
             const archive = new Fr((await this.worldState.getCommitted().getTreeInfo(MerkleTreeId.ARCHIVE)).root);
             return {
                 checkpointNumber: CheckpointNumber.ZERO,
+                checkpointedCheckpointNumber: CheckpointNumber.ZERO,
                 blockNumber: BlockNumber.ZERO,
                 archive,
-                l1Timestamp,
+                hasProposedCheckpoint: false,
+                syncedL2Slot,
                 pendingChainValidationStatus
             };
         }
-        const block = await this.l2BlockSource.getL2Block(blockNumber);
-        if (!block) {
+        const blockData = await this.l2BlockSource.getBlockData(blockNumber);
+        if (!blockData) {
             // this shouldn't really happen because a moment ago we checked that all components were in sync
-            this.log.error(`Failed to get L2 block ${blockNumber} from the archiver with all components in sync`);
+            this.log.error(`Failed to get L2 block data ${blockNumber} from the archiver with all components in sync`);
             return undefined;
         }
+        const hasProposedCheckpoint = l2Tips.proposedCheckpoint.checkpoint.number > l2Tips.checkpointed.checkpoint.number;
         return {
-            block,
-            blockNumber: block.number,
-            checkpointNumber: block.checkpointNumber,
-            archive: block.archive.root,
-            l1Timestamp,
+            blockData,
+            blockNumber: blockData.header.getBlockNumber(),
+            checkpointNumber: blockData.checkpointNumber,
+            checkpointedCheckpointNumber: l2Tips.checkpointed.checkpoint.number,
+            archive: blockData.archive.root,
+            hasProposedCheckpoint,
+            proposedCheckpointData,
+            syncedL2Slot,
             pendingChainValidationStatus
         };
     }
     /**
    * Checks if we are the proposer for the next slot.
    * @returns True if we can propose, and the proposer address (undefined if anyone can propose)
-   */ async checkCanPropose(slot) {
+   */ async checkCanPropose(targetSlot) {
         let proposer;
         try {
-            proposer = await this.epochCache.getProposerAttesterAddressInSlot(slot);
+            proposer = await this.epochCache.getProposerAttesterAddressInSlot(targetSlot);
         } catch (e) {
             if (e instanceof NoCommitteeError) {
-                this.log.warn(`Cannot propose at next L2 slot ${slot} since the committee does not exist on L1`);
+                if (this.lastSlotForNoCommitteeWarning !== targetSlot) {
+                    this.lastSlotForNoCommitteeWarning = targetSlot;
+                    this.log.warn(`Cannot propose at target slot ${targetSlot} since the committee does not exist on L1`);
+                }
                 return [
                     false,
                     undefined
                 ];
             }
-            this.log.error(`Error getting proposer for slot ${slot}`, e);
+            this.log.error(`Error getting proposer for target slot ${targetSlot}`, e);
             return [
                 false,
                 undefined
@@ -849,7 +932,8 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
         const validatorAddresses = this.validatorClient.getValidatorAddresses();
         const weAreProposer = validatorAddresses.some((addr)=>addr.equals(proposer));
         if (!weAreProposer) {
-            this.log.debug(`Cannot propose at slot ${slot} since we are not a proposer`, {
+            this.log.debug(`Cannot propose at target slot ${targetSlot} since we are not a proposer`, {
+                targetSlot,
                 validatorAddresses,
                 proposer
             });
@@ -858,6 +942,10 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
                 proposer
             ];
         }
+        this.log.info(`We are the proposer for pipeline slot ${targetSlot}`, {
+            targetSlot,
+            proposer
+        });
         return [
             true,
             proposer
@@ -867,7 +955,7 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
    * Tries to vote on slashing actions and governance when the sync check fails but we're past the max time for initializing a proposal.
    * This allows the sequencer to participate in governance/slashing votes even when it cannot build blocks.
    */ async tryVoteWhenSyncFails(args) {
-        const { slot } = args;
+        const { slot, targetSlot } = args;
         // Prevent duplicate attempts in the same slot
         if (this.lastSlotForFallbackVote === slot) {
             this.log.trace(`Already attempted to vote in slot ${slot} (skipping)`);
@@ -890,7 +978,7 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
             maxAllowedTime
         });
         // Check if we're a proposer or proposal is open
-        const [canPropose, proposer] = await this.checkCanPropose(slot);
+        const [canPropose, proposer] = await this.checkCanPropose(targetSlot);
         if (!canPropose) {
             this.log.trace(`Cannot vote in slot ${slot} since we are not a proposer`, {
                 slot,
@@ -906,8 +994,8 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
             attestorAddress,
             slot
         });
-        // Enqueue governance and slashing votes
-        const voter = new CheckpointVoter(slot, publisher, attestorAddress, this.validatorClient, this.slasherClient, this.l1Constants, this.config, this.metrics, this.log);
+        // Enqueue governance and slashing votes (voter uses the target slot for L1 submission)
+        const voter = new CheckpointVoter(targetSlot, publisher, attestorAddress, this.validatorClient, this.slasherClient, this.l1Constants, this.config, this.metrics, this.log);
         const votesPromises = voter.enqueueVotes();
         const votes = await Promise.all(votesPromises);
         if (votes.every((p)=>!p)) {
@@ -954,7 +1042,7 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
    * have the proposer try to invalidate, but if they fail, the sequencers in the committee are expected to try,
    * and if they fail, any sequencer will try as well.
    */ async considerInvalidatingCheckpoint(syncedTo, currentSlot) {
-        const { pendingChainValidationStatus, l1Timestamp } = syncedTo;
+        const { pendingChainValidationStatus, syncedL2Slot } = syncedTo;
         if (pendingChainValidationStatus.valid) {
             return;
         }
@@ -965,7 +1053,7 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
         const { secondsBeforeInvalidatingBlockAsCommitteeMember, secondsBeforeInvalidatingBlockAsNonCommitteeMember } = this.config;
         const logData = {
             invalidL1Timestamp: invalidCheckpointTimestamp,
-            l1Timestamp,
+            syncedL2Slot,
             invalidCheckpoint: pendingChainValidationStatus.checkpoint,
             secondsBeforeInvalidatingBlockAsCommitteeMember,
             secondsBeforeInvalidatingBlockAsNonCommitteeMember,
@@ -1056,6 +1144,9 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
     getValidatorAddresses() {
         return this.validatorClient?.getValidatorAddresses();
     }
+    /** Updates the publisher factory's node keystore adapter after a keystore reload. */ updatePublisherNodeKeyStore(adapter) {
+        this.publisherFactory.updateNodeKeyStore(adapter);
+    }
     getConfig() {
         return this.config;
     }