Merge branch 'master' into ethminer_crate

Conflicts:
	parity/main.rs

parity/main.rs

@@ -33,6 +33,7 @@ extern crate fdlimit;
 extern crate daemonize;
 extern crate time;
 extern crate number_prefix;
+extern crate rpassword;
 
 #[cfg(feature = "rpc")]
 extern crate ethcore_rpc as rpc;
@@ -44,7 +45,7 @@ use std::path::PathBuf;
 use env_logger::LogBuilder;
 use ctrlc::CtrlC;
 use util::*;
-use util::panics::MayPanic;
+use util::panics::{MayPanic, ForwardPanic, PanicHandler};
 use ethcore::spec::*;
 use ethcore::client::*;
 use ethcore::service::{ClientService, NetSyncMessage};
@@ -72,6 +73,7 @@ Parity. Ethereum Client.
 
 Usage:
   parity daemon <pid-file> [options] [ --no-bootstrap | <enode>... ]
+  parity account (new | list)
   parity [options] [ --no-bootstrap | <enode>... ]
 
 Protocol Options:
@@ -128,6 +130,9 @@ Miscellaneous Options:
 #[derive(Debug, RustcDecodable)]
 struct Args {
 	cmd_daemon: bool,
+	cmd_account: bool,
+	cmd_new: bool,
+	cmd_list: bool,
 	arg_pid_file: String,
 	arg_enode: Vec<String>,
 	flag_chain: String,
@@ -192,10 +197,10 @@ fn setup_log(init: &Option<String>) {
 }
 
 #[cfg(feature = "rpc")]
-fn setup_rpc_server(client: Arc<Client>, sync: Arc<EthSync>, miner: Arc<Miner>, url: &str, cors_domain: &str, apis: Vec<&str>) {
+fn setup_rpc_server(client: Arc<Client>, sync: Arc<EthSync>, miner: Arc<Miner>, url: &str, cors_domain: &str, apis: Vec<&str>) -> Option<Arc<PanicHandler>> {
 	use rpc::v1::*;
 
-	let mut server = rpc::HttpServer::new(1);
+	let server = rpc::RpcServer::new();
 	for api in apis.into_iter() {
 		match api {
 			"web3" => server.add_delegate(Web3Client::new().to_delegate()),
@@ -209,11 +214,12 @@ fn setup_rpc_server(client: Arc<Client>, sync: Arc<EthSync>, miner: Arc<Miner>,
 			}
 		}
 	}
-	server.start_async(url, cors_domain);
+	Some(server.start_http(url, cors_domain, 1))
 }
 
 #[cfg(not(feature = "rpc"))]
-fn setup_rpc_server(_client: Arc<Client>, _sync: Arc<EthSync>, _url: &str) {
+fn setup_rpc_server(_client: Arc<Client>, _sync: Arc<EthSync>, _url: &str) -> Option<Arc<PanicHandler>> {
+	None
 }
 
 fn print_version() {
@@ -364,10 +370,44 @@ impl Configuration {
 				.start()
 				.unwrap_or_else(|e| die!("Couldn't daemonize; {}", e));
 		}
+		if self.args.cmd_account {
+			self.execute_account_cli();
+			return;
+		}
 		self.execute_client();
 	}
 
+	fn execute_account_cli(&self) {
+		use util::keys::store::SecretStore;
+		use rpassword::read_password;
+		let mut secret_store = SecretStore::new();
+		if self.args.cmd_new {
+			println!("Please note that password is NOT RECOVERABLE.");
+			println!("Type password: ");
+			let password = read_password().unwrap();
+			println!("Repeat password: ");
+			let password_repeat = read_password().unwrap();
+			if password != password_repeat {
+				println!("Passwords do not match!");
+				return;
+			}
+			println!("New account address:");
+			let new_address = secret_store.new_account(&password).unwrap();
+			println!("{:?}", new_address);
+			return;
+		}
+		if self.args.cmd_list {
+			println!("Known addresses:");
+			for &(addr, _) in secret_store.accounts().unwrap().iter() {
+				println!("{:?}", addr);
+			}
+		}
+	}
+
 	fn execute_client(&self) {
+		// Setup panic handler
+		let panic_handler = PanicHandler::new_in_arc();
+
 		// Setup logging
 		setup_log(&self.args.flag_logging);
 		// Raise fdlimit
@@ -379,6 +419,7 @@ impl Configuration {
 
 		// Build client
 		let mut service = ClientService::start(self.client_config(), spec, net_settings, &Path::new(&self.path())).unwrap();
+		panic_handler.forward_from(&service);
 		let client = service.client();
 
 		// Miner
@@ -399,30 +440,36 @@ impl Configuration {
 			let cors = self.args.flag_rpccorsdomain.as_ref().unwrap_or(&self.args.flag_jsonrpc_cors);
 			// TODO: use this as the API list.
 			let apis = self.args.flag_rpcapi.as_ref().unwrap_or(&self.args.flag_jsonrpc_apis);
-			setup_rpc_server(service.client(), sync.clone(), miner.clone(), &url, cors, apis.split(",").collect());
+			let server_handler = setup_rpc_server(service.client(), sync.clone(), miner.clone(), &url, cors, apis.split(',').collect());
+
+			if let Some(handler) = server_handler {
+				panic_handler.forward_from(handler.deref());
+			}
 		}
 
 		// Register IO handler
 		let io_handler  = Arc::new(ClientIoHandler {
 			client: service.client(),
 			info: Default::default(),
-			sync: sync
+			sync: sync.clone(),
 		});
 		service.io().register_handler(io_handler).expect("Error registering IO handler");
 
 		// Handle exit
-		wait_for_exit(&service);
+		wait_for_exit(panic_handler);
 	}
 }
 
-fn wait_for_exit(client_service: &ClientService) {
+fn wait_for_exit(panic_handler: Arc<PanicHandler>) {
 	let exit = Arc::new(Condvar::new());
 
 	// Handle possible exits
 	let e = exit.clone();
 	CtrlC::set_handler(move || { e.notify_all(); });
+
+	// Handle panics
 	let e = exit.clone();
-	client_service.on_panic(move |_reason| { e.notify_all(); });
+	panic_handler.on_panic(move |_reason| { e.notify_all(); });
 
 	// Wait for signal
 	let mutex = Mutex::new(());