Initial commit for vaults (#4312)

* initial commit for vaults

* fixed TODO

* public docs

* vault_file.json now contains enc(pwd hash)

* removed doc

ethstore/tests/api.rs

@@ -19,9 +19,9 @@ extern crate ethstore;
 
 mod util;
 
-use ethstore::{EthStore, SimpleSecretStore};
+use ethstore::{EthStore, SimpleSecretStore, SecretVaultRef, StoreAccountRef};
 use ethstore::ethkey::{Random, Generator, Secret, KeyPair, verify_address};
-use ethstore::dir::DiskDirectory;
+use ethstore::dir::RootDiskDirectory;
 use util::TransientDir;
 
 #[test]
@@ -46,9 +46,9 @@ fn secret_store_create_account() {
 	let dir = TransientDir::create().unwrap();
 	let store = EthStore::open(Box::new(dir)).unwrap();
 	assert_eq!(store.accounts().unwrap().len(), 0);
-	assert!(store.insert_account(random_secret(), "").is_ok());
+	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), "").is_ok());
 	assert_eq!(store.accounts().unwrap().len(), 1);
-	assert!(store.insert_account(random_secret(), "").is_ok());
+	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), "").is_ok());
 	assert_eq!(store.accounts().unwrap().len(), 2);
 }
 
@@ -56,7 +56,7 @@ fn secret_store_create_account() {
 fn secret_store_sign() {
 	let dir = TransientDir::create().unwrap();
 	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert!(store.insert_account(random_secret(), "").is_ok());
+	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), "").is_ok());
 	let accounts = store.accounts().unwrap();
 	assert_eq!(accounts.len(), 1);
 	assert!(store.sign(&accounts[0], "", &Default::default()).is_ok());
@@ -67,7 +67,7 @@ fn secret_store_sign() {
 fn secret_store_change_password() {
 	let dir = TransientDir::create().unwrap();
 	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert!(store.insert_account(random_secret(), "").is_ok());
+	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), "").is_ok());
 	let accounts = store.accounts().unwrap();
 	assert_eq!(accounts.len(), 1);
 	assert!(store.sign(&accounts[0], "", &Default::default()).is_ok());
@@ -80,7 +80,7 @@ fn secret_store_change_password() {
 fn secret_store_remove_account() {
 	let dir = TransientDir::create().unwrap();
 	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert!(store.insert_account(random_secret(), "").is_ok());
+	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), "").is_ok());
 	let accounts = store.accounts().unwrap();
 	assert_eq!(accounts.len(), 1);
 	assert!(store.remove_account(&accounts[0], "").is_ok());
@@ -111,22 +111,22 @@ fn ciphertext_path() -> &'static str {
 
 #[test]
 fn secret_store_laod_geth_files() {
-	let dir = DiskDirectory::at(test_path());
+	let dir = RootDiskDirectory::at(test_path());
 	let store = EthStore::open(Box::new(dir)).unwrap();
 	assert_eq!(store.accounts().unwrap(), vec![
-		"3f49624084b67849c7b4e805c5988c21a430f9d9".into(),
-		"5ba4dcf897e97c2bdf8315b9ef26c13c085988cf".into(),
-		"63121b431a52f8043c16fcf0d1df9cb7b5f66649".into(),
+		StoreAccountRef::root("3f49624084b67849c7b4e805c5988c21a430f9d9".into()),
+		StoreAccountRef::root("5ba4dcf897e97c2bdf8315b9ef26c13c085988cf".into()),
+		StoreAccountRef::root("63121b431a52f8043c16fcf0d1df9cb7b5f66649".into()),
 	]);
 }
 
 #[test]
 fn secret_store_load_pat_files() {
-	let dir = DiskDirectory::at(pat_path());
+	let dir = RootDiskDirectory::at(pat_path());
 	let store = EthStore::open(Box::new(dir)).unwrap();
 	assert_eq!(store.accounts().unwrap(), vec![
-		"3f49624084b67849c7b4e805c5988c21a430f9d9".into(),
-		"5ba4dcf897e97c2bdf8315b9ef26c13c085988cf".into(),
+		StoreAccountRef::root("3f49624084b67849c7b4e805c5988c21a430f9d9".into()),
+		StoreAccountRef::root("5ba4dcf897e97c2bdf8315b9ef26c13c085988cf".into()),
 	]);
 }
 
@@ -136,19 +136,19 @@ fn test_decrypting_files_with_short_ciphertext() {
 	let kp1 = KeyPair::from_secret("000081c29e8142bb6a81bef5a92bda7a8328a5c85bb2f9542e76f9b0f94fc018".parse().unwrap()).unwrap();
 	// d1e64e5480bfaf733ba7d48712decb8227797a4e , 31
 	let kp2 = KeyPair::from_secret("00fa7b3db73dc7dfdf8c5fbdb796d741e4488628c41fc4febd9160a866ba0f35".parse().unwrap()).unwrap();
-	let dir = DiskDirectory::at(ciphertext_path());
+	let dir = RootDiskDirectory::at(ciphertext_path());
 	let store = EthStore::open(Box::new(dir)).unwrap();
 	let accounts = store.accounts().unwrap();
 	assert_eq!(accounts, vec![
-		"31e9d1e6d844bd3a536800ef8d8be6a9975db509".into(),
-		"d1e64e5480bfaf733ba7d48712decb8227797a4e".into(),
+		StoreAccountRef::root("31e9d1e6d844bd3a536800ef8d8be6a9975db509".into()),
+		StoreAccountRef::root("d1e64e5480bfaf733ba7d48712decb8227797a4e".into()),
 	]);
 
 	let message = Default::default();
 
 	let s1 = store.sign(&accounts[0], "foo", &message).unwrap();
 	let s2 = store.sign(&accounts[1], "foo", &message).unwrap();
-	assert!(verify_address(&accounts[0], &s1, &message).unwrap());
+	assert!(verify_address(&accounts[0].address, &s1, &message).unwrap());
 	assert!(verify_address(&kp1.address(), &s1, &message).unwrap());
 	assert!(verify_address(&kp2.address(), &s2, &message).unwrap());
 }

ethstore/tests/util/transient_dir.rs

@@ -17,7 +17,7 @@
 use std::path::PathBuf;
 use std::{env, fs};
 use rand::{Rng, OsRng};
-use ethstore::dir::{KeyDirectory, DiskDirectory};
+use ethstore::dir::{KeyDirectory, RootDiskDirectory};
 use ethstore::{Error, SafeAccount};
 
 pub fn random_dir() -> PathBuf {
@@ -28,7 +28,7 @@ pub fn random_dir() -> PathBuf {
 }
 
 pub struct TransientDir {
-	dir: DiskDirectory,
+	dir: RootDiskDirectory,
 	path: PathBuf,
 }
 
@@ -36,7 +36,7 @@ impl TransientDir {
 	pub fn create() -> Result<Self, Error> {
 		let path = random_dir();
 		let result = TransientDir {
-			dir: DiskDirectory::create(&path)?,
+			dir: RootDiskDirectory::create(&path)?,
 			path: path,
 		};
 
@@ -46,7 +46,7 @@ impl TransientDir {
 	pub fn open() -> Self {
 		let path = random_dir();
 		TransientDir {
-			dir: DiskDirectory::at(&path),
+			dir: RootDiskDirectory::at(&path),
 			path: path,
 		}
 	}