@aztec/sequencer-client 3.0.0-canary.a9708bd → 3.0.0-devnet.3

package/dest/sequencer/utils.js

@@ -1,28 +1,13 @@
 export var SequencerState = /*#__PURE__*/ function(SequencerState) {
-    /**
-   * Sequencer is stopped and not processing any txs from the pool.
-   */ SequencerState["STOPPED"] = "STOPPED";
-    /**
-   * Sequencer is awaiting the next call to work().
-   */ SequencerState["IDLE"] = "IDLE";
-    /**
-   * Synchronizing with the L2 chain.
-   */ SequencerState["SYNCHRONIZING"] = "SYNCHRONIZING";
-    /**
-   * Checking if we are the proposer for the current slot.
-   */ SequencerState["PROPOSER_CHECK"] = "PROPOSER_CHECK";
-    /**
-   * Initializing the block proposal. Will move to CREATING_BLOCK if there are valid txs to include, or back to SYNCHRONIZING otherwise.
-   */ SequencerState["INITIALIZING_PROPOSAL"] = "INITIALIZING_PROPOSAL";
-    /**
-   * Creating a new L2 block. Includes processing public function calls and running rollup circuits. Will move to PUBLISHING_CONTRACT_DATA.
-   */ SequencerState["CREATING_BLOCK"] = "CREATING_BLOCK";
-    /**
-   * Collecting attestations from its peers. Will move to PUBLISHING_BLOCK.
-   */ SequencerState["COLLECTING_ATTESTATIONS"] = "COLLECTING_ATTESTATIONS";
-    /**
-   * Sending the tx to L1 with the L2 block data and awaiting it to be mined. Will move to SYNCHRONIZING.
-   */ SequencerState["PUBLISHING_BLOCK"] = "PUBLISHING_BLOCK";
+    /** Sequencer is stopped and not processing any txs from the pool. */ SequencerState["STOPPED"] = "STOPPED";
+    /** Sequencer is being stopped. Will move to STOPPED shortly. */ SequencerState["STOPPING"] = "STOPPING";
+    /** Sequencer is awaiting the next call to work(). */ SequencerState["IDLE"] = "IDLE";
+    /** Synchronizing with the L2 chain. */ SequencerState["SYNCHRONIZING"] = "SYNCHRONIZING";
+    /** Checking if we are the proposer for the current slot. */ SequencerState["PROPOSER_CHECK"] = "PROPOSER_CHECK";
+    /** Initializing the block proposal. Will move to CREATING_BLOCK if there are valid txs to include, or back to SYNCHRONIZING otherwise. */ SequencerState["INITIALIZING_PROPOSAL"] = "INITIALIZING_PROPOSAL";
+    /** Creating a new L2 block. Includes processing public function calls and running rollup circuits. Will move to PUBLISHING_CONTRACT_DATA. */ SequencerState["CREATING_BLOCK"] = "CREATING_BLOCK";
+    /** Collecting attestations from its peers. Will move to PUBLISHING_BLOCK. */ SequencerState["COLLECTING_ATTESTATIONS"] = "COLLECTING_ATTESTATIONS";
+    /** Sending the tx to L1 with the L2 block data and awaiting it to be mined. Will move to SYNCHRONIZING. */ SequencerState["PUBLISHING_BLOCK"] = "PUBLISHING_BLOCK";
     return SequencerState;
 }({});
 export function sequencerStateToNumber(state) {

package/dest/tx_validator/tx_validator_factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx_validator_factory.d.ts","sourceRoot":"","sources":["../../src/tx_validator/tx_validator_factory.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,6BAA6B,GAAG,SAAS,EACnD,EACE,SAAS,EACT,aAAa,EACb,cAAc,EACd,OAAO,EACP,kBAAkB,EAClB,SAAS,EACT,WAAW,EACX,YAAY,GACb,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,cAAc,EAAE,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;CACvB,GACA,WAAW,CAAC,EAAE,CAAC,CA0BjB;AAED,wBAAgB,+BAA+B,CAC7C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,cAAc,EAAE,GAC/B,wBAAwB,CAgB1B"}
+{"version":3,"file":"tx_validator_factory.d.ts","sourceRoot":"","sources":["../../src/tx_validator/tx_validator_factory.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,6BAA6B,GAAG,SAAS,EACnD,EACE,SAAS,EACT,aAAa,EACb,cAAc,EACd,OAAO,EACP,kBAAkB,EAClB,SAAS,EACT,WAAW,EACX,YAAY,GACb,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,cAAc,EAAE,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;CACvB,GACA,WAAW,CAAC,EAAE,CAAC,CA4BjB;AAED,wBAAgB,+BAA+B,CAC7C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,cAAc,EAAE,GAC/B,wBAAwB,CAgB1B"}

package/dest/tx_validator/tx_validator_factory.js

@@ -1,7 +1,7 @@
 import { Fr } from '@aztec/foundation/fields';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { AggregateTxValidator, ArchiveCache, BlockHeaderTxValidator, DataTxValidator, DoubleSpendTxValidator, GasTxValidator, MetadataTxValidator, PhasesTxValidator, TxPermittedValidator, TxProofValidator } from '@aztec/p2p';
-import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { AggregateTxValidator, ArchiveCache, BlockHeaderTxValidator, DataTxValidator, DoubleSpendTxValidator, GasTxValidator, MetadataTxValidator, PhasesTxValidator, TimestampTxValidator, TxPermittedValidator, TxProofValidator } from '@aztec/p2p';
+import { ProtocolContractAddress, protocolContractsHash } from '@aztec/protocol-contracts';
 import { DatabasePublicStateSource } from '@aztec/stdlib/trees';
 import { NullifierCache } from './nullifier_cache.js';
 export function createValidatorForAcceptingTxs(db, contractDataSource, verifier, { l1ChainId, rollupVersion, setupAllowList, gasFees, skipFeeEnforcement, timestamp, blockNumber, txsPermitted }) {
@@ -11,11 +11,13 @@ export function createValidatorForAcceptingTxs(db, contractDataSource, verifier,
         new MetadataTxValidator({
             l1ChainId: new Fr(l1ChainId),
             rollupVersion: new Fr(rollupVersion),
-            timestamp,
-            blockNumber,
-            protocolContractTreeRoot,
+            protocolContractsHash,
             vkTreeRoot: getVKTreeRoot()
         }),
+        new TimestampTxValidator({
+            timestamp,
+            blockNumber
+        }),
         new DoubleSpendTxValidator(new NullifierCache(db)),
         new PhasesTxValidator(contractDataSource, setupAllowList, timestamp),
         new BlockHeaderTxValidator(new ArchiveCache(db))
@@ -42,9 +44,10 @@ function preprocessValidator(nullifierCache, archiveCache, publicStateSource, co
     return new AggregateTxValidator(new MetadataTxValidator({
         l1ChainId: globalVariables.chainId,
         rollupVersion: globalVariables.version,
-        timestamp: globalVariables.timestamp,
-        blockNumber: globalVariables.blockNumber,
-        protocolContractTreeRoot,
+        protocolContractsHash,
         vkTreeRoot: getVKTreeRoot()
+    }), new TimestampTxValidator({
+        timestamp: globalVariables.timestamp,
+        blockNumber: globalVariables.blockNumber
     }), new DoubleSpendTxValidator(nullifierCache), new PhasesTxValidator(contractDataSource, setupAllowList, globalVariables.timestamp), new GasTxValidator(publicStateSource, ProtocolContractAddress.FeeJuice, globalVariables.gasFees), new BlockHeaderTxValidator(archiveCache));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/sequencer-client",
-  "version": "3.0.0-canary.a9708bd",
+  "version": "3.0.0-devnet.3",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -26,37 +26,37 @@
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
   },
   "dependencies": {
-    "@aztec/aztec.js": "3.0.0-canary.a9708bd",
-    "@aztec/bb-prover": "3.0.0-canary.a9708bd",
-    "@aztec/blob-lib": "3.0.0-canary.a9708bd",
-    "@aztec/blob-sink": "3.0.0-canary.a9708bd",
-    "@aztec/constants": "3.0.0-canary.a9708bd",
-    "@aztec/epoch-cache": "3.0.0-canary.a9708bd",
-    "@aztec/ethereum": "3.0.0-canary.a9708bd",
-    "@aztec/foundation": "3.0.0-canary.a9708bd",
-    "@aztec/l1-artifacts": "3.0.0-canary.a9708bd",
-    "@aztec/merkle-tree": "3.0.0-canary.a9708bd",
-    "@aztec/noir-acvm_js": "3.0.0-canary.a9708bd",
-    "@aztec/noir-contracts.js": "3.0.0-canary.a9708bd",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-canary.a9708bd",
-    "@aztec/noir-types": "3.0.0-canary.a9708bd",
-    "@aztec/p2p": "3.0.0-canary.a9708bd",
-    "@aztec/protocol-contracts": "3.0.0-canary.a9708bd",
-    "@aztec/prover-client": "3.0.0-canary.a9708bd",
-    "@aztec/simulator": "3.0.0-canary.a9708bd",
-    "@aztec/slasher": "3.0.0-canary.a9708bd",
-    "@aztec/stdlib": "3.0.0-canary.a9708bd",
-    "@aztec/telemetry-client": "3.0.0-canary.a9708bd",
-    "@aztec/validator-client": "3.0.0-canary.a9708bd",
-    "@aztec/world-state": "3.0.0-canary.a9708bd",
+    "@aztec/aztec.js": "3.0.0-devnet.3",
+    "@aztec/bb-prover": "3.0.0-devnet.3",
+    "@aztec/blob-lib": "3.0.0-devnet.3",
+    "@aztec/blob-sink": "3.0.0-devnet.3",
+    "@aztec/constants": "3.0.0-devnet.3",
+    "@aztec/epoch-cache": "3.0.0-devnet.3",
+    "@aztec/ethereum": "3.0.0-devnet.3",
+    "@aztec/foundation": "3.0.0-devnet.3",
+    "@aztec/l1-artifacts": "3.0.0-devnet.3",
+    "@aztec/merkle-tree": "3.0.0-devnet.3",
+    "@aztec/node-keystore": "3.0.0-devnet.3",
+    "@aztec/noir-acvm_js": "3.0.0-devnet.3",
+    "@aztec/noir-contracts.js": "3.0.0-devnet.3",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-devnet.3",
+    "@aztec/noir-types": "3.0.0-devnet.3",
+    "@aztec/p2p": "3.0.0-devnet.3",
+    "@aztec/protocol-contracts": "3.0.0-devnet.3",
+    "@aztec/prover-client": "3.0.0-devnet.3",
+    "@aztec/simulator": "3.0.0-devnet.3",
+    "@aztec/slasher": "3.0.0-devnet.3",
+    "@aztec/stdlib": "3.0.0-devnet.3",
+    "@aztec/telemetry-client": "3.0.0-devnet.3",
+    "@aztec/validator-client": "3.0.0-devnet.3",
+    "@aztec/world-state": "3.0.0-devnet.3",
     "lodash.chunk": "^4.2.0",
-    "lodash.pick": "^4.4.0",
     "tslib": "^2.4.0",
-    "viem": "2.23.7"
+    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
   },
   "devDependencies": {
-    "@aztec/archiver": "3.0.0-canary.a9708bd",
-    "@aztec/kv-store": "3.0.0-canary.a9708bd",
+    "@aztec/archiver": "3.0.0-devnet.3",
+    "@aztec/kv-store": "3.0.0-devnet.3",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.chunk": "^4.2.7",
@@ -64,7 +64,7 @@
     "@types/node": "^22.15.17",
     "concurrently": "^7.6.0",
     "eslint": "^9.26.0",
-    "express": "^4.21.1",
+    "express": "^4.21.2",
     "jest": "^30.0.0",
     "jest-mock-extended": "^4.0.0",
     "prettier": "^3.5.3",

package/src/client/sequencer-client.ts

@@ -15,7 +15,11 @@ import type { KeystoreManager } from '@aztec/node-keystore';
 import type { P2P } from '@aztec/p2p';
 import type { SlasherClientInterface } from '@aztec/slasher';
 import type { L2BlockSource } from '@aztec/stdlib/block';
-import type { IFullNodeBlockBuilder, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import type {
+  IFullNodeBlockBuilder,
+  ValidatorClientFullConfig,
+  WorldStateSynchronizer,
+} from '@aztec/stdlib/interfaces/server';
 import { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
 import { L1Metrics, type TelemetryClient } from '@aztec/telemetry-client';
@@ -33,6 +37,7 @@ export class SequencerClient {
   constructor(
     protected publisherManager: PublisherManager<L1TxUtilsWithBlobs>,
     protected sequencer: Sequencer,
+    protected blockBuilder: IFullNodeBlockBuilder,
     protected validatorClient?: ValidatorClient,
     private l1Metrics?: L1Metrics,
   ) {}
@@ -79,7 +84,7 @@ export class SequencerClient {
       telemetry: telemetryClient,
     } = deps;
     const { l1RpcUrls: rpcUrls, l1ChainId: chainId } = config;
-    const log = createLogger('sequencer-client');
+    const log = createLogger('sequencer');
     const publicClient = getPublicClient(config);
     const l1TxUtils = deps.l1TxUtils;
     const l1Metrics = new L1Metrics(
@@ -87,7 +92,7 @@ export class SequencerClient {
       publicClient,
       l1TxUtils.map(x => x.getSenderAddress()),
     );
-    const publisherManager = new PublisherManager(l1TxUtils);
+    const publisherManager = new PublisherManager(l1TxUtils, config);
     const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
     const [l1GenesisTime, slotDuration] = await Promise.all([
       rollupContract.getL1GenesisTime(),
@@ -106,9 +111,7 @@ export class SequencerClient {
           l1RpcUrls: rpcUrls,
           l1ChainId: chainId,
           viemPollingIntervalMS: config.viemPollingIntervalMS,
-          aztecSlotDuration: config.aztecSlotDuration,
           ethereumSlotDuration: config.ethereumSlotDuration,
-          aztecEpochDuration: config.aztecEpochDuration,
         },
         { dateProvider: deps.dateProvider },
       ));
@@ -130,6 +133,7 @@ export class SequencerClient {
         dateProvider: deps.dateProvider,
         publisherManager,
         nodeKeyStore: NodeKeystoreAdapter.fromKeyStoreManager(deps.nodeKeyStore),
+        logger: log,
       });
     const globalsBuilder = new GlobalVariableBuilder(config);
 
@@ -175,19 +179,22 @@ export class SequencerClient {
       rollupContract,
       { ...config, maxL1TxInclusionTimeIntoSlot, maxL2BlockGas: sequencerManaLimit },
       telemetryClient,
+      log,
     );
 
     await sequencer.init();
 
-    return new SequencerClient(publisherManager, sequencer, validatorClient, l1Metrics);
+    return new SequencerClient(publisherManager, sequencer, blockBuilder, validatorClient, l1Metrics);
   }
 
   /**
-   * Updates sequencer config.
+   * Updates sequencer and validator client config.
    * @param config - New parameters.
    */
-  public updateSequencerConfig(config: SequencerConfig) {
-    return this.sequencer.updateConfig(config);
+  public updateConfig(config: SequencerConfig & Partial<ValidatorClientFullConfig>) {
+    this.sequencer.updateConfig(config);
+    this.blockBuilder.updateConfig(config);
+    this.validatorClient?.updateConfig(config);
   }
 
   /** Starts the sequencer. */
@@ -195,6 +202,7 @@ export class SequencerClient {
     await this.validatorClient?.start();
     this.sequencer.start();
     this.l1Metrics?.start();
+    await this.publisherManager.loadState();
   }
 
   /**
@@ -202,6 +210,7 @@ export class SequencerClient {
    */
   public async stop() {
     await this.sequencer.stop();
+    await this.validatorClient?.stop();
     this.publisherManager.interrupt();
     this.l1Metrics?.stop();
   }

package/src/config.ts

@@ -12,6 +12,7 @@ import {
   pickConfigMappings,
 } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { type KeyStoreConfig, keyStoreConfigMappings } from '@aztec/node-keystore';
 import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type ChainConfig, type SequencerConfig, chainConfigMappings } from '@aztec/stdlib/config';
@@ -33,6 +34,7 @@ export const DEFAULT_ATTESTATION_PROPAGATION_TIME = 2;
  * Configuration settings for the SequencerClient.
  */
 export type SequencerClientConfig = PublisherConfig &
+  KeyStoreConfig &
   ValidatorClientConfig &
   TxSenderConfig &
   SequencerConfig &
@@ -143,12 +145,21 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
     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: ConfigMappingsType<SequencerClientConfig> = {
   ...validatorClientConfigMappings,
   ...sequencerConfigMappings,
+  ...keyStoreConfigMappings,
   ...l1ReaderConfigMappings,
   ...getTxSenderConfigMappings('SEQ'),
   ...getPublisherConfigMappings('SEQ'),

package/src/publisher/config.ts

@@ -5,7 +5,12 @@ import {
   l1ReaderConfigMappings,
   l1TxUtilsConfigMappings,
 } from '@aztec/ethereum';
-import { type ConfigMappingsType, SecretValue, getConfigFromMappings } from '@aztec/foundation/config';
+import {
+  type ConfigMappingsType,
+  SecretValue,
+  booleanConfigHelper,
+  getConfigFromMappings,
+} from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
 /**
@@ -21,11 +26,6 @@ export type TxSenderConfig = L1ReaderConfig & {
    * Publisher addresses to be used with a remote signer
    */
   publisherAddresses?: EthAddress[];
-
-  /**
-   * The address of the custom forwarder contract.
-   */
-  customForwarderContractAddress: EthAddress;
 };
 
 /**
@@ -33,28 +33,20 @@ export type TxSenderConfig = L1ReaderConfig & {
  */
 export type PublisherConfig = L1TxUtilsConfig &
   BlobSinkConfig & {
-    /**
-     * The interval to wait between publish retries.
-     */
-    l1PublishRetryIntervalMS: number;
+    /** True to use publishers in invalid states (timed out, cancelled, etc) if no other is available */
+    publisherAllowInvalidStates?: boolean;
   };
 
 export const getTxSenderConfigMappings: (
   scope: 'PROVER' | 'SEQ',
 ) => ConfigMappingsType<Omit<TxSenderConfig, 'l1Contracts'>> = (scope: 'PROVER' | 'SEQ') => ({
   ...l1ReaderConfigMappings,
-  customForwarderContractAddress: {
-    env: `CUSTOM_FORWARDER_CONTRACT_ADDRESS`,
-    parseEnv: (val: string) => EthAddress.fromString(val),
-    description: 'The address of the custom forwarder contract.',
-    defaultValue: EthAddress.ZERO,
-  },
   publisherPrivateKeys: {
     env: scope === 'PROVER' ? `PROVER_PUBLISHER_PRIVATE_KEYS` : `SEQ_PUBLISHER_PRIVATE_KEYS`,
     description: 'The private keys to be used by the publisher.',
     parseEnv: (val: string) => val.split(',').map(key => new SecretValue(`0x${key.replace('0x', '')}`)),
     defaultValue: [],
-    fallback: scope === 'PROVER' ? ['PROVER_PUBLISHER_PRIVATE_KEY'] : ['SEQ_PUBLISHER_PRIVATE_KEY'],
+    fallback: [scope === 'PROVER' ? `PROVER_PUBLISHER_PRIVATE_KEY` : `SEQ_PUBLISHER_PRIVATE_KEY`],
   },
   publisherAddresses: {
     env: scope === 'PROVER' ? `PROVER_PUBLISHER_ADDRESSES` : `SEQ_PUBLISHER_ADDRESSES`,
@@ -71,11 +63,10 @@ export function getTxSenderConfigFromEnv(scope: 'PROVER' | 'SEQ'): Omit<TxSender
 export const getPublisherConfigMappings: (
   scope: 'PROVER' | 'SEQ',
 ) => ConfigMappingsType<PublisherConfig & L1TxUtilsConfig> = scope => ({
-  l1PublishRetryIntervalMS: {
-    env: scope === `PROVER` ? `PROVER_PUBLISH_RETRY_INTERVAL_MS` : `SEQ_PUBLISH_RETRY_INTERVAL_MS`,
-    parseEnv: (val: string) => +val,
-    defaultValue: 1000,
-    description: 'The interval to wait between publish retries.',
+  publisherAllowInvalidStates: {
+    description: 'True to use publishers in invalid states (timed out, cancelled, etc) if no other is available',
+    env: scope === `PROVER` ? `PROVER_PUBLISHER_ALLOW_INVALID_STATES` : `SEQ_PUBLISHER_ALLOW_INVALID_STATES`,
+    ...booleanConfigHelper(true),
   },
   ...l1TxUtilsConfigMappings,
   ...blobSinkConfigMapping,

package/src/publisher/index.ts

@@ -1,4 +1,4 @@
-export { SequencerPublisher, SignalType } from './sequencer-publisher.js';
+export { SequencerPublisher } from './sequencer-publisher.js';
 export { SequencerPublisherFactory } from './sequencer-publisher-factory.js';
 
 // Used for tests

package/src/publisher/sequencer-publisher-factory.ts

@@ -1,4 +1,5 @@
-import { EthAddress } from '@aztec/aztec.js';
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import { type Logger, createLogger } from '@aztec/aztec.js/log';
 import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
 import type { EpochCache } from '@aztec/epoch-cache';
 import type { GovernanceProposerContract, PublisherFilter, PublisherManager, RollupContract } from '@aztec/ethereum';
@@ -10,7 +11,7 @@ import { NodeKeystoreAdapter } from '@aztec/validator-client';
 
 import type { SequencerClientConfig } from '../config.js';
 import { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js';
-import { SequencerPublisher } from './sequencer-publisher.js';
+import { type Action, SequencerPublisher } from './sequencer-publisher.js';
 
 export type AttestorPublisherPair = {
   attestorAddress: EthAddress;
@@ -19,6 +20,12 @@ export type AttestorPublisherPair = {
 
 export class SequencerPublisherFactory {
   private publisherMetrics: SequencerPublisherMetrics;
+
+  /** Stores the last slot in which every action was carried out by a publisher */
+  private lastActions: Partial<Record<Action, bigint>> = {};
+
+  private logger: Logger;
+
   constructor(
     private sequencerConfig: SequencerClientConfig,
     private deps: {
@@ -31,9 +38,11 @@ export class SequencerPublisherFactory {
       governanceProposerContract: GovernanceProposerContract;
       slashFactoryContract: SlashFactoryContract;
       nodeKeyStore: NodeKeystoreAdapter;
+      logger?: Logger;
     },
   ) {
     this.publisherMetrics = new SequencerPublisherMetrics(deps.telemetry, 'SequencerPublisher');
+    this.logger = deps.logger ?? createLogger('sequencer');
   }
   /**
    * Creates a new SequencerPublisher instance.
@@ -69,6 +78,8 @@ export class SequencerPublisherFactory {
       slashFactoryContract: this.deps.slashFactoryContract,
       dateProvider: this.deps.dateProvider,
       metrics: this.publisherMetrics,
+      lastActions: this.lastActions,
+      log: this.logger.createChild('publisher'),
     });
 
     return {

package/src/publisher/sequencer-publisher-metrics.ts

@@ -1,4 +1,4 @@
-import { createLogger } from '@aztec/aztec.js';
+import { createLogger } from '@aztec/aztec.js/log';
 import type { L1PublishBlockStats, L1PublishStats } from '@aztec/stdlib/stats';
 import {
   Attributes,