expose kademlia replication factor through node CLI

client/cli/src/params/network_params.rs

@@ -28,7 +28,7 @@ use sc_service::{
 	config::{Multiaddr, MultiaddrWithPeerId},
 	ChainSpec, ChainType,
 };
-use std::{borrow::Cow, path::PathBuf};
+use std::{borrow::Cow, num::NonZeroUsize, path::PathBuf};
 
 /// Parameters used to create the network configuration.
 #[derive(Debug, Clone, Args)]
@@ -121,6 +121,12 @@ pub struct NetworkParams {
 	#[arg(long)]
 	pub kademlia_disjoint_query_paths: bool,
 
+	/// Kademlia replication factor determines to how many closest peers a record is replicated to.
+	/// Default value is 20. Discovery mechanism requires successful replication to all
+	/// `kademlia_replication_factor` peers to consider record successfully put.
+	#[arg(long)]
+	pub kademlia_replication_factor: Option<NonZeroUsize>,
+
 	/// Join the IPFS network and serve transactions over bitswap protocol.
 	#[arg(long)]
 	pub ipfs_server: bool,
@@ -233,6 +239,7 @@ impl NetworkParams {
 			enable_dht_random_walk: !self.reserved_only,
 			allow_non_globals_in_dht,
 			kademlia_disjoint_query_paths: self.kademlia_disjoint_query_paths,
+			kademlia_replication_factor: self.kademlia_replication_factor,
 			yamux_window_size: None,
 			ipfs_server: self.ipfs_server,
 			sync_mode: self.sync.into(),

client/network/src/config.rs

@@ -50,6 +50,7 @@ use std::{
 	io::{self, Write},
 	iter,
 	net::Ipv4Addr,
+	num::NonZeroUsize,
 	path::{Path, PathBuf},
 	pin::Pin,
 	str::{self, FromStr},
@@ -605,6 +606,9 @@ pub struct NetworkConfiguration {
 	/// the presence of potentially adversarial nodes.
 	pub kademlia_disjoint_query_paths: bool,
 
+	/// None will end up using default Kadmelia value.
+	pub kademlia_replication_factor: Option<NonZeroUsize>,
+
 	/// Enable serving block data over IPFS bitswap.
 	pub ipfs_server: bool,
 
@@ -656,6 +660,7 @@ impl NetworkConfiguration {
 			enable_dht_random_walk: true,
 			allow_non_globals_in_dht: false,
 			kademlia_disjoint_query_paths: false,
+			kademlia_replication_factor: None,
 			yamux_window_size: None,
 			ipfs_server: false,
 		}

client/network/src/discovery.rs

@@ -101,6 +101,7 @@ pub struct DiscoveryConfig {
 	enable_mdns: bool,
 	kademlia_disjoint_query_paths: bool,
 	kademlia_protocols: Vec<Vec<u8>>,
+	kademlia_replication_factor: Option<NonZeroUsize>,
 }
 
 impl DiscoveryConfig {
@@ -116,6 +117,7 @@ impl DiscoveryConfig {
 			enable_mdns: false,
 			kademlia_disjoint_query_paths: false,
 			kademlia_protocols: Vec::new(),
+			kademlia_replication_factor: None,
 		}
 	}
 
@@ -182,6 +184,11 @@ impl DiscoveryConfig {
 		self
 	}
 
+	pub fn with_kademlia_replication_factor(&mut self, value: NonZeroUsize) -> &mut Self {
+		self.kademlia_replication_factor = Some(value);
+		self
+	}
+
 	/// Create a `DiscoveryBehaviour` from this config.
 	pub fn finish(self) -> DiscoveryBehaviour {
 		let Self {
@@ -194,10 +201,16 @@ impl DiscoveryConfig {
 			enable_mdns,
 			kademlia_disjoint_query_paths,
 			kademlia_protocols,
+			kademlia_replication_factor,
 		} = self;
 
 		let kademlia = if !kademlia_protocols.is_empty() {
 			let mut config = KademliaConfig::default();
+
+			if let Some(replication_factor) = kademlia_replication_factor {
+				config.set_replication_factor(replication_factor);
+			}
+
 			config.set_protocol_names(kademlia_protocols.into_iter().map(Into::into).collect());
 			// By default Kademlia attempts to insert all peers into its routing table once a
 			// dialing attempt succeeds. In order to control which peer is added, disable the

client/network/src/service.rs

@@ -321,7 +321,13 @@ where
 					network_config.kademlia_disjoint_query_paths,
 				);
 
-				match network_config.transport {
+				if let Some(kademlia_replication_factor) =
+					params.network_config.kademlia_replication_factor
+				{
+					config.with_kademlia_replication_factor(kademlia_replication_factor);
+				}
+
+				match params.network_config.transport {
 					TransportConfig::MemoryOnly => {
 						config.with_mdns(false);
 						config.allow_private_ip(false);

frame/democracy/src/migrations/unlock_and_unreserve_all_funds.rs

@@ -150,8 +150,17 @@ where
 
 		log::info!(target: LOG_TARGET, "Total accounts: {:?}", all_accounts.len());
 		log::info!(target: LOG_TARGET, "Total stake to unlock: {:?}", total_stake_to_unlock);
-		log::info!(target: LOG_TARGET, "Total deposit to unreserve: {:?}", total_deposits_to_unreserve);
-		log::info!(target: LOG_TARGET, "Bugged deposits: {}/{}", bugged_deposits, account_deposits.len());
+		log::info!(
+			target: LOG_TARGET,
+			"Total deposit to unreserve: {:?}",
+			total_deposits_to_unreserve
+		);
+		log::info!(
+			target: LOG_TARGET,
+			"Bugged deposits: {}/{}",
+			bugged_deposits,
+			account_deposits.len()
+		);
 
 		Ok(account_reserved_before.encode())
 	}

frame/elections-phragmen/src/migrations/unlock_and_unreserve_all_funds.rs

@@ -165,11 +165,20 @@ where
 		let total_stake_to_unlock = account_staked_sums.clone().into_values().sum::<BalanceOf<T>>();
 		let total_deposits_to_unreserve =
 			account_deposited_sums.clone().into_values().sum::<BalanceOf<T>>();
-		log::info!(target: LOG_TARGET,  "Total accounts: {:?}", all_accounts.len());
+		log::info!(target: LOG_TARGET, "Total accounts: {:?}", all_accounts.len());
 		log::info!(target: LOG_TARGET, "Total stake to unlock: {:?}", total_stake_to_unlock);
-		log::info!(target: LOG_TARGET, "Total deposit to unreserve: {:?}", total_deposits_to_unreserve);
+		log::info!(
+			target: LOG_TARGET,
+			"Total deposit to unreserve: {:?}",
+			total_deposits_to_unreserve
+		);
 		if bugged_deposits > 0 {
-			log::warn!(target: LOG_TARGET, "Bugged deposits: {}/{}", bugged_deposits, all_accounts.len());
+			log::warn!(
+				target: LOG_TARGET,
+				"Bugged deposits: {}/{}",
+				bugged_deposits,
+				all_accounts.len()
+			);
 		}
 
 		Ok(account_reserved_before.encode())