Improvements to system_networkState

core/network-libp2p/src/behaviour.rs

@@ -129,6 +129,11 @@ impl<TMessage, TSubstream> Behaviour<TMessage, TSubstream> {
 	pub fn drop_node(&mut self, peer_id: &PeerId) {
 		self.custom_protocols.disconnect_peer(peer_id)
 	}
+
+	/// Returns the state of the peerset manager, for debugging purposes.
+	pub fn peerset_debug_info(&self) -> serde_json::Value {
+		self.custom_protocols.peerset_debug_info()
+	}
 }
 
 /// Event that can be emitted by the behaviour.

core/network-libp2p/src/custom_proto/behaviour.rs

@@ -317,6 +317,11 @@ impl<TMessage, TSubstream> CustomProto<TMessage, TSubstream> {
 		self.peerset.discovered(peer_id.clone())
 	}
 
+	/// Returns the state of the peerset manager, for debugging purposes.
+	pub fn peerset_debug_info(&self) -> serde_json::Value {
+		self.peerset.debug_info()
+	}
+
 	/// Function that is called when the peerset wants us to connect to a node.
 	fn peerset_report_connect(&mut self, peer_id: PeerId) {
 		let mut occ_entry = match self.peers.entry(peer_id) {

core/network-libp2p/src/lib.rs

@@ -99,7 +99,8 @@ pub struct NetworkState {
 	pub peer_id: String,
 	/// List of addresses the node is currently listening on.
 	pub listened_addresses: HashSet<Multiaddr>,
-	// TODO (https://github.com/libp2p/rust-libp2p/issues/978): external_addresses: Vec<Multiaddr>,
+	/// List of addresses the node knows it can be reached as.
+	pub external_addresses: HashSet<Multiaddr>,
 	/// List of node we're connected to.
 	pub connected_peers: HashMap<String, NetworkStatePeer>,
 	/// List of node that we know of but that we're not connected to.
@@ -108,6 +109,8 @@ pub struct NetworkState {
 	pub average_download_per_sec: u64,
 	/// Uploaded bytes per second averaged over the past few seconds.
 	pub average_upload_per_sec: u64,
+	/// State of the peerset manager.
+	pub peerset: serde_json::Value,
 }
 
 #[derive(Debug, PartialEq, Serialize)]

core/network-libp2p/src/service_task.rs

@@ -220,10 +220,12 @@ where TMessage: CustomMessage + Send + 'static {
 		NetworkState {
 			peer_id: Swarm::local_peer_id(&self.swarm).to_base58(),
 			listened_addresses: Swarm::listeners(&self.swarm).cloned().collect(),
+			external_addresses: Swarm::external_addresses(&self.swarm).cloned().collect(),
 			average_download_per_sec: self.bandwidth.average_download_per_sec(),
 			average_upload_per_sec: self.bandwidth.average_upload_per_sec(),
 			connected_peers,
 			not_connected_peers,
+			peerset: self.swarm.peerset_debug_info(),
 		}
 	}
 

core/peerset/src/lib.rs

@@ -23,6 +23,8 @@ use libp2p::PeerId;
 use parking_lot::Mutex;
 use std::sync::Arc;
 
+pub use serde_json::Value;
+
 /// Shared part of the peer set manager (PSM). Distributed around the code.
 pub struct Peerset {
 	tx: mpsc::UnboundedSender<Message>,
@@ -297,6 +299,11 @@ impl PeersetMut {
 		}
 		alloc_slots(&mut inner, &self.parent.tx);
 	}
+
+	/// Produces a JSON object containing the state of the peerset manager, for debugging purposes.
+	pub fn debug_info(&self) -> serde_json::Value {
+		serde_json::Value::Null
+	}
 }
 
 impl Stream for PeersetMut {

core/rpc/src/system/tests.rs

@@ -50,10 +50,12 @@ impl network::SyncProvider<Block> for Status {
 		network::NetworkState {
 			peer_id: String::new(),
 			listened_addresses: Default::default(),
+			external_addresses: Default::default(),
 			connected_peers: Default::default(),
 			not_connected_peers: Default::default(),
 			average_download_per_sec: 0,
 			average_upload_per_sec: 0,
+			peerset: serde_json::Value::Null,
 		}
 	}
 
@@ -202,10 +204,12 @@ fn system_network_state() {
 		network::NetworkState {
 			peer_id: String::new(),
 			listened_addresses: Default::default(),
+			external_addresses: Default::default(),
 			connected_peers: Default::default(),
 			not_connected_peers: Default::default(),
 			average_download_per_sec: 0,
 			average_upload_per_sec: 0,
+			peerset: serde_json::Value::Null,
 		}
 	);
 }