@aztec/sequencer-client 0.0.1-commit.9593d84 → 0.0.1-commit.96bb3f7

package/src/test/utils.ts

@@ -0,0 +1,157 @@
+import { Body } from '@aztec/aztec.js/block';
+import { CheckpointNumber } 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';
+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 { BlockProposal, CheckpointAttestation, CheckpointProposal, ConsensusPayload } from '@aztec/stdlib/p2p';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
+import { makeAppendOnlyTreeSnapshot, mockTxForRollup } from '@aztec/stdlib/testing';
+import { BlockHeader, GlobalVariables, type Tx, makeProcessedTxFromPrivateOnlyTx } from '@aztec/stdlib/tx';
+
+import type { MockProxy } from 'jest-mock-extended';
+
+// Re-export mock classes from their dedicated file
+export { MockCheckpointBuilder, MockCheckpointsBuilder } from './mock_checkpoint_builder.js';
+
+/**
+ * Creates a mock transaction with a specific seed for deterministic testing
+ */
+export async function makeTx(seed?: number, chainId?: Fr): Promise<Tx> {
+  const tx = await mockTxForRollup(seed);
+  if (chainId) {
+    tx.data.constants.txContext.chainId = chainId;
+  }
+  return tx;
+}
+
+/**
+ * Creates an L2BlockNew from transactions and global variables
+ */
+export async function makeBlock(txs: Tx[], globalVariables: GlobalVariables): Promise<L2BlockNew> {
+  const processedTxs = await Promise.all(
+    txs.map(tx =>
+      makeProcessedTxFromPrivateOnlyTx(tx, Fr.ZERO, new PublicDataWrite(Fr.random(), Fr.random()), globalVariables),
+    ),
+  );
+  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);
+}
+
+/**
+ * Mocks the P2P client to return specific pending transactions
+ */
+export function mockPendingTxs(p2p: MockProxy<P2P>, txs: Tx[]): void {
+  p2p.getPendingTxCount.mockResolvedValue(txs.length);
+  p2p.iteratePendingTxs.mockImplementation(() => mockTxIterator(Promise.resolve(txs)));
+}
+
+/**
+ * Creates an async iterator for transactions
+ */
+export async function* mockTxIterator(txs: Promise<Tx[]>): AsyncIterableIterator<Tx> {
+  for (const tx of await txs) {
+    yield tx;
+  }
+}
+
+/**
+ * Creates mock committee attestations from a signer
+ */
+export function createMockSignatures(signer: Secp256k1Signer): CommitteeAttestation[] {
+  const mockedSig = Signature.random();
+  return [new CommitteeAttestation(signer.address, mockedSig)];
+}
+
+/**
+ * Creates a CheckpointHeader from an L2BlockNew for testing purposes.
+ * Uses mock values for blockHeadersHash, blobsHash and inHash since L2BlockNew doesn't have these fields.
+ */
+function createCheckpointHeaderFromBlock(block: L2BlockNew): 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
+    gv.slotNumber,
+    gv.timestamp,
+    gv.coinbase,
+    gv.feeRecipient,
+    gv.gasFees,
+    block.header.totalManaUsed,
+  );
+}
+
+/**
+ * Creates a block proposal from a block and signature
+ */
+export function createBlockProposal(block: L2BlockNew, signature: Signature): BlockProposal {
+  const txHashes = block.body.txEffects.map(tx => tx.txHash);
+  return new BlockProposal(
+    block.header,
+    block.indexWithinCheckpoint,
+    Fr.ZERO, // inHash - using zero for testing
+    block.archive.root,
+    txHashes,
+    signature,
+  );
+}
+
+/**
+ * Creates a checkpoint proposal from a block and signature
+ */
+export function createCheckpointProposal(
+  block: L2BlockNew,
+  checkpointSignature: Signature,
+  blockSignature?: Signature,
+): 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
+  });
+}
+
+/**
+ * Creates a checkpoint attestation from a block and signature.
+ * Note: We manually set the sender since we use random signatures in tests.
+ * In production, the sender is recovered from the signature.
+ */
+export function createCheckpointAttestation(
+  block: L2BlockNew,
+  signature: Signature,
+  sender: EthAddress,
+): CheckpointAttestation {
+  const checkpointHeader = createCheckpointHeaderFromBlock(block);
+  const payload = new ConsensusPayload(checkpointHeader, block.archive.root);
+  const attestation = new CheckpointAttestation(payload, signature, signature);
+  // Set sender directly for testing (bypasses signature recovery)
+  (attestation as any).sender = sender;
+  return attestation;
+}
+
+/**
+ * Creates transactions and a block, and mocks P2P to return them.
+ * Helper for tests that need to set up a block with transactions.
+ */
+export async function setupTxsAndBlock(
+  p2p: MockProxy<P2P>,
+  globalVariables: GlobalVariables,
+  txCount: number,
+  chainId: Fr,
+): Promise<{ txs: Tx[]; block: L2BlockNew }> {
+  const txs = await Promise.all(times(txCount, i => makeTx(i + 1, chainId)));
+  const block = await makeBlock(txs, globalVariables);
+  mockPendingTxs(p2p, txs);
+  return { txs, block };
+}

package/dest/tx_validator/nullifier_cache.d.ts

@@ -1,14 +0,0 @@
-import type { NullifierSource } from '@aztec/p2p';
-import type { MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server';
-/**
- * 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 declare class NullifierCache implements NullifierSource {
-    private db;
-    nullifiers: Set<string>;
-    constructor(db: MerkleTreeReadOperations);
-    nullifiersExist(nullifiers: Buffer[]): Promise<boolean[]>;
-    addNullifiers(nullifiers: Buffer[]): void;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnVsbGlmaWVyX2NhY2hlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHhfdmFsaWRhdG9yL251bGxpZmllcl9jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDbEQsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUdoRjs7O0dBR0c7QUFDSCxxQkFBYSxjQUFlLFlBQVcsZUFBZTtJQUd4QyxPQUFPLENBQUMsRUFBRTtJQUZ0QixVQUFVLEVBQUUsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRXhCLFlBQW9CLEVBQUUsRUFBRSx3QkFBd0IsRUFFL0M7SUFFWSxlQUFlLENBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQU9yRTtJQUVNLGFBQWEsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLFFBSXhDO0NBQ0YifQ==

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

@@ -1 +0,0 @@
-{"version":3,"file":"nullifier_cache.d.ts","sourceRoot":"","sources":["../../src/tx_validator/nullifier_cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAGhF;;;GAGG;AACH,qBAAa,cAAe,YAAW,eAAe;IAGxC,OAAO,CAAC,EAAE;IAFtB,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAExB,YAAoB,EAAE,EAAE,wBAAwB,EAE/C;IAEY,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAOrE;IAEM,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,QAIxC;CACF"}

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,17 +0,0 @@
-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: number;
-    txsPermitted: boolean;
-}): TxValidator<Tx>;
-export declare function createValidatorForBlockBuilding(db: MerkleTreeReadOperations, contractDataSource: ContractDataSource, globalVariables: GlobalVariables, setupAllowList: AllowedElement[]): PublicProcessorValidator;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfdmFsaWRhdG9yX2ZhY3RvcnkuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eF92YWxpZGF0b3IvdHhfdmFsaWRhdG9yX2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBZ0JBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDakQsT0FBTyxLQUFLLEVBQ1YsY0FBYyxFQUNkLDZCQUE2QixFQUM3Qix3QkFBd0IsRUFDeEIsd0JBQXdCLEVBQ3pCLE1BQU0saUNBQWlDLENBQUM7QUFFekMsT0FBTyxFQUFFLGVBQWUsRUFBRSxLQUFLLEVBQUUsRUFBRSxLQUFLLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBSWxELHdCQUFnQiw4QkFBOEIsQ0FDNUMsRUFBRSxFQUFFLHdCQUF3QixFQUM1QixrQkFBa0IsRUFBRSxrQkFBa0IsRUFDdEMsUUFBUSxFQUFFLDZCQUE2QixHQUFHLFNBQVMsRUFDbkQsRUFDRSxTQUFTLEVBQ1QsYUFBYSxFQUNiLGNBQWMsRUFDZCxPQUFPLEVBQ1Asa0JBQWtCLEVBQ2xCLFNBQVMsRUFDVCxXQUFXLEVBQ1gsWUFBWSxFQUNiLEVBQUU7SUFDRCxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFDdEIsY0FBYyxFQUFFLGNBQWMsRUFBRSxDQUFDO0lBQ2pDLE9BQU8sRUFBRSxPQUFPLENBQUM7SUFDakIsa0JBQWtCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDN0IsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixXQUFXLEVBQUUsTUFBTSxDQUFDO0lBQ3BCLFlBQVksRUFBRSxPQUFPLENBQUM7Q0FDdkIsR0FDQSxXQUFXLENBQUMsRUFBRSxDQUFDLENBNEJqQjtBQUVELHdCQUFnQiwrQkFBK0IsQ0FDN0MsRUFBRSxFQUFFLHdCQUF3QixFQUM1QixrQkFBa0IsRUFBRSxrQkFBa0IsRUFDdEMsZUFBZSxFQUFFLGVBQWUsRUFDaEMsY0FBYyxFQUFFLGNBQWMsRUFBRSxHQUMvQix3QkFBd0IsQ0FnQjFCIn0=

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":"AAgBA,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,MAAM,CAAC;IACpB,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/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,132 +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 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: number;
-    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),
-  );
-}