Bump to discv5 experimental branch for concurrent requests

Author: njgheorghita

Cargo.lock

@@ -15,7 +15,7 @@ description = "A Rust implementation of the Ethereum Portal Network"
 [dependencies]
 anyhow = "1.0.68"
 clap = { version = "4.2.1", features = ["derive"] }
-discv5 = { version = "0.3.1", features = ["serde"] }
+discv5 = { git = "https://github.com/njgheorghita/discv5.git", rev = "09262ead2882e062de1a6a45df9ea61917eb8465", features = ["serde"] }
 eth2_ssz = "0.4.0"
 ethereum-types = "0.12.1"
 ethportal-api = { path = "ethportal-api" }

Cargo.toml

@@ -15,7 +15,7 @@ anyhow = "1.0.68"
 base64 = "0.13.0"
 bytes = "1.3.0"
 clap = { version = "4.2.1", features = ["derive"] }
-discv5 = { version = "0.3.1", features = ["serde"]}
+discv5 = { git = "https://github.com/njgheorghita/discv5.git", rev = "09262ead2882e062de1a6a45df9ea61917eb8465", features = ["serde"] }
 eth_trie = "0.3.0"
 eth2_ssz = "0.4.0"
 eth2_ssz_derive = "0.3.0"

ethportal-api/Cargo.toml

@@ -12,7 +12,7 @@ authors = ["https://github.com/ethereum/trin/graphs/contributors"]
 
 [dependencies]
 anyhow = "1.0.68"
-discv5 = { version = "0.3.1", features = ["serde"]}
+discv5 = { git = "https://github.com/njgheorghita/discv5.git", rev = "09262ead2882e062de1a6a45df9ea61917eb8465", features = ["serde"] }
 eth2_ssz = "0.4.0"
 ethereum-types = "0.12.1"
 ethportal-api = { path="../ethportal-api"}

ethportal-peertest/Cargo.toml

@@ -53,7 +53,7 @@ pub async fn test_beacon_bridge(peertest: &Peertest, target: &HttpClient) {
     let mode = BridgeMode::Test("./test_assets/portalnet/beacon_bridge_data.yaml".into());
     // Wait for bootnode to start
     sleep(Duration::from_secs(1)).await;
-    let consensus_api = ConsensusApi::new(Default::default());
+    let consensus_api = ConsensusApi::default();
     let bridge = BeaconBridge::new(consensus_api, mode, portal_clients);
     bridge.launch().await;
 

ethportal-peertest/src/scenarios/bridge.rs

@@ -24,7 +24,7 @@ pub async fn test_find_content_return_enr(target: &Client, peertest: &Peertest)
                 panic!("Response from GetEnr didn't return expected Enr");
             }
         }
-        Err(err) => panic!("{}", &err.to_string()),
+        Err(err) => panic!("{err}"),
     }
 
     let result = target

ethportal-peertest/src/scenarios/find.rs

@@ -16,7 +16,7 @@ anyhow = "1.0.68"
 async-trait = "0.1.68"
 chrono = "0.4.26"
 clap = { version = "4.2.1", features = ["derive"] }
-discv5 = { version = "0.3.1", features = ["serde"]}
+discv5 = { git = "https://github.com/njgheorghita/discv5.git", rev = "09262ead2882e062de1a6a45df9ea61917eb8465", features = ["serde"] }
 ethportal-api = { path = "../ethportal-api" }
 ethereum-types = "0.12.1"
 eth2_ssz = "0.4.0"

portal-bridge/Cargo.toml

@@ -2,7 +2,7 @@ use crate::pandaops::PandaOpsMiddleware;
 use std::fmt::Display;
 
 /// Implements endpoints from the Beacon API to access data from the consensus layer.
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub struct ConsensusApi {
     middleware: PandaOpsMiddleware,
 }

portal-bridge/src/consensus_api.rs

@@ -17,7 +17,7 @@ base64 = "0.13.0"
 bytes = "1.3.0"
 delay_map = "0.1.1"
 directories = "3.0"
-discv5 = { version = "0.3.1", features = ["serde"]}
+discv5 = { git = "https://github.com/njgheorghita/discv5.git", rev = "09262ead2882e062de1a6a45df9ea61917eb8465", features = ["serde"] }
 eth2_ssz = "0.4.0"
 eth2_ssz_derive = "0.3.0"
 eth2_ssz_types = "0.2.1"

portalnet/Cargo.toml

@@ -2,7 +2,7 @@ use anyhow::anyhow;
 use async_trait::async_trait;
 use discv5::{
     enr::{CombinedKey, EnrBuilder, NodeId},
-    Discv5, Discv5ConfigBuilder, Discv5Event, ListenConfig, RequestError, TalkRequest,
+    ConfigBuilder, Discv5, Event, ListenConfig, RequestError, TalkRequest,
 };
 use lru::LruCache;
 use parking_lot::RwLock;
@@ -110,7 +110,7 @@ impl Discovery {
             port: portal_config.listen_port,
         };
 
-        let discv5_config = Discv5ConfigBuilder::new(listen_config).build();
+        let discv5_config = ConfigBuilder::new(listen_config).build();
         let discv5 = Discv5::new(enr, enr_key, discv5_config)
             .map_err(|e| format!("Failed to create discv5 instance: {e}"))?;
 
@@ -162,11 +162,11 @@ impl Discovery {
         tokio::spawn(async move {
             while let Some(event) = event_rx.recv().await {
                 match event {
-                    Discv5Event::TalkRequest(talk_req) => {
+                    Event::TalkRequest(talk_req) => {
                         // Forward all TALKREQ messages.
                         let _ = talk_req_tx.send(talk_req).await;
                     }
-                    Discv5Event::SessionEstablished(enr, socket_addr) => {
+                    Event::SessionEstablished(enr, socket_addr) => {
                         if let Some(old) = node_addr_cache.write().put(
                             enr.node_id(),
                             NodeAddress {