Move the keys in the network state

substrate/network-libp2p/src/network_state.rs

@@ -17,10 +17,11 @@
 use bytes::Bytes;
 use fnv::{FnvHashMap, FnvHashSet};
 use futures::sync::mpsc;
-use libp2p::core::{Multiaddr, AddrComponent, Endpoint, PeerId as PeerstorePeerId};
+use libp2p::core::{Multiaddr, AddrComponent, Endpoint, PeerId as PeerstorePeerId, PublicKey};
 use libp2p::peerstore::{Peerstore, PeerAccess};
 use libp2p::peerstore::json_peerstore::JsonPeerstore;
 use libp2p::peerstore::memory_peerstore::MemoryPeerstore;
+use libp2p::secio;
 use network::{Error, ErrorKind, NetworkConfiguration, NonReservedPeerMode};
 use network::{PeerId, ProtocolId, SessionInfo};
 use parking_lot::{Mutex, RwLock};
@@ -56,6 +57,11 @@ pub struct NetworkState {
 
 	// List of the IDs of the disabled peers. These peers will see their connections refused.
 	disabled_peers: RwLock<FnvHashSet<PeerstorePeerId>>,
+
+	// Local private key.
+	local_private_key: secio::SecioKeyPair,
+	// Local public key.
+	local_public_key: PublicKey,
 }
 
 enum PeersStorage {
@@ -105,6 +111,12 @@ struct PeerConnectionInfo {
 
 impl NetworkState {
 	pub fn new(config: &NetworkConfiguration) -> Result<NetworkState, Error> {
+		// Private and public keys configuration.
+		// TODO: use key from the config ; however that requires supporting secp256k1 in libp2p
+		// 		 see https://github.com/libp2p/rust-libp2p/issues/228
+		let local_private_key = secio::SecioKeyPair::ed25519_generated().unwrap();
+		let local_public_key = local_private_key.to_public_key();
+
 		// Build the storage for peers, including the bootstrap nodes.
 		let peerstore = if let Some(ref path) = config.net_config_path {
 			let path = Path::new(path).join(NODES_FILE);
@@ -148,9 +160,21 @@ impl NetworkState {
 			reserved_peers,
 			next_peer_id: atomic::AtomicUsize::new(0),
 			disabled_peers: RwLock::new(Default::default()),
+			local_private_key,
+			local_public_key,
 		})
 	}
 
+	/// Returns the private key of the local node.
+	pub fn local_private_key(&self) -> &secio::SecioKeyPair {
+		&self.local_private_key
+	}
+
+	/// Returns the public key of the local node.
+	pub fn local_public_key(&self) -> &PublicKey {
+		&self.local_public_key
+	}
+
 	/// Returns all the IDs of the peer we have knowledge of.
 	///
 	/// This includes peers we are not connected to.

substrate/network-libp2p/src/service.rs

@@ -339,11 +339,7 @@ fn init_thread(core: Handle, shared: Arc<Shared>,
 			timeouts_register_rx: mpsc::UnboundedReceiver<(Instant, (Arc<NetworkProtocolHandler + Send + Sync + 'static>, ProtocolId, TimerToken))>,
 			close_rx: oneshot::Receiver<()>) -> Result<impl Future<Item = (), Error = IoError>, Error>
 {
-	// TODO: use key from the config ; however that requires supporting secp256k1 in libp2p
-	// 		 see https://github.com/libp2p/rust-libp2p/issues/228
-	let local_private_key = secio::SecioKeyPair::ed25519_generated().unwrap();
-	let local_public_key = local_private_key.to_public_key();
-	let local_peer_id = local_public_key.clone().into_peer_id();
+	let local_peer_id = shared.network_state.local_public_key().clone().into_peer_id();
 	info!(target: "sub-libp2p", "Local node id = {:?}", local_peer_id);	// TODO: debug! instead?
 
 	// Configuration for Kademlia DHT.
@@ -429,7 +425,7 @@ fn init_thread(core: Handle, shared: Arc<Shared>,
 		libp2p::core::swarm(
 			upgraded_transport,
 			move |(upgrade, endpoint), client_addr| {
-				listener_handle(shared.clone(), upgrade, endpoint, local_public_key.clone(), client_addr)
+				listener_handle(shared.clone(), upgrade, endpoint, client_addr)
 			},
 		)
 	};
@@ -497,7 +493,6 @@ enum FinalUpgrade<C> {
 
 // Called whenever we successfully open a multistream with a remote.
 fn listener_handle<'a, C>(shared: Arc<Shared>, upgrade: FinalUpgrade<C>, endpoint: Endpoint,
-					local_public_key: libp2p::core::PublicKey,
 					client_addr: impl Future<Item = Multiaddr, Error = IoError> + 'a,
 					/*listener_upgrade: impl ConnectionUpgrade<C, Box<Future<Item = Multiaddr, Error = IoError>>>*/)
 					-> Box<Future<Item = (), Error = IoError> + 'a>
@@ -540,7 +535,7 @@ where C: AsyncRead + AsyncWrite + 'a
 				.collect();*/
 			sender.send(
 				IdentifyInfo {
-					public_key: local_public_key.clone(),
+					public_key: shared.network_state.local_public_key().clone(),
 					protocol_version: concat!("substrate/", env!("CARGO_PKG_VERSION")).to_owned(),
 					agent_version: "rust-libp2p/1.0.0".to_owned(),
 					listen_addrs: shared.listened_addrs.read().clone(),