@aztec/sequencer-client 0.0.1-commit.d3ec352c → 0.0.1-commit.e61ad554

package/dest/tx_validator/nullifier_cache.js

@@ -1,24 +0,0 @@
-import { MerkleTreeId } from '@aztec/stdlib/trees';
-/**
- * Implements a nullifier source by checking a DB and an in-memory collection.
- * Intended for validating transactions as they are added to a block.
- */ export class NullifierCache {
-    db;
-    nullifiers;
-    constructor(db){
-        this.db = db;
-        this.nullifiers = new Set();
-    }
-    async nullifiersExist(nullifiers) {
-        const cacheResults = nullifiers.map((n)=>this.nullifiers.has(n.toString()));
-        const toCheckDb = nullifiers.filter((_n, index)=>!cacheResults[index]);
-        const dbHits = await this.db.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, toCheckDb);
-        let dbIndex = 0;
-        return nullifiers.map((_n, index)=>cacheResults[index] || dbHits[dbIndex++] !== undefined);
-    }
-    addNullifiers(nullifiers) {
-        for (const nullifier of nullifiers){
-            this.nullifiers.add(nullifier.toString());
-        }
-    }
-}

package/dest/tx_validator/tx_validator_factory.d.ts

@@ -1,18 +0,0 @@
-import { BlockNumber } from '@aztec/foundation/branded-types';
-import type { ContractDataSource } from '@aztec/stdlib/contract';
-import type { GasFees } from '@aztec/stdlib/gas';
-import type { AllowedElement, ClientProtocolCircuitVerifier, MerkleTreeReadOperations, PublicProcessorValidator } from '@aztec/stdlib/interfaces/server';
-import { GlobalVariables, type Tx, type TxValidator } from '@aztec/stdlib/tx';
-import type { UInt64 } from '@aztec/stdlib/types';
-export declare function createValidatorForAcceptingTxs(db: MerkleTreeReadOperations, contractDataSource: ContractDataSource, verifier: ClientProtocolCircuitVerifier | undefined, { l1ChainId, rollupVersion, setupAllowList, gasFees, skipFeeEnforcement, timestamp, blockNumber, txsPermitted }: {
-    l1ChainId: number;
-    rollupVersion: number;
-    setupAllowList: AllowedElement[];
-    gasFees: GasFees;
-    skipFeeEnforcement?: boolean;
-    timestamp: UInt64;
-    blockNumber: BlockNumber;
-    txsPermitted: boolean;
-}): TxValidator<Tx>;
-export declare function createValidatorForBlockBuilding(db: MerkleTreeReadOperations, contractDataSource: ContractDataSource, globalVariables: GlobalVariables, setupAllowList: AllowedElement[]): PublicProcessorValidator;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfdmFsaWRhdG9yX2ZhY3RvcnkuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eF92YWxpZGF0b3IvdHhfdmFsaWRhdG9yX2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBaUI5RCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxFQUNWLGNBQWMsRUFDZCw2QkFBNkIsRUFDN0Isd0JBQXdCLEVBQ3hCLHdCQUF3QixFQUN6QixNQUFNLGlDQUFpQyxDQUFDO0FBRXpDLE9BQU8sRUFBRSxlQUFlLEVBQUUsS0FBSyxFQUFFLEVBQUUsS0FBSyxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5RSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUlsRCx3QkFBZ0IsOEJBQThCLENBQzVDLEVBQUUsRUFBRSx3QkFBd0IsRUFDNUIsa0JBQWtCLEVBQUUsa0JBQWtCLEVBQ3RDLFFBQVEsRUFBRSw2QkFBNkIsR0FBRyxTQUFTLEVBQ25ELEVBQ0UsU0FBUyxFQUNULGFBQWEsRUFDYixjQUFjLEVBQ2QsT0FBTyxFQUNQLGtCQUFrQixFQUNsQixTQUFTLEVBQ1QsV0FBVyxFQUNYLFlBQVksRUFDYixFQUFFO0lBQ0QsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLGNBQWMsRUFBRSxjQUFjLEVBQUUsQ0FBQztJQUNqQyxPQUFPLEVBQUUsT0FBTyxDQUFDO0lBQ2pCLGtCQUFrQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQzdCLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsV0FBVyxFQUFFLFdBQVcsQ0FBQztJQUN6QixZQUFZLEVBQUUsT0FBTyxDQUFDO0NBQ3ZCLEdBQ0EsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQTRCakI7QUFFRCx3QkFBZ0IsK0JBQStCLENBQzdDLEVBQUUsRUFBRSx3QkFBd0IsRUFDNUIsa0JBQWtCLEVBQUUsa0JBQWtCLEVBQ3RDLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLGNBQWMsRUFBRSxjQUFjLEVBQUUsR0FDL0Isd0JBQXdCLENBZ0IxQiJ9

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

@@ -1 +0,0 @@
-{"version":3,"file":"tx_validator_factory.d.ts","sourceRoot":"","sources":["../../src/tx_validator/tx_validator_factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAiB9D,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,EACxB,wBAAwB,EACzB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,6BAA6B,GAAG,SAAS,EACnD,EACE,SAAS,EACT,aAAa,EACb,cAAc,EACd,OAAO,EACP,kBAAkB,EAClB,SAAS,EACT,WAAW,EACX,YAAY,EACb,EAAE;IACD,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;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;CACvB,GACA,WAAW,CAAC,EAAE,CAAC,CA4BjB;AAED,wBAAgB,+BAA+B,CAC7C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,cAAc,EAAE,GAC/B,wBAAwB,CAgB1B"}

package/dest/tx_validator/tx_validator_factory.js

@@ -1,53 +0,0 @@
-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, TimestampTxValidator, TxPermittedValidator, TxProofValidator } from '@aztec/p2p';
-import { ProtocolContractAddress, protocolContractsHash } from '@aztec/protocol-contracts';
-import { DatabasePublicStateSource } from '@aztec/stdlib/trees';
-import { NullifierCache } from './nullifier_cache.js';
-export function createValidatorForAcceptingTxs(db, contractDataSource, verifier, { l1ChainId, rollupVersion, setupAllowList, gasFees, skipFeeEnforcement, timestamp, blockNumber, txsPermitted }) {
-    const validators = [
-        new TxPermittedValidator(txsPermitted),
-        new DataTxValidator(),
-        new MetadataTxValidator({
-            l1ChainId: new Fr(l1ChainId),
-            rollupVersion: new Fr(rollupVersion),
-            protocolContractsHash,
-            vkTreeRoot: getVKTreeRoot()
-        }),
-        new TimestampTxValidator({
-            timestamp,
-            blockNumber
-        }),
-        new DoubleSpendTxValidator(new NullifierCache(db)),
-        new PhasesTxValidator(contractDataSource, setupAllowList, timestamp),
-        new BlockHeaderTxValidator(new ArchiveCache(db))
-    ];
-    if (!skipFeeEnforcement) {
-        validators.push(new GasTxValidator(new DatabasePublicStateSource(db), ProtocolContractAddress.FeeJuice, gasFees));
-    }
-    if (verifier) {
-        validators.push(new TxProofValidator(verifier));
-    }
-    return new AggregateTxValidator(...validators);
-}
-export function createValidatorForBlockBuilding(db, contractDataSource, globalVariables, setupAllowList) {
-    const nullifierCache = new NullifierCache(db);
-    const archiveCache = new ArchiveCache(db);
-    const publicStateSource = new DatabasePublicStateSource(db);
-    return {
-        preprocessValidator: preprocessValidator(nullifierCache, archiveCache, publicStateSource, contractDataSource, globalVariables, setupAllowList),
-        nullifierCache
-    };
-}
-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({
-        l1ChainId: globalVariables.chainId,
-        rollupVersion: globalVariables.version,
-        protocolContractsHash,
-        vkTreeRoot: getVKTreeRoot()
-    }), new TimestampTxValidator({
-        timestamp: globalVariables.timestamp,
-        blockNumber: globalVariables.blockNumber
-    }), new DoubleSpendTxValidator(nullifierCache), new PhasesTxValidator(contractDataSource, setupAllowList, globalVariables.timestamp), new GasTxValidator(publicStateSource, ProtocolContractAddress.FeeJuice, globalVariables.gasFees), new BlockHeaderTxValidator(archiveCache));
-}

package/src/sequencer/block_builder.ts

@@ -1,222 +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/fields';
-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,
-  TelemetryCppPublicTxSimulator,
-} from '@aztec/simulator/server';
-import { PublicSimulatorConfig } from '@aztec/stdlib/avm';
-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 '../tx_validator/tx_validator_factory.js';
-
-const log = createLogger('block-builder');
-
-export 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',
-] as const;
-
-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 = new TelemetryCppPublicTxSimulator(
-      guardedFork,
-      contractsDB,
-      globalVariables,
-      this.telemetryClient,
-      PublicSimulatorConfig.from({
-        skipFeeEnforcement: false,
-        collectDebugLogs: false,
-        collectHints: false,
-        collectStatistics: false,
-        collectCallMetadata: false,
-      }),
-    );
-
-    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);
-  }
-}

package/src/tx_validator/nullifier_cache.ts

@@ -1,30 +0,0 @@
-import type { NullifierSource } from '@aztec/p2p';
-import type { MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server';
-import { MerkleTreeId } from '@aztec/stdlib/trees';
-
-/**
- * Implements a nullifier source by checking a DB and an in-memory collection.
- * Intended for validating transactions as they are added to a block.
- */
-export class NullifierCache implements NullifierSource {
-  nullifiers: Set<string>;
-
-  constructor(private db: MerkleTreeReadOperations) {
-    this.nullifiers = new Set();
-  }
-
-  public async nullifiersExist(nullifiers: Buffer[]): Promise<boolean[]> {
-    const cacheResults = nullifiers.map(n => this.nullifiers.has(n.toString()));
-    const toCheckDb = nullifiers.filter((_n, index) => !cacheResults[index]);
-    const dbHits = await this.db.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, toCheckDb);
-
-    let dbIndex = 0;
-    return nullifiers.map((_n, index) => cacheResults[index] || dbHits[dbIndex++] !== undefined);
-  }
-
-  public addNullifiers(nullifiers: Buffer[]) {
-    for (const nullifier of nullifiers) {
-      this.nullifiers.add(nullifier.toString());
-    }
-  }
-}

package/src/tx_validator/tx_validator_factory.ts

@@ -1,133 +0,0 @@
-import { BlockNumber } from '@aztec/foundation/branded-types';
-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,
-  TimestampTxValidator,
-  TxPermittedValidator,
-  TxProofValidator,
-} from '@aztec/p2p';
-import { ProtocolContractAddress, protocolContractsHash } from '@aztec/protocol-contracts';
-import type { ContractDataSource } from '@aztec/stdlib/contract';
-import type { GasFees } from '@aztec/stdlib/gas';
-import type {
-  AllowedElement,
-  ClientProtocolCircuitVerifier,
-  MerkleTreeReadOperations,
-  PublicProcessorValidator,
-} from '@aztec/stdlib/interfaces/server';
-import { DatabasePublicStateSource, type PublicStateSource } from '@aztec/stdlib/trees';
-import { GlobalVariables, type Tx, type TxValidator } from '@aztec/stdlib/tx';
-import type { UInt64 } from '@aztec/stdlib/types';
-
-import { NullifierCache } from './nullifier_cache.js';
-
-export function createValidatorForAcceptingTxs(
-  db: MerkleTreeReadOperations,
-  contractDataSource: ContractDataSource,
-  verifier: ClientProtocolCircuitVerifier | undefined,
-  {
-    l1ChainId,
-    rollupVersion,
-    setupAllowList,
-    gasFees,
-    skipFeeEnforcement,
-    timestamp,
-    blockNumber,
-    txsPermitted,
-  }: {
-    l1ChainId: number;
-    rollupVersion: number;
-    setupAllowList: AllowedElement[];
-    gasFees: GasFees;
-    skipFeeEnforcement?: boolean;
-    timestamp: UInt64;
-    blockNumber: BlockNumber;
-    txsPermitted: boolean;
-  },
-): TxValidator<Tx> {
-  const validators: TxValidator<Tx>[] = [
-    new TxPermittedValidator(txsPermitted),
-    new DataTxValidator(),
-    new MetadataTxValidator({
-      l1ChainId: new Fr(l1ChainId),
-      rollupVersion: new Fr(rollupVersion),
-      protocolContractsHash,
-      vkTreeRoot: getVKTreeRoot(),
-    }),
-    new TimestampTxValidator({
-      timestamp,
-      blockNumber,
-    }),
-    new DoubleSpendTxValidator(new NullifierCache(db)),
-    new PhasesTxValidator(contractDataSource, setupAllowList, timestamp),
-    new BlockHeaderTxValidator(new ArchiveCache(db)),
-  ];
-
-  if (!skipFeeEnforcement) {
-    validators.push(new GasTxValidator(new DatabasePublicStateSource(db), ProtocolContractAddress.FeeJuice, gasFees));
-  }
-
-  if (verifier) {
-    validators.push(new TxProofValidator(verifier));
-  }
-
-  return new AggregateTxValidator(...validators);
-}
-
-export function createValidatorForBlockBuilding(
-  db: MerkleTreeReadOperations,
-  contractDataSource: ContractDataSource,
-  globalVariables: GlobalVariables,
-  setupAllowList: AllowedElement[],
-): PublicProcessorValidator {
-  const nullifierCache = new NullifierCache(db);
-  const archiveCache = new ArchiveCache(db);
-  const publicStateSource = new DatabasePublicStateSource(db);
-
-  return {
-    preprocessValidator: preprocessValidator(
-      nullifierCache,
-      archiveCache,
-      publicStateSource,
-      contractDataSource,
-      globalVariables,
-      setupAllowList,
-    ),
-    nullifierCache,
-  };
-}
-
-function preprocessValidator(
-  nullifierCache: NullifierCache,
-  archiveCache: ArchiveCache,
-  publicStateSource: PublicStateSource,
-  contractDataSource: ContractDataSource,
-  globalVariables: GlobalVariables,
-  setupAllowList: AllowedElement[],
-): TxValidator<Tx> {
-  // 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({
-      l1ChainId: globalVariables.chainId,
-      rollupVersion: globalVariables.version,
-      protocolContractsHash,
-      vkTreeRoot: getVKTreeRoot(),
-    }),
-    new TimestampTxValidator({
-      timestamp: globalVariables.timestamp,
-      blockNumber: globalVariables.blockNumber,
-    }),
-    new DoubleSpendTxValidator(nullifierCache),
-    new PhasesTxValidator(contractDataSource, setupAllowList, globalVariables.timestamp),
-    new GasTxValidator(publicStateSource, ProtocolContractAddress.FeeJuice, globalVariables.gasFees),
-    new BlockHeaderTxValidator(archiveCache),
-  );
-}