Cleaner enabling of development service (paritytech#260)

* combine into single service file

* two ways to enable dev service (doesn't compile)

* Add cli flag

* fix collator flag

* --dev implies --collator

* Bump binary version. This syncs alphanet!

moonbeam-types-bundle/index.ts

@@ -211,6 +211,12 @@ export const moonbeamDefinitions = {
           nominators: "Vec<Bond>",
           total: "Balance",
         },
+        SystemInherentData: {
+          validation_data: "PersistedValidationData",
+          relay_chain_state: "StorageProof",
+          downward_messages: "Vec<InboundDownwardMessage>",
+          horizontal_messages: "BTreeMap<ParaId, Vec<InboundHrmpMessage>>",
+        },
       },
     },
   ],

node/Cargo.toml

@@ -3,7 +3,7 @@ name = 'moonbeam'
 description = 'Moonbeam Collator'
 homepage = 'https://moonbeam.network'
 license = 'GPL-3.0-only'
-version = '0.6.0'
+version = '0.6.1'
 authors = ["PureStake"]
 build = 'build.rs'
 edition = '2018'

node/src/chain_spec.rs

@@ -77,7 +77,7 @@ pub fn development_chain_spec() -> ChainSpec {
 		None,
 		Some(serde_json::from_str("{\"tokenDecimals\": 18}").expect("Provided valid json map")),
 		Extensions {
-			relay_chain: Default::default(),
+			relay_chain: "dev-service".into(),
 			para_id: Default::default(),
 		},
 	)

node/src/cli.rs

@@ -97,6 +97,10 @@ pub struct RunCmd {
 	#[structopt(long)]
 	pub parachain_id: Option<u32>,
 
+	/// Enable the development service to run without a backing relay chain
+	#[structopt(long)]
+	pub dev_service: bool,
+
 	/// When blocks should be sealed in the dev service.
 	///
 	/// Options are "instant", "manual", or timer interval in milliseconds

node/src/command.rs

@@ -176,7 +176,7 @@ pub fn run() -> Result<()> {
 					task_manager,
 					import_queue,
 					..
-				} = crate::service::new_partial(&config, None)?;
+				} = crate::service::new_partial(&config, None, false)?;
 				Ok((cmd.run(client, import_queue), task_manager))
 			})
 		}
@@ -187,7 +187,7 @@ pub fn run() -> Result<()> {
 					client,
 					task_manager,
 					..
-				} = crate::service::new_partial(&config, None)?;
+				} = crate::service::new_partial(&config, None, false)?;
 				Ok((cmd.run(client, config.database), task_manager))
 			})
 		}
@@ -198,7 +198,7 @@ pub fn run() -> Result<()> {
 					client,
 					task_manager,
 					..
-				} = crate::service::new_partial(&config, None)?;
+				} = crate::service::new_partial(&config, None, false)?;
 				Ok((cmd.run(client, config.chain_spec), task_manager))
 			})
 		}
@@ -210,7 +210,7 @@ pub fn run() -> Result<()> {
 					task_manager,
 					import_queue,
 					..
-				} = crate::service::new_partial(&config, None)?;
+				} = crate::service::new_partial(&config, None, false)?;
 				Ok((cmd.run(client, import_queue), task_manager))
 			})
 		}
@@ -226,7 +226,7 @@ pub fn run() -> Result<()> {
 					task_manager,
 					backend,
 					..
-				} = crate::service::new_partial(&config, None)?;
+				} = crate::service::new_partial(&config, None, false)?;
 				Ok((cmd.run(client, backend), task_manager))
 			})
 		}
@@ -285,26 +285,39 @@ pub fn run() -> Result<()> {
 
 			runner
 				.run_node_until_exit(|config| async move {
-					// If this is a --dev node, start up manual or instant seal.
+					let key = sp_core::Pair::generate().0;
+
+					let extension = chain_spec::Extensions::try_get(&*config.chain_spec);
+					let relay_chain_id = extension.map(|e| e.relay_chain.clone());
+					let para_id = extension.map(|e| e.para_id);
+
+					// If dev service was requested, start up manual or instant seal.
 					// Otherwise continue with the normal parachain node.
-					if cli.run.base.shared_params.dev {
+					// Dev service can be requested in two ways.
+					// 1. by providing the --dev-service flag to the CLI
+					// 2. by specifying "dev-service" in the chain spec's "relay-chain" field.
+					// NOTE: the --dev flag triggers the dev service by way of number 2
+					if cli.run.dev_service || relay_chain_id == Some("dev-service".to_string()) {
+						// --dev implies --collator
+						let collator = collator || cli.run.shared_params.dev;
+
 						// If no author id was supplied, use the one that is staked at genesis
+						// in the default development spec.
 						let author_id = author_id.or_else(|| {
 							Some(
 								AccountId::from_str("6Be02d1d3665660d22FF9624b7BE0551ee1Ac91b")
 									.expect("Gerald is a valid account"),
 							)
 						});
 
-						return crate::dev_service::new_full(config, cli.run.sealing, author_id);
+						return crate::service::new_dev(
+							config,
+							cli.run.sealing,
+							author_id,
+							collator,
+						);
 					}
 
-					let key = sp_core::Pair::generate().0;
-
-					let extension = chain_spec::Extensions::try_get(&*config.chain_spec);
-					let relay_chain_id = extension.map(|e| e.relay_chain.clone());
-					let para_id = extension.map(|e| e.para_id);
-
 					let polkadot_cli = RelayChainCli::new(
 						config.base_path.as_ref().map(|x| x.path().join("polkadot")),
 						relay_chain_id,