@aztec/sequencer-client 3.0.0-canary.a9708bd → 3.0.0-devnet.20251212

package/dest/sequencer/sequencer.js

@@ -4,26 +4,35 @@ function _ts_decorate(decorators, target, key, desc) {
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
-import { FormattedViemError, NoCommitteeError } from '@aztec/ethereum';
+import { getKzg } from '@aztec/blob-lib';
+import { BLOBS_PER_CHECKPOINT, FIELDS_PER_BLOB, INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+import { NoCommitteeError } from '@aztec/ethereum/contracts';
+import { FormattedViemError } from '@aztec/ethereum/utils';
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import { omit, pick } from '@aztec/foundation/collection';
+import { randomInt } from '@aztec/foundation/crypto/random';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
+import { Signature } from '@aztec/foundation/eth-signature';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { Timer } from '@aztec/foundation/timer';
-import { getSlotAtTimestamp } from '@aztec/stdlib/epoch-helpers';
+import { unfreeze } from '@aztec/foundation/types';
+import { CommitteeAttestationsAndSigners, MaliciousCommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
+import { getSlotAtTimestamp, getSlotStartBuildTimestamp } from '@aztec/stdlib/epoch-helpers';
 import { Gas } from '@aztec/stdlib/gas';
 import { SequencerConfigSchema } from '@aztec/stdlib/interfaces/server';
 import { orderAttestations } from '@aztec/stdlib/p2p';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { pickFromSchema } from '@aztec/stdlib/schemas';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
-import { ContentCommitment, ProposedBlockHeader } from '@aztec/stdlib/tx';
+import { ContentCommitment } from '@aztec/stdlib/tx';
 import { AttestationTimeoutError } from '@aztec/stdlib/validators';
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import EventEmitter from 'node:events';
+import { SequencerInterruptedError, SequencerTooSlowError } from './errors.js';
 import { SequencerMetrics } from './metrics.js';
-import { SequencerTimetable, SequencerTooSlowError } from './timetable.js';
+import { SequencerTimetable } from './timetable.js';
 import { SequencerState } from './utils.js';
 export { SequencerState };
 /**
@@ -62,6 +71,8 @@ export { SequencerState };
     metrics;
     lastBlockPublished;
     governanceProposerPayload;
+    /** The last slot for which we attempted to vote when sync failed, to prevent duplicate attempts. */ lastSlotForVoteWhenSyncFailed;
+    /** The last slot for which we built a validation block in fisherman mode, to prevent duplicate attempts. */ lastSlotForValidationBlock;
     /** The maximum number of seconds that the sequencer can be into a slot to transition to a particular state. */ timetable;
     enforceTimeTable;
     // This shouldn't be here as this gets re-created each time we build/propose a block.
@@ -72,10 +83,11 @@ export { SequencerState };
     publisher;
     constructor(publisherFactory, validatorClient, globalsBuilder, p2pClient, worldState, slasherClient, l2BlockSource, l1ToL2MessageSource, blockBuilder, 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.blockBuilder = blockBuilder, this.l1Constants = l1Constants, this.dateProvider = dateProvider, this.epochCache = epochCache, this.rollupContract = rollupContract, this.config = config, this.telemetry = telemetry, this.log = log, this.pollingIntervalMs = 1000, this.maxTxsPerBlock = 32, this.minTxsPerBlock = 1, this.maxL1TxInclusionTimeIntoSlot = 0, this.state = SequencerState.STOPPED, this.maxBlockSizeInBytes = 1024 * 1024, this.maxBlockGas = new Gas(100e9, 100e9), this.enforceTimeTable = false;
-        // Set an initial coinbase for metrics purposes, but this will potentially change with each block.
-        const validatorAddresses = this.validatorClient?.getValidatorAddresses() ?? [];
-        const coinbase = validatorAddresses.length === 0 ? EthAddress.ZERO : this.validatorClient?.getCoinbaseForAttestor(validatorAddresses[0]) ?? EthAddress.ZERO;
-        this.metrics = new SequencerMetrics(telemetry, ()=>this.state, coinbase, this.rollupContract, 'Sequencer');
+        // Add [FISHERMAN] prefix to logger if in fisherman mode
+        if (this.config.fishermanMode) {
+            this.log = log.createChild('[FISHERMAN]');
+        }
+        this.metrics = new SequencerMetrics(telemetry, this.rollupContract, 'Sequencer');
         // Initialize config
         this.updateConfig(this.config);
     }
@@ -135,13 +147,14 @@ export { SequencerState };
         }, this.metrics, this.log);
     }
     async init() {
+        // Takes ~3s to precompute some tables.
+        getKzg();
         this.publisher = (await this.publisherFactory.create(undefined)).publisher;
     }
     /**
    * Starts the sequencer and moves to IDLE state.
    */ start() {
-        this.metrics.start();
-        this.runningPromise = new RunningPromise(this.work.bind(this), this.log, this.pollingIntervalMs);
+        this.runningPromise = new RunningPromise(this.safeWork.bind(this), this.log, this.pollingIntervalMs);
         this.setState(SequencerState.IDLE, undefined, {
             force: true
         });
@@ -152,9 +165,10 @@ export { SequencerState };
    * Stops the sequencer from processing txs and moves to STOPPED state.
    */ async stop() {
         this.log.info(`Stopping sequencer`);
-        this.metrics.stop();
+        this.setState(SequencerState.STOPPING, undefined, {
+            force: true
+        });
         this.publisher?.interrupt();
-        await this.validatorClient?.stop();
         await this.runningPromise?.stop();
         this.setState(SequencerState.STOPPED, undefined, {
             force: true
@@ -176,21 +190,28 @@ export { SequencerState };
    *          - Collect attestations for the block
    *          - Submit block
    *          - If our block for some reason is not included, revert the state
-   */ async doRealWork() {
+   */ async work() {
         this.setState(SequencerState.SYNCHRONIZING, undefined);
-        // Check all components are synced to latest as seen by the archiver
-        const syncedTo = await this.getChainTip();
-        // Do not go forward with new block if the previous one has not been mined and processed
+        const { slot, ts, now } = this.epochCache.getEpochAndSlotInNextL1Slot();
+        // Check we have not already published a block for this slot (cheapest check)
+        if (this.lastBlockPublished && this.lastBlockPublished.header.getSlot() >= slot) {
+            this.log.debug(`Cannot propose block at next L2 slot ${slot} since that slot was taken by our own block ${this.lastBlockPublished.number}`);
+            return;
+        }
+        // Check all components are synced to latest as seen by the archiver (queries all subsystems)
+        const syncedTo = await this.checkSync({
+            ts,
+            slot
+        });
         if (!syncedTo) {
+            await this.tryVoteWhenSyncFails({
+                slot,
+                ts
+            });
             return;
         }
         const chainTipArchive = syncedTo.archive;
-        const newBlockNumber = syncedTo.blockNumber + 1;
-        const { slot, ts, now } = this.epochCache.getEpochAndSlotInNextL1Slot();
-        this.setState(SequencerState.PROPOSER_CHECK, slot);
-        // 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 newBlockNumber = BlockNumber(syncedTo.blockNumber + 1);
         const syncLogData = {
             now,
             syncedToL1Ts: syncedTo.l1Timestamp,
@@ -201,73 +222,66 @@ export { SequencerState };
             newBlockNumber,
             isPendingChainValid: pick(syncedTo.pendingChainValidationStatus, 'valid', 'reason', 'invalidIndex')
         };
-        if (syncedTo.l1Timestamp + BigInt(this.l1Constants.ethereumSlotDuration) < ts) {
-            this.log.debug(`Cannot propose block ${newBlockNumber} at next L2 slot ${slot} due to pending sync from L1`, syncLogData);
-            return;
-        }
-        // Check that the slot is not taken by a block already
-        if (syncedTo.block && syncedTo.block.header.getSlot() >= slot) {
-            this.log.debug(`Cannot propose block at next L2 slot ${slot} since that slot was taken by block ${syncedTo.blockNumber}`, {
-                ...syncLogData,
-                block: syncedTo.block.header.toInspect()
-            });
-            return;
-        }
-        // Or that we haven't published it ourselves
-        if (this.lastBlockPublished && this.lastBlockPublished.header.getSlot() >= slot) {
-            this.log.debug(`Cannot propose block at next L2 slot ${slot} since that slot was taken by our own block ${this.lastBlockPublished.number}`, {
-                ...syncLogData,
-                block: this.lastBlockPublished.header.toInspect()
-            });
+        // Check that we are a proposer for the next slot
+        this.setState(SequencerState.PROPOSER_CHECK, slot);
+        const [canPropose, proposer] = await this.checkCanPropose(slot);
+        // If we are not a proposer check if we should invalidate a invalid block, and bail
+        if (!canPropose) {
+            await this.considerInvalidatingBlock(syncedTo, slot);
             return;
         }
-        // Check that we are a proposer for the next slot
-        let proposerInNextSlot;
-        try {
-            proposerInNextSlot = await this.epochCache.getProposerAttesterAddressInNextSlot();
-        } catch (e) {
-            if (e instanceof NoCommitteeError) {
-                this.log.warn(`Cannot propose block ${newBlockNumber} at next L2 slot ${slot} since the committee does not exist on L1`);
+        // In fisherman mode, check if we've already validated this slot to prevent duplicate attempts
+        if (this.config.fishermanMode) {
+            if (this.lastSlotForValidationBlock === slot) {
+                this.log.trace(`Already validated block building for slot ${slot} (skipping)`, {
+                    slot
+                });
                 return;
             }
+            this.log.debug(`Building validation block for slot ${slot} (actual proposer: ${proposer?.toString() ?? 'none'})`, {
+                slot,
+                proposer: proposer?.toString()
+            });
+            // Mark this slot as being validated
+            this.lastSlotForValidationBlock = slot;
         }
-        // If get proposer in next slot is undefined, then the committee is empty and anyone may propose.
-        // If the committee is defined and not empty, but none of our validators are the proposer, then stop.
-        const validatorAddresses = this.validatorClient.getValidatorAddresses();
-        if (proposerInNextSlot !== undefined && !validatorAddresses.some((addr)=>addr.equals(proposerInNextSlot))) {
-            this.log.debug(`Cannot propose block ${newBlockNumber} since we are not a proposer`, {
-                us: validatorAddresses,
-                proposer: proposerInNextSlot,
-                ...syncLogData
+        // 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}`, {
+                ...syncLogData,
+                block: syncedTo.block.header.toInspect()
             });
-            // If the pending chain is invalid, we may need to invalidate the block if no one else is doing it.
-            if (!syncedTo.pendingChainValidationStatus.valid) {
-                // We pass i undefined here to get any available publisher.
-                const { publisher } = await this.publisherFactory.create(undefined);
-                await this.considerInvalidatingBlock(syncedTo, slot, validatorAddresses, publisher);
-            }
+            this.metrics.recordBlockProposalPrecheckFailed('slot_already_taken');
             return;
         }
-        // Check with the rollup 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 proposerAddressInNextSlot = proposerInNextSlot ?? EthAddress.ZERO;
         // We now need to get ourselves a publisher.
         // The returned attestor will be the one we provided if we provided one.
         // Otherwise it will be a valid attestor for the returned publisher.
-        const { attestorAddress, publisher } = await this.publisherFactory.create(proposerInNextSlot);
+        // In fisherman mode, pass undefined to use the fisherman's own keystore instead of the actual proposer's
+        const { attestorAddress, publisher } = await this.publisherFactory.create(this.config.fishermanMode ? undefined : proposer);
         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) {
+            if (proposer) {
+                publisher.setProposerAddressForSimulation(proposer);
+                this.log.debug(`Set proposer address ${proposer} for simulation in fisherman mode`);
+            }
+        }
+        // Get proposer credentials
         const coinbase = this.validatorClient.getCoinbaseForAttestor(attestorAddress);
         const feeRecipient = this.validatorClient.getFeeRecipientForAttestor(attestorAddress);
-        this.metrics.setCoinbase(coinbase);
         // Prepare invalidation request if the pending chain is invalid (returns undefined if no need)
         const invalidateBlock = await publisher.simulateInvalidateBlock(syncedTo.pendingChainValidationStatus);
-        const canProposeCheck = await publisher.canProposeAtNextEthBlock(chainTipArchive, proposerAddressInNextSlot, invalidateBlock);
+        // Check with the rollup 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(chainTipArchive, proposer ?? EthAddress.ZERO, invalidateBlock);
         if (canProposeCheck === undefined) {
             this.log.warn(`Cannot propose block ${newBlockNumber} at slot ${slot} due to failed rollup contract check`, syncLogData);
             this.emit('proposer-rollup-check-failed', {
                 reason: 'Rollup contract check failed'
             });
+            this.metrics.recordBlockProposalPrecheckFailed('rollup_contract_check_failed');
             return;
         } else 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}.`, {
@@ -279,9 +293,10 @@ export { SequencerState };
             this.emit('proposer-rollup-check-failed', {
                 reason: 'Slot mismatch'
             });
+            this.metrics.recordBlockProposalPrecheckFailed('slot_mismatch');
             return;
-        } else if (canProposeCheck.blockNumber !== BigInt(newBlockNumber)) {
-            this.log.warn(`Cannot propose block due to block mismatch with rollup contract (this can be caused by a pending archiver sync). Expected block ${newBlockNumber} but got ${canProposeCheck.blockNumber}.`, {
+        } else if (canProposeCheck.checkpointNumber !== CheckpointNumber.fromBlockNumber(newBlockNumber)) {
+            this.log.warn(`Cannot propose block due to block mismatch with rollup contract (this can be caused by a pending archiver sync). Expected block ${newBlockNumber} but got ${canProposeCheck.checkpointNumber}.`, {
                 ...syncLogData,
                 rollup: canProposeCheck,
                 newBlockNumber,
@@ -290,48 +305,78 @@ export { SequencerState };
             this.emit('proposer-rollup-check-failed', {
                 reason: 'Block mismatch'
             });
+            this.metrics.recordBlockProposalPrecheckFailed('block_number_mismatch');
             return;
         }
-        this.log.debug(`Can propose block ${newBlockNumber} at slot ${slot}` + (proposerInNextSlot ? ` as ${proposerInNextSlot}` : ''), {
-            ...syncLogData,
-            validatorAddresses
+        this.log.debug(`Can propose block ${newBlockNumber} at slot ${slot} as ${proposer}`, {
+            ...syncLogData
         });
         const newGlobalVariables = await this.globalsBuilder.buildGlobalVariables(newBlockNumber, coinbase, feeRecipient, slot);
-        const { timestamp } = newGlobalVariables;
-        const signerFn = (msg)=>this.validatorClient.signWithAddress(attestorAddress, msg).then((s)=>s.toString());
-        const enqueueGovernanceSignalPromise = this.governanceProposerPayload && !this.governanceProposerPayload.isZero() ? publisher.enqueueGovernanceCastSignal(this.governanceProposerPayload, slot, timestamp, attestorAddress, signerFn).catch((err)=>{
-            this.log.error(`Error enqueuing governance vote`, err, {
-                blockNumber: newBlockNumber,
-                slot
-            });
-            return false;
-        }) : Promise.resolve(false);
-        const enqueueSlashingActionsPromise = this.slasherClient ? this.slasherClient.getProposerActions(slot).then((actions)=>publisher.enqueueSlashingActions(actions, slot, timestamp, attestorAddress, signerFn)).catch((err)=>{
-            this.log.error(`Error enqueuing slashing actions`, err, {
-                blockNumber: newBlockNumber,
-                slot
-            });
-            return false;
-        }) : Promise.resolve(false);
+        // 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
+        const votesPromises = this.enqueueGovernanceAndSlashingVotes(publisher, attestorAddress, slot, newGlobalVariables.timestamp);
+        // Enqueues block invalidation
         if (invalidateBlock && !this.config.skipInvalidateBlockAsProposer) {
             publisher.enqueueInvalidateBlock(invalidateBlock);
         }
+        // Actual block building
         this.setState(SequencerState.INITIALIZING_PROPOSAL, slot);
+        this.metrics.incOpenSlot(slot, proposer?.toString() ?? 'unknown');
+        const block = await this.tryBuildBlockAndEnqueuePublish(slot, proposer, newBlockNumber, publisher, newGlobalVariables, chainTipArchive, invalidateBlock);
+        // Wait until the voting promises have resolved, so all requests are enqueued
+        await Promise.all(votesPromises);
+        // In fisherman mode, we don't publish to L1
+        if (this.config.fishermanMode) {
+            // Clear pending requests
+            publisher.clearPendingRequests();
+            if (block) {
+                this.log.info(`Validation block building SUCCEEDED for slot ${slot}`, {
+                    blockNumber: newBlockNumber,
+                    slot: Number(slot),
+                    archive: block.archive.toString(),
+                    txCount: block.body.txEffects.length
+                });
+                this.lastBlockPublished = block;
+                this.metrics.recordBlockProposalSuccess();
+            } else {
+                // Block building failed in fisherman mode
+                this.log.warn(`Validation block building FAILED for slot ${slot}`, {
+                    blockNumber: newBlockNumber,
+                    slot: Number(slot)
+                });
+                this.metrics.recordBlockProposalFailed('block_build_failed');
+            }
+        } else {
+            // Normal mode: send the tx to L1
+            const l1Response = await publisher.sendRequests();
+            const proposedBlock = l1Response?.successfulActions.find((a)=>a === 'propose');
+            if (proposedBlock) {
+                this.lastBlockPublished = block;
+                this.emit('block-published', {
+                    blockNumber: newBlockNumber,
+                    slot: Number(slot)
+                });
+                await this.metrics.incFilledSlot(publisher.getSenderAddress().toString(), coinbase);
+            } else if (block) {
+                this.emit('block-publish-failed', l1Response ?? {});
+            }
+        }
+        this.setState(SequencerState.IDLE, undefined);
+    }
+    /** Tries building a block proposal, and if successful, enqueues it for publishing. */ async tryBuildBlockAndEnqueuePublish(slot, proposer, newBlockNumber, publisher, newGlobalVariables, chainTipArchive, invalidateBlock) {
         this.log.verbose(`Preparing proposal for block ${newBlockNumber} at slot ${slot}`, {
-            proposer: proposerInNextSlot?.toString(),
-            coinbase,
+            proposer,
             publisher: publisher.getSenderAddress(),
-            feeRecipient,
             globalVariables: newGlobalVariables.toInspect(),
             chainTipArchive,
             blockNumber: newBlockNumber,
             slot
         });
-        // If I created a "partial" header here that should make our job much easier.
-        const proposalHeader = ProposedBlockHeader.from({
+        const proposalHeader = CheckpointHeader.from({
             ...newGlobalVariables,
             timestamp: newGlobalVariables.timestamp,
             lastArchiveRoot: chainTipArchive,
+            blockHeadersHash: Fr.ZERO,
             contentCommitment: ContentCommitment.empty(),
             totalManaUsed: Fr.ZERO
         });
@@ -342,7 +387,7 @@ export { SequencerState };
             // and also we may need to fetch more if we don't have enough valid txs.
             const pendingTxs = this.p2pClient.iteratePendingTxs();
             try {
-                block = await this.buildBlockAndEnqueuePublish(pendingTxs, proposalHeader, newGlobalVariables, proposerInNextSlot, invalidateBlock, publisher);
+                block = await this.buildBlockAndEnqueuePublish(pendingTxs, proposalHeader, newGlobalVariables, proposer, invalidateBlock, publisher);
             } catch (err) {
                 this.emit('block-build-failed', {
                     reason: err.message
@@ -355,6 +400,7 @@ export { SequencerState };
                         slot
                     });
                 }
+                this.metrics.recordBlockProposalFailed(err.name || 'unknown_error');
             }
         } else {
             this.log.verbose(`Not enough txs to build block ${newBlockNumber} at slot ${slot} (got ${pendingTxCount} txs, need ${this.minTxsPerBlock})`, {
@@ -366,28 +412,13 @@ export { SequencerState };
                 minTxs: this.minTxsPerBlock,
                 availableTxs: pendingTxCount
             });
+            this.metrics.recordBlockProposalFailed('insufficient_txs');
         }
-        await Promise.all([
-            enqueueGovernanceSignalPromise,
-            enqueueSlashingActionsPromise
-        ]);
-        const l1Response = await publisher.sendRequests();
-        const proposedBlock = l1Response?.successfulActions.find((a)=>a === 'propose');
-        if (proposedBlock) {
-            this.lastBlockPublished = block;
-            this.emit('block-published', {
-                blockNumber: newBlockNumber,
-                slot: Number(slot)
-            });
-            this.metrics.incFilledSlot(publisher.getSenderAddress().toString());
-        } else if (block) {
-            this.emit('block-publish-failed', l1Response ?? {});
-        }
-        this.setState(SequencerState.IDLE, undefined);
+        return block;
     }
-    async work() {
+    async safeWork() {
         try {
-            await this.doRealWork();
+            await this.work();
         } catch (err) {
             if (err instanceof SequencerTooSlowError) {
                 // Log as warn only if we had to abort halfway through the block proposal
@@ -407,6 +438,10 @@ export { SequencerState };
         }
     }
     setState(proposedState, slotNumber, opts = {}) {
+        if (this.state === SequencerState.STOPPING && proposedState !== SequencerState.STOPPED && !opts.force) {
+            this.log.warn(`Cannot set sequencer to ${proposedState} as it is stopping.`);
+            throw new SequencerInterruptedError();
+        }
         if (this.state === SequencerState.STOPPED && !opts.force) {
             this.log.warn(`Cannot set sequencer from ${this.state} to ${proposedState} as it is stopped.`);
             return;
@@ -416,7 +451,12 @@ export { SequencerState };
             secondsIntoSlot = this.getSecondsIntoSlot(slotNumber);
             this.timetable.assertTimeLeft(proposedState, secondsIntoSlot);
         }
-        this.log.debug(`Transitioning from ${this.state} to ${proposedState}`, {
+        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}`, {
             slotNumber,
             secondsIntoSlot
         });
@@ -447,6 +487,7 @@ export { SequencerState };
             maxTransactions: this.maxTxsPerBlock,
             maxBlockSize: this.maxBlockSizeInBytes,
             maxBlockGas: this.maxBlockGas,
+            maxBlobFields: BLOBS_PER_CHECKPOINT * FIELDS_PER_BLOB,
             deadline
         };
     }
@@ -463,13 +504,13 @@ export { SequencerState };
    */ async buildBlockAndEnqueuePublish(pendingTxs, proposalHeader, newGlobalVariables, proposerAddress, invalidateBlock, publisher) {
         await publisher.validateBlockHeader(proposalHeader, invalidateBlock);
         const blockNumber = newGlobalVariables.blockNumber;
-        const slot = proposalHeader.slotNumber.toBigInt();
-        const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(blockNumber);
-        // this.metrics.recordNewBlock(blockNumber, validTxs.length);
+        const checkpointNumber = CheckpointNumber.fromBlockNumber(blockNumber);
+        const slot = proposalHeader.slotNumber;
+        const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(checkpointNumber);
         const workTimer = new Timer();
         this.setState(SequencerState.CREATING_BLOCK, slot);
         try {
-            const blockBuilderOptions = this.getBlockBuilderOptions(Number(slot));
+            const blockBuilderOptions = this.getBlockBuilderOptions(slot);
             const buildBlockRes = await this.blockBuilder.buildBlock(pendingTxs, l1ToL2Messages, newGlobalVariables, blockBuilderOptions);
             const { publicGas, block, publicProcessorDuration, numTxs, numMsgs, blockBuildingTimer, usedTxs, failedTxs } = buildBlockRes;
             const blockBuildDuration = workTimer.ms();
@@ -485,7 +526,7 @@ export { SequencerState };
             }
             // TODO(@PhilWindle) We should probably periodically check for things like another
             // block being published before ours instead of just waiting on our block
-            await publisher.validateBlockHeader(block.header.toPropose(), invalidateBlock);
+            await publisher.validateBlockHeader(block.getCheckpointHeader(), invalidateBlock);
             const blockStats = {
                 eventName: 'l2-block-built',
                 creator: proposerAddress?.toString() ?? publisher.getSenderAddress().toString(),
@@ -502,15 +543,23 @@ export { SequencerState };
                 txHashes,
                 ...blockStats
             });
-            this.log.debug('Collecting attestations');
-            const attestations = await this.collectAttestations(block, usedTxs, proposerAddress);
-            if (attestations !== undefined) {
-                this.log.verbose(`Collected ${attestations.length} attestations`, {
+            // In fisherman mode, skip attestation collection
+            let attestationsAndSigners;
+            if (this.config.fishermanMode) {
+                this.log.debug('Skipping attestation collection');
+                attestationsAndSigners = CommitteeAttestationsAndSigners.empty();
+            } else {
+                this.log.debug('Collecting attestations');
+                attestationsAndSigners = await this.collectAttestations(block, usedTxs, proposerAddress);
+                this.log.verbose(`Collected ${attestationsAndSigners.attestations.length} attestations for block ${blockNumber} at slot ${slot}`, {
                     blockHash,
-                    blockNumber
+                    blockNumber,
+                    slot
                 });
             }
-            await this.enqueuePublishL2Block(block, attestations, txHashes, invalidateBlock, publisher);
+            // In fisherman mode, skip attestation signing
+            const attestationsAndSignersSignature = this.config.fishermanMode || !this.validatorClient ? Signature.empty() : await this.validatorClient.signAttestationsAndSigners(attestationsAndSigners, proposerAddress ?? publisher.getSenderAddress());
+            await this.enqueuePublishL2Block(block, attestationsAndSigners, attestationsAndSignersSignature, invalidateBlock, publisher);
             this.metrics.recordBuiltBlock(blockBuildDuration, publicGas.l2Gas);
             return block;
         } catch (err) {
@@ -519,69 +568,110 @@ export { SequencerState };
         }
     }
     async collectAttestations(block, txs, proposerAddress) {
-        const { committee } = await this.epochCache.getCommittee(block.header.getSlot());
+        const { committee, seed, epoch } = await this.epochCache.getCommittee(block.slot);
         // We checked above that the committee is defined, so this should never happen.
         if (!committee) {
             throw new Error('No committee when collecting attestations');
         }
         if (committee.length === 0) {
             this.log.verbose(`Attesting committee is empty`);
-            return undefined;
+            return CommitteeAttestationsAndSigners.empty();
         } else {
             this.log.debug(`Attesting committee length is ${committee.length}`);
         }
         if (!this.validatorClient) {
-            const msg = 'Missing validator client: Cannot collect attestations';
-            this.log.error(msg);
-            throw new Error(msg);
+            throw new Error('Missing validator client: Cannot collect attestations');
         }
         const numberOfRequiredAttestations = Math.floor(committee.length * 2 / 3) + 1;
-        const slotNumber = block.header.globalVariables.slotNumber.toBigInt();
+        const slotNumber = block.header.globalVariables.slotNumber;
         this.setState(SequencerState.COLLECTING_ATTESTATIONS, slotNumber);
         this.log.debug('Creating block proposal for validators');
         const blockProposalOptions = {
-            publishFullTxs: !!this.config.publishTxsWithProposals
+            publishFullTxs: !!this.config.publishTxsWithProposals,
+            broadcastInvalidBlockProposal: this.config.broadcastInvalidBlockProposal
         };
-        const proposal = await this.validatorClient.createBlockProposal(block.header.globalVariables.blockNumber, block.header.toPropose(), block.archive.root, block.header.state, txs, proposerAddress, blockProposalOptions);
+        const proposal = await this.validatorClient.createBlockProposal(block.header.globalVariables.blockNumber, block.getCheckpointHeader(), block.archive.root, txs, proposerAddress, blockProposalOptions);
         if (!proposal) {
             throw new Error(`Failed to create block proposal`);
         }
         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 orderAttestations(attestations ?? [], committee);
+            return new CommitteeAttestationsAndSigners(orderAttestations(attestations ?? [], committee));
         }
         this.log.debug('Broadcasting block proposal to validators');
         await this.validatorClient.broadcastBlockProposal(proposal);
         const attestationTimeAllowed = this.enforceTimeTable ? this.timetable.getMaxAllowedTime(SequencerState.PUBLISHING_BLOCK) : this.aztecSlotDuration;
         this.metrics.recordRequiredAttestations(numberOfRequiredAttestations, attestationTimeAllowed);
         const timer = new Timer();
-        let collectedAttestionsCount = 0;
+        let collectedAttestationsCount = 0;
         try {
             const attestationDeadline = new Date(this.dateProvider.now() + attestationTimeAllowed * 1000);
             const attestations = await this.validatorClient.collectAttestations(proposal, numberOfRequiredAttestations, attestationDeadline);
-            collectedAttestionsCount = attestations.length;
+            collectedAttestationsCount = attestations.length;
             // note: the smart contract requires that the signatures are provided in the order of the committee
-            return orderAttestations(attestations, committee);
+            const sorted = orderAttestations(attestations, committee);
+            // manipulate the attestations if we've been configured to do so
+            if (this.config.injectFakeAttestation || this.config.shuffleAttestationOrdering) {
+                return this.manipulateAttestations(block, epoch, seed, committee, sorted);
+            }
+            return new CommitteeAttestationsAndSigners(sorted);
         } catch (err) {
             if (err && err instanceof AttestationTimeoutError) {
-                collectedAttestionsCount = err.collectedCount;
+                collectedAttestationsCount = err.collectedCount;
             }
             throw err;
         } finally{
-            this.metrics.recordCollectedAttestations(collectedAttestionsCount, timer.ms());
+            this.metrics.recordCollectedAttestations(collectedAttestationsCount, timer.ms());
         }
     }
+    /** Breaks the attestations before publishing based on attack configs */ manipulateAttestations(block, 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.
+        const proposerIndex = Number(this.epochCache.computeProposerIndex(block.slot, epoch, seed, BigInt(committee.length)));
+        if (this.config.injectFakeAttestation) {
+            // Find non-empty attestations that are not from the proposer
+            const nonProposerIndices = [];
+            for(let i = 0; i < attestations.length; i++){
+                if (!attestations[i].signature.isEmpty() && i !== proposerIndex) {
+                    nonProposerIndices.push(i);
+                }
+            }
+            if (nonProposerIndices.length > 0) {
+                const targetIndex = nonProposerIndices[randomInt(nonProposerIndices.length)];
+                this.log.warn(`Injecting fake attestation in block ${block.number} at index ${targetIndex}`);
+                unfreeze(attestations[targetIndex]).signature = Signature.random();
+            }
+            return new CommitteeAttestationsAndSigners(attestations);
+        }
+        if (this.config.shuffleAttestationOrdering) {
+            this.log.warn(`Shuffling attestation ordering in block ${block.number} (proposer index ${proposerIndex})`);
+            const shuffled = [
+                ...attestations
+            ];
+            const [i, j] = [
+                (proposerIndex + 1) % shuffled.length,
+                (proposerIndex + 2) % shuffled.length
+            ];
+            const valueI = shuffled[i];
+            const valueJ = shuffled[j];
+            shuffled[i] = valueJ;
+            shuffled[j] = valueI;
+            const signers = new CommitteeAttestationsAndSigners(attestations).getSigners();
+            return new MaliciousCommitteeAttestationsAndSigners(shuffled, signers);
+        }
+        return new CommitteeAttestationsAndSigners(attestations);
+    }
     /**
    * Publishes the L2Block to the rollup contract.
    * @param block - The L2Block to be published.
-   */ async enqueuePublishL2Block(block, attestations, txHashes, invalidateBlock, publisher) {
+   */ async enqueuePublishL2Block(block, attestationsAndSigners, attestationsAndSignersSignature, invalidateBlock, publisher) {
         // Publishes new block to the network and awaits the tx to be mined
-        this.setState(SequencerState.PUBLISHING_BLOCK, block.header.globalVariables.slotNumber.toBigInt());
+        this.setState(SequencerState.PUBLISHING_BLOCK, block.header.globalVariables.slotNumber);
         // Time out tx at the end of the slot
-        const slot = block.header.globalVariables.slotNumber.toNumber();
+        const slot = block.header.globalVariables.slotNumber;
         const txTimeoutAt = new Date((this.getSlotStartBuildTimestamp(slot) + this.aztecSlotDuration) * 1000);
-        const enqueued = await publisher.enqueueProposeL2Block(block, attestations, txHashes, {
+        const enqueued = await publisher.enqueueProposeL2Block(block, attestationsAndSigners, attestationsAndSignersSignature, {
             txTimeoutAt,
             forcePendingBlockNumber: invalidateBlock?.forcePendingBlockNumber
         });
@@ -592,8 +682,20 @@ export { SequencerState };
     /**
    * Returns whether all dependencies have caught up.
    * We don't check against the previous block submitted since it may have been reorg'd out.
-   * @returns Boolean indicating if our dependencies are synced to the latest block.
-   */ async getChainTip() {
+   */ 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) {
+            this.log.debug(`Cannot propose block at next L2 slot ${slot} due to pending sync from L1`, {
+                slot,
+                ts,
+                l1Timestamp
+            });
+            return undefined;
+        }
         const syncedBlocks = await Promise.all([
             this.worldState.status().then(({ syncSummary })=>({
                     number: syncSummary.latestBlockNumber,
@@ -602,66 +704,218 @@ export { SequencerState };
             this.l2BlockSource.getL2Tips().then((t)=>t.latest),
             this.p2pClient.getStatus().then((p2p)=>p2p.syncedToL2Block),
             this.l1ToL2MessageSource.getL2Tips().then((t)=>t.latest),
-            this.l2BlockSource.getL1Timestamp(),
             this.l2BlockSource.getPendingChainValidationStatus()
         ]);
-        const [worldState, l2BlockSource, p2p, l1ToL2MessageSource, l1Timestamp, pendingChainValidationStatus] = syncedBlocks;
-        // The archiver reports 'undefined' hash for the genesis block
-        // because it doesn't have access to world state to compute it (facepalm)
-        const result = l2BlockSource.hash === undefined ? worldState.number === 0 && p2p.number === 0 && l1ToL2MessageSource.number === 0 : worldState.hash === l2BlockSource.hash && p2p.hash === l2BlockSource.hash && l1ToL2MessageSource.hash === l2BlockSource.hash;
-        const logData = {
-            worldState,
-            l2BlockSource,
-            p2p,
-            l1ToL2MessageSource
-        };
-        this.log.debug(`Sequencer sync check ${result ? 'succeeded' : 'failed'}`, logData);
+        const [worldState, l2BlockSource, p2p, l1ToL2MessageSource, pendingChainValidationStatus] = 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.
+        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;
         if (!result) {
+            this.log.debug(`Sequencer sync check failed`, {
+                worldState,
+                l2BlockSource,
+                p2p,
+                l1ToL2MessageSource
+            });
             return undefined;
         }
+        // Special case for genesis state
         const blockNumber = worldState.number;
-        if (blockNumber >= INITIAL_L2_BLOCK_NUM) {
-            const block = await this.l2BlockSource.getBlock(blockNumber);
-            if (!block) {
-                // this shouldn't really happen because a moment ago we checked that all components were in sync
-                this.log.warn(`Failed to get L2 block ${blockNumber} from the archiver with all components in sync`, logData);
-                return undefined;
-            }
-            return {
-                block,
-                blockNumber: block.number,
-                archive: block.archive.root,
-                l1Timestamp,
-                pendingChainValidationStatus
-            };
-        } else {
+        if (blockNumber < INITIAL_L2_BLOCK_NUM) {
             const archive = new Fr((await this.worldState.getCommitted().getTreeInfo(MerkleTreeId.ARCHIVE)).root);
             return {
-                blockNumber: INITIAL_L2_BLOCK_NUM - 1,
+                blockNumber: BlockNumber(INITIAL_L2_BLOCK_NUM - 1),
                 archive,
                 l1Timestamp,
                 pendingChainValidationStatus
             };
         }
+        const block = await this.l2BlockSource.getBlock(blockNumber);
+        if (!block) {
+            // 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`);
+            return undefined;
+        }
+        return {
+            block,
+            blockNumber: block.number,
+            archive: block.archive.root,
+            l1Timestamp,
+            pendingChainValidationStatus
+        };
+    }
+    /**
+   * Enqueues governance and slashing votes with the publisher. Does not block.
+   * @param publisher - The publisher to enqueue votes with
+   * @param attestorAddress - The attestor address to use for signing
+   * @param slot - The slot number
+   * @param timestamp - The timestamp for the votes
+   * @param context - Optional context for logging (e.g., block number)
+   * @returns A tuple of [governanceEnqueued, slashingEnqueued]
+   */ enqueueGovernanceAndSlashingVotes(publisher, attestorAddress, slot, timestamp) {
+        try {
+            const signerFn = (msg)=>this.validatorClient.signWithAddress(attestorAddress, msg).then((s)=>s.toString());
+            const enqueueGovernancePromise = this.governanceProposerPayload && !this.governanceProposerPayload.isZero() ? publisher.enqueueGovernanceCastSignal(this.governanceProposerPayload, slot, timestamp, attestorAddress, signerFn).catch((err)=>{
+                this.log.error(`Error enqueuing governance vote`, err, {
+                    slot
+                });
+                return false;
+            }) : undefined;
+            const enqueueSlashingPromise = this.slasherClient ? this.slasherClient.getProposerActions(slot).then((actions)=>{
+                // Record metrics for fisherman mode
+                if (this.config.fishermanMode && actions.length > 0) {
+                    this.log.debug(`Fisherman mode: simulating ${actions.length} slashing action(s) for slot ${slot}`, {
+                        slot,
+                        actionCount: actions.length
+                    });
+                    this.metrics.recordSlashingAttempt(actions.length);
+                }
+                // Enqueue the actions to fully simulate L1 tx building (they won't be sent in fisherman mode)
+                return publisher.enqueueSlashingActions(actions, slot, timestamp, attestorAddress, signerFn);
+            }).catch((err)=>{
+                this.log.error(`Error enqueuing slashing actions`, err, {
+                    slot
+                });
+                return false;
+            }) : undefined;
+            return [
+                enqueueGovernancePromise,
+                enqueueSlashingPromise
+            ];
+        } catch (err) {
+            this.log.error(`Error enqueueing governance and slashing votes`, err);
+            return [
+                undefined,
+                undefined
+            ];
+        }
+    }
+    /**
+   * 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) {
+        let proposer;
+        try {
+            proposer = await this.epochCache.getProposerAttesterAddressInSlot(slot);
+        } catch (e) {
+            if (e instanceof NoCommitteeError) {
+                this.log.warn(`Cannot propose at next L2 slot ${slot} since the committee does not exist on L1`);
+                return [
+                    false,
+                    undefined
+                ];
+            }
+            this.log.error(`Error getting proposer for slot ${slot}`, e);
+            return [
+                false,
+                undefined
+            ];
+        }
+        // If proposer is undefined, then the committee is empty and anyone may propose
+        if (proposer === undefined) {
+            return [
+                true,
+                undefined
+            ];
+        }
+        // In fisherman mode, just return the current proposer
+        if (this.config.fishermanMode) {
+            return [
+                true,
+                proposer
+            ];
+        }
+        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`, {
+                validatorAddresses,
+                proposer
+            });
+            return [
+                false,
+                proposer
+            ];
+        }
+        return [
+            true,
+            proposer
+        ];
+    }
+    /**
+   * 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, ts } = args;
+        // Prevent duplicate attempts in the same slot
+        if (this.lastSlotForVoteWhenSyncFailed === slot) {
+            this.log.debug(`Already attempted to vote in slot ${slot} (skipping)`);
+            return;
+        }
+        // Check if we're past the max time for initializing a proposal
+        const secondsIntoSlot = this.getSecondsIntoSlot(slot);
+        const maxAllowedTime = this.timetable.getMaxAllowedTime(SequencerState.INITIALIZING_PROPOSAL);
+        // If we haven't exceeded the time limit for initializing a proposal, don't proceed with voting
+        // We use INITIALIZING_PROPOSAL time limit because if we're past that, we can't build a block anyway
+        if (maxAllowedTime === undefined || secondsIntoSlot <= maxAllowedTime) {
+            this.log.trace(`Not attempting to vote since there is still for block building`, {
+                secondsIntoSlot,
+                maxAllowedTime
+            });
+            return;
+        }
+        this.log.debug(`Sync for slot ${slot} failed, checking for voting opportunities`, {
+            secondsIntoSlot,
+            maxAllowedTime
+        });
+        // Check if we're a proposer or proposal is open
+        const [canPropose, proposer] = await this.checkCanPropose(slot);
+        if (!canPropose) {
+            this.log.debug(`Cannot vote in slot ${slot} since we are not a proposer`, {
+                slot,
+                proposer
+            });
+            return;
+        }
+        // Mark this slot as attempted
+        this.lastSlotForVoteWhenSyncFailed = slot;
+        // Get a publisher for voting
+        const { attestorAddress, publisher } = await this.publisherFactory.create(proposer);
+        this.log.debug(`Attempting to vote despite sync failure at slot ${slot}`, {
+            attestorAddress,
+            slot
+        });
+        // Enqueue governance and slashing votes using the shared helper method
+        const votesPromises = this.enqueueGovernanceAndSlashingVotes(publisher, attestorAddress, slot, ts);
+        await Promise.all(votesPromises);
+        if (votesPromises.every((p)=>!p)) {
+            this.log.debug(`No votes to enqueue for slot ${slot}`);
+            return;
+        }
+        this.log.info(`Voting in slot ${slot} despite sync failure`, {
+            slot
+        });
+        await publisher.sendRequests();
     }
     /**
    * Considers invalidating a block if the pending chain is invalid. Depends on how long the invalid block
    * has been there without being invalidated and whether the sequencer is in the committee or not. We always
    * 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 considerInvalidatingBlock(syncedTo, currentSlot, ourValidatorAddresses, publisher) {
+   */ async considerInvalidatingBlock(syncedTo, currentSlot) {
         const { pendingChainValidationStatus, l1Timestamp } = syncedTo;
         if (pendingChainValidationStatus.valid) {
             return;
         }
-        const invalidL1Timestamp = pendingChainValidationStatus.block.l1.timestamp;
-        const timeSinceChainInvalid = this.dateProvider.nowInSeconds() - Number(invalidL1Timestamp);
-        const invalidBlockNumber = pendingChainValidationStatus.block.block.number;
+        const invalidBlockNumber = pendingChainValidationStatus.block.blockNumber;
+        const invalidBlockTimestamp = pendingChainValidationStatus.block.timestamp;
+        const timeSinceChainInvalid = this.dateProvider.nowInSeconds() - Number(invalidBlockTimestamp);
+        const ourValidatorAddresses = this.validatorClient.getValidatorAddresses();
         const { secondsBeforeInvalidatingBlockAsCommitteeMember, secondsBeforeInvalidatingBlockAsNonCommitteeMember } = this.config;
         const logData = {
-            invalidL1Timestamp,
+            invalidL1Timestamp: invalidBlockTimestamp,
             l1Timestamp,
-            invalidBlock: pendingChainValidationStatus.block.block.toBlockInfo(),
+            invalidBlock: pendingChainValidationStatus.block,
             secondsBeforeInvalidatingBlockAsCommitteeMember,
             secondsBeforeInvalidatingBlockAsNonCommitteeMember,
             ourValidatorAddresses,
@@ -674,6 +928,21 @@ export { SequencerState };
             this.log.debug(`Not invalidating pending chain`, logData);
             return;
         }
+        let validatorToUse;
+        if (invalidateAsCommitteeMember) {
+            // When invalidating as a committee member, use first validator that's actually in the committee
+            const { committee } = await this.epochCache.getCommittee(currentSlot);
+            if (committee) {
+                const committeeSet = new Set(committee.map((addr)=>addr.toString()));
+                validatorToUse = ourValidatorAddresses.find((addr)=>committeeSet.has(addr.toString())) ?? ourValidatorAddresses[0];
+            } else {
+                validatorToUse = ourValidatorAddresses[0];
+            }
+        } else {
+            // When invalidating as a non-committee member, use the first validator
+            validatorToUse = ourValidatorAddresses[0];
+        }
+        const { publisher } = await this.publisherFactory.create(validatorToUse);
         const invalidateBlock = await publisher.simulateInvalidateBlock(pendingChainValidationStatus);
         if (!invalidateBlock) {
             this.log.warn(`Failed to simulate invalidate block`, logData);
@@ -681,10 +950,15 @@ export { SequencerState };
         }
         this.log.info(invalidateAsCommitteeMember ? `Invalidating block ${invalidBlockNumber} as committee member` : `Invalidating block ${invalidBlockNumber} as non-committee member`, logData);
         publisher.enqueueInvalidateBlock(invalidateBlock);
-        await publisher.sendRequests();
+        if (!this.config.fishermanMode) {
+            await publisher.sendRequests();
+        } else {
+            this.log.info('Invalidating block in fisherman mode, clearing pending requests');
+            publisher.clearPendingRequests();
+        }
     }
     getSlotStartBuildTimestamp(slotNumber) {
-        return Number(this.l1Constants.l1GenesisTime) + Number(slotNumber) * this.l1Constants.slotDuration - this.l1Constants.ethereumSlotDuration;
+        return getSlotStartBuildTimestamp(slotNumber, this.l1Constants);
     }
     getSecondsIntoSlot(slotNumber) {
         const slotStartTimestamp = this.getSlotStartBuildTimestamp(slotNumber);
@@ -702,7 +976,7 @@ export { SequencerState };
 }
 _ts_decorate([
     trackSpan('Sequencer.work')
-], Sequencer.prototype, "work", null);
+], Sequencer.prototype, "safeWork", null);
 _ts_decorate([
     trackSpan('Sequencer.buildBlockAndEnqueuePublish', (_validTxs, _proposalHeader, newGlobalVariables)=>({
             [Attributes.BLOCK_NUMBER]: newGlobalVariables.blockNumber