@aztec/sequencer-client 0.0.1-commit.96bb3f7 → 0.0.1-commit.993d240

package/src/test/utils.ts

@@ -1,5 +1,5 @@
 import { Body } from '@aztec/aztec.js/block';
-import { CheckpointNumber } from '@aztec/foundation/branded-types';
+import { CheckpointNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
 import { times } from '@aztec/foundation/collection';
 import { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
 import { Fr } from '@aztec/foundation/curves/bn254';
@@ -7,10 +7,14 @@ import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
 import type { P2P } from '@aztec/p2p';
 import { PublicDataWrite } from '@aztec/stdlib/avm';
-import { CommitteeAttestation, L2BlockNew } from '@aztec/stdlib/block';
+import { CommitteeAttestation, L2Block } from '@aztec/stdlib/block';
 import { BlockProposal, CheckpointAttestation, CheckpointProposal, ConsensusPayload } from '@aztec/stdlib/p2p';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
-import { makeAppendOnlyTreeSnapshot, mockTxForRollup } from '@aztec/stdlib/testing';
+import {
+  TEST_COORDINATION_SIGNATURE_CONTEXT,
+  makeAppendOnlyTreeSnapshot,
+  mockTxForRollup,
+} from '@aztec/stdlib/testing';
 import { BlockHeader, GlobalVariables, type Tx, makeProcessedTxFromPrivateOnlyTx } from '@aztec/stdlib/tx';
 
 import type { MockProxy } from 'jest-mock-extended';
@@ -30,9 +34,9 @@ export async function makeTx(seed?: number, chainId?: Fr): Promise<Tx> {
 }
 
 /**
- * Creates an L2BlockNew from transactions and global variables
+ * Creates an L2Block from transactions and global variables
  */
-export async function makeBlock(txs: Tx[], globalVariables: GlobalVariables): Promise<L2BlockNew> {
+export async function makeBlock(txs: Tx[], globalVariables: GlobalVariables): Promise<L2Block> {
   const processedTxs = await Promise.all(
     txs.map(tx =>
       makeProcessedTxFromPrivateOnlyTx(tx, Fr.ZERO, new PublicDataWrite(Fr.random(), Fr.random()), globalVariables),
@@ -41,7 +45,13 @@ export async function makeBlock(txs: Tx[], globalVariables: GlobalVariables): Pr
   const body = new Body(processedTxs.map(tx => tx.txEffect));
   const header = BlockHeader.empty({ globalVariables });
   const archive = makeAppendOnlyTreeSnapshot(globalVariables.blockNumber + 1);
-  return new L2BlockNew(archive, header, body, CheckpointNumber(globalVariables.blockNumber), 0);
+  return new L2Block(
+    archive,
+    header,
+    body,
+    CheckpointNumber.fromBlockNumber(globalVariables.blockNumber),
+    IndexWithinCheckpoint(0),
+  );
 }
 
 /**
@@ -50,6 +60,7 @@ export async function makeBlock(txs: Tx[], globalVariables: GlobalVariables): Pr
 export function mockPendingTxs(p2p: MockProxy<P2P>, txs: Tx[]): void {
   p2p.getPendingTxCount.mockResolvedValue(txs.length);
   p2p.iteratePendingTxs.mockImplementation(() => mockTxIterator(Promise.resolve(txs)));
+  p2p.iterateEligiblePendingTxs.mockImplementation(() => mockTxIterator(Promise.resolve(txs)));
 }
 
 /**
@@ -70,16 +81,17 @@ export function createMockSignatures(signer: Secp256k1Signer): CommitteeAttestat
 }
 
 /**
- * Creates a CheckpointHeader from an L2BlockNew for testing purposes.
- * Uses mock values for blockHeadersHash, blobsHash and inHash since L2BlockNew doesn't have these fields.
+ * Creates a CheckpointHeader from an L2Block for testing purposes.
+ * Uses mock values for blockHeadersHash, blobsHash and inHash since L2Block doesn't have these fields.
  */
-function createCheckpointHeaderFromBlock(block: L2BlockNew): CheckpointHeader {
+function createCheckpointHeaderFromBlock(block: L2Block): CheckpointHeader {
   const gv = block.header.globalVariables;
   return new CheckpointHeader(
     block.header.lastArchive.root,
     Fr.random(), // blockHeadersHash - mock value for testing
     Fr.random(), // blobsHash - mock value for testing
     Fr.random(), // inHash - mock value for testing
+    Fr.random(), // outHash - mock value for testing
     gv.slotNumber,
     gv.timestamp,
     gv.coinbase,
@@ -92,7 +104,7 @@ function createCheckpointHeaderFromBlock(block: L2BlockNew): CheckpointHeader {
 /**
  * Creates a block proposal from a block and signature
  */
-export function createBlockProposal(block: L2BlockNew, signature: Signature): BlockProposal {
+export function createBlockProposal(block: L2Block, signature: Signature): BlockProposal {
   const txHashes = block.body.txEffects.map(tx => tx.txHash);
   return new BlockProposal(
     block.header,
@@ -101,6 +113,7 @@ export function createBlockProposal(block: L2BlockNew, signature: Signature): Bl
     block.archive.root,
     txHashes,
     signature,
+    TEST_COORDINATION_SIGNATURE_CONTEXT,
   );
 }
 
@@ -108,18 +121,26 @@ export function createBlockProposal(block: L2BlockNew, signature: Signature): Bl
  * Creates a checkpoint proposal from a block and signature
  */
 export function createCheckpointProposal(
-  block: L2BlockNew,
+  block: L2Block,
   checkpointSignature: Signature,
   blockSignature?: Signature,
+  feeAssetPriceModifier: bigint = 0n,
 ): CheckpointProposal {
   const txHashes = block.body.txEffects.map(tx => tx.txHash);
   const checkpointHeader = createCheckpointHeaderFromBlock(block);
-  return new CheckpointProposal(checkpointHeader, block.archive.root, checkpointSignature, {
-    blockHeader: block.header,
-    indexWithinCheckpoint: block.indexWithinCheckpoint,
-    txHashes,
-    signature: blockSignature ?? checkpointSignature, // Use checkpoint signature as block signature if not provided
-  });
+  return new CheckpointProposal(
+    checkpointHeader,
+    block.archive.root,
+    feeAssetPriceModifier,
+    checkpointSignature,
+    TEST_COORDINATION_SIGNATURE_CONTEXT,
+    {
+      blockHeader: block.header,
+      indexWithinCheckpoint: block.indexWithinCheckpoint,
+      txHashes,
+      signature: blockSignature ?? checkpointSignature, // Use checkpoint signature as block signature if not provided
+    },
+  );
 }
 
 /**
@@ -128,15 +149,22 @@ export function createCheckpointProposal(
  * In production, the sender is recovered from the signature.
  */
 export function createCheckpointAttestation(
-  block: L2BlockNew,
+  block: L2Block,
   signature: Signature,
   sender: EthAddress,
+  feeAssetPriceModifier: bigint = 0n,
 ): CheckpointAttestation {
   const checkpointHeader = createCheckpointHeaderFromBlock(block);
-  const payload = new ConsensusPayload(checkpointHeader, block.archive.root);
+  const payload = new ConsensusPayload(
+    checkpointHeader,
+    block.archive.root,
+    feeAssetPriceModifier,
+    TEST_COORDINATION_SIGNATURE_CONTEXT,
+  );
   const attestation = new CheckpointAttestation(payload, signature, signature);
-  // Set sender directly for testing (bypasses signature recovery)
-  (attestation as any).sender = sender;
+  // Bypass signature recovery for testing since we use random signatures
+  (attestation as any).getSender = () => sender;
+  (attestation as any).getProposer = () => sender;
   return attestation;
 }
 
@@ -149,7 +177,7 @@ export async function setupTxsAndBlock(
   globalVariables: GlobalVariables,
   txCount: number,
   chainId: Fr,
-): Promise<{ txs: Tx[]; block: L2BlockNew }> {
+): Promise<{ txs: Tx[]; block: L2Block }> {
   const txs = await Promise.all(times(txCount, i => makeTx(i + 1, chainId)));
   const block = await makeBlock(txs, globalVariables);
   mockPendingTxs(p2p, txs);

package/dest/sequencer/block_builder.d.ts

@@ -1,26 +0,0 @@
-import { BlockNumber } from '@aztec/foundation/branded-types';
-import type { Fr } from '@aztec/foundation/curves/bn254';
-import { DateProvider } from '@aztec/foundation/timer';
-import { PublicProcessor } from '@aztec/simulator/server';
-import type { ContractDataSource } from '@aztec/stdlib/contract';
-import type { BuildBlockResult, FullNodeBlockBuilderConfig, IFullNodeBlockBuilder, MerkleTreeWriteOperations, PublicProcessorLimits, PublicProcessorValidator, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
-import { GlobalVariables, Tx } from '@aztec/stdlib/tx';
-import { type TelemetryClient } from '@aztec/telemetry-client';
-export declare class FullNodeBlockBuilder implements IFullNodeBlockBuilder {
-    private config;
-    private worldState;
-    private contractDataSource;
-    private dateProvider;
-    private telemetryClient;
-    constructor(config: FullNodeBlockBuilderConfig, worldState: WorldStateSynchronizer, contractDataSource: ContractDataSource, dateProvider: DateProvider, telemetryClient?: TelemetryClient);
-    getConfig(): FullNodeBlockBuilderConfig;
-    updateConfig(config: Partial<FullNodeBlockBuilderConfig>): void;
-    makeBlockBuilderDeps(globalVariables: GlobalVariables, fork: MerkleTreeWriteOperations): Promise<{
-        processor: PublicProcessor;
-        validator: PublicProcessorValidator;
-    }>;
-    private syncToPreviousBlock;
-    buildBlock(pendingTxs: Iterable<Tx> | AsyncIterable<Tx>, l1ToL2Messages: Fr[], globalVariables: GlobalVariables, opts: PublicProcessorLimits, suppliedFork?: MerkleTreeWriteOperations): Promise<BuildBlockResult>;
-    getFork(blockNumber: BlockNumber): Promise<MerkleTreeWriteOperations>;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfYnVpbGRlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcXVlbmNlci9ibG9ja19idWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU5RCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUl6RCxPQUFPLEVBQUUsWUFBWSxFQUFrQixNQUFNLHlCQUF5QixDQUFDO0FBR3ZFLE9BQU8sRUFHTCxlQUFlLEVBRWhCLE1BQU0seUJBQXlCLENBQUM7QUFDakMsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUdqRSxPQUFPLEtBQUssRUFDVixnQkFBZ0IsRUFDaEIsMEJBQTBCLEVBQzFCLHFCQUFxQixFQUNyQix5QkFBeUIsRUFDekIscUJBQXFCLEVBQ3JCLHdCQUF3QixFQUN4QixzQkFBc0IsRUFDdkIsTUFBTSxpQ0FBaUMsQ0FBQztBQUN6QyxPQUFPLEVBQUUsZUFBZSxFQUFFLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQTBFbkYscUJBQWEsb0JBQXFCLFlBQVcscUJBQXFCO0lBRTlELE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLFVBQVU7SUFDbEIsT0FBTyxDQUFDLGtCQUFrQjtJQUMxQixPQUFPLENBQUMsWUFBWTtJQUNwQixPQUFPLENBQUMsZUFBZTtJQUx6QixZQUNVLE1BQU0sRUFBRSwwQkFBMEIsRUFDbEMsVUFBVSxFQUFFLHNCQUFzQixFQUNsQyxrQkFBa0IsRUFBRSxrQkFBa0IsRUFDdEMsWUFBWSxFQUFFLFlBQVksRUFDMUIsZUFBZSxHQUFFLGVBQXNDLEVBQzdEO0lBRUcsU0FBUyxJQUFJLDBCQUEwQixDQUU3QztJQUVNLFlBQVksQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLDBCQUEwQixDQUFDLFFBRTlEO0lBRVksb0JBQW9CLENBQUMsZUFBZSxFQUFFLGVBQWUsRUFBRSxJQUFJLEVBQUUseUJBQXlCOzs7T0FrQ2xHO1lBRWEsbUJBQW1CO0lBVTNCLFVBQVUsQ0FDZCxVQUFVLEVBQUUsUUFBUSxDQUFDLEVBQUUsQ0FBQyxHQUFHLGFBQWEsQ0FBQyxFQUFFLENBQUMsRUFDNUMsY0FBYyxFQUFFLEVBQUUsRUFBRSxFQUNwQixlQUFlLEVBQUUsZUFBZSxFQUNoQyxJQUFJLEVBQUUscUJBQXFCLEVBQzNCLFlBQVksQ0FBQyxFQUFFLHlCQUF5QixHQUN2QyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FzQzNCO0lBRUQsT0FBTyxDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLHlCQUF5QixDQUFDLENBRXBFO0NBQ0YifQ==

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

@@ -1 +0,0 @@
-{"version":3,"file":"block_builder.d.ts","sourceRoot":"","sources":["../../src/sequencer/block_builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIzD,OAAO,EAAE,YAAY,EAAkB,MAAM,yBAAyB,CAAC;AAGvE,OAAO,EAGL,eAAe,EAEhB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,OAAO,KAAK,EACV,gBAAgB,EAChB,0BAA0B,EAC1B,qBAAqB,EACrB,yBAAyB,EACzB,qBAAqB,EACrB,wBAAwB,EACxB,sBAAsB,EACvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AA0EnF,qBAAa,oBAAqB,YAAW,qBAAqB;IAE9D,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;IALzB,YACU,MAAM,EAAE,0BAA0B,EAClC,UAAU,EAAE,sBAAsB,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,eAAe,GAAE,eAAsC,EAC7D;IAEG,SAAS,IAAI,0BAA0B,CAE7C;IAEM,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,0BAA0B,CAAC,QAE9D;IAEY,oBAAoB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,yBAAyB;;;OAkClG;YAEa,mBAAmB;IAU3B,UAAU,CACd,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,EAC5C,cAAc,EAAE,EAAE,EAAE,EACpB,eAAe,EAAE,eAAe,EAChC,IAAI,EAAE,qBAAqB,EAC3B,YAAY,CAAC,EAAE,yBAAyB,GACvC,OAAO,CAAC,gBAAgB,CAAC,CAsC3B;IAED,OAAO,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAEpE;CACF"}

package/dest/sequencer/block_builder.js

@@ -1,129 +0,0 @@
-import { MerkleTreeId } from '@aztec/aztec.js/trees';
-import { BlockNumber } from '@aztec/foundation/branded-types';
-import { merge, pick } from '@aztec/foundation/collection';
-import { createLogger } from '@aztec/foundation/log';
-import { retryUntil } from '@aztec/foundation/retry';
-import { bufferToHex } from '@aztec/foundation/string';
-import { Timer, elapsed } from '@aztec/foundation/timer';
-import { getDefaultAllowedSetupFunctions } from '@aztec/p2p/msg_validators';
-import { LightweightBlockFactory } from '@aztec/prover-client/block-factory';
-import { GuardedMerkleTreeOperations, PublicContractsDB, PublicProcessor, createPublicTxSimulatorForBlockBuilding } from '@aztec/simulator/server';
-import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
-import { Gas } from '@aztec/stdlib/gas';
-import { getTelemetryClient } from '@aztec/telemetry-client';
-import { createValidatorForBlockBuilding } from '@aztec/validator-client';
-const log = createLogger('block-builder');
-/** Builds a block out of pending txs */ async function buildBlock(pendingTxs, l1ToL2Messages, newGlobalVariables, opts = {}, worldStateFork, processor, validator, l1Constants, dateProvider, telemetryClient = getTelemetryClient()) {
-    const blockBuildingTimer = new Timer();
-    const blockNumber = newGlobalVariables.blockNumber;
-    const slot = newGlobalVariables.slotNumber;
-    const msgCount = l1ToL2Messages.length;
-    const stateReference = await worldStateFork.getStateReference();
-    const archiveTree = await worldStateFork.getTreeInfo(MerkleTreeId.ARCHIVE);
-    log.verbose(`Building block ${blockNumber} for slot ${slot}`, {
-        slot,
-        slotStart: new Date(Number(getTimestampForSlot(slot, l1Constants)) * 1000),
-        now: new Date(dateProvider.now()),
-        blockNumber,
-        msgCount,
-        initialStateReference: stateReference.toInspect(),
-        initialArchiveRoot: bufferToHex(archiveTree.root),
-        opts
-    });
-    const blockFactory = new LightweightBlockFactory(worldStateFork, telemetryClient);
-    await blockFactory.startNewBlock(newGlobalVariables, l1ToL2Messages);
-    const [publicProcessorDuration, [processedTxs, failedTxs, usedTxs]] = await elapsed(()=>processor.process(pendingTxs, opts, validator));
-    // All real transactions have been added, set the block as full and pad if needed
-    await blockFactory.addTxs(processedTxs);
-    const block = await blockFactory.setBlockCompleted();
-    // How much public gas was processed
-    const publicGas = processedTxs.reduce((acc, tx)=>acc.add(tx.gasUsed.publicGas), Gas.empty());
-    const res = {
-        block,
-        publicGas,
-        publicProcessorDuration,
-        numMsgs: l1ToL2Messages.length,
-        numTxs: processedTxs.length,
-        failedTxs: failedTxs,
-        blockBuildingTimer,
-        usedTxs
-    };
-    log.trace('Built block', res.block.header);
-    return res;
-}
-const FullNodeBlockBuilderConfigKeys = [
-    'l1GenesisTime',
-    'slotDuration',
-    'l1ChainId',
-    'rollupVersion',
-    'txPublicSetupAllowList',
-    'fakeProcessingDelayPerTxMs',
-    'fakeThrowAfterProcessingTxCount'
-];
-// TODO(palla/mbps): Try killing this in favor of the CheckpointsBuilder
-export class FullNodeBlockBuilder {
-    config;
-    worldState;
-    contractDataSource;
-    dateProvider;
-    telemetryClient;
-    constructor(config, worldState, contractDataSource, dateProvider, telemetryClient = getTelemetryClient()){
-        this.config = config;
-        this.worldState = worldState;
-        this.contractDataSource = contractDataSource;
-        this.dateProvider = dateProvider;
-        this.telemetryClient = telemetryClient;
-    }
-    getConfig() {
-        return pick(this.config, ...FullNodeBlockBuilderConfigKeys);
-    }
-    updateConfig(config) {
-        this.config = merge(this.config, pick(config, ...FullNodeBlockBuilderConfigKeys));
-    }
-    async makeBlockBuilderDeps(globalVariables, fork) {
-        const txPublicSetupAllowList = this.config.txPublicSetupAllowList ?? await getDefaultAllowedSetupFunctions();
-        const contractsDB = new PublicContractsDB(this.contractDataSource);
-        const guardedFork = new GuardedMerkleTreeOperations(fork);
-        const publicTxSimulator = createPublicTxSimulatorForBlockBuilding(guardedFork, contractsDB, globalVariables, this.telemetryClient);
-        const processor = new PublicProcessor(globalVariables, guardedFork, contractsDB, publicTxSimulator, this.dateProvider, this.telemetryClient, undefined, this.config);
-        const validator = createValidatorForBlockBuilding(fork, this.contractDataSource, globalVariables, txPublicSetupAllowList);
-        return {
-            processor,
-            validator
-        };
-    }
-    async syncToPreviousBlock(parentBlockNumber, timeout) {
-        await retryUntil(()=>this.worldState.syncImmediate(parentBlockNumber, true).then((syncedTo)=>syncedTo >= parentBlockNumber), 'sync to previous block', timeout, 0.1);
-        log.debug(`Synced to previous block ${parentBlockNumber}`);
-    }
-    async buildBlock(pendingTxs, l1ToL2Messages, globalVariables, opts, suppliedFork) {
-        const parentBlockNumber = BlockNumber(globalVariables.blockNumber - 1);
-        const syncTimeout = opts.deadline ? (opts.deadline.getTime() - this.dateProvider.now()) / 1000 : undefined;
-        await this.syncToPreviousBlock(parentBlockNumber, syncTimeout);
-        const fork = suppliedFork ?? await this.worldState.fork(parentBlockNumber);
-        try {
-            const { processor, validator } = await this.makeBlockBuilderDeps(globalVariables, fork);
-            const res = await buildBlock(pendingTxs, l1ToL2Messages, globalVariables, opts, fork, processor, validator, this.config, this.dateProvider, this.telemetryClient);
-            return res;
-        } finally{
-            // If the fork was supplied, we don't close it.
-            // Otherwise, we wait a bit to close the fork we just created,
-            // since the processor may still be working on a dangling tx
-            // which was interrupted due to the processingDeadline being hit.
-            if (!suppliedFork) {
-                // eslint-disable-next-line @typescript-eslint/no-misused-promises
-                setTimeout(async ()=>{
-                    try {
-                        await fork.close();
-                    } catch (err) {
-                        // This can happen if the sequencer is stopped before we hit this timeout.
-                        log.warn(`Error closing forks for block processing`, err);
-                    }
-                }, 5000);
-            }
-        }
-    }
-    getFork(blockNumber) {
-        return this.worldState.fork(blockNumber);
-    }
-}

package/src/sequencer/block_builder.ts

@@ -1,216 +0,0 @@
-import { MerkleTreeId } from '@aztec/aztec.js/trees';
-import { BlockNumber } from '@aztec/foundation/branded-types';
-import { merge, pick } from '@aztec/foundation/collection';
-import type { Fr } from '@aztec/foundation/curves/bn254';
-import { createLogger } from '@aztec/foundation/log';
-import { retryUntil } from '@aztec/foundation/retry';
-import { bufferToHex } from '@aztec/foundation/string';
-import { DateProvider, Timer, elapsed } from '@aztec/foundation/timer';
-import { getDefaultAllowedSetupFunctions } from '@aztec/p2p/msg_validators';
-import { LightweightBlockFactory } from '@aztec/prover-client/block-factory';
-import {
-  GuardedMerkleTreeOperations,
-  PublicContractsDB,
-  PublicProcessor,
-  createPublicTxSimulatorForBlockBuilding,
-} from '@aztec/simulator/server';
-import type { ContractDataSource } from '@aztec/stdlib/contract';
-import { type L1RollupConstants, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
-import { Gas } from '@aztec/stdlib/gas';
-import type {
-  BuildBlockResult,
-  FullNodeBlockBuilderConfig,
-  IFullNodeBlockBuilder,
-  MerkleTreeWriteOperations,
-  PublicProcessorLimits,
-  PublicProcessorValidator,
-  WorldStateSynchronizer,
-} from '@aztec/stdlib/interfaces/server';
-import { GlobalVariables, Tx } from '@aztec/stdlib/tx';
-import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
-import { createValidatorForBlockBuilding } from '@aztec/validator-client';
-
-const log = createLogger('block-builder');
-
-/** Builds a block out of pending txs */
-async function buildBlock(
-  pendingTxs: Iterable<Tx> | AsyncIterable<Tx>,
-  l1ToL2Messages: Fr[],
-  newGlobalVariables: GlobalVariables,
-  opts: PublicProcessorLimits = {},
-  worldStateFork: MerkleTreeWriteOperations,
-  processor: PublicProcessor,
-  validator: PublicProcessorValidator,
-  l1Constants: Pick<L1RollupConstants, 'l1GenesisTime' | 'slotDuration'>,
-  dateProvider: DateProvider,
-  telemetryClient: TelemetryClient = getTelemetryClient(),
-): Promise<BuildBlockResult> {
-  const blockBuildingTimer = new Timer();
-  const blockNumber = newGlobalVariables.blockNumber;
-  const slot = newGlobalVariables.slotNumber;
-  const msgCount = l1ToL2Messages.length;
-  const stateReference = await worldStateFork.getStateReference();
-  const archiveTree = await worldStateFork.getTreeInfo(MerkleTreeId.ARCHIVE);
-
-  log.verbose(`Building block ${blockNumber} for slot ${slot}`, {
-    slot,
-    slotStart: new Date(Number(getTimestampForSlot(slot, l1Constants)) * 1000),
-    now: new Date(dateProvider.now()),
-    blockNumber,
-    msgCount,
-    initialStateReference: stateReference.toInspect(),
-    initialArchiveRoot: bufferToHex(archiveTree.root),
-    opts,
-  });
-  const blockFactory = new LightweightBlockFactory(worldStateFork, telemetryClient);
-  await blockFactory.startNewBlock(newGlobalVariables, l1ToL2Messages);
-
-  const [publicProcessorDuration, [processedTxs, failedTxs, usedTxs]] = await elapsed(() =>
-    processor.process(pendingTxs, opts, validator),
-  );
-
-  // All real transactions have been added, set the block as full and pad if needed
-  await blockFactory.addTxs(processedTxs);
-  const block = await blockFactory.setBlockCompleted();
-
-  // How much public gas was processed
-  const publicGas = processedTxs.reduce((acc, tx) => acc.add(tx.gasUsed.publicGas), Gas.empty());
-
-  const res = {
-    block,
-    publicGas,
-    publicProcessorDuration,
-    numMsgs: l1ToL2Messages.length,
-    numTxs: processedTxs.length,
-    failedTxs: failedTxs,
-    blockBuildingTimer,
-    usedTxs,
-  };
-  log.trace('Built block', res.block.header);
-  return res;
-}
-
-const FullNodeBlockBuilderConfigKeys = [
-  'l1GenesisTime',
-  'slotDuration',
-  'l1ChainId',
-  'rollupVersion',
-  'txPublicSetupAllowList',
-  'fakeProcessingDelayPerTxMs',
-  'fakeThrowAfterProcessingTxCount',
-] as const;
-
-// TODO(palla/mbps): Try killing this in favor of the CheckpointsBuilder
-export class FullNodeBlockBuilder implements IFullNodeBlockBuilder {
-  constructor(
-    private config: FullNodeBlockBuilderConfig,
-    private worldState: WorldStateSynchronizer,
-    private contractDataSource: ContractDataSource,
-    private dateProvider: DateProvider,
-    private telemetryClient: TelemetryClient = getTelemetryClient(),
-  ) {}
-
-  public getConfig(): FullNodeBlockBuilderConfig {
-    return pick(this.config, ...FullNodeBlockBuilderConfigKeys);
-  }
-
-  public updateConfig(config: Partial<FullNodeBlockBuilderConfig>) {
-    this.config = merge(this.config, pick(config, ...FullNodeBlockBuilderConfigKeys));
-  }
-
-  public async makeBlockBuilderDeps(globalVariables: GlobalVariables, fork: MerkleTreeWriteOperations) {
-    const txPublicSetupAllowList = this.config.txPublicSetupAllowList ?? (await getDefaultAllowedSetupFunctions());
-    const contractsDB = new PublicContractsDB(this.contractDataSource);
-    const guardedFork = new GuardedMerkleTreeOperations(fork);
-
-    const publicTxSimulator = createPublicTxSimulatorForBlockBuilding(
-      guardedFork,
-      contractsDB,
-      globalVariables,
-      this.telemetryClient,
-    );
-
-    const processor = new PublicProcessor(
-      globalVariables,
-      guardedFork,
-      contractsDB,
-      publicTxSimulator,
-      this.dateProvider,
-      this.telemetryClient,
-      undefined,
-      this.config,
-    );
-
-    const validator = createValidatorForBlockBuilding(
-      fork,
-      this.contractDataSource,
-      globalVariables,
-      txPublicSetupAllowList,
-    );
-
-    return {
-      processor,
-      validator,
-    };
-  }
-
-  private async syncToPreviousBlock(parentBlockNumber: BlockNumber, timeout: number | undefined) {
-    await retryUntil(
-      () => this.worldState.syncImmediate(parentBlockNumber, true).then(syncedTo => syncedTo >= parentBlockNumber),
-      'sync to previous block',
-      timeout,
-      0.1,
-    );
-    log.debug(`Synced to previous block ${parentBlockNumber}`);
-  }
-
-  async buildBlock(
-    pendingTxs: Iterable<Tx> | AsyncIterable<Tx>,
-    l1ToL2Messages: Fr[],
-    globalVariables: GlobalVariables,
-    opts: PublicProcessorLimits,
-    suppliedFork?: MerkleTreeWriteOperations,
-  ): Promise<BuildBlockResult> {
-    const parentBlockNumber = BlockNumber(globalVariables.blockNumber - 1);
-    const syncTimeout = opts.deadline ? (opts.deadline.getTime() - this.dateProvider.now()) / 1000 : undefined;
-    await this.syncToPreviousBlock(parentBlockNumber, syncTimeout);
-    const fork = suppliedFork ?? (await this.worldState.fork(parentBlockNumber));
-
-    try {
-      const { processor, validator } = await this.makeBlockBuilderDeps(globalVariables, fork);
-      const res = await buildBlock(
-        pendingTxs,
-        l1ToL2Messages,
-        globalVariables,
-        opts,
-        fork,
-        processor,
-        validator,
-        this.config,
-        this.dateProvider,
-        this.telemetryClient,
-      );
-      return res;
-    } finally {
-      // If the fork was supplied, we don't close it.
-      // Otherwise, we wait a bit to close the fork we just created,
-      // since the processor may still be working on a dangling tx
-      // which was interrupted due to the processingDeadline being hit.
-      if (!suppliedFork) {
-        // eslint-disable-next-line @typescript-eslint/no-misused-promises
-        setTimeout(async () => {
-          try {
-            await fork.close();
-          } catch (err) {
-            // This can happen if the sequencer is stopped before we hit this timeout.
-            log.warn(`Error closing forks for block processing`, err);
-          }
-        }, 5000);
-      }
-    }
-  }
-
-  getFork(blockNumber: BlockNumber): Promise<MerkleTreeWriteOperations> {
-    return this.worldState.fork(blockNumber);
-  }
-}