Unknit rpc from polkadot.

substrate/cli/src/genesis.rs

@@ -45,7 +45,7 @@ mod tests {
 	use state_machine::execute;
 	use state_machine::OverlayedChanges;
 	use state_machine::backend::InMemory;
-	use substrate_executor::executor;
+	use polkadot_executor::executor;
 	use polkadot_primitives::{AccountId, Hash, BlockNumber, Header, Digest, UncheckedTransaction,
 		Transaction, Function};
 	use ed25519::Pair;

substrate/cli/src/lib.rs

@@ -24,14 +24,15 @@ extern crate triehash;
 extern crate substrate_codec as codec;
 extern crate substrate_state_machine as state_machine;
 extern crate substrate_client as client;
-extern crate substrate_executor;
 extern crate substrate_primitives as primitives;
 extern crate substrate_runtime_io as runtime_io;
 extern crate polkadot_rpc_servers as rpc;
 extern crate polkadot_primitives;
-extern crate polkadot_executor as executor;
+extern crate polkadot_executor;
 extern crate native_runtime;
 
+#[macro_use]
+extern crate hex_literal;
 #[macro_use]
 extern crate clap;
 #[macro_use]
@@ -39,6 +40,7 @@ extern crate error_chain;
 #[macro_use]
 extern crate log;
 
+mod genesis;
 pub mod error;
 
 /// Parse command line arguments and start the node.
@@ -61,8 +63,29 @@ pub fn run<I, T>(args: I) -> error::Result<()> where
 	init_logger(log_pattern);
 
 	// Create client
-	let executor = executor::executor();
-	let client = client::new_in_mem(executor)?;	// TODO: pass in genesis builder.
+	let executor = polkadot_executor::executor();
+	let mut storage = Default::default();
+	let god_key = hex!["3d866ec8a9190c8343c2fc593d21d8a6d0c5c4763aaab2349de3a6111d64d124"];
+	let genesis_config = native_runtime::runtime::genesismap::GenesisConfig {
+		validators: vec![god_key.clone()],
+		authorities: vec![god_key.clone()],
+		balances: vec![(god_key.clone(), 1u64 << 63)].into_iter().collect(),
+		block_time: 5,			// 5 second block time.
+		session_length: 720,	// that's 1 hour per session.
+		sessions_per_era: 24,	// 24 hours per era.
+		bonding_duration: 90,	// 90 days per bond.
+		approval_ratio: 667,	// 66.7% approvals required for legislation.
+	};
+
+	let prepare_genesis = || {
+		storage = genesis_config.genesis_map();
+		let block = genesis::construct_genesis_block(&storage);
+		use native_runtime::runtime::genesismap::additional_storage_with_genesis;
+		storage.extend(additional_storage_with_genesis(&block).into_iter());
+		use codec::Slicable;
+		(primitives::block::Header::from_slice(&mut block.header.to_vec().as_ref()).expect("to_vec() always gives a valid serialisation; qed"), storage.into_iter().collect())
+	};
+	let client = client::new_in_mem(executor, prepare_genesis)?;	// TODO: pass in genesis builder.
 
 	let address = "127.0.0.1:9933".parse().unwrap();
 	let handler = rpc::rpc_handler(client);