Discv5 support

Cargo.toml

@@ -13,6 +13,7 @@ members = [
     "crates/metrics/metrics-derive/",
     "crates/net/common/",
     "crates/net/discv4/",
+    "crates/net/discv5/",
     "crates/net/dns/",
     "crates/net/downloaders/",
     "crates/net/ecies/",
@@ -114,6 +115,7 @@ reth-config = { path = "crates/config" }
 reth-consensus-common = { path = "crates/consensus/common" }
 reth-db = { path = "crates/storage/db" }
 reth-discv4 = { path = "crates/net/discv4" }
+reth-discv5 = { path = "crates/net/discv5" }
 reth-dns-discovery = { path = "crates/net/dns" }
 reth-node-builder = { path = "crates/node-builder" }
 reth-node-core = { path = "crates/node-core" }
@@ -181,8 +183,7 @@ ethers-core = { version = "2.0", default-features = false }
 ethers-providers = { version = "2.0", default-features = false }
 ethers-signers = { version = "2.0", default-features = false }
 ethers-middleware = { version = "2.0", default-features = false }
-
-discv5 = { git = "https://github.com/sigp/discv5", rev = "f289bbd4c57d499bb1bdb393af3c249600a1c662" }
+discv5 = { version = "0.3" }
 igd = { git = "https://github.com/stevefan1999-personal/rust-igd", rev = "c2d1f83eb1612a462962453cb0703bc93258b173" }
 
 # js
@@ -213,6 +214,7 @@ once_cell = "1.17"
 syn = "2.0"
 ahash = "0.8.6"
 nybbles = "0.1"
+smallvec = "1.13.1"
 
 # proc-macros
 proc-macro2 = "1.0"

crates/net/discv4/Cargo.toml

@@ -34,6 +34,9 @@ parking_lot.workspace = true
 rand = { workspace = true, optional = true }
 generic-array = "0.14"
 serde = { workspace = true, optional = true }
+itertools.workspace = true
+smallvec.workspace = true
+derive_more.workspace = true
 
 [dev-dependencies]
 rand.workspace = true

crates/net/discv4/src/error.rs

@@ -1,6 +1,6 @@
 //! Error types that can occur in this crate.
 
-use tokio::sync::{mpsc::error::SendError, oneshot::error::RecvError};
+use tokio::sync::{mpsc::error::SendError, oneshot::error::RecvError, watch};
 
 /// Error thrown when decoding a UDP packet.
 #[derive(Debug, thiserror::Error)]
@@ -36,6 +36,12 @@ pub enum Discv4Error {
     /// Failed to receive a command response
     #[error(transparent)]
     Receive(#[from] RecvError),
+    /// Failed to receive state change update.
+    #[error("failed to receive update on state change of primary kbuckets")]
+    MirrorUpdateFailed(watch::error::RecvError),
+    /// Decoding a packet received over the network failed.
+    #[error(transparent)]
+    DecodePacketError(#[from] DecodePacketError),
 }
 
 impl<T> From<SendError<T>> for Discv4Error {