Update Substrate (#812)

* Update to latest Substrate master

* upgrade decl_storage declaration

* Companion PR to Substrate#4752

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

Substrate commit: 2c9ce7296b19934b1ffd50150be2fdb2ddf81a4e

* 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>

polkadot/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" }

polkadot/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,
+	})
+}

polkadot/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,
+}

polkadot/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
+>;

polkadot/cli/src/lib.rs

@@ -22,219 +22,23 @@
 mod chain_spec;
 #[cfg(feature = "browser")]
 mod browser;
-
-use chain_spec::ChainSpec;
-use futures::{Future, future::{select, Either}, channel::oneshot};
 #[cfg(feature = "cli")]
-use tokio::runtime::Runtime;
-use log::info;
-use structopt::StructOpt;
-use sp_api::ConstructRuntimeApi;
+mod cli;
+#[cfg(feature = "cli")]
+mod command;
 
 pub use service::{
-	AbstractService, CustomConfiguration, ProvideRuntimeApi, CoreApi, ParachainHost, IsKusama,
+	AbstractService, ProvideRuntimeApi, CoreApi, ParachainHost, IsKusama,
 	Block, self, RuntimeApiCollection, TFullClient
 };
 
-pub use sc_cli::{VersionInfo, IntoExit, NoCustom, SharedParams};
-pub use sc_cli::{display_role, error};
-
-/// 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,
-	})
-}
-
-#[derive(Debug, StructOpt, Clone)]
-enum PolkadotSubCommands {
-	#[structopt(name = "validation-worker", setting = structopt::clap::AppSettings::Hidden)]
-	ValidationWorker(ValidationWorkerCommand),
-}
-
-impl sc_cli::GetSharedParams for PolkadotSubCommands {
-	fn shared_params(&self) -> Option<&sc_cli::SharedParams> { None }
-}
-
-#[derive(Debug, StructOpt, Clone)]
-struct ValidationWorkerCommand {
-	#[structopt()]
-	pub mem_id: String,
-}
-
-#[derive(Debug, StructOpt, Clone)]
-struct PolkadotSubParams {
-	#[structopt(long = "enable-authority-discovery")]
-	pub authority_discovery_enabled: bool,
-}
-
-/// Parses polkadot specific CLI arguments and run the service.
 #[cfg(feature = "cli")]
-pub fn run<E: IntoExit>(exit: E, version: sc_cli::VersionInfo) -> error::Result<()> {
-	let cmd = sc_cli::parse_and_prepare::<PolkadotSubCommands, PolkadotSubParams, _>(
-		&version,
-		"parity-polkadot",
-		std::env::args(),
-	);
-
-	// Preload spec to select native runtime
-	let spec = match cmd.shared_params() {
-		Some(params) => Some(sc_cli::load_spec(params, &load_spec)?),
-		None => None,
-	};
-	if spec.as_ref().map_or(false, |c| c.is_kusama()) {
-		execute_cmd_with_runtime::<
-			service::kusama_runtime::RuntimeApi,
-			service::KusamaExecutor,
-			service::kusama_runtime::UncheckedExtrinsic,
-			_
-		>(exit, &version, cmd, spec)
-	} else {
-		execute_cmd_with_runtime::<
-			service::polkadot_runtime::RuntimeApi,
-			service::PolkadotExecutor,
-			service::polkadot_runtime::UncheckedExtrinsic,
-			_
-		>(exit, &version, cmd, spec)
-	}
-}
+pub use cli::*;
 
 #[cfg(feature = "cli")]
-use sp_core::Blake2Hasher;
+pub use command::*;
+
+pub use chain_spec::*;
 
 #[cfg(feature = "cli")]
-// 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
->;
-
-/// Execute the given `cmd` with the given runtime.
-#[cfg(feature = "cli")]
-fn execute_cmd_with_runtime<R, D, E, X>(
-	exit: X,
-	version: &sc_cli::VersionInfo,
-	cmd: sc_cli::ParseAndPrepare<PolkadotSubCommands, PolkadotSubParams>,
-	spec: Option<service::ChainSpec>,
-) -> 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,
-	X: IntoExit,
-	// 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>
-	>,
-{
-	let is_kusama = spec.as_ref().map_or(false, |s| s.is_kusama());
-	// Use preloaded spec
-	let load_spec = |_: &str| Ok(spec);
-	match cmd {
-		sc_cli::ParseAndPrepare::Run(cmd) => cmd.run(load_spec, exit,
-			|exit, _cli_args, custom_args, mut config| {
-				info!("{}", version.name);
-				info!("  version {}", config.full_version());
-				info!("  by {}, 2017-2020", version.author);
-				info!("Chain specification: {}", config.chain_spec.name());
-				info!("Native runtime: {}", D::native_version().runtime_version);
-				if is_kusama {
-					info!("----------------------------");
-					info!("This chain is not in any way");
-					info!("      endorsed by the       ");
-					info!("     KUSAMA FOUNDATION      ");
-					info!("----------------------------");
-				}
-				info!("Node name: {}", config.name);
-				info!("Roles: {}", display_role(&config));
-				config.custom = service::CustomConfiguration::default();
-				config.custom.authority_discovery_enabled = custom_args.authority_discovery_enabled;
-				let runtime = Runtime::new().map_err(|e| format!("{:?}", e))?;
-				config.tasks_executor = {
-					let runtime_handle = runtime.handle().clone();
-					Some(Box::new(move |fut| { runtime_handle.spawn(fut); }))
-				};
-				match config.roles {
-					service::Roles::LIGHT =>
-						run_until_exit(
-							runtime,
-							service::new_light::<R, D, E>(config).map_err(|e| format!("{:?}", e))?,
-							exit.into_exit(),
-						),
-					_ =>
-						run_until_exit(
-							runtime,
-							service::new_full::<R, D, E>(config).map_err(|e| format!("{:?}", e))?,
-							exit.into_exit(),
-						),
-				}.map_err(|e| format!("{:?}", e))
-			}),
-			sc_cli::ParseAndPrepare::BuildSpec(cmd) => cmd.run::<NoCustom, _, _, _>(load_spec),
-			sc_cli::ParseAndPrepare::ExportBlocks(cmd) => cmd.run_with_builder::<_, _, _, _, _, _, _>(|config|
-				Ok(service::new_chain_ops::<R, D, E>(config)?), load_spec, exit),
-			sc_cli::ParseAndPrepare::ImportBlocks(cmd) => cmd.run_with_builder::<_, _, _, _, _, _, _>(|config|
-				Ok(service::new_chain_ops::<R, D, E>(config)?), load_spec, exit),
-			sc_cli::ParseAndPrepare::CheckBlock(cmd) => cmd.run_with_builder::<_, _, _, _, _, _, _>(|config|
-				Ok(service::new_chain_ops::<R, D, E>(config)?), load_spec, exit),
-			sc_cli::ParseAndPrepare::PurgeChain(cmd) => cmd.run(load_spec),
-			sc_cli::ParseAndPrepare::RevertChain(cmd) => cmd.run_with_builder::<_, _, _, _, _, _>(|config|
-				Ok(service::new_chain_ops::<R, D, E>(config)?), load_spec),
-			sc_cli::ParseAndPrepare::CustomCommand(PolkadotSubCommands::ValidationWorker(args)) => {
-				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(())
-				}
-			}
-	}
-}
-
-/// Run the given `service` using the `runtime` until it exits or `e` fires.
-#[cfg(feature = "cli")]
-pub fn run_until_exit(
-	mut runtime: Runtime,
-	service: impl AbstractService,
-	e: impl Future<Output = ()> + Send + Unpin + 'static,
-) -> error::Result<()> {
-	let (exit_send, exit) = oneshot::channel();
-
-	let informant = sc_cli::informant::build(&service);
-
-	let handle = runtime.spawn(select(exit, informant));
-
-	// we eagerly drop the service so that the internal exit future is fired,
-	// but we need to keep holding a reference to the global telemetry guard
-	let _telemetry = service.telemetry();
-
-	let service_res = runtime.block_on(select(service, e));
-
-	let _ = exit_send.send(());
-
-	runtime.block_on(handle);
-
-	match service_res {
-		Either::Left((res, _)) => res.map_err(error::Error::Service),
-		Either::Right((_, _)) => Ok(())
-	}
-}
+pub use sc_cli::{VersionInfo, error};

polkadot/collator/Cargo.toml

@@ -8,6 +8,7 @@ edition = "2018"
 [dependencies]
 futures = "0.3.1"
 sc-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }

polkadot/collator/src/lib.rs

@@ -307,7 +307,6 @@ fn run_collator_node<S, E, P, Extrinsic>(
 		<P::ParachainContext as ParachainContext>::ProduceCandidate: Send,
 		Extrinsic: service::Codec + Send + Sync + 'static,
 {
-	let runtime = tokio::runtime::Runtime::new().map_err(|e| format!("{:?}", e))?;
 	let spawner = service.spawn_task_handle();
 
 	let client = service.client();
@@ -456,7 +455,8 @@ fn run_collator_node<S, E, P, Extrinsic>(
 
 	service.spawn_essential_task("collation", work);
 
-	polkadot_cli::run_until_exit(runtime, service, exit)
+	// NOTE: this is not ideal as we should only provide the service
+	sc_cli::run_service_until_exit(Configuration::default(), |_config| Ok(service))
 }
 
 fn compute_targets(para_id: ParaId, session_keys: &[ValidatorId], roster: DutyRoster) -> HashSet<ValidatorId> {
@@ -469,11 +469,6 @@ fn compute_targets(para_id: ParaId, session_keys: &[ValidatorId], roster: DutyRo
 		.collect()
 }
 
-/// Set the `collating_for` parameter of the configuration.
-fn prepare_config(config: &mut Configuration, para_id: ParaId, key: &Arc<CollatorPair>) {
-	config.custom.collating_for = Some((key.public(), para_id));
-}
-
 /// Run a collator node with the given `RelayChainContext` and `ParachainContext`
 /// build by the given `BuildParachainContext` and arguments to the underlying polkadot node.
 ///
@@ -484,24 +479,46 @@ pub fn run_collator<P, E>(
 	para_id: ParaId,
 	exit: E,
 	key: Arc<CollatorPair>,
-	mut config: Configuration,
+	config: Configuration,
 ) -> polkadot_cli::error::Result<()> where
 	P: BuildParachainContext,
 	P::ParachainContext: Send + 'static,
 	<P::ParachainContext as ParachainContext>::ProduceCandidate: Send,
 	E: futures::Future<Output = ()> + Unpin + Send + Clone + Sync + 'static,
 {
-	prepare_config(&mut config, para_id, &key);
-
-	match (config.chain_spec.is_kusama(), config.roles) {
+	match (config.expect_chain_spec().is_kusama(), config.roles) {
 		(true, Roles::LIGHT) =>
-			run_collator_node(service::kusama_new_light(config)?, exit, para_id, key, build_parachain_context),
+			run_collator_node(
+				service::kusama_new_light(config, Some((key.public(), para_id)))?,
+				exit,
+				para_id,
+				key,
+				build_parachain_context,
+			),
 		(true, _) =>
-			run_collator_node(service::kusama_new_full(config)?, exit, para_id, key, build_parachain_context),
+			run_collator_node(
+				service::kusama_new_full(config, Some((key.public(), para_id)), None, false, 6000)?,
+				exit,
+				para_id,
+				key,
+				build_parachain_context,
+			),
 		(false, Roles::LIGHT) =>
-			run_collator_node(service::polkadot_new_light(config)?, exit, para_id, key, build_parachain_context),
+			run_collator_node(
+				service::polkadot_new_light(config, Some((key.public(), para_id)))?,
+				exit,
+				para_id,
+				key,
+				build_parachain_context,
+			),
 		(false, _) =>
-			run_collator_node(service::polkadot_new_full(config)?, exit, para_id, key, build_parachain_context),
+			run_collator_node(
+				service::polkadot_new_full(config, Some((key.public(), para_id)), None, false, 6000)?,
+				exit,
+				para_id,
+				key,
+				build_parachain_context,
+			),
 	}
 }
 

polkadot/primitives/Cargo.toml

@@ -7,17 +7,17 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.102", optional = true, features = ["derive"] }
 parity-scale-codec = { version = "1.1.0", default-features = false, features = ["bit-vec", "derive"] }
-primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 polkadot-parachain = { path = "../parachain", default-features = false }
-trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 bitvec = { version = "0.15.2", default-features = false, features = ["alloc"] }
-babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 
 [dev-dependencies]
 sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }

polkadot/runtime/common/Cargo.toml

@@ -13,20 +13,20 @@ serde = { version = "1.0.102", default-features = false }
 serde_derive = { version = "1.0.102", optional = true }
 
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 
-authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
 polkadot-parachain = { path = "../../parachain", default-features = false }
@@ -37,10 +37,10 @@ libsecp256k1 = "0.3.2"
 tiny-keccak = "1.5.0"
 keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 trie-db = "0.19.2"
 serde_json = "1.0.41"
 

polkadot/runtime/common/src/registrar.rs

@@ -517,6 +517,7 @@ pub enum ValidityError {
 impl<T: Trait + Send + Sync> SignedExtension for LimitParathreadCommits<T> where
 	<T as system::Trait>::Call: IsSubType<Module<T>, T>
 {
+	const IDENTIFIER: &'static str = "LimitParathreadCommits";
 	type AccountId = T::AccountId;
 	type Call = <T as system::Trait>::Call;
 	type AdditionalSigned = ();

polkadot/runtime/kusama/Cargo.toml

@@ -13,51 +13,51 @@ rustc-hex = { version = "2.0.1", default-features = false }
 serde = { version = "1.0.102", default-features = false }
 serde_derive = { version = "1.0.102", optional = true }
 
-authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-version = { package = "sp-version", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 
-authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", default-features = false, features = ["migrate-authorities"], branch = "polkadot-master" }
-identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false, features = ["migrate-authorities"] }
+identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
@@ -73,7 +73,7 @@ trie-db = "0.19.2"
 serde_json = "1.0.41"
 
 [build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" }
 
 [features]
 default = ["std"]

polkadot/runtime/kusama/build.rs

@@ -14,8 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-use wasm_builder_runner::{build_current_project, WasmBuilderSource};
+use wasm_builder_runner::WasmBuilder;
 
 fn main() {
-	build_current_project("wasm_binary.rs", WasmBuilderSource::Crates("1.0.9"));
+	WasmBuilder::new()
+		.with_current_project()
+		.with_wasm_builder_from_crates("1.0.9")
+		.import_memory()
+		.export_heap_base()
+		.build()
 }

polkadot/runtime/kusama/src/lib.rs

@@ -95,6 +95,7 @@ pub fn native_version() -> NativeVersion {
 #[derive(Default, Encode, Decode, Clone, Eq, PartialEq, RuntimeDebug)]
 pub struct RestrictFunctionality;
 impl SignedExtension for RestrictFunctionality {
+	const IDENTIFIER: &'static str = "RestrictFunctionality";
 	type AccountId = AccountId;
 	type Call = Call;
 	type AdditionalSigned = ();
@@ -513,7 +514,8 @@ parameter_types! {
 	pub const BasicDeposit: Balance = 10 * DOLLARS;       // 258 bytes on-chain
 	pub const FieldDeposit: Balance = 250 * CENTS;        // 66 bytes on-chain
 	pub const SubAccountDeposit: Balance = 2 * DOLLARS;   // 53 bytes on-chain
-	pub const MaximumSubAccounts: u32 = 100;
+	pub const MaxSubAccounts: u32 = 100;
+	pub const MaxAdditionalFields: u32 = 100;
 }
 
 impl identity::Trait for Runtime {
@@ -523,7 +525,8 @@ impl identity::Trait for Runtime {
 	type BasicDeposit = BasicDeposit;
 	type FieldDeposit = FieldDeposit;
 	type SubAccountDeposit = SubAccountDeposit;
-	type MaximumSubAccounts = MaximumSubAccounts;
+	type MaxSubAccounts = MaxSubAccounts;
+	type MaxAdditionalFields = MaxAdditionalFields;
 	type RegistrarOrigin = collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>;
 	type ForceOrigin = collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>;
 }

polkadot/runtime/polkadot/Cargo.toml

@@ -13,48 +13,48 @@ rustc-hex = { version = "2.0.1", default-features = false }
 serde = { version = "1.0.102", default-features = false }
 serde_derive = { version = "1.0.102", optional = true }
 
-authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-version = { package = "sp-version", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 
-authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", default-features = false, features = ["migrate-authorities"], branch = "polkadot-master" }
-identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false, features = ["migrate-authorities"] }
+identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
@@ -70,7 +70,7 @@ trie-db = "0.19.2"
 serde_json = "1.0.41"
 
 [build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" }
 
 [features]
 default = ["std"]

polkadot/runtime/polkadot/build.rs

@@ -14,8 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-use wasm_builder_runner::{build_current_project, WasmBuilderSource};
+use wasm_builder_runner::WasmBuilder;
 
 fn main() {
-	build_current_project("wasm_binary.rs", WasmBuilderSource::Crates("1.0.9"));
+	WasmBuilder::new()
+		.with_current_project()
+		.with_wasm_builder_from_crates("1.0.9")
+		.import_memory()
+		.export_heap_base()
+		.build()
 }

polkadot/runtime/polkadot/src/lib.rs

@@ -99,6 +99,7 @@ pub fn native_version() -> NativeVersion {
 #[derive(Default, Encode, Decode, Clone, Eq, PartialEq, RuntimeDebug)]
 pub struct OnlyStakingAndClaims;
 impl SignedExtension for OnlyStakingAndClaims {
+	const IDENTIFIER: &'static str = "OnlyStakingAndClaims";
 	type AccountId = AccountId;
 	type Call = Call;
 	type AdditionalSigned = ();

polkadot/service/src/lib.rs

@@ -18,11 +18,6 @@
 
 pub mod chain_spec;
 
-use futures::{
-	FutureExt, TryFutureExt,
-	task::{Spawn, SpawnError, FutureObj},
-	compat::Future01CompatExt,
-};
 use sc_client::LongestChain;
 use std::sync::Arc;
 use std::time::Duration;
@@ -57,42 +52,14 @@ pub use codec::Codec;
 pub use polkadot_runtime;
 pub use kusama_runtime;
 
-/// Polkadot-specific configuration.
-pub struct CustomConfiguration {
-	/// Set to `Some` with a collator `CollatorId` and desired parachain
-	/// if the network protocol should be started in collator mode.
-	pub collating_for: Option<(CollatorId, parachain::Id)>,
-
-	/// Maximal `block_data` size.
-	pub max_block_data_size: Option<u64>,
-
-	/// Whether to enable or disable the authority discovery module.
-	pub authority_discovery_enabled: bool,
-
-	/// Milliseconds per block.
-	pub slot_duration: u64,
-}
-
 /// Configuration type that is being used.
 ///
 /// See [`ChainSpec`] for more information why Polkadot `GenesisConfig` is safe here.
 pub type Configuration = service::Configuration<
-	CustomConfiguration,
 	polkadot_runtime::GenesisConfig,
 	chain_spec::Extensions,
 >;
 
-impl Default for CustomConfiguration {
-	fn default() -> Self {
-		Self {
-			collating_for: None,
-			max_block_data_size: None,
-			authority_discovery_enabled: false,
-			slot_duration: 6000,
-		}
-	}
-}
-
 native_executor_instance!(
 	pub PolkadotExecutor,
 	polkadot_runtime::api::dispatch,
@@ -232,7 +199,13 @@ where
 }
 
 /// Create a new Polkadot service for a full node.
-pub fn polkadot_new_full(config: Configuration)
+pub fn polkadot_new_full(
+	config: Configuration,
+	collating_for: Option<(CollatorId, parachain::Id)>,
+	max_block_data_size: Option<u64>,
+	authority_discovery_enabled: bool,
+	slot_duration: u64,
+)
 	-> Result<impl AbstractService<
 		Block = Block,
 		RuntimeApi = polkadot_runtime::RuntimeApi,
@@ -242,11 +215,17 @@ pub fn polkadot_new_full(config: Configuration)
 		CallExecutor = TFullCallExecutor<Block, PolkadotExecutor>,
 	>, ServiceError>
 {
-	new_full(config)
+	new_full(config, collating_for, max_block_data_size, authority_discovery_enabled, slot_duration)
 }
 
 /// Create a new Kusama service for a full node.
-pub fn kusama_new_full(config: Configuration)
+pub fn kusama_new_full(
+	config: Configuration,
+	collating_for: Option<(CollatorId, parachain::Id)>,
+	max_block_data_size: Option<u64>,
+	authority_discovery_enabled: bool,
+	slot_duration: u64,
+)
 	-> Result<impl AbstractService<
 		Block = Block,
 		RuntimeApi = kusama_runtime::RuntimeApi,
@@ -256,11 +235,17 @@ pub fn kusama_new_full(config: Configuration)
 		CallExecutor = TFullCallExecutor<Block, KusamaExecutor>,
 	>, ServiceError>
 {
-	new_full(config)
+	new_full(config, collating_for, max_block_data_size, authority_discovery_enabled, slot_duration)
 }
 
 /// Builds a new service for a full client.
-pub fn new_full<Runtime, Dispatch, Extrinsic>(config: Configuration)
+pub fn new_full<Runtime, Dispatch, Extrinsic>(
+	config: Configuration,
+	collating_for: Option<(CollatorId, parachain::Id)>,
+	max_block_data_size: Option<u64>,
+	authority_discovery_enabled: bool,
+	slot_duration: u64,
+)
 	-> Result<impl AbstractService<
 		Block = Block,
 		RuntimeApi = Runtime,
@@ -281,10 +266,10 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(config: Configuration)
 	use sc_network::Event;
 	use futures::stream::StreamExt;
 
-	let is_collator = config.custom.collating_for.is_some();
+	let is_collator = collating_for.is_some();
 	let is_authority = config.roles.is_authority() && !is_collator;
 	let force_authoring = config.force_authoring;
-	let max_block_data_size = config.custom.max_block_data_size;
+	let max_block_data_size = max_block_data_size;
 	let db_path = if let DatabaseConfig::Path { ref path, .. } = config.database {
 		path.clone()
 	} else {
@@ -292,9 +277,9 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(config: Configuration)
 	};
 	let disable_grandpa = config.disable_grandpa;
 	let name = config.name.clone();
-	let authority_discovery_enabled = config.custom.authority_discovery_enabled;
+	let authority_discovery_enabled = authority_discovery_enabled;
 	let sentry_nodes = config.network.sentry_nodes.clone();
-	let slot_duration = config.custom.slot_duration;
+	let slot_duration = slot_duration;
 
 	// sentry nodes announce themselves as authorities to the network
 	// and should run the same protocols authorities do, but it should
@@ -306,7 +291,7 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(config: Configuration)
 	let backend = builder.backend().clone();
 
 	let service = builder
-		.with_network_protocol(|config| Ok(PolkadotProtocol::new(config.custom.collating_for.clone())))?
+		.with_network_protocol(|_config| Ok(PolkadotProtocol::new(collating_for.clone())))?
 		.with_finality_proof_provider(|client, backend|
 			Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, client)) as _)
 		)?
@@ -510,7 +495,10 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(config: Configuration)
 }
 
 /// Create a new Polkadot service for a light client.
-pub fn polkadot_new_light(config: Configuration)
+pub fn polkadot_new_light(
+	config: Configuration,
+	collating_for: Option<(CollatorId, parachain::Id)>,
+)
 	-> Result<impl AbstractService<
 		Block = Block,
 		RuntimeApi = polkadot_runtime::RuntimeApi,
@@ -520,11 +508,14 @@ pub fn polkadot_new_light(config: Configuration)
 		CallExecutor = TLightCallExecutor<Block, PolkadotExecutor>,
 	>, ServiceError>
 {
-	new_light(config)
+	new_light(config, collating_for)
 }
 
 /// Create a new Kusama service for a light client.
-pub fn kusama_new_light(config: Configuration)
+pub fn kusama_new_light(
+	config: Configuration,
+	collating_for: Option<(CollatorId, parachain::Id)>,
+)
 	-> Result<impl AbstractService<
 		Block = Block,
 		RuntimeApi = kusama_runtime::RuntimeApi,
@@ -534,7 +525,7 @@ pub fn kusama_new_light(config: Configuration)
 		CallExecutor = TLightCallExecutor<Block, KusamaExecutor>,
 	>, ServiceError>
 {
-	new_light(config)
+	new_light(config, collating_for)
 }
 
 // We can't use service::TLightClient due to
@@ -556,7 +547,10 @@ type TLocalLightClient<Runtime, Dispatch> =  Client<
 >;
 
 /// Builds a new service for a light client.
-pub fn new_light<Runtime, Dispatch, Extrinsic>(config: Configuration)
+pub fn new_light<Runtime, Dispatch, Extrinsic>(
+	config: Configuration,
+	collating_for: Option<(CollatorId, parachain::Id)>,
+)
 	-> Result<impl AbstractService<
 		Block = Block,
 		RuntimeApi = Runtime,
@@ -625,7 +619,7 @@ where
 
 			Ok((import_queue, finality_proof_request_builder))
 		})?
-		.with_network_protocol(|config| Ok(PolkadotProtocol::new(config.custom.collating_for.clone())))?
+		.with_network_protocol(|_config| Ok(PolkadotProtocol::new(collating_for.clone())))?
 		.with_finality_proof_provider(|client, backend|
 			Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, client)) as _)
 		)?

polkadot/src/main.rs

@@ -19,29 +19,6 @@
 #![warn(missing_docs)]
 
 use cli::VersionInfo;
-use futures::{channel::oneshot, future, FutureExt};
-
-use std::cell::RefCell;
-
-// the regular polkadot worker simply does nothing until ctrl-c
-struct Exit;
-impl cli::IntoExit for Exit {
-	type Exit = future::Map<oneshot::Receiver<()>, fn(Result<(), oneshot::Canceled>) -> ()>;
-	fn into_exit(self) -> Self::Exit {
-		// can't use signal directly here because CtrlC takes only `Fn`.
-		let (exit_send, exit) = oneshot::channel();
-
-		let exit_send_cell = RefCell::new(Some(exit_send));
-		#[cfg(not(target_os = "unknown"))]
-		ctrlc::set_handler(move || {
-			if let Some(exit_send) = exit_send_cell.try_borrow_mut().expect("signal handler not reentrant; qed").take() {
-				exit_send.send(()).expect("Error sending exit notification");
-			}
-		}).expect("Error setting Ctrl-C handler");
-
-		exit.map(drop)
-	}
-}
 
 fn main() -> Result<(), cli::error::Error> {
 	let version = VersionInfo {
@@ -52,7 +29,8 @@ fn main() -> Result<(), cli::error::Error> {
 		author: "Parity Team <admin@parity.io>",
 		description: "Polkadot Relay-chain Client Node",
 		support_url: "https://github.com/paritytech/polkadot/issues/new",
+		copyright_start_year: 2017,
 	};
 
-	cli::run(Exit, version)
+	cli::run(version)
 }

polkadot/test-parachains/adder/Cargo.toml

@@ -16,7 +16,7 @@ dlmalloc = { version = "0.1.3", features = [ "global" ] }
 runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false, features = [ "disable_allocator" ] }
 
 [build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" }
 
 [features]
 default = [ "std" ]

polkadot/test-parachains/adder/build.rs

@@ -14,12 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-use wasm_builder_runner::{build_current_project_with_rustflags, WasmBuilderSource};
+use wasm_builder_runner::WasmBuilder;
 
 fn main() {
-	build_current_project_with_rustflags(
-		"wasm_binary.rs",
-		WasmBuilderSource::Crates("1.0.9"),
-		"-C link-arg=--export=__heap_base",
-	);
+	WasmBuilder::new()
+		.with_current_project()
+		.with_wasm_builder_from_crates("1.0.9")
+		.export_heap_base()
+		.build()
 }

polkadot/test-parachains/adder/collator/src/main.rs

@@ -150,12 +150,15 @@ fn main() {
 		_network: None,
 	};
 
+	let mut config = Configuration::default();
+	config.chain_spec = load_spec("dev").unwrap();
+
 	let res = collator::run_collator(
 		context,
 		id,
 		exit,
 		key,
-		Configuration::default_with_spec_and_base_path(load_spec("dev").unwrap().unwrap(), None),
+		config,
 	);
 
 	if let Err(e) = res {

polkadot/test-parachains/halt/Cargo.toml

@@ -9,7 +9,7 @@ build = "build.rs"
 [dependencies]
 
 [build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" }
 
 [features]
 default = [ "std" ]

polkadot/test-parachains/halt/build.rs

@@ -14,12 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-use wasm_builder_runner::{build_current_project_with_rustflags, WasmBuilderSource};
+use wasm_builder_runner::WasmBuilder;
 
 fn main() {
-	build_current_project_with_rustflags(
-		"wasm_binary.rs",
-		WasmBuilderSource::Crates("1.0.9"),
-		"-C link-arg=--export=__heap_base",
-	);
+	WasmBuilder::new()
+		.with_current_project()
+		.with_wasm_builder_from_crates("1.0.9")
+		.export_heap_base()
+		.build()
 }