@aztec/p2p 0.86.0 → 0.87.0

package/src/services/service.ts

@@ -1,5 +1,6 @@
 import type { PeerInfo } from '@aztec/stdlib/interfaces/server';
 import type { BlockAttestation, BlockProposal, Gossipable } from '@aztec/stdlib/p2p';
+import type { Tx } from '@aztec/stdlib/tx';
 
 import type { ENR } from '@chainsafe/enr';
 import type { PeerId } from '@libp2p/interface';
@@ -32,7 +33,7 @@ export interface P2PService {
    * Called to have the given transaction propagated through the P2P network.
    * @param message - The message to be propagated.
    */
-  propagate<T extends Gossipable>(message: T): void;
+  propagate<T extends Gossipable>(message: T): Promise<void>;
 
   /**
    * Request information from peers via the request response protocol.
@@ -56,6 +57,9 @@ export interface P2PService {
   sendBatchRequest<Protocol extends ReqRespSubProtocol>(
     protocol: Protocol,
     requests: InstanceType<SubProtocolMap[Protocol]['request']>[],
+    timeoutMs?: number,
+    maxPeers?: number,
+    maxRetryAttempts?: number,
   ): Promise<(InstanceType<SubProtocolMap[Protocol]['response']> | undefined)[]>;
 
   // Leaky abstraction: fix https://github.com/AztecProtocol/aztec-packages/issues/7963
@@ -64,6 +68,8 @@ export interface P2PService {
   getEnr(): ENR | undefined;
 
   getPeers(includePending?: boolean): PeerInfo[];
+
+  validate(txs: Tx[]): Promise<void>;
 }
 
 /**

package/src/test-helpers/make-test-p2p-clients.ts

@@ -85,6 +85,7 @@ export async function makeTestP2PClient(
     proofVerifier,
     mockWorldState,
     mockEpochCache,
+    'test-p2p-client',
     undefined,
     deps,
   );
@@ -108,7 +109,7 @@ export async function makeTestP2PClients(numberOfPeers: number, testConfig: Make
     try {
       ports = await getPorts(numberOfPeers);
       break;
-    } catch (err) {
+    } catch {
       await sleep(1000);
     }
   }

package/src/test-helpers/reqresp-nodes.ts

@@ -120,7 +120,7 @@ export async function createTestLibP2PService<T extends P2PClientType>(
     bootstrapNodeEnrVersionCheck: false,
     ...chainConfig,
   } as P2PConfig & DataStoreConfig;
-  const discoveryService = new DiscV5Service(peerId, config, telemetry);
+  const discoveryService = new DiscV5Service(peerId, config, 'test-reqresp-node', telemetry);
   const proofVerifier = new AlwaysTrueCircuitVerifier();
 
   // No bootstrap nodes provided as the libp2p service will register them in the constructor

package/src/testbench/p2p_client_testbench_worker.ts

@@ -13,7 +13,7 @@ import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import type { ClientProtocolCircuitVerifier, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
-import { P2PClientType } from '@aztec/stdlib/p2p';
+import { P2PClientType, P2PMessage } from '@aztec/stdlib/p2p';
 import { Tx, TxStatus } from '@aztec/stdlib/tx';
 import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
@@ -34,6 +34,7 @@ import type { PubSubLibp2p } from '../util.js';
 function mockTxPool(): TxPool {
   // Mock all methods
   return {
+    isEmpty: () => Promise.resolve(false),
     addTxs: () => Promise.resolve(),
     getTxByHash: () => Promise.resolve(undefined),
     getArchivedTxByHash: () => Promise.resolve(undefined),
@@ -43,16 +44,19 @@ function mockTxPool(): TxPool {
     getAllTxs: () => Promise.resolve([]),
     getAllTxHashes: () => Promise.resolve([]),
     getPendingTxHashes: () => Promise.resolve([]),
+    getPendingTxCount: () => Promise.resolve(0),
     getMinedTxHashes: () => Promise.resolve([]),
     getTxStatus: () => Promise.resolve(TxStatus.PENDING),
     getTxsByHash: () => Promise.resolve([]),
     hasTxs: () => Promise.resolve([]),
     setMaxTxPoolSize: () => Promise.resolve(),
+    markTxsAsNonEvictable: () => Promise.resolve(),
   };
 }
 
 function mockAttestationPool(): AttestationPool {
   return {
+    isEmpty: () => Promise.resolve(false),
     addAttestations: () => Promise.resolve(),
     deleteAttestations: () => Promise.resolve(),
     deleteAttestationsOlderThan: () => Promise.resolve(),
@@ -122,9 +126,10 @@ class TestLibP2PService<T extends P2PClientType = P2PClientType.Full> extends Li
     this.disableTxValidation = disable;
   }
 
-  protected override async handleGossipedTx(msg: Message, msgId: string, source: PeerId) {
+  protected override async handleGossipedTx(payload: Buffer, msgId: string, source: PeerId) {
     if (this.disableTxValidation) {
-      const tx = Tx.fromBuffer(Buffer.from(msg.data));
+      const p2pMessage = P2PMessage.fromMessageData(payload);
+      const tx = Tx.fromBuffer(p2pMessage.payload);
       this.node.services.pubsub.reportMessageValidationResult(msgId, source.toString(), TopicValidatorResult.Accept);
 
       const txHash = await tx.getTxHash();
@@ -132,7 +137,7 @@ class TestLibP2PService<T extends P2PClientType = P2PClientType.Full> extends Li
       this.logger.verbose(`Received tx ${txHashString} from external peer ${source.toString()}.`);
       await this.mempools.txPool.addTxs([tx]);
     } else {
-      await super.handleGossipedTx(msg, msgId, source);
+      await super.handleGossipedTx(payload, msgId, source);
     }
   }
 
@@ -177,6 +182,7 @@ process.on('message', async msg => {
         proofVerifier,
         worldState,
         epochCache,
+        'test-p2p-bench-worker',
         telemetry,
         deps,
       );

package/src/testbench/testbench.ts

@@ -21,7 +21,7 @@ async function main() {
     }
 
     const configPath = path.join(__dirname, '../../testbench/configurations', configFile);
-    const config = await import(configPath, { assert: { type: 'json' } });
+    const config = await import(configPath, { with: { type: 'json' } });
     const testConfig = { ...testChainConfig, ...config.default };
     const numberOfClients = config.default.numberOfClients;
 

package/src/testbench/worker_client_manager.ts

@@ -257,7 +257,7 @@ class WorkerClientManager {
       // Try to gracefully stop the process
       try {
         process.send({ type: 'STOP' });
-      } catch (e) {
+      } catch {
         // If sending the message fails, force kill immediately
         clearTimeout(forceKillTimeout);
         try {
@@ -291,7 +291,7 @@ class WorkerClientManager {
                 if (!p.killed) {
                   p.kill('SIGKILL');
                 }
-              } catch (e) {
+              } catch {
                 // Ignore errors when force killing
               }
             });

package/src/types/index.ts

@@ -35,3 +35,4 @@ export enum GossipSubEvent {
  * Aztec network specific types
  */
 export const AZTEC_ENR_KEY = 'aztec';
+export const AZTEC_ENR_CLIENT_VERSION_KEY = 'ver';

package/src/versioning.ts

@@ -12,7 +12,7 @@ import {
 import type { SignableENR } from '@chainsafe/enr';
 import xxhashFactory from 'xxhash-wasm';
 
-import { AZTEC_ENR_KEY } from './types/index.js';
+import { AZTEC_ENR_CLIENT_VERSION_KEY, AZTEC_ENR_KEY } from './types/index.js';
 
 const USE_XX_HASH = false; // Enable to reduce the size of the ENR record for production
 const XX_HASH_LEN = 8;
@@ -31,6 +31,13 @@ export function setAztecEnrKey(enr: SignableENR, config: ChainConfig, useXxHash
   return versions;
 }
 
+/** Sets the Aztec client version on ENR record **/
+export function setAztecClientVersionEnrKey(enr: SignableENR, clientVersion: string) {
+  if (clientVersion) {
+    enr.set(AZTEC_ENR_CLIENT_VERSION_KEY, Buffer.from(clientVersion));
+  }
+}
+
 /** Checks the given value from an ENR record against the expected versions. */
 export function checkAztecEnrVersion(enrValue: Buffer, expectedVersions: ComponentsVersions) {
   if (enrValue.length === XX_HASH_LEN) {