chore: Revert upgraded libp2p (#15911)" (#16071)

This reverts commit 10f2c5f.
Due to a massive increase in e2e flakes

---------

Co-authored-by: Santiago Palladino <[email protected]>

Author: mralj

.test_patterns.yml

@@ -249,6 +249,10 @@ tests:
     error_regex: "ContractFunctionExecutionError: The contract function"
     owners:
       - *mitch
+  - regex: "src/e2e_block_building"
+    error_regex: "✕ detects an upcoming reorg and builds a block for the correct slot"
+    owners:
+      - *palla
 
   # Nightly GKE tests
   - regex: "spartan/bootstrap.sh"

yarn-project/cli/package.json

@@ -80,6 +80,7 @@
     "@aztec/stdlib": "workspace:^",
     "@aztec/world-state": "workspace:^",
     "@iarna/toml": "^2.2.5",
+    "@libp2p/peer-id-factory": "^3.0.4",
     "commander": "^12.1.0",
     "lodash.chunk": "^4.2.0",
     "lodash.groupby": "^4.6.0",

yarn-project/cli/src/cmds/misc/generate_bootnode_enr.ts

@@ -1,14 +1,13 @@
 import type { LogFn } from '@aztec/foundation/log';
-import { privateKeyFromHex } from '@aztec/p2p';
 import { createBootnodeENRandPeerId } from '@aztec/p2p/enr';
 
-export function generateEncodedBootnodeENR(
+export async function generateEncodedBootnodeENR(
   privateKey: string,
   p2pIp: string,
   p2pPort: number,
   l1ChainId: number,
   log: LogFn,
 ) {
-  const { enr } = createBootnodeENRandPeerId(privateKeyFromHex(privateKey), p2pIp, p2pPort, l1ChainId);
+  const { enr } = await createBootnodeENRandPeerId(privateKey, p2pIp, p2pPort, l1ChainId);
   log(`ENR: ${enr.encodeTxt()}`);
 }

yarn-project/cli/src/cmds/misc/generate_p2p_private_key.ts

@@ -1,8 +1,10 @@
 import type { LogFn } from '@aztec/foundation/log';
-import { createSecp256k1PrivateKeyWithPeerId, privateKeyToHex } from '@aztec/p2p';
+
+import { createSecp256k1PeerId } from '@libp2p/peer-id-factory';
 
 export async function generateP2PPrivateKey(log: LogFn) {
-  const { privateKey, peerId } = await createSecp256k1PrivateKeyWithPeerId();
-  log(`Private key: ${privateKeyToHex(privateKey)}`);
+  const peerId = await createSecp256k1PeerId();
+  const exportedPeerId = Buffer.from(peerId.privateKey!).toString('hex');
+  log(`Private key: ${exportedPeerId}`);
   log(`Peer Id: ${peerId}`);
 }

yarn-project/cli/src/cmds/misc/index.ts

@@ -40,16 +40,16 @@ export function injectCommands(program: Command, log: LogFn) {
     .addOption(l1ChainIdOption)
     .action(async (privateKey: string, p2pIp: string, p2pPort: number, options) => {
       const { generateEncodedBootnodeENR } = await import('./generate_bootnode_enr.js');
-      generateEncodedBootnodeENR(privateKey, p2pIp, p2pPort, options.l1ChainId, log);
+      await generateEncodedBootnodeENR(privateKey, p2pIp, p2pPort, options.l1ChainId, log);
     });
 
   program
     .command('decode-enr')
     .summary('Decodes an ENR record')
     .description('Decodes and ENR record')
     .argument('<enr>', 'The encoded ENR string')
-    .action((enr: string) => {
-      printENR(enr, log);
+    .action(async (enr: string) => {
+      await printENR(enr, log);
     });
 
   program

yarn-project/end-to-end/src/e2e_p2p/p2p_network.ts

@@ -16,7 +16,6 @@ import { ChainMonitor } from '@aztec/ethereum/test';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { RollupAbi, SlashFactoryAbi, SlasherAbi, SlashingProposerAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
-import { privateKeyFromHex } from '@aztec/p2p';
 import type { BootstrapNode } from '@aztec/p2p/bootstrap';
 import { createBootstrapNodeFromPrivateKey, getBootstrapNodeEnr } from '@aztec/p2p/test-helpers';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
@@ -155,7 +154,7 @@ export class P2PNetworkTest {
   }) {
     const port = basePort || (await getPort());
 
-    const bootstrapNodeENR = getBootstrapNodeEnr(privateKeyFromHex(BOOTSTRAP_NODE_PRIVATE_KEY), port);
+    const bootstrapNodeENR = await getBootstrapNodeEnr(BOOTSTRAP_NODE_PRIVATE_KEY, port);
     const bootstrapNodeEnr = bootstrapNodeENR.encodeTxt();
 
     const initialValidatorConfig = await createValidatorConfig(
@@ -187,7 +186,7 @@ export class P2PNetworkTest {
     await this.snapshotManager.snapshot('add-bootstrap-node', async ({ aztecNodeConfig }) => {
       const telemetry = getEndToEndTestTelemetryClient(this.metricsPort);
       this.bootstrapNode = await createBootstrapNodeFromPrivateKey(
-        privateKeyFromHex(BOOTSTRAP_NODE_PRIVATE_KEY),
+        BOOTSTRAP_NODE_PRIVATE_KEY,
         this.bootNodePort,
         telemetry,
         aztecNodeConfig,

yarn-project/end-to-end/src/e2e_p2p/preferred_gossip_network.test.ts

@@ -286,9 +286,9 @@ describe('e2e_p2p_preferred_network', () => {
     // We will setup some gossip monitors to ensure that nodes that restrict who they connect to
     // only receive messages from expected peers
 
-    const preferredNodePeerIds = await Promise.all(preferredNodeEnrs.map(x => ENR.decodeTxt(x!).peerId));
+    const preferredNodePeerIds = await Promise.all(preferredNodeEnrs.map(x => ENR.decodeTxt(x!).peerId()));
     const validatorEnrs = await Promise.all(validators.map(p => p.getEncodedEnr()));
-    const validatorPeerIds = await Promise.all(validatorEnrs.map(x => ENR.decodeTxt(x!).peerId));
+    const validatorPeerIds = await Promise.all(validatorEnrs.map(x => ENR.decodeTxt(x!).peerId()));
 
     // No-discovery validators should only receive P2P gossip from preferred nodes, as that is all they connect to
     noDiscoveryValidators.forEach(validator => {

yarn-project/foundation/package.json

@@ -125,7 +125,7 @@
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
-    "@libp2p/interface": "^2.10.3",
+    "@libp2p/interface": "1.3.1",
     "@types/detect-node": "^2.0.0",
     "@types/jest": "^30.0.0",
     "@types/koa": "^2.15.0",

yarn-project/foundation/src/log/libp2p_logger.ts

@@ -21,7 +21,7 @@ function replaceFormatting(message: string) {
     return message;
   }
 
-  return message.replace(/(%p|%a|%e)/g, '%s');
+  return message.replace(/(%p|%a)/g, '%s');
 }
 
 function createLibp2pLogger(component: string): Logger {

yarn-project/p2p/package.json

@@ -78,25 +78,26 @@
     "@aztec/simulator": "workspace:^",
     "@aztec/stdlib": "workspace:^",
     "@aztec/telemetry-client": "workspace:^",
-    "@chainsafe/discv5": "^11.0.2",
-    "@chainsafe/enr": "^5.0.1",
-    "@chainsafe/libp2p-gossipsub": "14.1.1",
-    "@chainsafe/libp2p-noise": "^16.1.3",
-    "@chainsafe/libp2p-yamux": "^7.0.1",
-    "@libp2p/bootstrap": "^11.0.39",
-    "@libp2p/crypto": "^5.1.5",
-    "@libp2p/identify": "^3.0.33",
-    "@libp2p/interface": "^2.10.3",
-    "@libp2p/kad-dht": "^15.1.3",
-    "@libp2p/mplex": "^11.0.39",
-    "@libp2p/peer-id": "^5.1.6",
-    "@libp2p/peer-store": "^11.2.3",
-    "@libp2p/prometheus-metrics": "^4.3.22",
-    "@libp2p/tcp": "^10.1.14",
-    "@multiformats/multiaddr": "12.4.4",
-    "interface-datastore": "^8.3.2",
+    "@chainsafe/discv5": "9.0.0",
+    "@chainsafe/enr": "3.0.0",
+    "@chainsafe/libp2p-gossipsub": "13.0.0",
+    "@chainsafe/libp2p-noise": "^15.0.0",
+    "@chainsafe/libp2p-yamux": "^6.0.2",
+    "@libp2p/bootstrap": "10.0.0",
+    "@libp2p/crypto": "4.0.3",
+    "@libp2p/identify": "1.0.18",
+    "@libp2p/interface": "1.3.1",
+    "@libp2p/kad-dht": "10.0.4",
+    "@libp2p/mplex": "10.0.16",
+    "@libp2p/peer-id": "4.0.7",
+    "@libp2p/peer-id-factory": "4.1.1",
+    "@libp2p/peer-store": "10.0.16",
+    "@libp2p/prometheus-metrics": "^4.2.4",
+    "@libp2p/tcp": "9.0.24",
+    "@multiformats/multiaddr": "12.1.14",
+    "interface-datastore": "^8.2.11",
     "interface-store": "^5.1.8",
-    "libp2p": "2.8.9",
+    "libp2p": "1.5.0",
     "semver": "^7.6.0",
     "sha3": "^2.1.4",
     "snappy": "^7.2.2",