chore(deps): bump ethers to 2.0.14, enr to 0.10, unpin discv5 (#6634)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>

Cargo.lock

@@ -2113,8 +2113,9 @@ dependencies = [
 
 [[package]]
 name = "discv5"
-version = "0.3.1"
+version = "0.4.1"
-source = "git+https://github.com/sigp/discv5?rev=f289bbd4c57d499bb1bdb393af3c249600a1c662#f289bbd4c57d499bb1bdb393af3c249600a1c662"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bac33cb3f99889a57e56a8c6ccb77aaf0cfc7787602b7af09783f736d77314e1"
 dependencies = [
  "aes 0.7.5",
  "aes-gcm",
@@ -2136,7 +2137,6 @@ dependencies = [
  "socket2 0.4.10",
  "tokio",
  "tracing",
- "tracing-subscriber",
  "uint",
  "zeroize",
 ]
@@ -2313,9 +2313,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "enr"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe81b5c06ecfdbc71dd845216f225f53b62a10cb8a16c946836a3467f701d05b"
+checksum = "2a3d8dc56e02f954cac8eb489772c552c473346fc34f67412bb6244fd647f7e4"
 dependencies = [
  "base64 0.21.7",
  "bytes",
@@ -2468,9 +2468,9 @@ dependencies = [
 
 [[package]]
 name = "ethers-core"
-version = "2.0.13"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aab3cef6cc1c9fd7f787043c81ad3052eff2b96a3878ef1526aa446311bdbfc9"
+checksum = "82d80cc6ad30b14a48ab786523af33b37f28a8623fc06afd55324816ef18fb1f"
 dependencies = [
  "arrayvec",
  "bytes",
@@ -2486,7 +2486,7 @@ dependencies = [
  "rlp",
  "serde",
  "serde_json",
- "strum 0.25.0",
+ "strum 0.26.1",
  "tempfile",
  "thiserror",
  "tiny-keccak",
@@ -2495,9 +2495,9 @@ dependencies = [
 
 [[package]]
 name = "ethers-providers"
-version = "2.0.13"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb6b15393996e3b8a78ef1332d6483c11d839042c17be58decc92fa8b1c3508a"
+checksum = "6434c9a33891f1effc9c75472e12666db2fa5a0fec4b29af6221680a6fe83ab2"
 dependencies = [
  "async-trait",
  "auto_impl",
@@ -3187,7 +3187,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.6",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing",

Cargo.toml

@@ -203,12 +203,8 @@ alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "975a52
 alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "975a52a" }
 
 # TODO: Remove
-ethers-core = { version = "2.0", default-features = false }
+ethers-core = { version = "2.0.14", default-features = false }
-ethers-providers = { version = "2.0", default-features = false }
+ethers-providers = { version = "2.0.14", default-features = false }
-
-discv5 = { git = "https://github.com/sigp/discv5", rev = "f289bbd4c57d499bb1bdb393af3c249600a1c662" }
-# Fork of rust-igd with ipv6 support
-igd-next = "0.14.3"
 
 # js
 boa_engine = "0.17"
@@ -255,6 +251,10 @@ futures = "0.3.26"
 pin-project = "1.0.12"
 futures-util = "0.3.25"
 
+# p2p
+discv5 = "0.4"
+igd-next = "0.14.3"
+
 # rpc
 jsonrpsee = { version = "0.20" }
 jsonrpsee-core = { version = "0.20" }
@@ -266,7 +266,7 @@ secp256k1 = { version = "0.27.0", default-features = false, features = [
     "rand-std",
     "recovery",
 ] }
-enr = { version = "0.9", default-features = false, features = ["k256"] }
+enr = { version = "0.10", default-features = false, features = ["k256"] }
 
 # for eip-4844
 c-kzg = "0.4.2"

crates/net/discv4/src/lib.rs

@@ -37,7 +37,7 @@ use discv5::{
     },
     ConnectionDirection, ConnectionState,
 };
-use enr::{Enr, EnrBuilder};
+use enr::Enr;
 use parking_lot::Mutex;
 use proto::{EnrRequest, EnrResponse, EnrWrapper};
 use reth_primitives::{
@@ -533,7 +533,7 @@ impl Discv4Service {
 
         // for EIP-868 construct an ENR
         let local_eip_868_enr = {
-            let mut builder = EnrBuilder::new("v4");
+            let mut builder = Enr::builder();
             builder.ip(local_node_record.address);
             if local_node_record.address.is_ipv4() {
                 builder.udp4(local_node_record.udp_port);

crates/net/discv4/src/proto.rs

@@ -549,7 +549,7 @@ mod tests {
         test_utils::{rng_endpoint, rng_ipv4_record, rng_ipv6_record, rng_message},
         DEFAULT_DISCOVERY_PORT, SAFE_MAX_DATAGRAM_NEIGHBOUR_RECORDS,
     };
-    use enr::{EnrBuilder, EnrPublicKey};
+    use enr::EnrPublicKey;
     use rand::{thread_rng, Rng, RngCore};
     use reth_primitives::{hex, ForkHash};
 
@@ -780,7 +780,7 @@ mod tests {
         let fork_id: ForkId = ForkId { hash: ForkHash([220, 233, 108, 45]), next: 0u64 };
 
         let enr = {
-            let mut builder = EnrBuilder::new("v4");
+            let mut builder = Enr::builder();
             builder.ip(ip.into());
             builder.tcp4(tcp);
             let mut buf = Vec::new();
@@ -879,7 +879,7 @@ mod tests {
         let tcp = 3000;
 
         let enr = {
-            let mut builder = EnrBuilder::new("v4");
+            let mut builder = Enr::builder();
             builder.ip(ip.into());
             builder.tcp4(tcp);
             EnrWrapper::new(builder.build(&key).unwrap())

crates/net/dns/src/lib.rs

@@ -412,7 +412,7 @@ mod tests {
     use crate::tree::TreeRootEntry;
     use alloy_chains::Chain;
     use alloy_rlp::Encodable;
-    use enr::{EnrBuilder, EnrKey};
+    use enr::EnrKey;
     use reth_primitives::{Hardfork, MAINNET};
     use secp256k1::rand::thread_rng;
     use std::{future::poll_fn, net::Ipv4Addr};
@@ -459,7 +459,7 @@ mod tests {
             LinkEntry { domain: "nodes.example.org".to_string(), pubkey: secret_key.public() };
         resolver.insert(link.domain.clone(), root.to_string());
 
-        let mut builder = EnrBuilder::new("v4");
+        let mut builder = Enr::builder();
         let mut buf = Vec::new();
         let fork_id = MAINNET.hardfork_fork_id(Hardfork::Frontier).unwrap();
         fork_id.encode(&mut buf);
@@ -528,7 +528,7 @@ mod tests {
         // await recheck timeout
         tokio::time::sleep(config.recheck_interval).await;
 
-        let enr = EnrBuilder::new("v4").build(&secret_key).unwrap();
+        let enr = Enr::empty(&secret_key).unwrap();
         resolver.insert(format!("{}.{}", root.enr_root.clone(), link.domain), enr.to_base64());
 
         let event = poll_fn(|cx| service.poll(cx)).await;

deny.toml

@@ -88,8 +88,6 @@ unknown-registry = "warn"
 unknown-git = "deny"
 allow-git = [
     # TODO: remove, see ./Cargo.toml
-    "https://github.com/bluealloy/revm",
     "https://github.com/alloy-rs/alloy",
     "https://github.com/paradigmxyz/evm-inspectors",
-    "https://github.com/sigp/discv5",
 ]