gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-09 11:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Lighthouse Dependencies (#2818)

Browse Source 
## Issue Addressed

Updates lighthouse dependencies to resolve audit issues in out-dated deps.
This commit is contained in:
Age Manning
2021-11-18 05:08:42 +00:00
parent e32c09bfda
commit e519af9012
27 changed files with 286 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
beacon_node/lighthouse_network/src/behaviour/mod.rs
View File

@@ -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,
});
}

10
beacon_node/lighthouse_network/src/service.rs
View File

@@ -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());
}
}