@aztec/sequencer-client 0.0.1-commit.6230efd → 0.0.1-commit.6a729f7

package/dest/publisher/sequencer-publisher.js

@@ -1,11 +1,384 @@
+function applyDecs2203RFactory() {
+    function createAddInitializerMethod(initializers, decoratorFinishedRef) {
+        return function addInitializer(initializer) {
+            assertNotFinished(decoratorFinishedRef, "addInitializer");
+            assertCallable(initializer, "An initializer");
+            initializers.push(initializer);
+        };
+    }
+    function memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value) {
+        var kindStr;
+        switch(kind){
+            case 1:
+                kindStr = "accessor";
+                break;
+            case 2:
+                kindStr = "method";
+                break;
+            case 3:
+                kindStr = "getter";
+                break;
+            case 4:
+                kindStr = "setter";
+                break;
+            default:
+                kindStr = "field";
+        }
+        var ctx = {
+            kind: kindStr,
+            name: isPrivate ? "#" + name : name,
+            static: isStatic,
+            private: isPrivate,
+            metadata: metadata
+        };
+        var decoratorFinishedRef = {
+            v: false
+        };
+        ctx.addInitializer = createAddInitializerMethod(initializers, decoratorFinishedRef);
+        var get, set;
+        if (kind === 0) {
+            if (isPrivate) {
+                get = desc.get;
+                set = desc.set;
+            } else {
+                get = function() {
+                    return this[name];
+                };
+                set = function(v) {
+                    this[name] = v;
+                };
+            }
+        } else if (kind === 2) {
+            get = function() {
+                return desc.value;
+            };
+        } else {
+            if (kind === 1 || kind === 3) {
+                get = function() {
+                    return desc.get.call(this);
+                };
+            }
+            if (kind === 1 || kind === 4) {
+                set = function(v) {
+                    desc.set.call(this, v);
+                };
+            }
+        }
+        ctx.access = get && set ? {
+            get: get,
+            set: set
+        } : get ? {
+            get: get
+        } : {
+            set: set
+        };
+        try {
+            return dec(value, ctx);
+        } finally{
+            decoratorFinishedRef.v = true;
+        }
+    }
+    function assertNotFinished(decoratorFinishedRef, fnName) {
+        if (decoratorFinishedRef.v) {
+            throw new Error("attempted to call " + fnName + " after decoration was finished");
+        }
+    }
+    function assertCallable(fn, hint) {
+        if (typeof fn !== "function") {
+            throw new TypeError(hint + " must be a function");
+        }
+    }
+    function assertValidReturnValue(kind, value) {
+        var type = typeof value;
+        if (kind === 1) {
+            if (type !== "object" || value === null) {
+                throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0");
+            }
+            if (value.get !== undefined) {
+                assertCallable(value.get, "accessor.get");
+            }
+            if (value.set !== undefined) {
+                assertCallable(value.set, "accessor.set");
+            }
+            if (value.init !== undefined) {
+                assertCallable(value.init, "accessor.init");
+            }
+        } else if (type !== "function") {
+            var hint;
+            if (kind === 0) {
+                hint = "field";
+            } else if (kind === 10) {
+                hint = "class";
+            } else {
+                hint = "method";
+            }
+            throw new TypeError(hint + " decorators must return a function or void 0");
+        }
+    }
+    function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata) {
+        var decs = decInfo[0];
+        var desc, init, value;
+        if (isPrivate) {
+            if (kind === 0 || kind === 1) {
+                desc = {
+                    get: decInfo[3],
+                    set: decInfo[4]
+                };
+            } else if (kind === 3) {
+                desc = {
+                    get: decInfo[3]
+                };
+            } else if (kind === 4) {
+                desc = {
+                    set: decInfo[3]
+                };
+            } else {
+                desc = {
+                    value: decInfo[3]
+                };
+            }
+        } else if (kind !== 0) {
+            desc = Object.getOwnPropertyDescriptor(base, name);
+        }
+        if (kind === 1) {
+            value = {
+                get: desc.get,
+                set: desc.set
+            };
+        } else if (kind === 2) {
+            value = desc.value;
+        } else if (kind === 3) {
+            value = desc.get;
+        } else if (kind === 4) {
+            value = desc.set;
+        }
+        var newValue, get, set;
+        if (typeof decs === "function") {
+            newValue = memberDec(decs, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+            if (newValue !== void 0) {
+                assertValidReturnValue(kind, newValue);
+                if (kind === 0) {
+                    init = newValue;
+                } else if (kind === 1) {
+                    init = newValue.init;
+                    get = newValue.get || value.get;
+                    set = newValue.set || value.set;
+                    value = {
+                        get: get,
+                        set: set
+                    };
+                } else {
+                    value = newValue;
+                }
+            }
+        } else {
+            for(var i = decs.length - 1; i >= 0; i--){
+                var dec = decs[i];
+                newValue = memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+                if (newValue !== void 0) {
+                    assertValidReturnValue(kind, newValue);
+                    var newInit;
+                    if (kind === 0) {
+                        newInit = newValue;
+                    } else if (kind === 1) {
+                        newInit = newValue.init;
+                        get = newValue.get || value.get;
+                        set = newValue.set || value.set;
+                        value = {
+                            get: get,
+                            set: set
+                        };
+                    } else {
+                        value = newValue;
+                    }
+                    if (newInit !== void 0) {
+                        if (init === void 0) {
+                            init = newInit;
+                        } else if (typeof init === "function") {
+                            init = [
+                                init,
+                                newInit
+                            ];
+                        } else {
+                            init.push(newInit);
+                        }
+                    }
+                }
+            }
+        }
+        if (kind === 0 || kind === 1) {
+            if (init === void 0) {
+                init = function(instance, init) {
+                    return init;
+                };
+            } else if (typeof init !== "function") {
+                var ownInitializers = init;
+                init = function(instance, init) {
+                    var value = init;
+                    for(var i = 0; i < ownInitializers.length; i++){
+                        value = ownInitializers[i].call(instance, value);
+                    }
+                    return value;
+                };
+            } else {
+                var originalInitializer = init;
+                init = function(instance, init) {
+                    return originalInitializer.call(instance, init);
+                };
+            }
+            ret.push(init);
+        }
+        if (kind !== 0) {
+            if (kind === 1) {
+                desc.get = value.get;
+                desc.set = value.set;
+            } else if (kind === 2) {
+                desc.value = value;
+            } else if (kind === 3) {
+                desc.get = value;
+            } else if (kind === 4) {
+                desc.set = value;
+            }
+            if (isPrivate) {
+                if (kind === 1) {
+                    ret.push(function(instance, args) {
+                        return value.get.call(instance, args);
+                    });
+                    ret.push(function(instance, args) {
+                        return value.set.call(instance, args);
+                    });
+                } else if (kind === 2) {
+                    ret.push(value);
+                } else {
+                    ret.push(function(instance, args) {
+                        return value.call(instance, args);
+                    });
+                }
+            } else {
+                Object.defineProperty(base, name, desc);
+            }
+        }
+    }
+    function applyMemberDecs(Class, decInfos, metadata) {
+        var ret = [];
+        var protoInitializers;
+        var staticInitializers;
+        var existingProtoNonFields = new Map();
+        var existingStaticNonFields = new Map();
+        for(var i = 0; i < decInfos.length; i++){
+            var decInfo = decInfos[i];
+            if (!Array.isArray(decInfo)) continue;
+            var kind = decInfo[1];
+            var name = decInfo[2];
+            var isPrivate = decInfo.length > 3;
+            var isStatic = kind >= 5;
+            var base;
+            var initializers;
+            if (isStatic) {
+                base = Class;
+                kind = kind - 5;
+                staticInitializers = staticInitializers || [];
+                initializers = staticInitializers;
+            } else {
+                base = Class.prototype;
+                protoInitializers = protoInitializers || [];
+                initializers = protoInitializers;
+            }
+            if (kind !== 0 && !isPrivate) {
+                var existingNonFields = isStatic ? existingStaticNonFields : existingProtoNonFields;
+                var existingKind = existingNonFields.get(name) || 0;
+                if (existingKind === true || existingKind === 3 && kind !== 4 || existingKind === 4 && kind !== 3) {
+                    throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + name);
+                } else if (!existingKind && kind > 2) {
+                    existingNonFields.set(name, kind);
+                } else {
+                    existingNonFields.set(name, true);
+                }
+            }
+            applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata);
+        }
+        pushInitializers(ret, protoInitializers);
+        pushInitializers(ret, staticInitializers);
+        return ret;
+    }
+    function pushInitializers(ret, initializers) {
+        if (initializers) {
+            ret.push(function(instance) {
+                for(var i = 0; i < initializers.length; i++){
+                    initializers[i].call(instance);
+                }
+                return instance;
+            });
+        }
+    }
+    function applyClassDecs(targetClass, classDecs, metadata) {
+        if (classDecs.length > 0) {
+            var initializers = [];
+            var newClass = targetClass;
+            var name = targetClass.name;
+            for(var i = classDecs.length - 1; i >= 0; i--){
+                var decoratorFinishedRef = {
+                    v: false
+                };
+                try {
+                    var nextNewClass = classDecs[i](newClass, {
+                        kind: "class",
+                        name: name,
+                        addInitializer: createAddInitializerMethod(initializers, decoratorFinishedRef),
+                        metadata
+                    });
+                } finally{
+                    decoratorFinishedRef.v = true;
+                }
+                if (nextNewClass !== undefined) {
+                    assertValidReturnValue(10, nextNewClass);
+                    newClass = nextNewClass;
+                }
+            }
+            return [
+                defineMetadata(newClass, metadata),
+                function() {
+                    for(var i = 0; i < initializers.length; i++){
+                        initializers[i].call(newClass);
+                    }
+                }
+            ];
+        }
+    }
+    function defineMetadata(Class, metadata) {
+        return Object.defineProperty(Class, Symbol.metadata || Symbol.for("Symbol.metadata"), {
+            configurable: true,
+            enumerable: true,
+            value: metadata
+        });
+    }
+    return function applyDecs2203R(targetClass, memberDecs, classDecs, parentClass) {
+        if (parentClass !== void 0) {
+            var parentMetadata = parentClass[Symbol.metadata || Symbol.for("Symbol.metadata")];
+        }
+        var metadata = Object.create(parentMetadata === void 0 ? null : parentMetadata);
+        var e = applyMemberDecs(targetClass, memberDecs, metadata);
+        if (!classDecs.length) defineMetadata(targetClass, metadata);
+        return {
+            e: e,
+            get c () {
+                return applyClassDecs(targetClass, classDecs, metadata);
+            }
+        };
+    };
+}
+function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
+    return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
+}
+var _dec, _dec1, _dec2, _initProto;
 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 { MAX_L1_TX_LIMIT, WEI_CONST } from '@aztec/ethereum/l1-tx-utils';
+import { FormattedViemError, formatViemError, mergeAbis, 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 { 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';
@@ -15,7 +388,7 @@ import { Timer } from '@aztec/foundation/timer';
 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 { getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { encodeFunctionData, toHex } from 'viem';
 import { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js';
 export const Actions = [
@@ -31,8 +404,28 @@ export const Actions = [
 ];
 // 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);
+_dec = trackSpan('SequencerPublisher.sendRequests'), _dec1 = trackSpan('SequencerPublisher.validateBlockHeader'), _dec2 = trackSpan('SequencerPublisher.validateCheckpointForSubmission');
 export class SequencerPublisher {
     config;
+    static{
+        ({ e: [_initProto] } = _apply_decs_2203_r(this, [
+            [
+                _dec,
+                2,
+                "sendRequests"
+            ],
+            [
+                _dec1,
+                2,
+                "validateBlockHeader"
+            ],
+            [
+                _dec2,
+                2,
+                "validateCheckpointForSubmission"
+            ]
+        ], []));
+    }
     interrupted;
     metrics;
     epochCache;
@@ -45,10 +438,6 @@ export class SequencerPublisher {
     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
@@ -58,10 +447,11 @@ export class SequencerPublisher {
     govProposerContract;
     slashingProposerContract;
     slashFactoryContract;
+    tracer;
     requests;
     constructor(config, deps){
         this.config = config;
-        this.interrupted = false;
+        this.interrupted = (_initProto(this), false);
         this.governanceLog = createLogger('sequencer:publisher:governance');
         this.slashingLog = createLogger('sequencer:publisher:slashing');
         this.lastActions = {};
@@ -74,6 +464,7 @@ export class SequencerPublisher {
         this.blobClient = deps.blobClient;
         const telemetry = deps.telemetry ?? getTelemetryClient();
         this.metrics = deps.metrics ?? new SequencerPublisherMetrics(telemetry, 'SequencerPublisher');
+        this.tracer = telemetry.getTracer('SequencerPublisher');
         this.l1TxUtils = deps.l1TxUtils;
         this.rollupContract = deps.rollupContract;
         this.govProposerContract = deps.governanceProposerContract;
@@ -149,7 +540,7 @@ export class SequencerPublisher {
         // 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);
+        const analysisId = await this.l1FeeAnalyzer.startAnalysis(l2SlotNumber, gasLimit > 0n ? gasLimit : MAX_L1_TX_LIMIT, l1Requests, blobConfig, onComplete);
         this.log.info('Started L1 fee analysis', {
             analysisId,
             l2SlotNumber: l2SlotNumber.toString(),
@@ -207,7 +598,16 @@ export class SequencerPublisher {
         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
+        let gasLimit = gasLimits.length > 0 ? sumBigint(gasLimits) : undefined; // sum
+        // Cap at L1 block gas limit so the node accepts the tx ("gas limit too high" otherwise).
+        const maxGas = MAX_L1_TX_LIMIT;
+        if (gasLimit !== undefined && gasLimit > maxGas) {
+            this.log.debug('Capping bundled tx gas limit to L1 max', {
+                requested: gasLimit,
+                capped: maxGas
+            });
+            gasLimit = maxGas;
+        }
         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 = {
@@ -282,7 +682,7 @@ export class SequencerPublisher {
             'InvalidArchive'
         ];
         return this.rollupContract.canProposeAtNextEthBlock(tipArchive.toBuffer(), msgSender.toString(), Number(this.ethereumSlotDuration), {
-            forcePendingCheckpointNumber: opts.forcePendingBlockNumber !== undefined ? CheckpointNumber.fromBlockNumber(opts.forcePendingBlockNumber) : undefined
+            forcePendingCheckpointNumber: opts.forcePendingCheckpointNumber
         }).catch((err)=>{
             if (err instanceof FormattedViemError && ignoredErrors.find((e)=>err.message.includes(e))) {
                 this.log.warn(`Failed canProposeAtTime check with ${ignoredErrors.find((e)=>err.message.includes(e))}`, {
@@ -310,12 +710,11 @@ export class SequencerPublisher {
             [],
             Signature.empty().toViemSignature(),
             `0x${'0'.repeat(64)}`,
-            header.contentCommitment.blobsHash.toString(),
+            header.blobsHash.toString(),
             flags
         ];
         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);
+        const stateOverrides = await this.rollupContract.makePendingCheckpointNumberOverride(opts?.forcePendingCheckpointNumber);
         let balance = 0n;
         if (this.config.fishermanMode) {
             // In fisherman mode, we can't know where the proposer is publishing from
@@ -342,34 +741,37 @@ export class SequencerPublisher {
         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) {
+   * Simulate making a call to invalidate a checkpoint with invalid attestations. Returns undefined if no need to invalidate.
+   * @param validationResult - The validation result indicating which checkpoint to invalidate (as returned by the archiver)
+   */ async simulateInvalidateCheckpoint(validationResult) {
         if (validationResult.valid) {
             return undefined;
         }
-        const { reason, block } = validationResult;
-        const blockNumber = block.blockNumber;
+        const { reason, checkpoint } = validationResult;
+        const checkpointNumber = checkpoint.checkpointNumber;
         const logData = {
-            ...block,
+            ...checkpoint,
             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,
+        const currentCheckpointNumber = await this.rollupContract.getCheckpointNumber();
+        if (currentCheckpointNumber < checkpointNumber) {
+            this.log.verbose(`Skipping checkpoint ${checkpointNumber} invalidation since it has already been removed from the pending chain`, {
+                currentCheckpointNumber,
                 ...logData
             });
             return undefined;
         }
-        const request = this.buildInvalidateBlockRequest(validationResult);
-        this.log.debug(`Simulating invalidate block ${blockNumber}`, {
+        const request = this.buildInvalidateCheckpointRequest(validationResult);
+        this.log.debug(`Simulating invalidate checkpoint ${checkpointNumber}`, {
             ...logData,
             request
         });
         try {
-            const { gasUsed } = await this.l1TxUtils.simulate(request, undefined, undefined, ErrorsAbi);
-            this.log.verbose(`Simulation for invalidate block ${blockNumber} succeeded`, {
+            const { gasUsed } = await this.l1TxUtils.simulate(request, undefined, undefined, mergeAbis([
+                request.abi ?? [],
+                ErrorsAbi
+            ]));
+            this.log.verbose(`Simulation for invalidate checkpoint ${checkpointNumber} succeeded`, {
                 ...logData,
                 request,
                 gasUsed
@@ -377,55 +779,55 @@ export class SequencerPublisher {
             return {
                 request,
                 gasUsed,
-                blockNumber,
-                forcePendingBlockNumber: BlockNumber(blockNumber - 1),
+                checkpointNumber,
+                forcePendingCheckpointNumber: CheckpointNumber(checkpointNumber - 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`, {
+            // If the error is due to the checkpoint 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 checkpoint building.
+            if (viemError.message?.includes('Rollup__CheckpointNotInPendingChain')) {
+                this.log.verbose(`Simulation for invalidate checkpoint ${checkpointNumber} failed due to checkpoint 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`, {
+                const latestPendingCheckpointNumber = await this.rollupContract.getCheckpointNumber();
+                if (latestPendingCheckpointNumber < checkpointNumber) {
+                    this.log.verbose(`Checkpoint ${checkpointNumber} 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`, {
+                    this.log.error(`Simulation for invalidate checkpoint ${checkpointNumber} failed and it is still in pending chain`, viemError, logData);
+                    throw new Error(`Failed to simulate invalidate checkpoint ${checkpointNumber} 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}`, {
+            // Otherwise, throw. We cannot build the next checkpoint if we cannot invalidate the previous one.
+            this.log.error(`Simulation for invalidate checkpoint ${checkpointNumber} failed`, viemError, logData);
+            throw new Error(`Failed to simulate invalidate checkpoint ${checkpointNumber}`, {
                 cause: viemError
             });
         }
     }
-    buildInvalidateBlockRequest(validationResult) {
+    buildInvalidateCheckpointRequest(validationResult) {
         if (validationResult.valid) {
-            throw new Error('Cannot invalidate a valid block');
+            throw new Error('Cannot invalidate a valid checkpoint');
         }
-        const { block, committee, reason } = validationResult;
+        const { checkpoint, committee, reason } = validationResult;
         const logData = {
-            ...block,
+            ...checkpoint,
             reason
         };
-        this.log.debug(`Simulating invalidate block ${block.blockNumber}`, logData);
+        this.log.debug(`Building invalidate checkpoint ${checkpoint.checkpointNumber} request`, logData);
         const attestationsAndSigners = new CommitteeAttestationsAndSigners(validationResult.attestations).getPackedAttestations();
         if (reason === 'invalid-attestation') {
-            return this.rollupContract.buildInvalidateBadAttestationRequest(CheckpointNumber.fromBlockNumber(block.blockNumber), attestationsAndSigners, committee, validationResult.invalidIndex);
+            return this.rollupContract.buildInvalidateBadAttestationRequest(checkpoint.checkpointNumber, attestationsAndSigners, committee, validationResult.invalidIndex);
         } else if (reason === 'insufficient-attestations') {
-            return this.rollupContract.buildInvalidateInsufficientAttestationsRequest(CheckpointNumber.fromBlockNumber(block.blockNumber), attestationsAndSigners, committee);
+            return this.rollupContract.buildInvalidateInsufficientAttestationsRequest(checkpoint.checkpointNumber, attestationsAndSigners, committee);
         } else {
             const _ = reason;
             throw new Error(`Unknown reason for invalidation`);
@@ -503,7 +905,10 @@ export class SequencerPublisher {
         try {
             await this.l1TxUtils.simulate(request, {
                 time: timestamp
-            }, [], ErrorsAbi);
+            }, [], mergeAbis([
+                request.abi ?? [],
+                ErrorsAbi
+            ]));
             this.log.debug(`Simulation for ${action} at slot ${slotNumber} succeeded`, {
                 request
             });
@@ -667,7 +1072,7 @@ export class SequencerPublisher {
             this.log.error(`Checkpoint validation failed. ${err instanceof Error ? err.message : 'No error message'}`, err, {
                 ...checkpoint.getStats(),
                 slotNumber: checkpoint.header.slotNumber,
-                forcePendingBlockNumber: opts.forcePendingBlockNumber
+                forcePendingCheckpointNumber: opts.forcePendingCheckpointNumber
             });
             throw err;
         }
@@ -677,20 +1082,20 @@ export class SequencerPublisher {
         });
         await this.addProposeTx(checkpoint, proposeTxArgs, opts, ts);
     }
-    enqueueInvalidateBlock(request, opts = {}) {
+    enqueueInvalidateCheckpoint(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 { gasUsed, checkpointNumber } = request;
         const logData = {
             gasUsed,
-            blockNumber,
+            checkpointNumber,
             gasLimit,
             opts
         };
-        this.log.verbose(`Enqueuing invalidate block request`, logData);
+        this.log.verbose(`Enqueuing invalidate checkpoint request`, logData);
         this.addRequest({
             action: `invalidate-by-${request.reason}`,
             request: request.request,
@@ -702,12 +1107,12 @@ export class SequencerPublisher {
             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`, {
+                    this.log.warn(`Invalidate checkpoint ${request.checkpointNumber} failed`, {
                         ...result,
                         ...logData
                     });
                 } else {
-                    this.log.info(`Invalidate block ${request.blockNumber} succeeded`, {
+                    this.log.info(`Invalidate checkpoint ${request.checkpointNumber} succeeded`, {
                         ...result,
                         ...logData
                     });
@@ -730,27 +1135,37 @@ export class SequencerPublisher {
         this.lastActions[action] = slotNumber;
         this.log.debug(`Simulating ${action} for slot ${slotNumber}`, logData);
         let gasUsed;
+        const simulateAbi = mergeAbis([
+            request.abi ?? [],
+            ErrorsAbi
+        ]);
         try {
             ({ gasUsed } = await this.l1TxUtils.simulate(request, {
                 time: timestamp
-            }, [], ErrorsAbi)); // TODO(palla/slash): Check the timestamp logic
+            }, [], simulateAbi)); // TODO(palla/slash): Check the timestamp logic
             this.log.verbose(`Simulation for ${action} succeeded`, {
                 ...logData,
                 request,
                 gasUsed
             });
         } catch (err) {
-            const viemError = formatViemError(err);
+            const viemError = formatViemError(err, simulateAbi);
             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;
+        // Store the ABI used for simulation on the request so Multicall3.forward can decode errors
+        // when the tx is sent and a revert is diagnosed via simulation.
+        const requestWithAbi = {
+            ...request,
+            abi: simulateAbi
+        };
         this.log.debug(`Enqueuing ${action}`, logData);
         this.addRequest({
             action,
-            request,
+            request: requestWithAbi,
             gasConfig: {
                 gasLimit
             },
@@ -857,8 +1272,7 @@ export class SequencerPublisher {
             args
         });
         // 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 forcePendingCheckpointNumberStateDiff = (options.forcePendingCheckpointNumber !== undefined ? await this.rollupContract.makePendingCheckpointNumberOverride(options.forcePendingCheckpointNumber) : []).flatMap((override)=>override.stateDiff ?? []);
         const stateOverrides = [
             {
                 address: this.rollupContract.address,
@@ -882,7 +1296,7 @@ export class SequencerPublisher {
         const simulationResult = await this.l1TxUtils.simulate({
             to: this.rollupContract.address,
             data: rollupData,
-            gas: SequencerPublisher.PROPOSE_GAS_GUESS,
+            gas: MAX_L1_TX_LIMIT,
             ...this.proposerAddressForSimulation && {
                 from: this.proposerAddressForSimulation.toString()
             }
@@ -890,10 +1304,10 @@ export class SequencerPublisher {
             // @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
+            gasLimit: MAX_L1_TX_LIMIT * 2n
         }, stateOverrides, RollupAbi, {
             // @note fallback gas estimate to use if the node doesn't support simulation API
-            fallbackGasEstimate: SequencerPublisher.PROPOSE_GAS_GUESS
+            fallbackGasEstimate: MAX_L1_TX_LIMIT
         }).catch((err)=>{
             // In fisherman mode, we expect ValidatorSelection__MissingProposerSignature since fisherman doesn't have proposer signature
             const viemError = formatViemError(err);
@@ -901,7 +1315,7 @@ export class SequencerPublisher {
                 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,
+                    gasUsed: MAX_L1_TX_LIMIT,
                     logs: []
                 };
             }