Polkadot service

Cargo.toml

@@ -24,6 +24,7 @@ members = [
 	"polkadot/statement-table",
 	"polkadot/transaction-pool",
 	"polkadot/validator",
+	"polkadot/service",
 	"substrate/bft",
 	"substrate/client",
 	"substrate/codec",

demo/cli/src/lib.rs

@@ -41,6 +41,7 @@ extern crate log;
 
 pub mod error;
 
+use std::sync::Arc;
 use codec::Slicable;
 use demo_runtime::genesismap::{additional_storage_with_genesis, GenesisConfig};
 use client::genesis;
@@ -98,7 +99,7 @@ pub fn run<I, T>(args: I) -> error::Result<()> where
 		storage.extend(additional_storage_with_genesis(&block));
 		(primitives::block::Header::decode(&mut block.header.encode().as_ref()).expect("to_vec() always gives a valid serialisation; qed"), storage.into_iter().collect())
 	};
-	let client = client::new_in_mem(executor, prepare_genesis)?;
+	let client = Arc::new(client::new_in_mem(executor, prepare_genesis)?);
 
 	let address = "127.0.0.1:9933".parse().unwrap();
 	let handler = rpc::rpc_handler(client);

polkadot/cli/Cargo.toml

@@ -23,4 +23,4 @@ substrate-rpc-servers = { path = "../../substrate/rpc-servers" }
 polkadot-primitives = { path = "../primitives" }
 polkadot-executor = { path = "../executor" }
 polkadot-runtime = { path = "../runtime" }
-polkadot-keystore = { path = "../keystore" }
+polkadot-service = { path = "../service" }

polkadot/cli/src/error.rs

@@ -22,15 +22,11 @@ error_chain! {
 	foreign_links {
 		Io(::std::io::Error) #[doc="IO error"];
 		Cli(::clap::Error) #[doc="CLI error"];
+		Service(::service::Error) #[doc="Polkadot service error"];
 	}
 	links {
 		Client(client::error::Error, client::error::ErrorKind) #[doc="Client error"];
     }
 	errors {
-		/// Key store errors
-		Keystore(e: ::keystore::Error) {
-			description("Keystore error"),
-			display("Keystore error: {:?}", e),
-		}
 	}
 }

polkadot/cli/src/lib.rs

@@ -30,10 +30,8 @@ extern crate substrate_rpc_servers as rpc;
 extern crate polkadot_primitives;
 extern crate polkadot_executor;
 extern crate polkadot_runtime;
-extern crate polkadot_keystore as keystore;
+extern crate polkadot_service as service;
 
-#[macro_use]
-extern crate hex_literal;
 #[macro_use]
 extern crate clap;
 #[macro_use]
@@ -45,11 +43,6 @@ pub mod error;
 
 use std::path::{Path, PathBuf};
 
-use codec::Slicable;
-use polkadot_runtime::genesismap::{additional_storage_with_genesis, GenesisConfig};
-use client::genesis;
-use keystore::Store as Keystore;
-
 /// Parse command line arguments and start the node.
 ///
 /// IANA unassigned port ranges that we could use:
@@ -69,52 +62,33 @@ pub fn run<I, T>(args: I) -> error::Result<()> where
 	let log_pattern = matches.value_of("log").unwrap_or("");
 	init_logger(log_pattern);
 
-	// Create client
-	let executor = polkadot_executor::Executor::new();
-	let mut storage = Default::default();
-	let god_key = hex!["3d866ec8a9190c8343c2fc593d21d8a6d0c5c4763aaab2349de3a6111d64d124"];
-
-	let genesis_config = 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);
-		storage.extend(additional_storage_with_genesis(&block));
-		(primitives::block::Header::decode(&mut block.header.encode().as_ref()).expect("to_vec() always gives a valid serialisation; qed"), storage.into_iter().collect())
-	};
+	let mut config = service::Configuration::default();
 
-	let keystore_path = matches.value_of("keystore")
+	config.keystore_path = matches.value_of("keystore")
 		.map(|x| Path::new(x).to_owned())
-		.unwrap_or_else(default_keystore_path);
-
-	let _keystore = Keystore::open(keystore_path).map_err(::error::ErrorKind::Keystore)?;
-	let client = client::new_in_mem(executor, prepare_genesis)?;
-
-	let address = "127.0.0.1:9933".parse().unwrap();
-	let handler = rpc::rpc_handler(client);
-	let server = rpc::start_http(&address, handler)?;
+		.unwrap_or_else(default_keystore_path)
+		.to_string_lossy()
+		.into();
 
+	let mut role = service::Role::FULL;
 	if let Some(_) = matches.subcommand_matches("collator") {
 		info!("Starting collator.");
-		server.wait();
-		return Ok(());
+		role = service::Role::COLLATOR;
 	}
-
-	if let Some(_) = matches.subcommand_matches("validator") {
+	else if let Some(_) = matches.subcommand_matches("validator") {
 		info!("Starting validator.");
-		server.wait();
-		return Ok(());
+		role = service::Role::VALIDATOR;
 	}
 
+	config.roles = role;
+
+	let service = service::Service::new(config)?;
+
+	let address = "127.0.0.1:9933".parse().unwrap();
+	let handler = rpc::rpc_handler(service.client());
+	let server = rpc::start_http(&address, handler)?;
+
+	server.wait();
 	println!("No command given.\n");
 	let _ = clap::App::from_yaml(yaml).print_long_help();
 

polkadot/consensus/Cargo.toml

@@ -18,3 +18,8 @@ polkadot-transaction-pool = { path = "../transaction-pool" }
 substrate-bft = { path = "../../substrate/bft" }
 substrate-codec = { path = "../../substrate/codec" }
 substrate-primitives = { path = "../../substrate/primitives" }
+substrate-network = { path = "../../substrate/network" }
+
+tokio-core = "0.1.12"
+substrate-keyring = { path = "../../substrate/keyring" }
+substrate-client = { path = "../../substrate/client" }

polkadot/consensus/src/error.rs

@@ -48,6 +48,10 @@ error_chain! {
 				::MAX_TRANSACTIONS_SIZE, ::MAX_TRANSACTIONS_SIZE.saturating_sub(*size)
 			),
 		}
+		Executor(e: ::futures::future::ExecuteErrorKind) {
+			description("Unable to dispatch agreement future"),
+			display("Unable to dispatch agreement future: {:?}", e),
+		}
 	}
 }