@aztec/sequencer-client 0.76.4 → 0.77.0-testnet-ignition.21

package/dest/sequencer/sequencer.js

@@ -1,14 +1,22 @@
-import { __esDecorate, __runInitializers } from "tslib";
-import { SequencerConfigSchema, Tx, } from '@aztec/circuit-types';
-import { AppendOnlyTreeSnapshot, BlockHeader, ContentCommitment, GENESIS_ARCHIVE_ROOT, Gas, INITIAL_L2_BLOCK_NUM, StateReference, } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+function _ts_decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.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 { omit } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
-import { pickFromSchema } from '@aztec/foundation/schemas';
 import { Timer, elapsed } from '@aztec/foundation/timer';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { Gas } from '@aztec/stdlib/gas';
+import { SequencerConfigSchema } from '@aztec/stdlib/interfaces/server';
+import { pickFromSchema } from '@aztec/stdlib/schemas';
+import { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees';
+import { BlockHeader, ContentCommitment, StateReference, Tx } from '@aztec/stdlib/tx';
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { VoteType } from '../publisher/sequencer-publisher.js';
 import { createValidatorsForBlockBuilding } from '../tx_validator/tx_validator_factory.js';
@@ -25,570 +33,591 @@ export { SequencerState };
  * - Adds proof requests to the request pool (not for this milestone).
  * - Receives results to those proofs from the network (repeats as necessary) (not for this milestone).
  * - Publishes L1 tx(s) to the rollup contract via RollupPublisher.
- */
-let Sequencer = (() => {
-    var _a;
-    let _instanceExtraInitializers = [];
-    let _work_decorators;
-    let _buildBlockAndEnqueuePublish_decorators;
-    let _collectAttestations_decorators;
-    let _enqueuePublishL2Block_decorators;
-    return _a = class Sequencer {
-            constructor(publisher, validatorClient, // During migration the validator client can be inactive
-            globalsBuilder, p2pClient, worldState, slasherClient, blockBuilderFactory, l2BlockSource, l1ToL2MessageSource, publicProcessorFactory, contractDataSource, l1Constants, dateProvider, config = {}, telemetry = getTelemetryClient(), log = createLogger('sequencer')) {
-                this.publisher = (__runInitializers(this, _instanceExtraInitializers), publisher);
-                this.validatorClient = validatorClient;
-                this.globalsBuilder = globalsBuilder;
-                this.p2pClient = p2pClient;
-                this.worldState = worldState;
-                this.slasherClient = slasherClient;
-                this.blockBuilderFactory = blockBuilderFactory;
-                this.l2BlockSource = l2BlockSource;
-                this.l1ToL2MessageSource = l1ToL2MessageSource;
-                this.publicProcessorFactory = publicProcessorFactory;
-                this.contractDataSource = contractDataSource;
-                this.l1Constants = l1Constants;
-                this.dateProvider = dateProvider;
-                this.config = config;
-                this.log = log;
-                this.pollingIntervalMs = 1000;
-                this.maxTxsPerBlock = 32;
-                this.minTxsPerBlock = 1;
-                this.maxL1TxInclusionTimeIntoSlot = 0;
-                // TODO: zero values should not be allowed for the following 2 values in PROD
-                this._coinbase = EthAddress.ZERO;
-                this._feeRecipient = AztecAddress.ZERO;
-                this.state = SequencerState.STOPPED;
-                this.allowedInSetup = [];
-                this.maxBlockSizeInBytes = 1024 * 1024;
-                this.maxBlockGas = new Gas(100e9, 100e9);
-                this.isFlushing = false;
-                this.enforceTimeTable = false;
-                this.metrics = new SequencerMetrics(telemetry, () => this.state, 'Sequencer');
-                // Register the block builder with the validator client for re-execution
-                this.validatorClient?.registerBlockBuilder(this.buildBlock.bind(this));
-                // Register the slasher on the publisher to fetch slashing payloads
-                this.publisher.registerSlashPayloadGetter(this.slasherClient.getSlashPayload.bind(this.slasherClient));
-            }
-            get tracer() {
-                return this.metrics.tracer;
-            }
-            /**
-             * Updates sequencer config.
-             * @param config - New parameters.
-             */
-            async updateConfig(config) {
-                this.log.info(`Sequencer config set`, omit(pickFromSchema(config, SequencerConfigSchema), 'allowedInSetup'));
-                if (config.transactionPollingIntervalMS !== undefined) {
-                    this.pollingIntervalMs = config.transactionPollingIntervalMS;
-                }
-                if (config.maxTxsPerBlock !== undefined) {
-                    this.maxTxsPerBlock = config.maxTxsPerBlock;
-                }
-                if (config.minTxsPerBlock !== undefined) {
-                    this.minTxsPerBlock = config.minTxsPerBlock;
-                }
-                if (config.maxDABlockGas !== undefined) {
-                    this.maxBlockGas = new Gas(config.maxDABlockGas, this.maxBlockGas.l2Gas);
-                }
-                if (config.maxL2BlockGas !== undefined) {
-                    this.maxBlockGas = new Gas(this.maxBlockGas.daGas, config.maxL2BlockGas);
-                }
-                if (config.coinbase) {
-                    this._coinbase = config.coinbase;
-                }
-                if (config.feeRecipient) {
-                    this._feeRecipient = config.feeRecipient;
-                }
-                if (config.allowedInSetup) {
-                    this.allowedInSetup = config.allowedInSetup;
-                }
-                else {
-                    this.allowedInSetup = await getDefaultAllowedSetupFunctions();
-                }
-                if (config.maxBlockSizeInBytes !== undefined) {
-                    this.maxBlockSizeInBytes = config.maxBlockSizeInBytes;
-                }
-                if (config.governanceProposerPayload) {
-                    this.publisher.setGovernancePayload(config.governanceProposerPayload);
-                }
-                if (config.maxL1TxInclusionTimeIntoSlot !== undefined) {
-                    this.maxL1TxInclusionTimeIntoSlot = config.maxL1TxInclusionTimeIntoSlot;
-                }
-                if (config.enforceTimeTable !== undefined) {
-                    this.enforceTimeTable = config.enforceTimeTable;
-                }
-                this.setTimeTable();
-                // TODO: Just read everything from the config object as needed instead of copying everything into local vars.
-                this.config = config;
-            }
-            setTimeTable() {
-                this.timetable = new SequencerTimetable(this.l1Constants.ethereumSlotDuration, this.aztecSlotDuration, this.maxL1TxInclusionTimeIntoSlot, this.enforceTimeTable, this.metrics, this.log);
-                this.log.verbose(`Sequencer timetable updated`, { enforceTimeTable: this.enforceTimeTable });
-            }
-            /**
-             * Starts the sequencer and moves to IDLE state.
-             */
-            async start() {
-                await this.updateConfig(this.config);
-                this.runningPromise = new RunningPromise(this.work.bind(this), this.log, this.pollingIntervalMs);
-                this.setState(SequencerState.IDLE, 0n, true /** force */);
-                this.runningPromise.start();
-                this.log.info(`Sequencer started with address ${this.publisher.getSenderAddress().toString()}`);
-            }
-            /**
-             * Stops the sequencer from processing txs and moves to STOPPED state.
-             */
-            async stop() {
-                this.log.debug(`Stopping sequencer`);
-                await this.validatorClient?.stop();
-                await this.runningPromise?.stop();
-                await this.slasherClient?.stop();
-                this.publisher.interrupt();
-                this.setState(SequencerState.STOPPED, 0n, true /** force */);
-                this.log.info('Stopped sequencer');
-            }
-            /**
-             * Starts a previously stopped sequencer.
-             */
-            restart() {
-                this.log.info('Restarting sequencer');
-                this.publisher.restart();
-                this.runningPromise.start();
-                this.setState(SequencerState.IDLE, 0n, true /** force */);
-            }
-            /**
-             * Returns the current state of the sequencer.
-             * @returns An object with a state entry with one of SequencerState.
-             */
-            status() {
-                return { state: this.state };
-            }
-            /** Forces the sequencer to bypass all time and tx count checks for the next block and build anyway. */
-            flush() {
-                this.isFlushing = true;
-            }
-            /**
-             * @notice  Performs most of the sequencer duties:
-             *          - Checks if we are up to date
-             *          - If we are and we are the sequencer, collect txs and build a block
-             *          - Collect attestations for the block
-             *          - Submit block
-             *          - If our block for some reason is not included, revert the state
-             */
-            async doRealWork() {
-                this.setState(SequencerState.SYNCHRONIZING, 0n);
-                // Update state when the previous block has been synced
-                const chainTip = await this.getChainTip();
-                // Do not go forward with new block if the previous one has not been mined and processed
-                if (!chainTip) {
-                    return;
-                }
-                this.setState(SequencerState.PROPOSER_CHECK, 0n);
-                const newBlockNumber = chainTip.blockNumber + 1;
-                // If we cannot find a tip archive, assume genesis.
-                const chainTipArchive = chainTip.archive;
-                const slot = await this.slotForProposal(chainTipArchive.toBuffer(), BigInt(newBlockNumber));
-                if (!slot) {
-                    this.log.debug(`Cannot propose block ${newBlockNumber}`);
-                    return;
-                }
-                this.log.debug(`Can propose block ${newBlockNumber} at slot ${slot}`);
-                const newGlobalVariables = await this.globalsBuilder.buildGlobalVariables(new Fr(newBlockNumber), this._coinbase, this._feeRecipient, slot);
-                const enqueueGovernanceVotePromise = this.publisher.enqueueCastVote(slot, newGlobalVariables.timestamp.toBigInt(), VoteType.GOVERNANCE);
-                const enqueueSlashingVotePromise = this.publisher.enqueueCastVote(slot, newGlobalVariables.timestamp.toBigInt(), VoteType.SLASHING);
-                this.setState(SequencerState.INITIALIZING_PROPOSAL, slot);
-                this.log.verbose(`Preparing proposal for block ${newBlockNumber} at slot ${slot}`, {
-                    chainTipArchive,
+ */ export class Sequencer {
+    publisher;
+    validatorClient;
+    globalsBuilder;
+    p2pClient;
+    worldState;
+    slasherClient;
+    blockBuilderFactory;
+    l2BlockSource;
+    l1ToL2MessageSource;
+    publicProcessorFactory;
+    contractDataSource;
+    l1Constants;
+    dateProvider;
+    config;
+    log;
+    runningPromise;
+    pollingIntervalMs;
+    maxTxsPerBlock;
+    minTxsPerBlock;
+    maxL1TxInclusionTimeIntoSlot;
+    // TODO: zero values should not be allowed for the following 2 values in PROD
+    _coinbase;
+    _feeRecipient;
+    state;
+    allowedInSetup;
+    maxBlockSizeInBytes;
+    maxBlockGas;
+    metrics;
+    isFlushing;
+    /** The maximum number of seconds that the sequencer can be into a slot to transition to a particular state. */ timetable;
+    enforceTimeTable;
+    constructor(publisher, validatorClient, globalsBuilder, p2pClient, worldState, slasherClient, blockBuilderFactory, l2BlockSource, l1ToL2MessageSource, publicProcessorFactory, contractDataSource, l1Constants, dateProvider, config = {}, telemetry = getTelemetryClient(), log = createLogger('sequencer')){
+        this.publisher = publisher;
+        this.validatorClient = validatorClient;
+        this.globalsBuilder = globalsBuilder;
+        this.p2pClient = p2pClient;
+        this.worldState = worldState;
+        this.slasherClient = slasherClient;
+        this.blockBuilderFactory = blockBuilderFactory;
+        this.l2BlockSource = l2BlockSource;
+        this.l1ToL2MessageSource = l1ToL2MessageSource;
+        this.publicProcessorFactory = publicProcessorFactory;
+        this.contractDataSource = contractDataSource;
+        this.l1Constants = l1Constants;
+        this.dateProvider = dateProvider;
+        this.config = config;
+        this.log = log;
+        this.pollingIntervalMs = 1000;
+        this.maxTxsPerBlock = 32;
+        this.minTxsPerBlock = 1;
+        this.maxL1TxInclusionTimeIntoSlot = 0;
+        this._coinbase = EthAddress.ZERO;
+        this._feeRecipient = AztecAddress.ZERO;
+        this.state = SequencerState.STOPPED;
+        this.allowedInSetup = [];
+        this.maxBlockSizeInBytes = 1024 * 1024;
+        this.maxBlockGas = new Gas(100e9, 100e9);
+        this.isFlushing = false;
+        this.enforceTimeTable = false;
+        this.metrics = new SequencerMetrics(telemetry, ()=>this.state, 'Sequencer');
+        // Register the block builder with the validator client for re-execution
+        this.validatorClient?.registerBlockBuilder(this.buildBlock.bind(this));
+        // Register the slasher on the publisher to fetch slashing payloads
+        this.publisher.registerSlashPayloadGetter(this.slasherClient.getSlashPayload.bind(this.slasherClient));
+    }
+    get tracer() {
+        return this.metrics.tracer;
+    }
+    /**
+   * Updates sequencer config.
+   * @param config - New parameters.
+   */ async updateConfig(config) {
+        this.log.info(`Sequencer config set`, omit(pickFromSchema(config, SequencerConfigSchema), 'allowedInSetup'));
+        if (config.transactionPollingIntervalMS !== undefined) {
+            this.pollingIntervalMs = config.transactionPollingIntervalMS;
+        }
+        if (config.maxTxsPerBlock !== undefined) {
+            this.maxTxsPerBlock = config.maxTxsPerBlock;
+        }
+        if (config.minTxsPerBlock !== undefined) {
+            this.minTxsPerBlock = config.minTxsPerBlock;
+        }
+        if (config.maxDABlockGas !== undefined) {
+            this.maxBlockGas = new Gas(config.maxDABlockGas, this.maxBlockGas.l2Gas);
+        }
+        if (config.maxL2BlockGas !== undefined) {
+            this.maxBlockGas = new Gas(this.maxBlockGas.daGas, config.maxL2BlockGas);
+        }
+        if (config.coinbase) {
+            this._coinbase = config.coinbase;
+        }
+        if (config.feeRecipient) {
+            this._feeRecipient = config.feeRecipient;
+        }
+        if (config.allowedInSetup) {
+            this.allowedInSetup = config.allowedInSetup;
+        } else {
+            this.allowedInSetup = await getDefaultAllowedSetupFunctions();
+        }
+        if (config.maxBlockSizeInBytes !== undefined) {
+            this.maxBlockSizeInBytes = config.maxBlockSizeInBytes;
+        }
+        if (config.governanceProposerPayload) {
+            this.publisher.setGovernancePayload(config.governanceProposerPayload);
+        }
+        if (config.maxL1TxInclusionTimeIntoSlot !== undefined) {
+            this.maxL1TxInclusionTimeIntoSlot = config.maxL1TxInclusionTimeIntoSlot;
+        }
+        if (config.enforceTimeTable !== undefined) {
+            this.enforceTimeTable = config.enforceTimeTable;
+        }
+        this.setTimeTable();
+        // TODO: Just read everything from the config object as needed instead of copying everything into local vars.
+        this.config = config;
+    }
+    setTimeTable() {
+        this.timetable = new SequencerTimetable(this.l1Constants.ethereumSlotDuration, this.aztecSlotDuration, this.maxL1TxInclusionTimeIntoSlot, this.enforceTimeTable, this.metrics, this.log);
+        this.log.verbose(`Sequencer timetable updated`, {
+            enforceTimeTable: this.enforceTimeTable
+        });
+    }
+    /**
+   * Starts the sequencer and moves to IDLE state.
+   */ async start() {
+        await this.updateConfig(this.config);
+        this.runningPromise = new RunningPromise(this.work.bind(this), this.log, this.pollingIntervalMs);
+        this.setState(SequencerState.IDLE, 0n, true);
+        this.runningPromise.start();
+        this.log.info(`Sequencer started with address ${this.publisher.getSenderAddress().toString()}`);
+    }
+    /**
+   * Stops the sequencer from processing txs and moves to STOPPED state.
+   */ async stop() {
+        this.log.debug(`Stopping sequencer`);
+        await this.validatorClient?.stop();
+        await this.runningPromise?.stop();
+        this.slasherClient.stop();
+        this.publisher.interrupt();
+        this.setState(SequencerState.STOPPED, 0n, true);
+        this.log.info('Stopped sequencer');
+    }
+    /**
+   * Starts a previously stopped sequencer.
+   */ restart() {
+        this.log.info('Restarting sequencer');
+        this.publisher.restart();
+        this.runningPromise.start();
+        this.setState(SequencerState.IDLE, 0n, true);
+    }
+    /**
+   * Returns the current state of the sequencer.
+   * @returns An object with a state entry with one of SequencerState.
+   */ status() {
+        return {
+            state: this.state
+        };
+    }
+    /** Forces the sequencer to bypass all time and tx count checks for the next block and build anyway. */ flush() {
+        this.isFlushing = true;
+    }
+    /**
+   * @notice  Performs most of the sequencer duties:
+   *          - Checks if we are up to date
+   *          - If we are and we are the sequencer, collect txs and build a block
+   *          - Collect attestations for the block
+   *          - Submit block
+   *          - If our block for some reason is not included, revert the state
+   */ async doRealWork() {
+        this.setState(SequencerState.SYNCHRONIZING, 0n);
+        // Update state when the previous block has been synced
+        const chainTip = await this.getChainTip();
+        // Do not go forward with new block if the previous one has not been mined and processed
+        if (!chainTip) {
+            return;
+        }
+        this.setState(SequencerState.PROPOSER_CHECK, 0n);
+        const newBlockNumber = chainTip.blockNumber + 1;
+        // If we cannot find a tip archive, assume genesis.
+        const chainTipArchive = chainTip.archive;
+        const slot = await this.slotForProposal(chainTipArchive.toBuffer(), BigInt(newBlockNumber));
+        if (!slot) {
+            this.log.debug(`Cannot propose block ${newBlockNumber}`);
+            return;
+        }
+        this.log.debug(`Can propose block ${newBlockNumber} at slot ${slot}`);
+        const newGlobalVariables = await this.globalsBuilder.buildGlobalVariables(new Fr(newBlockNumber), this._coinbase, this._feeRecipient, slot);
+        const enqueueGovernanceVotePromise = this.publisher.enqueueCastVote(slot, newGlobalVariables.timestamp.toBigInt(), VoteType.GOVERNANCE);
+        const enqueueSlashingVotePromise = this.publisher.enqueueCastVote(slot, newGlobalVariables.timestamp.toBigInt(), VoteType.SLASHING);
+        this.setState(SequencerState.INITIALIZING_PROPOSAL, slot);
+        this.log.verbose(`Preparing proposal for block ${newBlockNumber} at slot ${slot}`, {
+            chainTipArchive,
+            blockNumber: newBlockNumber,
+            slot
+        });
+        // If I created a "partial" header here that should make our job much easier.
+        const proposalHeader = new BlockHeader(new AppendOnlyTreeSnapshot(chainTipArchive, 1), ContentCommitment.empty(), StateReference.empty(), newGlobalVariables, Fr.ZERO, Fr.ZERO);
+        let finishedFlushing = false;
+        const pendingTxCount = await this.p2pClient.getPendingTxCount();
+        if (pendingTxCount >= this.minTxsPerBlock || this.isFlushing) {
+            // We don't fetch exactly maxTxsPerBlock txs here because we may not need all of them if we hit a limit before,
+            // and also we may need to fetch more if we don't have enough valid txs.
+            const pendingTxs = this.p2pClient.iteratePendingTxs();
+            await this.buildBlockAndEnqueuePublish(pendingTxs, proposalHeader).catch((err)=>{
+                this.log.error(`Error building/enqueuing block`, err, {
                     blockNumber: newBlockNumber,
-                    slot,
-                });
-                // If I created a "partial" header here that should make our job much easier.
-                const proposalHeader = new BlockHeader(new AppendOnlyTreeSnapshot(chainTipArchive, 1), ContentCommitment.empty(), StateReference.empty(), newGlobalVariables, Fr.ZERO, Fr.ZERO);
-                let finishedFlushing = false;
-                const pendingTxCount = await this.p2pClient.getPendingTxCount();
-                if (pendingTxCount >= this.minTxsPerBlock || this.isFlushing) {
-                    // We don't fetch exactly maxTxsPerBlock txs here because we may not need all of them if we hit a limit before,
-                    // and also we may need to fetch more if we don't have enough valid txs.
-                    const pendingTxs = this.p2pClient.iteratePendingTxs();
-                    await this.buildBlockAndEnqueuePublish(pendingTxs, proposalHeader).catch(err => {
-                        this.log.error(`Error building/enqueuing block`, err, { blockNumber: newBlockNumber, slot });
-                    });
-                    finishedFlushing = true;
-                }
-                else {
-                    this.log.debug(`Not enough txs to build block ${newBlockNumber} at slot ${slot}: got ${pendingTxCount} txs, need ${this.minTxsPerBlock}`);
-                }
-                await enqueueGovernanceVotePromise.catch(err => {
-                    this.log.error(`Error enqueuing governance vote`, err, { blockNumber: newBlockNumber, slot });
+                    slot
                 });
-                await enqueueSlashingVotePromise.catch(err => {
-                    this.log.error(`Error enqueuing slashing vote`, err, { blockNumber: newBlockNumber, slot });
-                });
-                await this.publisher.sendRequests();
-                if (finishedFlushing) {
-                    this.isFlushing = false;
-                }
-                this.setState(SequencerState.IDLE, 0n);
+            });
+            finishedFlushing = true;
+        } else {
+            this.log.debug(`Not enough txs to build block ${newBlockNumber} at slot ${slot}: got ${pendingTxCount} txs, need ${this.minTxsPerBlock}`);
+        }
+        await enqueueGovernanceVotePromise.catch((err)=>{
+            this.log.error(`Error enqueuing governance vote`, err, {
+                blockNumber: newBlockNumber,
+                slot
+            });
+        });
+        await enqueueSlashingVotePromise.catch((err)=>{
+            this.log.error(`Error enqueuing slashing vote`, err, {
+                blockNumber: newBlockNumber,
+                slot
+            });
+        });
+        await this.publisher.sendRequests();
+        if (finishedFlushing) {
+            this.isFlushing = false;
+        }
+        this.setState(SequencerState.IDLE, 0n);
+    }
+    async work() {
+        try {
+            await this.doRealWork();
+        } catch (err) {
+            if (err instanceof SequencerTooSlowError) {
+                this.log.warn(err.message);
+            } else {
+                // Re-throw other errors
+                throw err;
             }
-            async work() {
-                try {
-                    await this.doRealWork();
-                }
-                catch (err) {
-                    if (err instanceof SequencerTooSlowError) {
-                        this.log.warn(err.message);
-                    }
-                    else {
-                        // Re-throw other errors
-                        throw err;
-                    }
-                }
-                finally {
-                    this.setState(SequencerState.IDLE, 0n);
-                }
-            }
-            getForwarderAddress() {
-                return this.publisher.getForwarderAddress();
+        } finally{
+            this.setState(SequencerState.IDLE, 0n);
+        }
+    }
+    getForwarderAddress() {
+        return this.publisher.getForwarderAddress();
+    }
+    /**
+   * Checks if we can propose at the next block and returns the slot number if we can.
+   * @param tipArchive - The archive of the previous block.
+   * @param proposalBlockNumber - The block number of the proposal.
+   * @returns The slot number if we can propose at the next block, otherwise undefined.
+   */ async slotForProposal(tipArchive, proposalBlockNumber) {
+        const result = await this.publisher.canProposeAtNextEthBlock(tipArchive);
+        if (!result) {
+            return undefined;
+        }
+        const [slot, blockNumber] = result;
+        if (proposalBlockNumber !== blockNumber) {
+            const msg = `Sequencer block number mismatch. Expected ${proposalBlockNumber} but got ${blockNumber}.`;
+            this.log.warn(msg);
+            throw new Error(msg);
+        }
+        return slot;
+    }
+    /**
+   * Sets the sequencer state and checks if we have enough time left in the slot to transition to the new state.
+   * @param proposedState - The new state to transition to.
+   * @param currentSlotNumber - The current slot number.
+   * @param force - Whether to force the transition even if the sequencer is stopped.
+   *
+   * @dev If the `currentSlotNumber` doesn't matter (e.g. transitioning to IDLE), pass in `0n`;
+   * it is only used to check if we have enough time left in the slot to transition to the new state.
+   */ setState(proposedState, currentSlotNumber, force = false) {
+        if (this.state === SequencerState.STOPPED && force !== true) {
+            this.log.warn(`Cannot set sequencer from ${this.state} to ${proposedState} as it is stopped.`);
+            return;
+        }
+        const secondsIntoSlot = this.getSecondsIntoSlot(currentSlotNumber);
+        this.timetable.assertTimeLeft(proposedState, secondsIntoSlot);
+        this.log.debug(`Transitioning from ${this.state} to ${proposedState}`);
+        this.state = proposedState;
+    }
+    /**
+   * Build a block
+   *
+   * Shared between the sequencer and the validator for re-execution
+   *
+   * @param pendingTxs - The pending transactions to construct the block from
+   * @param newGlobalVariables - The global variables for the new block
+   * @param historicalHeader - The historical header of the parent
+   * @param opts - Whether to just validate the block as a validator, as opposed to building it as a proposal
+   */ async buildBlock(pendingTxs, newGlobalVariables, opts = {}) {
+        const blockNumber = newGlobalVariables.blockNumber.toNumber();
+        const slot = newGlobalVariables.slotNumber.toBigInt();
+        this.log.debug(`Requesting L1 to L2 messages from contract for block ${blockNumber}`);
+        const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(BigInt(blockNumber));
+        const msgCount = l1ToL2Messages.length;
+        this.log.verbose(`Building block ${blockNumber} for slot ${slot}`, {
+            slot,
+            blockNumber,
+            msgCount,
+            validator: opts.validateOnly
+        });
+        // Sync to the previous block at least
+        await this.worldState.syncImmediate(blockNumber - 1);
+        this.log.debug(`Synced to previous block ${blockNumber - 1}`);
+        // NB: separating the dbs because both should update the state
+        const publicProcessorFork = await this.worldState.fork();
+        const orchestratorFork = await this.worldState.fork();
+        const previousBlockHeader = (await this.l2BlockSource.getBlock(blockNumber - 1))?.header ?? orchestratorFork.getInitialHeader();
+        try {
+            const processor = this.publicProcessorFactory.create(publicProcessorFork, newGlobalVariables, true);
+            const blockBuildingTimer = new Timer();
+            const blockBuilder = this.blockBuilderFactory.create(orchestratorFork);
+            await blockBuilder.startNewBlock(newGlobalVariables, l1ToL2Messages, previousBlockHeader);
+            // Deadline for processing depends on whether we're proposing a block
+            const secondsIntoSlot = this.getSecondsIntoSlot(slot);
+            const processingEndTimeWithinSlot = opts.validateOnly ? this.timetable.getValidatorReexecTimeEnd(secondsIntoSlot) : this.timetable.getBlockProposalExecTimeEnd(secondsIntoSlot);
+            // Deadline is only set if enforceTimeTable is enabled.
+            const deadline = this.enforceTimeTable ? new Date((this.getSlotStartTimestamp(slot) + processingEndTimeWithinSlot) * 1000) : undefined;
+            this.log.verbose(`Processing pending txs`, {
+                slot,
+                slotStart: new Date(this.getSlotStartTimestamp(slot) * 1000),
+                now: new Date(this.dateProvider.now()),
+                deadline
+            });
+            const validators = createValidatorsForBlockBuilding(publicProcessorFork, this.contractDataSource, newGlobalVariables, this.allowedInSetup);
+            // TODO(#11000): Public processor should just handle processing, one tx at a time. It should be responsibility
+            // of the sequencer to update world state and iterate over txs. We should refactor this along with unifying the
+            // publicProcessorFork and orchestratorFork, to avoid doing tree insertions twice when building the block.
+            const proposerLimits = {
+                maxTransactions: this.maxTxsPerBlock,
+                maxBlockSize: this.maxBlockSizeInBytes,
+                maxBlockGas: this.maxBlockGas
+            };
+            const limits = opts.validateOnly ? {
+                deadline
+            } : {
+                deadline,
+                ...proposerLimits
+            };
+            const [publicProcessorDuration, [processedTxs, failedTxs]] = await elapsed(()=>processor.process(pendingTxs, limits, validators));
+            if (!opts.validateOnly && failedTxs.length > 0) {
+                const failedTxData = failedTxs.map((fail)=>fail.tx);
+                const failedTxHashes = await Tx.getHashes(failedTxData);
+                this.log.verbose(`Dropping failed txs ${failedTxHashes.join(', ')}`);
+                await this.p2pClient.deleteTxs(failedTxHashes);
             }
-            /**
-             * Checks if we can propose at the next block and returns the slot number if we can.
-             * @param tipArchive - The archive of the previous block.
-             * @param proposalBlockNumber - The block number of the proposal.
-             * @returns The slot number if we can propose at the next block, otherwise undefined.
-             */
-            async slotForProposal(tipArchive, proposalBlockNumber) {
-                const result = await this.publisher.canProposeAtNextEthBlock(tipArchive);
-                if (!result) {
-                    return undefined;
-                }
-                const [slot, blockNumber] = result;
-                if (proposalBlockNumber !== blockNumber) {
-                    const msg = `Sequencer block number mismatch. Expected ${proposalBlockNumber} but got ${blockNumber}.`;
-                    this.log.warn(msg);
-                    throw new Error(msg);
-                }
-                return slot;
-            }
-            /**
-             * Sets the sequencer state and checks if we have enough time left in the slot to transition to the new state.
-             * @param proposedState - The new state to transition to.
-             * @param currentSlotNumber - The current slot number.
-             * @param force - Whether to force the transition even if the sequencer is stopped.
-             *
-             * @dev If the `currentSlotNumber` doesn't matter (e.g. transitioning to IDLE), pass in `0n`;
-             * it is only used to check if we have enough time left in the slot to transition to the new state.
-             */
-            setState(proposedState, currentSlotNumber, force = false) {
-                if (this.state === SequencerState.STOPPED && force !== true) {
-                    this.log.warn(`Cannot set sequencer from ${this.state} to ${proposedState} as it is stopped.`);
-                    return;
-                }
-                const secondsIntoSlot = this.getSecondsIntoSlot(currentSlotNumber);
-                this.timetable.assertTimeLeft(proposedState, secondsIntoSlot);
-                this.log.debug(`Transitioning from ${this.state} to ${proposedState}`);
-                this.state = proposedState;
-            }
-            /**
-             * Build a block
-             *
-             * Shared between the sequencer and the validator for re-execution
-             *
-             * @param pendingTxs - The pending transactions to construct the block from
-             * @param newGlobalVariables - The global variables for the new block
-             * @param historicalHeader - The historical header of the parent
-             * @param opts - Whether to just validate the block as a validator, as opposed to building it as a proposal
-             */
-            async buildBlock(pendingTxs, newGlobalVariables, opts = {}) {
-                const blockNumber = newGlobalVariables.blockNumber.toNumber();
-                const slot = newGlobalVariables.slotNumber.toBigInt();
-                this.log.debug(`Requesting L1 to L2 messages from contract for block ${blockNumber}`);
-                const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(BigInt(blockNumber));
-                const msgCount = l1ToL2Messages.length;
-                this.log.verbose(`Building block ${blockNumber} for slot ${slot}`, {
+            if (!opts.validateOnly && // We check for minTxCount only if we are proposing a block, not if we are validating it
+            !this.isFlushing && // And we skip the check when flushing, since we want all pending txs to go out, no matter if too few
+            this.minTxsPerBlock !== undefined && processedTxs.length < this.minTxsPerBlock) {
+                this.log.warn(`Block ${blockNumber} has too few txs to be proposed (got ${processedTxs.length} but required ${this.minTxsPerBlock})`, {
                     slot,
                     blockNumber,
-                    msgCount,
-                    validator: opts.validateOnly,
+                    processedTxCount: processedTxs.length
                 });
-                // Sync to the previous block at least
-                await this.worldState.syncImmediate(blockNumber - 1);
-                this.log.debug(`Synced to previous block ${blockNumber - 1}`);
-                // NB: separating the dbs because both should update the state
-                const publicProcessorFork = await this.worldState.fork();
-                const orchestratorFork = await this.worldState.fork();
-                const previousBlockHeader = (await this.l2BlockSource.getBlock(blockNumber - 1))?.header ?? orchestratorFork.getInitialHeader();
-                try {
-                    const processor = this.publicProcessorFactory.create(publicProcessorFork, newGlobalVariables, true);
-                    const blockBuildingTimer = new Timer();
-                    const blockBuilder = this.blockBuilderFactory.create(orchestratorFork);
-                    await blockBuilder.startNewBlock(newGlobalVariables, l1ToL2Messages, previousBlockHeader);
-                    // Deadline for processing depends on whether we're proposing a block
-                    const secondsIntoSlot = this.getSecondsIntoSlot(slot);
-                    const processingEndTimeWithinSlot = opts.validateOnly
-                        ? this.timetable.getValidatorReexecTimeEnd(secondsIntoSlot)
-                        : this.timetable.getBlockProposalExecTimeEnd(secondsIntoSlot);
-                    // Deadline is only set if enforceTimeTable is enabled.
-                    const deadline = this.enforceTimeTable
-                        ? new Date((this.getSlotStartTimestamp(slot) + processingEndTimeWithinSlot) * 1000)
-                        : undefined;
-                    this.log.verbose(`Processing pending txs`, {
-                        slot,
-                        slotStart: new Date(this.getSlotStartTimestamp(slot) * 1000),
-                        now: new Date(this.dateProvider.now()),
-                        deadline,
-                    });
-                    const validators = createValidatorsForBlockBuilding(publicProcessorFork, this.contractDataSource, newGlobalVariables, !!this.config.enforceFees, this.allowedInSetup);
-                    // TODO(#11000): Public processor should just handle processing, one tx at a time. It should be responsibility
-                    // of the sequencer to update world state and iterate over txs. We should refactor this along with unifying the
-                    // publicProcessorFork and orchestratorFork, to avoid doing tree insertions twice when building the block.
-                    const proposerLimits = {
-                        maxTransactions: this.maxTxsPerBlock,
-                        maxBlockSize: this.maxBlockSizeInBytes,
-                        maxBlockGas: this.maxBlockGas,
-                    };
-                    const limits = opts.validateOnly ? { deadline } : { deadline, ...proposerLimits };
-                    const [publicProcessorDuration, [processedTxs, failedTxs]] = await elapsed(() => processor.process(pendingTxs, limits, validators));
-                    if (!opts.validateOnly && failedTxs.length > 0) {
-                        const failedTxData = failedTxs.map(fail => fail.tx);
-                        const failedTxHashes = await Tx.getHashes(failedTxData);
-                        this.log.verbose(`Dropping failed txs ${failedTxHashes.join(', ')}`);
-                        await this.p2pClient.deleteTxs(failedTxHashes);
-                    }
-                    if (!opts.validateOnly && // We check for minTxCount only if we are proposing a block, not if we are validating it
-                        !this.isFlushing && // And we skip the check when flushing, since we want all pending txs to go out, no matter if too few
-                        this.minTxsPerBlock !== undefined &&
-                        processedTxs.length < this.minTxsPerBlock) {
-                        this.log.warn(`Block ${blockNumber} has too few txs to be proposed (got ${processedTxs.length} but required ${this.minTxsPerBlock})`, { slot, blockNumber, processedTxCount: processedTxs.length });
-                        throw new Error(`Block has too few successful txs to be proposed`);
-                    }
-                    const start = process.hrtime.bigint();
-                    await blockBuilder.addTxs(processedTxs);
-                    const end = process.hrtime.bigint();
-                    const duration = Number(end - start) / 1000;
-                    this.metrics.recordBlockBuilderTreeInsertions(duration);
-                    // All real transactions have been added, set the block as full and pad if needed
-                    const block = await blockBuilder.setBlockCompleted();
-                    // How much public gas was processed
-                    const publicGas = processedTxs.reduce((acc, tx) => acc.add(tx.gasUsed.publicGas), Gas.empty());
-                    return {
-                        block,
-                        publicGas,
-                        publicProcessorDuration,
-                        numMsgs: l1ToL2Messages.length,
-                        numTxs: processedTxs.length,
-                        numFailedTxs: failedTxs.length,
-                        blockBuildingTimer,
-                    };
-                }
-                finally {
-                    // We create a fresh processor each time to reset any cached state (eg storage writes)
-                    // We wait a bit to close the forks since the processor may still be working on a dangling tx
-                    // which was interrupted due to the processingDeadline being hit.
-                    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-                    setTimeout(async () => {
-                        try {
-                            await publicProcessorFork.close();
-                            await orchestratorFork.close();
-                        }
-                        catch (err) {
-                            // This can happen if the sequencer is stopped before we hit this timeout.
-                            this.log.warn(`Error closing forks for block processing`, err);
-                        }
-                    }, 5000);
-                }
+                throw new Error(`Block has too few successful txs to be proposed`);
             }
-            /**
-             * @notice  Build and propose a block to the chain
-             *
-             * @dev     MUST throw instead of exiting early to ensure that world-state
-             *          is being rolled back if the block is dropped.
-             *
-             * @param pendingTxs - Iterable of pending transactions to construct the block from
-             * @param proposalHeader - The partial header constructed for the proposal
-             */
-            async buildBlockAndEnqueuePublish(pendingTxs, proposalHeader) {
-                await this.publisher.validateBlockForSubmission(proposalHeader);
-                const newGlobalVariables = proposalHeader.globalVariables;
-                const blockNumber = newGlobalVariables.blockNumber.toNumber();
-                const slot = newGlobalVariables.slotNumber.toBigInt();
-                // this.metrics.recordNewBlock(blockNumber, validTxs.length);
-                const workTimer = new Timer();
-                this.setState(SequencerState.CREATING_BLOCK, slot);
+            const start = process.hrtime.bigint();
+            await blockBuilder.addTxs(processedTxs);
+            const end = process.hrtime.bigint();
+            const duration = Number(end - start) / 1_000;
+            this.metrics.recordBlockBuilderTreeInsertions(duration);
+            // All real transactions have been added, set the block as full and pad if needed
+            const block = await blockBuilder.setBlockCompleted();
+            // How much public gas was processed
+            const publicGas = processedTxs.reduce((acc, tx)=>acc.add(tx.gasUsed.publicGas), Gas.empty());
+            return {
+                block,
+                publicGas,
+                publicProcessorDuration,
+                numMsgs: l1ToL2Messages.length,
+                numTxs: processedTxs.length,
+                numFailedTxs: failedTxs.length,
+                blockBuildingTimer
+            };
+        } finally{
+            // We create a fresh processor each time to reset any cached state (eg storage writes)
+            // We wait a bit to close the forks since the processor may still be working on a dangling tx
+            // which was interrupted due to the processingDeadline being hit.
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+            setTimeout(async ()=>{
                 try {
-                    const buildBlockRes = await this.buildBlock(pendingTxs, newGlobalVariables);
-                    const { publicGas, block, publicProcessorDuration, numTxs, numMsgs, blockBuildingTimer } = buildBlockRes;
-                    this.metrics.recordBuiltBlock(workTimer.ms(), publicGas.l2Gas);
-                    // TODO(@PhilWindle) We should probably periodically check for things like another
-                    // block being published before ours instead of just waiting on our block
-                    await this.publisher.validateBlockForSubmission(block.header);
-                    const blockStats = {
-                        eventName: 'l2-block-built',
-                        creator: this.publisher.getSenderAddress().toString(),
-                        duration: workTimer.ms(),
-                        publicProcessDuration: publicProcessorDuration,
-                        rollupCircuitsDuration: blockBuildingTimer.ms(),
-                        ...block.getStats(),
-                    };
-                    const blockHash = await block.hash();
-                    const txHashes = block.body.txEffects.map(tx => tx.txHash);
-                    this.log.info(`Built block ${block.number} for slot ${slot} with ${numTxs} txs and ${numMsgs} messages. ${publicGas.l2Gas / workTimer.s()} mana/s`, {
-                        blockHash,
-                        globalVariables: block.header.globalVariables.toInspect(),
-                        txHashes,
-                        ...blockStats,
-                    });
-                    this.log.debug('Collecting attestations');
-                    const stopCollectingAttestationsTimer = this.metrics.startCollectingAttestationsTimer();
-                    const attestations = await this.collectAttestations(block, txHashes);
-                    if (attestations !== undefined) {
-                        this.log.verbose(`Collected ${attestations.length} attestations`, { blockHash, blockNumber });
-                    }
-                    stopCollectingAttestationsTimer();
-                    return this.enqueuePublishL2Block(block, attestations, txHashes);
-                }
-                catch (err) {
-                    this.metrics.recordFailedBlock();
-                    throw err;
-                }
-            }
-            async collectAttestations(block, txHashes) {
-                // TODO(https://github.com/AztecProtocol/aztec-packages/issues/7962): inefficient to have a round trip in here - this should be cached
-                const committee = await this.publisher.getCurrentEpochCommittee();
-                if (committee.length === 0) {
-                    this.log.verbose(`Attesting committee is empty`);
-                    return undefined;
-                }
-                else {
-                    this.log.debug(`Attesting committee length is ${committee.length}`);
-                }
-                if (!this.validatorClient) {
-                    const msg = 'Missing validator client: Cannot collect attestations';
-                    this.log.error(msg);
-                    throw new Error(msg);
-                }
-                const numberOfRequiredAttestations = Math.floor((committee.length * 2) / 3) + 1;
-                const slotNumber = block.header.globalVariables.slotNumber.toBigInt();
-                this.setState(SequencerState.COLLECTING_ATTESTATIONS, slotNumber);
-                this.log.debug('Creating block proposal for validators');
-                const proposal = await this.validatorClient.createBlockProposal(block.header, block.archive.root, txHashes);
-                if (!proposal) {
-                    const msg = `Failed to create block proposal`;
-                    throw new Error(msg);
-                }
-                this.log.debug('Broadcasting block proposal to validators');
-                this.validatorClient.broadcastBlockProposal(proposal);
-                const attestationTimeAllowed = this.enforceTimeTable
-                    ? this.timetable.getMaxAllowedTime(SequencerState.PUBLISHING_BLOCK)
-                    : this.aztecSlotDuration;
-                const attestationDeadline = new Date(this.dateProvider.now() + attestationTimeAllowed * 1000);
-                const attestations = await this.validatorClient.collectAttestations(proposal, numberOfRequiredAttestations, attestationDeadline);
-                // note: the smart contract requires that the signatures are provided in the order of the committee
-                return orderAttestations(attestations, committee);
-            }
-            /**
-             * Publishes the L2Block to the rollup contract.
-             * @param block - The L2Block to be published.
-             */
-            async enqueuePublishL2Block(block, attestations, txHashes) {
-                // 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.getSlotStartTimestamp(slot) + this.aztecSlotDuration) * 1000);
-                const enqueued = await this.publisher.enqueueProposeL2Block(block, attestations, txHashes, {
-                    txTimeoutAt,
-                });
-                if (!enqueued) {
-                    throw new Error(`Failed to enqueue publish of block ${block.number}`);
-                }
-            }
-            /**
-             * Returns whether all dependencies have caught up.
-             * We don't check against the previous block submitted since it may have been reorg'd out.
-             * @returns Boolean indicating if our dependencies are synced to the latest block.
-             */
-            async getChainTip() {
-                const syncedBlocks = await Promise.all([
-                    this.worldState.status().then((s) => s.syncedToL2Block),
-                    this.l2BlockSource.getL2Tips().then(t => t.latest),
-                    this.p2pClient.getStatus().then(p2p => p2p.syncedToL2Block),
-                    this.l1ToL2MessageSource.getBlockNumber(),
-                ]);
-                const [worldState, l2BlockSource, p2p, l1ToL2MessageSource] = syncedBlocks;
-                const result = 
-                // check that world state has caught up with archiver
-                // note that the archiver reports undefined hash for the genesis block
-                // because it doesn't have access to world state to compute it (facepalm)
-                (l2BlockSource.hash === undefined || worldState.hash === l2BlockSource.hash) &&
-                    // and p2p client and message source are at least at the same block
-                    // this should change to hashes once p2p client handles reorgs
-                    // and once we stop pretending that the l1tol2message source is not
-                    // just the archiver under a different name
-                    (!l2BlockSource.hash || p2p.hash === l2BlockSource.hash) &&
-                    l1ToL2MessageSource === l2BlockSource.number;
-                this.log.debug(`Sequencer sync check ${result ? 'succeeded' : 'failed'}`, {
-                    worldStateNumber: worldState.number,
-                    worldStateHash: worldState.hash,
-                    l2BlockSourceNumber: l2BlockSource.number,
-                    l2BlockSourceHash: l2BlockSource.hash,
-                    p2pNumber: p2p.number,
-                    p2pHash: p2p.hash,
-                    l1ToL2MessageSourceNumber: l1ToL2MessageSource,
+                    await publicProcessorFork.close();
+                    await orchestratorFork.close();
+                } catch (err) {
+                    // This can happen if the sequencer is stopped before we hit this timeout.
+                    this.log.warn(`Error closing forks for block processing`, err);
+                }
+            }, 5000);
+        }
+    }
+    /**
+   * @notice  Build and propose a block to the chain
+   *
+   * @dev     MUST throw instead of exiting early to ensure that world-state
+   *          is being rolled back if the block is dropped.
+   *
+   * @param pendingTxs - Iterable of pending transactions to construct the block from
+   * @param proposalHeader - The partial header constructed for the proposal
+   */ async buildBlockAndEnqueuePublish(pendingTxs, proposalHeader) {
+        await this.publisher.validateBlockForSubmission(proposalHeader);
+        const newGlobalVariables = proposalHeader.globalVariables;
+        const blockNumber = newGlobalVariables.blockNumber.toNumber();
+        const slot = newGlobalVariables.slotNumber.toBigInt();
+        // this.metrics.recordNewBlock(blockNumber, validTxs.length);
+        const workTimer = new Timer();
+        this.setState(SequencerState.CREATING_BLOCK, slot);
+        try {
+            const buildBlockRes = await this.buildBlock(pendingTxs, newGlobalVariables);
+            const { publicGas, block, publicProcessorDuration, numTxs, numMsgs, blockBuildingTimer } = buildBlockRes;
+            this.metrics.recordBuiltBlock(workTimer.ms(), publicGas.l2Gas);
+            // TODO(@PhilWindle) We should probably periodically check for things like another
+            // block being published before ours instead of just waiting on our block
+            await this.publisher.validateBlockForSubmission(block.header);
+            const blockStats = {
+                eventName: 'l2-block-built',
+                creator: this.publisher.getSenderAddress().toString(),
+                duration: workTimer.ms(),
+                publicProcessDuration: publicProcessorDuration,
+                rollupCircuitsDuration: blockBuildingTimer.ms(),
+                ...block.getStats()
+            };
+            const blockHash = await block.hash();
+            const txHashes = block.body.txEffects.map((tx)=>tx.txHash);
+            this.log.info(`Built block ${block.number} for slot ${slot} with ${numTxs} txs and ${numMsgs} messages. ${publicGas.l2Gas / workTimer.s()} mana/s`, {
+                blockHash,
+                globalVariables: block.header.globalVariables.toInspect(),
+                txHashes,
+                ...blockStats
+            });
+            this.log.debug('Collecting attestations');
+            const stopCollectingAttestationsTimer = this.metrics.startCollectingAttestationsTimer();
+            const attestations = await this.collectAttestations(block, txHashes);
+            if (attestations !== undefined) {
+                this.log.verbose(`Collected ${attestations.length} attestations`, {
+                    blockHash,
+                    blockNumber
                 });
-                if (!result) {
-                    return undefined;
-                }
-                if (worldState.number >= INITIAL_L2_BLOCK_NUM) {
-                    const block = await this.l2BlockSource.getBlock(worldState.number);
-                    if (!block) {
-                        // this shouldn't really happen because a moment ago we checked that all components were in synch
-                        return undefined;
-                    }
-                    return { blockNumber: block.number, archive: block.archive.root };
-                }
-                else {
-                    return { blockNumber: INITIAL_L2_BLOCK_NUM - 1, archive: new Fr(GENESIS_ARCHIVE_ROOT) };
-                }
-            }
-            getSlotStartTimestamp(slotNumber) {
-                return Number(this.l1Constants.l1GenesisTime) + Number(slotNumber) * this.l1Constants.slotDuration;
-            }
-            getSecondsIntoSlot(slotNumber) {
-                const slotStartTimestamp = this.getSlotStartTimestamp(slotNumber);
-                return Number((this.dateProvider.now() / 1000 - slotStartTimestamp).toFixed(3));
-            }
-            get aztecSlotDuration() {
-                return this.l1Constants.slotDuration;
-            }
-            get coinbase() {
-                return this._coinbase;
             }
-            get feeRecipient() {
-                return this._feeRecipient;
+            stopCollectingAttestationsTimer();
+            return this.enqueuePublishL2Block(block, attestations, txHashes);
+        } catch (err) {
+            this.metrics.recordFailedBlock();
+            throw err;
+        }
+    }
+    async collectAttestations(block, txHashes) {
+        // TODO(https://github.com/AztecProtocol/aztec-packages/issues/7962): inefficient to have a round trip in here - this should be cached
+        const committee = await this.publisher.getCurrentEpochCommittee();
+        if (committee.length === 0) {
+            this.log.verbose(`Attesting committee is empty`);
+            return undefined;
+        } else {
+            this.log.debug(`Attesting committee length is ${committee.length}`);
+        }
+        if (!this.validatorClient) {
+            const msg = 'Missing validator client: Cannot collect attestations';
+            this.log.error(msg);
+            throw new Error(msg);
+        }
+        const numberOfRequiredAttestations = Math.floor(committee.length * 2 / 3) + 1;
+        const slotNumber = block.header.globalVariables.slotNumber.toBigInt();
+        this.setState(SequencerState.COLLECTING_ATTESTATIONS, slotNumber);
+        this.log.debug('Creating block proposal for validators');
+        const proposal = await this.validatorClient.createBlockProposal(block.header, block.archive.root, txHashes);
+        if (!proposal) {
+            const msg = `Failed to create block proposal`;
+            throw new Error(msg);
+        }
+        this.log.debug('Broadcasting block proposal to validators');
+        this.validatorClient.broadcastBlockProposal(proposal);
+        const attestationTimeAllowed = this.enforceTimeTable ? this.timetable.getMaxAllowedTime(SequencerState.PUBLISHING_BLOCK) : this.aztecSlotDuration;
+        const attestationDeadline = new Date(this.dateProvider.now() + attestationTimeAllowed * 1000);
+        const attestations = await this.validatorClient.collectAttestations(proposal, numberOfRequiredAttestations, attestationDeadline);
+        // note: the smart contract requires that the signatures are provided in the order of the committee
+        return orderAttestations(attestations, committee);
+    }
+    /**
+   * Publishes the L2Block to the rollup contract.
+   * @param block - The L2Block to be published.
+   */ async enqueuePublishL2Block(block, attestations, txHashes) {
+        // 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.getSlotStartTimestamp(slot) + this.aztecSlotDuration) * 1000);
+        const enqueued = await this.publisher.enqueueProposeL2Block(block, attestations, txHashes, {
+            txTimeoutAt
+        });
+        if (!enqueued) {
+            throw new Error(`Failed to enqueue publish of block ${block.number}`);
+        }
+    }
+    /**
+   * Returns whether all dependencies have caught up.
+   * We don't check against the previous block submitted since it may have been reorg'd out.
+   * @returns Boolean indicating if our dependencies are synced to the latest block.
+   */ async getChainTip() {
+        const syncedBlocks = await Promise.all([
+            this.worldState.status().then((s)=>{
+                return {
+                    number: s.syncSummary.latestBlockNumber,
+                    hash: s.syncSummary.latestBlockHash
+                };
+            }),
+            this.l2BlockSource.getL2Tips().then((t)=>t.latest),
+            this.p2pClient.getStatus().then((p2p)=>p2p.syncedToL2Block),
+            this.l1ToL2MessageSource.getBlockNumber()
+        ]);
+        const [worldState, l2BlockSource, p2p, l1ToL2MessageSource] = syncedBlocks;
+        const result = // check that world state has caught up with archiver
+        // note that the archiver reports undefined hash for the genesis block
+        // because it doesn't have access to world state to compute it (facepalm)
+        (l2BlockSource.hash === undefined || worldState.hash === l2BlockSource.hash) && // and p2p client and message source are at least at the same block
+        // this should change to hashes once p2p client handles reorgs
+        // and once we stop pretending that the l1tol2message source is not
+        // just the archiver under a different name
+        (!l2BlockSource.hash || p2p.hash === l2BlockSource.hash) && l1ToL2MessageSource === l2BlockSource.number;
+        this.log.debug(`Sequencer sync check ${result ? 'succeeded' : 'failed'}`, {
+            worldStateNumber: worldState.number,
+            worldStateHash: worldState.hash,
+            l2BlockSourceNumber: l2BlockSource.number,
+            l2BlockSourceHash: l2BlockSource.hash,
+            p2pNumber: p2p.number,
+            p2pHash: p2p.hash,
+            l1ToL2MessageSourceNumber: l1ToL2MessageSource
+        });
+        if (!result) {
+            return undefined;
+        }
+        if (worldState.number >= INITIAL_L2_BLOCK_NUM) {
+            const block = await this.l2BlockSource.getBlock(worldState.number);
+            if (!block) {
+                // this shouldn't really happen because a moment ago we checked that all components were in synch
+                return undefined;
             }
-        },
-        (() => {
-            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-            _work_decorators = [trackSpan('Sequencer.work')];
-            _buildBlockAndEnqueuePublish_decorators = [trackSpan('Sequencer.buildBlockAndEnqueuePublish', (_validTxs, proposalHeader) => ({
-                    [Attributes.BLOCK_NUMBER]: proposalHeader.globalVariables.blockNumber.toNumber(),
-                }))];
-            _collectAttestations_decorators = [trackSpan('Sequencer.collectAttestations', (block, txHashes) => ({
-                    [Attributes.BLOCK_NUMBER]: block.number,
-                    [Attributes.BLOCK_ARCHIVE]: block.archive.toString(),
-                    [Attributes.BLOCK_TXS_COUNT]: txHashes.length,
-                }))];
-            _enqueuePublishL2Block_decorators = [trackSpan('Sequencer.enqueuePublishL2Block', block => ({
-                    [Attributes.BLOCK_NUMBER]: block.number,
-                }))];
-            __esDecorate(_a, null, _work_decorators, { kind: "method", name: "work", static: false, private: false, access: { has: obj => "work" in obj, get: obj => obj.work }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _buildBlockAndEnqueuePublish_decorators, { kind: "method", name: "buildBlockAndEnqueuePublish", static: false, private: false, access: { has: obj => "buildBlockAndEnqueuePublish" in obj, get: obj => obj.buildBlockAndEnqueuePublish }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _collectAttestations_decorators, { kind: "method", name: "collectAttestations", static: false, private: false, access: { has: obj => "collectAttestations" in obj, get: obj => obj.collectAttestations }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _enqueuePublishL2Block_decorators, { kind: "method", name: "enqueuePublishL2Block", static: false, private: false, access: { has: obj => "enqueuePublishL2Block" in obj, get: obj => obj.enqueuePublishL2Block }, metadata: _metadata }, null, _instanceExtraInitializers);
-            if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-        })(),
-        _a;
-})();
-export { Sequencer };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
+            return {
+                blockNumber: block.number,
+                archive: block.archive.root
+            };
+        } else {
+            const archive = new Fr((await this.worldState.getCommitted().getTreeInfo(MerkleTreeId.ARCHIVE)).root);
+            return {
+                blockNumber: INITIAL_L2_BLOCK_NUM - 1,
+                archive
+            };
+        }
+    }
+    getSlotStartTimestamp(slotNumber) {
+        return Number(this.l1Constants.l1GenesisTime) + Number(slotNumber) * this.l1Constants.slotDuration;
+    }
+    getSecondsIntoSlot(slotNumber) {
+        const slotStartTimestamp = this.getSlotStartTimestamp(slotNumber);
+        return Number((this.dateProvider.now() / 1000 - slotStartTimestamp).toFixed(3));
+    }
+    get aztecSlotDuration() {
+        return this.l1Constants.slotDuration;
+    }
+    get coinbase() {
+        return this._coinbase;
+    }
+    get feeRecipient() {
+        return this._feeRecipient;
+    }
+}
+_ts_decorate([
+    trackSpan('Sequencer.work')
+], Sequencer.prototype, "work", null);
+_ts_decorate([
+    trackSpan('Sequencer.buildBlockAndEnqueuePublish', (_validTxs, proposalHeader)=>({
+            [Attributes.BLOCK_NUMBER]: proposalHeader.globalVariables.blockNumber.toNumber()
+        }))
+], Sequencer.prototype, "buildBlockAndEnqueuePublish", null);
+_ts_decorate([
+    trackSpan('Sequencer.collectAttestations', (block, txHashes)=>({
+            [Attributes.BLOCK_NUMBER]: block.number,
+            [Attributes.BLOCK_ARCHIVE]: block.archive.toString(),
+            [Attributes.BLOCK_TXS_COUNT]: txHashes.length
+        }))
+], Sequencer.prototype, "collectAttestations", null);
+_ts_decorate([
+    trackSpan('Sequencer.enqueuePublishL2Block', (block)=>({
+            [Attributes.BLOCK_NUMBER]: block.number
+        }))
+], Sequencer.prototype, "enqueuePublishL2Block", null);