@aztec/sequencer-client 0.0.0-test.0 → 0.0.1-commit.03f7ef2

package/dest/publisher/sequencer-publisher.js

@@ -1,74 +1,113 @@
-import { Blob } from '@aztec/blob-lib';
-import { createBlobSinkClient } from '@aztec/blob-sink/client';
-import { FormattedViemError, RollupContract, formatViemError } from '@aztec/ethereum';
-import { toHex } from '@aztec/foundation/bigint-buffer';
+import { createBlobClient } from '@aztec/blob-client/client';
+import { Blob, getBlobsPerL1Block, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
+import { MULTI_CALL_3_ADDRESS, Multicall3, RollupContract } from '@aztec/ethereum/contracts';
+import { L1FeeAnalyzer } from '@aztec/ethereum/l1-fee-analysis';
+import { WEI_CONST } from '@aztec/ethereum/l1-tx-utils';
+import { FormattedViemError, formatViemError, tryExtractEvent } from '@aztec/ethereum/utils';
+import { sumBigint } from '@aztec/foundation/bigint';
+import { toHex as toPaddedHex } from '@aztec/foundation/bigint-buffer';
+import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { pick } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { Signature } from '@aztec/foundation/eth-signature';
 import { createLogger } from '@aztec/foundation/log';
+import { bufferToHex } from '@aztec/foundation/string';
 import { Timer } from '@aztec/foundation/timer';
-import { ForwarderAbi, RollupAbi } from '@aztec/l1-artifacts';
-import { ConsensusPayload, SignatureDomainSeparator, getHashedSignaturePayload } from '@aztec/stdlib/p2p';
+import { EmpireBaseAbi, ErrorsAbi, RollupAbi } from '@aztec/l1-artifacts';
+import { encodeSlashConsensusVotes } from '@aztec/slasher';
+import { CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
 import { getTelemetryClient } from '@aztec/telemetry-client';
-import pick from 'lodash.pick';
-import { encodeFunctionData } from 'viem';
+import { encodeFunctionData, toHex } from 'viem';
 import { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js';
-export var VoteType = /*#__PURE__*/ function(VoteType) {
-    VoteType[VoteType["GOVERNANCE"] = 0] = "GOVERNANCE";
-    VoteType[VoteType["SLASHING"] = 1] = "SLASHING";
-    return VoteType;
-}({});
+export const Actions = [
+    'invalidate-by-invalid-attestation',
+    'invalidate-by-insufficient-attestations',
+    'propose',
+    'governance-signal',
+    'empire-slashing-signal',
+    'create-empire-payload',
+    'execute-empire-payload',
+    'vote-offenses',
+    'execute-slash'
+];
+// Sorting for actions such that invalidations go before proposals, and proposals go before votes
+export const compareActions = (a, b)=>Actions.indexOf(a) - Actions.indexOf(b);
 export class SequencerPublisher {
-    interrupted = false;
+    config;
+    interrupted;
     metrics;
     epochCache;
-    forwarderContract;
-    governanceLog = createLogger('sequencer:publisher:governance');
-    governanceProposerAddress;
-    governancePayload = EthAddress.ZERO;
-    slashingLog = createLogger('sequencer:publisher:slashing');
-    slashingProposerAddress;
-    getSlashPayload = undefined;
-    myLastVotes = {
-        [0]: 0n,
-        [1]: 0n
-    };
-    log = createLogger('sequencer:publisher');
+    governanceLog;
+    slashingLog;
+    lastActions;
+    isPayloadEmptyCache;
+    log;
     ethereumSlotDuration;
-    blobSinkClient;
+    blobClient;
+    /** Address to use for simulations in fisherman mode (actual proposer's address) */ proposerAddressForSimulation;
+    /** L1 fee analyzer for fisherman mode */ l1FeeAnalyzer;
     // @note - with blobs, the below estimate seems too large.
     // Total used for full block from int_l1_pub e2e test: 1m (of which 86k is 1x blob)
     // Total used for emptier block from above test: 429k (of which 84k is 1x blob)
     static PROPOSE_GAS_GUESS = 12_000_000n;
+    // A CALL to a cold address is 2700 gas
+    static MULTICALL_OVERHEAD_GAS_GUESS = 5000n;
+    // Gas report for VotingWithSigTest shows a max gas of 100k, but we've seen it cost 700k+ in testnet
+    static VOTE_GAS_GUESS = 800_000n;
     l1TxUtils;
     rollupContract;
     govProposerContract;
     slashingProposerContract;
-    requests = [];
+    slashFactoryContract;
+    requests;
     constructor(config, deps){
+        this.config = config;
+        this.interrupted = false;
+        this.governanceLog = createLogger('sequencer:publisher:governance');
+        this.slashingLog = createLogger('sequencer:publisher:slashing');
+        this.lastActions = {};
+        this.isPayloadEmptyCache = new Map();
+        this.requests = [];
+        this.log = deps.log ?? createLogger('sequencer:publisher');
         this.ethereumSlotDuration = BigInt(config.ethereumSlotDuration);
         this.epochCache = deps.epochCache;
-        this.blobSinkClient = deps.blobSinkClient ?? createBlobSinkClient(config);
+        this.lastActions = deps.lastActions;
+        this.blobClient = deps.blobClient ?? createBlobClient(config, {
+            logger: createLogger('sequencer:blob-client:client')
+        });
         const telemetry = deps.telemetry ?? getTelemetryClient();
-        this.metrics = new SequencerPublisherMetrics(telemetry, 'SequencerPublisher');
+        this.metrics = deps.metrics ?? new SequencerPublisherMetrics(telemetry, 'SequencerPublisher');
         this.l1TxUtils = deps.l1TxUtils;
         this.rollupContract = deps.rollupContract;
-        this.forwarderContract = deps.forwarderContract;
         this.govProposerContract = deps.governanceProposerContract;
         this.slashingProposerContract = deps.slashingProposerContract;
+        this.rollupContract.listenToSlasherChanged(async ()=>{
+            this.log.info('Slashing proposer changed');
+            const newSlashingProposer = await this.rollupContract.getSlashingProposer();
+            this.slashingProposerContract = newSlashingProposer;
+        });
+        this.slashFactoryContract = deps.slashFactoryContract;
+        // Initialize L1 fee analyzer for fisherman mode
+        if (config.fishermanMode) {
+            this.l1FeeAnalyzer = new L1FeeAnalyzer(this.l1TxUtils.client, deps.dateProvider, createLogger('sequencer:publisher:fee-analyzer'));
+        }
     }
-    registerSlashPayloadGetter(callback) {
-        this.getSlashPayload = callback;
-    }
-    getForwarderAddress() {
-        return EthAddress.fromString(this.forwarderContract.getAddress());
+    getRollupContract() {
+        return this.rollupContract;
     }
     getSenderAddress() {
-        return EthAddress.fromString(this.l1TxUtils.getSenderAddress());
+        return this.l1TxUtils.getSenderAddress();
     }
-    getGovernancePayload() {
-        return this.governancePayload;
+    /**
+   * Gets the L1 fee analyzer instance (only available in fisherman mode)
+   */ getL1FeeAnalyzer() {
+        return this.l1FeeAnalyzer;
     }
-    setGovernancePayload(payload) {
-        this.governancePayload = payload;
+    /**
+   * Sets the proposer address to use for simulations in fisherman mode.
+   * @param proposerAddress - The actual proposer's address to use for balance lookups in simulations
+   */ setProposerAddressForSimulation(proposerAddress) {
+        this.proposerAddressForSimulation = proposerAddress;
     }
     addRequest(request) {
         this.requests.push(request);
@@ -77,6 +116,55 @@ export class SequencerPublisher {
         return this.epochCache.getEpochAndSlotNow().slot;
     }
     /**
+   * Clears all pending requests without sending them.
+   */ clearPendingRequests() {
+        const count = this.requests.length;
+        this.requests = [];
+        if (count > 0) {
+            this.log.debug(`Cleared ${count} pending request(s)`);
+        }
+    }
+    /**
+   * Analyzes L1 fees for the pending requests without sending them.
+   * This is used in fisherman mode to validate fee calculations.
+   * @param l2SlotNumber - The L2 slot number for this analysis
+   * @param onComplete - Optional callback to invoke when analysis completes (after block is mined)
+   * @returns The analysis result (incomplete until block mines), or undefined if no requests
+   */ async analyzeL1Fees(l2SlotNumber, onComplete) {
+        if (!this.l1FeeAnalyzer) {
+            this.log.warn('L1 fee analyzer not available (not in fisherman mode)');
+            return undefined;
+        }
+        const requestsToAnalyze = [
+            ...this.requests
+        ];
+        if (requestsToAnalyze.length === 0) {
+            this.log.debug('No requests to analyze for L1 fees');
+            return undefined;
+        }
+        // Extract blob config from requests (if any)
+        const blobConfigs = requestsToAnalyze.filter((request)=>request.blobConfig).map((request)=>request.blobConfig);
+        const blobConfig = blobConfigs[0];
+        // Get gas configs
+        const gasConfigs = requestsToAnalyze.filter((request)=>request.gasConfig).map((request)=>request.gasConfig);
+        const gasLimits = gasConfigs.map((g)=>g?.gasLimit).filter((g)=>g !== undefined);
+        const gasLimit = gasLimits.length > 0 ? gasLimits.reduce((sum, g)=>sum + g, 0n) : 0n;
+        // Get the transaction requests
+        const l1Requests = requestsToAnalyze.map((r)=>r.request);
+        // Start the analysis
+        const analysisId = await this.l1FeeAnalyzer.startAnalysis(l2SlotNumber, gasLimit > 0n ? gasLimit : SequencerPublisher.PROPOSE_GAS_GUESS, l1Requests, blobConfig, onComplete);
+        this.log.info('Started L1 fee analysis', {
+            analysisId,
+            l2SlotNumber: l2SlotNumber.toString(),
+            requestCount: requestsToAnalyze.length,
+            hasBlobConfig: !!blobConfig,
+            gasLimit: gasLimit.toString(),
+            actions: requestsToAnalyze.map((r)=>r.action)
+        });
+        // Return the analysis result (will be incomplete until block mines)
+        return this.l1FeeAnalyzer.getAnalysis(analysisId);
+    }
+    /**
    * Sends all requests that are still valid.
    * @returns one of:
    * - A receipt and stats if the tx succeeded
@@ -87,12 +175,14 @@ export class SequencerPublisher {
             ...this.requests
         ];
         this.requests = [];
-        if (this.interrupted) {
+        if (this.interrupted || requestsToProcess.length === 0) {
             return undefined;
         }
         const currentL2Slot = this.getCurrentL2Slot();
-        this.log.debug(`Current L2 slot: ${currentL2Slot}`);
+        this.log.debug(`Sending requests on L2 slot ${currentL2Slot}`);
         const validRequests = requestsToProcess.filter((request)=>request.lastValidL2Slot >= currentL2Slot);
+        const validActions = validRequests.map((x)=>x.action);
+        const expiredActions = requestsToProcess.filter((request)=>request.lastValidL2Slot < currentL2Slot).map((x)=>x.action);
         if (validRequests.length !== requestsToProcess.length) {
             this.log.warn(`Some requests were expired for slot ${currentL2Slot}`, {
                 validRequests: validRequests.map((request)=>({
@@ -109,56 +199,98 @@ export class SequencerPublisher {
             this.log.debug(`No valid requests to send`);
             return undefined;
         }
-        // @note - we can only have one gas config and one blob config per bundle
+        // @note - we can only have one blob config per bundle
         // find requests with gas and blob configs
         // See https://github.com/AztecProtocol/aztec-packages/issues/11513
-        const gasConfigs = requestsToProcess.filter((request)=>request.gasConfig);
-        const blobConfigs = requestsToProcess.filter((request)=>request.blobConfig);
-        if (gasConfigs.length > 1 || blobConfigs.length > 1) {
-            throw new Error('Multiple gas or blob configs found');
+        const gasConfigs = requestsToProcess.filter((request)=>request.gasConfig).map((request)=>request.gasConfig);
+        const blobConfigs = requestsToProcess.filter((request)=>request.blobConfig).map((request)=>request.blobConfig);
+        if (blobConfigs.length > 1) {
+            throw new Error('Multiple blob configs found');
         }
-        const gasConfig = gasConfigs[0]?.gasConfig;
-        const blobConfig = blobConfigs[0]?.blobConfig;
+        const blobConfig = blobConfigs[0];
+        // Merge gasConfigs. Yields the sum of gasLimits, and the earliest txTimeoutAt, or undefined if no gasConfig sets them.
+        const gasLimits = gasConfigs.map((g)=>g?.gasLimit).filter((g)=>g !== undefined);
+        const gasLimit = gasLimits.length > 0 ? sumBigint(gasLimits) : undefined; // sum
+        const txTimeoutAts = gasConfigs.map((g)=>g?.txTimeoutAt).filter((g)=>g !== undefined);
+        const txTimeoutAt = txTimeoutAts.length > 0 ? new Date(Math.min(...txTimeoutAts.map((g)=>g.getTime()))) : undefined; // earliest
+        const txConfig = {
+            gasLimit,
+            txTimeoutAt
+        };
+        // Sort the requests so that proposals always go first
+        // This ensures the committee gets precomputed correctly
+        validRequests.sort((a, b)=>compareActions(a.action, b.action));
         try {
             this.log.debug('Forwarding transactions', {
-                validRequests: validRequests.map((request)=>request.action)
+                validRequests: validRequests.map((request)=>request.action),
+                txConfig
             });
-            const result = await this.forwarderContract.forward(validRequests.map((request)=>request.request), this.l1TxUtils, gasConfig, blobConfig, this.log);
-            this.callbackBundledTransactions(validRequests, result);
-            return result;
+            const result = await Multicall3.forward(validRequests.map((request)=>request.request), this.l1TxUtils, txConfig, blobConfig, this.rollupContract.address, this.log);
+            const { successfulActions = [], failedActions = [] } = this.callbackBundledTransactions(validRequests, result);
+            return {
+                result,
+                expiredActions,
+                sentActions: validActions,
+                successfulActions,
+                failedActions
+            };
         } catch (err) {
             const viemError = formatViemError(err);
             this.log.error(`Failed to publish bundled transactions`, viemError);
             return undefined;
         } finally{
             try {
-                this.metrics.recordSenderBalance(await this.l1TxUtils.getSenderBalance(), this.l1TxUtils.getSenderAddress());
+                this.metrics.recordSenderBalance(await this.l1TxUtils.getSenderBalance(), this.l1TxUtils.getSenderAddress().toString());
             } catch (err) {
                 this.log.warn(`Failed to record balance after sending tx: ${err}`);
             }
         }
     }
     callbackBundledTransactions(requests, result) {
-        const success = result?.receipt.status === 'success';
-        const logger = success ? this.log.info : this.log.error;
-        for (const request of requests){
-            logger(`Bundled [${request.action}] transaction [${success ? 'succeeded' : 'failed'}]`);
-            request.onResult?.(request.request, result);
+        const actionsListStr = requests.map((r)=>r.action).join(', ');
+        if (result instanceof FormattedViemError) {
+            this.log.error(`Failed to publish bundled transactions (${actionsListStr})`, result);
+            return {
+                failedActions: requests.map((r)=>r.action)
+            };
+        } else {
+            this.log.verbose(`Published bundled transactions (${actionsListStr})`, {
+                result,
+                requests
+            });
+            const successfulActions = [];
+            const failedActions = [];
+            for (const request of requests){
+                if (request.checkSuccess(request.request, result)) {
+                    successfulActions.push(request.action);
+                } else {
+                    failedActions.push(request.action);
+                }
+            }
+            return {
+                successfulActions,
+                failedActions
+            };
         }
     }
     /**
    * @notice  Will call `canProposeAtNextEthBlock` to make sure that it is possible to propose
    * @param tipArchive - The archive to check
    * @returns The slot and block number if it is possible to propose, undefined otherwise
-   */ canProposeAtNextEthBlock(tipArchive) {
+   */ canProposeAtNextEthBlock(tipArchive, msgSender, opts = {}) {
+        // TODO: #14291 - should loop through multiple keys to check if any of them can propose
         const ignoredErrors = [
             'SlotAlreadyInChain',
             'InvalidProposer',
             'InvalidArchive'
         ];
-        return this.rollupContract.canProposeAtNextEthBlock(tipArchive, this.getForwarderAddress().toString(), this.ethereumSlotDuration).catch((err)=>{
+        return this.rollupContract.canProposeAtNextEthBlock(tipArchive.toBuffer(), msgSender.toString(), Number(this.ethereumSlotDuration), {
+            forcePendingCheckpointNumber: opts.forcePendingBlockNumber !== undefined ? CheckpointNumber.fromBlockNumber(opts.forcePendingBlockNumber) : undefined
+        }).catch((err)=>{
             if (err instanceof FormattedViemError && ignoredErrors.find((e)=>err.message.includes(e))) {
-                this.log.debug(err.message);
+                this.log.warn(`Failed canProposeAtTime check with ${ignoredErrors.find((e)=>err.message.includes(e))}`, {
+                    error: err.message
+                });
             } else {
                 this.log.error(err.name, err);
             }
@@ -166,135 +298,483 @@ export class SequencerPublisher {
         });
     }
     /**
-   * @notice  Will call `validateHeader` to make sure that it is possible to propose
-   *
-   * @dev     Throws if unable to propose
-   *
-   * @param header - The header to propose
-   * @param digest - The digest that attestations are signing over
-   *
-   */ async validateBlockForSubmission(header, attestationData = {
-        digest: Buffer.alloc(32),
-        signatures: []
-    }) {
-        const ts = BigInt((await this.l1TxUtils.getBlock()).timestamp + this.ethereumSlotDuration);
-        const formattedSignatures = attestationData.signatures.map((attest)=>attest.toViemSignature());
+   * @notice  Will simulate `validateHeader` to make sure that the block header is valid
+   * @dev     This is a convenience function that can be used by the sequencer to validate a "partial" header.
+   *          It will throw if the block header is invalid.
+   * @param header - The block header to validate
+   */ async validateBlockHeader(header, opts) {
         const flags = {
             ignoreDA: true,
-            ignoreSignatures: formattedSignatures.length == 0
+            ignoreSignatures: true
         };
         const args = [
-            `0x${header.toBuffer().toString('hex')}`,
-            formattedSignatures,
-            `0x${attestationData.digest.toString('hex')}`,
-            ts,
-            `0x${header.contentCommitment.blobsHash.toString('hex')}`,
+            header.toViem(),
+            CommitteeAttestationsAndSigners.empty().getPackedAttestations(),
+            [],
+            Signature.empty().toViemSignature(),
+            `0x${'0'.repeat(64)}`,
+            header.contentCommitment.blobsHash.toString(),
             flags
         ];
-        await this.rollupContract.validateHeader(args, this.getForwarderAddress().toString());
-        return ts;
+        const ts = BigInt((await this.l1TxUtils.getBlock()).timestamp + this.ethereumSlotDuration);
+        const optsForcePendingCheckpointNumber = opts?.forcePendingBlockNumber !== undefined ? CheckpointNumber.fromBlockNumber(opts.forcePendingBlockNumber) : undefined;
+        const stateOverrides = await this.rollupContract.makePendingCheckpointNumberOverride(optsForcePendingCheckpointNumber);
+        let balance = 0n;
+        if (this.config.fishermanMode) {
+            // In fisherman mode, we can't know where the proposer is publishing from
+            // so we just add sufficient balance to the multicall3 address
+            balance = 10n * WEI_CONST * WEI_CONST; // 10 ETH
+        } else {
+            balance = await this.l1TxUtils.getSenderBalance();
+        }
+        stateOverrides.push({
+            address: MULTI_CALL_3_ADDRESS,
+            balance
+        });
+        await this.l1TxUtils.simulate({
+            to: this.rollupContract.address,
+            data: encodeFunctionData({
+                abi: RollupAbi,
+                functionName: 'validateHeaderWithAttestations',
+                args
+            }),
+            from: MULTI_CALL_3_ADDRESS
+        }, {
+            time: ts + 1n
+        }, stateOverrides);
+        this.log.debug(`Simulated validateHeader`);
+    }
+    /**
+   * Simulate making a call to invalidate a block with invalid attestations. Returns undefined if no need to invalidate.
+   * @param block - The block to invalidate and the criteria for invalidation (as returned by the archiver)
+   */ async simulateInvalidateBlock(validationResult) {
+        if (validationResult.valid) {
+            return undefined;
+        }
+        const { reason, block } = validationResult;
+        const blockNumber = block.blockNumber;
+        const logData = {
+            ...block,
+            reason
+        };
+        const currentBlockNumber = await this.rollupContract.getCheckpointNumber();
+        if (currentBlockNumber < validationResult.block.blockNumber) {
+            this.log.verbose(`Skipping block ${blockNumber} invalidation since it has already been removed from the pending chain`, {
+                currentBlockNumber,
+                ...logData
+            });
+            return undefined;
+        }
+        const request = this.buildInvalidateBlockRequest(validationResult);
+        this.log.debug(`Simulating invalidate block ${blockNumber}`, {
+            ...logData,
+            request
+        });
+        try {
+            const { gasUsed } = await this.l1TxUtils.simulate(request, undefined, undefined, ErrorsAbi);
+            this.log.verbose(`Simulation for invalidate block ${blockNumber} succeeded`, {
+                ...logData,
+                request,
+                gasUsed
+            });
+            return {
+                request,
+                gasUsed,
+                blockNumber,
+                forcePendingBlockNumber: BlockNumber(blockNumber - 1),
+                reason
+            };
+        } catch (err) {
+            const viemError = formatViemError(err);
+            // If the error is due to the block not being in the pending chain, and it was indeed removed by someone else,
+            // we can safely ignore it and return undefined so we go ahead with block building.
+            if (viemError.message?.includes('Rollup__BlockNotInPendingChain')) {
+                this.log.verbose(`Simulation for invalidate block ${blockNumber} failed due to block not being in pending chain`, {
+                    ...logData,
+                    request,
+                    error: viemError.message
+                });
+                const latestPendingBlockNumber = await this.rollupContract.getCheckpointNumber();
+                if (latestPendingBlockNumber < blockNumber) {
+                    this.log.verbose(`Block number ${blockNumber} has already been invalidated`, {
+                        ...logData
+                    });
+                    return undefined;
+                } else {
+                    this.log.error(`Simulation for invalidate ${blockNumber} failed and it is still in pending chain`, viemError, logData);
+                    throw new Error(`Failed to simulate invalidate block ${blockNumber} while it is still in pending chain`, {
+                        cause: viemError
+                    });
+                }
+            }
+            // Otherwise, throw. We cannot build the next block if we cannot invalidate the previous one.
+            this.log.error(`Simulation for invalidate block ${blockNumber} failed`, viemError, logData);
+            throw new Error(`Failed to simulate invalidate block ${blockNumber}`, {
+                cause: viemError
+            });
+        }
+    }
+    buildInvalidateBlockRequest(validationResult) {
+        if (validationResult.valid) {
+            throw new Error('Cannot invalidate a valid block');
+        }
+        const { block, committee, reason } = validationResult;
+        const logData = {
+            ...block,
+            reason
+        };
+        this.log.debug(`Simulating invalidate block ${block.blockNumber}`, logData);
+        const attestationsAndSigners = new CommitteeAttestationsAndSigners(validationResult.attestations).getPackedAttestations();
+        if (reason === 'invalid-attestation') {
+            return this.rollupContract.buildInvalidateBadAttestationRequest(CheckpointNumber.fromBlockNumber(block.blockNumber), attestationsAndSigners, committee, validationResult.invalidIndex);
+        } else if (reason === 'insufficient-attestations') {
+            return this.rollupContract.buildInvalidateInsufficientAttestationsRequest(CheckpointNumber.fromBlockNumber(block.blockNumber), attestationsAndSigners, committee);
+        } else {
+            const _ = reason;
+            throw new Error(`Unknown reason for invalidation`);
+        }
     }
-    async getCurrentEpochCommittee() {
-        const committee = await this.rollupContract.getCurrentEpochCommittee();
-        return committee.map(EthAddress.fromString);
+    /** Simulates `propose` to make sure that the checkpoint is valid for submission */ async validateCheckpointForSubmission(checkpoint, attestationsAndSigners, attestationsAndSignersSignature, options) {
+        const ts = BigInt((await this.l1TxUtils.getBlock()).timestamp + this.ethereumSlotDuration);
+        // TODO(palla/mbps): This should not be needed, there's no flow where we propose with zero attestations. Or is there?
+        // If we have no attestations, we still need to provide the empty attestations
+        // so that the committee is recalculated correctly
+        // const ignoreSignatures = attestationsAndSigners.attestations.length === 0;
+        // if (ignoreSignatures) {
+        //   const { committee } = await this.epochCache.getCommittee(block.header.globalVariables.slotNumber);
+        //   if (!committee) {
+        //     this.log.warn(`No committee found for slot ${block.header.globalVariables.slotNumber}`);
+        //     throw new Error(`No committee found for slot ${block.header.globalVariables.slotNumber}`);
+        //   }
+        //   attestationsAndSigners.attestations = committee.map(committeeMember =>
+        //     CommitteeAttestation.fromAddress(committeeMember),
+        //   );
+        // }
+        const blobFields = checkpoint.toBlobFields();
+        const blobs = getBlobsPerL1Block(blobFields);
+        const blobInput = getPrefixedEthBlobCommitments(blobs);
+        const args = [
+            {
+                header: checkpoint.header.toViem(),
+                archive: toHex(checkpoint.archive.root.toBuffer()),
+                oracleInput: {
+                    feeAssetPriceModifier: 0n
+                }
+            },
+            attestationsAndSigners.getPackedAttestations(),
+            attestationsAndSigners.getSigners().map((signer)=>signer.toString()),
+            attestationsAndSignersSignature.toViemSignature(),
+            blobInput
+        ];
+        await this.simulateProposeTx(args, ts, options);
+        return ts;
     }
-    async enqueueCastVoteHelper(slotNumber, timestamp, voteType, payload, base) {
-        if (this.myLastVotes[voteType] >= slotNumber) {
+    async enqueueCastSignalHelper(slotNumber, timestamp, signalType, payload, base, signerAddress, signer) {
+        if (this.lastActions[signalType] && this.lastActions[signalType] === slotNumber) {
+            this.log.debug(`Skipping duplicate vote cast signal ${signalType} for slot ${slotNumber}`);
             return false;
         }
         if (payload.equals(EthAddress.ZERO)) {
             return false;
         }
+        if (signerAddress.equals(EthAddress.ZERO)) {
+            this.log.warn(`Cannot enqueue vote cast signal ${signalType} for address zero at slot ${slotNumber}`);
+            return false;
+        }
         const round = await base.computeRound(slotNumber);
-        const [proposer, roundInfo] = await Promise.all([
-            this.rollupContract.getProposerAt(timestamp),
-            base.getRoundInfo(this.rollupContract.address, round)
-        ]);
-        if (proposer.toLowerCase() !== this.getForwarderAddress().toString().toLowerCase()) {
+        const roundInfo = await base.getRoundInfo(this.rollupContract.address, round);
+        if (roundInfo.quorumReached) {
+            return false;
+        }
+        if (roundInfo.lastSignalSlot >= slotNumber) {
             return false;
         }
-        if (roundInfo.lastVote >= slotNumber) {
+        if (await this.isPayloadEmpty(payload)) {
+            this.log.warn(`Skipping vote cast for payload with empty code`);
             return false;
         }
-        const cachedLastVote = this.myLastVotes[voteType];
-        this.myLastVotes[voteType] = slotNumber;
+        const cachedLastVote = this.lastActions[signalType];
+        this.lastActions[signalType] = slotNumber;
+        const action = signalType;
+        const request = await base.createSignalRequestWithSignature(payload.toString(), slotNumber, this.config.l1ChainId, signerAddress.toString(), signer);
+        this.log.debug(`Created ${action} request with signature`, {
+            request,
+            round,
+            signer: this.l1TxUtils.client.account?.address,
+            lastValidL2Slot: slotNumber
+        });
+        try {
+            await this.l1TxUtils.simulate(request, {
+                time: timestamp
+            }, [], ErrorsAbi);
+            this.log.debug(`Simulation for ${action} at slot ${slotNumber} succeeded`, {
+                request
+            });
+        } catch (err) {
+            this.log.error(`Failed simulation for ${action} at slot ${slotNumber} (enqueuing the action anyway)`, err);
+        // Yes, we enqueue the request anyway, in case there was a bug with the simulation itself
+        }
+        // TODO(palla/slash): All votes (governance and slashing) should txTimeoutAt at the end of the slot.
         this.addRequest({
-            action: voteType === 0 ? 'governance-vote' : 'slashing-vote',
-            request: base.createVoteRequest(payload.toString()),
+            gasConfig: {
+                gasLimit: SequencerPublisher.VOTE_GAS_GUESS
+            },
+            action,
+            request,
             lastValidL2Slot: slotNumber,
-            onResult: (_request, result)=>{
-                if (!result || result.receipt.status !== 'success') {
-                    this.myLastVotes[voteType] = cachedLastVote;
+            checkSuccess: (_request, result)=>{
+                const success = result && result.receipt && result.receipt.status === 'success' && tryExtractEvent(result.receipt.logs, base.address.toString(), EmpireBaseAbi, 'SignalCast');
+                const logData = {
+                    ...result,
+                    slotNumber,
+                    round,
+                    payload: payload.toString()
+                };
+                if (!success) {
+                    this.log.error(`Signaling in ${action} for ${payload} at slot ${slotNumber} in round ${round} failed`, logData);
+                    this.lastActions[signalType] = cachedLastVote;
+                    return false;
                 } else {
-                    this.log.info(`Cast [${voteType}] vote for slot ${slotNumber}`);
+                    this.log.info(`Signaling in ${action} for ${payload} at slot ${slotNumber} in round ${round} succeeded`, logData);
+                    return true;
                 }
             }
         });
         return true;
     }
-    async getVoteConfig(slotNumber, voteType) {
-        if (voteType === 0) {
-            return {
-                payload: this.governancePayload,
-                base: this.govProposerContract
-            };
-        } else if (voteType === 1) {
-            if (!this.getSlashPayload) {
-                return undefined;
-            }
-            const slashPayload = await this.getSlashPayload(slotNumber);
-            if (!slashPayload) {
-                return undefined;
-            }
-            return {
-                payload: slashPayload,
-                base: this.slashingProposerContract
-            };
+    async isPayloadEmpty(payload) {
+        const key = payload.toString();
+        const cached = this.isPayloadEmptyCache.get(key);
+        if (cached) {
+            return cached;
         }
-        throw new Error('Unreachable: Invalid vote type');
+        const isEmpty = !await this.l1TxUtils.getCode(payload);
+        this.isPayloadEmptyCache.set(key, isEmpty);
+        return isEmpty;
     }
     /**
-   * Enqueues a castVote transaction to cast a vote for a given slot number.
-   * @param slotNumber - The slot number to cast a vote for.
-   * @param timestamp - The timestamp of the slot to cast a vote for.
-   * @param voteType - The type of vote to cast.
-   * @returns True if the vote was successfully enqueued, false otherwise.
-   */ async enqueueCastVote(slotNumber, timestamp, voteType) {
-        const voteConfig = await this.getVoteConfig(slotNumber, voteType);
-        if (!voteConfig) {
+   * Enqueues a governance castSignal transaction to cast a signal for a given slot number.
+   * @param slotNumber - The slot number to cast a signal for.
+   * @param timestamp - The timestamp of the slot to cast a signal for.
+   * @returns True if the signal was successfully enqueued, false otherwise.
+   */ enqueueGovernanceCastSignal(governancePayload, slotNumber, timestamp, signerAddress, signer) {
+        return this.enqueueCastSignalHelper(slotNumber, timestamp, 'governance-signal', governancePayload, this.govProposerContract, signerAddress, signer);
+    }
+    /** Enqueues all slashing actions as returned by the slasher client. */ async enqueueSlashingActions(actions, slotNumber, timestamp, signerAddress, signer) {
+        if (actions.length === 0) {
+            this.log.debug(`No slashing actions to enqueue for slot ${slotNumber}`);
             return false;
         }
-        const { payload, base } = voteConfig;
-        return this.enqueueCastVoteHelper(slotNumber, timestamp, voteType, payload, base);
+        for (const action of actions){
+            switch(action.type){
+                case 'vote-empire-payload':
+                    {
+                        if (this.slashingProposerContract?.type !== 'empire') {
+                            this.log.error('Cannot vote for empire payload on non-empire slashing contract');
+                            break;
+                        }
+                        this.log.debug(`Enqueuing slashing vote for payload ${action.payload} at slot ${slotNumber}`, {
+                            signerAddress
+                        });
+                        await this.enqueueCastSignalHelper(slotNumber, timestamp, 'empire-slashing-signal', action.payload, this.slashingProposerContract, signerAddress, signer);
+                        break;
+                    }
+                case 'create-empire-payload':
+                    {
+                        this.log.debug(`Enqueuing slashing create payload at slot ${slotNumber}`, {
+                            slotNumber,
+                            signerAddress
+                        });
+                        const request = this.slashFactoryContract.buildCreatePayloadRequest(action.data);
+                        await this.simulateAndEnqueueRequest('create-empire-payload', request, (receipt)=>!!this.slashFactoryContract.tryExtractSlashPayloadCreatedEvent(receipt.logs), slotNumber, timestamp);
+                        break;
+                    }
+                case 'execute-empire-payload':
+                    {
+                        this.log.debug(`Enqueuing slashing execute payload at slot ${slotNumber}`, {
+                            slotNumber,
+                            signerAddress
+                        });
+                        if (this.slashingProposerContract?.type !== 'empire') {
+                            this.log.error('Cannot execute slashing payload on non-empire slashing contract');
+                            return false;
+                        }
+                        const empireSlashingProposer = this.slashingProposerContract;
+                        const request = empireSlashingProposer.buildExecuteRoundRequest(action.round);
+                        await this.simulateAndEnqueueRequest('execute-empire-payload', request, (receipt)=>!!empireSlashingProposer.tryExtractPayloadSubmittedEvent(receipt.logs), slotNumber, timestamp);
+                        break;
+                    }
+                case 'vote-offenses':
+                    {
+                        this.log.debug(`Enqueuing slashing vote for ${action.votes.length} votes at slot ${slotNumber}`, {
+                            slotNumber,
+                            round: action.round,
+                            votesCount: action.votes.length,
+                            signerAddress
+                        });
+                        if (this.slashingProposerContract?.type !== 'tally') {
+                            this.log.error('Cannot vote for slashing offenses on non-tally slashing contract');
+                            return false;
+                        }
+                        const tallySlashingProposer = this.slashingProposerContract;
+                        const votes = bufferToHex(encodeSlashConsensusVotes(action.votes));
+                        const request = await tallySlashingProposer.buildVoteRequestFromSigner(votes, slotNumber, signer);
+                        await this.simulateAndEnqueueRequest('vote-offenses', request, (receipt)=>!!tallySlashingProposer.tryExtractVoteCastEvent(receipt.logs), slotNumber, timestamp);
+                        break;
+                    }
+                case 'execute-slash':
+                    {
+                        this.log.debug(`Enqueuing slash execution for round ${action.round} at slot ${slotNumber}`, {
+                            slotNumber,
+                            round: action.round,
+                            signerAddress
+                        });
+                        if (this.slashingProposerContract?.type !== 'tally') {
+                            this.log.error('Cannot execute slashing offenses on non-tally slashing contract');
+                            return false;
+                        }
+                        const tallySlashingProposer = this.slashingProposerContract;
+                        const request = tallySlashingProposer.buildExecuteRoundRequest(action.round, action.committees);
+                        await this.simulateAndEnqueueRequest('execute-slash', request, (receipt)=>!!tallySlashingProposer.tryExtractRoundExecutedEvent(receipt.logs), slotNumber, timestamp);
+                        break;
+                    }
+                default:
+                    {
+                        const _ = action;
+                        throw new Error(`Unknown slashing action type: ${action.type}`);
+                    }
+            }
+        }
+        return true;
     }
-    /**
-   * Proposes a L2 block on L1.
-   *
-   * @param block - L2 block to propose.
-   * @returns True if the tx has been enqueued, throws otherwise. See #9315
-   */ async enqueueProposeL2Block(block, attestations, txHashes, opts = {}) {
-        const consensusPayload = new ConsensusPayload(block.header, block.archive.root, txHashes ?? []);
-        const digest = await getHashedSignaturePayload(consensusPayload, SignatureDomainSeparator.blockAttestation);
-        const blobs = await Blob.getBlobs(block.body.toBlobFields());
+    /** Simulates and enqueues a proposal for a checkpoint on L1 */ async enqueueProposeCheckpoint(checkpoint, attestationsAndSigners, attestationsAndSignersSignature, opts = {}) {
+        const checkpointHeader = checkpoint.header;
+        const blobFields = checkpoint.toBlobFields();
+        const blobs = getBlobsPerL1Block(blobFields);
         const proposeTxArgs = {
-            header: block.header.toBuffer(),
-            archive: block.archive.root.toBuffer(),
-            blockHash: (await block.header.hash()).toBuffer(),
-            body: block.body.toBuffer(),
+            header: checkpointHeader,
+            archive: checkpoint.archive.root.toBuffer(),
             blobs,
-            attestations,
-            txHashes: txHashes ?? []
+            attestationsAndSigners,
+            attestationsAndSignersSignature
+        };
+        let ts;
+        try {
+            // @note  This will make sure that we are passing the checks for our header ASSUMING that the data is also made available
+            //        This means that we can avoid the simulation issues in later checks.
+            //        By simulation issue, I mean the fact that the block.timestamp is equal to the last block, not the next, which
+            //        make time consistency checks break.
+            // TODO(palla): Check whether we're validating twice, once here and once within addProposeTx, since we call simulateProposeTx in both places.
+            ts = await this.validateCheckpointForSubmission(checkpoint, attestationsAndSigners, attestationsAndSignersSignature, opts);
+        } catch (err) {
+            this.log.error(`Checkpoint validation failed. ${err instanceof Error ? err.message : 'No error message'}`, err, {
+                ...checkpoint.getStats(),
+                slotNumber: checkpoint.header.slotNumber,
+                forcePendingBlockNumber: opts.forcePendingBlockNumber
+            });
+            throw err;
+        }
+        this.log.verbose(`Enqueuing checkpoint propose transaction`, {
+            ...checkpoint.toCheckpointInfo(),
+            ...opts
+        });
+        await this.addProposeTx(checkpoint, proposeTxArgs, opts, ts);
+    }
+    enqueueInvalidateBlock(request, opts = {}) {
+        if (!request) {
+            return;
+        }
+        // We issued the simulation against the rollup contract, so we need to account for the overhead of the multicall3
+        const gasLimit = this.l1TxUtils.bumpGasLimit(BigInt(Math.ceil(Number(request.gasUsed) * 64 / 63)));
+        const { gasUsed, blockNumber } = request;
+        const logData = {
+            gasUsed,
+            blockNumber,
+            gasLimit,
+            opts
+        };
+        this.log.verbose(`Enqueuing invalidate block request`, logData);
+        this.addRequest({
+            action: `invalidate-by-${request.reason}`,
+            request: request.request,
+            gasConfig: {
+                gasLimit,
+                txTimeoutAt: opts.txTimeoutAt
+            },
+            lastValidL2Slot: SlotNumber(this.getCurrentL2Slot() + 2),
+            checkSuccess: (_req, result)=>{
+                const success = result && result.receipt && result.receipt.status === 'success' && tryExtractEvent(result.receipt.logs, this.rollupContract.address, RollupAbi, 'CheckpointInvalidated');
+                if (!success) {
+                    this.log.warn(`Invalidate block ${request.blockNumber} failed`, {
+                        ...result,
+                        ...logData
+                    });
+                } else {
+                    this.log.info(`Invalidate block ${request.blockNumber} succeeded`, {
+                        ...result,
+                        ...logData
+                    });
+                }
+                return !!success;
+            }
+        });
+    }
+    async simulateAndEnqueueRequest(action, request, checkSuccess, slotNumber, timestamp) {
+        const logData = {
+            slotNumber,
+            timestamp,
+            gasLimit: undefined
         };
-        // @note  This will make sure that we are passing the checks for our header ASSUMING that the data is also made available
-        //        This means that we can avoid the simulation issues in later checks.
-        //        By simulation issue, I mean the fact that the block.timestamp is equal to the last block, not the next, which
-        //        make time consistency checks break.
-        const ts = await this.validateBlockForSubmission(block.header, {
-            digest: digest.toBuffer(),
-            signatures: attestations ?? []
+        if (this.lastActions[action] && this.lastActions[action] === slotNumber) {
+            this.log.debug(`Skipping duplicate action ${action} for slot ${slotNumber}`);
+            return false;
+        }
+        const cachedLastActionSlot = this.lastActions[action];
+        this.lastActions[action] = slotNumber;
+        this.log.debug(`Simulating ${action} for slot ${slotNumber}`, logData);
+        let gasUsed;
+        try {
+            ({ gasUsed } = await this.l1TxUtils.simulate(request, {
+                time: timestamp
+            }, [], ErrorsAbi)); // TODO(palla/slash): Check the timestamp logic
+            this.log.verbose(`Simulation for ${action} succeeded`, {
+                ...logData,
+                request,
+                gasUsed
+            });
+        } catch (err) {
+            const viemError = formatViemError(err);
+            this.log.error(`Simulation for ${action} at ${slotNumber} failed`, viemError, logData);
+            return false;
+        }
+        // We issued the simulation against the rollup contract, so we need to account for the overhead of the multicall3
+        const gasLimit = this.l1TxUtils.bumpGasLimit(BigInt(Math.ceil(Number(gasUsed) * 64 / 63)));
+        logData.gasLimit = gasLimit;
+        this.log.debug(`Enqueuing ${action}`, logData);
+        this.addRequest({
+            action,
+            request,
+            gasConfig: {
+                gasLimit
+            },
+            lastValidL2Slot: slotNumber,
+            checkSuccess: (_req, result)=>{
+                const success = result && result.receipt && result.receipt.status === 'success' && checkSuccess(result.receipt);
+                if (!success) {
+                    this.log.warn(`Action ${action} at ${slotNumber} failed`, {
+                        ...result,
+                        ...logData
+                    });
+                    this.lastActions[action] = cachedLastActionSlot;
+                } else {
+                    this.log.info(`Action ${action} at ${slotNumber} succeeded`, {
+                        ...result,
+                        ...logData
+                    });
+                }
+                return !!success;
+            }
         });
-        this.log.debug(`Submitting propose transaction`);
-        await this.addProposeTx(block, proposeTxArgs, opts, ts);
         return true;
     }
     /**
@@ -310,172 +790,199 @@ export class SequencerPublisher {
         this.interrupted = false;
         this.l1TxUtils.restart();
     }
-    async prepareProposeTx(encodedData, timestamp) {
+    async prepareProposeTx(encodedData, timestamp, options) {
         const kzg = Blob.getViemKzgInstance();
-        const blobInput = Blob.getEthBlobEvaluationInputs(encodedData.blobs);
+        const blobInput = getPrefixedEthBlobCommitments(encodedData.blobs);
         this.log.debug('Validating blob input', {
             blobInput
         });
-        const blobEvaluationGas = await this.l1TxUtils.estimateGas(this.l1TxUtils.walletClient.account, {
-            to: this.rollupContract.address,
-            data: encodeFunctionData({
-                abi: RollupAbi,
-                functionName: 'validateBlobs',
-                args: [
-                    blobInput
-                ]
-            })
-        }, {}, {
-            blobs: encodedData.blobs.map((b)=>b.data),
-            kzg
-        }).catch((err)=>{
-            const { message, metaMessages } = formatViemError(err);
-            this.log.error(`Failed to validate blobs`, message, {
-                metaMessages
+        // Get blob evaluation gas
+        let blobEvaluationGas;
+        if (this.config.fishermanMode) {
+            // In fisherman mode, we can't estimate blob gas because estimateGas doesn't support state overrides
+            // Use a fixed estimate.
+            blobEvaluationGas = BigInt(encodedData.blobs.length) * 21_000n;
+            this.log.debug(`Using fixed blob evaluation gas estimate in fisherman mode: ${blobEvaluationGas}`);
+        } else {
+            // Normal mode - use estimateGas with blob inputs
+            blobEvaluationGas = await this.l1TxUtils.estimateGas(this.getSenderAddress().toString(), {
+                to: this.rollupContract.address,
+                data: encodeFunctionData({
+                    abi: RollupAbi,
+                    functionName: 'validateBlobs',
+                    args: [
+                        blobInput
+                    ]
+                })
+            }, {}, {
+                blobs: encodedData.blobs.map((b)=>b.data),
+                kzg
+            }).catch((err)=>{
+                const { message, metaMessages } = formatViemError(err);
+                this.log.error(`Failed to validate blobs`, message, {
+                    metaMessages
+                });
+                throw new Error('Failed to validate blobs');
             });
-            throw new Error('Failed to validate blobs');
-        });
-        const attestations = encodedData.attestations ? encodedData.attestations.map((attest)=>attest.toViemSignature()) : [];
-        const txHashes = encodedData.txHashes ? encodedData.txHashes.map((txHash)=>txHash.toString()) : [];
+        }
+        const signers = encodedData.attestationsAndSigners.getSigners().map((signer)=>signer.toString());
         const args = [
             {
-                header: `0x${encodedData.header.toString('hex')}`,
-                archive: `0x${encodedData.archive.toString('hex')}`,
+                header: encodedData.header.toViem(),
+                archive: toHex(encodedData.archive),
                 oracleInput: {
                     // We are currently not modifying these. See #9963
                     feeAssetPriceModifier: 0n
-                },
-                blockHash: `0x${encodedData.blockHash.toString('hex')}`,
-                txHashes
+                }
             },
-            attestations,
+            encodedData.attestationsAndSigners.getPackedAttestations(),
+            signers,
+            encodedData.attestationsAndSignersSignature.toViemSignature(),
             blobInput
         ];
+        const { rollupData, simulationResult } = await this.simulateProposeTx(args, timestamp, options);
+        return {
+            args,
+            blobEvaluationGas,
+            rollupData,
+            simulationResult
+        };
+    }
+    /**
+   * Simulates the propose tx with eth_simulateV1
+   * @param args - The propose tx args
+   * @param timestamp - The timestamp to simulate proposal at
+   * @returns The simulation result
+   */ async simulateProposeTx(args, timestamp, options) {
         const rollupData = encodeFunctionData({
             abi: RollupAbi,
             functionName: 'propose',
             args
         });
-        const forwarderData = encodeFunctionData({
-            abi: ForwarderAbi,
-            functionName: 'forward',
-            args: [
-                [
-                    this.rollupContract.address
-                ],
-                [
-                    rollupData
-                ]
-            ]
-        });
-        const simulationResult = await this.l1TxUtils.simulateGasUsed({
-            to: this.getForwarderAddress().toString(),
-            data: forwarderData,
-            gas: SequencerPublisher.PROPOSE_GAS_GUESS
-        }, {
-            // @note we add 1n to the timestamp because geth implementation doesn't like simulation timestamp to be equal to the current block timestamp
-            time: timestamp + 1n,
-            // @note reth should have a 30m gas limit per block but throws errors that this tx is beyond limit
-            gasLimit: SequencerPublisher.PROPOSE_GAS_GUESS * 2n
-        }, [
+        // override the pending checkpoint number if requested
+        const optsForcePendingCheckpointNumber = options.forcePendingBlockNumber !== undefined ? CheckpointNumber.fromBlockNumber(options.forcePendingBlockNumber) : undefined;
+        const forcePendingCheckpointNumberStateDiff = (optsForcePendingCheckpointNumber !== undefined ? await this.rollupContract.makePendingCheckpointNumberOverride(optsForcePendingCheckpointNumber) : []).flatMap((override)=>override.stateDiff ?? []);
+        const stateOverrides = [
             {
                 address: this.rollupContract.address,
                 // @note we override checkBlob to false since blobs are not part simulate()
                 stateDiff: [
                     {
-                        slot: toHex(RollupContract.checkBlobStorageSlot, true),
-                        value: toHex(0n, true)
-                    }
+                        slot: toPaddedHex(RollupContract.checkBlobStorageSlot, true),
+                        value: toPaddedHex(0n, true)
+                    },
+                    ...forcePendingCheckpointNumberStateDiff
                 ]
             }
-        ], {
+        ];
+        // In fisherman mode, simulate as the proposer but with sufficient balance
+        if (this.proposerAddressForSimulation) {
+            stateOverrides.push({
+                address: this.proposerAddressForSimulation.toString(),
+                balance: 10n * WEI_CONST * WEI_CONST
+            });
+        }
+        const simulationResult = await this.l1TxUtils.simulate({
+            to: this.rollupContract.address,
+            data: rollupData,
+            gas: SequencerPublisher.PROPOSE_GAS_GUESS,
+            ...this.proposerAddressForSimulation && {
+                from: this.proposerAddressForSimulation.toString()
+            }
+        }, {
+            // @note we add 1n to the timestamp because geth implementation doesn't like simulation timestamp to be equal to the current block timestamp
+            time: timestamp + 1n,
+            // @note reth should have a 30m gas limit per block but throws errors that this tx is beyond limit so we increase here
+            gasLimit: SequencerPublisher.PROPOSE_GAS_GUESS * 2n
+        }, stateOverrides, RollupAbi, {
             // @note fallback gas estimate to use if the node doesn't support simulation API
             fallbackGasEstimate: SequencerPublisher.PROPOSE_GAS_GUESS
         }).catch((err)=>{
-            const { message, metaMessages } = formatViemError(err);
-            this.log.error(`Failed to simulate gas used`, message, {
-                metaMessages
-            });
-            throw new Error('Failed to simulate gas used');
+            // In fisherman mode, we expect ValidatorSelection__MissingProposerSignature since fisherman doesn't have proposer signature
+            const viemError = formatViemError(err);
+            if (this.config.fishermanMode && viemError.message?.includes('ValidatorSelection__MissingProposerSignature')) {
+                this.log.debug(`Ignoring expected ValidatorSelection__MissingProposerSignature error in fisherman mode`);
+                // Return a minimal simulation result with the fallback gas estimate
+                return {
+                    gasUsed: SequencerPublisher.PROPOSE_GAS_GUESS,
+                    logs: []
+                };
+            }
+            this.log.error(`Failed to simulate propose tx`, viemError);
+            throw err;
         });
         return {
-            args,
-            blobEvaluationGas,
             rollupData,
             simulationResult
         };
     }
-    async addProposeTx(block, encodedData, opts = {}, timestamp) {
+    async addProposeTx(checkpoint, encodedData, opts = {}, timestamp) {
+        const slot = checkpoint.header.slotNumber;
         const timer = new Timer();
         const kzg = Blob.getViemKzgInstance();
-        const { rollupData, simulationResult, blobEvaluationGas } = await this.prepareProposeTx(encodedData, timestamp);
+        const { rollupData, simulationResult, blobEvaluationGas } = await this.prepareProposeTx(encodedData, timestamp, opts);
         const startBlock = await this.l1TxUtils.getBlockNumber();
-        const blockHash = await block.hash();
+        const gasLimit = this.l1TxUtils.bumpGasLimit(BigInt(Math.ceil(Number(simulationResult.gasUsed) * 64 / 63)) + blobEvaluationGas + SequencerPublisher.MULTICALL_OVERHEAD_GAS_GUESS);
+        // Send the blobs to the blob client preemptively. This helps in tests where the sequencer mistakingly thinks that the propose
+        // tx fails but it does get mined. We make sure that the blobs are sent to the blob client regardless of the tx outcome.
+        void Promise.resolve().then(()=>this.blobClient.sendBlobsToFilestore(encodedData.blobs).catch((_err)=>{
+                this.log.error('Failed to send blobs to blob client');
+            }));
         return this.addRequest({
             action: 'propose',
             request: {
                 to: this.rollupContract.address,
                 data: rollupData
             },
-            lastValidL2Slot: block.header.globalVariables.slotNumber.toBigInt(),
+            lastValidL2Slot: checkpoint.header.slotNumber,
             gasConfig: {
                 ...opts,
-                gasLimit: this.l1TxUtils.bumpGasLimit(simulationResult + blobEvaluationGas)
+                gasLimit
             },
             blobConfig: {
                 blobs: encodedData.blobs.map((b)=>b.data),
                 kzg
             },
-            onResult: (request, result)=>{
+            checkSuccess: (_request, result)=>{
                 if (!result) {
-                    return;
+                    return false;
                 }
                 const { receipt, stats, errorMsg } = result;
-                if (receipt.status === 'success') {
+                const success = receipt && receipt.status === 'success' && tryExtractEvent(receipt.logs, this.rollupContract.address, RollupAbi, 'CheckpointProposed');
+                if (success) {
                     const endBlock = receipt.blockNumber;
                     const inclusionBlocks = Number(endBlock - startBlock);
+                    const { calldataGas, calldataSize, sender } = stats;
                     const publishStats = {
                         gasPrice: receipt.effectiveGasPrice,
                         gasUsed: receipt.gasUsed,
                         blobGasUsed: receipt.blobGasUsed ?? 0n,
                         blobDataGas: receipt.blobGasPrice ?? 0n,
                         transactionHash: receipt.transactionHash,
-                        ...pick(stats, 'calldataGas', 'calldataSize', 'sender'),
-                        ...block.getStats(),
+                        calldataGas,
+                        calldataSize,
+                        sender,
+                        ...checkpoint.getStats(),
                         eventName: 'rollup-published-to-l1',
                         blobCount: encodedData.blobs.length,
                         inclusionBlocks
                     };
-                    this.log.verbose(`Published L2 block to L1 rollup contract`, {
+                    this.log.info(`Published checkpoint ${checkpoint.number} at slot ${slot} to rollup contract`, {
                         ...stats,
-                        ...block.getStats()
+                        ...checkpoint.getStats(),
+                        ...pick(receipt, 'transactionHash', 'blockHash')
                     });
                     this.metrics.recordProcessBlockTx(timer.ms(), publishStats);
-                    // Send the blobs to the blob sink
-                    this.sendBlobsToBlobSink(receipt.blockHash, encodedData.blobs).catch((_err)=>{
-                        this.log.error('Failed to send blobs to blob sink');
-                    });
                     return true;
                 } else {
                     this.metrics.recordFailedTx('process');
-                    this.log.error(`Rollup process tx reverted. ${errorMsg ?? 'No error message'}`, undefined, {
-                        ...block.getStats(),
-                        txHash: receipt.transactionHash,
-                        blockHash,
-                        slotNumber: block.header.globalVariables.slotNumber.toBigInt()
+                    this.log.error(`Publishing checkpoint at slot ${slot} failed with ${errorMsg ?? 'no error message'}`, undefined, {
+                        ...checkpoint.getStats(),
+                        ...receipt
                     });
+                    return false;
                 }
             }
         });
     }
-    /**
-   * Send blobs to the blob sink
-   *
-   * If a blob sink url is configured, then we send blobs to the blob sink
-   * - for now we use the blockHash as the identifier for the blobs;
-   *   In the future this will move to be the beacon block id - which takes a bit more work
-   *   to calculate and will need to be mocked in e2e tests
-   */ sendBlobsToBlobSink(blockHash, blobs) {
-        return this.blobSinkClient.sendBlobsToBlobSink(blockHash, blobs);
-    }
 }