Split polkadot-service (#310)

* Substrate service

* Splitting polkadot service

* Specialised components

* Specialised components

* Docs and style

* Docs and style

* Final touches

* Added db key assertion

api/src/full.rs

@@ -16,7 +16,7 @@
 
 //! Strongly typed API for full Polkadot client.
 
-use client::backend::{Backend, LocalBackend};
+use client::backend::LocalBackend;
 use client::block_builder::BlockBuilder as ClientBlockBuilder;
 use client::{Client, LocalCallExecutor};
 use polkadot_executor::Executor as LocalDispatch;
@@ -57,9 +57,7 @@ macro_rules! with_runtime {
 	}}
 }
 
-impl<B: LocalBackend<Block>> BlockBuilder for ClientBlockBuilder<B, LocalCallExecutor<B, NativeExecutor<LocalDispatch>>, Block>
-	where ::client::error::Error: From<<<B as Backend<Block>>::State as state_machine::backend::Backend>::Error>
-{
+impl<B: LocalBackend<Block>> BlockBuilder for ClientBlockBuilder<B, LocalCallExecutor<B, NativeExecutor<LocalDispatch>>, Block> {
 	fn push_extrinsic(&mut self, extrinsic: UncheckedExtrinsic) -> Result<()> {
 		self.push(extrinsic).map_err(Into::into)
 	}
@@ -70,9 +68,7 @@ impl<B: LocalBackend<Block>> BlockBuilder for ClientBlockBuilder<B, LocalCallExe
 	}
 }
 
-impl<B: LocalBackend<Block>> PolkadotApi for Client<B, LocalCallExecutor<B, NativeExecutor<LocalDispatch>>, Block>
-	where ::client::error::Error: From<<<B as Backend<Block>>::State as state_machine::backend::Backend>::Error>
-{
+impl<B: LocalBackend<Block>> PolkadotApi for Client<B, LocalCallExecutor<B, NativeExecutor<LocalDispatch>>, Block> {
 	type BlockBuilder = ClientBlockBuilder<B, LocalCallExecutor<B, NativeExecutor<LocalDispatch>>, Block>;
 
 	fn session_keys(&self, at: &BlockId) -> Result<Vec<SessionKey>> {
@@ -160,7 +156,6 @@ impl<B: LocalBackend<Block>> PolkadotApi for Client<B, LocalCallExecutor<B, Nati
 }
 
 impl<B: LocalBackend<Block>> LocalPolkadotApi for Client<B, LocalCallExecutor<B, NativeExecutor<LocalDispatch>>, Block>
-	where ::client::error::Error: From<<<B as Backend<Block>>::State as state_machine::backend::Backend>::Error>
 {}
 
 #[cfg(test)]

api/src/light.rs

@@ -20,7 +20,6 @@ use std::sync::Arc;
 use client::backend::{Backend, RemoteBackend};
 use client::{Client, CallExecutor};
 use codec::Slicable;
-use state_machine;
 use primitives::{AccountId, Block, BlockId, Hash, Index, SessionKey, Timestamp, UncheckedExtrinsic};
 use runtime::Address;
 use primitives::parachain::{CandidateReceipt, DutyRoster, Id as ParaId};
@@ -43,9 +42,7 @@ impl BlockBuilder for LightBlockBuilder {
 /// Remote polkadot API implementation.
 pub struct RemotePolkadotApiWrapper<B: Backend<Block>, E: CallExecutor<Block>>(pub Arc<Client<B, E, Block>>);
 
-impl<B: Backend<Block>, E: CallExecutor<Block>> PolkadotApi for RemotePolkadotApiWrapper<B, E>
-	where ::client::error::Error: From<<<B as Backend<Block>>::State as state_machine::backend::Backend>::Error>
-{
+impl<B: Backend<Block>, E: CallExecutor<Block>> PolkadotApi for RemotePolkadotApiWrapper<B, E> {
 	type BlockBuilder = LightBlockBuilder;
 
 	fn session_keys(&self, at: &BlockId) -> Result<Vec<SessionKey>> {
@@ -104,6 +101,4 @@ impl<B: Backend<Block>, E: CallExecutor<Block>> PolkadotApi for RemotePolkadotAp
 	}
 }
 
-impl<B: RemoteBackend<Block>, E: CallExecutor<Block>> RemotePolkadotApi for RemotePolkadotApiWrapper<B, E>
-	where ::client::error::Error: From<<<B as Backend<Block>>::State as state_machine::backend::Backend>::Error>
-{}
+impl<B: RemoteBackend<Block>, E: CallExecutor<Block>> RemotePolkadotApi for RemotePolkadotApiWrapper<B, E> {}

cli/Cargo.toml

@@ -27,11 +27,13 @@ serde = "1.0"
 exit-future = "0.1"
 substrate-client = { path = "../../substrate/client" }
 substrate-codec = { path = "../../substrate/codec" }
+substrate-extrinsic-pool = { path = "../../substrate/extrinsic-pool" }
 substrate-network = { path = "../../substrate/network" }
 substrate-primitives = { path = "../../substrate/primitives" }
 substrate-rpc = { path = "../../substrate/rpc" }
 substrate-rpc-servers = { path = "../../substrate/rpc-servers" }
 substrate-runtime-primitives = { path = "../../substrate/runtime/primitives" }
+substrate-service = { path = "../../substrate/service" }
 substrate-state-machine = { path = "../../substrate/state-machine" }
 substrate-telemetry = { path = "../../substrate/telemetry" }
 polkadot-primitives = { path = "../primitives" }

cli/src/chain_spec.rs

@@ -39,10 +39,10 @@ pub enum ChainSpec {
 impl ChainSpec {
 	pub(crate) fn load(self) -> Result<service::ChainSpec, String> {
 		Ok(match self {
-			ChainSpec::PoC1Testnet => service::ChainSpec::poc_1_testnet_config()?,
-			ChainSpec::Development => service::ChainSpec::development_config(),
-			ChainSpec::LocalTestnet => service::ChainSpec::local_testnet_config(),
-			ChainSpec::StagingTestnet => service::ChainSpec::staging_testnet_config(),
+			ChainSpec::PoC1Testnet => service::chain_spec::poc_1_testnet_config()?,
+			ChainSpec::Development => service::chain_spec::development_config(),
+			ChainSpec::LocalTestnet => service::chain_spec::local_testnet_config(),
+			ChainSpec::StagingTestnet => service::chain_spec::staging_testnet_config(),
 			ChainSpec::Custom(f) => service::ChainSpec::from_json_file(PathBuf::from(f))?,
 		})
 	}

cli/src/informant.rs

@@ -22,9 +22,9 @@ use service::{Service, Components};
 use tokio::runtime::TaskExecutor;
 use tokio::timer::Interval;
 use network::{SyncState, SyncProvider};
-use polkadot_primitives::Block;
-use state_machine;
-use client::{self, BlockchainEvents};
+use client::BlockchainEvents;
+use runtime_primitives::traits::{Header, As};
+use substrate_extrinsic_pool::api::ExtrinsicPool;
 
 const TIMER_INTERVAL_MS: u64 = 5000;
 
@@ -32,13 +32,12 @@ const TIMER_INTERVAL_MS: u64 = 5000;
 pub fn start<C>(service: &Service<C>, exit: ::exit_future::Exit, handle: TaskExecutor)
 	where
 		C: Components,
-		client::error::Error: From<<<<C as Components>::Backend as client::backend::Backend<Block>>::State as state_machine::Backend>::Error>,
 {
 	let interval = Interval::new(Instant::now(), Duration::from_millis(TIMER_INTERVAL_MS));
 
 	let network = service.network();
 	let client = service.client();
-	let txpool = service.transaction_pool();
+	let txpool = service.extrinsic_pool();
 
 	let display_notifications = interval.map_err(|e| debug!("Timer error: {:?}", e)).for_each(move |_| {
 		let sync_status = network.status();
@@ -52,8 +51,9 @@ pub fn start<C>(service: &Service<C>, exit: ::exit_future::Exit, handle: TaskExe
 				(SyncState::Downloading, Some(n)) => format!("Syncing, target=#{}", n),
 			};
 			let txpool_status = txpool.light_status();
-			info!(target: "polkadot", "{} ({} peers), best: #{} ({})", status, sync_status.num_peers, best_block.number, hash);
-			telemetry!("system.interval"; "status" => status, "peers" => num_peers, "height" => best_block.number, "best" => ?hash, "txcount" => txpool_status.transaction_count);
+			let best_number: u64 = best_block.number().as_();
+			info!(target: "polkadot", "{} ({} peers), best: #{} ({})", status, sync_status.num_peers, best_number, hash);
+			telemetry!("system.interval"; "status" => status, "peers" => num_peers, "height" => best_number, "best" => ?hash, "txcount" => txpool_status.transaction_count);
 		} else {
 			warn!("Error getting best block information");
 		}
@@ -66,7 +66,7 @@ pub fn start<C>(service: &Service<C>, exit: ::exit_future::Exit, handle: TaskExe
 		Ok(())
 	});
 
-	let txpool = service.transaction_pool();
+	let txpool = service.extrinsic_pool();
 	let display_txpool_import = txpool.import_notification_stream().for_each(move |_| {
 		let status = txpool.light_status();
 		telemetry!("txpool.import"; "mem_usage" => status.mem_usage, "count" => status.transaction_count, "sender" => status.senders);

cli/src/lib.rs

@@ -41,6 +41,8 @@ extern crate substrate_rpc;
 extern crate substrate_rpc_servers as rpc;
 extern crate substrate_runtime_primitives as runtime_primitives;
 extern crate substrate_state_machine as state_machine;
+extern crate substrate_extrinsic_pool;
+extern crate substrate_service;
 extern crate polkadot_primitives;
 extern crate polkadot_runtime;
 extern crate polkadot_service as service;
@@ -76,7 +78,7 @@ use std::fs::File;
 use std::net::SocketAddr;
 use std::path::{Path, PathBuf};
 use substrate_telemetry::{init_telemetry, TelemetryConfig};
-use polkadot_primitives::{Block, BlockId};
+use polkadot_primitives::BlockId;
 use codec::Slicable;
 use client::BlockOrigin;
 use runtime_primitives::generic::SignedBlock;
@@ -141,8 +143,7 @@ pub trait Worker {
 	fn exit_only(self) -> Self::Exit;
 
 	/// Do work and schedule exit.
-	fn work<C: ServiceComponents>(self, service: &Service<C>) -> Self::Work
-		where ClientError: From<<<<C as ServiceComponents>::Backend as ClientBackend<PolkadotBlock>>::State as StateMachineBackend>::Error>;
+	fn work<C: ServiceComponents>(self, service: &Service<C>) -> Self::Work;
 }
 
 /// Parse command line arguments and start the node.
@@ -441,7 +442,6 @@ fn run_until_exit<C, W>(
 	where
 		C: service::Components,
 		W: Worker,
-		client::error::Error: From<<<<C as service::Components>::Backend as client::backend::Backend<Block>>::State as state_machine::Backend>::Error>,
 {
 	let (exit_send, exit) = exit_future::signal();
 
@@ -453,10 +453,11 @@ fn run_until_exit<C, W>(
 		let ws_address = parse_address("127.0.0.1:9944", "ws-port", matches)?;
 
 		let handler = || {
-			let chain = rpc::apis::chain::Chain::new(service.client(), executor.clone());
-			let author = rpc::apis::author::Author::new(service.client(), service.transaction_pool());
-			rpc::rpc_handler::<Block, _, _, _, _>(
-				service.client(),
+			let client = (&service as &substrate_service::Service<C>).client();
+			let chain = rpc::apis::chain::Chain::new(client.clone(), executor.clone());
+			let author = rpc::apis::author::Author::new(client.clone(), service.extrinsic_pool());
+			rpc::rpc_handler::<service::ComponentBlock<C>, _, _, _, _>(
+				client,
 				chain,
 				author,
 				sys_conf.clone(),

collator/src/lib.rs

@@ -66,7 +66,7 @@ use client::BlockchainEvents;
 use polkadot_api::PolkadotApi;
 use polkadot_primitives::BlockId;
 use polkadot_primitives::parachain::{self, BlockData, HeadData, ConsolidatedIngress, Collation, Message, Id as ParaId};
-use polkadot_cli::{ClientError, ServiceComponents, ClientBackend, PolkadotBlock, StateMachineBackend, Service};
+use polkadot_cli::{ServiceComponents, Service};
 use polkadot_cli::Worker;
 
 /// Parachain context needed for collation.
@@ -213,9 +213,7 @@ impl<P, E> Worker for CollationNode<P, E> where
 		self.exit
 	}
 
-	fn work<C: ServiceComponents>(self, service: &Service<C>) -> Self::Work
-		where ClientError: From<<<<C as ServiceComponents>::Backend as ClientBackend<PolkadotBlock>>::State as StateMachineBackend>::Error>,
-	{
+	fn work<C: ServiceComponents>(self, service: &Service<C>) -> Self::Work {
 		let CollationNode { parachain_context, exit, para_id, key } = self;
 		let client = service.client();
 		let api = service.api();

network/src/lib.rs

@@ -221,6 +221,12 @@ pub struct PolkadotProtocol {
 	next_req_id: u64,
 }
 
+impl Default for PolkadotProtocol {
+	fn default() -> Self {
+		Self::new()
+	}
+}
+
 impl PolkadotProtocol {
 	/// Instantiate a polkadot protocol handler.
 	pub fn new() -> Self {

service/Cargo.toml

@@ -4,18 +4,12 @@ version = "0.2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-futures = "0.1.17"
 parking_lot = "0.4"
 error-chain = "0.12"
 lazy_static = "1.0"
 log = "0.3"
 slog = "^2"
-clap = "2.27"
 tokio = "0.1.7"
-exit-future = "0.1"
-serde = "1.0"
-serde_json = "1.0"
-serde_derive = "1.0"
 hex-literal = "0.1"
 ed25519 = { path = "../../substrate/ed25519" }
 polkadot-primitives = { path = "../primitives" }
@@ -27,12 +21,9 @@ polkadot-transaction-pool = { path = "../transaction-pool" }
 polkadot-network = { path = "../network" }
 substrate-keystore = { path = "../../substrate/keystore" }
 substrate-runtime-io = { path = "../../substrate/runtime-io" }
-substrate-runtime-primitives = { path = "../../substrate/runtime/primitives" }
 substrate-primitives = { path = "../../substrate/primitives" }
 substrate-network = { path = "../../substrate/network" }
 substrate-client = { path = "../../substrate/client" }
-substrate-client-db = { path = "../../substrate/client/db" }
 substrate-codec = { path = "../../substrate/codec" }
-substrate-executor = { path = "../../substrate/executor" }
-substrate-state-machine = { path = "../../substrate/state-machine" }
+substrate-service = { path = "../../substrate/service" }
 substrate-telemetry = { path = "../../substrate/telemetry" }

service/src/chain_spec.rs

@@ -17,299 +17,173 @@
 //! Polkadot chain configurations.
 
 use ed25519;
-use std::collections::HashMap;
-use std::fs::File;
-use std::path::PathBuf;
-use primitives::{AuthorityId, storage::{StorageKey, StorageData}};
-use runtime_primitives::{BuildStorage, StorageMap};
+use primitives::AuthorityId;
 use polkadot_runtime::{GenesisConfig, ConsensusConfig, CouncilConfig, DemocracyConfig,
 	SessionConfig, StakingConfig, TimestampConfig};
-use serde_json as json;
+use service::ChainSpec;
 
-enum GenesisSource {
-	File(PathBuf),
-	Embedded(&'static [u8]),
-	Factory(fn() -> Genesis),
+pub fn poc_1_testnet_config() -> Result<ChainSpec<GenesisConfig>, String> {
+	ChainSpec::from_embedded(include_bytes!("../res/poc-1.json"))
 }
 
-impl GenesisSource {
-	fn resolve(&self) -> Result<Genesis, String> {
-		#[derive(Serialize, Deserialize)]
-		struct GenesisContainer {
-			genesis: Genesis,
-		}
-
-		match *self {
-			GenesisSource::File(ref path) => {
-				let file = File::open(path).map_err(|e| format!("Error opening spec file: {}", e))?;
-				let genesis: GenesisContainer = json::from_reader(file).map_err(|e| format!("Error parsing spec file: {}", e))?;
-				Ok(genesis.genesis)
-			},
-			GenesisSource::Embedded(buf) => {
-				let genesis: GenesisContainer = json::from_reader(buf).map_err(|e| format!("Error parsing embedded file: {}", e))?;
-				Ok(genesis.genesis)
-			},
-			GenesisSource::Factory(f) => Ok(f()),
-		}
+fn staging_testnet_config_genesis() -> GenesisConfig {
+	let initial_authorities = vec![
+		hex!["82c39b31a2b79a90f8e66e7a77fdb85a4ed5517f2ae39f6a80565e8ecae85cf5"].into(),
+		hex!["4de37a07567ebcbf8c64568428a835269a566723687058e017b6d69db00a77e7"].into(),
+		hex!["063d7787ebca768b7445dfebe7d62cbb1625ff4dba288ea34488da266dd6dca5"].into(),
+		hex!["8101764f45778d4980dadaceee6e8af2517d3ab91ac9bec9cd1714fa5994081c"].into(),
+	];
+	let endowed_accounts = vec![
+		hex!["f295940fa750df68a686fcf4abd4111c8a9c5a5a5a83c4c8639c451a94a7adfd"].into(),
+	];
+	GenesisConfig {
+		consensus: Some(ConsensusConfig {
+			code: include_bytes!("../../runtime/wasm/genesis.wasm").to_vec(),	// TODO change
+			authorities: initial_authorities.clone(),
+		}),
+		system: None,
+		session: Some(SessionConfig {
+			validators: initial_authorities.iter().cloned().map(Into::into).collect(),
+			session_length: 60,	// that's 5 minutes per session.
+			broken_percent_late: 50,
+		}),
+		staking: Some(StakingConfig {
+			current_era: 0,
+			intentions: initial_authorities.iter().cloned().map(Into::into).collect(),
+			transaction_base_fee: 100,
+			transaction_byte_fee: 1,
+			existential_deposit: 500,
+			transfer_fee: 0,
+			creation_fee: 0,
+			contract_fee: 0,
+			reclaim_rebate: 0,
+			early_era_slash: 10000,
+			session_reward: 100,
+			balances: endowed_accounts.iter().map(|&k|(k, 1u128 << 60)).collect(),
+			validator_count: 12,
+			sessions_per_era: 12,	// 1 hour per era
+			bonding_duration: 24,	// 1 day per bond.
+		}),
+		democracy: Some(DemocracyConfig {
+			launch_period: 12 * 60 * 24,	// 1 day per public referendum
+			voting_period: 12 * 60 * 24 * 3,	// 3 days to discuss & vote on an active referendum
+			minimum_deposit: 5000,	// 12000 as the minimum deposit for a referendum
+		}),
+		council: Some(CouncilConfig {
+			active_council: vec![],
+			candidacy_bond: 5000,	// 5000 to become a council candidate
+			voter_bond: 1000,		// 1000 down to vote for a candidate
+			present_slash_per_voter: 1,	// slash by 1 per voter for an invalid presentation.
+			carry_count: 6,		// carry over the 6 runners-up to the next council election
+			presentation_duration: 12 * 60 * 24,	// one day for presenting winners.
+			approval_voting_period: 12 * 60 * 24 * 2,	// two days period between possible council elections.
+			term_duration: 12 * 60 * 24 * 24,	// 24 day term duration for the council.
+			desired_seats: 0, // start with no council: we'll raise this once the stake has been dispersed a bit.
+			inactive_grace_period: 1,	// one addition vote should go by before an inactive voter can be reaped.
+
+			cooloff_period: 12 * 60 * 24 * 4, // 4 day cooling off period if council member vetoes a proposal.
+			voting_period: 12 * 60 * 24, // 1 day voting period for council members.
+		}),
+		parachains: Some(Default::default()),
+		timestamp: Some(TimestampConfig {
+			period: 5,					// 5 second block time.
+		}),
 	}
 }
 
-impl<'a> BuildStorage for &'a ChainSpec {
-	fn build_storage(self) -> Result<StorageMap, String> {
-		match self.genesis.resolve()? {
-			Genesis::Runtime(gc) => gc.build_storage(),
-			Genesis::Raw(map) => Ok(map.into_iter().map(|(k, v)| (k.0, v.0)).collect()),
-		}
-	}
+/// Staging testnet config.
+pub fn staging_testnet_config() -> ChainSpec<GenesisConfig> {
+	let boot_nodes = vec![
+		"enode://a93a29fa68d965452bf0ff8c1910f5992fe2273a72a1ee8d3a3482f68512a61974211ba32bb33f051ceb1530b8ba3527fc36224ba6b9910329025e6d9153cf50@104.211.54.233:30333".into(),
+		"enode://051b18f63a316c4c5fef4631f8c550ae0adba179153588406fac3e5bbbbf534ebeda1bf475dceda27a531f6cdef3846ab6a010a269aa643a1fec7bff51af66bd@104.211.48.51:30333".into(),
+		"enode://c831ec9011d2c02d2c4620fc88db6d897a40d2f88fd75f47b9e4cf3b243999acb6f01b7b7343474650b34eeb1363041a422a91f1fc3850e43482983ee15aa582@104.211.48.247:30333".into(),
+	];
+	ChainSpec::from_genesis("Staging Testnet", staging_testnet_config_genesis, boot_nodes)
 }
 
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-#[serde(deny_unknown_fields)]
-enum Genesis {
-	Runtime(GenesisConfig),
-	Raw(HashMap<StorageKey, StorageData>),
+fn testnet_genesis(initial_authorities: Vec<AuthorityId>) -> GenesisConfig {
+	let endowed_accounts = vec![
+		ed25519::Pair::from_seed(b"Alice                           ").public().0.into(),
+		ed25519::Pair::from_seed(b"Bob                             ").public().0.into(),
+		ed25519::Pair::from_seed(b"Charlie                         ").public().0.into(),
+		ed25519::Pair::from_seed(b"Dave                            ").public().0.into(),
+		ed25519::Pair::from_seed(b"Eve                             ").public().0.into(),
+		ed25519::Pair::from_seed(b"Ferdie                          ").public().0.into(),
+	];
+	GenesisConfig {
+		consensus: Some(ConsensusConfig {
+			code: include_bytes!("../../runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm").to_vec(),
+			authorities: initial_authorities.clone(),
+		}),
+		system: None,
+		session: Some(SessionConfig {
+			validators: initial_authorities.iter().cloned().map(Into::into).collect(),
+			session_length: 10,
+			broken_percent_late: 30,
+		}),
+		staking: Some(StakingConfig {
+			current_era: 0,
+			intentions: initial_authorities.iter().cloned().map(Into::into).collect(),
+			transaction_base_fee: 1,
+			transaction_byte_fee: 0,
+			existential_deposit: 500,
+			transfer_fee: 0,
+			creation_fee: 0,
+			contract_fee: 0,
+			reclaim_rebate: 0,
+			balances: endowed_accounts.iter().map(|&k|(k, (1u128 << 60))).collect(),
+			validator_count: 2,
+			sessions_per_era: 5,
+			bonding_duration: 2,
+			early_era_slash: 0,
+			session_reward: 0,
+		}),
+		democracy: Some(DemocracyConfig {
+			launch_period: 9,
+			voting_period: 18,
+			minimum_deposit: 10,
+		}),
+		council: Some(CouncilConfig {
+			active_council: endowed_accounts.iter().filter(|a| initial_authorities.iter().find(|&b| a.0 == b.0).is_none()).map(|a| (a.clone(), 1000000)).collect(),
+			candidacy_bond: 10,
+			voter_bond: 2,
+			present_slash_per_voter: 1,
+			carry_count: 4,
+			presentation_duration: 10,
+			approval_voting_period: 20,
+			term_duration: 1000000,
+			desired_seats: (endowed_accounts.len() - initial_authorities.len()) as u32,
+			inactive_grace_period: 1,
+
+			cooloff_period: 75,
+			voting_period: 20,
+		}),
+		parachains: Some(Default::default()),
+		timestamp: Some(TimestampConfig {
+			period: 5,					// 5 second block time.
+		}),
+	}
 }
 
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct ChainSpecFile {
-	pub name: String,
-	pub boot_nodes: Vec<String>,
+fn development_config_genesis() -> GenesisConfig {
+	testnet_genesis(vec![
+		ed25519::Pair::from_seed(b"Alice                           ").public().into(),
+	])
 }
 
-/// A configuration of a chain. Can be used to build a genesis block.
-pub struct ChainSpec {
-	spec: ChainSpecFile,
-	genesis: GenesisSource,
+/// Development config (single validator Alice)
+pub fn development_config() -> ChainSpec<GenesisConfig> {
+	ChainSpec::from_genesis("Development", development_config_genesis, vec![])
 }
 
-impl ChainSpec {
-	pub fn boot_nodes(&self) -> &[String] {
-		&self.spec.boot_nodes
-	}
-
-	pub fn name(&self) -> &str {
-		&self.spec.name
-	}
-
-	/// Parse json content into a `ChainSpec`
-	pub fn from_embedded(json: &'static [u8]) -> Result<Self, String> {
-		let spec = json::from_slice(json).map_err(|e| format!("Error parsing spec file: {}", e))?;
-		Ok(ChainSpec {
-			spec,
-			genesis: GenesisSource::Embedded(json),
-		})
-	}
-
-	/// Parse json file into a `ChainSpec`
-	pub fn from_json_file(path: PathBuf) -> Result<Self, String> {
-		let file = File::open(&path).map_err(|e| format!("Error opening spec file: {}", e))?;
-		let spec = json::from_reader(file).map_err(|e| format!("Error parsing spec file: {}", e))?;
-		Ok(ChainSpec {
-			spec,
-			genesis: GenesisSource::File(path),
-		})
-	}
-
-	/// Dump to json string.
-	pub fn to_json(self, raw: bool) -> Result<String, String> {
-		#[derive(Serialize, Deserialize)]
-		struct Container {
-			#[serde(flatten)]
-			spec: ChainSpecFile,
-			#[serde(flatten)]
-			genesis: Genesis,
-
-		};
-		let genesis = match (raw, self.genesis.resolve()?) {
-			(true, Genesis::Runtime(g)) => {
-				let storage = g.build_storage()?.into_iter()
-					.map(|(k, v)| (StorageKey(k), StorageData(v)))
-					.collect();
-
-				Genesis::Raw(storage)
-			},
-			(_, genesis) => genesis,
-		};
-		let spec = Container {
-			spec: self.spec,
-			genesis,
-		};
-		json::to_string_pretty(&spec).map_err(|e| format!("Error generating spec json: {}", e))
-	}
-
-	pub fn poc_1_testnet_config() -> Result<Self, String> {
-		Self::from_embedded(include_bytes!("../res/poc-1.json"))
-	}
-
-	fn staging_testnet_config_genesis() -> Genesis {
-		let initial_authorities = vec![
-			hex!["82c39b31a2b79a90f8e66e7a77fdb85a4ed5517f2ae39f6a80565e8ecae85cf5"].into(),
-			hex!["4de37a07567ebcbf8c64568428a835269a566723687058e017b6d69db00a77e7"].into(),
-			hex!["063d7787ebca768b7445dfebe7d62cbb1625ff4dba288ea34488da266dd6dca5"].into(),
-			hex!["8101764f45778d4980dadaceee6e8af2517d3ab91ac9bec9cd1714fa5994081c"].into(),
-		];
-		let endowed_accounts = vec![
-			hex!["f295940fa750df68a686fcf4abd4111c8a9c5a5a5a83c4c8639c451a94a7adfd"].into(),
-		];
-		Genesis::Runtime(GenesisConfig {
-			consensus: Some(ConsensusConfig {
-				code: include_bytes!("../../runtime/wasm/genesis.wasm").to_vec(),	// TODO change
-				authorities: initial_authorities.clone(),
-			}),
-			system: None,
-			session: Some(SessionConfig {
-				validators: initial_authorities.iter().cloned().map(Into::into).collect(),
-				session_length: 60,	// that's 5 minutes per session.
-				broken_percent_late: 50,
-			}),
-			staking: Some(StakingConfig {
-				current_era: 0,
-				intentions: initial_authorities.iter().cloned().map(Into::into).collect(),
-				transaction_base_fee: 100,
-				transaction_byte_fee: 1,
-				existential_deposit: 500,
-				transfer_fee: 0,
-				creation_fee: 0,
-				contract_fee: 0,
-				reclaim_rebate: 0,
-				early_era_slash: 10000,
-				session_reward: 100,
-				balances: endowed_accounts.iter().map(|&k|(k, 1u128 << 60)).collect(),
-				validator_count: 12,
-				sessions_per_era: 12,	// 1 hour per era
-				bonding_duration: 24,	// 1 day per bond.
-			}),
-			democracy: Some(DemocracyConfig {
-				launch_period: 12 * 60 * 24,	// 1 day per public referendum
-				voting_period: 12 * 60 * 24 * 3,	// 3 days to discuss & vote on an active referendum
-				minimum_deposit: 5000,	// 12000 as the minimum deposit for a referendum
-			}),
-			council: Some(CouncilConfig {
-				active_council: vec![],
-				candidacy_bond: 5000,	// 5000 to become a council candidate
-				voter_bond: 1000,		// 1000 down to vote for a candidate
-				present_slash_per_voter: 1,	// slash by 1 per voter for an invalid presentation.
-				carry_count: 6,		// carry over the 6 runners-up to the next council election
-				presentation_duration: 12 * 60 * 24,	// one day for presenting winners.
-				approval_voting_period: 12 * 60 * 24 * 2,	// two days period between possible council elections.
-				term_duration: 12 * 60 * 24 * 24,	// 24 day term duration for the council.
-				desired_seats: 0, // start with no council: we'll raise this once the stake has been dispersed a bit.
-				inactive_grace_period: 1,	// one addition vote should go by before an inactive voter can be reaped.
-
-				cooloff_period: 12 * 60 * 24 * 4, // 4 day cooling off period if council member vetoes a proposal.
-				voting_period: 12 * 60 * 24, // 1 day voting period for council members.
-			}),
-			parachains: Some(Default::default()),
-			timestamp: Some(TimestampConfig {
-				period: 5,					// 5 second block time.