@aztec/sequencer-client 2.0.3 → 2.1.0-rc.2

package/dest/sequencer/sequencer.js

@@ -4,15 +4,17 @@ function _ts_decorate(decorators, target, key, desc) {
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+import { BLOBS_PER_BLOCK, FIELDS_PER_BLOB, INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { FormattedViemError, NoCommitteeError } from '@aztec/ethereum';
 import { omit, pick } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { Signature } from '@aztec/foundation/eth-signature';
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { Timer } from '@aztec/foundation/timer';
-import { getSlotAtTimestamp } from '@aztec/stdlib/epoch-helpers';
+import { CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
+import { getSlotAtTimestamp, getSlotStartBuildTimestamp } from '@aztec/stdlib/epoch-helpers';
 import { Gas } from '@aztec/stdlib/gas';
 import { SequencerConfigSchema } from '@aztec/stdlib/interfaces/server';
 import { orderAttestations } from '@aztec/stdlib/p2p';
@@ -22,8 +24,9 @@ import { ContentCommitment, ProposedBlockHeader } from '@aztec/stdlib/tx';
 import { AttestationTimeoutError } from '@aztec/stdlib/validators';
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import EventEmitter from 'node:events';
+import { SequencerInterruptedError, SequencerTooSlowError } from './errors.js';
 import { SequencerMetrics } from './metrics.js';
-import { SequencerTimetable, SequencerTooSlowError } from './timetable.js';
+import { SequencerTimetable } from './timetable.js';
 import { SequencerState } from './utils.js';
 export { SequencerState };
 /**
@@ -72,10 +75,7 @@ export { SequencerState };
     publisher;
     constructor(publisherFactory, validatorClient, globalsBuilder, p2pClient, worldState, slasherClient, l2BlockSource, l1ToL2MessageSource, blockBuilder, l1Constants, dateProvider, epochCache, rollupContract, config, telemetry = getTelemetryClient(), log = createLogger('sequencer')){
         super(), this.publisherFactory = publisherFactory, this.validatorClient = validatorClient, this.globalsBuilder = globalsBuilder, this.p2pClient = p2pClient, this.worldState = worldState, this.slasherClient = slasherClient, this.l2BlockSource = l2BlockSource, this.l1ToL2MessageSource = l1ToL2MessageSource, this.blockBuilder = blockBuilder, this.l1Constants = l1Constants, this.dateProvider = dateProvider, this.epochCache = epochCache, this.rollupContract = rollupContract, this.config = config, this.telemetry = telemetry, this.log = log, this.pollingIntervalMs = 1000, this.maxTxsPerBlock = 32, this.minTxsPerBlock = 1, this.maxL1TxInclusionTimeIntoSlot = 0, this.state = SequencerState.STOPPED, this.maxBlockSizeInBytes = 1024 * 1024, this.maxBlockGas = new Gas(100e9, 100e9), this.enforceTimeTable = false;
-        // Set an initial coinbase for metrics purposes, but this will potentially change with each block.
-        const validatorAddresses = this.validatorClient?.getValidatorAddresses() ?? [];
-        const coinbase = validatorAddresses.length === 0 ? EthAddress.ZERO : this.validatorClient?.getCoinbaseForAttestor(validatorAddresses[0]) ?? EthAddress.ZERO;
-        this.metrics = new SequencerMetrics(telemetry, ()=>this.state, coinbase, this.rollupContract, 'Sequencer');
+        this.metrics = new SequencerMetrics(telemetry, this.rollupContract, 'Sequencer');
         // Initialize config
         this.updateConfig(this.config);
     }
@@ -140,7 +140,6 @@ export { SequencerState };
     /**
    * Starts the sequencer and moves to IDLE state.
    */ start() {
-        this.metrics.start();
         this.runningPromise = new RunningPromise(this.work.bind(this), this.log, this.pollingIntervalMs);
         this.setState(SequencerState.IDLE, undefined, {
             force: true
@@ -152,9 +151,10 @@ export { SequencerState };
    * Stops the sequencer from processing txs and moves to STOPPED state.
    */ async stop() {
         this.log.info(`Stopping sequencer`);
-        this.metrics.stop();
+        this.setState(SequencerState.STOPPING, undefined, {
+            force: true
+        });
         this.publisher?.interrupt();
-        await this.validatorClient?.stop();
         await this.runningPromise?.stop();
         this.setState(SequencerState.STOPPED, undefined, {
             force: true
@@ -259,7 +259,6 @@ export { SequencerState };
         this.publisher = publisher;
         const coinbase = this.validatorClient.getCoinbaseForAttestor(attestorAddress);
         const feeRecipient = this.validatorClient.getFeeRecipientForAttestor(attestorAddress);
-        this.metrics.setCoinbase(coinbase);
         // Prepare invalidation request if the pending chain is invalid (returns undefined if no need)
         const invalidateBlock = await publisher.simulateInvalidateBlock(syncedTo.pendingChainValidationStatus);
         const canProposeCheck = await publisher.canProposeAtNextEthBlock(chainTipArchive, proposerAddressInNextSlot, invalidateBlock);
@@ -317,6 +316,7 @@ export { SequencerState };
             publisher.enqueueInvalidateBlock(invalidateBlock);
         }
         this.setState(SequencerState.INITIALIZING_PROPOSAL, slot);
+        this.metrics.incOpenSlot(slot, proposerAddressInNextSlot.toString());
         this.log.verbose(`Preparing proposal for block ${newBlockNumber} at slot ${slot}`, {
             proposer: proposerInNextSlot?.toString(),
             coinbase,
@@ -379,7 +379,7 @@ export { SequencerState };
                 blockNumber: newBlockNumber,
                 slot: Number(slot)
             });
-            this.metrics.incFilledSlot(publisher.getSenderAddress().toString());
+            await this.metrics.incFilledSlot(publisher.getSenderAddress().toString(), coinbase);
         } else if (block) {
             this.emit('block-publish-failed', l1Response ?? {});
         }
@@ -407,6 +407,10 @@ export { SequencerState };
         }
     }
     setState(proposedState, slotNumber, opts = {}) {
+        if (this.state === SequencerState.STOPPING && proposedState !== SequencerState.STOPPED && !opts.force) {
+            this.log.warn(`Cannot set sequencer to ${proposedState} as it is stopping.`);
+            throw new SequencerInterruptedError();
+        }
         if (this.state === SequencerState.STOPPED && !opts.force) {
             this.log.warn(`Cannot set sequencer from ${this.state} to ${proposedState} as it is stopped.`);
             return;
@@ -452,6 +456,7 @@ export { SequencerState };
             maxTransactions: this.maxTxsPerBlock,
             maxBlockSize: this.maxBlockSizeInBytes,
             maxBlockGas: this.maxBlockGas,
+            maxBlobFields: BLOBS_PER_BLOCK * FIELDS_PER_BLOB,
             deadline
         };
     }
@@ -470,7 +475,6 @@ export { SequencerState };
         const blockNumber = newGlobalVariables.blockNumber;
         const slot = proposalHeader.slotNumber.toBigInt();
         const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(blockNumber);
-        // this.metrics.recordNewBlock(blockNumber, validTxs.length);
         const workTimer = new Timer();
         this.setState(SequencerState.CREATING_BLOCK, slot);
         try {
@@ -515,7 +519,9 @@ export { SequencerState };
                     blockNumber
                 });
             }
-            await this.enqueuePublishL2Block(block, attestations, txHashes, invalidateBlock, publisher);
+            const attestationsAndSigners = new CommitteeAttestationsAndSigners(attestations ?? []);
+            const attestationsAndSignersSignature = this.validatorClient ? await this.validatorClient.signAttestationsAndSigners(attestationsAndSigners, proposerAddress) : Signature.empty();
+            await this.enqueuePublishL2Block(block, attestationsAndSigners, attestationsAndSignersSignature, invalidateBlock, publisher);
             this.metrics.recordBuiltBlock(blockBuildDuration, publicGas.l2Gas);
             return block;
         } catch (err) {
@@ -561,32 +567,32 @@ export { SequencerState };
         const attestationTimeAllowed = this.enforceTimeTable ? this.timetable.getMaxAllowedTime(SequencerState.PUBLISHING_BLOCK) : this.aztecSlotDuration;
         this.metrics.recordRequiredAttestations(numberOfRequiredAttestations, attestationTimeAllowed);
         const timer = new Timer();
-        let collectedAttestionsCount = 0;
+        let collectedAttestationsCount = 0;
         try {
             const attestationDeadline = new Date(this.dateProvider.now() + attestationTimeAllowed * 1000);
             const attestations = await this.validatorClient.collectAttestations(proposal, numberOfRequiredAttestations, attestationDeadline);
-            collectedAttestionsCount = attestations.length;
+            collectedAttestationsCount = attestations.length;
             // note: the smart contract requires that the signatures are provided in the order of the committee
             return orderAttestations(attestations, committee);
         } catch (err) {
             if (err && err instanceof AttestationTimeoutError) {
-                collectedAttestionsCount = err.collectedCount;
+                collectedAttestationsCount = err.collectedCount;
             }
             throw err;
         } finally{
-            this.metrics.recordCollectedAttestations(collectedAttestionsCount, timer.ms());
+            this.metrics.recordCollectedAttestations(collectedAttestationsCount, timer.ms());
         }
     }
     /**
    * Publishes the L2Block to the rollup contract.
    * @param block - The L2Block to be published.
-   */ async enqueuePublishL2Block(block, attestations, txHashes, invalidateBlock, publisher) {
+   */ async enqueuePublishL2Block(block, attestationsAndSigners, attestationsAndSignersSignature, invalidateBlock, publisher) {
         // Publishes new block to the network and awaits the tx to be mined
         this.setState(SequencerState.PUBLISHING_BLOCK, block.header.globalVariables.slotNumber.toBigInt());
         // Time out tx at the end of the slot
         const slot = block.header.globalVariables.slotNumber.toNumber();
         const txTimeoutAt = new Date((this.getSlotStartBuildTimestamp(slot) + this.aztecSlotDuration) * 1000);
-        const enqueued = await publisher.enqueueProposeL2Block(block, attestations, txHashes, {
+        const enqueued = await publisher.enqueueProposeL2Block(block, attestationsAndSigners, attestationsAndSignersSignature, {
             txTimeoutAt,
             forcePendingBlockNumber: invalidateBlock?.forcePendingBlockNumber
         });
@@ -689,7 +695,7 @@ export { SequencerState };
         await publisher.sendRequests();
     }
     getSlotStartBuildTimestamp(slotNumber) {
-        return Number(this.l1Constants.l1GenesisTime) + Number(slotNumber) * this.l1Constants.slotDuration - this.l1Constants.ethereumSlotDuration;
+        return getSlotStartBuildTimestamp(slotNumber, this.l1Constants);
     }
     getSecondsIntoSlot(slotNumber) {
         const slotStartTimestamp = this.getSlotStartBuildTimestamp(slotNumber);

package/dest/sequencer/timetable.d.ts

@@ -45,10 +45,4 @@ export declare class SequencerTimetable {
     getMaxAllowedTime(state: SequencerState): number | undefined;
     assertTimeLeft(newState: SequencerState, secondsIntoSlot: number): void;
 }
-export declare class SequencerTooSlowError extends Error {
-    readonly proposedState: SequencerState;
-    readonly maxAllowedTime: number;
-    readonly currentTime: number;
-    constructor(proposedState: SequencerState, maxAllowedTime: number, currentTime: number);
-}
 //# sourceMappingURL=timetable.d.ts.map

package/dest/sequencer/timetable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timetable.d.ts","sourceRoot":"","sources":["../../src/sequencer/timetable.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAM5C,qBAAa,kBAAkB;IA+C3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG;IA/CtB;;;;OAIG;IACH,SAAgB,kBAAkB,EAAE,MAAM,CAAC;IAE3C;;;;OAIG;IACH,SAAgB,gBAAgB,SAAC;IAEjC,sHAAsH;IACtH,SAAgB,gBAAgB,EAAE,MAAM,CAAsB;IAE9D,uDAAuD;IACvD,SAAgB,gBAAgB,EAAE,MAAM,CAAsB;IAE9D,mGAAmG;IACnG,SAAgB,0BAA0B,EAAE,MAAM,CAAC;IAEnD,mIAAmI;IACnI,SAAgB,mBAAmB,EAAE,MAAM,CAAyB;IAEpE,wCAAwC;IACxC,SAAgB,oBAAoB,EAAE,MAAM,CAAC;IAE7C,kFAAkF;IAClF,SAAgB,iBAAiB,EAAE,MAAM,CAAC;IAE1C,2IAA2I;IAC3I,SAAgB,4BAA4B,EAAE,MAAM,CAAC;IAErD,4DAA4D;IAC5D,SAAgB,OAAO,EAAE,OAAO,CAAC;gBAG/B,IAAI,EAAE;QACJ,oBAAoB,EAAE,MAAM,CAAC;QAC7B,iBAAiB,EAAE,MAAM,CAAC;QAC1B,4BAA4B,EAAE,MAAM,CAAC;QACrC,0BAA0B,CAAC,EAAE,MAAM,CAAC;QACpC,OAAO,EAAE,OAAO,CAAC;KAClB,EACgB,OAAO,CAAC,EAAE,gBAAgB,YAAA,EAC1B,GAAG,mCAAsC;IA+C5D,OAAO,KAAK,yCAAyC,GAEpD;IAEM,2BAA2B,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM;IAenE,OAAO,KAAK,0BAA0B,GAErC;IAEM,yBAAyB,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM;IAU3D,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,GAAG,SAAS;IAsB5D,cAAc,CAAC,QAAQ,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM;CAkBxE;AAED,qBAAa,qBAAsB,SAAQ,KAAK;aAE5B,aAAa,EAAE,cAAc;aAC7B,cAAc,EAAE,MAAM;aACtB,WAAW,EAAE,MAAM;gBAFnB,aAAa,EAAE,cAAc,EAC7B,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM;CAOtC"}
+{"version":3,"file":"timetable.d.ts","sourceRoot":"","sources":["../../src/sequencer/timetable.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAM5C,qBAAa,kBAAkB;IA+C3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG;IA/CtB;;;;OAIG;IACH,SAAgB,kBAAkB,EAAE,MAAM,CAAC;IAE3C;;;;OAIG;IACH,SAAgB,gBAAgB,SAAC;IAEjC,sHAAsH;IACtH,SAAgB,gBAAgB,EAAE,MAAM,CAAsB;IAE9D,uDAAuD;IACvD,SAAgB,gBAAgB,EAAE,MAAM,CAAsB;IAE9D,mGAAmG;IACnG,SAAgB,0BAA0B,EAAE,MAAM,CAAC;IAEnD,mIAAmI;IACnI,SAAgB,mBAAmB,EAAE,MAAM,CAAyB;IAEpE,wCAAwC;IACxC,SAAgB,oBAAoB,EAAE,MAAM,CAAC;IAE7C,kFAAkF;IAClF,SAAgB,iBAAiB,EAAE,MAAM,CAAC;IAE1C,2IAA2I;IAC3I,SAAgB,4BAA4B,EAAE,MAAM,CAAC;IAErD,4DAA4D;IAC5D,SAAgB,OAAO,EAAE,OAAO,CAAC;gBAG/B,IAAI,EAAE;QACJ,oBAAoB,EAAE,MAAM,CAAC;QAC7B,iBAAiB,EAAE,MAAM,CAAC;QAC1B,4BAA4B,EAAE,MAAM,CAAC;QACrC,0BAA0B,CAAC,EAAE,MAAM,CAAC;QACpC,OAAO,EAAE,OAAO,CAAC;KAClB,EACgB,OAAO,CAAC,EAAE,gBAAgB,YAAA,EAC1B,GAAG,mCAAsC;IA+C5D,OAAO,KAAK,yCAAyC,GAEpD;IAEM,2BAA2B,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM;IAenE,OAAO,KAAK,0BAA0B,GAErC;IAEM,yBAAyB,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM;IAU3D,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,GAAG,SAAS;IAuB5D,cAAc,CAAC,QAAQ,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM;CAkBxE"}

package/dest/sequencer/timetable.js

@@ -1,5 +1,6 @@
 import { createLogger } from '@aztec/aztec.js';
 import { DEFAULT_ATTESTATION_PROPAGATION_TIME } from '../config.js';
+import { SequencerTooSlowError } from './errors.js';
 import { SequencerState } from './utils.js';
 const MIN_EXECUTION_TIME = 1;
 const BLOCK_PREPARE_TIME = 1;
@@ -95,6 +96,7 @@ export class SequencerTimetable {
     getMaxAllowedTime(state) {
         switch(state){
             case SequencerState.STOPPED:
+            case SequencerState.STOPPING:
             case SequencerState.IDLE:
             case SequencerState.SYNCHRONIZING:
                 return; // We don't really care about times for this states
@@ -133,12 +135,3 @@ export class SequencerTimetable {
         });
     }
 }
-export class SequencerTooSlowError extends Error {
-    proposedState;
-    maxAllowedTime;
-    currentTime;
-    constructor(proposedState, maxAllowedTime, currentTime){
-        super(`Too far into slot for ${proposedState} (time into slot ${currentTime}s greater than ${maxAllowedTime}s allowance)`), this.proposedState = proposedState, this.maxAllowedTime = maxAllowedTime, this.currentTime = currentTime;
-        this.name = 'SequencerTooSlowError';
-    }
-}

package/dest/sequencer/utils.d.ts

@@ -1,35 +1,21 @@
 export declare enum SequencerState {
-    /**
-     * Sequencer is stopped and not processing any txs from the pool.
-     */
+    /** Sequencer is stopped and not processing any txs from the pool. */
     STOPPED = "STOPPED",
-    /**
-     * Sequencer is awaiting the next call to work().
-     */
+    /** Sequencer is being stopped. Will move to STOPPED shortly. */
+    STOPPING = "STOPPING",
+    /** Sequencer is awaiting the next call to work(). */
     IDLE = "IDLE",
-    /**
-     * Synchronizing with the L2 chain.
-     */
+    /** Synchronizing with the L2 chain. */
     SYNCHRONIZING = "SYNCHRONIZING",
-    /**
-     * Checking if we are the proposer for the current slot.
-     */
+    /** Checking if we are the proposer for the current slot. */
     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.
-     */
+    /** Initializing the block proposal. Will move to CREATING_BLOCK if there are valid txs to include, or back to SYNCHRONIZING otherwise. */
     INITIALIZING_PROPOSAL = "INITIALIZING_PROPOSAL",
-    /**
-     * Creating a new L2 block. Includes processing public function calls and running rollup circuits. Will move to PUBLISHING_CONTRACT_DATA.
-     */
+    /** Creating a new L2 block. Includes processing public function calls and running rollup circuits. Will move to PUBLISHING_CONTRACT_DATA. */
     CREATING_BLOCK = "CREATING_BLOCK",
-    /**
-     * Collecting attestations from its peers. Will move to PUBLISHING_BLOCK.
-     */
+    /** Collecting attestations from its peers. Will move to PUBLISHING_BLOCK. */
     COLLECTING_ATTESTATIONS = "COLLECTING_ATTESTATIONS",
-    /**
-     * Sending the tx to L1 with the L2 block data and awaiting it to be mined. Will move to SYNCHRONIZING.
-     */
+    /** Sending the tx to L1 with the L2 block data and awaiting it to be mined. Will move to SYNCHRONIZING. */
     PUBLISHING_BLOCK = "PUBLISHING_BLOCK"
 }
 export type SequencerStateWithSlot = SequencerState.INITIALIZING_PROPOSAL | SequencerState.CREATING_BLOCK | SequencerState.COLLECTING_ATTESTATIONS | SequencerState.PUBLISHING_BLOCK | SequencerState.PROPOSER_CHECK;

package/dest/sequencer/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/sequencer/utils.ts"],"names":[],"mappings":"AAAA,oBAAY,cAAc;IACxB;;OAEG;IACH,OAAO,YAAY;IACnB;;OAEG;IACH,IAAI,SAAS;IACb;;OAEG;IACH,aAAa,kBAAkB;IAC/B;;OAEG;IACH,cAAc,mBAAmB;IACjC;;OAEG;IACH,qBAAqB,0BAA0B;IAC/C;;OAEG;IACH,cAAc,mBAAmB;IACjC;;OAEG;IACH,uBAAuB,4BAA4B;IACnD;;OAEG;IACH,gBAAgB,qBAAqB;CACtC;AAED,MAAM,MAAM,sBAAsB,GAC9B,cAAc,CAAC,qBAAqB,GACpC,cAAc,CAAC,cAAc,GAC7B,cAAc,CAAC,uBAAuB,GACtC,cAAc,CAAC,gBAAgB,GAC/B,cAAc,CAAC,cAAc,CAAC;AAElC,MAAM,MAAM,sBAAsB,GAAG,MAAM,cAAc,CAAC;AAE1D,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAEpE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/sequencer/utils.ts"],"names":[],"mappings":"AAAA,oBAAY,cAAc;IACxB,qEAAqE;IACrE,OAAO,YAAY;IACnB,gEAAgE;IAChE,QAAQ,aAAa;IACrB,qDAAqD;IACrD,IAAI,SAAS;IACb,uCAAuC;IACvC,aAAa,kBAAkB;IAC/B,4DAA4D;IAC5D,cAAc,mBAAmB;IACjC,0IAA0I;IAC1I,qBAAqB,0BAA0B;IAC/C,6IAA6I;IAC7I,cAAc,mBAAmB;IACjC,6EAA6E;IAC7E,uBAAuB,4BAA4B;IACnD,2GAA2G;IAC3G,gBAAgB,qBAAqB;CACtC;AAED,MAAM,MAAM,sBAAsB,GAC9B,cAAc,CAAC,qBAAqB,GACpC,cAAc,CAAC,cAAc,GAC7B,cAAc,CAAC,uBAAuB,GACtC,cAAc,CAAC,gBAAgB,GAC/B,cAAc,CAAC,cAAc,CAAC;AAElC,MAAM,MAAM,sBAAsB,GAAG,MAAM,cAAc,CAAC;AAE1D,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAEpE"}

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/sequencer-client",
-  "version": "2.0.3",
+  "version": "2.1.0-rc.2",
   "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": "2.0.3",
-    "@aztec/bb-prover": "2.0.3",
-    "@aztec/blob-lib": "2.0.3",
-    "@aztec/blob-sink": "2.0.3",
-    "@aztec/constants": "2.0.3",
-    "@aztec/epoch-cache": "2.0.3",
-    "@aztec/ethereum": "2.0.3",
-    "@aztec/foundation": "2.0.3",
-    "@aztec/l1-artifacts": "2.0.3",
-    "@aztec/merkle-tree": "2.0.3",
-    "@aztec/noir-acvm_js": "2.0.3",
-    "@aztec/noir-contracts.js": "2.0.3",
-    "@aztec/noir-protocol-circuits-types": "2.0.3",
-    "@aztec/noir-types": "2.0.3",
-    "@aztec/p2p": "2.0.3",
-    "@aztec/protocol-contracts": "2.0.3",
-    "@aztec/prover-client": "2.0.3",
-    "@aztec/simulator": "2.0.3",
-    "@aztec/slasher": "2.0.3",
-    "@aztec/stdlib": "2.0.3",
-    "@aztec/telemetry-client": "2.0.3",
-    "@aztec/validator-client": "2.0.3",
-    "@aztec/world-state": "2.0.3",
+    "@aztec/aztec.js": "2.1.0-rc.2",
+    "@aztec/bb-prover": "2.1.0-rc.2",
+    "@aztec/blob-lib": "2.1.0-rc.2",
+    "@aztec/blob-sink": "2.1.0-rc.2",
+    "@aztec/constants": "2.1.0-rc.2",
+    "@aztec/epoch-cache": "2.1.0-rc.2",
+    "@aztec/ethereum": "2.1.0-rc.2",
+    "@aztec/foundation": "2.1.0-rc.2",
+    "@aztec/l1-artifacts": "2.1.0-rc.2",
+    "@aztec/merkle-tree": "2.1.0-rc.2",
+    "@aztec/node-keystore": "2.1.0-rc.2",
+    "@aztec/noir-acvm_js": "2.1.0-rc.2",
+    "@aztec/noir-contracts.js": "2.1.0-rc.2",
+    "@aztec/noir-protocol-circuits-types": "2.1.0-rc.2",
+    "@aztec/noir-types": "2.1.0-rc.2",
+    "@aztec/p2p": "2.1.0-rc.2",
+    "@aztec/protocol-contracts": "2.1.0-rc.2",
+    "@aztec/prover-client": "2.1.0-rc.2",
+    "@aztec/simulator": "2.1.0-rc.2",
+    "@aztec/slasher": "2.1.0-rc.2",
+    "@aztec/stdlib": "2.1.0-rc.2",
+    "@aztec/telemetry-client": "2.1.0-rc.2",
+    "@aztec/validator-client": "2.1.0-rc.2",
+    "@aztec/world-state": "2.1.0-rc.2",
     "lodash.chunk": "^4.2.0",
-    "lodash.pick": "^4.4.0",
     "tslib": "^2.4.0",
     "viem": "2.23.7"
   },
   "devDependencies": {
-    "@aztec/archiver": "2.0.3",
-    "@aztec/kv-store": "2.0.3",
+    "@aztec/archiver": "2.1.0-rc.2",
+    "@aztec/kv-store": "2.1.0-rc.2",
     "@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

@@ -84,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(
@@ -92,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(),
@@ -133,6 +133,7 @@ export class SequencerClient {
         dateProvider: deps.dateProvider,
         publisherManager,
         nodeKeyStore: NodeKeystoreAdapter.fromKeyStoreManager(deps.nodeKeyStore),
+        logger: log,
       });
     const globalsBuilder = new GlobalVariableBuilder(config);
 
@@ -178,6 +179,7 @@ export class SequencerClient {
       rollupContract,
       { ...config, maxL1TxInclusionTimeIntoSlot, maxL2BlockGas: sequencerManaLimit },
       telemetryClient,
+      log,
     );
 
     await sequencer.init();
@@ -200,6 +202,7 @@ export class SequencerClient {
     await this.validatorClient?.start();
     this.sequencer.start();
     this.l1Metrics?.start();
+    await this.publisherManager.loadState();
   }
 
   /**
@@ -207,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 &
@@ -149,6 +151,7 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
 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';
 
 /**
@@ -28,10 +33,8 @@ 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: (
@@ -43,7 +46,7 @@ export const getTxSenderConfigMappings: (
     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`,
@@ -60,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,4 @@
-import { EthAddress } from '@aztec/aztec.js';
+import { EthAddress, type Logger, createLogger } from '@aztec/aztec.js';
 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 +10,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 +19,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 +37,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 +77,8 @@ export class SequencerPublisherFactory {
       slashFactoryContract: this.deps.slashFactoryContract,
       dateProvider: this.deps.dateProvider,
       metrics: this.publisherMetrics,
+      lastActions: this.lastActions,
+      log: this.logger.createChild('publisher'),
     });
 
     return {