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

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

@@ -1,28 +1,32 @@
 import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
 import { EpochCache } from '@aztec/epoch-cache';
+import { PublisherManager } from '@aztec/ethereum';
 import { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { DateProvider } from '@aztec/foundation/timer';
+import type { KeystoreManager } from '@aztec/node-keystore';
 import type { P2P } from '@aztec/p2p';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { SlasherClientInterface } from '@aztec/slasher';
 import type { L2BlockSource } from '@aztec/stdlib/block';
-import type { ContractDataSource } from '@aztec/stdlib/contract';
-import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import type { IFullNodeBlockBuilder, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
-import type { TelemetryClient } from '@aztec/telemetry-client';
-import type { ValidatorClient } from '@aztec/validator-client';
+import { L1Metrics, type TelemetryClient } from '@aztec/telemetry-client';
+import { type ValidatorClient } from '@aztec/validator-client';
 import type { SequencerClientConfig } from '../config.js';
-import { SequencerPublisher } from '../publisher/index.js';
+import { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
 import { Sequencer, type SequencerConfig } from '../sequencer/index.js';
-import type { SlasherClient } from '../slasher/index.js';
 /**
  * Encapsulates the full sequencer and publisher.
  */
 export declare class SequencerClient {
+    protected publisherManager: PublisherManager<L1TxUtilsWithBlobs>;
     protected sequencer: Sequencer;
-    constructor(sequencer: Sequencer);
+    protected blockBuilder: IFullNodeBlockBuilder;
+    protected validatorClient?: ValidatorClient | undefined;
+    private l1Metrics?;
+    constructor(publisherManager: PublisherManager<L1TxUtilsWithBlobs>, sequencer: Sequencer, blockBuilder: IFullNodeBlockBuilder, validatorClient?: ValidatorClient | undefined, l1Metrics?: L1Metrics | undefined);
     /**
-     * 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.
@@ -31,41 +35,37 @@ export declare class SequencerClient {
      * @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 new(config: SequencerClientConfig, deps: {
         validatorClient: ValidatorClient | undefined;
         p2pClient: P2P;
         worldStateSynchronizer: WorldStateSynchronizer;
-        slasherClient: SlasherClient;
-        contractDataSource: ContractDataSource;
+        slasherClient: SlasherClientInterface | undefined;
+        blockBuilder: IFullNodeBlockBuilder;
         l2BlockSource: L2BlockSource;
         l1ToL2MessageSource: L1ToL2MessageSource;
         telemetry: TelemetryClient;
-        publisher?: SequencerPublisher;
+        publisherFactory?: SequencerPublisherFactory;
         blobSinkClient?: BlobSinkClientInterface;
         dateProvider: DateProvider;
         epochCache?: EpochCache;
-        l1TxUtils?: L1TxUtilsWithBlobs;
+        l1TxUtils: L1TxUtilsWithBlobs[];
+        nodeKeyStore: KeystoreManager;
     }): Promise<SequencerClient>;
     /**
-     * Updates sequencer config.
+     * Updates sequencer and validator client config.
      * @param config - New parameters.
      */
-    updateSequencerConfig(config: SequencerConfig): Promise<void>;
+    updateConfig(config: SequencerConfig & Partial<ValidatorClientFullConfig>): void;
+    /** Starts the sequencer. */
+    start(): Promise<void>;
     /**
      * Stops the sequencer from processing new txs.
      */
     stop(): Promise<void>;
-    /** Forces the sequencer to bypass all time and tx count checks for the next block and build anyway. */
-    flush(): void;
-    /**
-     * Restarts the sequencer after being stopped.
-     */
-    restart(): void;
-    get coinbase(): EthAddress;
-    get feeRecipient(): AztecAddress;
-    get forwarderAddress(): EthAddress;
+    getSequencer(): Sequencer;
+    get validatorAddresses(): EthAddress[] | undefined;
+    get maxL2BlockGas(): number | undefined;
 }
 //# sourceMappingURL=sequencer-client.d.ts.map

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;AAUhD,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,GAAG,EAAE,MAAM,YAAY,CAAC;AAGtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD;;GAEG;AACH,qBAAa,eAAe;IACd,SAAS,CAAC,SAAS,EAAE,SAAS;gBAApB,SAAS,EAAE,SAAS;IAE1C;;;;;;;;;;;;OAYG;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,aAAa,CAAC;QAC7B,kBAAkB,EAAE,kBAAkB,CAAC;QACvC,aAAa,EAAE,aAAa,CAAC;QAC7B,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,SAAS,EAAE,eAAe,CAAC;QAC3B,SAAS,CAAC,EAAE,kBAAkB,CAAC;QAC/B,cAAc,CAAC,EAAE,uBAAuB,CAAC;QACzC,YAAY,EAAE,YAAY,CAAC;QAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,SAAS,CAAC,EAAE,kBAAkB,CAAC;KAChC;IAiHH;;;OAGG;IACI,qBAAqB,CAAC,MAAM,EAAE,eAAe;IAIpD;;OAEG;IACU,IAAI;IAIjB,uGAAuG;IAChG,KAAK;IAIZ;;OAEG;IACI,OAAO;IAId,IAAI,QAAQ,IAAI,UAAU,CAEzB;IAED,IAAI,YAAY,IAAI,YAAY,CAE/B;IAED,IAAI,gBAAgB,IAAI,UAAU,CAEjC;CACF"}
+{"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"}

package/dest/client/sequencer-client.js

@@ -1,22 +1,30 @@
 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 { GovernanceProposerContract, PublisherManager, RollupContract, getPublicClient, isAnvilTestChain } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
-import { LightweightBlockBuilderFactory } from '@aztec/prover-client/block-builder';
-import { PublicProcessorFactory } from '@aztec/simulator/server';
+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 { SequencerPublisher } from '../publisher/index.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){
+    blockBuilder;
+    validatorClient;
+    l1Metrics;
+    constructor(publisherManager, sequencer, blockBuilder, validatorClient, l1Metrics){
+        this.publisherManager = publisherManager;
         this.sequencer = sequencer;
+        this.blockBuilder = blockBuilder;
+        this.validatorClient = validatorClient;
+        this.l1Metrics = l1Metrics;
     }
     /**
-   * 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 +33,99 @@ 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 { validatorClient, p2pClient, worldStateSynchronizer, slasherClient, blockBuilder, 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([
             rollupContract.getL1GenesisTime(),
             rollupContract.getSlotDuration()
         ]);
-        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, {
             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 slashFactoryContract = new SlashFactoryContract(publicClient, config.l1Contracts.slashFactoryAddress?.toString() ?? EthAddress.ZERO.toString());
+        const publisherFactory = deps.publisherFactory ?? new SequencerPublisherFactory(config, {
             telemetry: telemetryClient,
             blobSinkClient: deps.blobSinkClient,
-            rollupContract,
             epochCache,
-            forwarderContract,
             governanceProposerContract,
-            slashingProposerContract
+            slashFactoryContract,
+            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.
+        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;
+        }
+        // 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.
         // 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.
         // See https://www.blocknative.com/blog/anatomy-of-a-slot#7 for more info.
-        const maxL1TxInclusionTimeIntoSlot = config.maxL1TxInclusionTimeIntoSlot ?? isAnvilTestChain(config.l1ChainId) ? ethereumSlotDuration : 0;
+        const maxL1TxInclusionTimeIntoSlot = config.maxL1TxInclusionTimeIntoSlot ?? isAnvilTestChain(config.l1ChainId) ? ethereumSlotDuration - 1 : 0;
         const l1Constants = {
             l1GenesisTime,
             slotDuration: Number(slotDuration),
             ethereumSlotDuration
         };
-        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, blockBuilder, l1Constants, deps.dateProvider, epochCache, rollupContract, {
             ...config,
-            maxL1TxInclusionTimeIntoSlot
-        }, telemetryClient);
-        await validatorClient?.start();
-        await sequencer.start();
-        return new SequencerClient(sequencer);
+            maxL1TxInclusionTimeIntoSlot,
+            maxL2BlockGas: sequencerManaLimit
+        }, telemetryClient, log);
+        await sequencer.init();
+        return new SequencerClient(publisherManager, sequencer, blockBuilder, validatorClient, l1Metrics);
     }
     /**
-   * 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.blockBuilder.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();
     }
     /**
    * Stops the sequencer from processing new txs.
    */ async stop() {
         await this.sequencer.stop();
+        await this.validatorClient?.stop();
+        this.publisherManager.interrupt();
+        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();
-    }
-    /**
-   * Restarts the sequencer after being stopped.
-   */ restart() {
-        this.sequencer.restart();
-    }
-    get coinbase() {
-        return this.sequencer.coinbase;
+    getSequencer() {
+        return this.sequencer;
     }
-    get feeRecipient() {
-        return this.sequencer.feeRecipient;
+    get validatorAddresses() {
+        return this.sequencer.getValidatorAddresses();
     }
-    get forwarderAddress() {
-        return this.sequencer.getForwarderAddress();
+    get maxL2BlockGas() {
+        return this.sequencer.maxL2BlockGas;
     }
 }

package/dest/config.d.ts

@@ -1,29 +1,21 @@
 import { type L1ContractsConfig, type L1ReaderConfig } from '@aztec/ethereum';
 import { type ConfigMappingsType } from '@aztec/foundation/config';
-import { type AllowedElement, type ChainConfig, type SequencerConfig } from '@aztec/stdlib/config';
+import { type KeyStoreConfig } from '@aztec/node-keystore';
+import { type P2PConfig } from '@aztec/p2p';
+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';
 export * from './publisher/config.js';
 export type { SequencerConfig };
+export declare const DEFAULT_ATTESTATION_PROPAGATION_TIME = 2;
 /**
  * Configuration settings for the SequencerClient.
  */
-export type SequencerClientConfig = PublisherConfig & TxSenderConfig & SequencerConfig & L1ReaderConfig & ChainConfig & Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration' | 'aztecEpochDuration'>;
+export type SequencerClientConfig = PublisherConfig & KeyStoreConfig & ValidatorClientConfig & TxSenderConfig & SequencerConfig & L1ReaderConfig & ChainConfig & Pick<P2PConfig, 'txPublicSetupAllowList'> & 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

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,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"}

package/dest/config.js

@@ -1,12 +1,14 @@
 import { l1ContractsConfigMappings, l1ReaderConfigMappings } from '@aztec/ethereum';
 import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, 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';
+import { p2pConfigMappings } from '@aztec/p2p';
 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';
 export * from './publisher/config.js';
+export const DEFAULT_ATTESTATION_PROPAGATION_TIME = 2;
 export const sequencerConfigMappings = {
     transactionPollingIntervalMS: {
         env: 'SEQ_TX_POLLING_INTERVAL_MS',
@@ -23,6 +25,11 @@ export const sequencerConfigMappings = {
         description: 'The minimum number of txs to include in a block.',
         ...numberConfigHelper(1)
     },
+    publishTxsWithProposals: {
+        env: 'SEQ_PUBLISH_TXS_WITH_PROPOSALS',
+        description: 'Whether to publish txs with proposals.',
+        ...booleanConfigHelper(false)
+    },
     maxL2BlockGas: {
         env: 'SEQ_MAX_L2_BLOCK_GAS',
         description: 'The maximum L2 block gas.',
@@ -51,12 +58,6 @@ 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',
@@ -66,7 +67,7 @@ export const sequencerConfigMappings = {
         env: 'SEQ_ENFORCE_TIME_TABLE',
         description: 'Whether to enforce the time table when building blocks',
         ...booleanConfigHelper(),
-        defaultValue: false
+        defaultValue: true
     },
     governanceProposerPayload: {
         env: 'GOVERNANCE_PROPOSER_PAYLOAD_ADDRESS',
@@ -78,10 +79,49 @@ export const sequencerConfigMappings = {
         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
-    }
+    },
+    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)
+    },
+    fakeProcessingDelayPerTxMs: {
+        description: 'Used for testing to introduce a fake delay after processing each tx'
+    },
+    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)
+    },
+    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)
+    },
+    skipCollectingAttestations: {
+        description: 'Whether to skip collecting attestations from validators and only use self-attestations (for testing only)',
+        ...booleanConfigHelper(false)
+    },
+    skipInvalidateBlockAsProposer: {
+        description: 'Do not invalidate the previous block if invalid when we are the proposer (for testing only)',
+        ...booleanConfigHelper(false)
+    },
+    broadcastInvalidBlockProposal: {
+        description: 'Broadcast invalid block proposals with corrupted state (for testing only)',
+        ...booleanConfigHelper(false)
+    },
+    injectFakeAttestation: {
+        description: 'Inject a fake attestation (for testing only)',
+        ...booleanConfigHelper(false)
+    },
+    ...pickConfigMappings(p2pConfigMappings, [
+        'txPublicSetupAllowList'
+    ])
 };
 export const sequencerClientConfigMappings = {
+    ...validatorClientConfigMappings,
     ...sequencerConfigMappings,
+    ...keyStoreConfigMappings,
     ...l1ReaderConfigMappings,
     ...getTxSenderConfigMappings('SEQ'),
     ...getPublisherConfigMappings('SEQ'),
@@ -97,47 +137,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;
-}

package/dest/global_variable_builder/global_builder.d.ts

@@ -1,6 +1,5 @@
 import { type L1ContractsConfig, type L1ReaderConfig } from '@aztec/ethereum';
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { GasFees } from '@aztec/stdlib/gas';
 import type { GlobalVariableBuilder as GlobalVariableBuilderInterface } from '@aztec/stdlib/tx';
@@ -10,15 +9,21 @@ import { GlobalVariables } from '@aztec/stdlib/tx';
  */
 export declare class GlobalVariableBuilder implements GlobalVariableBuilderInterface {
     private log;
-    private rollupContract;
-    private publicClient;
-    private ethereumSlotDuration;
+    private currentBaseFees;
+    private currentL1BlockNumber;
+    private readonly rollupContract;
+    private readonly publicClient;
+    private readonly ethereumSlotDuration;
+    private chainId?;
+    private version?;
     constructor(config: L1ReaderConfig & Pick<L1ContractsConfig, 'ethereumSlotDuration'>);
     /**
      * Computes the "current" base fees, e.g., the price that you currently should pay to get include in the next block
-     * @returns Base fees for the expected next block
+     * @returns Base fees for the next block
      */
+    private computeCurrentBaseFees;
     getCurrentBaseFees(): Promise<GasFees>;
+    getGlobalConstantVariables(): Promise<Pick<GlobalVariables, 'chainId' | 'version'>>;
     /**
      * Simple builder of global variables that use the minimum time possible.
      * @param blockNumber - The block number to build global variables for.
@@ -27,6 +32,6 @@ export declare class GlobalVariableBuilder implements GlobalVariableBuilderInter
      * @param slotNumber - The slot number to use for the global variables, if undefined it will be calculated.
      * @returns The global variables for the given block number.
      */
-    buildGlobalVariables(blockNumber: Fr, coinbase: EthAddress, feeRecipient: AztecAddress, slotNumber?: bigint): Promise<GlobalVariables>;
+    buildGlobalVariables(blockNumber: number, coinbase: EthAddress, feeRecipient: AztecAddress, slotNumber?: bigint): Promise<GlobalVariables>;
 }
 //# sourceMappingURL=global_builder.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"global_builder.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/global_builder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,qBAAqB,IAAI,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAChG,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAInD;;GAEG;AACH,qBAAa,qBAAsB,YAAW,8BAA8B;IAC1E,OAAO,CAAC,GAAG,CAAqD;IAEhE,OAAO,CAAC,cAAc,CAA4D;IAClF,OAAO,CAAC,YAAY,CAAmB;IACvC,OAAO,CAAC,oBAAoB,CAAS;gBAEzB,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;IAoBpF;;;OAGG;IACU,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;IAanD;;;;;;;OAOG;IACU,oBAAoB,CAC/B,WAAW,EAAE,EAAE,EACf,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,eAAe,CAAC;CA8B5B"}
+{"version":3,"file":"global_builder.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/global_builder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAIpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,qBAAqB,IAAI,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAChG,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAInD;;GAEG;AACH,qBAAa,qBAAsB,YAAW,8BAA8B;IAC1E,OAAO,CAAC,GAAG,CAAqD;IAChE,OAAO,CAAC,eAAe,CAAwD;IAC/E,OAAO,CAAC,oBAAoB,CAAiC;IAE7D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAmB;IAChD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAE9C,OAAO,CAAC,OAAO,CAAC,CAAK;IACrB,OAAO,CAAC,OAAO,CAAC,CAAK;gBAET,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;IAgBpF;;;OAGG;YACW,sBAAsB;IAavB,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;IAYtC,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,SAAS,CAAC,CAAC;IAUhG;;;;;;;OAOG;IACU,oBAAoB,CAC/B,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,eAAe,CAAC;CA4B5B"}