Merge branch 'master' into types-binary

Conflicts:
	ethcore/src/error.rs

util/src/keys/directory.rs

@@ -381,7 +381,7 @@ impl KeyFileContent {
 		}
 	}
 
-	/// Loads key from valid json, returns error and records warning if key is mallformed
+	/// Loads key from valid json, returns error and records warning if key is malformed
 	pub fn load(json: &Json) -> Result<KeyFileContent, ()> {
 		match Self::from_json(json) {
 			Ok(key_file) => Ok(key_file),

util/src/keys/geth_import.rs

@@ -20,6 +20,7 @@ use common::*;
 use keys::store::SecretStore;
 use keys::directory::KeyFileContent;
 use std::path::PathBuf;
+use path;
 
 /// Enumerates all geth keys in the directory and returns collection of tuples `(accountId, filename)`
 pub fn enumerate_geth_keys(path: &Path) -> Result<Vec<(Address, String)>, ImportError> {
@@ -98,30 +99,7 @@ pub fn import_geth_keys(secret_store: &mut SecretStore, geth_keyfiles_directory:
 ///
 /// Based on https://github.com/ethereum/go-ethereum/blob/e553215/common/path.go#L75
 pub fn keystore_dir() -> PathBuf {
-	#[cfg(target_os = "macos")]
-	fn data_dir(mut home: PathBuf) -> PathBuf {
-		home.push("Library");
-		home.push("Ethereum");
-		home
-	}
-	
-	#[cfg(windows)]
-	fn data_dir(mut home: PathBuf) -> PathBuf {
-		home.push("AppData");
-		home.push("Roaming");
-		home.push("Ethereum");
-		home	
-	}
-	
-	#[cfg(not(any(target_os = "macos", windows)))]
-	fn data_dir(mut home: PathBuf) -> PathBuf {
-		home.push(".ethereum");
-        home
-	}
-	
-	let mut data_dir = data_dir(::std::env::home_dir().expect("Failed to get home dir"));
-	data_dir.push("keystore");
-	data_dir
+	path::ethereum::with_default("keystore")
 }
 
 #[cfg(test)]

util/src/keys/store.rs

@@ -73,6 +73,7 @@ pub enum SigningError {
 pub struct SecretStore {
 	directory: KeyDirectory,
 	unlocks: RwLock<HashMap<Address, AccountUnlock>>,
+	key_iterations: u32,
 }
 
 struct AccountUnlock {
@@ -128,10 +129,15 @@ impl AccountProvider for AccountService {
 impl AccountService {
 	/// New account service with the keys store in specific location
 	pub fn new_in(path: &Path) -> Self {
-		let secret_store = RwLock::new(SecretStore::new_in(path));
+		AccountService::with_security(path, KEY_ITERATIONS)
+	}
+
+	/// New account service with the keys store in specific location and configured security parameters
+	pub fn with_security(path: &Path, key_iterations: u32) -> Self {
+		let secret_store = RwLock::new(SecretStore::with_security(path, key_iterations));
 		secret_store.write().unwrap().try_import_existing();
 		AccountService {
-			secret_store: secret_store
+			secret_store: secret_store,
 		}
 	}
 
@@ -157,10 +163,16 @@ impl AccountService {
 impl SecretStore {
 	/// new instance of Secret Store in specific directory
 	pub fn new_in(path: &Path) -> Self {
+		SecretStore::with_security(path, KEY_ITERATIONS)
+	}
+
+	/// new instance of Secret Store in specific directory and configured security parameters
+	pub fn with_security(path: &Path, key_iterations: u32) -> Self {
 		::std::fs::create_dir_all(&path).expect("Cannot access requested key directory - critical");
 		SecretStore {
 			directory: KeyDirectory::new(path),
 			unlocks: RwLock::new(HashMap::new()),
+			key_iterations: key_iterations,
 		}
 	}
 
@@ -206,6 +218,7 @@ impl SecretStore {
 		SecretStore {
 			directory: KeyDirectory::new(path.as_path()),
 			unlocks: RwLock::new(HashMap::new()),
+			key_iterations: KEY_ITERATIONS,
 		}
 	}
 
@@ -289,8 +302,8 @@ fn derive_key_iterations(password: &str, salt: &H256, c: u32) -> (Bytes, Bytes)
 	(derived_right_bits.to_vec(), derived_left_bits.to_vec())
 }
 
-fn derive_key(password: &str, salt: &H256) -> (Bytes, Bytes) {
-	derive_key_iterations(password, salt, KEY_ITERATIONS)
+fn derive_key(password: &str, salt: &H256, iterations: u32) -> (Bytes, Bytes) {
+	derive_key_iterations(password, salt, iterations)
 }
 
 fn derive_key_scrypt(password: &str, salt: &H256, n: u32, p: u32, r: u32) -> (Bytes, Bytes) {
@@ -346,7 +359,7 @@ impl EncryptedHashMap<H128> for SecretStore {
 
 		// two parts of derived key
 		// DK = [ DK[0..15] DK[16..31] ] = [derived_left_bits, derived_right_bits]
-		let (derived_left_bits, derived_right_bits) = derive_key(password, &salt);
+		let (derived_left_bits, derived_right_bits) = derive_key(password, &salt, self.key_iterations);
 
 		let mut cipher_text = vec![0u8; value.as_slice().len()];
 		// aes-128-ctr with initial vector of iv
@@ -361,7 +374,7 @@ impl EncryptedHashMap<H128> for SecretStore {
 				iv,
 				salt,
 				mac,
-				KEY_ITERATIONS,
+				self.key_iterations,
 				KEY_LENGTH));
 		key_file.id = key;
 		if let Err(io_error) = self.directory.save(key_file) {

util/src/lib.rs

@@ -148,6 +148,7 @@ pub mod panics;
 pub mod keys;
 pub mod table;
 pub mod network_settings;
+pub mod path;
 
 pub use common::*;
 pub use misc::*;

util/src/network/host.rs

@@ -466,8 +466,8 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
 			io.register_stream(DISCOVERY).expect("Error registering UDP listener");
 			io.register_timer(DISCOVERY_REFRESH, 7200).expect("Error registering discovery timer");
 			io.register_timer(DISCOVERY_ROUND, 300).expect("Error registering discovery timer");
-			io.register_timer(NODE_TABLE, 300_000).expect("Error registering node table timer");
 		}
+		try!(io.register_timer(NODE_TABLE, 300_000));
 		try!(io.register_stream(TCP_ACCEPT));
 		Ok(())
 	}
@@ -509,6 +509,9 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
 	}
 
 	fn connect_peers(&self, io: &IoContext<NetworkIoMessage<Message>>) {
+		if self.info.read().unwrap().deref().capabilities.is_empty() {
+			return;
+		}
 		let ideal_peers = { self.info.read().unwrap().deref().config.ideal_peers };
 		let pin = { self.info.read().unwrap().deref().config.pin };
 		let session_count = self.session_count();

util/src/path.rs

@@ -0,0 +1,56 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Path utilities
+
+/// Default ethereum paths
+pub mod ethereum {
+	use std::path::PathBuf;
+
+	#[cfg(target_os = "macos")]
+	/// Default path for ethereum installation on Mac Os
+	pub fn default() -> PathBuf {
+		let mut home = ::std::env::home_dir().expect("Failed to get home dir");
+		home.push("Library");
+		home.push("Ethereum");
+		home
+	}
+
+	#[cfg(windows)]
+	/// Default path for ethereum installation on Windows
+	pub fn default() -> PathBuf {
+		let mut home = ::std::env::home_dir().expect("Failed to get home dir");
+		home.push("AppData");
+		home.push("Roaming");
+		home.push("Ethereum");
+		home
+	}
+
+	#[cfg(not(any(target_os = "macos", windows)))]
+	/// Default path for ethereum installation on posix system which is not Mac OS
+	pub fn default() -> PathBuf {
+		let mut home = ::std::env::home_dir().expect("Failed to get home dir");
+		home.push(".ethereum");
+		home
+	}
+
+	/// Get the specific folder inside default ethereum installation
+	pub fn with_default(s: &str) -> PathBuf {
+		let mut pth = default();
+		pth.push(s);
+		pth
+	}
+}