Dump genesis to JSON file (#218)

* Merge remote-tracking branch 'origin/master' into gav-xts-dont-panic

* Update wasm.

* consensus, session and staking all panic-safe.

* Democracy doesn't panic in apply.

* Fix tests.

* Extra helper macro, council depanicked.

* Fix one test.

* Fix up all council tests. No panics!

* Council voting depanicked.

* Dispatch returns result.

* session & staking tests updated

* Fix democracy tests.

* Fix council tests.

* Fix up polkadot parachains in runtime

* Fix borked merge

* More Slicable support

Support general `Option` and array types.

* Basic storage types.

* Existential deposit for contract creation

* Basic implemnetation along with removals

* Fix tests.

* externalities builder fix.

* Tests.

* Fix up the runtime.

* Fix tests.

* Add generic `Address` type.

* Initial function integration of Address into Extrinsic.

* Fix build

* All tests compile.

* Fix (some) tests.

* Fix signing.

* Push error.

* transfer can accept Address

* Make Address generic over AccountIndex

* Fix test

* Make Council use Address for dispatch.

* Fix build

* Bend over backwards to support braindead derive.

* Repot some files.

* Fix tests.

* Fix grumbles

* Remove Default bound

* Fix build for new nightly.

* Make `apply_extrinsic` never panic, return useful Result.

* More merge hell

* Doesn't build, but might do soon

* Serde woes

* get substrate-runtime-staking compiling

* Polkadot builds again!

* Fix all build.

* Fix tests & binaries.

* Reserve some extra initial byte values of address for future format changes

* Make semantic of `ReservedBalance` clear.

* Fix panic handler.

* Integrate other balance transformations into the new model

Fix up staking tests.

* Fix runtime tests.

* Fix panic build.

* Tests for demonstrating interaction between balance types.

* Repot some runtime code

* Fix checkedblock in non-std builds

* Get rid of `DoLookup` phantom.

* Attempt to make transaction_pool work with lookups.

* Remove vscode settings

* New attempt at making transaction pool work.

* It builds again!

* --all builds

* Fix tests.

* New build.

* Test account nonce reset.

* polkadot transaction pool tests/framework.

* Initial draft (working).

* Address grumbles.

* Revert bad `map_or`

* Rebuild binaries, workaround.

* Avoid checking in vscode

* reconnecting, shared, slog

* CLI options for name and telemetry url

* ensure telemetry url imples enabled

* Avoid casting to usize early.

* Provide on-connect event for session message

* Better port

* heartbeat and some renaming

* transaction pool stuff

* minor renaming.

* report telemetry

* cleanups.

* Fix for previous cleanup

* dump genesis, dev mode, renaming

* Rework chain spec/config &c. to allow for genesis file loading.

* Avoid producing genesis storage when unneeded

* Allow reading JSON genesis state dumps

* tests work again

* better logging.

* Fix wasm build.

* Introduce PoC-1 spec

* Made block message compatible with poc-1

* Squashed changes for dumping genesis block.

* Binaries.

* Made block message compatible with poc-1

* Remove dead code.

* Fix bad merge.

* Argument passing and returning values when invoking sandboxed funcs (#189)

* Fixed block download sequence (#223)

* Trie-based execution proof (#177)

* TrieBasedBackend

* trie tests

* redunant return_value removed

* use Trie::get_with to record trie proofs

* Relaying tx/blocks by light clients (#190)

* do not import external transactions into light tx pool

* do not announce blocks on light clients

* blocks_are_not_announced_by_light_nodes

polkadot/service/src/components.rs

@@ -18,16 +18,16 @@
 
 use std::collections::HashMap;
 use std::sync::Arc;
-use client::{self, genesis, Client};
+use client::{self, Client};
 use client_db;
 use codec::{self, Slicable};
 use consensus;
 use keystore::Store as Keystore;
 use network;
 use polkadot_api;
+use runtime_primitives::MakeStorage;
 use polkadot_executor::Executor as LocalDispatch;
-use polkadot_runtime::{GenesisConfig, BuildExternalities};
-use polkadot_primitives::{Block, BlockId, Hash, Header};
+use polkadot_primitives::{Block, BlockId, Hash};
 use state_machine;
 use substrate_executor::NativeExecutor;
 use transaction_pool::{self, TransactionPool};
@@ -48,7 +48,7 @@ pub trait Components {
 	type Executor: 'static + client::CallExecutor<Block> + Send + Sync;
 
 	/// Create client.
-	fn build_client(&self, settings: client_db::DatabaseSettings, executor: CodeExecutor, genesis: GenesisBuilder)
+	fn build_client(&self, settings: client_db::DatabaseSettings, executor: CodeExecutor, genesis_storage: MakeStorage)
 		-> Result<(Arc<Client<Self::Backend, Self::Executor, Block>>, Option<Arc<network::OnDemand<Block, network::Service<Block>>>>), error::Error>;
 
 	/// Create api.
@@ -63,19 +63,6 @@ pub trait Components {
 		-> Result<Option<consensus::Service>, error::Error>;
 }
 
-/// Genesis block builder.
-pub struct GenesisBuilder {
-	pub config: GenesisConfig,
-}
-
-impl client::GenesisBuilder<Block> for GenesisBuilder {
-	fn build(self) -> (Header, Vec<(Vec<u8>, Vec<u8>)>) {
-		let storage = self.config.build_externalities();
-		let block = genesis::construct_genesis_block::<Block>(&storage);
-		(block.header, storage.into_iter().collect())
-	}
-}
-
 /// Components for full Polkadot service.
 pub struct FullComponents {
 	/// Is this a validator node?
@@ -87,9 +74,9 @@ impl Components for FullComponents {
 	type Api = Client<Self::Backend, Self::Executor, Block>;
 	type Executor = client::LocalCallExecutor<client_db::Backend<Block>, NativeExecutor<LocalDispatch>>;
 
-	fn build_client(&self, db_settings: client_db::DatabaseSettings, executor: CodeExecutor, genesis: GenesisBuilder)
+	fn build_client(&self, db_settings: client_db::DatabaseSettings, executor: CodeExecutor, genesis_storage: MakeStorage)
 		-> Result<(Arc<client::Client<Self::Backend, Self::Executor, Block>>, Option<Arc<network::OnDemand<Block, network::Service<Block>>>>), error::Error> {
-		Ok((Arc::new(client_db::new_client(db_settings, executor, genesis)?), None))
+		Ok((Arc::new(client_db::new_client(db_settings, executor, genesis_storage)?), None))
 	}
 
 	fn build_api(&self, client: Arc<client::Client<Self::Backend, Self::Executor, Block>>) -> Arc<Self::Api> {
@@ -134,12 +121,12 @@ impl Components for LightComponents {
 	type Api = polkadot_api::light::RemotePolkadotApiWrapper<Self::Backend, Self::Executor>;
 	type Executor = client::RemoteCallExecutor<client::light::Backend<Block>, network::OnDemand<Block, network::Service<Block>>>;
 
-	fn build_client(&self, _settings: client_db::DatabaseSettings, executor: CodeExecutor, genesis: GenesisBuilder)
+	fn build_client(&self, _settings: client_db::DatabaseSettings, executor: CodeExecutor, genesis_storage: MakeStorage)
 		-> Result<(Arc<client::Client<Self::Backend, Self::Executor, Block>>, Option<Arc<network::OnDemand<Block, network::Service<Block>>>>), error::Error> {
 		let client_backend = client::light::new_light_backend();
 		let fetch_checker = Arc::new(client::light::new_fetch_checker(client_backend.clone(), executor));
 		let fetcher = Arc::new(network::OnDemand::new(fetch_checker));
-		let client = client::light::new_light(client_backend, fetcher.clone(), genesis)?;
+		let client = client::light::new_light(client_backend, fetcher.clone(), genesis_storage)?;
 		Ok((Arc::new(client), Some(fetcher)))
 	}
 

polkadot/service/src/config.rs

@@ -17,64 +17,11 @@
 //! Service configuration.
 
 use transaction_pool;
+use runtime_primitives::MakeStorage;
 pub use network::Role;
 pub use network::NetworkConfiguration;
 
-/// The chain specification (this should eventually be replaced by a more general JSON-based chain
-/// specification).
-#[derive(Clone, Copy, Debug)]
-pub enum ChainSpec {
-	/// Whatever the current runtime is, with just Alice as an auth.
-	Development,
-	/// Whatever the current runtime is, with simple Alice/Bob auths.
-	LocalTestnet,
-	/// The PoC-2 testnet.
-	PoC2Testnet,
-}
-
-/// Synonym for Option<ChainSpec> because we cannot `impl From<..> for Option<ChainSpec>`
-pub struct OptionChainSpec(Option<ChainSpec>);
-
-impl OptionChainSpec {
-	/// Return the inner part.
-	pub fn inner(self) -> Option<ChainSpec> {
-		self.0
-	}
-}
-
-impl<'a> From<&'a str> for OptionChainSpec {
-	fn from(s: &'a str) -> Self {
-		OptionChainSpec(Some(match s {
-			"dev" => ChainSpec::Development,
-			"local" => ChainSpec::LocalTestnet,
-			"poc-2" => ChainSpec::PoC2Testnet,
-			_ => return OptionChainSpec(None),
-		}))
-	}
-}
-
-impl From<ChainSpec> for &'static str {
-	fn from(s: ChainSpec) -> &'static str {
-		match s {
-			ChainSpec::Development => "dev",
-			ChainSpec::LocalTestnet => "local",
-			ChainSpec::PoC2Testnet => "poc-2",
-		}
-	}
-}
-
-impl ::std::fmt::Display for ChainSpec {
-	fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-		write!(f, "{}", match *self {
-			ChainSpec::Development => "Development",
-			ChainSpec::LocalTestnet => "Local Testnet",
-			ChainSpec::PoC2Testnet => "PoC-2 Testnet",
-		})
-	}
-}
-
 /// Service configuration.
-#[derive(Clone)]
 pub struct Configuration {
 	/// Node roles.
 	pub roles: Role,
@@ -88,8 +35,10 @@ pub struct Configuration {
 	pub database_path: String,
 	/// Additional key seeds.
 	pub keys: Vec<String>,
-	/// Chain specification.
-	pub chain_spec: ChainSpec,
+	/// The name of the chain.
+	pub chain_name: String,
+	/// Chain configuration.
+	pub genesis_storage: MakeStorage,
 	/// Telemetry server URL, optional - only `Some` if telemetry reporting is enabled
 	pub telemetry: Option<String>,
 	/// Node name.
@@ -105,7 +54,8 @@ impl Default for Configuration {
 			keystore_path: Default::default(),
 			database_path: Default::default(),
 			keys: Default::default(),
-			chain_spec: ChainSpec::Development,
+			chain_name: Default::default(),
+			genesis_storage: Box::new(Default::default),
 			telemetry: Default::default(),
 			name: "Anonymous".into(),
 		}

polkadot/service/src/lib.rs

@@ -31,6 +31,7 @@ extern crate polkadot_transaction_pool as transaction_pool;
 extern crate substrate_keystore as keystore;
 extern crate substrate_runtime_io as runtime_io;
 extern crate substrate_primitives as primitives;
+extern crate substrate_runtime_primitives as runtime_primitives;
 extern crate substrate_network as network;
 extern crate substrate_codec as codec;
 extern crate substrate_executor;
@@ -48,8 +49,6 @@ extern crate error_chain;
 extern crate slog;	// needed until we can reexport `slog_info` from `substrate_telemetry`
 #[macro_use]
 extern crate log;
-#[macro_use]
-extern crate hex_literal;
 
 mod components;
 mod error;
@@ -59,20 +58,17 @@ use std::sync::Arc;
 use std::thread;
 use futures::prelude::*;
 use tokio_core::reactor::Core;
-use primitives::AuthorityId;
 use transaction_pool::TransactionPool;
 use keystore::Store as Keystore;
 use polkadot_api::PolkadotApi;
 use polkadot_primitives::{Block, BlockId, Hash};
-use polkadot_runtime::{GenesisConfig, ConsensusConfig, CouncilConfig, DemocracyConfig,
-	SessionConfig, StakingConfig};
 use client::{Client, BlockchainEvents};
 use network::ManageNetwork;
 use exit_future::Signal;
 
 pub use self::error::{ErrorKind, Error};
 pub use self::components::{Components, FullComponents, LightComponents};
-pub use config::{Configuration, Role, OptionChainSpec, ChainSpec};
+pub use config::{Configuration, Role};
 
 /// Polkadot service.
 pub struct Service<Components: components::Components> {
@@ -84,149 +80,6 @@ pub struct Service<Components: components::Components> {
 	_consensus: Option<consensus::Service>,
 }
 
-pub struct ChainConfig {
-	genesis_config: GenesisConfig,
-	boot_nodes: Vec<String>,
-}
-
-fn poc_2_testnet_config() -> ChainConfig {
-	let initial_authorities = vec![
-		hex!["82c39b31a2b79a90f8e66e7a77fdb85a4ed5517f2ae39f6a80565e8ecae85cf5"].into(),
-		hex!["4de37a07567ebcbf8c64568428a835269a566723687058e017b6d69db00a77e7"].into(),
-		hex!["063d7787ebca768b7445dfebe7d62cbb1625ff4dba288ea34488da266dd6dca5"].into(),
-		hex!["8101764f45778d4980dadaceee6e8af2517d3ab91ac9bec9cd1714fa5994081c"].into(),
-	];
-	let endowed_accounts = vec![
-		hex!["f295940fa750df68a686fcf4abd4111c8a9c5a5a5a83c4c8639c451a94a7adfd"].into(),
-	];
-	let genesis_config = 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: 720,	// that's 1 hour per session.
-		}),
-		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,
-			balances: endowed_accounts.iter().map(|&k|(k, 1u128 << 60)).collect(),
-			validator_count: 12,
-			sessions_per_era: 24,	// 24 hours per era.
-			bonding_duration: 90,	// 90 days per bond.
-		}),
-		democracy: Some(DemocracyConfig {
-			launch_period: 120 * 24 * 14,	// 2 weeks per public referendum
-			voting_period: 120 * 24 * 28,	// 4 weeks to discuss & vote on an active referendum
-			minimum_deposit: 1000,	// 1000 as the minimum deposit for a referendum
-		}),
-		council: Some(CouncilConfig {
-			active_council: vec![],
-			candidacy_bond: 1000,	// 1000 to become a council candidate
-			voter_bond: 100,		// 100 down to vote for a candidate
-			present_slash_per_voter: 1,	// slash by 1 per voter for an invalid presentation.
-			carry_count: 24,		// carry over the 24 runners-up to the next council election
-			presentation_duration: 120 * 24,	// one day for presenting winners.
-			approval_voting_period: 7 * 120 * 24,	// one week period between possible council elections.
-			term_duration: 180 * 120 * 24,	// 180 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: 90 * 120 * 24, // 90 day cooling off period if council member vetoes a proposal.
-			voting_period: 7 * 120 * 24, // 7 day voting period for council members.
-		}),
-		parachains: Some(Default::default()),
-	};
-	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(),
-	];
-	ChainConfig { genesis_config, boot_nodes }
-}
-
-fn testnet_config(initial_authorities: Vec<AuthorityId>) -> ChainConfig {
-	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(),
-	];
-	let genesis_config = 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,
-		}),
-		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,
-		}),
-		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).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()),
-	};
-	let boot_nodes = Vec::new();
-	ChainConfig { genesis_config, boot_nodes }
-}
-
-fn development_config() -> ChainConfig {
-	testnet_config(vec![
-		ed25519::Pair::from_seed(b"Alice                           ").public().into(),
-	])
-}
-
-fn local_testnet_config() -> ChainConfig {
-	testnet_config(vec![
-		ed25519::Pair::from_seed(b"Alice                           ").public().into(),
-		ed25519::Pair::from_seed(b"Bob                             ").public().into(),
-	])
-}
-
 /// Creates light client and register protocol with the network service
 pub fn new_light(config: Configuration) -> Result<Service<components::LightComponents>, error::Error> {
 	Service::new(components::LightComponents, config)
@@ -244,7 +97,7 @@ impl<Components> Service<Components>
 		client::error::Error: From<<<<Components as components::Components>::Backend as client::backend::Backend<Block>>::State as state_machine::Backend>::Error>,
 {
 	/// Creates and register protocol with the network service
-	fn new(components: Components, mut config: Configuration) -> Result<Self, error::Error> {
+	fn new(components: Components, config: Configuration) -> Result<Self, error::Error> {
 		use std::sync::Barrier;
 
 		let (signal, exit) = ::exit_future::signal();
@@ -262,23 +115,12 @@ impl<Components> Service<Components>
 			info!("Generated a new keypair: {:?}", key.public());
 		}
 
-		let ChainConfig { genesis_config, boot_nodes } = match config.chain_spec {
-			ChainSpec::Development => development_config(),
-			ChainSpec::LocalTestnet => local_testnet_config(),
-			ChainSpec::PoC2Testnet => poc_2_testnet_config(),
-		};
-		config.network.boot_nodes.extend(boot_nodes);
-
-		let genesis_builder = components::GenesisBuilder {
-			config: genesis_config,
-		};
-
 		let db_settings = client_db::DatabaseSettings {
 			cache_size: None,
 			path: config.database_path.into(),
 		};
 
-		let (client, on_demand) = components.build_client(db_settings, executor, genesis_builder)?;
+		let (client, on_demand) = components.build_client(db_settings, executor, config.genesis_storage)?;
 		let api = components.build_api(client.clone());
 		let best_header = client.best_block_header()?;
 
@@ -300,7 +142,6 @@ impl<Components> Service<Components>
 		let barrier = ::std::sync::Arc::new(Barrier::new(2));
 		on_demand.map(|on_demand| on_demand.set_service_link(Arc::downgrade(&network)));
 
-
 		let thread = {
 			let client = client.clone();
 			let network = network.clone();