Update Substrate (paritytech#812)

* Update to latest Substrate master

* upgrade decl_storage declaration

* Companion PR to Substrate#4752

* Substrate update: Identity should bound additional fields (paritytech#4770)

Substrate commit: 2c9ce72

* WIP

* WIP

* Updated substrate and fixes

* Fix compilation and switch to latest wasm-builder-runner

* Fixed missing doc

* Update collator/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
Co-authored-by: Cecile Tonglet <cecile.tonglet@cecton.com>

cli/Cargo.toml

@@ -11,7 +11,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 log = "0.4.8"
 futures = { version = "0.3.1", features = ["compat"] }
-structopt = "=0.3.7"
+structopt = "0.3.8"
 sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }

cli/src/chain_spec.rs

@@ -65,3 +65,10 @@ impl ChainSpec {
 	}
 }
 
+/// Load the `ChainSpec` for the given `id`.
+pub fn load_spec(id: &str) -> Result<Option<service::ChainSpec>, String> {
+	Ok(match ChainSpec::from(id) {
+		Some(spec) => Some(spec.load()?),
+		None => None,
+	})
+}

cli/src/cli.rs

@@ -0,0 +1,55 @@
+// Copyright 2017-2020 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Polkadot CLI library.
+
+use structopt::StructOpt;
+pub use sc_cli::RunCmd;
+
+#[allow(missing_docs)]
+#[derive(Debug, StructOpt, Clone)]
+pub enum Subcommand {
+	#[allow(missing_docs)]
+	#[structopt(flatten)]
+	Base(sc_cli::Subcommand),
+
+	#[allow(missing_docs)]
+	#[structopt(name = "validation-worker", setting = structopt::clap::AppSettings::Hidden)]
+	ValidationWorker(ValidationWorkerCommand),
+}
+
+#[allow(missing_docs)]
+#[derive(Debug, StructOpt, Clone)]
+pub struct ValidationWorkerCommand {
+	#[allow(missing_docs)]
+	pub mem_id: String,
+}
+
+#[allow(missing_docs)]
+#[derive(Debug, StructOpt, Clone)]
+pub struct Cli {
+	#[allow(missing_docs)]
+	#[structopt(subcommand)]
+	pub subcommand: Option<Subcommand>,
+
+	#[allow(missing_docs)]
+	#[structopt(flatten)]
+	pub run: RunCmd,
+
+	#[allow(missing_docs)]
+	#[structopt(long = "enable-authority-discovery")]
+	pub authority_discovery_enabled: bool,
+}

cli/src/command.rs

@@ -0,0 +1,156 @@
+// Copyright 2017-2020 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+use log::info;
+use sp_core::Blake2Hasher;
+use service::{IsKusama, Block, self, RuntimeApiCollection, TFullClient};
+use sp_api::ConstructRuntimeApi;
+use sc_executor::NativeExecutionDispatch;
+use crate::chain_spec::load_spec;
+use crate::cli::{Cli, Subcommand};
+use sc_cli::{VersionInfo, display_role, error};
+
+/// Parses polkadot specific CLI arguments and run the service.
+pub fn run(version: VersionInfo) -> error::Result<()> {
+	let opt = sc_cli::from_args::<Cli>(&version);
+
+	let mut config = service::Configuration::default();
+	config.impl_name = "parity-polkadot";
+
+	match opt.subcommand {
+		None => {
+			sc_cli::init(&mut config, load_spec, &opt.run.shared_params, &version)?;
+
+			let is_kusama = config.chain_spec.as_ref().map_or(false, |s| s.is_kusama());
+
+			sc_cli::update_config_for_running_node(
+				&mut config,
+				opt.run,
+			)?;
+
+			info!("{}", version.name);
+			info!("  version {}", config.full_version());
+			info!("  by {}, 2017-2020", version.author);
+			info!("Chain specification: {}", config.expect_chain_spec().name());
+			info!("Node name: {}", config.name);
+			info!("Roles: {}", display_role(&config));
+
+			if is_kusama {
+				info!("Native runtime: {}", service::KusamaExecutor::native_version().runtime_version);
+				info!("----------------------------");
+				info!("This chain is not in any way");
+				info!("      endorsed by the       ");
+				info!("     KUSAMA FOUNDATION      ");
+				info!("----------------------------");
+
+				run_service_until_exit::<
+					service::kusama_runtime::RuntimeApi,
+					service::KusamaExecutor,
+					service::kusama_runtime::UncheckedExtrinsic,
+				>(config, opt.authority_discovery_enabled)
+			} else {
+				info!("Native runtime: {}", service::PolkadotExecutor::native_version().runtime_version);
+
+				run_service_until_exit::<
+					service::polkadot_runtime::RuntimeApi,
+					service::PolkadotExecutor,
+					service::polkadot_runtime::UncheckedExtrinsic,
+				>(config, opt.authority_discovery_enabled)
+			}
+		},
+		Some(Subcommand::Base(cmd)) => {
+			sc_cli::init(&mut config, load_spec, cmd.get_shared_params(), &version)?;
+
+			let is_kusama = config.chain_spec.as_ref().map_or(false, |s| s.is_kusama());
+
+			if is_kusama {
+				cmd.run(config, service::new_chain_ops::<
+					service::kusama_runtime::RuntimeApi,
+					service::KusamaExecutor,
+					service::kusama_runtime::UncheckedExtrinsic,
+				>)
+			} else {
+				cmd.run(config, service::new_chain_ops::<
+					service::polkadot_runtime::RuntimeApi,
+					service::PolkadotExecutor,
+					service::polkadot_runtime::UncheckedExtrinsic,
+				>)
+			}
+		},
+		Some(Subcommand::ValidationWorker(args)) => {
+			sc_cli::init_logger("");
+
+			if cfg!(feature = "browser") {
+				Err(error::Error::Input("Cannot run validation worker in browser".into()))
+			} else {
+				#[cfg(not(feature = "browser"))]
+				service::run_validation_worker(&args.mem_id)?;
+				Ok(())
+			}
+		},
+	}
+}
+
+fn run_service_until_exit<R, D, E>(
+	config: service::Configuration,
+	authority_discovery_enabled: bool,
+) -> error::Result<()>
+where
+	R: ConstructRuntimeApi<Block, service::TFullClient<Block, R, D>>
+		+ Send + Sync + 'static,
+	<R as ConstructRuntimeApi<Block, service::TFullClient<Block, R, D>>>::RuntimeApi:
+		RuntimeApiCollection<E, StateBackend = sc_client_api::StateBackendFor<service::TFullBackend<Block>, Block>>,
+	<R as ConstructRuntimeApi<Block, service::TLightClient<Block, R, D>>>::RuntimeApi:
+		RuntimeApiCollection<E, StateBackend = sc_client_api::StateBackendFor<service::TLightBackend<Block>, Block>>,
+	E: service::Codec + Send + Sync + 'static,
+	D: service::NativeExecutionDispatch + 'static,
+	// Rust bug: https://github.com/rust-lang/rust/issues/24159
+	<<R as ConstructRuntimeApi<Block, TFullClient<Block, R, D>>>::RuntimeApi as sp_api::ApiExt<Block>>::StateBackend:
+		sp_api::StateBackend<Blake2Hasher>,
+	// Rust bug: https://github.com/rust-lang/rust/issues/43580
+	R: ConstructRuntimeApi<
+		Block,
+		TLightClient<R, D>
+	>,
+{
+	match config.roles {
+		service::Roles::LIGHT =>
+			sc_cli::run_service_until_exit(
+				config,
+				|config| service::new_light::<R, D, E>(config, None),
+			),
+		_ =>
+			sc_cli::run_service_until_exit(
+				config,
+				|config| service::new_full::<R, D, E>(config, None, None, authority_discovery_enabled, 6000),
+			),
+	}
+}
+
+// We can't simply use `service::TLightClient` due to a
+// Rust bug: https://github.com/rust-lang/rust/issues/43580
+type TLightClient<Runtime, Dispatch> = sc_client::Client<
+	sc_client::light::backend::Backend<sc_client_db::light::LightStorage<Block>, Blake2Hasher>,
+	sc_client::light::call_executor::GenesisCallExecutor<
+		sc_client::light::backend::Backend<sc_client_db::light::LightStorage<Block>, Blake2Hasher>,
+		sc_client::LocalCallExecutor<
+			sc_client::light::backend::Backend<sc_client_db::light::LightStorage<Block>, Blake2Hasher>,
+			sc_executor::NativeExecutor<Dispatch>
+		>
+	>,
+	Block,
+	Runtime
+>;