Update Lighthouse Dependencies (#2818)

## Issue Addressed

Updates lighthouse dependencies to resolve audit issues in out-dated deps.

beacon_node/lighthouse_network/Cargo.toml

@@ -16,7 +16,7 @@ eth2_ssz = "0.4.0"
 eth2_ssz_derive = "0.3.0"
 slog = { version = "2.5.2", features = ["max_level_trace"] }
 lighthouse_version = { path = "../../common/lighthouse_version" }
-tokio = { version = "1.10.0", features = ["time", "macros"] }
+tokio = { version = "1.14.0", features = ["time", "macros"] }
 futures = "0.3.7"
 error-chain = "0.12.4"
 dirs = "3.0.1"
@@ -40,7 +40,7 @@ strum = { version = "0.21.0", features = ["derive"] }
 superstruct = "0.2.0"
 
 [dependencies.libp2p]
-version = "0.40.0-rc.3"
+version = "0.41.0"
 default-features = false
 features = ["websocket", "identify", "mplex", "yamux", "noise", "gossipsub", "dns-tokio", "tcp-tokio"]
 

beacon_node/lighthouse_network/src/behaviour/mod.rs

@@ -26,7 +26,8 @@ use libp2p::{
     },
     identify::{Identify, IdentifyConfig, IdentifyEvent},
     swarm::{
-        AddressScore, DialPeerCondition, NetworkBehaviour, NetworkBehaviourAction as NBAction,
+        dial_opts::{DialOpts, PeerCondition},
+        AddressScore, NetworkBehaviour, NetworkBehaviourAction as NBAction,
         NetworkBehaviourEventProcess, PollParameters,
     },
     NetworkBehaviour, PeerId,
@@ -232,6 +233,7 @@ impl<TSpec: EthSpec> Behaviour<TSpec> {
         let mut gossipsub = Gossipsub::new_with_subscription_filter_and_transform(
             MessageAuthenticity::Anonymous,
             config.gs_config.clone(),
+            None, // No metrics for the time being
             filter,
             snappy_transform,
         )
@@ -1071,9 +1073,10 @@ impl<TSpec: EthSpec> Behaviour<TSpec> {
             match event {
                 InternalBehaviourMessage::DialPeer(peer_id) => {
                     let handler = self.new_handler();
-                    return Poll::Ready(NBAction::DialPeer {
-                        peer_id,
-                        condition: DialPeerCondition::Disconnected,
+                    return Poll::Ready(NBAction::Dial {
+                        opts: DialOpts::peer_id(peer_id)
+                            .condition(PeerCondition::Disconnected)
+                            .build(),
                         handler,
                     });
                 }

beacon_node/lighthouse_network/src/service.rs

@@ -185,10 +185,10 @@ impl<TSpec: EthSpec> Service<TSpec> {
         };
 
         // helper closure for dialing peers
-        let mut dial_addr = |mut multiaddr: Multiaddr| {
+        let mut dial = |mut multiaddr: Multiaddr| {
             // strip the p2p protocol if it exists
             strip_peer_id(&mut multiaddr);
-            match Swarm::dial_addr(&mut swarm, multiaddr.clone()) {
+            match Swarm::dial(&mut swarm, multiaddr.clone()) {
                 Ok(()) => debug!(log, "Dialing libp2p peer"; "address" => %multiaddr),
                 Err(err) => debug!(
                     log,
@@ -199,7 +199,7 @@ impl<TSpec: EthSpec> Service<TSpec> {
 
         // attempt to connect to user-input libp2p nodes
         for multiaddr in &config.libp2p_nodes {
-            dial_addr(multiaddr.clone());
+            dial(multiaddr.clone());
         }
 
         // attempt to connect to any specified boot-nodes
@@ -219,7 +219,7 @@ impl<TSpec: EthSpec> Service<TSpec> {
                     .read()
                     .is_connected_or_dialing(&bootnode_enr.peer_id())
                 {
-                    dial_addr(multiaddr.clone());
+                    dial(multiaddr.clone());
                 }
             }
         }
@@ -230,7 +230,7 @@ impl<TSpec: EthSpec> Service<TSpec> {
                 .iter()
                 .any(|proto| matches!(proto, Protocol::Tcp(_)))
             {
-                dial_addr(multiaddr.clone());
+                dial(multiaddr.clone());
             }
         }
 

beacon_node/lighthouse_network/tests/common/mod.rs

@@ -160,7 +160,7 @@ pub async fn build_full_mesh(
     for (i, node) in nodes.iter_mut().enumerate().take(n) {
         for (j, multiaddr) in multiaddrs.iter().enumerate().skip(i) {
             if i != j {
-                match libp2p::Swarm::dial_addr(&mut node.swarm, multiaddr.clone()) {
+                match libp2p::Swarm::dial(&mut node.swarm, multiaddr.clone()) {
                     Ok(()) => debug!(log, "Connected"),
                     Err(_) => error!(log, "Failed to connect"),
                 };
@@ -209,7 +209,7 @@ pub async fn build_node_pair(
         _ = joined => {}
     }
 
-    match libp2p::Swarm::dial_addr(&mut sender.swarm, receiver_multiaddr.clone()) {
+    match libp2p::Swarm::dial(&mut sender.swarm, receiver_multiaddr.clone()) {
         Ok(()) => {
             debug!(log, "Sender dialed receiver"; "address" => format!("{:?}", receiver_multiaddr))
         }
@@ -231,7 +231,7 @@ pub async fn build_linear(rt: Weak<Runtime>, log: slog::Logger, n: usize) -> Vec
         .map(|x| get_enr(x).multiaddr()[1].clone())
         .collect();
     for i in 0..n - 1 {
-        match libp2p::Swarm::dial_addr(&mut nodes[i].swarm, multiaddrs[i + 1].clone()) {
+        match libp2p::Swarm::dial(&mut nodes[i].swarm, multiaddrs[i + 1].clone()) {
             Ok(()) => debug!(log, "Connected"),
             Err(_) => error!(log, "Failed to connect"),
         };