gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-18 20:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove libp2p multiaddress (#8683)

Browse Source 
Co-Authored-By: João Oliveira <hello@jxs.pt>

Co-Authored-By: ackintosh <sora.akatsuki@gmail.com>
This commit is contained in:
João Oliveira
2026-02-09 23:31:49 +00:00
committed by GitHub
parent a3f04bd2d2
commit 0c9f97f015
5 changed files with 59 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
beacon_node/lighthouse_network/src/discovery/mod.rs
View File

@@ -264,47 +264,62 @@ impl<E: EthSpec> Discovery<E> {
info!("Contacting Multiaddr boot-nodes for their ENR");
}
// get futures for requesting the Enrs associated to these multiaddr and wait for their
// get futures for requesting the ENRs associated to these multiaddr and wait for their
// completion
let mut fut_coll = config
let discv5_eligible_addrs = config
.boot_nodes_multiaddr
.iter()
.map(|addr| addr.to_string())
// request the ENR for this multiaddr and keep the original for logging
.map(|addr| {
futures::future::join(
discv5.request_enr(addr.clone()),
futures::future::ready(addr),
)
})
.collect::<FuturesUnordered<_>>();
// Filter out multiaddrs without UDP or P2P protocols required for discv5 ENR requests
.filter(|addr| {
addr.iter().any(|proto| matches!(proto, Protocol::Udp(_)))
&& addr.iter().any(|proto| matches!(proto, Protocol::P2p(_)))
});
while let Some((result, original_addr)) = fut_coll.next().await {
match result {
Ok(enr) => {
debug!(
node_id = %enr.node_id(),
peer_id = %enr.peer_id(),
ip4 = ?enr.ip4(),
udp4 = ?enr.udp4(),
tcp4 = ?enr.tcp4(),
quic4 = ?enr.quic4(),
"Adding node to routing table"
);
let _ = discv5.add_enr(enr).map_err(|e| {
error!(
addr = original_addr.to_string(),
error = e.to_string(),
"Could not add peer to the local routing table"
)
});
}
Err(e) => {
error!(
multiaddr = original_addr.to_string(),
error = e.to_string(),
"Error getting mapping to ENR"
if config.disable_discovery {
if discv5_eligible_addrs.count() > 0 {
warn!(
"Boot node multiaddrs requiring discv5 ENR lookup will be ignored because discovery is disabled"
);
}
} else {
let mut fut_coll = discv5_eligible_addrs
.map(|addr| addr.to_string())
// request the ENR for this multiaddr and keep the original for logging
.map(|addr| {
futures::future::join(
discv5.request_enr(addr.clone()),
futures::future::ready(addr),
)
})
.collect::<FuturesUnordered<_>>();
while let Some((result, original_addr)) = fut_coll.next().await {
match result {
Ok(enr) => {
debug!(
node_id = %enr.node_id(),
peer_id = %enr.peer_id(),
ip4 = ?enr.ip4(),
udp4 = ?enr.udp4(),
tcp4 = ?enr.tcp4(),
quic4 = ?enr.quic4(),
"Adding node to routing table"
);
let _ = discv5.add_enr(enr).map_err(|e| {
error!(
addr = original_addr.to_string(),
error = e.to_string(),
"Could not add peer to the local routing table"
)
});
}
Err(e) => {
error!(
multiaddr = original_addr.to_string(),
error = e.to_string(),
"Error getting mapping to ENR"
)
}
}
}
}

1
beacon_node/lighthouse_network/src/service/mod.rs
View File

@@ -573,6 +573,7 @@ impl<E: EthSpec> Network<E> {
};
// attempt to connect to user-input libp2p nodes
// DEPRECATED: can be removed in v8.2.0./v9.0.0
for multiaddr in &config.libp2p_nodes {
dial(multiaddr.clone());
}