@aztec/sequencer-client 0.86.0 → 0.87.0

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

@@ -1 +1 @@
-{"version":3,"file":"tx_validator_factory.d.ts","sourceRoot":"","sources":["../../src/tx_validator/tx_validator_factory.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,wBAAwB,EACzB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE9E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,6BAA6B,GAAG,SAAS,EACnD,EACE,WAAW,EACX,SAAS,EACT,aAAa,EACb,cAAc,EACd,OAAO,EACP,kBAAkB,GACnB,EAAE;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,cAAc,EAAE,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,GACA,WAAW,CAAC,EAAE,CAAC,CAkBjB;AAED,wBAAgB,+BAA+B,CAC7C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,cAAc,EAAE,GAC/B;IACD,mBAAmB,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IACrC,cAAc,EAAE,cAAc,CAAC;CAChC,CAgBA"}
+{"version":3,"file":"tx_validator_factory.d.ts","sourceRoot":"","sources":["../../src/tx_validator/tx_validator_factory.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,wBAAwB,EACzB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE9E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,6BAA6B,GAAG,SAAS,EACnD,EACE,WAAW,EACX,SAAS,EACT,aAAa,EACb,cAAc,EACd,OAAO,EACP,kBAAkB,GACnB,EAAE;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,cAAc,EAAE,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,GACA,WAAW,CAAC,EAAE,CAAC,CAwBjB;AAED,wBAAgB,+BAA+B,CAC7C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,cAAc,EAAE,GAC/B;IACD,mBAAmB,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IACrC,cAAc,EAAE,cAAc,CAAC;CAChC,CAgBA"}

package/dest/tx_validator/tx_validator_factory.js

@@ -1,12 +1,19 @@
 import { Fr } from '@aztec/foundation/fields';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { AggregateTxValidator, ArchiveCache, BlockHeaderTxValidator, DataTxValidator, DoubleSpendTxValidator, GasTxValidator, MetadataTxValidator, PhasesTxValidator, TxProofValidator } from '@aztec/p2p';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import { DatabasePublicStateSource } from '@aztec/stdlib/trees';
 import { NullifierCache } from './nullifier_cache.js';
 export function createValidatorForAcceptingTxs(db, contractDataSource, verifier, { blockNumber, l1ChainId, rollupVersion, setupAllowList, gasFees, skipFeeEnforcement }) {
     const validators = [
         new DataTxValidator(),
-        new MetadataTxValidator(new Fr(l1ChainId), new Fr(rollupVersion), new Fr(blockNumber)),
+        new MetadataTxValidator({
+            l1ChainId: new Fr(l1ChainId),
+            rollupVersion: new Fr(rollupVersion),
+            blockNumber: new Fr(blockNumber),
+            protocolContractTreeRoot,
+            vkTreeRoot: getVKTreeRoot()
+        }),
         new DoubleSpendTxValidator(new NullifierCache(db)),
         new PhasesTxValidator(contractDataSource, setupAllowList, blockNumber),
         new BlockHeaderTxValidator(new ArchiveCache(db))
@@ -30,5 +37,11 @@ export function createValidatorForBlockBuilding(db, contractDataSource, globalVa
 }
 function preprocessValidator(nullifierCache, archiveCache, publicStateSource, contractDataSource, globalVariables, setupAllowList) {
     // We don't include the TxProofValidator nor the DataTxValidator here because they are already checked by the time we get to block building.
-    return new AggregateTxValidator(new MetadataTxValidator(globalVariables.chainId, globalVariables.version, globalVariables.blockNumber), new DoubleSpendTxValidator(nullifierCache), new PhasesTxValidator(contractDataSource, setupAllowList, globalVariables.blockNumber.toNumber()), new GasTxValidator(publicStateSource, ProtocolContractAddress.FeeJuice, globalVariables.gasFees), new BlockHeaderTxValidator(archiveCache));
+    return new AggregateTxValidator(new MetadataTxValidator({
+        l1ChainId: globalVariables.chainId,
+        rollupVersion: globalVariables.version,
+        blockNumber: globalVariables.blockNumber,
+        protocolContractTreeRoot,
+        vkTreeRoot: getVKTreeRoot()
+    }), new DoubleSpendTxValidator(nullifierCache), new PhasesTxValidator(contractDataSource, setupAllowList, globalVariables.blockNumber.toNumber()), new GasTxValidator(publicStateSource, ProtocolContractAddress.FeeJuice, globalVariables.gasFees), new BlockHeaderTxValidator(archiveCache));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/sequencer-client",
-  "version": "0.86.0",
+  "version": "0.87.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -26,49 +26,49 @@
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
   },
   "dependencies": {
-    "@aztec/aztec.js": "0.86.0",
-    "@aztec/bb-prover": "0.86.0",
-    "@aztec/blob-lib": "0.86.0",
-    "@aztec/blob-sink": "0.86.0",
-    "@aztec/constants": "0.86.0",
-    "@aztec/epoch-cache": "0.86.0",
-    "@aztec/ethereum": "0.86.0",
-    "@aztec/foundation": "0.86.0",
-    "@aztec/l1-artifacts": "0.86.0",
-    "@aztec/merkle-tree": "0.86.0",
-    "@aztec/noir-acvm_js": "0.86.0",
-    "@aztec/noir-contracts.js": "0.86.0",
-    "@aztec/noir-protocol-circuits-types": "0.86.0",
-    "@aztec/noir-types": "0.86.0",
-    "@aztec/p2p": "0.86.0",
-    "@aztec/protocol-contracts": "0.86.0",
-    "@aztec/prover-client": "0.86.0",
-    "@aztec/simulator": "0.86.0",
-    "@aztec/stdlib": "0.86.0",
-    "@aztec/telemetry-client": "0.86.0",
-    "@aztec/validator-client": "0.86.0",
-    "@aztec/world-state": "0.86.0",
+    "@aztec/aztec.js": "0.87.0",
+    "@aztec/bb-prover": "0.87.0",
+    "@aztec/blob-lib": "0.87.0",
+    "@aztec/blob-sink": "0.87.0",
+    "@aztec/constants": "0.87.0",
+    "@aztec/epoch-cache": "0.87.0",
+    "@aztec/ethereum": "0.87.0",
+    "@aztec/foundation": "0.87.0",
+    "@aztec/l1-artifacts": "0.87.0",
+    "@aztec/merkle-tree": "0.87.0",
+    "@aztec/noir-acvm_js": "0.87.0",
+    "@aztec/noir-contracts.js": "0.87.0",
+    "@aztec/noir-protocol-circuits-types": "0.87.0",
+    "@aztec/noir-types": "0.87.0",
+    "@aztec/p2p": "0.87.0",
+    "@aztec/protocol-contracts": "0.87.0",
+    "@aztec/prover-client": "0.87.0",
+    "@aztec/simulator": "0.87.0",
+    "@aztec/stdlib": "0.87.0",
+    "@aztec/telemetry-client": "0.87.0",
+    "@aztec/validator-client": "0.87.0",
+    "@aztec/world-state": "0.87.0",
     "lodash.chunk": "^4.2.0",
     "lodash.pick": "^4.4.0",
     "tslib": "^2.4.0",
     "viem": "2.23.7"
   },
   "devDependencies": {
-    "@aztec/archiver": "0.86.0",
-    "@aztec/kv-store": "0.86.0",
+    "@aztec/archiver": "0.87.0",
+    "@aztec/kv-store": "0.87.0",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/lodash.chunk": "^4.2.7",
     "@types/lodash.pick": "^4.4.7",
-    "@types/node": "^18.7.23",
+    "@types/node": "^22.15.17",
     "concurrently": "^7.6.0",
-    "eslint": "^8.37.0",
+    "eslint": "^9.26.0",
     "express": "^4.21.1",
     "jest": "^29.5.0",
     "jest-mock-extended": "^3.0.3",
-    "prettier": "^2.8.7",
+    "prettier": "^3.5.3",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "files": [
     "dest",
@@ -77,7 +77,7 @@
   ],
   "types": "./dest/index.d.ts",
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   },
   "jest": {
     "extensionsToTreatAsEsm": [

package/src/client/sequencer-client.ts

@@ -157,7 +157,7 @@ export class SequencerClient {
     // make it with a propagation time into slot equal to 4s. However, we prefer being conservative.
     // See https://www.blocknative.com/blog/anatomy-of-a-slot#7 for more info.
     const maxL1TxInclusionTimeIntoSlot =
-      config.maxL1TxInclusionTimeIntoSlot ?? isAnvilTestChain(config.l1ChainId) ? ethereumSlotDuration : 0;
+      (config.maxL1TxInclusionTimeIntoSlot ?? isAnvilTestChain(config.l1ChainId)) ? ethereumSlotDuration : 0;
 
     const l1Constants = {
       l1GenesisTime,

package/src/config.ts

@@ -58,6 +58,11 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
     description: 'The minimum number of txs to include in a block.',
     ...numberConfigHelper(1),
   },
+  publishTxsWithProposals: {
+    env: 'SEQ_PUBLISH_TXS_WITH_PROPOSALS',
+    description: 'Whether to publish txs with proposals.',
+    ...booleanConfigHelper(false),
+  },
   maxL2BlockGas: {
     env: 'SEQ_MAX_L2_BLOCK_GAS',
     description: 'The maximum L2 block gas.',

package/src/global_variable_builder/global_builder.ts

@@ -21,9 +21,12 @@ import { createPublicClient, fallback, http } from 'viem';
 export class GlobalVariableBuilder implements GlobalVariableBuilderInterface {
   private log = createLogger('sequencer:global_variable_builder');
 
-  private rollupContract: RollupContract;
-  private publicClient: ViemPublicClient;
-  private ethereumSlotDuration: number;
+  private readonly rollupContract: RollupContract;
+  private readonly publicClient: ViemPublicClient;
+  private readonly ethereumSlotDuration: number;
+
+  private chainId?: Fr;
+  private version?: Fr;
 
   constructor(config: L1ReaderConfig & Pick<L1ContractsConfig, 'ethereumSlotDuration'>) {
     const { l1RpcUrls, l1ChainId: chainId, l1Contracts } = config;
@@ -58,6 +61,16 @@ export class GlobalVariableBuilder implements GlobalVariableBuilderInterface {
     return new GasFees(Fr.ZERO, new Fr(await this.rollupContract.getManaBaseFeeAt(timestamp, true)));
   }
 
+  public async getGlobalConstantVariables(): Promise<Pick<GlobalVariables, 'chainId' | 'version'>> {
+    if (!this.chainId) {
+      this.chainId = new Fr(this.publicClient.chain.id);
+    }
+    if (!this.version) {
+      this.version = new Fr(await this.rollupContract.getVersion());
+    }
+    return { chainId: this.chainId, version: this.version };
+  }
+
   /**
    * Simple builder of global variables that use the minimum time possible.
    * @param blockNumber - The block number to build global variables for.
@@ -72,8 +85,7 @@ export class GlobalVariableBuilder implements GlobalVariableBuilderInterface {
     feeRecipient: AztecAddress,
     slotNumber?: bigint,
   ): Promise<GlobalVariables> {
-    const version = new Fr(await this.rollupContract.getVersion());
-    const chainId = new Fr(this.publicClient.chain.id);
+    const { chainId, version } = await this.getGlobalConstantVariables();
 
     if (slotNumber === undefined) {
       const ts = BigInt((await this.publicClient.getBlock()).timestamp + BigInt(this.ethereumSlotDuration));

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

@@ -181,7 +181,7 @@ export class SequencerPublisherMetrics {
 
     try {
       this.gasPrice.record(parseInt(formatEther(stats.gasPrice, 'gwei'), 10));
-    } catch (e) {
+    } catch {
       // ignore
     }
 
@@ -191,7 +191,7 @@ export class SequencerPublisherMetrics {
 
     try {
       this.txTotalFee.record(parseFloat(formatEther(totalFee)));
-    } catch (e) {
+    } catch {
       // ignore
     }
   }

package/src/publisher/sequencer-publisher.ts

@@ -18,7 +18,7 @@ import {
   formatViemError,
 } from '@aztec/ethereum';
 import type { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
-import { toHex } from '@aztec/foundation/bigint-buffer';
+import { toHex as toPaddedHex } from '@aztec/foundation/bigint-buffer';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { Signature } from '@aztec/foundation/eth-signature';
 import { createLogger } from '@aztec/foundation/log';
@@ -26,11 +26,11 @@ import { Timer } from '@aztec/foundation/timer';
 import { ForwarderAbi, RollupAbi } from '@aztec/l1-artifacts';
 import { ConsensusPayload, SignatureDomainSeparator, getHashedSignaturePayload } from '@aztec/stdlib/p2p';
 import type { L1PublishBlockStats } from '@aztec/stdlib/stats';
-import { type BlockHeader, TxHash } from '@aztec/stdlib/tx';
+import { type ProposedBlockHeader, TxHash } from '@aztec/stdlib/tx';
 import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
 import pick from 'lodash.pick';
-import { type TransactionReceipt, encodeFunctionData } from 'viem';
+import { type TransactionReceipt, encodeFunctionData, toHex } from 'viem';
 
 import type { PublisherConfig, TxSenderConfig } from './config.js';
 import { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js';
@@ -41,6 +41,8 @@ type L1ProcessArgs = {
   header: Buffer;
   /** A root of the archive tree after the L2 block is applied. */
   archive: Buffer;
+  /** State reference after the L2 block is applied. */
+  stateReference: Buffer;
   /** L2 block blobs containing all tx effects. */
   blobs: Blob[];
   /** L2 block tx hashes */
@@ -285,7 +287,7 @@ export class SequencerPublisher {
    *
    */
   public async validateBlockForSubmission(
-    header: BlockHeader,
+    header: ProposedBlockHeader,
     attestationData: { digest: Buffer; signatures: Signature[] } = {
       digest: Buffer.alloc(32),
       signatures: [],
@@ -297,11 +299,11 @@ export class SequencerPublisher {
     const flags = { ignoreDA: true, ignoreSignatures: formattedSignatures.length == 0 };
 
     const args = [
-      `0x${header.toBuffer().toString('hex')}`,
+      toHex(header.toBuffer()),
       formattedSignatures,
-      `0x${attestationData.digest.toString('hex')}`,
+      toHex(attestationData.digest),
       ts,
-      `0x${header.contentCommitment.blobsHash.toString('hex')}`,
+      toHex(header.contentCommitment.blobsHash),
       flags,
     ] as const;
 
@@ -407,14 +409,16 @@ export class SequencerPublisher {
     txHashes?: TxHash[],
     opts: { txTimeoutAt?: Date } = {},
   ): Promise<boolean> {
-    const consensusPayload = new ConsensusPayload(block.header, block.archive.root, txHashes ?? []);
+    const proposedBlockHeader = block.header.toPropose();
 
+    const consensusPayload = ConsensusPayload.fromBlock(block);
     const digest = getHashedSignaturePayload(consensusPayload, SignatureDomainSeparator.blockAttestation);
 
     const blobs = await Blob.getBlobs(block.body.toBlobFields());
     const proposeTxArgs = {
-      header: block.header.toBuffer(),
+      header: proposedBlockHeader.toBuffer(),
       archive: block.archive.root.toBuffer(),
+      stateReference: block.header.state.toBuffer(),
       body: block.body.toBuffer(),
       blobs,
       attestations,
@@ -425,7 +429,7 @@ export class SequencerPublisher {
     //        This means that we can avoid the simulation issues in later checks.
     //        By simulation issue, I mean the fact that the block.timestamp is equal to the last block, not the next, which
     //        make time consistency checks break.
-    const ts = await this.validateBlockForSubmission(block.header, {
+    const ts = await this.validateBlockForSubmission(proposedBlockHeader, {
       digest: digest.toBuffer(),
       signatures: attestations ?? [],
     });
@@ -488,8 +492,9 @@ export class SequencerPublisher {
     const txHashes = encodedData.txHashes ? encodedData.txHashes.map(txHash => txHash.toString()) : [];
     const args = [
       {
-        header: `0x${encodedData.header.toString('hex')}`,
-        archive: `0x${encodedData.archive.toString('hex')}`,
+        header: toHex(encodedData.header),
+        archive: toHex(encodedData.archive),
+        stateReference: toHex(encodedData.stateReference),
         oracleInput: {
           // We are currently not modifying these. See #9963
           feeAssetPriceModifier: 0n,
@@ -531,8 +536,8 @@ export class SequencerPublisher {
             // @note we override checkBlob to false since blobs are not part simulate()
             stateDiff: [
               {
-                slot: toHex(RollupContract.checkBlobStorageSlot, true),
-                value: toHex(0n, true),
+                slot: toPaddedHex(RollupContract.checkBlobStorageSlot, true),
+                value: toPaddedHex(0n, true),
               },
             ],
           },

package/src/sequencer/metrics.ts

@@ -136,6 +136,10 @@ export class SequencerMetrics {
     });
   }
 
+  public setCoinbase(coinbase: EthAddress) {
+    this.coinbase = coinbase;
+  }
+
   public start() {
     this.meter.addBatchObservableCallback(this.observe, [this.rewards]);
   }

package/src/sequencer/sequencer.ts

@@ -23,17 +23,11 @@ import {
   type WorldStateSynchronizer,
 } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
+import type { BlockProposalOptions } from '@aztec/stdlib/p2p';
 import { pickFromSchema } from '@aztec/stdlib/schemas';
 import type { L2BlockBuiltStats } from '@aztec/stdlib/stats';
-import { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees';
-import {
-  BlockHeader,
-  ContentCommitment,
-  type GlobalVariables,
-  StateReference,
-  Tx,
-  type TxHash,
-} from '@aztec/stdlib/tx';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+import { ContentCommitment, GlobalVariables, ProposedBlockHeader, Tx, type TxHash } from '@aztec/stdlib/tx';
 import {
   Attributes,
   L1Metrics,
@@ -109,7 +103,7 @@ export class Sequencer {
     this.metrics = new SequencerMetrics(
       telemetry,
       () => this.state,
-      this._coinbase,
+      this.config.coinbase ?? this.publisher.getSenderAddress(),
       this.publisher.getRollupContract(),
       'Sequencer',
     );
@@ -120,7 +114,7 @@ export class Sequencer {
     );
 
     // Register the block builder with the validator client for re-execution
-    this.validatorClient?.registerBlockBuilder(this.buildBlock.bind(this));
+    this.validatorClient?.registerBlockBuilder(this.buildBlockFromProposal.bind(this));
 
     // Register the slasher on the publisher to fetch slashing payloads
     this.publisher.registerSlashPayloadGetter(this.slasherClient.getSlashPayload.bind(this.slasherClient));
@@ -161,6 +155,7 @@ export class Sequencer {
     }
     if (config.coinbase) {
       this._coinbase = config.coinbase;
+      this.metrics.setCoinbase(this._coinbase);
     }
     if (config.feeRecipient) {
       this._feeRecipient = config.feeRecipient;
@@ -311,14 +306,13 @@ export class Sequencer {
     });
 
     // 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,
-    );
+    const proposalHeader = ProposedBlockHeader.from({
+      ...newGlobalVariables,
+      timestamp: newGlobalVariables.timestamp.toBigInt(),
+      lastArchiveRoot: chainTipArchive,
+      contentCommitment: ContentCommitment.empty(),
+      totalManaUsed: Fr.ZERO,
+    });
 
     let finishedFlushing = false;
     const pendingTxCount = await this.p2pClient.getPendingTxCount();
@@ -327,7 +321,7 @@ export class Sequencer {
       // 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 => {
+      await this.buildBlockAndEnqueuePublish(pendingTxs, proposalHeader, newGlobalVariables).catch(err => {
         this.log.error(`Error building/enqueuing block`, err, { blockNumber: newBlockNumber, slot });
       });
       finishedFlushing = true;
@@ -426,11 +420,8 @@ export class Sequencer {
   /**
    * 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
    */
   protected async buildBlock(
@@ -509,7 +500,7 @@ export class Sequencer {
         maxBlockGas: this.maxBlockGas,
       };
       const limits = opts.validateOnly ? { deadline } : { deadline, ...proposerLimits };
-      const [publicProcessorDuration, [processedTxs, failedTxs]] = await elapsed(() =>
+      const [publicProcessorDuration, [processedTxs, failedTxs, usedTxs]] = await elapsed(() =>
         processor.process(pendingTxs, limits, validator),
       );
 
@@ -553,6 +544,7 @@ export class Sequencer {
         numTxs: processedTxs.length,
         numFailedTxs: failedTxs.length,
         blockBuildingTimer,
+        usedTxs,
       };
     } finally {
       // We create a fresh processor each time to reset any cached state (eg storage writes)
@@ -571,6 +563,31 @@ export class Sequencer {
     }
   }
 
+  /**
+   * Build a block from a proposal. Used by the validator to re-execute transactions.
+   *
+   * @param blockNumber - The block number of the proposal.
+   * @param header - The header of the proposal.
+   * @param pendingTxs - The pending transactions to construct the block from.
+   * @param opts - Whether to just validate the block as a validator, as opposed to building it as a proposal.
+   */
+  async buildBlockFromProposal(
+    blockNumber: Fr,
+    header: ProposedBlockHeader,
+    pendingTxs: Iterable<Tx> | AsyncIterable<Tx>,
+    opts: { validateOnly?: boolean } = {},
+  ) {
+    const { chainId, version } = await this.globalsBuilder.getGlobalConstantVariables();
+    const globalVariables = GlobalVariables.from({
+      ...header,
+      blockNumber,
+      timestamp: new Fr(header.timestamp),
+      chainId,
+      version,
+    });
+    return await this.buildBlock(pendingTxs, globalVariables, opts);
+  }
+
   /**
    * @notice  Build and propose a block to the chain
    *
@@ -580,18 +597,18 @@ export class Sequencer {
    * @param pendingTxs - Iterable of pending transactions to construct the block from
    * @param proposalHeader - The partial header constructed for the proposal
    */
-  @trackSpan('Sequencer.buildBlockAndEnqueuePublish', (_validTxs, proposalHeader) => ({
-    [Attributes.BLOCK_NUMBER]: proposalHeader.globalVariables.blockNumber.toNumber(),
+  @trackSpan('Sequencer.buildBlockAndEnqueuePublish', (_validTxs, _proposalHeader, newGlobalVariables) => ({
+    [Attributes.BLOCK_NUMBER]: newGlobalVariables.blockNumber.toNumber(),
   }))
   private async buildBlockAndEnqueuePublish(
     pendingTxs: Iterable<Tx> | AsyncIterable<Tx>,
-    proposalHeader: BlockHeader,
+    proposalHeader: ProposedBlockHeader,
+    newGlobalVariables: GlobalVariables,
   ): Promise<void> {
     await this.publisher.validateBlockForSubmission(proposalHeader);
 
-    const newGlobalVariables = proposalHeader.globalVariables;
     const blockNumber = newGlobalVariables.blockNumber.toNumber();
-    const slot = newGlobalVariables.slotNumber.toBigInt();
+    const slot = proposalHeader.slotNumber.toBigInt();
 
     // this.metrics.recordNewBlock(blockNumber, validTxs.length);
     const workTimer = new Timer();
@@ -599,12 +616,12 @@ export class Sequencer {
 
     try {
       const buildBlockRes = await this.buildBlock(pendingTxs, newGlobalVariables);
-      const { publicGas, block, publicProcessorDuration, numTxs, numMsgs, blockBuildingTimer } = buildBlockRes;
+      const { publicGas, block, publicProcessorDuration, numTxs, numMsgs, blockBuildingTimer, usedTxs } = 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);
+      await this.publisher.validateBlockForSubmission(block.header.toPropose());
 
       const blockStats: L2BlockBuiltStats = {
         eventName: 'l2-block-built',
@@ -631,7 +648,7 @@ export class Sequencer {
 
       this.log.debug('Collecting attestations');
       const stopCollectingAttestationsTimer = this.metrics.startCollectingAttestationsTimer();
-      const attestations = await this.collectAttestations(block, txHashes);
+      const attestations = await this.collectAttestations(block, usedTxs);
       if (attestations !== undefined) {
         this.log.verbose(`Collected ${attestations.length} attestations`, { blockHash, blockNumber });
       }
@@ -649,7 +666,7 @@ export class Sequencer {
     [Attributes.BLOCK_ARCHIVE]: block.archive.toString(),
     [Attributes.BLOCK_TXS_COUNT]: txHashes.length,
   }))
-  protected async collectAttestations(block: L2Block, txHashes: TxHash[]): Promise<Signature[] | undefined> {
+  protected async collectAttestations(block: L2Block, txs: Tx[]): Promise<Signature[] | undefined> {
     // 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();
 
@@ -671,14 +688,22 @@ export class Sequencer {
     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);
+    const blockProposalOptions: BlockProposalOptions = { publishFullTxs: !!this.config.publishTxsWithProposals };
+    const proposal = await this.validatorClient.createBlockProposal(
+      block.header.globalVariables.blockNumber,
+      block.header.toPropose(),
+      block.archive.root,
+      block.header.state,
+      txs,
+      blockProposalOptions,
+    );
     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);
+    await this.validatorClient.broadcastBlockProposal(proposal);
 
     const attestationTimeAllowed = this.enforceTimeTable
       ? this.timetable.getMaxAllowedTime(SequencerState.PUBLISHING_BLOCK)!

package/src/sequencer/timetable.ts

@@ -3,6 +3,11 @@ import { createLogger } from '@aztec/aztec.js';
 import type { SequencerMetrics } from './metrics.js';
 import { SequencerState } from './utils.js';
 
+const MIN_EXECUTION_TIME = 1;
+const BLOCK_PREPARE_TIME = 1;
+const BLOCK_VALIDATION_TIME = 1;
+const ATTESTATION_PROPAGATION_TIME = 2;
+
 export class SequencerTimetable {
   /**
    * How late into the slot can we be to start working. Computed as the total time needed for assembling and publishing a block,
@@ -19,16 +24,16 @@ export class SequencerTimetable {
   public readonly l1PublishingTime;
 
   /** What's the minimum time we want to leave available for execution and reexecution (used to derive init deadline) */
-  public readonly minExecutionTime = 1;
+  public readonly minExecutionTime: number = MIN_EXECUTION_TIME;
 
   /** How long it takes to get ready to start building */
-  public readonly blockPrepareTime = 1;
+  public readonly blockPrepareTime: number = BLOCK_PREPARE_TIME;
 
   /** How long it takes to for proposals and attestations to travel across the p2p layer (one-way) */
-  public readonly attestationPropagationTime = 2;
+  public readonly attestationPropagationTime: number = ATTESTATION_PROPAGATION_TIME;
 
   /** How much time we spend validating and processing a block after building it, and assembling the proposal to send to attestors */
-  public readonly blockValidationTime = 1;
+  public readonly blockValidationTime: number = BLOCK_VALIDATION_TIME;
 
   constructor(
     private readonly ethereumSlotDuration: number,
@@ -40,6 +45,13 @@ export class SequencerTimetable {
   ) {
     this.l1PublishingTime = this.ethereumSlotDuration - this.maxL1TxInclusionTimeIntoSlot;
 
+    // Assume zero-cost propagation time and faster runs in test environments where L1 slot duration is shortened
+    if (this.ethereumSlotDuration < 8) {
+      this.attestationPropagationTime = 0;
+      this.blockValidationTime = 0.5;
+      this.blockPrepareTime = 0.5;
+    }
+
     const allWorkToDo =
       this.blockPrepareTime +
       this.minExecutionTime * 2 +

package/src/slasher/slasher_client.ts

@@ -154,7 +154,7 @@ export class SlasherClient extends WithTracer {
 
   public handleBlockStreamEvent(event: L2BlockSourceEvent): Promise<void> {
     this.log.debug(`Handling block stream event ${event.type}`);
-    switch (event.type) {
+    switch (event.type as L2BlockSourceEvents) {
       case L2BlockSourceEvents.L2PruneDetected:
         this.handlePruneL2Blocks(event);
         break;

package/src/test/index.ts

@@ -6,15 +6,15 @@ import { Sequencer } from '../sequencer/sequencer.js';
 import type { SequencerTimetable } from '../sequencer/timetable.js';
 
 class TestSequencer_ extends Sequencer {
-  public declare publicProcessorFactory: PublicProcessorFactory;
-  public declare timetable: SequencerTimetable;
-  public declare publisher: SequencerPublisher;
+  declare public publicProcessorFactory: PublicProcessorFactory;
+  declare public timetable: SequencerTimetable;
+  declare public publisher: SequencerPublisher;
 }
 
 export type TestSequencer = TestSequencer_;
 
 class TestSequencerClient_ extends SequencerClient {
-  public declare sequencer: TestSequencer;
+  declare public sequencer: TestSequencer;
 }
 
 export type TestSequencerClient = TestSequencerClient_;