@aztec/p2p 0.75.0 → 0.76.1

package/src/testbench/p2p_client_testbench_worker.ts

@@ -0,0 +1,156 @@
+/**
+ * A testbench worker that creates a p2p client and listens for commands from the parent.
+ *
+ * Used when running testbench commands
+ */
+import { MockL2BlockSource } from '@aztec/archiver/test';
+import { P2PClientType, Tx, TxStatus, type WorldStateSynchronizer } from '@aztec/circuit-types';
+import { type EpochCacheInterface } from '@aztec/epoch-cache';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { createLogger } from '@aztec/foundation/log';
+import { sleep } from '@aztec/foundation/sleep';
+import { type DataStoreConfig } from '@aztec/kv-store/config';
+import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
+
+import { type P2PConfig } from '../config.js';
+import { createP2PClient } from '../index.js';
+import { type AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js';
+import { type EpochProofQuotePool } from '../mem_pools/epoch_proof_quote_pool/epoch_proof_quote_pool.js';
+import { type TxPool } from '../mem_pools/tx_pool/index.js';
+import { AlwaysTrueCircuitVerifier } from '../test-helpers/reqresp-nodes.js';
+
+// Simple mock implementation
+function mockTxPool(): TxPool {
+  // Mock all methods
+  return {
+    addTxs: () => Promise.resolve(),
+    getTxByHash: () => Promise.resolve(undefined),
+    getArchivedTxByHash: () => Promise.resolve(undefined),
+    markAsMined: () => Promise.resolve(),
+    markMinedAsPending: () => Promise.resolve(),
+    deleteTxs: () => Promise.resolve(),
+    getAllTxs: () => Promise.resolve([]),
+    getAllTxHashes: () => Promise.resolve([]),
+    getPendingTxHashes: () => Promise.resolve([]),
+    getMinedTxHashes: () => Promise.resolve([]),
+    getTxStatus: () => Promise.resolve(TxStatus.PENDING),
+  };
+}
+
+function mockAttestationPool(): AttestationPool {
+  return {
+    addAttestations: () => Promise.resolve(),
+    deleteAttestations: () => Promise.resolve(),
+    deleteAttestationsOlderThan: () => Promise.resolve(),
+    deleteAttestationsForSlot: () => Promise.resolve(),
+    deleteAttestationsForSlotAndProposal: () => Promise.resolve(),
+    getAttestationsForSlot: () => Promise.resolve([]),
+  };
+}
+
+function mockEpochProofQuotePool(): EpochProofQuotePool {
+  return {
+    addQuote: () => {},
+    getQuotes: () => [],
+    deleteQuotesToEpoch: () => {},
+  };
+}
+
+function mockEpochCache(): EpochCacheInterface {
+  return {
+    getCommittee: () => Promise.resolve([] as EthAddress[]),
+    getProposerIndexEncoding: () => '0x' as `0x${string}`,
+    getEpochAndSlotNow: () => ({ epoch: 0n, slot: 0n, ts: 0n }),
+    computeProposerIndex: () => 0n,
+    getProposerInCurrentOrNextSlot: () =>
+      Promise.resolve({
+        currentProposer: EthAddress.ZERO,
+        nextProposer: EthAddress.ZERO,
+        currentSlot: 0n,
+        nextSlot: 0n,
+      }),
+    isInCommittee: () => Promise.resolve(false),
+  };
+}
+
+// eslint-disable-next-line @typescript-eslint/no-misused-promises
+process.on('message', async msg => {
+  const { type, config, clientIndex } = msg as { type: string; config: P2PConfig; clientIndex: number };
+
+  try {
+    if (type === 'START') {
+      const txPool = mockTxPool();
+      const attestationPool = mockAttestationPool();
+      const epochProofQuotePool = mockEpochProofQuotePool();
+      const epochCache = mockEpochCache();
+      const worldState = {} as WorldStateSynchronizer;
+      const l2BlockSource = new MockL2BlockSource();
+      await l2BlockSource.createBlocks(100);
+
+      const proofVerifier = new AlwaysTrueCircuitVerifier();
+      const kvStore = await openTmpStore(`test-${clientIndex}`);
+      const logger = createLogger(`p2p:${clientIndex}`);
+
+      const deps = {
+        txPool,
+        attestationPool,
+        epochProofQuotePool,
+        store: kvStore,
+        logger,
+      };
+
+      const client = await createP2PClient(
+        P2PClientType.Full,
+        config as P2PConfig & DataStoreConfig,
+        l2BlockSource,
+        proofVerifier,
+        worldState,
+        epochCache,
+        undefined,
+        deps,
+      );
+
+      // Create spy for gossip messages
+      let gossipMessageCount = 0;
+      (client as any).p2pService.handleNewGossipMessage = (...args: any[]) => {
+        gossipMessageCount++;
+        process.send!({ type: 'GOSSIP_RECEIVED', count: gossipMessageCount });
+        return (client as any).p2pService.constructor.prototype.handleNewGossipMessage.apply(
+          (client as any).p2pService,
+          args,
+        );
+      };
+
+      await client.start();
+      // Wait until the client is ready
+      for (let i = 0; i < 100; i++) {
+        const isReady = client.isReady();
+        logger.debug(`Client ${clientIndex} isReady: ${isReady}`);
+        if (isReady) {
+          break;
+        }
+        await sleep(1000);
+      }
+
+      // Listen for commands from parent
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      process.on('message', async (cmd: any) => {
+        switch (cmd.type) {
+          case 'STOP':
+            await client.stop();
+            process.exit(0);
+            break;
+          case 'SEND_TX':
+            await client.sendTx(Tx.fromBuffer(Buffer.from(cmd.tx)));
+            process.send!({ type: 'TX_SENT' });
+            break;
+        }
+      });
+
+      process.send!({ type: 'READY' });
+    }
+  } catch (err: any) {
+    process.send!({ type: 'ERROR', error: err.message });
+    process.exit(1);
+  }
+});

package/src/testbench/scripts/run_testbench.sh

@@ -0,0 +1,7 @@
+## Test bench
+# Run the testbench and pipe the output into a file
+# Usage: ./run_testbench.sh <outputfile>
+
+outputfile=$1
+
+LOG_LEVEL="debug; trace: .*gossipsub" yarn test testbench.test.ts 2>&1 | pino-pretty > $outputfile

package/src/versioning.ts

@@ -0,0 +1,50 @@
+import {
+  type ComponentsVersions,
+  checkCompressedComponentVersion,
+  compressComponentVersions,
+  getComponentsVersionsFromConfig,
+} from '@aztec/circuit-types';
+import { type ChainConfig } from '@aztec/circuit-types/config';
+import { toBufferBE } from '@aztec/foundation/bigint-buffer';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks';
+import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
+
+import { type SignableENR } from '@chainsafe/enr';
+import xxhashFactory from 'xxhash-wasm';
+
+import { AZTEC_ENR_KEY } from './services/types.js';
+
+const USE_XX_HASH = false; // Enable to reduce the size of the ENR record for production
+const XX_HASH_LEN = 8;
+const xxhash = await xxhashFactory();
+
+/** Returns the component versions based on config and this build. */
+export function getVersions(config: ChainConfig) {
+  return getComponentsVersionsFromConfig(config, protocolContractTreeRoot, getVKTreeRoot());
+}
+
+/** Sets the aztec key on the ENR record with versioning info. */
+export function setAztecEnrKey(enr: SignableENR, config: ChainConfig, useXxHash = USE_XX_HASH) {
+  const versions = getVersions(config);
+  const value = versionsToEnrValue(versions, useXxHash);
+  enr.set(AZTEC_ENR_KEY, value);
+  return versions;
+}
+
+/** 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) {
+    const expected = versionsToEnrValue(expectedVersions, true);
+    if (!Buffer.from(enrValue).equals(expected)) {
+      throw new Error(`Expected ENR version ${expected.toString('hex')} but received ${enrValue.toString('hex')}`);
+    }
+  } else {
+    const actual = Buffer.from(enrValue).toString();
+    checkCompressedComponentVersion(actual, expectedVersions);
+  }
+}
+
+function versionsToEnrValue(versions: ComponentsVersions, useXxHash: boolean) {
+  const compressed = compressComponentVersions(versions);
+  return useXxHash ? toBufferBE(xxhash.h64(compressed), XX_HASH_LEN) : Buffer.from(compressed);
+}

package/dest/mocks/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mocks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,EAAE,EACP,KAAK,sBAAsB,EAC5B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIrD,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAOnF,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIhD,OAAO,EAAE,KAAK,MAAM,EAAoC,MAAM,QAAQ,CAAC;AAEvE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,KAAK,cAAc,EAAkB,MAAM,cAAc,CAAC;AACnE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAE5E,OAAO,EAEL,KAAK,0BAA0B,EAC/B,KAAK,4BAA4B,EAElC,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAGzD;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,aAAa,GAAE,MAAM,EAAO,EAC5B,MAAM,CAAC,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,MAAM,EACb,eAAe,GAAE,OAAe,EAChC,KAAK,GAAE,OAAc,GACpB,OAAO,CAAC,MAAM,CAAC,CAqCjB;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,CAAC,SAAS,aAAa,EACnE,UAAU,EAAE,CAAC,EACb,aAAa,sBAAe,EAC5B,aAAa,EAAE,aAAa,EAC5B,sBAAsB,EAAE,sBAAsB,EAC9C,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EACrB,SAAS,EAAE,eAAe,EAC1B,IAAI,GAAE,MAAU,EAChB,MAAM,CAAC,EAAE,MAAM,6BAiChB;AAED;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,OAAO,CAAC;CACd,CAAC;AAGF,eAAO,MAAM,0BAA0B,EAAE,0BAMxC,CAAC;AAIF,eAAO,MAAM,4BAA4B,EAAE,4BAM1C,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,gBAAiB,WAAW,iBAAiB,MAAM,KAAG,QAAQ,WAAW,EAAE,CAElG,CAAC;AAEF,eAAO,MAAM,UAAU,UACd,WAAW,EAAE,0HAOrB,CAAC;AAEF,eAAO,MAAM,SAAS,UAAiB,WAAW,EAAE,KAAG,QAAQ,IAAI,CAGlE,CAAC;AAGF,eAAO,MAAM,aAAa,gBAAuB,WAAW,KAAG,QAAQ,WAAW,CAWjF,CAAC;AAGF,eAAO,MAAM,cAAc,UAAiB,WAAW,EAAE,KAAG,QAAQ,IAAI,CAUvE,CAAC;AAGF,qBAAa,yBAA0B,YAAW,6BAA6B;IAC7E,WAAW,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAGvC;AACD,qBAAa,0BAA2B,YAAW,6BAA6B;IAC9E,WAAW,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAGvC;AAGD,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,cAAc,CAU1F;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,SAAS,GAAE,eAAsC,GAChD,OAAO,CAAC,aAAa,CAAC,CAGxB;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,SAAS,GAAE,eAAsC,GAChD,OAAO,CAAC,aAAa,CAAC,CAKxB"}

package/dest/mocks/index.js

@@ -1,181 +0,0 @@
-import { timesParallel } from '@aztec/foundation/collection';
-import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
-import { getTelemetryClient } from '@aztec/telemetry-client';
-import { gossipsub } from '@chainsafe/libp2p-gossipsub';
-import { noise } from '@chainsafe/libp2p-noise';
-import { yamux } from '@chainsafe/libp2p-yamux';
-import { bootstrap } from '@libp2p/bootstrap';
-import { identify } from '@libp2p/identify';
-import { createSecp256k1PeerId } from '@libp2p/peer-id-factory';
-import { tcp } from '@libp2p/tcp';
-import getPort from 'get-port';
-import { createLibp2p } from 'libp2p';
-import { BootstrapNode } from '../bootstrap/bootstrap.js';
-import { DiscV5Service } from '../services/discv5/discV5_service.js';
-import { LibP2PService } from '../services/libp2p/libp2p_service.js';
-import { ReqRespSubProtocol, noopValidator, } from '../services/reqresp/interface.js';
-import { pingHandler, statusHandler } from '../services/reqresp/protocols/index.js';
-import { ReqResp } from '../services/reqresp/reqresp.js';
-/**
- * Creates a libp2p node, pre configured.
- * @param boostrapAddrs - an optional list of bootstrap addresses
- * @returns Lip2p node
- */
-export async function createLibp2pNode(boostrapAddrs = [], peerId, port, enableGossipSub = false, start = true) {
-    port = port ?? (await getPort());
-    const options = {
-        start,
-        addresses: {
-            listen: [`/ip4/0.0.0.0/tcp/${port}`],
-            announce: [`/ip4/0.0.0.0/tcp/${port}`],
-        },
-        connectionEncryption: [noise()],
-        streamMuxers: [yamux()],
-        transports: [tcp()],
-        services: {
-            identify: identify({
-                protocolPrefix: 'aztec',
-            }),
-        },
-    };
-    if (boostrapAddrs.length > 0) {
-        options.peerDiscovery = [
-            bootstrap({
-                list: boostrapAddrs,
-            }),
-        ];
-    }
-    if (peerId) {
-        options.peerId = peerId;
-    }
-    if (enableGossipSub) {
-        options.services.pubsub = gossipsub({
-            allowPublishToZeroTopicPeers: true,
-        });
-    }
-    return await createLibp2p(options);
-}
-/**
- * Test Libp2p service
- * P2P functionality is operational, however everything else is default
- *
- *
- */
-export async function createTestLibP2PService(clientType, boostrapAddrs = [], l2BlockSource, worldStateSynchronizer, epochCache, mempools, telemetry, port = 0, peerId) {
-    peerId = peerId ?? (await createSecp256k1PeerId());
-    const config = {
-        tcpAnnounceAddress: `127.0.0.1:${port}`,
-        udpAnnounceAddress: `127.0.0.1:${port}`,
-        tcpListenAddress: `0.0.0.0:${port}`,
-        udpListenAddress: `0.0.0.0:${port}`,
-        bootstrapNodes: boostrapAddrs,
-        peerCheckIntervalMS: 1000,
-        minPeerCount: 1,
-        maxPeerCount: 5,
-        p2pEnabled: true,
-        peerIdPrivateKey: Buffer.from(peerId.privateKey).toString('hex'),
-    };
-    const discoveryService = new DiscV5Service(peerId, config, telemetry);
-    const proofVerifier = new AlwaysTrueCircuitVerifier();
-    // No bootstrap nodes provided as the libp2p service will register them in the constructor
-    const p2pNode = await createLibp2pNode([], peerId, port, /*enable gossip */ true, /**start */ false);
-    return new LibP2PService(clientType, config, p2pNode, discoveryService, mempools, l2BlockSource, epochCache, proofVerifier, worldStateSynchronizer, telemetry);
-}
-// Mock sub protocol handlers
-export const MOCK_SUB_PROTOCOL_HANDLERS = {
-    [ReqRespSubProtocol.PING]: pingHandler,
-    [ReqRespSubProtocol.STATUS]: statusHandler,
-    [ReqRespSubProtocol.TX]: (_msg) => Promise.resolve(Buffer.from('tx')),
-    [ReqRespSubProtocol.GOODBYE]: (_msg) => Promise.resolve(Buffer.from('goodbye')),
-    [ReqRespSubProtocol.BLOCK]: (_msg) => Promise.resolve(Buffer.from('block')),
-};
-// By default, all requests are valid
-// If you want to test an invalid response, you can override the validator
-export const MOCK_SUB_PROTOCOL_VALIDATORS = {
-    [ReqRespSubProtocol.PING]: noopValidator,
-    [ReqRespSubProtocol.STATUS]: noopValidator,
-    [ReqRespSubProtocol.TX]: noopValidator,
-    [ReqRespSubProtocol.GOODBYE]: noopValidator,
-    [ReqRespSubProtocol.BLOCK]: noopValidator,
-};
-/**
- * @param numberOfNodes - the number of nodes to create
- * @returns An array of the created nodes
- */
-export const createNodes = (peerScoring, numberOfNodes) => {
-    return timesParallel(numberOfNodes, () => createReqResp(peerScoring));
-};
-export const startNodes = async (nodes, subProtocolHandlers = MOCK_SUB_PROTOCOL_HANDLERS, subProtocolValidators = MOCK_SUB_PROTOCOL_VALIDATORS) => {
-    for (const node of nodes) {
-        await node.req.start(subProtocolHandlers, subProtocolValidators);
-    }
-};
-export const stopNodes = async (nodes) => {
-    const stopPromises = nodes.flatMap(node => [node.req.stop(), node.p2p.stop()]);
-    await Promise.all(stopPromises);
-};
-// Create a req resp node, exposing the underlying p2p node
-export const createReqResp = async (peerScoring) => {
-    const p2p = await createLibp2pNode();
-    const config = {
-        overallRequestTimeoutMs: 4000,
-        individualRequestTimeoutMs: 2000,
-    };
-    const req = new ReqResp(config, p2p, peerScoring);
-    return {
-        p2p,
-        req,
-    };
-};
-// Given a node list; hand shake all of the nodes with each other
-export const connectToPeers = async (nodes) => {
-    for (const node of nodes) {
-        for (const otherNode of nodes) {
-            if (node === otherNode) {
-                continue;
-            }
-            const addr = otherNode.p2p.getMultiaddrs()[0];
-            await node.p2p.dial(addr);
-        }
-    }
-};
-// Mock circuit verifier for testing - reimplementation from bb to avoid dependency
-export class AlwaysTrueCircuitVerifier {
-    verifyProof(_tx) {
-        return Promise.resolve(true);
-    }
-}
-export class AlwaysFalseCircuitVerifier {
-    verifyProof(_tx) {
-        return Promise.resolve(false);
-    }
-}
-// Bootnodes
-export function createBootstrapNodeConfig(privateKey, port) {
-    return {
-        udpListenAddress: `0.0.0.0:${port}`,
-        udpAnnounceAddress: `127.0.0.1:${port}`,
-        peerIdPrivateKey: privateKey,
-        minPeerCount: 10,
-        maxPeerCount: 100,
-        dataDirectory: undefined,
-        dataStoreMapSizeKB: 0,
-    };
-}
-export function createBootstrapNodeFromPrivateKey(privateKey, port, telemetry = getTelemetryClient()) {
-    const config = createBootstrapNodeConfig(privateKey, port);
-    return startBootstrapNode(config, telemetry);
-}
-export async function createBootstrapNode(port, telemetry = getTelemetryClient()) {
-    const peerId = await createSecp256k1PeerId();
-    const config = createBootstrapNodeConfig(Buffer.from(peerId.privateKey).toString('hex'), port);
-    return startBootstrapNode(config, telemetry);
-}
-async function startBootstrapNode(config, telemetry) {
-    // Open an ephemeral store that will only exist in memory
-    const store = await openTmpStore('bootstrap-node', true);
-    const bootstrapNode = new BootstrapNode(store, telemetry);
-    await bootstrapNode.start(config);
-    return bootstrapNode;
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mocks/index.ts"],"names":[],"mappings":"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"}