@aztec/p2p 0.85.0 → 0.86.0

package/dest/test-helpers/make-test-p2p-clients.js

@@ -1,5 +1,6 @@
 import { MockL2BlockSource } from '@aztec/archiver/test';
 import { createLogger } from '@aztec/foundation/log';
+import { sleep } from '@aztec/foundation/sleep';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import { P2PClientType } from '@aztec/stdlib/p2p';
 import { createP2PClient } from '../client/index.js';
@@ -21,6 +22,7 @@ import { AlwaysFalseCircuitVerifier, AlwaysTrueCircuitVerifier } from './reqresp
         p2pEnabled: true,
         peerIdPrivateKey,
         p2pIp: `127.0.0.1`,
+        listenAddress: `127.0.0.1`,
         p2pPort: port,
         bootstrapNodes: peers,
         peerCheckIntervalMS: 1000,
@@ -50,7 +52,15 @@ import { AlwaysFalseCircuitVerifier, AlwaysTrueCircuitVerifier } from './reqresp
  */ export async function makeTestP2PClients(numberOfPeers, testConfig) {
     const clients = [];
     const peerIdPrivateKeys = generatePeerIdPrivateKeys(numberOfPeers);
-    const ports = await getPorts(numberOfPeers);
+    let ports = [];
+    while(true){
+        try {
+            ports = await getPorts(numberOfPeers);
+            break;
+        } catch (err) {
+            await sleep(1000);
+        }
+    }
     const peerEnrs = await makeEnrs(peerIdPrivateKeys, ports, testConfig.p2pBaseConfig);
     for(let i = 0; i < numberOfPeers; i++){
         const client = await makeTestP2PClient(peerIdPrivateKeys[i], ports[i], peerEnrs, {
@@ -60,5 +70,12 @@ import { AlwaysFalseCircuitVerifier, AlwaysTrueCircuitVerifier } from './reqresp
         clients.push(client);
     }
     await Promise.all(clients.map((client)=>client.isReady()));
-    return clients;
+    return clients.map((client, index)=>{
+        return {
+            client,
+            peerPrivateKey: peerIdPrivateKeys[index],
+            port: ports[index],
+            enr: peerEnrs[index]
+        };
+    });
 }

package/dest/testbench/p2p_client_testbench_worker.js

@@ -28,7 +28,10 @@ function mockTxPool() {
         getAllTxHashes: ()=>Promise.resolve([]),
         getPendingTxHashes: ()=>Promise.resolve([]),
         getMinedTxHashes: ()=>Promise.resolve([]),
-        getTxStatus: ()=>Promise.resolve(TxStatus.PENDING)
+        getTxStatus: ()=>Promise.resolve(TxStatus.PENDING),
+        getTxsByHash: ()=>Promise.resolve([]),
+        hasTxs: ()=>Promise.resolve([]),
+        setMaxTxPoolSize: ()=>Promise.resolve()
     };
 }
 function mockAttestationPool() {

package/dest/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAuB,MAAM,iBAAiB,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAc,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAIpE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGrC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAI7C,MAAM,WAAW,YAAa,SAAQ,MAAM;IAC1C,QAAQ,EAAE;QACR,MAAM,EAAE,SAAS,CAAC;QAClB,UAAU,EAAE;YACV,iBAAiB,EAAE,iBAAiB,CAAC;SACtC,CAAC;KACH,CAAC;CACH;AAED;;;;;;;6CAO6C;AAC7C,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAOjG;AAED;;GAEG;AACH,wBAAsB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAInD;AAED,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAW9F;AAcD,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,SAAS,GAAG,eAAe,GACnC,OAAO,CAAC,SAAS,GAAG,eAAe,CAAC,CActC;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,EAC5F,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CA2DjB;AAED;;;;GAIG;AACH,wBAAsB,gCAAgC,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAS1F"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAuB,MAAM,iBAAiB,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAc,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAIpE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGrC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAI7C,MAAM,WAAW,YAAa,SAAQ,MAAM;IAC1C,QAAQ,EAAE;QACR,MAAM,EAAE,SAAS,CAAC;QAClB,UAAU,EAAE;YACV,iBAAiB,EAAE,iBAAiB,CAAC;SACtC,CAAC;KACH,CAAC;CACH;AAED;;;;;;;6CAO6C;AAC7C,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAOjG;AAED;;GAEG;AACH,wBAAsB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAInD;AAED,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAW9F;AAcD,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,SAAS,GAAG,eAAe,GACnC,OAAO,CAAC,SAAS,GAAG,eAAe,CAAC,CAmBtC;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,EAC5F,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CA2DjB;AAED;;;;GAIG;AACH,wBAAsB,gCAAgC,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAS1F"}

package/dest/util.js

@@ -52,7 +52,11 @@ export async function configureP2PClientAddresses(_config) {
     const config = {
         ..._config
     };
-    const { p2pIp, queryForIp } = config;
+    const { p2pIp, queryForIp, p2pBroadcastPort, p2pPort } = config;
+    // If no broadcast port is provided, use the given p2p port as the broadcast port
+    if (!p2pBroadcastPort) {
+        config.p2pBroadcastPort = p2pPort;
+    }
     // check if no announce IP was provided
     if (!p2pIp) {
         if (queryForIp) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/p2p",
-  "version": "0.85.0",
+  "version": "0.86.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -22,8 +22,6 @@
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
     "start": "node ./dest",
     "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'"
@@ -65,16 +63,16 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.85.0",
-    "@aztec/epoch-cache": "0.85.0",
-    "@aztec/foundation": "0.85.0",
-    "@aztec/kv-store": "0.85.0",
-    "@aztec/noir-contracts.js": "0.85.0",
-    "@aztec/noir-protocol-circuits-types": "0.85.0",
-    "@aztec/protocol-contracts": "0.85.0",
-    "@aztec/simulator": "0.85.0",
-    "@aztec/stdlib": "0.85.0",
-    "@aztec/telemetry-client": "0.85.0",
+    "@aztec/constants": "0.86.0",
+    "@aztec/epoch-cache": "0.86.0",
+    "@aztec/foundation": "0.86.0",
+    "@aztec/kv-store": "0.86.0",
+    "@aztec/noir-contracts.js": "0.86.0",
+    "@aztec/noir-protocol-circuits-types": "0.86.0",
+    "@aztec/protocol-contracts": "0.86.0",
+    "@aztec/simulator": "0.86.0",
+    "@aztec/stdlib": "0.86.0",
+    "@aztec/telemetry-client": "0.86.0",
     "@chainsafe/discv5": "9.0.0",
     "@chainsafe/enr": "3.0.0",
     "@chainsafe/libp2p-gossipsub": "13.0.0",
@@ -103,7 +101,7 @@
     "xxhash-wasm": "^1.1.0"
   },
   "devDependencies": {
-    "@aztec/archiver": "0.85.0",
+    "@aztec/archiver": "0.86.0",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/node": "^18.14.6",

package/src/bootstrap/bootstrap.ts

@@ -31,19 +31,23 @@ export class BootstrapNode implements P2PBootstrapApi {
    * @returns An empty promise.
    */
   public async start(config: BootnodeConfig) {
-    const { p2pIp, p2pPort, listenAddress } = config;
-    const listenAddrUdp = multiaddr(convertToMultiaddr(listenAddress, p2pPort, 'udp'));
-
+    const { p2pIp, p2pPort, listenAddress, p2pBroadcastPort } = config;
     if (!p2pIp) {
       throw new Error('You need to provide a P2P IP address.');
     }
 
+    if (!p2pBroadcastPort) {
+      config.p2pBroadcastPort = p2pPort;
+    }
+
+    const listenAddrUdp = multiaddr(convertToMultiaddr(listenAddress, config.p2pBroadcastPort!, 'udp'));
+
     const peerIdPrivateKey = await getPeerIdPrivateKey(config, this.store, this.logger);
 
     const { enr: ourEnr, peerId } = await createBootnodeENRandPeerId(
       peerIdPrivateKey,
       p2pIp,
-      p2pPort,
+      config.p2pBroadcastPort!,
       config.l1ChainId,
     );
     this.peerId = peerId;

package/src/client/p2p_client.ts

@@ -10,7 +10,7 @@ import type {
   PublishedL2Block,
 } from '@aztec/stdlib/block';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
-import type { P2PApi, PeerInfo, ProverCoordination } from '@aztec/stdlib/interfaces/server';
+import type { P2PApi, PeerInfo } from '@aztec/stdlib/interfaces/server';
 import { BlockAttestation, type BlockProposal, ConsensusPayload, type P2PClientType } from '@aztec/stdlib/p2p';
 import type { Tx, TxHash } from '@aztec/stdlib/tx';
 import {
@@ -58,116 +58,144 @@ export interface P2PSyncState {
 /**
  * Interface of a P2P client.
  **/
-export type P2P<T extends P2PClientType = P2PClientType.Full> = ProverCoordination &
-  P2PApi<T> & {
-    /**
-     * Broadcasts a block proposal to other peers.
-     *
-     * @param proposal - the block proposal
-     */
-    broadcastProposal(proposal: BlockProposal): void;
-
-    /**
-     * Registers a callback from the validator client that determines how to behave when
-     * foreign block proposals are received
-     *
-     * @param handler - A function taking a received block proposal and producing an attestation
-     */
-    // REVIEW: https://github.com/AztecProtocol/aztec-packages/issues/7963
-    // ^ This pattern is not my favorite (md)
-    registerBlockProposalHandler(handler: (block: BlockProposal) => Promise<BlockAttestation | undefined>): void;
-
-    /**
-     * Request a list of transactions from another peer by their tx hashes.
-     * @param txHashes - Hashes of the txs to query.
-     * @returns A list of transactions or undefined if the transactions are not found.
-     */
-    requestTxs(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
-
-    /**
-     * Request a transaction from another peer by its tx hash.
-     * @param txHash - Hash of the tx to query.
-     */
-    requestTxByHash(txHash: TxHash): Promise<Tx | undefined>;
-
-    /**
-     * Verifies the 'tx' and, if valid, adds it to local tx pool and forwards it to other peers.
-     * @param tx - The transaction.
-     **/
-    sendTx(tx: Tx): Promise<void>;
-
-    /**
-     * Deletes 'txs' from the pool, given hashes.
-     * NOT used if we use sendTx as reconcileTxPool will handle this.
-     * @param txHashes - Hashes to check.
-     **/
-    deleteTxs(txHashes: TxHash[]): Promise<void>;
-
-    /**
-     * Returns a transaction in the transaction pool by its hash.
-     * @param txHash  - Hash of tx to return.
-     * @returns A single tx or undefined.
-     */
-    getTxByHashFromPool(txHash: TxHash): Promise<Tx | undefined>;
-
-    /**
-     * Returns a transaction in the transaction pool by its hash, requesting it from the network if it is not found.
-     * @param txHash  - Hash of tx to return.
-     * @returns A single tx or undefined.
-     */
-    getTxByHash(txHash: TxHash): Promise<Tx | undefined>;
-
-    /**
-     * Returns an archived transaction from the transaction pool by its hash.
-     * @param txHash  - Hash of tx to return.
-     * @returns A single tx or undefined.
-     */
-    getArchivedTxByHash(txHash: TxHash): Promise<Tx | undefined>;
-
-    /**
-     * Returns whether the given tx hash is flagged as pending or mined.
-     * @param txHash - Hash of the tx to query.
-     * @returns Pending or mined depending on its status, or undefined if not found.
-     */
-    getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | undefined>;
-
-    /** Returns an iterator over pending txs on the mempool. */
-    iteratePendingTxs(): AsyncIterableIterator<Tx>;
-
-    /** Returns the number of pending txs in the mempool. */
-    getPendingTxCount(): Promise<number>;
-
-    /**
-     * Starts the p2p client.
-     * @returns A promise signalling the completion of the block sync.
-     */
-    start(): Promise<void>;
-
-    /**
-     * Stops the p2p client.
-     * @returns A promise signalling the completion of the stop process.
-     */
-    stop(): Promise<void>;
-
-    /**
-     * Indicates if the p2p client is ready for transaction submission.
-     * @returns A boolean flag indicating readiness.
-     */
-    isReady(): boolean;
-
-    /**
-     * Returns the current status of the p2p client.
-     */
-    getStatus(): Promise<P2PSyncState>;
-
-    /**
-     * Returns the ENR of this node, if any.
-     */
-    getEnr(): ENR | undefined;
-
-    /** Identifies a p2p client. */
-    isP2PClient(): true;
-  };
+export type P2P<T extends P2PClientType = P2PClientType.Full> = P2PApi<T> & {
+  /**
+   * Broadcasts a block proposal to other peers.
+   *
+   * @param proposal - the block proposal
+   */
+  broadcastProposal(proposal: BlockProposal): void;
+
+  /**
+   * Registers a callback from the validator client that determines how to behave when
+   * foreign block proposals are received
+   *
+   * @param handler - A function taking a received block proposal and producing an attestation
+   */
+  // REVIEW: https://github.com/AztecProtocol/aztec-packages/issues/7963
+  // ^ This pattern is not my favorite (md)
+  registerBlockProposalHandler(handler: (block: BlockProposal) => Promise<BlockAttestation | undefined>): void;
+
+  /**
+   * Request a list of transactions from another peer by their tx hashes.
+   * @param txHashes - Hashes of the txs to query.
+   * @returns A list of transactions or undefined if the transactions are not found.
+   */
+  requestTxs(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
+
+  /**
+   * Request a transaction from another peer by its tx hash.
+   * @param txHash - Hash of the tx to query.
+   */
+  requestTxByHash(txHash: TxHash): Promise<Tx | undefined>;
+
+  /**
+   * Verifies the 'tx' and, if valid, adds it to local tx pool and forwards it to other peers.
+   * @param tx - The transaction.
+   **/
+  sendTx(tx: Tx): Promise<void>;
+
+  /**
+   * Adds transactions to the pool. Does not send to peers or validate the tx.
+   * @param txs - The transactions.
+   **/
+  addTxs(txs: Tx[]): Promise<void>;
+
+  /**
+   * Deletes 'txs' from the pool, given hashes.
+   * NOT used if we use sendTx as reconcileTxPool will handle this.
+   * @param txHashes - Hashes to check.
+   **/
+  deleteTxs(txHashes: TxHash[]): Promise<void>;
+
+  /**
+   * Returns a transaction in the transaction pool by its hash.
+   * @param txHash  - Hash of tx to return.
+   * @returns A single tx or undefined.
+   */
+  getTxByHashFromPool(txHash: TxHash): Promise<Tx | undefined>;
+
+  /**
+   * Returns transactions in the transaction pool by hash.
+   * @param txHashes  - Hashes of txs to return.
+   * @returns An array of txs or undefined.
+   */
+  getTxsByHashFromPool(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
+
+  /**
+   * Checks if transactions exist in the pool
+   * @param txHashes - The hashes of the transactions to check for
+   * @returns True or False for each hash
+   */
+  hasTxsInPool(txHashes: TxHash[]): Promise<boolean[]>;
+
+  /**
+   * Returns a transaction in the transaction pool by its hash, requesting it from the network if it is not found.
+   * @param txHash  - Hash of tx to return.
+   * @returns A single tx or undefined.
+   */
+  getTxByHash(txHash: TxHash): Promise<Tx | undefined>;
+
+  /**
+   * Returns transactions in the transaction pool by hash, requesting from the network if not found.
+   * @param txHashes  - Hashes of tx to return.
+   * @returns An array of tx or undefined.
+   */
+  getTxsByHash(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
+
+  /**
+   * Returns an archived transaction from the transaction pool by its hash.
+   * @param txHash  - Hash of tx to return.
+   * @returns A single tx or undefined.
+   */
+  getArchivedTxByHash(txHash: TxHash): Promise<Tx | undefined>;
+
+  /**
+   * Returns whether the given tx hash is flagged as pending or mined.
+   * @param txHash - Hash of the tx to query.
+   * @returns Pending or mined depending on its status, or undefined if not found.
+   */
+  getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | undefined>;
+
+  /** Returns an iterator over pending txs on the mempool. */
+  iteratePendingTxs(): AsyncIterableIterator<Tx>;
+
+  /** Returns the number of pending txs in the mempool. */
+  getPendingTxCount(): Promise<number>;
+
+  /**
+   * Starts the p2p client.
+   * @returns A promise signalling the completion of the block sync.
+   */
+  start(): Promise<void>;
+
+  /**
+   * Stops the p2p client.
+   * @returns A promise signalling the completion of the stop process.
+   */
+  stop(): Promise<void>;
+
+  /**
+   * Indicates if the p2p client is ready for transaction submission.
+   * @returns A boolean flag indicating readiness.
+   */
+  isReady(): boolean;
+
+  /**
+   * Returns the current status of the p2p client.
+   */
+  getStatus(): Promise<P2PSyncState>;
+
+  /**
+   * Returns the ENR of this node, if any.
+   */
+  getEnr(): ENR | undefined;
+
+  /** Identifies a p2p client. */
+  isP2PClient(): true;
+
+  updateP2PConfig(config: Partial<P2PConfig>): Promise<void>;
+};
 
 /**
  * The P2P client implementation.
@@ -200,6 +228,8 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
 
   private blockStream;
 
+  private config: P2PConfig;
+
   /**
    * In-memory P2P client constructor.
    * @param store - The client's instance of the KV store.
@@ -221,10 +251,13 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
   ) {
     super(telemetry, 'P2PClient');
 
-    const { keepProvenTxsInPoolFor, blockCheckIntervalMS, blockRequestBatchSize, keepAttestationsInPoolFor } = {
+    this.config = {
       ...getP2PDefaultConfig(),
       ...config,
     };
+
+    const { keepProvenTxsInPoolFor, blockCheckIntervalMS, blockRequestBatchSize, keepAttestationsInPoolFor } =
+      this.config;
     this.keepProvenTxsFor = keepProvenTxsInPoolFor;
     this.keepAttestationsInPoolFor = keepAttestationsInPoolFor;
 
@@ -256,6 +289,13 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
     return this.synchedBlockHashes.getAsync(number);
   }
 
+  public async updateP2PConfig(config: Partial<P2PConfig>): Promise<void> {
+    if (typeof config.maxTxPoolSize === 'number' && this.config.maxTxPoolSize !== config.maxTxPoolSize) {
+      await this.txPool.setMaxTxPoolSize(config.maxTxPoolSize);
+      this.config.maxTxPoolSize = config.maxTxPoolSize;
+    }
+  }
+
   public async getL2Tips(): Promise<L2Tips> {
     const latestBlockNumber = await this.getSyncedLatestBlockNum();
     let latestBlockHash: string | undefined;
@@ -445,12 +485,17 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
   /**
    * Uses the batched Request Response protocol to request a set of transactions from the network.
    */
-  public async requestTxsByHash(txHashes: TxHash[]): Promise<Tx[]> {
-    const txs = (await this.p2pService.sendBatchRequest(ReqRespSubProtocol.TX, txHashes)) ?? [];
-    await this.txPool.addTxs(txs);
+  public async requestTxsByHash(txHashes: TxHash[]): Promise<(Tx | undefined)[]> {
+    const txs = await this.p2pService.sendBatchRequest(ReqRespSubProtocol.TX, txHashes);
+
+    // Some transactions may return undefined, so we filter them out
+    const filteredTxs = txs.filter((tx): tx is Tx => !!tx);
+    await this.txPool.addTxs(filteredTxs);
     const txHashesStr = txHashes.map(tx => tx.toString()).join(', ');
     this.log.debug(`Received batched txs ${txHashesStr} (${txs.length} / ${txHashes.length}}) from peers`);
-    return txs as Tx[];
+
+    // We return all transactions, even the not found ones to the caller, such they can handle missing items themselves.
+    return txs;
   }
 
   public getPendingTxs(): Promise<Tx[]> {
@@ -501,6 +546,19 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
     return this.txPool.getTxByHash(txHash);
   }
 
+  /**
+   * Returns transactions in the transaction pool by hash.
+   * @param txHashes - Hashes of the transactions to look for.
+   * @returns The txs found, not necessarily on the same order as the hashes.
+   */
+  getTxsByHashFromPool(txHashes: TxHash[]): Promise<(Tx | undefined)[]> {
+    return this.txPool.getTxsByHash(txHashes);
+  }
+
+  hasTxsInPool(txHashes: TxHash[]): Promise<boolean[]> {
+    return this.txPool.hasTxs(txHashes);
+  }
+
   /**
    * Returns a transaction in the transaction pool by its hash.
    * If the transaction is not in the pool, it will be requested from the network.
@@ -533,7 +591,8 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
     }
 
     const missingTxs = await this.requestTxsByHash(missingTxHashes);
-    return txs.filter((tx): tx is Tx => !!tx).concat(missingTxs);
+    const fetchedMissingTxs = missingTxs.filter((tx): tx is Tx => !!tx);
+    return txs.filter((tx): tx is Tx => !!tx).concat(fetchedMissingTxs);
   }
 
   /**
@@ -551,11 +610,19 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
    * @returns Empty promise.
    **/
   public async sendTx(tx: Tx): Promise<void> {
-    this.#assertIsReady();
-    await this.txPool.addTxs([tx]);
+    await this.addTxs([tx]);
     this.p2pService.propagate(tx);
   }
 
+  /**
+   * Adds transactions to the pool. Does not send to peers or validate the txs.
+   * @param txs - The transactions.
+   **/
+  public async addTxs(txs: Tx[]): Promise<void> {
+    this.#assertIsReady();
+    await this.txPool.addTxs(txs);
+  }
+
   /**
    * Returns whether the given tx hash is flagged as pending or mined.
    * @param txHash - Hash of the tx to query.
@@ -732,36 +799,50 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
    * @param latestBlock - The block number the chain was pruned to.
    */
   private async handlePruneL2Blocks(latestBlock: number): Promise<void> {
-    const txsToDelete: TxHash[] = [];
+    // NOTE: temporary fix for alphanet, deleting ALL txs that were in the epoch from the pool #13723
+    // TODO: undo once fixed: #13770
+    const txsToDelete = new Set<TxHash>();
+    const minedTxs = await this.txPool.getMinedTxHashes();
+    for (const [txHash, blockNumber] of minedTxs) {
+      if (blockNumber > latestBlock) {
+        txsToDelete.add(txHash);
+      }
+    }
+
+    // Find transactions that reference pruned blocks in their historical header
     for (const tx of await this.txPool.getAllTxs()) {
       // every tx that's been generated against a block that has now been pruned is no longer valid
       if (tx.data.constants.historicalHeader.globalVariables.blockNumber.toNumber() > latestBlock) {
-        txsToDelete.push(await tx.getTxHash());
+        const txHash = await tx.getTxHash();
+        txsToDelete.add(txHash);
       }
     }
 
     this.log.info(
       `Detected chain prune. Removing invalid txs count=${
-        txsToDelete.length
+        txsToDelete.size
       } newLatestBlock=${latestBlock} previousLatestBlock=${await this.getSyncedLatestBlockNum()}`,
     );
 
     // delete invalid txs (both pending and mined)
-    await this.txPool.deleteTxs(txsToDelete);
+    await this.txPool.deleteTxs(Array.from(txsToDelete));
 
     // everything left in the mined set was built against a block on the proven chain so its still valid
     // move back to pending the txs that were reorged out of the chain
     // NOTE: we can't move _all_ txs back to pending because the tx pool could keep hold of mined txs for longer
     // (see this.keepProvenTxsFor)
-    const txsToMoveToPending: TxHash[] = [];
-    for (const [txHash, blockNumber] of await this.txPool.getMinedTxHashes()) {
-      if (blockNumber > latestBlock) {
-        txsToMoveToPending.push(txHash);
-      }
-    }
 
-    this.log.info(`Moving ${txsToMoveToPending.length} mined txs back to pending`);
-    await this.txPool.markMinedAsPending(txsToMoveToPending);
+    // NOTE: given current fix for alphanet, the code below is redundant as all these txs will be deleted.
+    // TODO: bring back once fixed: #13770
+    // const txsToMoveToPending: TxHash[] = [];
+    // for (const [txHash, blockNumber] of minedTxs) {
+    //   if (blockNumber > latestBlock) {
+    //     txsToMoveToPending.push(txHash);
+    //   }
+    // }
+
+    // this.log.info(`Moving ${txsToMoveToPending.length} mined txs back to pending`);
+    // await this.txPool.markMinedAsPending(txsToMoveToPending);
 
     await this.synchedLatestBlockNumber.set(latestBlock);
     // no need to update block hashes, as they will be updated as new blocks are added