Bump to latest Substrate (#898)

* Flag to force kusama runtime

* Chainspecs for kusama

* Polkadot config for westend

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>

* network/src/legacy/gossip: Wrap GossipEngine in Arc Mutex & lock it on use

`GossipEngine` in itself has no need to be Send and Sync, given that it
does not rely on separately spawned background tasks anymore.
`RegisteredMessageValidator` needs to be `Send` and `Sync` due to the
inherited trait bounds from implementing `GossipService`. In addition
`RegisteredMessageValidator` derives `Clone`. Thereby `GossipEngine`
needs to be wrapped in an `Arc` and `Mutex` to keep the status quo.

* Needed fixes.

* Fixes

* Fixed build

* Fixed build w benchmarking CLI

* Fixed building tests

* Added --dev shortcut

Co-authored-by: arkpar <arkady.paronyan@gmail.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Max Inden <mail@max-inden.de>

polkadot/cli/src/chain_spec.rs

@@ -22,16 +22,22 @@ use service;
 /// specification).
 #[derive(Clone, Debug)]
 pub enum ChainSpec {
-	/// Whatever the current runtime is, with just Alice as an auth.
-	Development,
-	/// Whatever the current runtime is, with simple Alice/Bob auths.
-	LocalTestnet,
+	/// Whatever the current polkadot runtime is, with just Alice as an auth.
+	PolkadotDevelopment,
+	/// Whatever the current pokadot runtime is, with simple Alice/Bob auths.
+	PolkadotLocalTestnet,
 	/// The Kusama network.
 	Kusama,
+	/// Whatever the current kusama runtime is, with just Alice as an auth.
+	KusamaDevelopment,
 	/// The Westend network,
 	Westend,
-	/// Whatever the current runtime is with the "global testnet" defaults.
-	StagingTestnet,
+	/// Whatever the current polkadot runtime is with the "global testnet" defaults.
+	PolkadotStagingTestnet,
+	/// Whatever the current kusama runtime is with the "global testnet" defaults.
+	KusamaStagingTestnet,
+	/// Whatever the current kusama runtime is, with simple Alice/Bob auths.
+	KusamaLocalTestnet,
 }
 
 impl Default for ChainSpec {
@@ -42,23 +48,29 @@ impl Default for ChainSpec {
 
 /// Get a chain config from a spec setting.
 impl ChainSpec {
-	pub(crate) fn load(self) -> Result<service::ChainSpec, String> {
-		match self {
-			ChainSpec::Development => Ok(service::chain_spec::development_config()),
-			ChainSpec::LocalTestnet => Ok(service::chain_spec::local_testnet_config()),
-			ChainSpec::StagingTestnet => Ok(service::chain_spec::staging_testnet_config()),
-			ChainSpec::Westend => service::chain_spec::westend_config(),
-			ChainSpec::Kusama => service::chain_spec::kusama_config(),
-		}
+	pub(crate) fn load(self) -> Result<Box<dyn service::ChainSpec>, String> {
+		Ok(match self {
+			ChainSpec::PolkadotDevelopment => Box::new(service::chain_spec::polkadot_development_config()),
+			ChainSpec::PolkadotLocalTestnet => Box::new(service::chain_spec::polkadot_local_testnet_config()),
+			ChainSpec::PolkadotStagingTestnet => Box::new(service::chain_spec::polkadot_staging_testnet_config()),
+			ChainSpec::KusamaDevelopment =>Box::new(service::chain_spec::kusama_development_config()),
+			ChainSpec::KusamaLocalTestnet => Box::new(service::chain_spec::kusama_local_testnet_config()),
+			ChainSpec::KusamaStagingTestnet => Box::new(service::chain_spec::kusama_staging_testnet_config()),
+			ChainSpec::Westend => Box::new(service::chain_spec::westend_config()?),
+			ChainSpec::Kusama => Box::new(service::chain_spec::kusama_config()?),
+		})
 	}
 
 	pub(crate) fn from(s: &str) -> Option<Self> {
 		match s {
-			"dev" => Some(ChainSpec::Development),
-			"local" => Some(ChainSpec::LocalTestnet),
+			"polkadot-dev" | "dev" => Some(ChainSpec::PolkadotDevelopment),
+			"polkadot-local" => Some(ChainSpec::PolkadotLocalTestnet),
+			"polkadot-staging" => Some(ChainSpec::PolkadotStagingTestnet),
+			"kusama-dev" => Some(ChainSpec::KusamaDevelopment),
+			"kusama-local" => Some(ChainSpec::KusamaLocalTestnet),
+			"kusama-staging" => Some(ChainSpec::KusamaStagingTestnet),
 			"kusama" => Some(ChainSpec::Kusama),
 			"westend" => Some(ChainSpec::Westend),
-			"staging" => Some(ChainSpec::StagingTestnet),
 			"" => Some(ChainSpec::default()),
 			_ => None,
 		}
@@ -66,9 +78,11 @@ impl ChainSpec {
 }
 
 /// Load the `ChainSpec` for the given `id`.
-pub fn load_spec(id: &str) -> Result<Option<service::ChainSpec>, String> {
+/// `force_kusama` treats chain specs coming from a file as kusama specs.
+pub fn load_spec(id: &str, force_kusama: bool) -> Result<Box<dyn service::ChainSpec>, String> {
 	Ok(match ChainSpec::from(id) {
-		Some(spec) => Some(spec.load()?),
-		None => None,
+		Some(spec) => spec.load()?,
+		None if force_kusama => Box::new(service::KusamaChainSpec::from_json_file(std::path::PathBuf::from(id))?),
+		None => Box::new(service::PolkadotChainSpec::from_json_file(std::path::PathBuf::from(id))?),
 	})
 }

polkadot/cli/src/cli.rs

@@ -17,7 +17,6 @@
 //! Polkadot CLI library.
 
 use structopt::StructOpt;
-pub use sc_cli::RunCmd;
 
 #[allow(missing_docs)]
 #[derive(Debug, StructOpt, Clone)]
@@ -45,6 +44,18 @@ pub struct ValidationWorkerCommand {
 	pub mem_id: String,
 }
 
+#[allow(missing_docs)]
+#[derive(Debug, StructOpt, Clone)]
+pub struct RunCmd {
+	#[allow(missing_docs)]
+	#[structopt(flatten)]
+	pub base: sc_cli::RunCmd,
+
+	/// Force using Kusama native runtime.
+	#[structopt(long = "force-kusama")]
+	pub force_kusama: bool,
+}
+
 #[allow(missing_docs)]
 #[derive(Debug, StructOpt, Clone)]
 #[structopt(settings = &[

polkadot/cli/src/command.rs

@@ -29,13 +29,18 @@ pub fn run(version: VersionInfo) -> sc_cli::Result<()> {
 
 	let mut config = service::Configuration::from_version(&version);
 	config.impl_name = "parity-polkadot";
+	let force_kusama = opt.run.force_kusama;
 
 	match opt.subcommand {
 		None => {
-			opt.run.init(&version)?;
-			opt.run.update_config(&mut config, load_spec, &version)?;
+			opt.run.base.init(&version)?;
+			opt.run.base.update_config(
+				&mut config,
+				|id| load_spec(id, force_kusama),
+				&version
+			)?;
 
-			let is_kusama = config.chain_spec.as_ref().map_or(false, |s| s.is_kusama());
+			let is_kusama = config.expect_chain_spec().is_kusama();
 
 			info!("{}", version.name);
 			info!("  version {}", config.full_version());
@@ -69,9 +74,13 @@ pub fn run(version: VersionInfo) -> sc_cli::Result<()> {
 		},
 		Some(Subcommand::Base(cmd)) => {
 			cmd.init(&version)?;
-			cmd.update_config(&mut config, load_spec, &version)?;
+			cmd.update_config(
+				&mut config,
+				|id| load_spec(id, force_kusama),
+				&version
+			)?;
 
-			let is_kusama = config.chain_spec.as_ref().map_or(false, |s| s.is_kusama());
+			let is_kusama = config.expect_chain_spec().is_kusama();
 
 			if is_kusama {
 				cmd.run(config, service::new_chain_ops::<
@@ -100,14 +109,12 @@ pub fn run(version: VersionInfo) -> sc_cli::Result<()> {
 		},
 		Some(Subcommand::Benchmark(cmd)) => {
 			cmd.init(&version)?;
-			cmd.update_config(&mut config, load_spec, &version)?;
-
-			let is_kusama = config.chain_spec.as_ref().map_or(false, |s| s.is_kusama());
-
+			cmd.update_config(&mut config, |id| load_spec(id, force_kusama), &version)?;
+			let is_kusama = config.expect_chain_spec().is_kusama();
 			if is_kusama {
-				cmd.run::<_, _, service::kusama_runtime::Block, service::KusamaExecutor>(config)
+				cmd.run::<service::kusama_runtime::Block, service::KusamaExecutor>(config)
 			} else {
-				cmd.run::<_, _, service::polkadot_runtime::Block, service::PolkadotExecutor>(config)
+				cmd.run::<service::polkadot_runtime::Block, service::PolkadotExecutor>(config)
 			}
 		},
 	}