@aztec/sequencer-client 0.0.1-commit.b655e406 → 0.0.1-commit.b9865e97

package/dest/client/sequencer-client.js

@@ -1,11 +1,13 @@
+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 { EthAddress } from '@aztec/foundation/eth-address';
+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 { 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 { GlobalVariableBuilder } from '../global_variable_builder/index.js';
+import { getPublisherConfigFromSequencerConfig } from '../config.js';
 import { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
 import { Sequencer } from '../sequencer/index.js';
 /**
@@ -13,15 +15,17 @@ import { Sequencer } from '../sequencer/index.js';
  */ 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,20 +39,24 @@ 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 rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
-        const [l1GenesisTime, slotDuration] = await Promise.all([
+        const publisherManager = new PublisherManager(l1TxUtils, getPublisherConfigFromSequencerConfig(config), {
+            bindings: log.getBindings(),
+            funder: deps.funderL1TxUtils
+        });
+        const rollupContract = new RollupContract(publicClient, config.rollupAddress.toString());
+        const [l1GenesisTime, slotDuration, rollupManaLimit] = await Promise.all([
             rollupContract.getL1GenesisTime(),
-            rollupContract.getSlotDuration()
+            rollupContract.getSlotDuration(),
+            rollupContract.getManaLimit().then(Number)
         ]);
-        const governanceProposerContract = new GovernanceProposerContract(publicClient, config.l1Contracts.governanceProposerAddress.toString());
-        const epochCache = deps.epochCache ?? await EpochCache.create(config.l1Contracts.rollupAddress, {
+        const governanceProposerContract = new GovernanceProposerContract(publicClient, config.governanceProposerAddress.toString());
+        const epochCache = deps.epochCache ?? await EpochCache.create(config.rollupAddress, {
             l1RpcUrls: rpcUrls,
             l1ChainId: chainId,
             viemPollingIntervalMS: config.viemPollingIntervalMS,
@@ -56,72 +64,80 @@ import { Sequencer } from '../sequencer/index.js';
         }, {
             dateProvider: deps.dateProvider
         });
-        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,
             rollupContract,
             dateProvider: deps.dateProvider,
             publisherManager,
             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 = deps.globalVariableBuilder;
         // 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 } = capPerBlockLimits(config, rollupManaLimit, log);
         const l1Constants = {
             l1GenesisTime,
             slotDuration: Number(slotDuration),
-            ethereumSlotDuration
+            ethereumSlotDuration,
+            rollupManaLimit,
+            epochDuration: config.aztecEpochDuration
         };
-        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() {
         await this.validatorClient?.start();
         this.sequencer.start();
         this.l1Metrics?.start();
-        await this.publisherManager.loadState();
+        await this.publisherManager.start();
     }
     /**
    * Stops the sequencer from processing new txs.
    */ async stop() {
         await this.sequencer.stop();
         await this.validatorClient?.stop();
-        this.publisherManager.interrupt();
+        await this.publisherManager.stop();
         this.l1Metrics?.stop();
     }
+    /** Triggers an immediate run of the sequencer, bypassing the polling interval. */ trigger() {
+        return this.sequencer.trigger();
+    }
     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 +145,28 @@ import { Sequencer } from '../sequencer/index.js';
         return this.sequencer.maxL2BlockGas;
     }
 }
+/**
+ * Caps operator-provided per-block limits at checkpoint-level limits.
+ * Returns undefined for any limit the operator didn't set — the checkpoint builder handles redistribution.
+ */ function capPerBlockLimits(config, rollupManaLimit, log) {
+    let maxL2BlockGas = config.maxL2BlockGas;
+    if (maxL2BlockGas !== undefined && maxL2BlockGas > rollupManaLimit) {
+        log.warn(`Provided MAX_L2_BLOCK_GAS ${maxL2BlockGas} exceeds rollup mana limit ${rollupManaLimit} (capping)`);
+        maxL2BlockGas = rollupManaLimit;
+    }
+    let maxDABlockGas = config.maxDABlockGas;
+    if (maxDABlockGas !== undefined && maxDABlockGas > MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT) {
+        log.warn(`Provided MAX_DA_BLOCK_GAS ${maxDABlockGas} exceeds DA checkpoint limit ${MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT} (capping)`);
+        maxDABlockGas = MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT;
+    }
+    let maxTxsPerBlock = config.maxTxsPerBlock;
+    if (maxTxsPerBlock !== undefined && config.maxTxsPerCheckpoint !== undefined && maxTxsPerBlock > config.maxTxsPerCheckpoint) {
+        log.warn(`Provided MAX_TX_PER_BLOCK ${maxTxsPerBlock} exceeds MAX_TX_PER_CHECKPOINT ${config.maxTxsPerCheckpoint} (capping)`);
+        maxTxsPerBlock = config.maxTxsPerCheckpoint;
+    }
+    return {
+        maxL2BlockGas,
+        maxDABlockGas,
+        maxTxsPerBlock
+    };
+}

package/dest/config.d.ts

@@ -1,21 +1,50 @@
-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;
+    redistributeCheckpointBudget: true;
+    enforceTimeTable: true;
+    attestationPropagationTime: number;
+    secondsBeforeInvalidatingBlockAsCommitteeMember: number;
+    secondsBeforeInvalidatingBlockAsNonCommitteeMember: number;
+    skipCollectingAttestations: false;
+    skipInvalidateBlockAsProposer: false;
+    skipWaitForValidParentCheckpointOnL1: false;
+    broadcastInvalidBlockProposal: false;
+    broadcastInvalidCheckpointProposalOnly: false;
+    injectFakeAttestation: false;
+    injectHighSValueAttestation: false;
+    injectUnrecoverableSignatureAttestation: false;
+    fishermanMode: false;
+    shuffleAttestationOrdering: false;
+    skipPushProposedBlocksToArchiver: false;
+    skipPublishingCheckpointsPercent: number;
+    maxBlocksPerCheckpoint: 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUE2QixNQUFNLHdCQUF3QixDQUFDO0FBQzNGLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBMEIsTUFBTSwyQkFBMkIsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFNeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsQyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQTBCLE1BQU0sNkJBQTZCLENBQUM7QUFDMUYsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFxQixNQUFNLG1CQUFtQixDQUFDO0FBRXRFLE9BQU8sRUFDTCxLQUFLLFdBQVcsRUFFaEIsS0FBSyxlQUFlLEVBR3JCLE1BQU0sc0JBQXNCLENBQUM7QUFHOUIsT0FBTyxFQUFFLEtBQUsscUJBQXFCLEVBQWlDLE1BQU0sZ0NBQWdDLENBQUM7QUFFM0csT0FBTyxFQUNMLEtBQUssd0JBQXdCLEVBQzdCLEtBQUssdUJBQXVCLEVBRzdCLE1BQU0sdUJBQXVCLENBQUM7QUFFL0IsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxZQUFZLEVBQUUsZUFBZSxFQUFFLENBQUM7QUFFaEM7OztHQUdHO0FBQ0gsZUFBTyxNQUFNLHNCQUFzQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBd0JBLENBQUM7QUFFcEM7O0dBRUc7QUFDSCxNQUFNLE1BQU0scUJBQXFCLEdBQUcsd0JBQXdCLEdBQzFELGNBQWMsR0FDZCxxQkFBcUIsR0FDckIsdUJBQXVCLEdBQ3ZCLGVBQWUsR0FDZixjQUFjLEdBQ2QsV0FBVyxHQUNYLElBQUksQ0FBQyxTQUFTLEVBQUUsOEJBQThCLENBQUMsR0FDL0MsSUFBSSxDQUFDLGlCQUFpQixFQUFFLHNCQUFzQixHQUFHLG1CQUFtQixHQUFHLG9CQUFvQixDQUFDLENBQUM7QUFFL0YsZUFBTyxNQUFNLHVCQUF1QixFQUFFLGtCQUFrQixDQUFDLGVBQWUsQ0F3THZFLENBQUM7QUFFRixlQUFPLE1BQU0sNkJBQTZCLEVBQUUsa0JBQWtCLENBQUMscUJBQXFCLENBU25GLENBQUM7QUFFRjs7R0FFRztBQUNILHdCQUFnQixnQkFBZ0IsSUFBSSxxQkFBcUIsQ0FFeEQifQ==

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,CA+GvE,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,EAMxB,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,EAEhB,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;;;;;;;;;;;;;;;;;;;;;;;;CAwBA,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,CAwLvE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CASnF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD"}

package/dest/config.js

@@ -1,48 +1,90 @@
-import { l1ContractsConfigMappings, l1ReaderConfigMappings } from '@aztec/ethereum';
-import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, pickConfigMappings } from '@aztec/foundation/config';
+import { l1ContractsConfigMappings } from '@aztec/ethereum/config';
+import { l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
+import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, optionalNumberConfigHelper, 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 { DEFAULT_MAX_BLOCKS_PER_CHECKPOINT, 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: 1.2,
+    redistributeCheckpointBudget: true,
+    enforceTimeTable: true,
+    attestationPropagationTime: DEFAULT_P2P_PROPAGATION_TIME,
+    secondsBeforeInvalidatingBlockAsCommitteeMember: 144,
+    secondsBeforeInvalidatingBlockAsNonCommitteeMember: 432,
+    skipCollectingAttestations: false,
+    skipInvalidateBlockAsProposer: false,
+    skipWaitForValidParentCheckpointOnL1: false,
+    broadcastInvalidBlockProposal: false,
+    broadcastInvalidCheckpointProposalOnly: false,
+    injectFakeAttestation: false,
+    injectHighSValueAttestation: false,
+    injectUnrecoverableSignatureAttestation: false,
+    fishermanMode: false,
+    shuffleAttestationOrdering: false,
+    skipPushProposedBlocksToArchiver: false,
+    skipPublishingCheckpointsPercent: 0,
+    maxBlocksPerCheckpoint: DEFAULT_MAX_BLOCKS_PER_CHECKPOINT
+};
 export const sequencerConfigMappings = {
-    transactionPollingIntervalMS: {
-        env: 'SEQ_TX_POLLING_INTERVAL_MS',
-        description: 'The number of ms to wait between polling for pending txs.',
-        ...numberConfigHelper(500)
+    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)
     },
-    maxTxsPerBlock: {
-        env: 'SEQ_MAX_TX_PER_BLOCK',
-        description: 'The maximum number of txs to include in a block.',
-        ...numberConfigHelper(32)
+    maxTxsPerCheckpoint: {
+        env: 'SEQ_MAX_TX_PER_CHECKPOINT',
+        description: 'The maximum number of txs across all blocks in a checkpoint.',
+        ...optionalNumberConfigHelper()
     },
     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)
+        ...optionalNumberConfigHelper()
     },
     maxDABlockGas: {
         env: 'SEQ_MAX_DA_BLOCK_GAS',
         description: 'The maximum DA block gas.',
-        ...numberConfigHelper(10e9)
+        ...optionalNumberConfigHelper()
+    },
+    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)
+    },
+    redistributeCheckpointBudget: {
+        env: 'SEQ_REDISTRIBUTE_CHECKPOINT_BUDGET',
+        description: 'Redistribute remaining checkpoint budget evenly across remaining blocks instead of allowing a single block to consume the entire remaining budget.',
+        ...booleanConfigHelper(DefaultSequencerConfig.redistributeCheckpointBudget)
     },
     coinbase: {
         env: 'COINBASE',
-        parseEnv: (val)=>val ? EthAddress.fromString(val) : undefined,
+        parseEnv: (val)=>EthAddress.fromString(val),
         description: 'Recipient of block reward.'
     },
     feeRecipient: {
@@ -58,74 +100,123 @@ 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
-    },
-    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.',
-        parseEnv: (val)=>val ? parseInt(val, 10) : undefined
+        parseEnv: (val)=>EthAddress.fromString(val)
     },
-    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)
+    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).',
+        ...optionalNumberConfigHelper()
     },
     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)
+    },
+    skipWaitForValidParentCheckpointOnL1: {
+        description: 'Bypass the parent checkpoint validity check before submitting a pipelined checkpoint, ' + 'allowing the proposer to publish even when the parent landed on L1 with invalid attestations (for testing only)',
+        ...booleanConfigHelper(DefaultSequencerConfig.skipWaitForValidParentCheckpointOnL1)
     },
     broadcastInvalidBlockProposal: {
         description: 'Broadcast invalid block proposals with corrupted state (for testing only)',
-        ...booleanConfigHelper(false)
+        ...booleanConfigHelper(DefaultSequencerConfig.broadcastInvalidBlockProposal)
+    },
+    invalidBlockProposalIndexWithinCheckpoint: {
+        description: 'Broadcast an invalid block proposal only at this indexWithinCheckpoint (for testing only)',
+        ...optionalNumberConfigHelper()
+    },
+    broadcastInvalidCheckpointProposalOnly: {
+        description: 'Broadcast invalid checkpoint proposals while keeping the underlying block proposals valid (for testing only). When unset, the checkpoint follows broadcastInvalidBlockProposal.',
+        ...booleanConfigHelper(DefaultSequencerConfig.broadcastInvalidCheckpointProposalOnly)
     },
     injectFakeAttestation: {
         description: 'Inject a fake attestation (for testing only)',
+        ...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)
+    },
+    skipBroadcastProposals: {
+        description: 'Skip broadcasting checkpoint and block proposals via gossipsub when proposer (for testing only)',
+        ...booleanConfigHelper(false)
+    },
+    skipBroadcastCheckpointProposal: {
+        description: 'Skip broadcasting only the CheckpointProposal via gossipsub when proposer; the held last block is broadcast ' + 'standalone instead so peers still receive it as a proposed-but-uncheckpointed tip (for testing only)',
         ...booleanConfigHelper(false)
     },
+    pauseProposingForSlots: {
+        description: 'List of slots for which the sequencer will not produce a proposal (for testing only). Attestation paths are unaffected.'
+    },
     ...pickConfigMappings(p2pConfigMappings, [
-        'txPublicSetupAllowList'
+        'txPublicSetupAllowListExtend'
     ])
 };
 export const sequencerClientConfigMappings = {
+    ...chainConfigMappings,
     ...validatorClientConfigMappings,
     ...sequencerConfigMappings,
     ...keyStoreConfigMappings,
     ...l1ReaderConfigMappings,
-    ...getTxSenderConfigMappings('SEQ'),
-    ...getPublisherConfigMappings('SEQ'),
-    ...chainConfigMappings,
+    ...sequencerTxSenderConfigMappings,
+    ...sequencerPublisherConfigMappings,
     ...pickConfigMappings(l1ContractsConfigMappings, [
         'ethereumSlotDuration',
         'aztecSlotDuration',

package/dest/global_variable_builder/fee_predictor.d.ts

@@ -0,0 +1,37 @@
+import { type RollupContract } from '@aztec/ethereum/contracts';
+import type { DateProvider } from '@aztec/foundation/timer';
+import { GasFees, ManaUsageEstimate } from '@aztec/stdlib/gas';
+/**
+ * Predicts min fees for LAG upcoming slots based on the L1 oracle state.
+ * A new oracle update can activate at startSlot + LAG, so only the first LAG entries
+ * are guaranteed stable. Caches L1 queries per L1 block and recomputes predictions
+ * for each mana usage estimate.
+ */
+export declare class FeePredictor {
+    private readonly rollupContract;
+    private readonly publicClient;
+    private readonly dateProvider;
+    private cachedState;
+    private cachedL1BlockNumber;
+    private readonly slotDuration;
+    private readonly l1GenesisTime;
+    private readonly ethereumSlotDuration;
+    constructor(rollupContract: RollupContract, publicClient: {
+        getBlockNumber: (opts?: {
+            cacheTime?: number;
+        }) => Promise<bigint>;
+    }, dateProvider: DateProvider, config: {
+        slotDuration: number;
+        l1GenesisTime: bigint;
+        ethereumSlotDuration: number;
+    });
+    /** Returns predicted min fees for each slot in the prediction window. */
+    getPredictedMinFees(manaUsage: ManaUsageEstimate): Promise<GasFees[]>;
+    private getState;
+    private fetchState;
+    /** Computes per-slot fee predictions given cached state and a mana usage assumption. */
+    private computePredictions;
+    private getAssumedManaUsed;
+    private computeGasFees;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3ByZWRpY3Rvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2dsb2JhbF92YXJpYWJsZV9idWlsZGVyL2ZlZV9wcmVkaWN0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFvRCxLQUFLLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBR2xILE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTVELE9BQU8sRUFFTCxPQUFPLEVBRVAsaUJBQWlCLEVBR2xCLE1BQU0sbUJBQW1CLENBQUM7QUFlM0I7Ozs7O0dBS0c7QUFDSCxxQkFBYSxZQUFZO0lBU3JCLE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYztJQUMvQixPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZO0lBVi9CLE9BQU8sQ0FBQyxXQUFXLENBQXNDO0lBQ3pELE9BQU8sQ0FBQyxtQkFBbUIsQ0FBcUI7SUFFaEQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQVM7SUFDdEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQVM7SUFDdkMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBUztJQUU5QyxZQUNtQixjQUFjLEVBQUUsY0FBYyxFQUM5QixZQUFZLEVBQUU7UUFBRSxjQUFjLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUFFLFNBQVMsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtTQUFFLEtBQUssT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0tBQUUsRUFDcEYsWUFBWSxFQUFFLFlBQVksRUFDM0MsTUFBTSxFQUFFO1FBQUUsWUFBWSxFQUFFLE1BQU0sQ0FBQztRQUFDLGFBQWEsRUFBRSxNQUFNLENBQUM7UUFBQyxvQkFBb0IsRUFBRSxNQUFNLENBQUE7S0FBRSxFQUt0RjtJQUVELHlFQUF5RTtJQUNuRSxtQkFBbUIsQ0FBQyxTQUFTLEVBQUUsaUJBQWlCLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBRzFFO1lBR2EsUUFBUTtZQVNSLFVBQVU7SUFpRHhCLHdGQUF3RjtJQUN4RixPQUFPLENBQUMsa0JBQWtCO0lBdUIxQixPQUFPLENBQUMsa0JBQWtCO0lBVzFCLE9BQU8sQ0FBQyxjQUFjO0NBbUJ2QiJ9

package/dest/global_variable_builder/fee_predictor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fee_predictor.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/fee_predictor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoD,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGlH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAEL,OAAO,EAEP,iBAAiB,EAGlB,MAAM,mBAAmB,CAAC;AAe3B;;;;;GAKG;AACH,qBAAa,YAAY;IASrB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAV/B,OAAO,CAAC,WAAW,CAAsC;IACzD,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAE9C,YACmB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE;QAAE,cAAc,EAAE,CAAC,IAAI,CAAC,EAAE;YAAE,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,EACpF,YAAY,EAAE,YAAY,EAC3C,MAAM,EAAE;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAA;KAAE,EAKtF;IAED,yEAAyE;IACnE,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAG1E;YAGa,QAAQ;YASR,UAAU;IAiDxB,wFAAwF;IACxF,OAAO,CAAC,kBAAkB;IAuB1B,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,cAAc;CAmBvB"}