chore: bump discv5 to 0.9 includes NAT fixes (#1639)

Cargo.toml

@@ -45,7 +45,7 @@ chrono = "0.4.38"
 clap = { version = "4.2.1", features = ["derive"] }
 delay_map = "0.4.0"
 directories = "3.0"
-discv5 = { version = "0.4.1", features = ["serde"] }
+discv5 = { git = "https://github.com/kolbyml/discv5", rev = "7dcd74031aa98c220c2984bbc2274c414b6f709f", features = ["serde"] }
 env_logger = "0.9.0"
 eth_trie = "0.5.0"
 ethereum_hashing = "0.7.0"

bin/portal-bridge/src/cli.rs

@@ -267,8 +267,8 @@ impl FromStr for ClientType {
 impl From<&Enr> for ClientType {
     fn from(enr: &Enr) -> Self {
         let client_id = enr
-            .get(ENR_PORTAL_CLIENT_KEY)
-            .and_then(|v| String::from_utf8(v.to_vec()).ok());
+            .get_decodable::<String>(ENR_PORTAL_CLIENT_KEY)
+            .and_then(|v| v.ok());
         if let Some(client_id) = client_id {
             if client_id.starts_with("t") {
                 ClientType::Trin

crates/ethportal-api/Cargo.toml

@@ -34,7 +34,6 @@ lazy_static.workspace = true
 once_cell = "1.17"
 quickcheck.workspace = true
 rand.workspace = true
-rlp = "0.5.0"
 rs_merkle = "1.4.2"
 secp256k1 = { version = "0.29.0", features = ["global-context", "recovery", "rand"] }
 serde = { workspace = true, features = ["rc"] }

crates/ethportal-api/src/types/enr.rs

@@ -4,17 +4,19 @@ use std::{
     str::FromStr,
 };
 
+use alloy_rlp::{Encodable, RlpDecodableWrapper, RlpEncodableWrapper};
 use discv5::enr::{CombinedKey, Enr as Discv5Enr};
 use rand::Rng;
-use rlp::Encodable;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use ssz::DecodeError;
 use validator::ValidationError;
 
 pub type Enr = Discv5Enr<CombinedKey>;
 
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
+#[derive(
+    Debug, PartialEq, Clone, Serialize, Deserialize, RlpEncodableWrapper, RlpDecodableWrapper,
+)]
 pub struct SszEnr(pub Enr);
 
 impl SszEnr {
@@ -76,11 +78,13 @@ impl ssz::Encode for SszEnr {
     }
 
     fn ssz_append(&self, buf: &mut Vec<u8>) {
-        buf.append(&mut self.rlp_bytes().to_vec());
+        self.encode(buf);
     }
 
     fn ssz_bytes_len(&self) -> usize {
-        self.rlp_bytes().to_vec().ssz_bytes_len()
+        let mut buf = vec![];
+        self.encode(&mut buf);
+        buf.ssz_bytes_len()
     }
 }