KeyStore implementation + key derivation

Cargo.toml

@@ -18,6 +18,7 @@ members = [
 	"polkadot/collator",
 	"polkadot/consensus",
 	"polkadot/executor",
+	"polkadot/keystore",
 	"polkadot/primitives",
 	"polkadot/runtime",
 	"polkadot/statement-table",

polkadot/cli/Cargo.toml

@@ -12,6 +12,7 @@ log = "0.3"
 hex-literal = "0.1"
 triehash = "0.1"
 ed25519 = { path = "../../substrate/ed25519" }
+app_dirs = "1.1"
 substrate-client = { path = "../../substrate/client" }
 substrate-codec = { path = "../../substrate/codec" }
 substrate-runtime-io = { path = "../../substrate/runtime-io" }
@@ -22,3 +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/cli/src/cli.yml

@@ -5,7 +5,11 @@ args:
   - log:
       short: l
       value_name: LOG_PATTERN
-      help: Sets a custom logging
+      help: Sets a custom logging filter
+      takes_value: true
+  - keystore-path:
+      value_name: KEYSTORE_PATH
+      help: specify custom keystore path
       takes_value: true
 subcommands:
   - collator:

polkadot/cli/src/error.rs

@@ -26,4 +26,11 @@ error_chain! {
 	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

@@ -18,6 +18,7 @@
 
 #![warn(missing_docs)]
 
+extern crate app_dirs;
 extern crate env_logger;
 extern crate ed25519;
 extern crate triehash;
@@ -29,6 +30,7 @@ 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;
 
 #[macro_use]
 extern crate hex_literal;
@@ -41,9 +43,12 @@ extern crate log;
 
 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.
 ///
@@ -79,12 +84,19 @@ pub fn run<I, T>(args: I) -> error::Result<()> where
 		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 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();
@@ -109,6 +121,21 @@ pub fn run<I, T>(args: I) -> error::Result<()> where
 	Ok(())
 }
 
+fn default_keystore_path() -> PathBuf {
+	use app_dirs::{AppInfo, AppDataType};
+
+	let app_info = AppInfo {
+		name: "Polkadot",
+		author: "Parity Technologies",
+	};
+
+	app_dirs::get_app_dir(
+		AppDataType::UserData,
+		&app_info,
+		"keystore",
+	).expect("app directories exist on all supported platforms; qed")
+}
+
 fn init_logger(pattern: &str) {
 	let mut builder = env_logger::LogBuilder::new();
 	// Disable info logging by default for some modules:

polkadot/keystore/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "polkadot-keystore"
+version = "0.1.0"
+authors = ["Parity Technologies <robert@parity.io>"]
+
+[dependencies]
+ethcrypto = { git = "https://github.com/paritytech/parity", default_features = false }
+ed25519 = { path = "../../substrate/ed25519" }
+error-chain = "0.11"
+hex = "0.3"
+rand = "0.4"
+serde_json = "1.0"
+serde = "1.0"
+serde_derive = "1.0"
+subtle = "0.5"
+
+[dev-dependencies]
+tempdir = "0.3"