@aztec/sequencer-client 0.43.0 → 0.45.0

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

@@ -2,6 +2,7 @@ import { type L1ToL2MessageSource, type L2BlockSource } from '@aztec/circuit-typ
 import { type BlockProver } from '@aztec/circuit-types/interfaces';
 import { type P2P } from '@aztec/p2p';
 import { type SimulationProvider } from '@aztec/simulator';
+import { type TelemetryClient } from '@aztec/telemetry-client';
 import { type ContractDataSource } from '@aztec/types/contracts';
 import { type WorldStateSynchronizer } from '@aztec/world-state';
 import { type SequencerClientConfig } from '../config.js';
@@ -24,7 +25,7 @@ export declare class SequencerClient {
      * @param simulationProvider - An instance of a simulation provider
      * @returns A new running instance.
      */
-    static new(config: SequencerClientConfig, p2pClient: P2P, worldStateSynchronizer: WorldStateSynchronizer, contractDataSource: ContractDataSource, l2BlockSource: L2BlockSource, l1ToL2MessageSource: L1ToL2MessageSource, prover: BlockProver, simulationProvider: SimulationProvider): Promise<SequencerClient>;
+    static new(config: SequencerClientConfig, p2pClient: P2P, worldStateSynchronizer: WorldStateSynchronizer, contractDataSource: ContractDataSource, l2BlockSource: L2BlockSource, l1ToL2MessageSource: L1ToL2MessageSource, prover: BlockProver, simulationProvider: SimulationProvider, telemetryClient: TelemetryClient): Promise<SequencerClient>;
     /**
      * Updates sequencer config.
      * @param config - New parameters.

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

@@ -1 +1 @@
-{"version":3,"file":"sequencer-client.d.ts","sourceRoot":"","sources":["../../src/client/sequencer-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACpF,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAA0B,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACnF,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAG1D,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxE;;GAEG;AACH,qBAAa,eAAe;IACd,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAExC;;;;;;;;;;;OAWG;WACiB,GAAG,CACrB,MAAM,EAAE,qBAAqB,EAC7B,SAAS,EAAE,GAAG,EACd,sBAAsB,EAAE,sBAAsB,EAC9C,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,aAAa,EAC5B,mBAAmB,EAAE,mBAAmB,EACxC,MAAM,EAAE,WAAW,EACnB,kBAAkB,EAAE,kBAAkB;IAyBxC;;;OAGG;IACI,qBAAqB,CAAC,MAAM,EAAE,eAAe;IAIpD;;OAEG;IACU,IAAI;IAIjB;;OAEG;IACI,OAAO;IAId,IAAI,QAAQ,yCAEX;IAED,IAAI,YAAY,2CAEf;CACF"}
+{"version":3,"file":"sequencer-client.d.ts","sourceRoot":"","sources":["../../src/client/sequencer-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACpF,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAA0B,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACnF,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAG1D,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxE;;GAEG;AACH,qBAAa,eAAe;IACd,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAExC;;;;;;;;;;;OAWG;WACiB,GAAG,CACrB,MAAM,EAAE,qBAAqB,EAC7B,SAAS,EAAE,GAAG,EACd,sBAAsB,EAAE,sBAAsB,EAC9C,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,aAAa,EAC5B,mBAAmB,EAAE,mBAAmB,EACxC,MAAM,EAAE,WAAW,EACnB,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,eAAe;IA+BlC;;;OAGG;IACI,qBAAqB,CAAC,MAAM,EAAE,eAAe;IAIpD;;OAEG;IACU,IAAI;IAIjB;;OAEG;IACI,OAAO;IAId,IAAI,QAAQ,yCAEX;IAED,IAAI,YAAY,2CAEf;CACF"}

package/dest/client/sequencer-client.js

@@ -22,12 +22,12 @@ export class SequencerClient {
      * @param simulationProvider - An instance of a simulation provider
      * @returns A new running instance.
      */
-    static async new(config, p2pClient, worldStateSynchronizer, contractDataSource, l2BlockSource, l1ToL2MessageSource, prover, simulationProvider) {
+    static async new(config, p2pClient, worldStateSynchronizer, contractDataSource, l2BlockSource, l1ToL2MessageSource, prover, simulationProvider, telemetryClient) {
         const publisher = getL1Publisher(config);
         const globalsBuilder = getGlobalVariableBuilder(config);
         const merkleTreeDb = worldStateSynchronizer.getLatest();
-        const publicProcessorFactory = new PublicProcessorFactory(merkleTreeDb, contractDataSource, simulationProvider);
-        const sequencer = new Sequencer(publisher, globalsBuilder, p2pClient, worldStateSynchronizer, prover, l2BlockSource, l1ToL2MessageSource, publicProcessorFactory, new TxValidatorFactory(merkleTreeDb, contractDataSource, !!config.enforceFees), config);
+        const publicProcessorFactory = new PublicProcessorFactory(merkleTreeDb, contractDataSource, simulationProvider, telemetryClient);
+        const sequencer = new Sequencer(publisher, globalsBuilder, p2pClient, worldStateSynchronizer, prover, l2BlockSource, l1ToL2MessageSource, publicProcessorFactory, new TxValidatorFactory(merkleTreeDb, contractDataSource, !!config.enforceFees), telemetryClient, config);
         await sequencer.start();
         return new SequencerClient(sequencer);
     }
@@ -57,4 +57,4 @@ export class SequencerClient {
         return this.sequencer.feeRecipient;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLWNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbGllbnQvc2VxdWVuY2VyLWNsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsc0JBQXNCLEVBQTJCLE1BQU0sa0JBQWtCLENBQUM7QUFLbkYsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDL0UsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxTQUFTLEVBQXdCLE1BQU0sdUJBQXVCLENBQUM7QUFDeEUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFFN0U7O0dBRUc7QUFDSCxNQUFNLE9BQU8sZUFBZTtJQUMxQixZQUFvQixTQUFvQjtRQUFwQixjQUFTLEdBQVQsU0FBUyxDQUFXO0lBQUcsQ0FBQztJQUU1Qzs7Ozs7Ozs7Ozs7T0FXRztJQUNJLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUNyQixNQUE2QixFQUM3QixTQUFjLEVBQ2Qsc0JBQThDLEVBQzlDLGtCQUFzQyxFQUN0QyxhQUE0QixFQUM1QixtQkFBd0MsRUFDeEMsTUFBbUIsRUFDbkIsa0JBQXNDO1FBRXRDLE1BQU0sU0FBUyxHQUFHLGNBQWMsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN6QyxNQUFNLGNBQWMsR0FBRyx3QkFBd0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN4RCxNQUFNLFlBQVksR0FBRyxzQkFBc0IsQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUV4RCxNQUFNLHNCQUFzQixHQUFHLElBQUksc0JBQXNCLENBQUMsWUFBWSxFQUFFLGtCQUFrQixFQUFFLGtCQUFrQixDQUFDLENBQUM7UUFFaEgsTUFBTSxTQUFTLEdBQUcsSUFBSSxTQUFTLENBQzdCLFNBQVMsRUFDVCxjQUFjLEVBQ2QsU0FBUyxFQUNULHNCQUFzQixFQUN0QixNQUFNLEVBQ04sYUFBYSxFQUNiLG1CQUFtQixFQUNuQixzQkFBc0IsRUFDdEIsSUFBSSxrQkFBa0IsQ0FBQyxZQUFZLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsRUFDOUUsTUFBTSxDQUNQLENBQUM7UUFFRixNQUFNLFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUN4QixPQUFPLElBQUksZUFBZSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3hDLENBQUM7SUFFRDs7O09BR0c7SUFDSSxxQkFBcUIsQ0FBQyxNQUF1QjtRQUNsRCxJQUFJLENBQUMsU0FBUyxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUN0QyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsSUFBSTtRQUNmLE1BQU0sSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUM5QixDQUFDO0lBRUQ7O09BRUc7SUFDSSxPQUFPO1FBQ1osSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBRUQsSUFBSSxRQUFRO1FBQ1YsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQztJQUNqQyxDQUFDO0lBRUQsSUFBSSxZQUFZO1FBQ2QsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLFlBQVksQ0FBQztJQUNyQyxDQUFDO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLWNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbGllbnQvc2VxdWVuY2VyLWNsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsc0JBQXNCLEVBQTJCLE1BQU0sa0JBQWtCLENBQUM7QUFNbkYsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDL0UsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxTQUFTLEVBQXdCLE1BQU0sdUJBQXVCLENBQUM7QUFDeEUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFFN0U7O0dBRUc7QUFDSCxNQUFNLE9BQU8sZUFBZTtJQUMxQixZQUFvQixTQUFvQjtRQUFwQixjQUFTLEdBQVQsU0FBUyxDQUFXO0lBQUcsQ0FBQztJQUU1Qzs7Ozs7Ozs7Ozs7T0FXRztJQUNJLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUNyQixNQUE2QixFQUM3QixTQUFjLEVBQ2Qsc0JBQThDLEVBQzlDLGtCQUFzQyxFQUN0QyxhQUE0QixFQUM1QixtQkFBd0MsRUFDeEMsTUFBbUIsRUFDbkIsa0JBQXNDLEVBQ3RDLGVBQWdDO1FBRWhDLE1BQU0sU0FBUyxHQUFHLGNBQWMsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN6QyxNQUFNLGNBQWMsR0FBRyx3QkFBd0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN4RCxNQUFNLFlBQVksR0FBRyxzQkFBc0IsQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUV4RCxNQUFNLHNCQUFzQixHQUFHLElBQUksc0JBQXNCLENBQ3ZELFlBQVksRUFDWixrQkFBa0IsRUFDbEIsa0JBQWtCLEVBQ2xCLGVBQWUsQ0FDaEIsQ0FBQztRQUVGLE1BQU0sU0FBUyxHQUFHLElBQUksU0FBUyxDQUM3QixTQUFTLEVBQ1QsY0FBYyxFQUNkLFNBQVMsRUFDVCxzQkFBc0IsRUFDdEIsTUFBTSxFQUNOLGFBQWEsRUFDYixtQkFBbUIsRUFDbkIsc0JBQXNCLEVBQ3RCLElBQUksa0JBQWtCLENBQUMsWUFBWSxFQUFFLGtCQUFrQixFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLEVBQzlFLGVBQWUsRUFDZixNQUFNLENBQ1AsQ0FBQztRQUVGLE1BQU0sU0FBUyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ3hCLE9BQU8sSUFBSSxlQUFlLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDeEMsQ0FBQztJQUVEOzs7T0FHRztJQUNJLHFCQUFxQixDQUFDLE1BQXVCO1FBQ2xELElBQUksQ0FBQyxTQUFTLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3RDLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxJQUFJO1FBQ2YsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxDQUFDO0lBQzlCLENBQUM7SUFFRDs7T0FFRztJQUNJLE9BQU87UUFDWixJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFFRCxJQUFJLFFBQVE7UUFDVixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDO0lBQ2pDLENBQUM7SUFFRCxJQUFJLFlBQVk7UUFDZCxPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsWUFBWSxDQUFDO0lBQ3JDLENBQUM7Q0FDRiJ9

package/dest/sequencer/sequencer.d.ts

@@ -4,6 +4,7 @@ import { AztecAddress, EthAddress, type Proof } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 import { type P2P } from '@aztec/p2p';
 import { type PublicProcessorFactory } from '@aztec/simulator';
+import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
 import { type WorldStateSynchronizer } from '@aztec/world-state';
 import { type GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
 import { type L1Publisher } from '../publisher/l1-publisher.js';
@@ -40,7 +41,8 @@ export declare class Sequencer {
     private allowedInSetup;
     private allowedInTeardown;
     private maxBlockSizeInBytes;
-    constructor(publisher: L1Publisher, globalsBuilder: GlobalVariableBuilder, p2pClient: P2P, worldState: WorldStateSynchronizer, prover: BlockProver, l2BlockSource: L2BlockSource, l1ToL2MessageSource: L1ToL2MessageSource, publicProcessorFactory: PublicProcessorFactory, txValidatorFactory: TxValidatorFactory, config?: SequencerConfig, log?: import("@aztec/foundation/log").Logger);
+    readonly tracer: Tracer;
+    constructor(publisher: L1Publisher, globalsBuilder: GlobalVariableBuilder, p2pClient: P2P, worldState: WorldStateSynchronizer, prover: BlockProver, l2BlockSource: L2BlockSource, l1ToL2MessageSource: L1ToL2MessageSource, publicProcessorFactory: PublicProcessorFactory, txValidatorFactory: TxValidatorFactory, telemetry: TelemetryClient, config?: SequencerConfig, log?: import("@aztec/foundation/log").Logger);
     /**
      * Updates sequencer config.
      * @param config - New parameters.
@@ -70,6 +72,7 @@ export declare class Sequencer {
      * Grabs up to maxTxsPerBlock from the p2p client, constructs a block, and pushes it to L1.
      */
     protected work(): Promise<void>;
+    private buildBlockAndPublish;
     /**
      * Publishes the L2Block to the rollup contract.
      * @param block - The L2Block to be published.

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

@@ -1 +1 @@
-{"version":3,"file":"sequencer.d.ts","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sequencer.d.ts","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}

package/dest/sequencer/sequencer.js

@@ -1,3 +1,4 @@
+import { __esDecorate, __runInitializers } from "tslib";
 import { Tx, } from '@aztec/circuit-types';
 import { BlockProofError, PROVING_STATUS, } from '@aztec/circuit-types/interfaces';
 import { AztecAddress, EthAddress } from '@aztec/circuits.js';
@@ -5,6 +6,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { Timer, elapsed } from '@aztec/foundation/timer';
+import { Attributes, trackSpan } from '@aztec/telemetry-client';
 /**
  * Sequencer client
  * - Wins a period of time to become the sequencer (depending on finalized protocol).
@@ -14,281 +16,298 @@ import { Timer, elapsed } from '@aztec/foundation/timer';
  * - 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.
  */
-export class Sequencer {
-    constructor(publisher, globalsBuilder, p2pClient, worldState, prover, l2BlockSource, l1ToL2MessageSource, publicProcessorFactory, txValidatorFactory, config = {}, log = createDebugLogger('aztec:sequencer')) {
-        this.publisher = publisher;
-        this.globalsBuilder = globalsBuilder;
-        this.p2pClient = p2pClient;
-        this.worldState = worldState;
-        this.prover = prover;
-        this.l2BlockSource = l2BlockSource;
-        this.l1ToL2MessageSource = l1ToL2MessageSource;
-        this.publicProcessorFactory = publicProcessorFactory;
-        this.txValidatorFactory = txValidatorFactory;
-        this.log = log;
-        this.pollingIntervalMs = 1000;
-        this.maxTxsPerBlock = 32;
-        this.minTxsPerBLock = 1;
-        // TODO: zero values should not be allowed for the following 2 values in PROD
-        this._coinbase = EthAddress.ZERO;
-        this._feeRecipient = AztecAddress.ZERO;
-        this.lastPublishedBlock = 0;
-        this.state = SequencerState.STOPPED;
-        this.allowedInSetup = [];
-        this.allowedInTeardown = [];
-        this.maxBlockSizeInBytes = 1024 * 1024;
-        this.updateConfig(config);
-        this.log.verbose(`Initialized sequencer with ${this.minTxsPerBLock}-${this.maxTxsPerBlock} txs per block.`);
-    }
-    /**
-     * Updates sequencer config.
-     * @param config - New parameters.
-     */
-    updateConfig(config) {
-        if (config.transactionPollingIntervalMS) {
-            this.pollingIntervalMs = config.transactionPollingIntervalMS;
-        }
-        if (config.maxTxsPerBlock) {
-            this.maxTxsPerBlock = config.maxTxsPerBlock;
-        }
-        if (config.minTxsPerBlock) {
-            this.minTxsPerBLock = config.minTxsPerBlock;
-        }
-        if (config.coinbase) {
-            this._coinbase = config.coinbase;
-        }
-        if (config.feeRecipient) {
-            this._feeRecipient = config.feeRecipient;
-        }
-        if (config.allowedInSetup) {
-            this.allowedInSetup = config.allowedInSetup;
-        }
-        if (config.maxBlockSizeInBytes) {
-            this.maxBlockSizeInBytes = config.maxBlockSizeInBytes;
-        }
-        // TODO(#5917) remove this. it is no longer needed since we don't need to whitelist functions in teardown
-        if (config.allowedInTeardown) {
-            this.allowedInTeardown = config.allowedInTeardown;
-        }
-    }
-    /**
-     * Starts the sequencer and moves to IDLE state. Blocks until the initial sync is complete.
-     */
-    async start() {
-        await this.initialSync();
-        this.runningPromise = new RunningPromise(this.work.bind(this), this.pollingIntervalMs);
-        this.runningPromise.start();
-        this.state = SequencerState.IDLE;
-        this.log.info('Sequencer started');
-    }
-    /**
-     * Stops the sequencer from processing txs and moves to STOPPED state.
-     */
-    async stop() {
-        this.log.debug(`Stopping sequencer`);
-        await this.runningPromise?.stop();
-        this.publisher.interrupt();
-        this.state = SequencerState.STOPPED;
-        this.log.info('Stopped sequencer');
-    }
-    /**
-     * Starts a previously stopped sequencer.
-     */
-    restart() {
-        this.log.info('Restarting sequencer');
-        this.publisher.restart();
-        this.runningPromise.start();
-        this.state = SequencerState.IDLE;
-    }
-    /**
-     * Returns the current state of the sequencer.
-     * @returns An object with a state entry with one of SequencerState.
-     */
-    status() {
-        return { state: this.state };
-    }
-    async initialSync() {
-        // TODO: Should we wait for world state to be ready, or is the caller expected to run await start?
-        this.lastPublishedBlock = await this.worldState.status().then((s) => s.syncedToL2Block);
-    }
-    /**
-     * Grabs up to maxTxsPerBlock from the p2p client, constructs a block, and pushes it to L1.
-     */
-    async work() {
-        try {
-            // Update state when the previous block has been synced
-            const prevBlockSynced = await this.isBlockSynced();
-            if (prevBlockSynced && this.state === SequencerState.PUBLISHING_BLOCK) {
-                this.log.debug(`Block has been synced`);
+let Sequencer = (() => {
+    var _a;
+    let _instanceExtraInitializers = [];
+    let _buildBlockAndPublish_decorators;
+    let _publishL2Block_decorators;
+    return _a = class Sequencer {
+            constructor(publisher, globalsBuilder, p2pClient, worldState, prover, l2BlockSource, l1ToL2MessageSource, publicProcessorFactory, txValidatorFactory, telemetry, config = {}, log = createDebugLogger('aztec:sequencer')) {
+                this.publisher = (__runInitializers(this, _instanceExtraInitializers), publisher);
+                this.globalsBuilder = globalsBuilder;
+                this.p2pClient = p2pClient;
+                this.worldState = worldState;
+                this.prover = prover;
+                this.l2BlockSource = l2BlockSource;
+                this.l1ToL2MessageSource = l1ToL2MessageSource;
+                this.publicProcessorFactory = publicProcessorFactory;
+                this.txValidatorFactory = txValidatorFactory;
+                this.log = log;
+                this.pollingIntervalMs = 1000;
+                this.maxTxsPerBlock = 32;
+                this.minTxsPerBLock = 1;
+                // TODO: zero values should not be allowed for the following 2 values in PROD
+                this._coinbase = EthAddress.ZERO;
+                this._feeRecipient = AztecAddress.ZERO;
+                this.lastPublishedBlock = 0;
+                this.state = SequencerState.STOPPED;
+                this.allowedInSetup = [];
+                this.allowedInTeardown = [];
+                this.maxBlockSizeInBytes = 1024 * 1024;
+                this.updateConfig(config);
+                this.tracer = telemetry.getTracer('Sequencer');
+                this.log.verbose(`Initialized sequencer with ${this.minTxsPerBLock}-${this.maxTxsPerBlock} txs per block.`);
+            }
+            /**
+             * Updates sequencer config.
+             * @param config - New parameters.
+             */
+            updateConfig(config) {
+                if (config.transactionPollingIntervalMS) {
+                    this.pollingIntervalMs = config.transactionPollingIntervalMS;
+                }
+                if (config.maxTxsPerBlock) {
+                    this.maxTxsPerBlock = config.maxTxsPerBlock;
+                }
+                if (config.minTxsPerBlock) {
+                    this.minTxsPerBLock = config.minTxsPerBlock;
+                }
+                if (config.coinbase) {
+                    this._coinbase = config.coinbase;
+                }
+                if (config.feeRecipient) {
+                    this._feeRecipient = config.feeRecipient;
+                }
+                if (config.allowedInSetup) {
+                    this.allowedInSetup = config.allowedInSetup;
+                }
+                if (config.maxBlockSizeInBytes) {
+                    this.maxBlockSizeInBytes = config.maxBlockSizeInBytes;
+                }
+                // TODO(#5917) remove this. it is no longer needed since we don't need to whitelist functions in teardown
+                if (config.allowedInTeardown) {
+                    this.allowedInTeardown = config.allowedInTeardown;
+                }
+            }
+            /**
+             * Starts the sequencer and moves to IDLE state. Blocks until the initial sync is complete.
+             */
+            async start() {
+                await this.initialSync();
+                this.runningPromise = new RunningPromise(this.work.bind(this), this.pollingIntervalMs);
+                this.runningPromise.start();
                 this.state = SequencerState.IDLE;
+                this.log.info('Sequencer started');
             }
-            // Do not go forward with new block if the previous one has not been mined and processed
-            if (!prevBlockSynced) {
-                return;
+            /**
+             * Stops the sequencer from processing txs and moves to STOPPED state.
+             */
+            async stop() {
+                this.log.debug(`Stopping sequencer`);
+                await this.runningPromise?.stop();
+                this.publisher.interrupt();
+                this.state = SequencerState.STOPPED;
+                this.log.info('Stopped sequencer');
             }
-            const historicalHeader = (await this.l2BlockSource.getBlock(-1))?.header;
-            const newBlockNumber = (historicalHeader === undefined
-                ? await this.l2BlockSource.getBlockNumber()
-                : Number(historicalHeader.globalVariables.blockNumber.toBigInt())) + 1;
-            // Do not go forward with new block if not my turn
-            if (!(await this.publisher.isItMyTurnToSubmit(newBlockNumber))) {
-                this.log.verbose('Not my turn to submit block');
-                return;
+            /**
+             * Starts a previously stopped sequencer.
+             */
+            restart() {
+                this.log.info('Restarting sequencer');
+                this.publisher.restart();
+                this.runningPromise.start();
+                this.state = SequencerState.IDLE;
             }
-            const workTimer = new Timer();
-            this.state = SequencerState.WAITING_FOR_TXS;
-            // Get txs to build the new block
-            const pendingTxs = await this.p2pClient.getTxs();
-            if (pendingTxs.length < this.minTxsPerBLock) {
-                return;
+            /**
+             * Returns the current state of the sequencer.
+             * @returns An object with a state entry with one of SequencerState.
+             */
+            status() {
+                return { state: this.state };
+            }
+            async initialSync() {
+                // TODO: Should we wait for world state to be ready, or is the caller expected to run await start?
+                this.lastPublishedBlock = await this.worldState.status().then((s) => s.syncedToL2Block);
             }
-            this.log.debug(`Retrieved ${pendingTxs.length} txs from P2P pool`);
             /**
-             * We'll call this function before running expensive operations to avoid wasted work.
+             * Grabs up to maxTxsPerBlock from the p2p client, constructs a block, and pushes it to L1.
              */
-            const assertBlockHeight = async () => {
-                const currentBlockNumber = await this.l2BlockSource.getBlockNumber();
-                if (currentBlockNumber + 1 !== newBlockNumber) {
-                    throw new Error('New block was emitted while building block');
+            async work() {
+                try {
+                    // Update state when the previous block has been synced
+                    const prevBlockSynced = await this.isBlockSynced();
+                    if (prevBlockSynced && this.state === SequencerState.PUBLISHING_BLOCK) {
+                        this.log.debug(`Block has been synced`);
+                        this.state = SequencerState.IDLE;
+                    }
+                    // Do not go forward with new block if the previous one has not been mined and processed
+                    if (!prevBlockSynced) {
+                        return;
+                    }
+                    const historicalHeader = (await this.l2BlockSource.getBlock(-1))?.header;
+                    const newBlockNumber = (historicalHeader === undefined
+                        ? await this.l2BlockSource.getBlockNumber()
+                        : Number(historicalHeader.globalVariables.blockNumber.toBigInt())) + 1;
+                    // Do not go forward with new block if not my turn
+                    if (!(await this.publisher.isItMyTurnToSubmit(newBlockNumber))) {
+                        this.log.verbose('Not my turn to submit block');
+                        return;
+                    }
+                    this.state = SequencerState.WAITING_FOR_TXS;
+                    // Get txs to build the new block
+                    const pendingTxs = await this.p2pClient.getTxs();
+                    if (pendingTxs.length < this.minTxsPerBLock) {
+                        return;
+                    }
+                    this.log.debug(`Retrieved ${pendingTxs.length} txs from P2P pool`);
+                    const newGlobalVariables = await this.globalsBuilder.buildGlobalVariables(new Fr(newBlockNumber), this._coinbase, this._feeRecipient);
+                    // TODO: It should be responsibility of the P2P layer to validate txs before passing them on here
+                    const allValidTxs = await this.takeValidTxs(pendingTxs, this.txValidatorFactory.validatorForNewTxs(newGlobalVariables, this.allowedInSetup));
+                    // TODO: We are taking the size of the tx from private-land, but we should be doing this after running
+                    // public functions. Only reason why we do it here now is because the public processor and orchestrator
+                    // are set up such that they require knowing the total number of txs in advance. Still, main reason for
+                    // exceeding max block size in bytes is contract class registration, which happens in private-land. This
+                    // may break if we start emitting lots of log data from public-land.
+                    const validTxs = this.takeTxsWithinMaxSize(allValidTxs);
+                    if (validTxs.length < this.minTxsPerBLock) {
+                        return;
+                    }
+                    await this.buildBlockAndPublish(validTxs, newGlobalVariables, historicalHeader);
                 }
-                if (!(await this.publisher.isItMyTurnToSubmit(newBlockNumber))) {
-                    throw new Error(`Not this sequencer turn to submit block`);
+                catch (err) {
+                    if (BlockProofError.isBlockProofError(err)) {
+                        const txHashes = err.txHashes.filter(h => !h.isZero());
+                        this.log.warn(`Proving block failed, removing ${txHashes.length} txs from pool`);
+                        await this.p2pClient.deleteTxs(txHashes);
+                    }
+                    this.log.error(`Rolling back world state DB due to error assembling block`, err.stack);
+                    // Cancel any further proving on the block
+                    this.prover?.cancelBlock();
+                    await this.worldState.getLatest().rollback();
                 }
-            };
-            const newGlobalVariables = await this.globalsBuilder.buildGlobalVariables(new Fr(newBlockNumber), this._coinbase, this._feeRecipient);
-            // TODO: It should be responsibility of the P2P layer to validate txs before passing them on here
-            const allValidTxs = await this.takeValidTxs(pendingTxs, this.txValidatorFactory.validatorForNewTxs(newGlobalVariables, this.allowedInSetup));
-            // TODO: We are taking the size of the tx from private-land, but we should be doing this after running
-            // public functions. Only reason why we do it here now is because the public processor and orchestrator
-            // are set up such that they require knowing the total number of txs in advance. Still, main reason for
-            // exceeding max block size in bytes is contract class registration, which happens in private-land. This
-            // may break if we start emitting lots of log data from public-land.
-            const validTxs = this.takeTxsWithinMaxSize(allValidTxs);
-            if (validTxs.length < this.minTxsPerBLock) {
-                return;
             }
-            this.log.info(`Building block ${newBlockNumber} with ${validTxs.length} transactions`);
-            this.state = SequencerState.CREATING_BLOCK;
-            // Get l1 to l2 messages from the contract
-            this.log.debug('Requesting L1 to L2 messages from contract');
-            const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(BigInt(newBlockNumber));
-            this.log.verbose(`Retrieved ${l1ToL2Messages.length} L1 to L2 messages for block ${newBlockNumber}`);
-            // We create a fresh processor each time to reset any cached state (eg storage writes)
-            const processor = await this.publicProcessorFactory.create(historicalHeader, newGlobalVariables);
-            const blockBuildingTimer = new Timer();
-            // We must initialise the block to be a power of 2 in size
-            const numRealTxs = validTxs.length;
-            const pow2 = Math.log2(numRealTxs);
-            // TODO turn this back into a Math.ceil once we can pad blocks to the next-power-of-2 with empty txs
-            const totalTxs = 2 ** Math.ceil(pow2);
-            const blockSize = Math.max(2, totalTxs);
-            const blockTicket = await this.prover.startNewBlock(blockSize, newGlobalVariables, l1ToL2Messages);
-            const [publicProcessorDuration, [processedTxs, failedTxs]] = await elapsed(() => processor.process(validTxs, blockSize, this.prover, this.txValidatorFactory.validatorForProcessedTxs()));
-            if (failedTxs.length > 0) {
-                const failedTxData = failedTxs.map(fail => fail.tx);
-                this.log.debug(`Dropping failed txs ${Tx.getHashes(failedTxData).join(', ')}`);
-                await this.p2pClient.deleteTxs(Tx.getHashes(failedTxData));
+            async buildBlockAndPublish(validTxs, newGlobalVariables, historicalHeader) {
+                const workTimer = new Timer();
+                this.state = SequencerState.CREATING_BLOCK;
+                this.log.info(`Building block ${newGlobalVariables.blockNumber.toNumber()} with ${validTxs.length} transactions`);
+                const assertBlockHeight = async () => {
+                    const currentBlockNumber = await this.l2BlockSource.getBlockNumber();
+                    if (currentBlockNumber + 1 !== newGlobalVariables.blockNumber.toNumber()) {
+                        throw new Error('New block was emitted while building block');
+                    }
+                    if (!(await this.publisher.isItMyTurnToSubmit(newGlobalVariables.blockNumber.toNumber()))) {
+                        throw new Error(`Not this sequencer turn to submit block`);
+                    }
+                };
+                // Get l1 to l2 messages from the contract
+                this.log.debug('Requesting L1 to L2 messages from contract');
+                const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(newGlobalVariables.blockNumber.toBigInt());
+                this.log.verbose(`Retrieved ${l1ToL2Messages.length} L1 to L2 messages for block ${newGlobalVariables.blockNumber.toNumber()}`);
+                // We create a fresh processor each time to reset any cached state (eg storage writes)
+                const processor = await this.publicProcessorFactory.create(historicalHeader, newGlobalVariables);
+                const numRealTxs = validTxs.length;
+                const blockSize = Math.max(2, numRealTxs);
+                const blockBuildingTimer = new Timer();
+                const blockTicket = await this.prover.startNewBlock(blockSize, newGlobalVariables, l1ToL2Messages);
+                const [publicProcessorDuration, [processedTxs, failedTxs]] = await elapsed(() => processor.process(validTxs, blockSize, this.prover, this.txValidatorFactory.validatorForProcessedTxs()));
+                if (failedTxs.length > 0) {
+                    const failedTxData = failedTxs.map(fail => fail.tx);
+                    this.log.debug(`Dropping failed txs ${Tx.getHashes(failedTxData).join(', ')}`);
+                    await this.p2pClient.deleteTxs(Tx.getHashes(failedTxData));
+                }
+                if (processedTxs.length === 0) {
+                    this.log.verbose('No txs processed correctly to build block. Exiting');
+                    this.prover.cancelBlock();
+                    return;
+                }
+                await assertBlockHeight();
+                // All real transactions have been added, set the block as full and complete the proving.
+                await this.prover.setBlockCompleted();
+                // Here we are now waiting for the block to be proven.
+                // TODO(@PhilWindle) We should probably periodically check for things like another
+                // block being published before ours instead of just waiting on our block
+                const result = await blockTicket.provingPromise;
+                if (result.status === PROVING_STATUS.FAILURE) {
+                    throw new Error(`Block proving failed, reason: ${result.reason}`);
+                }
+                await assertBlockHeight();
+                // Block is proven, now finalise and publish!
+                const { block, aggregationObject, proof } = await this.prover.finaliseBlock();
+                await assertBlockHeight();
+                this.log.verbose(`Assembled block ${block.number}`, {
+                    eventName: 'l2-block-built',
+                    duration: workTimer.ms(),
+                    publicProcessDuration: publicProcessorDuration,
+                    rollupCircuitsDuration: blockBuildingTimer.ms(),
+                    ...block.getStats(),
+                });
+                await this.publishL2Block(block, aggregationObject, proof);
+                this.log.info(`Submitted rollup block ${block.number} with ${processedTxs.length} transactions`);
             }
-            if (processedTxs.length === 0) {
-                this.log.verbose('No txs processed correctly to build block. Exiting');
-                this.prover.cancelBlock();
-                return;
+            /**
+             * Publishes the L2Block to the rollup contract.
+             * @param block - The L2Block to be published.
+             */
+            async publishL2Block(block, aggregationObject, proof) {
+                // Publishes new block to the network and awaits the tx to be mined
+                this.state = SequencerState.PUBLISHING_BLOCK;
+                const publishedL2Block = await this.publisher.processL2Block(block, aggregationObject, proof);
+                if (publishedL2Block) {
+                    this.lastPublishedBlock = block.number;
+                }
+                else {
+                    throw new Error(`Failed to publish block`);
+                }
             }
-            await assertBlockHeight();
-            // All real transactions have been added, set the block as full and complete the proving.
-            await this.prover.setBlockCompleted();
-            // Here we are now waiting for the block to be proven.
-            // TODO(@PhilWindle) We should probably periodically check for things like another
-            // block being published before ours instead of just waiting on our block
-            const result = await blockTicket.provingPromise;
-            if (result.status === PROVING_STATUS.FAILURE) {
-                throw new Error(`Block proving failed, reason: ${result.reason}`);
+            async takeValidTxs(txs, validator) {
+                const [valid, invalid] = await validator.validateTxs(txs);
+                if (invalid.length > 0) {
+                    this.log.debug(`Dropping invalid txs from the p2p pool ${Tx.getHashes(invalid).join(', ')}`);
+                    await this.p2pClient.deleteTxs(Tx.getHashes(invalid));
+                }
+                return valid.slice(0, this.maxTxsPerBlock);
             }
-            await assertBlockHeight();
-            // Block is proven, now finalise and publish!
-            const { block, aggregationObject, proof } = await this.prover.finaliseBlock();
-            await assertBlockHeight();
-            this.log.verbose(`Assembled block ${block.number}`, {
-                eventName: 'l2-block-built',
-                duration: workTimer.ms(),
-                publicProcessDuration: publicProcessorDuration,
-                rollupCircuitsDuration: blockBuildingTimer.ms(),
-                ...block.getStats(),
-            });
-            await this.publishL2Block(block, aggregationObject, proof);
-            this.log.info(`Submitted rollup block ${block.number} with ${processedTxs.length} transactions`);
-        }
-        catch (err) {
-            if (BlockProofError.isBlockProofError(err)) {
-                const txHashes = err.txHashes.filter(h => !h.isZero());
-                this.log.warn(`Proving block failed, removing ${txHashes.length} txs from pool`);
-                await this.p2pClient.deleteTxs(txHashes);
+            takeTxsWithinMaxSize(txs) {
+                const maxSize = this.maxBlockSizeInBytes;
+                let totalSize = 0;
+                const toReturn = [];
+                for (const tx of txs) {
+                    const txSize = tx.getSize() - tx.proof.toBuffer().length;
+                    if (totalSize + txSize > maxSize) {
+                        this.log.warn(`Dropping tx ${tx.getTxHash()} with estimated size ${txSize} due to exceeding ${maxSize} block size limit (currently at ${totalSize})`);
+                        continue;
+                    }
+                    toReturn.push(tx);
+                    totalSize += txSize;
+                }
+                return toReturn;
             }
-            this.log.error(`Rolling back world state DB due to error assembling block`, err.stack);
-            // Cancel any further proving on the block
-            this.prover?.cancelBlock();
-            await this.worldState.getLatest().rollback();
-        }
-    }
-    /**
-     * Publishes the L2Block to the rollup contract.
-     * @param block - The L2Block to be published.
-     */
-    async publishL2Block(block, aggregationObject, proof) {
-        // Publishes new block to the network and awaits the tx to be mined
-        this.state = SequencerState.PUBLISHING_BLOCK;
-        const publishedL2Block = await this.publisher.processL2Block(block, aggregationObject, proof);
-        if (publishedL2Block) {
-            this.lastPublishedBlock = block.number;
-        }
-        else {
-            throw new Error(`Failed to publish block`);
-        }
-    }
-    async takeValidTxs(txs, validator) {
-        const [valid, invalid] = await validator.validateTxs(txs);
-        if (invalid.length > 0) {
-            this.log.debug(`Dropping invalid txs from the p2p pool ${Tx.getHashes(invalid).join(', ')}`);
-            await this.p2pClient.deleteTxs(Tx.getHashes(invalid));
-        }
-        return valid.slice(0, this.maxTxsPerBlock);
-    }
-    takeTxsWithinMaxSize(txs) {
-        const maxSize = this.maxBlockSizeInBytes;
-        let totalSize = 0;
-        const toReturn = [];
-        for (const tx of txs) {
-            const txSize = tx.getSize() - tx.proof.toBuffer().length;
-            if (totalSize + txSize > maxSize) {
-                this.log.warn(`Dropping tx ${tx.getTxHash()} with estimated size ${txSize} due to exceeding ${maxSize} block size limit (currently at ${totalSize})`);
-                continue;
+            /**
+             * Returns whether the previous block sent has been mined, and all dependencies have caught up with it.
+             * @returns Boolean indicating if our dependencies are synced to the latest block.
+             */
+            async isBlockSynced() {
+                const syncedBlocks = await Promise.all([
+                    this.worldState.status().then((s) => s.syncedToL2Block),
+                    this.p2pClient.getStatus().then(s => s.syncedToL2Block),
+                    this.l2BlockSource.getBlockNumber(),
+                    this.l1ToL2MessageSource.getBlockNumber(),
+                ]);
+                const min = Math.min(...syncedBlocks);
+                return min >= this.lastPublishedBlock;
             }
-            toReturn.push(tx);
-            totalSize += txSize;
-        }
-        return toReturn;
-    }
-    /**
-     * Returns whether the previous block sent has been mined, and all dependencies have caught up with it.
-     * @returns Boolean indicating if our dependencies are synced to the latest block.
-     */
-    async isBlockSynced() {
-        const syncedBlocks = await Promise.all([
-            this.worldState.status().then((s) => s.syncedToL2Block),
-            this.p2pClient.getStatus().then(s => s.syncedToL2Block),
-            this.l2BlockSource.getBlockNumber(),
-            this.l1ToL2MessageSource.getBlockNumber(),
-        ]);
-        const min = Math.min(...syncedBlocks);
-        return min >= this.lastPublishedBlock;
-    }
-    get coinbase() {
-        return this._coinbase;
-    }
-    get feeRecipient() {
-        return this._feeRecipient;
-    }
-}
+            get coinbase() {
+                return this._coinbase;
+            }
+            get feeRecipient() {
+                return this._feeRecipient;
+            }
+        },
+        (() => {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            _buildBlockAndPublish_decorators = [trackSpan('Sequencer.buildBlockAndPublish', (_validTxs, newGlobalVariables, _historicalHeader) => ({
+                    [Attributes.BLOCK_NUMBER]: newGlobalVariables.blockNumber.toNumber(),
+                }))];
+            _publishL2Block_decorators = [trackSpan('Sequencer.publishL2Block', block => ({
+                    [Attributes.BLOCK_NUMBER]: block.number,
+                }))];
+            __esDecorate(_a, null, _buildBlockAndPublish_decorators, { kind: "method", name: "buildBlockAndPublish", static: false, private: false, access: { has: obj => "buildBlockAndPublish" in obj, get: obj => obj.buildBlockAndPublish }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _publishL2Block_decorators, { kind: "method", name: "publishL2Block", static: false, private: false, access: { has: obj => "publishL2Block" in obj, get: obj => obj.publishL2Block }, metadata: _metadata }, null, _instanceExtraInitializers);
+            if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        })(),
+        _a;
+})();
+export { Sequencer };
 /**
  * State of the sequencer.
  */
@@ -319,4 +338,4 @@ export var SequencerState;
      */
     SequencerState[SequencerState["STOPPED"] = 5] = "STOPPED";
 })(SequencerState || (SequencerState = {}));
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/sequencer-client",
-  "version": "0.43.0",
+  "version": "0.45.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -24,19 +24,20 @@
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.43.0",
-    "@aztec/circuits.js": "0.43.0",
-    "@aztec/ethereum": "0.43.0",
-    "@aztec/foundation": "0.43.0",
-    "@aztec/l1-artifacts": "0.43.0",
-    "@aztec/merkle-tree": "0.43.0",
-    "@aztec/noir-contracts.js": "0.43.0",
-    "@aztec/noir-protocol-circuits-types": "0.43.0",
-    "@aztec/p2p": "0.43.0",
-    "@aztec/protocol-contracts": "0.43.0",
-    "@aztec/simulator": "0.43.0",
-    "@aztec/types": "0.43.0",
-    "@aztec/world-state": "0.43.0",
+    "@aztec/circuit-types": "0.45.0",
+    "@aztec/circuits.js": "0.45.0",
+    "@aztec/ethereum": "0.45.0",
+    "@aztec/foundation": "0.45.0",
+    "@aztec/l1-artifacts": "0.45.0",
+    "@aztec/merkle-tree": "0.45.0",
+    "@aztec/noir-contracts.js": "0.45.0",
+    "@aztec/noir-protocol-circuits-types": "0.45.0",
+    "@aztec/p2p": "0.45.0",
+    "@aztec/protocol-contracts": "0.45.0",
+    "@aztec/simulator": "0.45.0",
+    "@aztec/telemetry-client": "0.45.0",
+    "@aztec/types": "0.45.0",
+    "@aztec/world-state": "0.45.0",
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
     "@noir-lang/types": "portal:../../noir/packages/types",
     "lodash.chunk": "^4.2.0",
@@ -78,7 +79,15 @@
     ],
     "transform": {
       "^.+\\.tsx?$": [
-        "@swc/jest"
+        "@swc/jest",
+        {
+          "jsc": {
+            "parser": {
+              "syntax": "typescript",
+              "decorators": true
+            }
+          }
+        }
       ]
     },
     "moduleNameMapper": {

package/src/client/sequencer-client.ts

@@ -2,6 +2,7 @@ import { type L1ToL2MessageSource, type L2BlockSource } from '@aztec/circuit-typ
 import { type BlockProver } from '@aztec/circuit-types/interfaces';
 import { type P2P } from '@aztec/p2p';
 import { PublicProcessorFactory, type SimulationProvider } from '@aztec/simulator';
+import { type TelemetryClient } from '@aztec/telemetry-client';
 import { type ContractDataSource } from '@aztec/types/contracts';
 import { type WorldStateSynchronizer } from '@aztec/world-state';
 
@@ -38,12 +39,18 @@ export class SequencerClient {
     l1ToL2MessageSource: L1ToL2MessageSource,
     prover: BlockProver,
     simulationProvider: SimulationProvider,
+    telemetryClient: TelemetryClient,
   ) {
     const publisher = getL1Publisher(config);
     const globalsBuilder = getGlobalVariableBuilder(config);
     const merkleTreeDb = worldStateSynchronizer.getLatest();
 
-    const publicProcessorFactory = new PublicProcessorFactory(merkleTreeDb, contractDataSource, simulationProvider);
+    const publicProcessorFactory = new PublicProcessorFactory(
+      merkleTreeDb,
+      contractDataSource,
+      simulationProvider,
+      telemetryClient,
+    );
 
     const sequencer = new Sequencer(
       publisher,
@@ -55,6 +62,7 @@ export class SequencerClient {
       l1ToL2MessageSource,
       publicProcessorFactory,
       new TxValidatorFactory(merkleTreeDb, contractDataSource, !!config.enforceFees),
+      telemetryClient,
       config,
     );
 

package/src/sequencer/sequencer.ts

@@ -13,13 +13,14 @@ import {
   PROVING_STATUS,
 } from '@aztec/circuit-types/interfaces';
 import { type L2BlockBuiltStats } from '@aztec/circuit-types/stats';
-import { AztecAddress, EthAddress, type Proof } from '@aztec/circuits.js';
+import { AztecAddress, EthAddress, type GlobalVariables, type Header, type Proof } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { Timer, elapsed } from '@aztec/foundation/timer';
 import { type P2P } from '@aztec/p2p';
 import { type PublicProcessorFactory } from '@aztec/simulator';
+import { Attributes, type TelemetryClient, type Tracer, trackSpan } from '@aztec/telemetry-client';
 import { type WorldStateStatus, type WorldStateSynchronizer } from '@aztec/world-state';
 
 import { type GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
@@ -50,6 +51,8 @@ export class Sequencer {
   private allowedInTeardown: AllowedElement[] = [];
   private maxBlockSizeInBytes: number = 1024 * 1024;
 
+  public readonly tracer: Tracer;
+
   constructor(
     private publisher: L1Publisher,
     private globalsBuilder: GlobalVariableBuilder,
@@ -60,10 +63,12 @@ export class Sequencer {
     private l1ToL2MessageSource: L1ToL2MessageSource,
     private publicProcessorFactory: PublicProcessorFactory,
     private txValidatorFactory: TxValidatorFactory,
+    telemetry: TelemetryClient,
     config: SequencerConfig = {},
     private log = createDebugLogger('aztec:sequencer'),
   ) {
     this.updateConfig(config);
+    this.tracer = telemetry.getTracer('Sequencer');
     this.log.verbose(`Initialized sequencer with ${this.minTxsPerBLock}-${this.maxTxsPerBlock} txs per block.`);
   }
 
@@ -174,7 +179,6 @@ export class Sequencer {
         return;
       }
 
-      const workTimer = new Timer();
       this.state = SequencerState.WAITING_FOR_TXS;
 
       // Get txs to build the new block
@@ -184,19 +188,6 @@ export class Sequencer {
       }
       this.log.debug(`Retrieved ${pendingTxs.length} txs from P2P pool`);
 
-      /**
-       * We'll call this function before running expensive operations to avoid wasted work.
-       */
-      const assertBlockHeight = async () => {
-        const currentBlockNumber = await this.l2BlockSource.getBlockNumber();
-        if (currentBlockNumber + 1 !== newBlockNumber) {
-          throw new Error('New block was emitted while building block');
-        }
-        if (!(await this.publisher.isItMyTurnToSubmit(newBlockNumber))) {
-          throw new Error(`Not this sequencer turn to submit block`);
-        }
-      };
-
       const newGlobalVariables = await this.globalsBuilder.buildGlobalVariables(
         new Fr(newBlockNumber),
         this._coinbase,
@@ -220,72 +211,7 @@ export class Sequencer {
         return;
       }
 
-      this.log.info(`Building block ${newBlockNumber} with ${validTxs.length} transactions`);
-      this.state = SequencerState.CREATING_BLOCK;
-
-      // Get l1 to l2 messages from the contract
-      this.log.debug('Requesting L1 to L2 messages from contract');
-      const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(BigInt(newBlockNumber));
-      this.log.verbose(`Retrieved ${l1ToL2Messages.length} L1 to L2 messages for block ${newBlockNumber}`);
-
-      // We create a fresh processor each time to reset any cached state (eg storage writes)
-      const processor = await this.publicProcessorFactory.create(historicalHeader, newGlobalVariables);
-
-      const blockBuildingTimer = new Timer();
-
-      // We must initialise the block to be a power of 2 in size
-      const numRealTxs = validTxs.length;
-      const pow2 = Math.log2(numRealTxs);
-      // TODO turn this back into a Math.ceil once we can pad blocks to the next-power-of-2 with empty txs
-      const totalTxs = 2 ** Math.ceil(pow2);
-      const blockSize = Math.max(2, totalTxs);
-      const blockTicket = await this.prover.startNewBlock(blockSize, newGlobalVariables, l1ToL2Messages);
-
-      const [publicProcessorDuration, [processedTxs, failedTxs]] = await elapsed(() =>
-        processor.process(validTxs, blockSize, this.prover, this.txValidatorFactory.validatorForProcessedTxs()),
-      );
-      if (failedTxs.length > 0) {
-        const failedTxData = failedTxs.map(fail => fail.tx);
-        this.log.debug(`Dropping failed txs ${Tx.getHashes(failedTxData).join(', ')}`);
-        await this.p2pClient.deleteTxs(Tx.getHashes(failedTxData));
-      }
-
-      if (processedTxs.length === 0) {
-        this.log.verbose('No txs processed correctly to build block. Exiting');
-        this.prover.cancelBlock();
-        return;
-      }
-
-      await assertBlockHeight();
-
-      // All real transactions have been added, set the block as full and complete the proving.
-      await this.prover.setBlockCompleted();
-
-      // Here we are now waiting for the block to be proven.
-      // TODO(@PhilWindle) We should probably periodically check for things like another
-      // block being published before ours instead of just waiting on our block
-      const result = await blockTicket.provingPromise;
-      if (result.status === PROVING_STATUS.FAILURE) {
-        throw new Error(`Block proving failed, reason: ${result.reason}`);
-      }
-
-      await assertBlockHeight();
-
-      // Block is proven, now finalise and publish!
-      const { block, aggregationObject, proof } = await this.prover.finaliseBlock();
-
-      await assertBlockHeight();
-
-      this.log.verbose(`Assembled block ${block.number}`, {
-        eventName: 'l2-block-built',
-        duration: workTimer.ms(),
-        publicProcessDuration: publicProcessorDuration,
-        rollupCircuitsDuration: blockBuildingTimer.ms(),
-        ...block.getStats(),
-      } satisfies L2BlockBuiltStats);
-
-      await this.publishL2Block(block, aggregationObject, proof);
-      this.log.info(`Submitted rollup block ${block.number} with ${processedTxs.length} transactions`);
+      await this.buildBlockAndPublish(validTxs, newGlobalVariables, historicalHeader);
     } catch (err) {
       if (BlockProofError.isBlockProofError(err)) {
         const txHashes = err.txHashes.filter(h => !h.isZero());
@@ -299,10 +225,98 @@ export class Sequencer {
     }
   }
 
+  @trackSpan('Sequencer.buildBlockAndPublish', (_validTxs, newGlobalVariables, _historicalHeader) => ({
+    [Attributes.BLOCK_NUMBER]: newGlobalVariables.blockNumber.toNumber(),
+  }))
+  private async buildBlockAndPublish(
+    validTxs: Tx[],
+    newGlobalVariables: GlobalVariables,
+    historicalHeader: Header | undefined,
+  ): Promise<void> {
+    const workTimer = new Timer();
+    this.state = SequencerState.CREATING_BLOCK;
+    this.log.info(`Building block ${newGlobalVariables.blockNumber.toNumber()} with ${validTxs.length} transactions`);
+
+    const assertBlockHeight = async () => {
+      const currentBlockNumber = await this.l2BlockSource.getBlockNumber();
+      if (currentBlockNumber + 1 !== newGlobalVariables.blockNumber.toNumber()) {
+        throw new Error('New block was emitted while building block');
+      }
+      if (!(await this.publisher.isItMyTurnToSubmit(newGlobalVariables.blockNumber.toNumber()))) {
+        throw new Error(`Not this sequencer turn to submit block`);
+      }
+    };
+
+    // Get l1 to l2 messages from the contract
+    this.log.debug('Requesting L1 to L2 messages from contract');
+    const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(newGlobalVariables.blockNumber.toBigInt());
+    this.log.verbose(
+      `Retrieved ${l1ToL2Messages.length} L1 to L2 messages for block ${newGlobalVariables.blockNumber.toNumber()}`,
+    );
+
+    // We create a fresh processor each time to reset any cached state (eg storage writes)
+    const processor = await this.publicProcessorFactory.create(historicalHeader, newGlobalVariables);
+
+    const numRealTxs = validTxs.length;
+    const blockSize = Math.max(2, numRealTxs);
+
+    const blockBuildingTimer = new Timer();
+    const blockTicket = await this.prover.startNewBlock(blockSize, newGlobalVariables, l1ToL2Messages);
+
+    const [publicProcessorDuration, [processedTxs, failedTxs]] = await elapsed(() =>
+      processor.process(validTxs, blockSize, this.prover, this.txValidatorFactory.validatorForProcessedTxs()),
+    );
+    if (failedTxs.length > 0) {
+      const failedTxData = failedTxs.map(fail => fail.tx);
+      this.log.debug(`Dropping failed txs ${Tx.getHashes(failedTxData).join(', ')}`);
+      await this.p2pClient.deleteTxs(Tx.getHashes(failedTxData));
+    }
+
+    if (processedTxs.length === 0) {
+      this.log.verbose('No txs processed correctly to build block. Exiting');
+      this.prover.cancelBlock();
+      return;
+    }
+
+    await assertBlockHeight();
+
+    // All real transactions have been added, set the block as full and complete the proving.
+    await this.prover.setBlockCompleted();
+
+    // Here we are now waiting for the block to be proven.
+    // TODO(@PhilWindle) We should probably periodically check for things like another
+    // block being published before ours instead of just waiting on our block
+    const result = await blockTicket.provingPromise;
+    if (result.status === PROVING_STATUS.FAILURE) {
+      throw new Error(`Block proving failed, reason: ${result.reason}`);
+    }
+
+    await assertBlockHeight();
+
+    // Block is proven, now finalise and publish!
+    const { block, aggregationObject, proof } = await this.prover.finaliseBlock();
+
+    await assertBlockHeight();
+
+    this.log.verbose(`Assembled block ${block.number}`, {
+      eventName: 'l2-block-built',
+      duration: workTimer.ms(),
+      publicProcessDuration: publicProcessorDuration,
+      rollupCircuitsDuration: blockBuildingTimer.ms(),
+      ...block.getStats(),
+    } satisfies L2BlockBuiltStats);
+
+    await this.publishL2Block(block, aggregationObject, proof);
+    this.log.info(`Submitted rollup block ${block.number} with ${processedTxs.length} transactions`);
+  }
+
   /**
    * Publishes the L2Block to the rollup contract.
    * @param block - The L2Block to be published.
    */
+  @trackSpan('Sequencer.publishL2Block', block => ({
+    [Attributes.BLOCK_NUMBER]: block.number,
+  }))
   protected async publishL2Block(block: L2Block, aggregationObject: Fr[], proof: Proof) {
     // Publishes new block to the network and awaits the tx to be mined
     this.state = SequencerState.PUBLISHING_BLOCK;