@aztec/validator-client 0.87.5 → 0.87.7

package/dest/validator.d.ts

@@ -2,7 +2,7 @@ import type { EpochCache } from '@aztec/epoch-cache';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { DateProvider, type Timer } from '@aztec/foundation/timer';
-import type { P2P } from '@aztec/p2p';
+import { type P2P, type PeerId } from '@aztec/p2p';
 import type { L2Block, L2BlockSource } from '@aztec/stdlib/block';
 import type { BlockAttestation, BlockProposal, BlockProposalOptions } from '@aztec/stdlib/p2p';
 import type { ProposedBlockHeader, StateReference, Tx } from '@aztec/stdlib/tx';
@@ -28,7 +28,7 @@ export interface Validator {
     registerBlockProposalHandler(): void;
     registerBlockBuilder(blockBuilder: BlockBuilderCallback): void;
     createBlockProposal(blockNumber: Fr, header: ProposedBlockHeader, archive: Fr, stateReference: StateReference, txs: Tx[], options: BlockProposalOptions): Promise<BlockProposal | undefined>;
-    attestToProposal(proposal: BlockProposal): Promise<BlockAttestation | undefined>;
+    attestToProposal(proposal: BlockProposal, sender: PeerId): Promise<BlockAttestation | undefined>;
     broadcastBlockProposal(proposal: BlockProposal): Promise<void>;
     collectAttestations(proposal: BlockProposal, required: number, deadline: Date): Promise<BlockAttestation[]>;
 }
@@ -51,6 +51,7 @@ export declare class ValidatorClient extends WithTracer implements Validator {
     private lastEpoch;
     private epochCacheUpdateLoop;
     private blockProposalValidator;
+    private txCollector;
     constructor(keyStore: ValidatorKeyStore, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource, config: ValidatorClientConfig, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
     private handleEpochCommitteeUpdate;
     static new(config: ValidatorClientConfig, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource, dateProvider?: DateProvider, telemetry?: TelemetryClient): ValidatorClient;
@@ -64,21 +65,12 @@ export declare class ValidatorClient extends WithTracer implements Validator {
      * We reuse the sequencer's block building functionality for re-execution
      */
     registerBlockBuilder(blockBuilder: BlockBuilderCallback): void;
-    attestToProposal(proposal: BlockProposal): Promise<BlockAttestation | undefined>;
+    attestToProposal(proposal: BlockProposal, proposalSender: PeerId): Promise<BlockAttestation | undefined>;
     /**
      * Re-execute the transactions in the proposal and check that the state updates match the header state
      * @param proposal - The proposal to re-execute
      */
     reExecuteTransactions(proposal: BlockProposal, txs: Tx[]): Promise<void>;
-    /**
-     * Ensure that all of the transactions in the proposal are available in the tx pool before attesting
-     *
-     * 1. Check if the local tx pool contains all of the transactions in the proposal
-     * 2. If any transactions are not in the local tx pool, request them from the network
-     * 3. If we cannot retrieve them from the network, throw an error
-     * @param proposal - The proposal to attest to
-     */
-    ensureTransactionsAreAvailable(proposal: BlockProposal): Promise<Tx[]>;
     createBlockProposal(blockNumber: Fr, header: ProposedBlockHeader, archive: Fr, stateReference: StateReference, txs: Tx[], options: BlockProposalOptions): Promise<BlockProposal | undefined>;
     broadcastBlockProposal(proposal: BlockProposal): Promise<void>;
     collectAttestations(proposal: BlockProposal, required: number, deadline: Date): Promise<BlockAttestation[]>;

package/dest/validator.d.ts.map

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

package/dest/validator.js

@@ -4,6 +4,7 @@ import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { sleep } from '@aztec/foundation/sleep';
 import { DateProvider } from '@aztec/foundation/timer';
+import { TxCollector } from '@aztec/p2p';
 import { BlockProposalValidator } from '@aztec/p2p/msg_validators';
 import { WithTracer, getTelemetryClient } from '@aztec/telemetry-client';
 import { ValidationService } from './duties/validation_service.js';
@@ -30,12 +31,14 @@ import { ValidatorMetrics } from './metrics.js';
     lastEpoch;
     epochCacheUpdateLoop;
     blockProposalValidator;
+    txCollector;
     constructor(keyStore, epochCache, p2pClient, blockSource, config, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator')){
         // Instantiate tracer
         super(telemetry, 'Validator'), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.blockSource = blockSource, this.config = config, this.dateProvider = dateProvider, this.log = log, this.blockBuilder = undefined;
         this.metrics = new ValidatorMetrics(telemetry);
         this.validationService = new ValidationService(keyStore);
         this.blockProposalValidator = new BlockProposalValidator(epochCache);
+        this.txCollector = new TxCollector(p2pClient, this.log);
         // Refresh epoch cache every second to trigger alert if participation in committee changes
         this.myAddress = this.keyStore.getAddress();
         this.epochCacheUpdateLoop = new RunningPromise(this.handleEpochCommitteeUpdate.bind(this), log, 1000);
@@ -87,8 +90,8 @@ import { ValidatorMetrics } from './metrics.js';
         await this.epochCacheUpdateLoop.stop();
     }
     registerBlockProposalHandler() {
-        const handler = (block)=>{
-            return this.attestToProposal(block);
+        const handler = (block, proposalSender)=>{
+            return this.attestToProposal(block, proposalSender);
         };
         this.p2pClient.registerBlockProposalHandler(handler);
     }
@@ -99,7 +102,7 @@ import { ValidatorMetrics } from './metrics.js';
    */ registerBlockBuilder(blockBuilder) {
         this.blockBuilder = blockBuilder;
     }
-    async attestToProposal(proposal) {
+    async attestToProposal(proposal, proposalSender) {
         const slotNumber = proposal.slotNumber.toNumber();
         const blockNumber = proposal.blockNumber.toNumber();
         const proposalInfo = {
@@ -110,12 +113,8 @@ import { ValidatorMetrics } from './metrics.js';
             txHashes: proposal.payload.txHashes.map((txHash)=>txHash.toString())
         };
         this.log.verbose(`Received request to attest for slot ${slotNumber}`);
-        // Check that I am in the committee
-        if (!await this.epochCache.isInCommittee(this.keyStore.getAddress())) {
-            this.log.verbose(`Not in the committee, skipping attestation`);
-            return undefined;
-        }
         // Check that the proposal is from the current proposer, or the next proposer.
+        // Q: Should this be moved to the block proposal validator, so we disregard proposals from anyone?
         const invalidProposal = await this.blockProposalValidator.validate(proposal);
         if (invalidProposal) {
             this.log.verbose(`Proposal is not valid, skipping attestation`);
@@ -144,30 +143,37 @@ import { ValidatorMetrics } from './metrics.js';
                 return undefined;
             }
         }
+        // Collect txs from the proposal
+        const { missing, txs } = await this.txCollector.collectForBlockProposal(proposal, proposalSender);
+        // Check that I am in the committee before attesting
+        if (!await this.epochCache.isInCommittee(this.keyStore.getAddress())) {
+            this.log.verbose(`Not in the committee, skipping attestation`);
+            return undefined;
+        }
         // Check that all of the transactions in the proposal are available in the tx pool before attesting
-        this.log.verbose(`Processing attestation for slot ${slotNumber}`, proposalInfo);
+        if (missing && missing.length > 0) {
+            this.log.error(`Missing ${missing.length}/${proposal.payload.txHashes.length} txs to attest to proposal`, undefined, {
+                proposalInfo,
+                missing
+            });
+            this.metrics.incFailedAttestations('TransactionsNotAvailableError');
+            return undefined;
+        }
+        // Try re-executing the transactions in the proposal
         try {
-            const txs = await this.ensureTransactionsAreAvailable(proposal);
+            this.log.verbose(`Processing attestation for slot ${slotNumber}`, proposalInfo);
             if (this.config.validatorReexecute) {
                 this.log.verbose(`Re-executing transactions in the proposal before attesting`);
                 await this.reExecuteTransactions(proposal, txs);
             }
         } catch (error) {
             this.metrics.incFailedAttestations(error instanceof Error ? error.name : 'unknown');
-            // If the transactions are not available, then we should not attempt to attest
-            if (error instanceof TransactionsNotAvailableError) {
-                this.log.error(`Transactions not available, skipping attestation`, error, proposalInfo);
-            } else {
-                // This branch most commonly be hit if the transactions are available, but the re-execution fails
-                // Catch all error handler
-                this.log.error(`Failed to attest to proposal`, error, proposalInfo);
-            }
+            this.log.error(`Failed to attest to proposal`, error, proposalInfo);
             return undefined;
         }
         // Provided all of the above checks pass, we can attest to the proposal
         this.log.info(`Attesting to proposal for slot ${slotNumber}`, proposalInfo);
         this.metrics.incAttestations();
-        // If the above function does not throw an error, then we can attest to the proposal
         return this.doAttestToProposal(proposal);
     }
     /**
@@ -206,79 +212,6 @@ import { ValidatorMetrics } from './metrics.js';
             throw new ReExStateMismatchError();
         }
     }
-    /**
-   * Ensure that all of the transactions in the proposal are available in the tx pool before attesting
-   *
-   * 1. Check if the local tx pool contains all of the transactions in the proposal
-   * 2. If any transactions are not in the local tx pool, request them from the network
-   * 3. If we cannot retrieve them from the network, throw an error
-   * @param proposal - The proposal to attest to
-   */ async ensureTransactionsAreAvailable(proposal) {
-        if (proposal.payload.txHashes.length === 0) {
-            this.log.verbose(`Received block proposal with no transactions, skipping transaction availability check`);
-            return [];
-        }
-        // Is this a new style proposal?
-        if (proposal.txs && proposal.txs.length > 0 && proposal.txs.length === proposal.payload.txHashes.length) {
-            // Yes, any txs that we already have we should use
-            this.log.info(`Using new style proposal with ${proposal.txs.length} transactions`);
-            // Request from the pool based on the signed hashes in the payload
-            const hashesFromPayload = proposal.payload.txHashes;
-            const txsToUse = await this.p2pClient.getTxsByHashFromPool(hashesFromPayload);
-            const missingTxs = txsToUse.filter((tx)=>tx === undefined).length;
-            if (missingTxs > 0) {
-                this.log.verbose(`Missing ${missingTxs}/${hashesFromPayload.length} transactions in the tx pool, will attempt to take from the proposal`);
-            }
-            let usedFromProposal = 0;
-            // Fill any holes with txs in the proposal, provided their hash matches the hash in the payload
-            for(let i = 0; i < txsToUse.length; i++){
-                if (txsToUse[i] === undefined) {
-                    // We don't have the transaction, take from the proposal, provided the hash is the same
-                    const hashOfTxInProposal = await proposal.txs[i].getTxHash();
-                    if (hashOfTxInProposal.equals(hashesFromPayload[i])) {
-                        // Hash is equal, we can use the tx from the proposal
-                        txsToUse[i] = proposal.txs[i];
-                        usedFromProposal++;
-                    } else {
-                        this.log.warn(`Unable to take tx: ${hashOfTxInProposal.toString()} from the proposal, it does not match payload hash: ${hashesFromPayload[i].toString()}`);
-                    }
-                }
-            }
-            // See if we still have any holes, if there are then we were not successful and will try the old method
-            if (txsToUse.some((tx)=>tx === undefined)) {
-                this.log.warn(`Failed to use transactions from proposal. Falling back to old proposal logic`);
-            } else {
-                this.log.info(`Successfully used ${usedFromProposal}/${hashesFromPayload.length} transactions from the proposal`);
-                await this.p2pClient.validate(txsToUse);
-                return txsToUse;
-            }
-        }
-        this.log.info(`Using old style proposal with ${proposal.payload.txHashes.length} transactions`);
-        // Old style proposal, we will perform a request by hash from pool
-        // This will request from network any txs that are missing
-        const txHashes = proposal.payload.txHashes;
-        // This part is just for logging that we are requesting from the network
-        const availability = await this.p2pClient.hasTxsInPool(txHashes);
-        const notAvailable = availability.filter((availability)=>availability === false);
-        if (notAvailable.length) {
-            this.log.verbose(`Missing ${notAvailable.length} transactions in the tx pool, will need to request from the network`);
-        }
-        // This will request from the network any txs that are missing
-        const retrievedTxs = await this.p2pClient.getTxsByHash(txHashes);
-        const missingTxs = retrievedTxs.map((tx, index)=>{
-            // Return the hash of any that we did not get
-            if (tx === undefined) {
-                return txHashes[index];
-            } else {
-                return undefined;
-            }
-        }).filter((hash)=>hash !== undefined);
-        if (missingTxs.length > 0) {
-            throw new TransactionsNotAvailableError(missingTxs);
-        }
-        await this.p2pClient.validate(retrievedTxs);
-        return retrievedTxs;
-    }
     async createBlockProposal(blockNumber, header, archive, stateReference, txs, options) {
         if (this.previousProposal?.slotNumber.equals(header.slotNumber)) {
             this.log.verbose(`Already made a proposal for the same slot, skipping proposal`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/validator-client",
-  "version": "0.87.5",
+  "version": "0.87.7",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
@@ -60,13 +60,13 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.87.5",
-    "@aztec/epoch-cache": "0.87.5",
-    "@aztec/ethereum": "0.87.5",
-    "@aztec/foundation": "0.87.5",
-    "@aztec/p2p": "0.87.5",
-    "@aztec/stdlib": "0.87.5",
-    "@aztec/telemetry-client": "0.87.5",
+    "@aztec/constants": "0.87.7",
+    "@aztec/epoch-cache": "0.87.7",
+    "@aztec/ethereum": "0.87.7",
+    "@aztec/foundation": "0.87.7",
+    "@aztec/p2p": "0.87.7",
+    "@aztec/stdlib": "0.87.7",
+    "@aztec/telemetry-client": "0.87.7",
     "koa": "^2.16.1",
     "koa-router": "^12.0.0",
     "tslib": "^2.4.0",

package/src/validator.ts

@@ -7,11 +7,11 @@ import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { sleep } from '@aztec/foundation/sleep';
 import { DateProvider, type Timer } from '@aztec/foundation/timer';
-import type { P2P } from '@aztec/p2p';
+import { type P2P, type PeerId, TxCollector } from '@aztec/p2p';
 import { BlockProposalValidator } from '@aztec/p2p/msg_validators';
 import type { L2Block, L2BlockSource } from '@aztec/stdlib/block';
 import type { BlockAttestation, BlockProposal, BlockProposalOptions } from '@aztec/stdlib/p2p';
-import type { ProposedBlockHeader, StateReference, Tx, TxHash } from '@aztec/stdlib/tx';
+import type { ProposedBlockHeader, StateReference, Tx } from '@aztec/stdlib/tx';
 import { type TelemetryClient, WithTracer, getTelemetryClient } from '@aztec/telemetry-client';
 
 import type { ValidatorClientConfig } from './config.js';
@@ -61,7 +61,7 @@ export interface Validator {
     txs: Tx[],
     options: BlockProposalOptions,
   ): Promise<BlockProposal | undefined>;
-  attestToProposal(proposal: BlockProposal): Promise<BlockAttestation | undefined>;
+  attestToProposal(proposal: BlockProposal, sender: PeerId): Promise<BlockAttestation | undefined>;
 
   broadcastBlockProposal(proposal: BlockProposal): Promise<void>;
   collectAttestations(proposal: BlockProposal, required: number, deadline: Date): Promise<BlockAttestation[]>;
@@ -85,6 +85,7 @@ export class ValidatorClient extends WithTracer implements Validator {
   private epochCacheUpdateLoop: RunningPromise;
 
   private blockProposalValidator: BlockProposalValidator;
+  private txCollector: TxCollector;
 
   constructor(
     private keyStore: ValidatorKeyStore,
@@ -104,6 +105,8 @@ export class ValidatorClient extends WithTracer implements Validator {
 
     this.blockProposalValidator = new BlockProposalValidator(epochCache);
 
+    this.txCollector = new TxCollector(p2pClient, this.log);
+
     // Refresh epoch cache every second to trigger alert if participation in committee changes
     this.myAddress = this.keyStore.getAddress();
     this.epochCacheUpdateLoop = new RunningPromise(this.handleEpochCommitteeUpdate.bind(this), log, 1000);
@@ -180,8 +183,8 @@ export class ValidatorClient extends WithTracer implements Validator {
   }
 
   public registerBlockProposalHandler() {
-    const handler = (block: BlockProposal): Promise<BlockAttestation | undefined> => {
-      return this.attestToProposal(block);
+    const handler = (block: BlockProposal, proposalSender: any): Promise<BlockAttestation | undefined> => {
+      return this.attestToProposal(block, proposalSender);
     };
     this.p2pClient.registerBlockProposalHandler(handler);
   }
@@ -195,7 +198,7 @@ export class ValidatorClient extends WithTracer implements Validator {
     this.blockBuilder = blockBuilder;
   }
 
-  async attestToProposal(proposal: BlockProposal): Promise<BlockAttestation | undefined> {
+  async attestToProposal(proposal: BlockProposal, proposalSender: PeerId): Promise<BlockAttestation | undefined> {
     const slotNumber = proposal.slotNumber.toNumber();
     const blockNumber = proposal.blockNumber.toNumber();
     const proposalInfo = {
@@ -207,13 +210,8 @@ export class ValidatorClient extends WithTracer implements Validator {
     };
     this.log.verbose(`Received request to attest for slot ${slotNumber}`);
 
-    // Check that I am in the committee
-    if (!(await this.epochCache.isInCommittee(this.keyStore.getAddress()))) {
-      this.log.verbose(`Not in the committee, skipping attestation`);
-      return undefined;
-    }
-
     // Check that the proposal is from the current proposer, or the next proposer.
+    // Q: Should this be moved to the block proposal validator, so we disregard proposals from anyone?
     const invalidProposal = await this.blockProposalValidator.validate(proposal);
     if (invalidProposal) {
       this.log.verbose(`Proposal is not valid, skipping attestation`);
@@ -244,34 +242,42 @@ export class ValidatorClient extends WithTracer implements Validator {
       }
     }
 
+    // Collect txs from the proposal
+    const { missing, txs } = await this.txCollector.collectForBlockProposal(proposal, proposalSender);
+
+    // Check that I am in the committee before attesting
+    if (!(await this.epochCache.isInCommittee(this.keyStore.getAddress()))) {
+      this.log.verbose(`Not in the committee, skipping attestation`);
+      return undefined;
+    }
+
     // Check that all of the transactions in the proposal are available in the tx pool before attesting
-    this.log.verbose(`Processing attestation for slot ${slotNumber}`, proposalInfo);
-    try {
-      const txs = await this.ensureTransactionsAreAvailable(proposal);
+    if (missing && missing.length > 0) {
+      this.log.error(
+        `Missing ${missing.length}/${proposal.payload.txHashes.length} txs to attest to proposal`,
+        undefined,
+        { proposalInfo, missing },
+      );
+      this.metrics.incFailedAttestations('TransactionsNotAvailableError');
+      return undefined;
+    }
 
+    // Try re-executing the transactions in the proposal
+    try {
+      this.log.verbose(`Processing attestation for slot ${slotNumber}`, proposalInfo);
       if (this.config.validatorReexecute) {
         this.log.verbose(`Re-executing transactions in the proposal before attesting`);
         await this.reExecuteTransactions(proposal, txs);
       }
     } catch (error: any) {
       this.metrics.incFailedAttestations(error instanceof Error ? error.name : 'unknown');
-
-      // If the transactions are not available, then we should not attempt to attest
-      if (error instanceof TransactionsNotAvailableError) {
-        this.log.error(`Transactions not available, skipping attestation`, error, proposalInfo);
-      } else {
-        // This branch most commonly be hit if the transactions are available, but the re-execution fails
-        // Catch all error handler
-        this.log.error(`Failed to attest to proposal`, error, proposalInfo);
-      }
+      this.log.error(`Failed to attest to proposal`, error, proposalInfo);
       return undefined;
     }
 
     // Provided all of the above checks pass, we can attest to the proposal
     this.log.info(`Attesting to proposal for slot ${slotNumber}`, proposalInfo);
     this.metrics.incAttestations();
-
-    // If the above function does not throw an error, then we can attest to the proposal
     return this.doAttestToProposal(proposal);
   }
 
@@ -320,105 +326,6 @@ export class ValidatorClient extends WithTracer implements Validator {
     }
   }
 
-  /**
-   * Ensure that all of the transactions in the proposal are available in the tx pool before attesting
-   *
-   * 1. Check if the local tx pool contains all of the transactions in the proposal
-   * 2. If any transactions are not in the local tx pool, request them from the network
-   * 3. If we cannot retrieve them from the network, throw an error
-   * @param proposal - The proposal to attest to
-   */
-  async ensureTransactionsAreAvailable(proposal: BlockProposal): Promise<Tx[]> {
-    if (proposal.payload.txHashes.length === 0) {
-      this.log.verbose(`Received block proposal with no transactions, skipping transaction availability check`);
-      return [];
-    }
-    // Is this a new style proposal?
-    if (proposal.txs && proposal.txs.length > 0 && proposal.txs.length === proposal.payload.txHashes.length) {
-      // Yes, any txs that we already have we should use
-      this.log.info(`Using new style proposal with ${proposal.txs.length} transactions`);
-
-      // Request from the pool based on the signed hashes in the payload
-      const hashesFromPayload = proposal.payload.txHashes;
-      const txsToUse = await this.p2pClient.getTxsByHashFromPool(hashesFromPayload);
-
-      const missingTxs = txsToUse.filter(tx => tx === undefined).length;
-      if (missingTxs > 0) {
-        this.log.verbose(
-          `Missing ${missingTxs}/${hashesFromPayload.length} transactions in the tx pool, will attempt to take from the proposal`,
-        );
-      }
-
-      let usedFromProposal = 0;
-
-      // Fill any holes with txs in the proposal, provided their hash matches the hash in the payload
-      for (let i = 0; i < txsToUse.length; i++) {
-        if (txsToUse[i] === undefined) {
-          // We don't have the transaction, take from the proposal, provided the hash is the same
-          const hashOfTxInProposal = await proposal.txs[i].getTxHash();
-          if (hashOfTxInProposal.equals(hashesFromPayload[i])) {
-            // Hash is equal, we can use the tx from the proposal
-            txsToUse[i] = proposal.txs[i];
-            usedFromProposal++;
-          } else {
-            this.log.warn(
-              `Unable to take tx: ${hashOfTxInProposal.toString()} from the proposal, it does not match payload hash: ${hashesFromPayload[
-                i
-              ].toString()}`,
-            );
-          }
-        }
-      }
-
-      // See if we still have any holes, if there are then we were not successful and will try the old method
-      if (txsToUse.some(tx => tx === undefined)) {
-        this.log.warn(`Failed to use transactions from proposal. Falling back to old proposal logic`);
-      } else {
-        this.log.info(
-          `Successfully used ${usedFromProposal}/${hashesFromPayload.length} transactions from the proposal`,
-        );
-
-        await this.p2pClient.validate(txsToUse as Tx[]);
-        return txsToUse as Tx[];
-      }
-    }
-
-    this.log.info(`Using old style proposal with ${proposal.payload.txHashes.length} transactions`);
-
-    // Old style proposal, we will perform a request by hash from pool
-    // This will request from network any txs that are missing
-    const txHashes: TxHash[] = proposal.payload.txHashes;
-
-    // This part is just for logging that we are requesting from the network
-    const availability = await this.p2pClient.hasTxsInPool(txHashes);
-    const notAvailable = availability.filter(availability => availability === false);
-    if (notAvailable.length) {
-      this.log.verbose(
-        `Missing ${notAvailable.length} transactions in the tx pool, will need to request from the network`,
-      );
-    }
-
-    // This will request from the network any txs that are missing
-    const retrievedTxs = await this.p2pClient.getTxsByHash(txHashes);
-    const missingTxs = retrievedTxs
-      .map((tx, index) => {
-        // Return the hash of any that we did not get
-        if (tx === undefined) {
-          return txHashes[index];
-        } else {
-          return undefined;
-        }
-      })
-      .filter(hash => hash !== undefined);
-    if (missingTxs.length > 0) {
-      throw new TransactionsNotAvailableError(missingTxs as TxHash[]);
-    }
-
-    await this.p2pClient.validate(retrievedTxs as Tx[]);
-
-    return retrievedTxs as Tx[];
-  }
-
   async createBlockProposal(
     blockNumber: Fr,
     header: ProposedBlockHeader,