@aztec/sequencer-client 0.0.0-test.1 → 0.0.1-commit.017a351

package/dest/client/sequencer-client.js

@@ -1,22 +1,34 @@
+import { MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT } from '@aztec/constants';
 import { EpochCache } from '@aztec/epoch-cache';
-import { ForwarderContract, GovernanceProposerContract, RollupContract, SlashingProposerContract, createEthereumChain, createL1Clients, isAnvilTestChain } from '@aztec/ethereum';
-import { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
-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 { LightweightBlockBuilderFactory } from '@aztec/prover-client/block-builder';
-import { PublicProcessorFactory } from '@aztec/simulator/server';
-import { GlobalVariableBuilder } from '../global_variable_builder/index.js';
-import { SequencerPublisher } from '../publisher/index.js';
+import { L1Metrics } from '@aztec/telemetry-client';
+import { NodeKeystoreAdapter } from '@aztec/validator-client';
+import { getPublisherConfigFromSequencerConfig } from '../config.js';
+import { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
 import { Sequencer } from '../sequencer/index.js';
 /**
  * Encapsulates the full sequencer and publisher.
  */ export class SequencerClient {
+    publisherManager;
     sequencer;
-    constructor(sequencer){
+    checkpointsBuilder;
+    validatorClient;
+    l1Metrics;
+    delayer_;
+    constructor(publisherManager, sequencer, checkpointsBuilder, validatorClient, l1Metrics, delayer_){
+        this.publisherManager = publisherManager;
         this.sequencer = sequencer;
+        this.checkpointsBuilder = checkpointsBuilder;
+        this.validatorClient = validatorClient;
+        this.l1Metrics = l1Metrics;
+        this.delayer_ = delayer_;
     }
     /**
-   * Initializes and starts a new instance.
+   * Initializes a new instance.
    * @param config - Configuration for the sequencer, publisher, and L1 tx sender.
    * @param p2pClient - P2P client that provides the txs to be sequenced.
    * @param validatorClient - Validator client performs attestation duties when rotating proposers.
@@ -25,93 +37,136 @@ import { Sequencer } from '../sequencer/index.js';
    * @param l2BlockSource - Provides information about the previously published blocks.
    * @param l1ToL2MessageSource - Provides access to L1 to L2 messages.
    * @param prover - An instance of a block prover
-   * @param simulationProvider - An instance of a simulation provider
    * @returns A new running instance.
    */ static async new(config, deps) {
-        const { validatorClient, p2pClient, worldStateSynchronizer, slasherClient, contractDataSource, l2BlockSource, l1ToL2MessageSource, telemetry: telemetryClient } = deps;
-        const { l1RpcUrls: rpcUrls, l1ChainId: chainId, publisherPrivateKey } = config;
-        const chain = createEthereumChain(rpcUrls, chainId);
-        const log = createLogger('sequencer-client');
-        const { publicClient, walletClient } = createL1Clients(rpcUrls, publisherPrivateKey, chain.chainInfo);
-        const l1TxUtils = deps.l1TxUtils ?? new L1TxUtilsWithBlobs(publicClient, walletClient, log, config);
-        const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
-        const [l1GenesisTime, slotDuration] = await Promise.all([
+        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, 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 forwarderContract = config.customForwarderContractAddress && config.customForwarderContractAddress !== EthAddress.ZERO ? new ForwarderContract(publicClient, config.customForwarderContractAddress.toString(), config.l1Contracts.rollupAddress.toString()) : await ForwarderContract.create(walletClient.account.address, walletClient, publicClient, log, config.l1Contracts.rollupAddress.toString());
-        const governanceProposerContract = new GovernanceProposerContract(publicClient, config.l1Contracts.governanceProposerAddress.toString());
-        const slashingProposerAddress = await rollupContract.getSlashingProposerAddress();
-        const slashingProposerContract = new SlashingProposerContract(publicClient, slashingProposerAddress.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,
-            aztecSlotDuration: config.aztecSlotDuration,
-            ethereumSlotDuration: config.ethereumSlotDuration,
-            aztecEpochDuration: config.aztecEpochDuration
+            ethereumSlotDuration: config.ethereumSlotDuration
         }, {
             dateProvider: deps.dateProvider
         });
-        const publisher = deps.publisher ?? new SequencerPublisher(config, {
-            l1TxUtils,
+        const publisherFactory = deps.publisherFactory ?? new SequencerPublisherFactory(config, {
             telemetry: telemetryClient,
-            blobSinkClient: deps.blobSinkClient,
-            rollupContract,
+            blobClient: deps.blobClient,
             epochCache,
-            forwarderContract,
             governanceProposerContract,
-            slashingProposerContract
+            rollupContract,
+            dateProvider: deps.dateProvider,
+            publisherManager,
+            nodeKeyStore: NodeKeystoreAdapter.fromKeyStoreManager(deps.nodeKeyStore),
+            logger: log
         });
-        const globalsBuilder = new GlobalVariableBuilder(config);
-        const publicProcessorFactory = new PublicProcessorFactory(contractDataSource, deps.dateProvider, telemetryClient);
         const ethereumSlotDuration = config.ethereumSlotDuration;
-        // When running in anvil, assume we can post a tx up until the very last second 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.
+        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, 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 : 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(publisher, validatorClient, globalsBuilder, p2pClient, worldStateSynchronizer, slasherClient, new LightweightBlockBuilderFactory(telemetryClient), l2BlockSource, l1ToL2MessageSource, publicProcessorFactory, contractDataSource, l1Constants, deps.dateProvider, {
+        const sequencer = new Sequencer(publisherFactory, validatorClient, globalsBuilder, p2pClient, worldStateSynchronizer, slasherClient, l2BlockSource, l1ToL2MessageSource, checkpointsBuilder, l1Constants, deps.dateProvider, epochCache, rollupContract, {
             ...config,
-            maxL1TxInclusionTimeIntoSlot
-        }, telemetryClient);
-        await validatorClient?.start();
-        await sequencer.start();
-        return new SequencerClient(sequencer);
+            l1PublishingTime,
+            maxL2BlockGas,
+            maxDABlockGas,
+            maxTxsPerBlock
+        }, telemetryClient, log);
+        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 config.
+   * Updates sequencer and validator client config.
    * @param config - New parameters.
-   */ updateSequencerConfig(config) {
-        return this.sequencer.updateConfig(config);
+   */ updateConfig(config) {
+        this.sequencer.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.start();
     }
     /**
    * Stops the sequencer from processing new txs.
    */ async stop() {
         await this.sequencer.stop();
+        await this.validatorClient?.stop();
+        await this.publisherManager.stop();
+        this.l1Metrics?.stop();
     }
-    /** Forces the sequencer to bypass all time and tx count checks for the next block and build anyway. */ flush() {
-        this.sequencer.flush();
+    /** Triggers an immediate run of the sequencer, bypassing the polling interval. */ trigger() {
+        return this.sequencer.trigger();
     }
-    /**
-   * Restarts the sequencer after being stopped.
-   */ restart() {
-        this.sequencer.restart();
+    getSequencer() {
+        return this.sequencer;
+    }
+    /** Updates the publisher factory's node keystore adapter after a keystore reload. */ updatePublisherNodeKeyStore(adapter) {
+        this.sequencer.updatePublisherNodeKeyStore(adapter);
     }
-    get coinbase() {
-        return this.sequencer.coinbase;
+    /** Returns the shared tx delayer for sequencer L1 txs, if enabled. Test-only. */ getDelayer() {
+        return this.delayer_;
+    }
+    get validatorAddresses() {
+        return this.sequencer.getValidatorAddresses();
+    }
+    get maxL2BlockGas() {
+        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;
     }
-    get feeRecipient() {
-        return this.sequencer.feeRecipient;
+    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;
     }
-    get forwarderAddress() {
-        return this.sequencer.getForwarderAddress();
+    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,29 +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 AllowedElement, type ChainConfig, type SequencerConfig } from '@aztec/stdlib/config';
-import { type PublisherConfig, type TxSenderConfig } from './publisher/config.js';
+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/config';
+import { type SequencerPublisherConfig, type SequencerTxSenderConfig } from './publisher/config.js';
 export * from './publisher/config.js';
 export type { SequencerConfig };
+/**
+ * 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 & TxSenderConfig & SequencerConfig & L1ReaderConfig & ChainConfig & 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;
-/**
- * Parses a string to a list of allowed elements.
- * Each encoded is expected to be of one of the following formats
- * `I:${address}`
- * `I:${address}:${selector}`
- * `C:${classId}`
- * `C:${classId}:${selector}`
- *
- * @param value The string to parse
- * @returns A list of allowed elements
- */
-export declare function parseSequencerAllowList(value: string): AllowedElement[];
-//# 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;AAKlC,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAuB,MAAM,sBAAsB,CAAC;AAExH,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAGpB,MAAM,uBAAuB,CAAC;AAE/B,cAAc,uBAAuB,CAAC;AACtC,YAAY,EAAE,eAAe,EAAE,CAAC;AAEhC;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,eAAe,GACjD,cAAc,GACd,eAAe,GACf,cAAc,GACd,WAAW,GACX,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,GAAG,mBAAmB,GAAG,oBAAoB,CAAC,CAAC;AAE/F,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,CAyEvE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CAOnF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,EAAE,CAqCvE"}
+{"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,41 +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 { Fr } from '@aztec/foundation/fields';
-import { FunctionSelector } from '@aztec/stdlib/abi';
+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 { 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';
+/**
+ * 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(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: {
@@ -51,41 +100,123 @@ export const sequencerConfigMappings = {
         env: 'ACVM_BINARY_PATH',
         description: 'The path to the ACVM binary'
     },
-    allowedInSetup: {
-        env: 'SEQ_ALLOWED_SETUP_FN',
-        parseEnv: (val)=>parseSequencerAllowList(val),
-        description: 'The list of functions calls allowed to run in setup',
-        printDefault: ()=>'AuthRegistry, FeeJuice.increase_public_balance, Token.increase_public_balance, FPC.prepare_fee'
-    },
-    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: false
+        ...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)
+    },
+    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(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(DefaultSequencerConfig.secondsBeforeInvalidatingBlockAsNonCommitteeMember)
+    },
+    skipCollectingAttestations: {
+        description: 'Whether to skip collecting attestations from validators and only use self-attestations (for testing only)',
+        ...booleanConfigHelper(DefaultSequencerConfig.skipCollectingAttestations)
+    },
+    skipInvalidateBlockAsProposer: {
+        description: 'Do not invalidate the previous block if invalid when we are the proposer (for testing only)',
+        ...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(DefaultSequencerConfig.broadcastInvalidBlockProposal)
     },
-    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
-    }
+    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, [
+        'txPublicSetupAllowListExtend'
+    ])
 };
 export const sequencerClientConfigMappings = {
+    ...chainConfigMappings,
+    ...validatorClientConfigMappings,
     ...sequencerConfigMappings,
+    ...keyStoreConfigMappings,
     ...l1ReaderConfigMappings,
-    ...getTxSenderConfigMappings('SEQ'),
-    ...getPublisherConfigMappings('SEQ'),
-    ...chainConfigMappings,
+    ...sequencerTxSenderConfigMappings,
+    ...sequencerPublisherConfigMappings,
     ...pickConfigMappings(l1ContractsConfigMappings, [
         'ethereumSlotDuration',
         'aztecSlotDuration',
@@ -97,47 +228,3 @@ export const sequencerClientConfigMappings = {
  */ export function getConfigEnvVars() {
     return getConfigFromMappings(sequencerClientConfigMappings);
 }
-/**
- * Parses a string to a list of allowed elements.
- * Each encoded is expected to be of one of the following formats
- * `I:${address}`
- * `I:${address}:${selector}`
- * `C:${classId}`
- * `C:${classId}:${selector}`
- *
- * @param value The string to parse
- * @returns A list of allowed elements
- */ export function parseSequencerAllowList(value) {
-    const entries = [];
-    if (!value) {
-        return entries;
-    }
-    for (const val of value.split(',')){
-        const [typeString, identifierString, selectorString] = val.split(':');
-        const selector = selectorString !== undefined ? FunctionSelector.fromString(selectorString) : undefined;
-        if (typeString === 'I') {
-            if (selector) {
-                entries.push({
-                    address: AztecAddress.fromString(identifierString),
-                    selector
-                });
-            } else {
-                entries.push({
-                    address: AztecAddress.fromString(identifierString)
-                });
-            }
-        } else if (typeString === 'C') {
-            if (selector) {
-                entries.push({
-                    classId: Fr.fromHexString(identifierString),
-                    selector
-                });
-            } else {
-                entries.push({
-                    classId: Fr.fromHexString(identifierString)
-                });
-            }
-        }
-    }
-    return entries;
-}