From d4353c4971bf7487439310510d816a7bf7b4179a Mon Sep 17 00:00:00 2001
From: Alexandru Vasile <60601340+lexnv@users.noreply.github.com>
Date: Wed, 13 Mar 2024 13:33:27 +0200
Subject: [PATCH] authority-discovery: Add log for debugging DHT authority
 records (#3668)

This PR adds a debug log for displaying all the public addresses that
will later be advertised in the DHT record of the authority. The
Authority DHT record will contain the address ++ `/p2p/peerID` (if not
already present).

This log enables us to check if different nodes will advertise in the
DHT record of the authority the same IP address, however with different
peer IDs.

Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
---
 .../client/authority-discovery/src/worker.rs  | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/substrate/client/authority-discovery/src/worker.rs b/substrate/client/authority-discovery/src/worker.rs
index 6db25416dee7..9bccb96ff378 100644
--- a/substrate/client/authority-discovery/src/worker.rs
+++ b/substrate/client/authority-discovery/src/worker.rs
@@ -306,29 +306,30 @@ where
 	fn addresses_to_publish(&self) -> impl Iterator<Item = Multiaddr> {
 		let peer_id: Multihash = self.network.local_peer_id().into();
 		let publish_non_global_ips = self.publish_non_global_ips;
-		self.network
-			.external_addresses()
-			.into_iter()
-			.filter(move |a| {
-				if publish_non_global_ips {
-					return true
-				}
+		let addresses = self.network.external_addresses().into_iter().filter(move |a| {
+			if publish_non_global_ips {
+				return true
+			}
 
-				a.iter().all(|p| match p {
-					// The `ip_network` library is used because its `is_global()` method is stable,
-					// while `is_global()` in the standard library currently isn't.
-					multiaddr::Protocol::Ip4(ip) if !IpNetwork::from(ip).is_global() => false,
-					multiaddr::Protocol::Ip6(ip) if !IpNetwork::from(ip).is_global() => false,
-					_ => true,
-				})
-			})
-			.map(move |a| {
-				if a.iter().any(|p| matches!(p, multiaddr::Protocol::P2p(_))) {
-					a
-				} else {
-					a.with(multiaddr::Protocol::P2p(peer_id))
-				}
+			a.iter().all(|p| match p {
+				// The `ip_network` library is used because its `is_global()` method is stable,
+				// while `is_global()` in the standard library currently isn't.
+				multiaddr::Protocol::Ip4(ip) if !IpNetwork::from(ip).is_global() => false,
+				multiaddr::Protocol::Ip6(ip) if !IpNetwork::from(ip).is_global() => false,
+				_ => true,
 			})
+		});
+
+		debug!(target: LOG_TARGET, "Authority DHT record peer_id='{:?}' addresses='{:?}'", peer_id, addresses.clone().collect::<Vec<_>>());
+
+		// The address must include the peer id if not already set.
+		addresses.map(move |a| {
+			if a.iter().any(|p| matches!(p, multiaddr::Protocol::P2p(_))) {
+				a
+			} else {
+				a.with(multiaddr::Protocol::P2p(peer_id))
+			}
+		})
 	}
 
 	/// Publish own public addresses.