@aztec/sequencer-client 0.0.1-fake-ceab37513c → 0.0.1-private.d0bedffd

package/dest/client/index.d.ts

@@ -1,2 +1,2 @@
 export * from './sequencer-client.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbGllbnQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyx1QkFBdUIsQ0FBQyJ9

package/dest/client/sequencer-client.d.ts

@@ -1,30 +1,32 @@
-import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
+import type { BlobClientInterface } from '@aztec/blob-client/client';
 import { EpochCache } from '@aztec/epoch-cache';
-import { PublisherManager } from '@aztec/ethereum';
-import { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
+import { type Delayer, L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
+import { PublisherManager } from '@aztec/ethereum/publisher-manager';
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { createLogger } from '@aztec/foundation/log';
 import type { DateProvider } from '@aztec/foundation/timer';
 import type { KeystoreManager } from '@aztec/node-keystore';
 import type { P2P } from '@aztec/p2p';
 import type { SlasherClientInterface } from '@aztec/slasher';
-import type { L2BlockSource } from '@aztec/stdlib/block';
-import type { IFullNodeBlockBuilder, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import type { L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
+import type { ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
 import { L1Metrics, type TelemetryClient } from '@aztec/telemetry-client';
-import { type ValidatorClient } from '@aztec/validator-client';
-import type { SequencerClientConfig } from '../config.js';
+import { FullNodeCheckpointsBuilder, NodeKeystoreAdapter, type ValidatorClient } from '@aztec/validator-client';
+import { type SequencerClientConfig } from '../config.js';
 import { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
 import { Sequencer, type SequencerConfig } from '../sequencer/index.js';
 /**
  * Encapsulates the full sequencer and publisher.
  */
 export declare class SequencerClient {
-    protected publisherManager: PublisherManager<L1TxUtilsWithBlobs>;
+    protected publisherManager: PublisherManager<L1TxUtils>;
     protected sequencer: Sequencer;
-    protected blockBuilder: IFullNodeBlockBuilder;
+    protected checkpointsBuilder: FullNodeCheckpointsBuilder;
     protected validatorClient?: ValidatorClient | undefined;
     private l1Metrics?;
-    constructor(publisherManager: PublisherManager<L1TxUtilsWithBlobs>, sequencer: Sequencer, blockBuilder: IFullNodeBlockBuilder, validatorClient?: ValidatorClient | undefined, l1Metrics?: L1Metrics | undefined);
+    private delayer_?;
+    constructor(publisherManager: PublisherManager<L1TxUtils>, sequencer: Sequencer, checkpointsBuilder: FullNodeCheckpointsBuilder, validatorClient?: ValidatorClient | undefined, l1Metrics?: L1Metrics | undefined, delayer_?: Delayer | undefined);
     /**
      * Initializes a new instance.
      * @param config - Configuration for the sequencer, publisher, and L1 tx sender.
@@ -38,19 +40,19 @@ export declare class SequencerClient {
      * @returns A new running instance.
      */
     static new(config: SequencerClientConfig, deps: {
-        validatorClient: ValidatorClient | undefined;
+        validatorClient: ValidatorClient;
         p2pClient: P2P;
         worldStateSynchronizer: WorldStateSynchronizer;
         slasherClient: SlasherClientInterface | undefined;
-        blockBuilder: IFullNodeBlockBuilder;
-        l2BlockSource: L2BlockSource;
+        checkpointsBuilder: FullNodeCheckpointsBuilder;
+        l2BlockSource: L2BlockSource & L2BlockSink;
         l1ToL2MessageSource: L1ToL2MessageSource;
         telemetry: TelemetryClient;
         publisherFactory?: SequencerPublisherFactory;
-        blobSinkClient?: BlobSinkClientInterface;
+        blobClient: BlobClientInterface;
         dateProvider: DateProvider;
         epochCache?: EpochCache;
-        l1TxUtils: L1TxUtilsWithBlobs[];
+        l1TxUtils: L1TxUtils[];
         nodeKeyStore: KeystoreManager;
     }): Promise<SequencerClient>;
     /**
@@ -65,7 +67,21 @@ export declare class SequencerClient {
      */
     stop(): Promise<void>;
     getSequencer(): Sequencer;
+    /** Updates the publisher factory's node keystore adapter after a keystore reload. */
+    updatePublisherNodeKeyStore(adapter: NodeKeystoreAdapter): void;
+    /** Returns the shared tx delayer for sequencer L1 txs, if enabled. Test-only. */
+    getDelayer(): Delayer | undefined;
     get validatorAddresses(): EthAddress[] | undefined;
     get maxL2BlockGas(): number | undefined;
 }
-//# sourceMappingURL=sequencer-client.d.ts.map
+/**
+ * Computes per-block L2 gas, DA gas, and TX count budgets based on the L1 rollup limits and the timetable.
+ * If the user explicitly set a limit, it is capped at the corresponding checkpoint limit.
+ * Otherwise, derives it as (checkpointLimit / maxBlocks) * multiplier, capped at the checkpoint limit.
+ */
+export declare function computeBlockLimits(config: SequencerClientConfig, rollupManaLimit: number, l1PublishingTime: number, log: ReturnType<typeof createLogger>): {
+    maxL2BlockGas: number;
+    maxDABlockGas: number;
+    maxTxsPerBlock: number;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLWNsaWVudC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9zZXF1ZW5jZXItY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFckUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSWhELE9BQU8sRUFBRSxLQUFLLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUN0RSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUNyRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUN0QyxPQUFPLEtBQUssRUFBRSxzQkFBc0IsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSx5QkFBeUIsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXpHLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbkUsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzFFLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxtQkFBbUIsRUFBRSxLQUFLLGVBQWUsRUFBRSxNQUFNLHlCQUF5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

package/dest/client/sequencer-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sequencer-client.d.ts","sourceRoot":"","sources":["../../src/client/sequencer-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAEL,gBAAgB,EAIjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EAAuB,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAEpF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AACxF,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExE;;GAEG;AACH,qBAAa,eAAe;IAExB,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,kBAAkB,CAAC;IAChE,SAAS,CAAC,SAAS,EAAE,SAAS;IAC9B,SAAS,CAAC,YAAY,EAAE,qBAAqB;IAC7C,SAAS,CAAC,eAAe,CAAC,EAAE,eAAe;IAC3C,OAAO,CAAC,SAAS,CAAC;gBAJR,gBAAgB,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,EACtD,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,qBAAqB,EACnC,eAAe,CAAC,EAAE,eAAe,YAAA,EACnC,SAAS,CAAC,EAAE,SAAS,YAAA;IAG/B;;;;;;;;;;;OAWG;WACiB,GAAG,CACrB,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE;QACJ,eAAe,EAAE,eAAe,GAAG,SAAS,CAAC;QAC7C,SAAS,EAAE,GAAG,CAAC;QACf,sBAAsB,EAAE,sBAAsB,CAAC;QAC/C,aAAa,EAAE,sBAAsB,GAAG,SAAS,CAAC;QAClD,YAAY,EAAE,qBAAqB,CAAC;QACpC,aAAa,EAAE,aAAa,CAAC;QAC7B,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,SAAS,EAAE,eAAe,CAAC;QAC3B,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;QAC7C,cAAc,CAAC,EAAE,uBAAuB,CAAC;QACzC,YAAY,EAAE,YAAY,CAAC;QAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,SAAS,EAAE,kBAAkB,EAAE,CAAC;QAChC,YAAY,EAAE,eAAe,CAAC;KAC/B;IAoHH;;;OAGG;IACI,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAMhF,4BAA4B;IACf,KAAK;IAOlB;;OAEG;IACU,IAAI;IAOV,YAAY,IAAI,SAAS;IAIhC,IAAI,kBAAkB,IAAI,UAAU,EAAE,GAAG,SAAS,CAEjD;IAED,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;CACF"}
+{"version":3,"file":"sequencer-client.d.ts","sourceRoot":"","sources":["../../src/client/sequencer-client.ts"],"names":[],"mappings":"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"}

package/dest/client/sequencer-client.js

@@ -1,27 +1,35 @@
+import { MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT } from '@aztec/constants';
 import { EpochCache } from '@aztec/epoch-cache';
-import { GovernanceProposerContract, PublisherManager, RollupContract, getPublicClient, isAnvilTestChain } from '@aztec/ethereum';
+import { isAnvilTestChain } from '@aztec/ethereum/chain';
+import { getPublicClient } from '@aztec/ethereum/client';
+import { GovernanceProposerContract, RollupContract } from '@aztec/ethereum/contracts';
+import { PublisherManager } from '@aztec/ethereum/publisher-manager';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
 import { L1Metrics } from '@aztec/telemetry-client';
 import { NodeKeystoreAdapter } from '@aztec/validator-client';
+import { DefaultSequencerConfig, getPublisherConfigFromSequencerConfig } from '../config.js';
 import { GlobalVariableBuilder } from '../global_variable_builder/index.js';
 import { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
 import { Sequencer } from '../sequencer/index.js';
+import { SequencerTimetable } from '../sequencer/timetable.js';
 /**
  * Encapsulates the full sequencer and publisher.
  */ export class SequencerClient {
     publisherManager;
     sequencer;
-    blockBuilder;
+    checkpointsBuilder;
     validatorClient;
     l1Metrics;
-    constructor(publisherManager, sequencer, blockBuilder, validatorClient, l1Metrics){
+    delayer_;
+    constructor(publisherManager, sequencer, checkpointsBuilder, validatorClient, l1Metrics, delayer_){
         this.publisherManager = publisherManager;
         this.sequencer = sequencer;
-        this.blockBuilder = blockBuilder;
+        this.checkpointsBuilder = checkpointsBuilder;
         this.validatorClient = validatorClient;
         this.l1Metrics = l1Metrics;
+        this.delayer_ = delayer_;
     }
     /**
    * Initializes a new instance.
@@ -35,17 +43,19 @@ import { Sequencer } from '../sequencer/index.js';
    * @param prover - An instance of a block prover
    * @returns A new running instance.
    */ static async new(config, deps) {
-        const { validatorClient, p2pClient, worldStateSynchronizer, slasherClient, blockBuilder, l2BlockSource, l1ToL2MessageSource, telemetry: telemetryClient } = deps;
+        const { validatorClient, p2pClient, worldStateSynchronizer, slasherClient, checkpointsBuilder, l2BlockSource, l1ToL2MessageSource, telemetry: telemetryClient } = deps;
         const { l1RpcUrls: rpcUrls, l1ChainId: chainId } = config;
         const log = createLogger('sequencer');
         const publicClient = getPublicClient(config);
         const l1TxUtils = deps.l1TxUtils;
         const l1Metrics = new L1Metrics(telemetryClient.getMeter('L1PublisherMetrics'), publicClient, l1TxUtils.map((x)=>x.getSenderAddress()));
-        const publisherManager = new PublisherManager(l1TxUtils, config);
+        const publisherManager = new PublisherManager(l1TxUtils, getPublisherConfigFromSequencerConfig(config), log.getBindings());
         const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
-        const [l1GenesisTime, slotDuration] = await Promise.all([
+        const [l1GenesisTime, slotDuration, rollupVersion, rollupManaLimit] = await Promise.all([
             rollupContract.getL1GenesisTime(),
-            rollupContract.getSlotDuration()
+            rollupContract.getSlotDuration(),
+            rollupContract.getVersion(),
+            rollupContract.getManaLimit().then(Number)
         ]);
         const governanceProposerContract = new GovernanceProposerContract(publicClient, config.l1Contracts.governanceProposerAddress.toString());
         const epochCache = deps.epochCache ?? await EpochCache.create(config.l1Contracts.rollupAddress, {
@@ -59,7 +69,7 @@ import { Sequencer } from '../sequencer/index.js';
         const slashFactoryContract = new SlashFactoryContract(publicClient, config.l1Contracts.slashFactoryAddress?.toString() ?? EthAddress.ZERO.toString());
         const publisherFactory = deps.publisherFactory ?? new SequencerPublisherFactory(config, {
             telemetry: telemetryClient,
-            blobSinkClient: deps.blobSinkClient,
+            blobClient: deps.blobClient,
             epochCache,
             governanceProposerContract,
             slashFactoryContract,
@@ -69,40 +79,46 @@ import { Sequencer } from '../sequencer/index.js';
             nodeKeyStore: NodeKeystoreAdapter.fromKeyStoreManager(deps.nodeKeyStore),
             logger: log
         });
-        const globalsBuilder = new GlobalVariableBuilder(config);
         const ethereumSlotDuration = config.ethereumSlotDuration;
-        const rollupManaLimit = Number(await rollupContract.getManaLimit());
-        let sequencerManaLimit = config.maxL2BlockGas ?? rollupManaLimit;
-        if (sequencerManaLimit > rollupManaLimit) {
-            log.warn(`Provided maxL2BlockGas of ${sequencerManaLimit} is greater than the maximum allowed by the L1 (${rollupManaLimit}), setting limit to ${rollupManaLimit}`);
-            sequencerManaLimit = rollupManaLimit;
-        }
+        const globalsBuilder = new GlobalVariableBuilder({
+            ...config,
+            l1GenesisTime,
+            slotDuration: Number(slotDuration),
+            ethereumSlotDuration,
+            rollupVersion
+        });
         // When running in anvil, assume we can post a tx up until one second before the end of an L1 slot.
-        // Otherwise, assume we must have broadcasted the tx before the slot started (we use a default
-        // maxL1TxInclusionTimeIntoSlot of zero) to get the tx into that L1 slot.
+        // Otherwise, we need the full L1 slot duration for publishing to ensure inclusion.
         // In theory, the L1 slot has an initial 4s phase where the block is propagated, so we could
-        // make it with a propagation time into slot equal to 4s. However, we prefer being conservative.
+        // reduce the publishing time allowance. However, we prefer being conservative.
         // See https://www.blocknative.com/blog/anatomy-of-a-slot#7 for more info.
-        const maxL1TxInclusionTimeIntoSlot = config.maxL1TxInclusionTimeIntoSlot ?? isAnvilTestChain(config.l1ChainId) ? ethereumSlotDuration - 1 : 0;
+        const l1PublishingTimeBasedOnChain = isAnvilTestChain(config.l1ChainId) ? 1 : ethereumSlotDuration;
+        const l1PublishingTime = config.l1PublishingTime ?? l1PublishingTimeBasedOnChain;
+        const { maxL2BlockGas, maxDABlockGas, maxTxsPerBlock } = computeBlockLimits(config, rollupManaLimit, l1PublishingTime, log);
         const l1Constants = {
             l1GenesisTime,
             slotDuration: Number(slotDuration),
-            ethereumSlotDuration
+            ethereumSlotDuration,
+            rollupManaLimit
         };
-        const sequencer = new Sequencer(publisherFactory, validatorClient, globalsBuilder, p2pClient, worldStateSynchronizer, slasherClient, l2BlockSource, l1ToL2MessageSource, blockBuilder, l1Constants, deps.dateProvider, epochCache, rollupContract, {
+        const sequencer = new Sequencer(publisherFactory, validatorClient, globalsBuilder, p2pClient, worldStateSynchronizer, slasherClient, l2BlockSource, l1ToL2MessageSource, checkpointsBuilder, l1Constants, deps.dateProvider, epochCache, rollupContract, {
             ...config,
-            maxL1TxInclusionTimeIntoSlot,
-            maxL2BlockGas: sequencerManaLimit
+            l1PublishingTime,
+            maxL2BlockGas,
+            maxDABlockGas,
+            maxTxsPerBlock
         }, telemetryClient, log);
-        await sequencer.init();
-        return new SequencerClient(publisherManager, sequencer, blockBuilder, validatorClient, l1Metrics);
+        sequencer.init();
+        // Extract the shared delayer from the first L1TxUtils instance (all instances share the same delayer)
+        const delayer = l1TxUtils[0]?.delayer;
+        return new SequencerClient(publisherManager, sequencer, checkpointsBuilder, validatorClient, l1Metrics, delayer);
     }
     /**
    * Updates sequencer and validator client config.
    * @param config - New parameters.
    */ updateConfig(config) {
         this.sequencer.updateConfig(config);
-        this.blockBuilder.updateConfig(config);
+        this.checkpointsBuilder.updateConfig(config);
         this.validatorClient?.updateConfig(config);
     }
     /** Starts the sequencer. */ async start() {
@@ -122,6 +138,12 @@ import { Sequencer } from '../sequencer/index.js';
     getSequencer() {
         return this.sequencer;
     }
+    /** Updates the publisher factory's node keystore adapter after a keystore reload. */ updatePublisherNodeKeyStore(adapter) {
+        this.sequencer.updatePublisherNodeKeyStore(adapter);
+    }
+    /** Returns the shared tx delayer for sequencer L1 txs, if enabled. Test-only. */ getDelayer() {
+        return this.delayer_;
+    }
     get validatorAddresses() {
         return this.sequencer.getValidatorAddresses();
     }
@@ -129,3 +151,72 @@ import { Sequencer } from '../sequencer/index.js';
         return this.sequencer.maxL2BlockGas;
     }
 }
+/**
+ * Computes per-block L2 gas, DA gas, and TX count budgets based on the L1 rollup limits and the timetable.
+ * If the user explicitly set a limit, it is capped at the corresponding checkpoint limit.
+ * Otherwise, derives it as (checkpointLimit / maxBlocks) * multiplier, capped at the checkpoint limit.
+ */ export function computeBlockLimits(config, rollupManaLimit, l1PublishingTime, log) {
+    const maxNumberOfBlocks = new SequencerTimetable({
+        ethereumSlotDuration: config.ethereumSlotDuration,
+        aztecSlotDuration: config.aztecSlotDuration,
+        l1PublishingTime,
+        p2pPropagationTime: config.attestationPropagationTime,
+        blockDurationMs: config.blockDurationMs,
+        enforce: config.enforceTimeTable ?? DefaultSequencerConfig.enforceTimeTable
+    }).maxNumberOfBlocks;
+    const multiplier = config.perBlockAllocationMultiplier ?? DefaultSequencerConfig.perBlockAllocationMultiplier;
+    // Compute maxL2BlockGas
+    let maxL2BlockGas;
+    if (config.maxL2BlockGas !== undefined) {
+        if (config.maxL2BlockGas > rollupManaLimit) {
+            log.warn(`Provided MAX_L2_BLOCK_GAS ${config.maxL2BlockGas} exceeds L1 rollup mana limit ${rollupManaLimit} (capping)`);
+            maxL2BlockGas = rollupManaLimit;
+        } else {
+            maxL2BlockGas = config.maxL2BlockGas;
+        }
+    } else {
+        maxL2BlockGas = Math.min(rollupManaLimit, Math.ceil(rollupManaLimit / maxNumberOfBlocks * multiplier));
+    }
+    // Compute maxDABlockGas
+    const daCheckpointLimit = MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT;
+    let maxDABlockGas;
+    if (config.maxDABlockGas !== undefined) {
+        if (config.maxDABlockGas > daCheckpointLimit) {
+            log.warn(`Provided MAX_DA_BLOCK_GAS ${config.maxDABlockGas} exceeds DA checkpoint limit ${daCheckpointLimit} (capping)`);
+            maxDABlockGas = daCheckpointLimit;
+        } else {
+            maxDABlockGas = config.maxDABlockGas;
+        }
+    } else {
+        maxDABlockGas = Math.min(daCheckpointLimit, Math.ceil(daCheckpointLimit / maxNumberOfBlocks * multiplier));
+    }
+    // Compute maxTxsPerBlock
+    const defaultMaxTxsPerBlock = 32;
+    let maxTxsPerBlock;
+    if (config.maxTxsPerBlock !== undefined) {
+        if (config.maxTxsPerCheckpoint !== undefined && config.maxTxsPerBlock > config.maxTxsPerCheckpoint) {
+            log.warn(`Provided MAX_TX_PER_BLOCK ${config.maxTxsPerBlock} exceeds MAX_TX_PER_CHECKPOINT ${config.maxTxsPerCheckpoint} (capping)`);
+            maxTxsPerBlock = config.maxTxsPerCheckpoint;
+        } else {
+            maxTxsPerBlock = config.maxTxsPerBlock;
+        }
+    } else if (config.maxTxsPerCheckpoint !== undefined) {
+        maxTxsPerBlock = Math.min(config.maxTxsPerCheckpoint, Math.ceil(config.maxTxsPerCheckpoint / maxNumberOfBlocks * multiplier));
+    } else {
+        maxTxsPerBlock = defaultMaxTxsPerBlock;
+    }
+    log.info(`Computed block limits L2=${maxL2BlockGas} DA=${maxDABlockGas} maxTxs=${maxTxsPerBlock}`, {
+        maxL2BlockGas,
+        maxDABlockGas,
+        maxTxsPerBlock,
+        rollupManaLimit,
+        daCheckpointLimit,
+        maxNumberOfBlocks,
+        multiplier
+    });
+    return {
+        maxL2BlockGas,
+        maxDABlockGas,
+        maxTxsPerBlock
+    };
+}

package/dest/config.d.ts

@@ -1,21 +1,46 @@
-import { type L1ContractsConfig, type L1ReaderConfig } from '@aztec/ethereum';
+import { type L1ContractsConfig } from '@aztec/ethereum/config';
+import { type L1ReaderConfig } from '@aztec/ethereum/l1-reader';
 import { type ConfigMappingsType } from '@aztec/foundation/config';
-import { type KeyStoreConfig } from '@aztec/node-keystore';
-import { type P2PConfig } from '@aztec/p2p';
+import { type KeyStoreConfig } from '@aztec/node-keystore/config';
+import { type P2PConfig } from '@aztec/p2p/config';
 import { type ChainConfig, type SequencerConfig } from '@aztec/stdlib/config';
-import { type ValidatorClientConfig } from '@aztec/validator-client';
-import { type PublisherConfig, type TxSenderConfig } from './publisher/config.js';
+import { type ValidatorClientConfig } from '@aztec/validator-client/config';
+import { type SequencerPublisherConfig, type SequencerTxSenderConfig } from './publisher/config.js';
 export * from './publisher/config.js';
 export type { SequencerConfig };
-export declare const DEFAULT_ATTESTATION_PROPAGATION_TIME = 2;
+/**
+ * Default values for SequencerConfig.
+ * Centralized location for all sequencer configuration defaults.
+ */
+export declare const DefaultSequencerConfig: {
+    sequencerPollingIntervalMS: number;
+    minTxsPerBlock: number;
+    buildCheckpointIfEmpty: false;
+    publishTxsWithProposals: false;
+    perBlockAllocationMultiplier: number;
+    enforceTimeTable: true;
+    attestationPropagationTime: number;
+    secondsBeforeInvalidatingBlockAsCommitteeMember: number;
+    secondsBeforeInvalidatingBlockAsNonCommitteeMember: number;
+    skipCollectingAttestations: false;
+    skipInvalidateBlockAsProposer: false;
+    broadcastInvalidBlockProposal: false;
+    injectFakeAttestation: false;
+    injectHighSValueAttestation: false;
+    injectUnrecoverableSignatureAttestation: false;
+    fishermanMode: false;
+    shuffleAttestationOrdering: false;
+    skipPushProposedBlocksToArchiver: false;
+    skipPublishingCheckpointsPercent: number;
+};
 /**
  * Configuration settings for the SequencerClient.
  */
-export type SequencerClientConfig = PublisherConfig & KeyStoreConfig & ValidatorClientConfig & TxSenderConfig & SequencerConfig & L1ReaderConfig & ChainConfig & Pick<P2PConfig, 'txPublicSetupAllowList'> & Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration' | 'aztecEpochDuration'>;
+export type SequencerClientConfig = SequencerPublisherConfig & KeyStoreConfig & ValidatorClientConfig & SequencerTxSenderConfig & SequencerConfig & L1ReaderConfig & ChainConfig & Pick<P2PConfig, 'txPublicSetupAllowListExtend'> & Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration' | 'aztecEpochDuration'>;
 export declare const sequencerConfigMappings: ConfigMappingsType<SequencerConfig>;
 export declare const sequencerClientConfigMappings: ConfigMappingsType<SequencerClientConfig>;
 /**
  * Creates an instance of SequencerClientConfig out of environment variables using sensible defaults for integration testing if not set.
  */
 export declare function getConfigEnvVars(): SequencerClientConfig;
-//# sourceMappingURL=config.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUE2QixNQUFNLHdCQUF3QixDQUFDO0FBQzNGLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBMEIsTUFBTSwyQkFBMkIsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFLeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsQyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQTBCLE1BQU0sNkJBQTZCLENBQUM7QUFDMUYsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFxQixNQUFNLG1CQUFtQixDQUFDO0FBRXRFLE9BQU8sRUFDTCxLQUFLLFdBQVcsRUFDaEIsS0FBSyxlQUFlLEVBR3JCLE1BQU0sc0JBQXNCLENBQUM7QUFHOUIsT0FBTyxFQUFFLEtBQUsscUJBQXFCLEVBQWlDLE1BQU0sZ0NBQWdDLENBQUM7QUFFM0csT0FBTyxFQUNMLEtBQUssd0JBQXdCLEVBQzdCLEtBQUssdUJBQXVCLEVBRzdCLE1BQU0sdUJBQXVCLENBQUM7QUFFL0IsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxZQUFZLEVBQUUsZUFBZSxFQUFFLENBQUM7QUFFaEM7OztHQUdHO0FBQ0gsZUFBTyxNQUFNLHNCQUFzQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0FvQkEsQ0FBQztBQUVwQzs7R0FFRztBQUNILE1BQU0sTUFBTSxxQkFBcUIsR0FBRyx3QkFBd0IsR0FDMUQsY0FBYyxHQUNkLHFCQUFxQixHQUNyQix1QkFBdUIsR0FDdkIsZUFBZSxHQUNmLGNBQWMsR0FDZCxXQUFXLEdBQ1gsSUFBSSxDQUFDLFNBQVMsRUFBRSw4QkFBOEIsQ0FBQyxHQUMvQyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsc0JBQXNCLEdBQUcsbUJBQW1CLEdBQUcsb0JBQW9CLENBQUMsQ0FBQztBQUUvRixlQUFPLE1BQU0sdUJBQXVCLEVBQUUsa0JBQWtCLENBQUMsZUFBZSxDQTBKdkUsQ0FBQztBQUVGLGVBQU8sTUFBTSw2QkFBNkIsRUFBRSxrQkFBa0IsQ0FBQyxxQkFBcUIsQ0FTbkYsQ0FBQztBQUVGOztHQUVHO0FBQ0gsd0JBQWdCLGdCQUFnQixJQUFJLHFCQUFxQixDQUV4RCJ9

package/dest/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,YAAY,CAAC;AAE/D,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAuB,MAAM,sBAAsB,CAAC;AACnG,OAAO,EAAE,KAAK,qBAAqB,EAAiC,MAAM,yBAAyB,CAAC;AAEpG,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAGpB,MAAM,uBAAuB,CAAC;AAE/B,cAAc,uBAAuB,CAAC;AACtC,YAAY,EAAE,eAAe,EAAE,CAAC;AAEhC,eAAO,MAAM,oCAAoC,IAAI,CAAC;AAEtD;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,eAAe,GACjD,cAAc,GACd,qBAAqB,GACrB,cAAc,GACd,eAAe,GACf,cAAc,GACd,WAAW,GACX,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,GACzC,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,GAAG,mBAAmB,GAAG,oBAAoB,CAAC,CAAC;AAE/F,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,CA2GvE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CASnF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAA6B,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AAEtE,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,eAAe,EAGrB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,KAAK,qBAAqB,EAAiC,MAAM,gCAAgC,CAAC;AAE3G,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,EAG7B,MAAM,uBAAuB,CAAC;AAE/B,cAAc,uBAAuB,CAAC;AACtC,YAAY,EAAE,eAAe,EAAE,CAAC;AAEhC;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;CAoBA,CAAC;AAEpC;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,wBAAwB,GAC1D,cAAc,GACd,qBAAqB,GACrB,uBAAuB,GACvB,eAAe,GACf,cAAc,GACd,WAAW,GACX,IAAI,CAAC,SAAS,EAAE,8BAA8B,CAAC,GAC/C,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,GAAG,mBAAmB,GAAG,oBAAoB,CAAC,CAAC;AAE/F,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,CA0JvE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CASnF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD"}

package/dest/config.js

@@ -1,44 +1,77 @@
-import { l1ContractsConfigMappings, l1ReaderConfigMappings } from '@aztec/ethereum';
+import { l1ContractsConfigMappings } from '@aztec/ethereum/config';
+import { l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
 import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, pickConfigMappings } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { keyStoreConfigMappings } from '@aztec/node-keystore';
-import { p2pConfigMappings } from '@aztec/p2p';
+import { keyStoreConfigMappings } from '@aztec/node-keystore/config';
+import { p2pConfigMappings } from '@aztec/p2p/config';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { chainConfigMappings } from '@aztec/stdlib/config';
-import { validatorClientConfigMappings } from '@aztec/validator-client';
-import { getPublisherConfigMappings, getTxSenderConfigMappings } from './publisher/config.js';
+import { chainConfigMappings, sharedSequencerConfigMappings } from '@aztec/stdlib/config';
+import { DEFAULT_P2P_PROPAGATION_TIME } from '@aztec/stdlib/timetable';
+import { validatorClientConfigMappings } from '@aztec/validator-client/config';
+import { sequencerPublisherConfigMappings, sequencerTxSenderConfigMappings } from './publisher/config.js';
 export * from './publisher/config.js';
-export const DEFAULT_ATTESTATION_PROPAGATION_TIME = 2;
+/**
+ * Default values for SequencerConfig.
+ * Centralized location for all sequencer configuration defaults.
+ */ export const DefaultSequencerConfig = {
+    sequencerPollingIntervalMS: 500,
+    minTxsPerBlock: 1,
+    buildCheckpointIfEmpty: false,
+    publishTxsWithProposals: false,
+    perBlockAllocationMultiplier: 2,
+    enforceTimeTable: true,
+    attestationPropagationTime: DEFAULT_P2P_PROPAGATION_TIME,
+    secondsBeforeInvalidatingBlockAsCommitteeMember: 144,
+    secondsBeforeInvalidatingBlockAsNonCommitteeMember: 432,
+    skipCollectingAttestations: false,
+    skipInvalidateBlockAsProposer: false,
+    broadcastInvalidBlockProposal: false,
+    injectFakeAttestation: false,
+    injectHighSValueAttestation: false,
+    injectUnrecoverableSignatureAttestation: false,
+    fishermanMode: false,
+    shuffleAttestationOrdering: false,
+    skipPushProposedBlocksToArchiver: false,
+    skipPublishingCheckpointsPercent: 0
+};
 export const sequencerConfigMappings = {
-    transactionPollingIntervalMS: {
-        env: 'SEQ_TX_POLLING_INTERVAL_MS',
-        description: 'The number of ms to wait between polling for pending txs.',
-        ...numberConfigHelper(500)
-    },
-    maxTxsPerBlock: {
-        env: 'SEQ_MAX_TX_PER_BLOCK',
-        description: 'The maximum number of txs to include in a block.',
-        ...numberConfigHelper(32)
+    sequencerPollingIntervalMS: {
+        env: 'SEQ_POLLING_INTERVAL_MS',
+        description: 'The number of ms to wait between polling for checking to build on the next slot.',
+        ...numberConfigHelper(DefaultSequencerConfig.sequencerPollingIntervalMS)
+    },
+    maxTxsPerCheckpoint: {
+        env: 'SEQ_MAX_TX_PER_CHECKPOINT',
+        description: 'The maximum number of txs across all blocks in a checkpoint.',
+        parseEnv: (val)=>val ? parseInt(val, 10) : undefined
     },
     minTxsPerBlock: {
         env: 'SEQ_MIN_TX_PER_BLOCK',
         description: 'The minimum number of txs to include in a block.',
-        ...numberConfigHelper(1)
+        ...numberConfigHelper(DefaultSequencerConfig.minTxsPerBlock)
+    },
+    minValidTxsPerBlock: {
+        description: 'The minimum number of valid txs (after execution) to include in a block. If not set, falls back to minTxsPerBlock.'
     },
     publishTxsWithProposals: {
         env: 'SEQ_PUBLISH_TXS_WITH_PROPOSALS',
         description: 'Whether to publish txs with proposals.',
-        ...booleanConfigHelper(false)
+        ...booleanConfigHelper(DefaultSequencerConfig.publishTxsWithProposals)
     },
     maxL2BlockGas: {
         env: 'SEQ_MAX_L2_BLOCK_GAS',
         description: 'The maximum L2 block gas.',
-        ...numberConfigHelper(10e9)
+        parseEnv: (val)=>val ? parseInt(val, 10) : undefined
     },
     maxDABlockGas: {
         env: 'SEQ_MAX_DA_BLOCK_GAS',
         description: 'The maximum DA block gas.',
-        ...numberConfigHelper(10e9)
+        parseEnv: (val)=>val ? parseInt(val, 10) : undefined
+    },
+    perBlockAllocationMultiplier: {
+        env: 'SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER',
+        description: 'Per-block gas budget multiplier for both L2 and DA gas. Budget per block is (checkpointLimit / maxBlocks) * multiplier.' + ' Values greater than one allow early blocks to use more than their even share, relying on checkpoint-level capping for later blocks.',
+        ...numberConfigHelper(DefaultSequencerConfig.perBlockAllocationMultiplier)
     },
     coinbase: {
         env: 'COINBASE',
@@ -58,60 +91,95 @@ export const sequencerConfigMappings = {
         env: 'ACVM_BINARY_PATH',
         description: 'The path to the ACVM binary'
     },
-    maxBlockSizeInBytes: {
-        env: 'SEQ_MAX_BLOCK_SIZE_IN_BYTES',
-        description: 'Max block size',
-        ...numberConfigHelper(1024 * 1024)
-    },
     enforceTimeTable: {
         env: 'SEQ_ENFORCE_TIME_TABLE',
         description: 'Whether to enforce the time table when building blocks',
-        ...booleanConfigHelper(),
-        defaultValue: true
+        ...booleanConfigHelper(DefaultSequencerConfig.enforceTimeTable)
     },
     governanceProposerPayload: {
         env: 'GOVERNANCE_PROPOSER_PAYLOAD_ADDRESS',
         description: 'The address of the payload for the governanceProposer',
-        parseEnv: (val)=>EthAddress.fromString(val),
-        defaultValue: EthAddress.ZERO
+        parseEnv: (val)=>EthAddress.fromString(val)
     },
-    maxL1TxInclusionTimeIntoSlot: {
-        env: 'SEQ_MAX_L1_TX_INCLUSION_TIME_INTO_SLOT',
-        description: 'How many seconds into an L1 slot we can still send a tx and get it mined.',
+    l1PublishingTime: {
+        env: 'SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT',
+        description: 'How much time (in seconds) we allow in the slot for publishing the L1 tx (defaults to 1 L1 slot).',
         parseEnv: (val)=>val ? parseInt(val, 10) : undefined
     },
     attestationPropagationTime: {
         env: 'SEQ_ATTESTATION_PROPAGATION_TIME',
         description: 'How many seconds it takes for proposals and attestations to travel across the p2p layer (one-way)',
-        ...numberConfigHelper(DEFAULT_ATTESTATION_PROPAGATION_TIME)
+        ...numberConfigHelper(DefaultSequencerConfig.attestationPropagationTime)
     },
     fakeProcessingDelayPerTxMs: {
         description: 'Used for testing to introduce a fake delay after processing each tx'
     },
+    fakeThrowAfterProcessingTxCount: {
+        description: 'Used for testing to throw an error after processing N txs'
+    },
     secondsBeforeInvalidatingBlockAsCommitteeMember: {
         env: 'SEQ_SECONDS_BEFORE_INVALIDATING_BLOCK_AS_COMMITTEE_MEMBER',
         description: 'How many seconds to wait before trying to invalidate a block from the pending chain as a committee member (zero to never invalidate).' + ' The next proposer is expected to invalidate, so the committee acts as a fallback.',
-        ...numberConfigHelper(144)
+        ...numberConfigHelper(DefaultSequencerConfig.secondsBeforeInvalidatingBlockAsCommitteeMember)
     },
     secondsBeforeInvalidatingBlockAsNonCommitteeMember: {
         env: 'SEQ_SECONDS_BEFORE_INVALIDATING_BLOCK_AS_NON_COMMITTEE_MEMBER',
         description: 'How many seconds to wait before trying to invalidate a block from the pending chain as a non-committee member (zero to never invalidate).' + ' The next proposer is expected to invalidate, then the committee, so other sequencers act as a fallback.',
-        ...numberConfigHelper(432)
+        ...numberConfigHelper(DefaultSequencerConfig.secondsBeforeInvalidatingBlockAsNonCommitteeMember)
     },
     skipCollectingAttestations: {
         description: 'Whether to skip collecting attestations from validators and only use self-attestations (for testing only)',
-        ...booleanConfigHelper(false)
+        ...booleanConfigHelper(DefaultSequencerConfig.skipCollectingAttestations)
     },
     skipInvalidateBlockAsProposer: {
         description: 'Do not invalidate the previous block if invalid when we are the proposer (for testing only)',
-        ...booleanConfigHelper(false)
+        ...booleanConfigHelper(DefaultSequencerConfig.skipInvalidateBlockAsProposer)
+    },
+    broadcastInvalidBlockProposal: {
+        description: 'Broadcast invalid block proposals with corrupted state (for testing only)',
+        ...booleanConfigHelper(DefaultSequencerConfig.broadcastInvalidBlockProposal)
     },
     injectFakeAttestation: {
         description: 'Inject a fake attestation (for testing only)',
-        ...booleanConfigHelper(false)
+        ...booleanConfigHelper(DefaultSequencerConfig.injectFakeAttestation)
+    },
+    injectHighSValueAttestation: {
+        description: 'Inject a malleable attestation with a high-s value (for testing only)',
+        ...booleanConfigHelper(DefaultSequencerConfig.injectHighSValueAttestation)
+    },
+    injectUnrecoverableSignatureAttestation: {
+        description: 'Inject an attestation with an unrecoverable signature (for testing only)',
+        ...booleanConfigHelper(DefaultSequencerConfig.injectUnrecoverableSignatureAttestation)
+    },
+    fishermanMode: {
+        env: 'FISHERMAN_MODE',
+        description: 'Whether to run in fisherman mode: builds blocks on every slot for validation without publishing to L1',
+        ...booleanConfigHelper(DefaultSequencerConfig.fishermanMode)
+    },
+    shuffleAttestationOrdering: {
+        description: 'Shuffle attestation ordering to create invalid ordering (for testing only)',
+        ...booleanConfigHelper(DefaultSequencerConfig.shuffleAttestationOrdering)
+    },
+    ...sharedSequencerConfigMappings,
+    buildCheckpointIfEmpty: {
+        env: 'SEQ_BUILD_CHECKPOINT_IF_EMPTY',
+        description: 'Have sequencer build and publish an empty checkpoint if there are no txs',
+        ...booleanConfigHelper(DefaultSequencerConfig.buildCheckpointIfEmpty)
+    },
+    skipPushProposedBlocksToArchiver: {
+        description: 'Skip pushing proposed blocks to archiver (default: true)',
+        ...booleanConfigHelper(DefaultSequencerConfig.skipPushProposedBlocksToArchiver)
+    },
+    minBlocksForCheckpoint: {
+        description: 'Minimum number of blocks required for a checkpoint proposal (test only)'
+    },
+    skipPublishingCheckpointsPercent: {
+        env: 'SEQ_SKIP_CHECKPOINT_PUBLISH_PERCENT',
+        description: 'Percent probability (0 - 100) of sequencer skipping checkpoint publishing (testing only)',
+        ...numberConfigHelper(DefaultSequencerConfig.skipPublishingCheckpointsPercent)
     },
     ...pickConfigMappings(p2pConfigMappings, [
-        'txPublicSetupAllowList'
+        'txPublicSetupAllowListExtend'
     ])
 };
 export const sequencerClientConfigMappings = {
@@ -119,8 +187,8 @@ export const sequencerClientConfigMappings = {
     ...sequencerConfigMappings,
     ...keyStoreConfigMappings,
     ...l1ReaderConfigMappings,
-    ...getTxSenderConfigMappings('SEQ'),
-    ...getPublisherConfigMappings('SEQ'),
+    ...sequencerTxSenderConfigMappings,
+    ...sequencerPublisherConfigMappings,
     ...chainConfigMappings,
     ...pickConfigMappings(l1ContractsConfigMappings, [
         'ethereumSlotDuration',