Merge branch 'master' into ao-prometheus-metrics

* master:
  Unalias Substrate Imports (#1530)
  Rewrite client handling (#1531)
  Integrate ChainApi with all messages (#1533)
  Add Rococo test network (#1363)
  Fix a typo parathreads -> parachains (#1529)
  Cleanup upcoming paras (#1527)
  Sudo wrapper for paras (#1517)
  Implementer's guide: notes on contextual execution (#1525)
  Companion for substrate/6782 (#1523)
  Sort out validation errors (#1516)

Cargo.toml

@@ -37,6 +37,7 @@ members = [
 	"runtime/kusama",
 	"runtime/rococo-v1",
 	"runtime/westend",
+	"runtime/rococo",
 	"runtime/test-runtime",
 	"runtime/test-runtime/client",
 	"service",
@@ -66,12 +67,6 @@ members = [
 	"parachain/test-parachains/adder/collator",
 	"parachain/test-parachains/code-upgrader",
 ]
-exclude = [
-	"runtime/polkadot/wasm",
-	"runtime/kusama/wasm",
-	"runtime/westend/wasm",
-	"parachain/test-parachains/adder/wasm",
-]
 
 [badges]
 maintenance = { status = "actively-developed" }

cli/src/browser.rs

@@ -46,8 +46,7 @@ async fn start_inner(chain_spec: String, log_level: String) -> Result<Client, Bo
 	info!("👤 Role: {}", config.display_role());
 
 	// Create the service. This is the most heavy initialization step.
-	let builder = service::NodeBuilder::new(config);
-	let (task_manager, rpc_handlers) = builder.build_light().map_err(|e| format!("{:?}", e))?;
+	let (task_manager, rpc_handlers) = service::build_light(config).map_err(|e| format!("{:?}", e))?;
 
 	Ok(browser_utils::start_client(task_manager, rpc_handlers))
 }

cli/src/command.rs

@@ -47,7 +47,7 @@ impl SubstrateCli for Cli {
 	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
 		let id = if id == "" {
 			let n = get_exec_name().unwrap_or_default();
-			["polkadot", "kusama", "westend"].iter()
+			["polkadot", "kusama", "westend", "rococo"].iter()
 				.cloned()
 				.find(|&chain| n.starts_with(chain))
 				.unwrap_or("polkadot")
@@ -65,6 +65,9 @@ impl SubstrateCli for Cli {
 			"westend-dev" => Box::new(service::chain_spec::westend_development_config()?),
 			"westend-local" => Box::new(service::chain_spec::westend_local_testnet_config()?),
 			"westend-staging" => Box::new(service::chain_spec::westend_staging_testnet_config()?),
+			"rococo-staging" => Box::new(service::chain_spec::rococo_staging_testnet_config()?),
+			"rococo-local" => Box::new(service::chain_spec::rococo_local_testnet_config()?),
+			"rococo" => Box::new(service::chain_spec::rococo_config()?),
 			path if self.run.force_kusama => {
 				Box::new(service::KusamaChainSpec::from_json_file(std::path::PathBuf::from(path))?)
 			},
@@ -128,17 +131,17 @@ pub fn run() -> Result<()> {
 
 			runner.run_node_until_exit(|config| {
 				let role = config.role.clone();
-				let builder = service::NodeBuilder::new(config);
 
 				match role {
-					Role::Light => builder.build_light().map(|(task_manager, _)| task_manager),
-					_ => builder.build_full(
+					Role::Light => service::build_light(config).map(|(task_manager, _)| task_manager),
+					_ => service::build_full(
+						config,
 						None,
 						None,
 						authority_discovery_disabled,
 						6000,
 						grandpa_pause,
-					),
+					).map(|r| r.0),
 				}
 			})
 		},