From 2e00419f59dad1999dd9258e0e3ec5e72d32794a Mon Sep 17 00:00:00 2001 From: Alexandru Vasile Date: Mon, 18 Nov 2024 17:44:34 +0200 Subject: [PATCH] libp2p: Revert discovery address check from stable code Signed-off-by: Alexandru Vasile --- substrate/client/network/src/discovery.rs | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/substrate/client/network/src/discovery.rs b/substrate/client/network/src/discovery.rs index f8553db1c8a3..86c66c22701c 100644 --- a/substrate/client/network/src/discovery.rs +++ b/substrate/client/network/src/discovery.rs @@ -749,28 +749,16 @@ impl NetworkBehaviour for DiscoveryBehaviour { self.mdns.on_swarm_event(FromSwarm::NewListenAddr(e)); }, FromSwarm::ExternalAddrConfirmed(e @ ExternalAddrConfirmed { addr }) => { - let mut address = addr.clone(); + let new_addr = addr.clone().with(Protocol::P2p(self.local_peer_id)); - if let Some(Protocol::P2p(peer_id)) = addr.iter().last() { - if peer_id != self.local_peer_id { - warn!( - target: "sub-libp2p", - "🔍 Discovered external address for a peer that is not us: {addr}", - ); - // Ensure this address is not propagated to kademlia. - return - } - } else { - address.push(Protocol::P2p(self.local_peer_id)); - } - - if Self::can_add_to_dht(&address) { + if Self::can_add_to_dht(addr) { // NOTE: we might re-discover the same address multiple times // in which case we just want to refrain from logging. - if self.known_external_addresses.insert(address.clone()) { + if self.known_external_addresses.insert(new_addr.clone()) { info!( target: "sub-libp2p", - "🔍 Discovered new external address for our node: {address}", + "🔍 Discovered new external address for our node: {}", + new_addr, ); } }