diff --git a/enigma-core/app/Cargo.lock b/enigma-core/app/Cargo.lock
index 5775bd1a..444a293c 100644
--- a/enigma-core/app/Cargo.lock
+++ b/enigma-core/app/Cargo.lock
@@ -628,6 +628,7 @@ dependencies = [
  "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
  "sgx_types 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
  "sgx_urts 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
+ "thiserror 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "web3 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2243,6 +2244,24 @@ dependencies = [
  "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "thiserror"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "thiserror-impl 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "thread-id"
 version = "3.3.0"
@@ -3040,6 +3059,8 @@ dependencies = [
 "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 "checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+"checksum thiserror 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "205684fd018ca14432b12cce6ea3d46763311a571c3d294e71ba3f01adcf1aad"
+"checksum thiserror-impl 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "57e4d2e50ca050ed44fb58309bdce3efa79948f84f9993ad1978de5eebdce5a7"
 "checksum thread-id 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
diff --git a/enigma-core/app/cross-test-utils/src/lib.rs b/enigma-core/app/cross-test-utils/src/lib.rs
index d99cdd94..f55fbd30 100644
--- a/enigma-core/app/cross-test-utils/src/lib.rs
+++ b/enigma-core/app/cross-test-utils/src/lib.rs
@@ -12,15 +12,15 @@ use std::fs::File;
 use std::io::Read;
 use std::path::PathBuf;
 use std::process::Command;
-pub use enigma_types::{ContractAddress, StateKey, Hash256};
+pub use enigma_types::{StateKey, Hash256};
 use enigma_crypto::{KeyPair, symmetric, rand};
 use enigma_crypto::hash::{Sha256, Keccak256};
 use serde_json::{*, Value};
 use rmp_serde::{Serializer};
 use serde::{Serialize};
 
-pub fn generate_contract_address() -> ContractAddress {
-    let mut address = ContractAddress::default();
+pub fn generate_contract_address() -> Hash256 {
+    let mut address = Hash256::default();
     rand::random(address.as_mut()).unwrap();
     address
 }
@@ -56,17 +56,17 @@ pub fn get_bytecode_from_path(contract_path: &str) -> Vec<u8> {
 }
 
 // creates a non trivial reproducible stateKey from the contract address
-pub fn get_fake_state_key(contract_address: ContractAddress) -> [u8; 32] {
+pub fn get_fake_state_key(contract_address: Hash256) -> [u8; 32] {
     contract_address.keccak256().sha256().into()
 }
 
-pub fn make_encrypted_response(req: &Value, addresses: Vec<ContractAddress>, keys: Option<Vec<StateKey>>) -> Value {
+pub fn make_encrypted_response(req: &Value, addresses: Vec<Hash256>, keys: Option<Vec<StateKey>>) -> Value {
     // Making the response
     if !req["data"]["Request"].is_null() { // Just makes sure that {data:{Request}} Exists.
-        assert_eq!(serde_json::from_value::<Vec<ContractAddress>>(req["data"]["Request"].clone()).unwrap(), addresses);
+        assert_eq!(serde_json::from_value::<Vec<Hash256>>(req["data"]["Request"].clone()).unwrap(), addresses);
     }
 
-    let _response_data: Vec<(ContractAddress, StateKey)> = if let Some(keys) = keys {
+    let _response_data: Vec<(Hash256, StateKey)> = if let Some(keys) = keys {
         addresses.into_iter().zip(keys.into_iter()).collect()
     } else {
         addresses.into_iter().map(|addr| (addr, get_fake_state_key(addr))).collect()
diff --git a/enigma-core/app/src/db/dal.rs b/enigma-core/app/src/db/dal.rs
index 01cc5913..90f94c7b 100644
--- a/enigma-core/app/src/db/dal.rs
+++ b/enigma-core/app/src/db/dal.rs
@@ -290,7 +290,7 @@ mod test {
 
     use crate::db::{tests::create_test_db, dal::CRUDInterface, primitives::{Array32u8, DeltaKey, Stype}};
     use hex::ToHex;
-    use enigma_types::ContractAddress;
+    use enigma_types::Hash256;
 
     #[test]
     fn test_new_db() {
@@ -383,7 +383,7 @@ mod test {
     #[should_panic]
     fn test_delete_contract_dk() {
         let (mut db, _dir) = create_test_db();
-        let addr: ContractAddress = [2u8; 32].into();
+        let addr: Hash256 = [2u8; 32].into();
         let dk_code = DeltaKey::new(addr, Stype::ByteCode);
         let dk_delta = DeltaKey::new(addr, Stype::Delta(0));
         let v_code = b"This is a Contract";
diff --git a/enigma-core/app/src/db/iterator.rs b/enigma-core/app/src/db/iterator.rs
index a8e6afce..c9c33459 100644
--- a/enigma-core/app/src/db/iterator.rs
+++ b/enigma-core/app/src/db/iterator.rs
@@ -1,7 +1,7 @@
 use common_u::errors::{DBErr, DBErrKind};
 use db::dal::{CRUDInterface, DB};
 use db::primitives::{DeltaKey, SplitKey, Stype};
-use enigma_types::ContractAddress;
+use enigma_types::Hash256;
 use failure::Error;
 use hex::{FromHex, ToHex};
 use rocksdb::DB as rocks_db;
@@ -43,11 +43,11 @@ pub trait P2PCalls {
     /// # extern crate enigma_core_app;
     /// # extern crate enigma_types;
     /// # use enigma_core_app::db::{dal::DB, primitives::{DeltaKey, Stype}, iterator::P2PCalls};
-    /// # use enigma_types::ContractAddress;
+    /// # use enigma_types::Hash256;
     ///
     /// # let tempdir = tempfile::tempdir().unwrap();
     /// # let mut db = DB::new(tempdir.path(), true).unwrap();
-    /// # let contract_address: ContractAddress = [2u8; 32].into();
+    /// # let contract_address: Hash256 = [2u8; 32].into();
     /// let dk1 = DeltaKey {contract_address, key_type: Stype::Delta(1)};
     /// let val1 = b"Enigma".to_vec();
     /// let dk2 = DeltaKey {contract_address, key_type: Stype::Delta(2)};
@@ -58,7 +58,7 @@ pub trait P2PCalls {
     /// let (key, tip): (DeltaKey, Vec<u8>)= db.get_tip(&contract_address).unwrap();
     /// assert_eq!(tip, val2);
     /// ```
-    fn get_tip<K: SplitKey>(&self, address: &ContractAddress) -> Result<(K, Vec<u8>), Error>;
+    fn get_tip<K: SplitKey>(&self, address: &Hash256) -> Result<(K, Vec<u8>), Error>;
 
     /// return the latest delta for each of the required addresses.
     /// # Examples
@@ -67,11 +67,11 @@ pub trait P2PCalls {
     /// # extern crate enigma_core_app;
     /// # extern crate enigma_types;
     /// # use enigma_core_app::db::{dal::DB, primitives::{DeltaKey, Stype}, iterator::P2PCalls};
-    /// # use enigma_types::ContractAddress;
+    /// # use enigma_types::Hash256;
     ///
     /// # let tempdir = tempfile::tempdir().unwrap();
     /// # let mut db = DB::new(tempdir.path(), true).unwrap();
-    /// # let contract_address: ContractAddress = [2u8; 32].into();
+    /// # let contract_address: Hash256 = [2u8; 32].into();
     /// # let dk1 = DeltaKey {contract_address, key_type: Stype::Delta(1)};
     /// # let val1 = b"Enigma".to_vec();
     /// # let dk2 = DeltaKey {contract_address, key_type: Stype::Delta(2)};
@@ -79,7 +79,7 @@ pub trait P2PCalls {
     /// # let key_vals = vec![(dk1, val1.clone()), (dk2, val2.clone())];
     /// # let _ = db.insert_tuples(&key_vals);
     ///
-    /// # let other_contract_address: ContractAddress = [4u8; 32].into();
+    /// # let other_contract_address: Hash256 = [4u8; 32].into();
     /// let other_dk = DeltaKey {contract_address: other_contract_address, key_type: Stype::Delta(1)};
     /// let other_val = b"delta1".to_vec();
     /// let _ = db.insert_tuples(&vec![(other_dk, other_val.clone())]);
@@ -93,7 +93,7 @@ pub trait P2PCalls {
     ///     }
     /// }
     /// ```
-    fn get_tips<K: SplitKey>(&self, address_list: &[ContractAddress]) -> ResultVec<(K, Vec<u8>)>;
+    fn get_tips<K: SplitKey>(&self, address_list: &[Hash256]) -> ResultVec<(K, Vec<u8>)>;
 
     /// get a list of all valid addresses in the DB.
     /// # Examples
@@ -102,11 +102,11 @@ pub trait P2PCalls {
     /// # extern crate enigma_core_app;
     /// # extern crate enigma_types;
     /// # use enigma_core_app::db::{dal::DB, primitives::{DeltaKey, Stype}, iterator::P2PCalls};
-    /// # use enigma_types::ContractAddress;
+    /// # use enigma_types::Hash256;
     ///
     /// # let tempdir = tempfile::tempdir().unwrap();
     /// # let mut db = DB::new(tempdir.path(), true).unwrap();
-    /// # let contract_address: ContractAddress = [2u8; 32].into();
+    /// # let contract_address: Hash256 = [2u8; 32].into();
     /// # let dk1 = DeltaKey {contract_address, key_type: Stype::Delta(1)};
     /// # let val1 = b"Enigma".to_vec();
     /// # let dk2 = DeltaKey {contract_address, key_type: Stype::Delta(2)};
@@ -114,15 +114,15 @@ pub trait P2PCalls {
     /// # let key_vals = vec![(dk1, val1.clone()), (dk2, val2.clone())];
     /// # let _ = db.insert_tuples(&key_vals);
     ///
-    /// # let other_contract_address: ContractAddress = [4u8; 32].into();
+    /// # let other_contract_address: Hash256 = [4u8; 32].into();
     /// # let other_dk = DeltaKey {contract_address: other_contract_address, key_type: Stype::Delta(1)};
     /// # let other_val = b"delta1".to_vec();
     /// # let _ = db.insert_tuples(&vec![(other_dk, other_val.clone())]);
-    /// let all_addresses: Vec<ContractAddress> = db.get_all_addresses().unwrap();
+    /// let all_addresses: Vec<Hash256> = db.get_all_addresses().unwrap();
     /// let expected_addresses = vec![contract_address, other_contract_address];
     /// assert_eq!(all_addresses, expected_addresses);
     /// ```
-    fn get_all_addresses(&self) -> ResultVec<ContractAddress>;
+    fn get_all_addresses(&self) -> ResultVec<Hash256>;
 
     /// get the delta of the required address and key.
     /// # Examples
@@ -131,11 +131,11 @@ pub trait P2PCalls {
     /// # extern crate enigma_core_app;
     /// # extern crate enigma_types;
     /// # use enigma_core_app::db::{dal::DB, primitives::{DeltaKey, Stype}, iterator::P2PCalls};
-    /// # use enigma_types::ContractAddress;
+    /// # use enigma_types::Hash256;
     ///
     /// # let tempdir = tempfile::tempdir().unwrap();
     /// # let mut db = DB::new(tempdir.path(), true).unwrap();
-    /// # let contract_address: ContractAddress = [2u8; 32].into();
+    /// # let contract_address: Hash256 = [2u8; 32].into();
     /// # let dk1 = DeltaKey {contract_address, key_type: Stype::Delta(1)};
     /// # let val1 = b"Enigma".to_vec();
     /// # let dk2 = DeltaKey {contract_address, key_type: Stype::Delta(2)};
@@ -154,18 +154,18 @@ pub trait P2PCalls {
     /// # extern crate enigma_core_app;
     /// # extern crate enigma_types;
     /// # use enigma_core_app::db::{dal::DB, primitives::{DeltaKey, Stype}, iterator::P2PCalls};
-    /// # use enigma_types::ContractAddress;
+    /// # use enigma_types::Hash256;
     ///
     /// # let tempdir = tempfile::tempdir().unwrap();
     /// # let mut db = DB::new(tempdir.path(), true).unwrap();
-    /// # let contract_address: ContractAddress = [2u8; 32].into();
+    /// # let contract_address: Hash256 = [2u8; 32].into();
     /// let dk_bytecode = DeltaKey {contract_address, key_type: Stype::ByteCode};
     /// let contract = b"This is a Contract".to_vec();
     /// let _ = db.insert_tuples(&vec![(dk_bytecode, contract.clone())]);
     /// let db_contract = db.get_contract(contract_address).unwrap();
     /// assert_eq!(contract, db_contract);
     /// ```
-    fn get_contract(&self, address: ContractAddress) -> ResultVec<u8>;
+    fn get_contract(&self, address: Hash256) -> ResultVec<u8>;
 
     /// returns a list of the latest deltas for all addresses that exist in the DB.
     /// # Examples
@@ -174,11 +174,11 @@ pub trait P2PCalls {
     /// # extern crate enigma_core_app;
     /// # extern crate enigma_types;
     /// # use enigma_core_app::db::{dal::DB, primitives::{DeltaKey, Stype}, iterator::P2PCalls};
-    /// # use enigma_types::ContractAddress;
+    /// # use enigma_types::Hash256;
     ///
     /// # let tempdir = tempfile::tempdir().unwrap();
     /// # let mut db = DB::new(tempdir.path(), true).unwrap();
-    /// # let contract_address: ContractAddress = [2u8; 32].into();
+    /// # let contract_address: Hash256 = [2u8; 32].into();
     /// # let dk1 = DeltaKey {contract_address, key_type: Stype::Delta(1)};
     /// # let val1 = b"Enigma".to_vec();
     /// # let dk2 = DeltaKey {contract_address, key_type: Stype::Delta(2)};
@@ -186,7 +186,7 @@ pub trait P2PCalls {
     /// # let key_vals = vec![(dk1, val1.clone()), (dk2, val2.clone())];
     /// # let _ = db.insert_tuples(&key_vals);
     ///
-    /// # let other_contract_address: ContractAddress = [4u8; 32].into();
+    /// # let other_contract_address: Hash256 = [4u8; 32].into();
     /// # let other_dk = DeltaKey {contract_address: other_contract_address, key_type: Stype::Delta(1)};
     /// # let other_val = b"delta1".to_vec();
     /// # let _ = db.insert_tuples(&vec![(other_dk, other_val.clone())]);
@@ -211,11 +211,11 @@ pub trait P2PCalls {
     /// # extern crate enigma_core_app;
     /// # extern crate enigma_types;
     /// # use enigma_core_app::db::{dal::DB, primitives::{DeltaKey, Stype}, iterator::P2PCalls};
-    /// # use enigma_types::ContractAddress;
+    /// # use enigma_types::Hash256;
     ///
     /// # let tempdir = tempfile::tempdir().unwrap();
     /// # let mut db = DB::new(tempdir.path(), true).unwrap();
-    /// # let contract_address: ContractAddress = [2u8; 32].into();
+    /// # let contract_address: Hash256 = [2u8; 32].into();
     /// # let dk1 = DeltaKey {contract_address, key_type: Stype::Delta(1)};
     /// # let val1 = b"Enigma".to_vec();
     /// # let dk2 = DeltaKey {contract_address, key_type: Stype::Delta(2)};
@@ -235,11 +235,11 @@ pub trait P2PCalls {
     /// # extern crate enigma_core_app;
     /// # extern crate enigma_types;
     /// # use enigma_core_app::db::{dal::DB, primitives::{DeltaKey, Stype}, iterator::P2PCalls};
-    /// # use enigma_types::ContractAddress;
+    /// # use enigma_types::Hash256;
     ///
     /// # let tempdir = tempfile::tempdir().unwrap();
     /// # let mut db = DB::new(tempdir.path(), true).unwrap();
-    /// # let contract_address: ContractAddress = [2u8; 32].into();
+    /// # let contract_address: Hash256 = [2u8; 32].into();
     /// # let dk1 = DeltaKey {contract_address, key_type: Stype::Delta(1)};
     /// # let val1 = b"Enigma".to_vec();
     /// # let dk2 = DeltaKey {contract_address, key_type: Stype::Delta(2)};
@@ -260,7 +260,7 @@ pub trait P2PCalls {
 
 impl P2PCalls for DB {
     #[logfn(TRACE)]
-    fn get_tip<K: SplitKey>(&self, address: &ContractAddress) -> Result<(K, Vec<u8>), Error> {
+    fn get_tip<K: SplitKey>(&self, address: &Hash256) -> Result<(K, Vec<u8>), Error> {
         // check and extract the CF from the DB
         // to_hex converts the [u8] to str
         let str_addr = address.to_hex();
@@ -277,7 +277,7 @@ impl P2PCalls for DB {
     }
 
     #[logfn(TRACE)]
-    fn get_tips<K: SplitKey>(&self, address_list: &[ContractAddress]) -> ResultVec<(K, Vec<u8>)> {
+    fn get_tips<K: SplitKey>(&self, address_list: &[Hash256]) -> ResultVec<(K, Vec<u8>)> {
         let mut deltas_list = Vec::with_capacity(address_list.len());
         trace!("DB: Get Tips, Address List: {:?}",address_list);
         for address in address_list {
@@ -290,7 +290,7 @@ impl P2PCalls for DB {
     /// get_all_addresses will return a list of all addresses that are valid.
     /// meaning if an address was'nt saved according to the hex format the function will ignore it.
     #[logfn(TRACE)]
-    fn get_all_addresses(&self) -> Result<Vec<ContractAddress>, Error> {
+    fn get_all_addresses(&self) -> Result<Vec<Hash256>, Error> {
         trace!("DB: Get all addresses");
         // get a list of all CF's (addresses) in our DB
         let mut cf_list = rocks_db::list_cf(&self.options, &self.location)?;
@@ -306,7 +306,7 @@ impl P2PCalls for DB {
         let addr_list = cf_list
             .iter()
             .filter_map(|address_str| {
-                let mut address = ContractAddress::default();
+                let mut address = Hash256::default();
                 let slice_address = match address_str.from_hex() {
                     Ok(slice) => slice,
                     // if the address is not a correct hex then it is not a correct address.
@@ -330,14 +330,14 @@ impl P2PCalls for DB {
     }
 
     #[logfn(TRACE)]
-    fn get_contract(&self, contract_address: ContractAddress) -> ResultVec<u8> {
+    fn get_contract(&self, contract_address: Hash256) -> ResultVec<u8> {
         let key = DeltaKey { contract_address, key_type: Stype::ByteCode };
         Ok(self.read(&key).map_err(|_| DBErr { command: "get_contract".to_string(), kind: DBErrKind::MissingKey(contract_address.to_hex()) })?)
     }
 
     #[logfn(TRACE)]
     fn get_all_tips<K: SplitKey>(&self) -> ResultVec<(K, Vec<u8>)> {
-        let _address_list: Vec<ContractAddress> = self.get_all_addresses()?;
+        let _address_list: Vec<Hash256> = self.get_all_addresses()?;
         self.get_tips(&_address_list[..])
     }
 
@@ -416,7 +416,7 @@ impl P2PCalls for DB {
 #[cfg(test)]
 mod test {
     use db::{CRUDInterface, P2PCalls, tests::create_test_db};
-    use enigma_types::ContractAddress;
+    use enigma_types::Hash256;
     use db::primitives::{DeltaKey, Stype};
 
     #[test]
@@ -499,7 +499,7 @@ mod test {
     fn test_get_tips_multi_row_per_add_success() {
         let (mut db, _dir) = create_test_db();
 
-        let contract_address: ContractAddress = [7u8; 32].into();
+        let contract_address: Hash256 = [7u8; 32].into();
 
         let key_type_a = Stype::Delta(1);
         let dk_a = DeltaKey { contract_address, key_type: key_type_a };
@@ -520,12 +520,12 @@ mod test {
     fn test_get_tips_multi_add_success() {
         let (mut db, _dir) = create_test_db();
 
-        let contract_address_a: ContractAddress = [7u8; 32].into();
+        let contract_address_a: Hash256 = [7u8; 32].into();
         let key_type_a = Stype::Delta(1);
         let dk_a = DeltaKey { contract_address: contract_address_a, key_type: key_type_a };
         let v_a = b"Enigma_a";
 
-        let contract_address_b: ContractAddress = [4u8; 32].into();
+        let contract_address_b: Hash256 = [4u8; 32].into();
 
         let key_type_b = Stype::Delta(2);
         let dk_b = DeltaKey { contract_address: contract_address_b, key_type: key_type_b };
@@ -549,12 +549,12 @@ mod test {
     fn test_get_tips_no_addr() {
         let (mut db, _dir) = create_test_db();
 
-        let contract_address_a: ContractAddress = [7u8; 32].into();
+        let contract_address_a: Hash256 = [7u8; 32].into();
         let key_type_a = Stype::Delta(1);
         let dk_a = DeltaKey { contract_address: contract_address_a, key_type: key_type_a };
         let v_a = b"Enigma_a";
 
-        let contract_address_b: ContractAddress = [4u8; 32].into();
+        let contract_address_b: Hash256 = [4u8; 32].into();
 
         db.create(&dk_a, &v_a[..]).unwrap();
 
@@ -566,12 +566,12 @@ mod test {
     fn test_get_tips_no_deltas() {
         let (mut db, _dir) = create_test_db();
 
-        let contract_address_a: ContractAddress = [7u8; 32].into();
+        let contract_address_a: Hash256 = [7u8; 32].into();
         let key_type_a = Stype::State;
         let dk_a = DeltaKey { contract_address: contract_address_a, key_type: key_type_a };
         let v_a = b"Enigma_a";
 
-        let contract_address_b: ContractAddress = [4u8; 32].into();
+        let contract_address_b: Hash256 = [4u8; 32].into();
         let key_type_b = Stype::ByteCode;
         let dk_b = DeltaKey { contract_address: contract_address_b, key_type: key_type_b };
         let v_b = b"Enigma_b";
@@ -586,17 +586,17 @@ mod test {
     fn test_get_all_addresses_success() {
         let (mut db, _dir) = create_test_db();
 
-        let contract_address_a: ContractAddress = [7u8; 32].into();
+        let contract_address_a: Hash256 = [7u8; 32].into();
         let key_type_a = Stype::State;
         let dk_a = DeltaKey { contract_address: contract_address_a, key_type: key_type_a };
         let v_a = b"Enigma_state_1";
 
-        let contract_address_b: ContractAddress = [4u8; 32].into();
+        let contract_address_b: Hash256 = [4u8; 32].into();
         let key_type_b = Stype::ByteCode;
         let dk_b = DeltaKey { contract_address: contract_address_b, key_type: key_type_b };
         let v_b = b"Enigma_byte_code_2";
 
-        let contract_address_c: ContractAddress = [67u8; 32].into();
+        let contract_address_c: Hash256 = [67u8; 32].into();
         let key_type_c = Stype::Delta(78);
         let dk_c = DeltaKey { contract_address: contract_address_c, key_type: key_type_c };
         let v_c = b"Enigma_delta_3";
@@ -607,7 +607,7 @@ mod test {
         db.create(&dk_b, &v_b[..]).unwrap();
         db.create(&dk_c, &v_c[..]).unwrap();
 
-        let accepted_addresses: Vec<ContractAddress> = db.get_all_addresses().unwrap();
+        let accepted_addresses: Vec<Hash256> = db.get_all_addresses().unwrap();
         assert_eq!(expected_addresses, accepted_addresses);
     }
 
@@ -615,17 +615,17 @@ mod test {
     fn test_get_all_addresses_invalid_cf() {
         let (mut db, _dir) = create_test_db();
 
-        let contract_address_a: ContractAddress = [7u8; 32].into();
+        let contract_address_a: Hash256 = [7u8; 32].into();
         let key_type_a = Stype::State;
         let dk_a = DeltaKey { contract_address: contract_address_a, key_type: key_type_a };
         let v_a = b"Enigma_state_1";
 
-        let contract_address_b: ContractAddress = [4u8; 32].into();
+        let contract_address_b: Hash256 = [4u8; 32].into();
         let key_type_b = Stype::ByteCode;
         let dk_b = DeltaKey { contract_address: contract_address_b, key_type: key_type_b };
         let v_b = b"Enigma_byte_code_2";
 
-        let contract_address_c: ContractAddress = [67u8; 32].into();
+        let contract_address_c: Hash256 = [67u8; 32].into();
         let key_type_c = Stype::Delta(78);
         let dk_c = DeltaKey { contract_address: contract_address_c, key_type: key_type_c };
         let v_c = b"Enigma_delta_3";
@@ -640,7 +640,7 @@ mod test {
 
         let _cf = db.database.create_cf(&cf_str, &db.options).unwrap();
 
-        let accepted_addresses: Vec<ContractAddress> = db.get_all_addresses().unwrap();
+        let accepted_addresses: Vec<Hash256> = db.get_all_addresses().unwrap();
 
         assert_eq!(expected_addresses, accepted_addresses);
     }
@@ -687,7 +687,7 @@ mod test {
     fn test_get_deltas() {
         let (mut db, _dir) = create_test_db();
 
-        let contract_address: ContractAddress = [7u8; 32].into();
+        let contract_address: Hash256 = [7u8; 32].into();
 
         let key_type_a = Stype::Delta(1);
         let dk_a = DeltaKey { contract_address, key_type: key_type_a };
diff --git a/enigma-core/app/src/db/primitives.rs b/enigma-core/app/src/db/primitives.rs
index 92a9c363..25df33ce 100644
--- a/enigma-core/app/src/db/primitives.rs
+++ b/enigma-core/app/src/db/primitives.rs
@@ -1,4 +1,4 @@
-use enigma_types::ContractAddress;
+use enigma_types::Hash256;
 use failure::Error;
 use hex::{FromHex, ToHex};
 use std::str;
@@ -10,7 +10,7 @@ pub struct VecKey(pub Vec<u8>);
 
 #[derive(Clone, Copy, Debug, PartialEq, PartialOrd, Eq, Ord, Hash, Default)]
 pub struct DeltaKey {
-    pub contract_address: ContractAddress,
+    pub contract_address: Hash256,
     pub key_type: Stype,
 }
 
@@ -56,7 +56,7 @@ impl Default for Stype {
 }
 
 impl DeltaKey {
-    pub fn new(contract_address: ContractAddress, key_type: Stype) -> DeltaKey { DeltaKey { contract_address, key_type } }
+    pub fn new(contract_address: Hash256, key_type: Stype) -> DeltaKey { DeltaKey { contract_address, key_type } }
 }
 
 impl SplitKey for DeltaKey {
@@ -88,7 +88,7 @@ impl SplitKey for DeltaKey {
             _ => bail!("Failed parsing the Key, key does not contain a correct index"),
         };
         // if the address is not a correct hex then it not a correct address.
-        let contract_address = ContractAddress::from_hex(&_hash)?;
+        let contract_address = Hash256::from_hex(&_hash)?;
         Ok(DeltaKey { contract_address, key_type })
     }
 }
diff --git a/enigma-core/app/src/esgx/ocalls_u.rs b/enigma-core/app/src/esgx/ocalls_u.rs
index b51c6488..44dd0013 100644
--- a/enigma-core/app/src/esgx/ocalls_u.rs
+++ b/enigma-core/app/src/esgx/ocalls_u.rs
@@ -2,7 +2,7 @@
 use crate::db::{CRUDInterface, DeltaKey, P2PCalls, ResultType, ResultTypeVec, Stype, DB};
 use enigma_tools_m::utils::LockExpectMutex;
 use enigma_crypto::hash::Sha256;
-use enigma_types::{ContractAddress, EnclaveReturn, Hash256, RawPointer};
+use enigma_types::{EnclaveReturn, Hash256, RawPointer};
 use lru_cache::LruCache;
 use std::sync::Mutex;
 use std::{ptr, slice};
@@ -12,7 +12,7 @@ lazy_static! { static ref DELTAS_CACHE: Mutex<LruCache<Hash256, Vec<Vec<u8>>>> =
 
 
 #[no_mangle]
-pub unsafe extern "C" fn ocall_update_state(db_ptr: *const RawPointer, id: &ContractAddress, enc_state: *const u8, state_len: usize) -> EnclaveReturn {
+pub unsafe extern "C" fn ocall_update_state(db_ptr: *const RawPointer, id: &Hash256, enc_state: *const u8, state_len: usize) -> EnclaveReturn {
     let encrypted_state = slice::from_raw_parts(enc_state, state_len);
     let key = DeltaKey::new(*id, Stype::State);
 
@@ -36,7 +36,7 @@ pub unsafe extern "C" fn ocall_update_state(db_ptr: *const RawPointer, id: &Cont
 #[no_mangle]
 pub unsafe extern "C" fn ocall_new_delta(db_ptr: *const RawPointer,
                                          enc_delta: *const u8, delta_len: usize,
-                                         contract_address: &ContractAddress, delta_index_: *const u32) -> EnclaveReturn {
+                                         contract_address: &Hash256, delta_index_: *const u32) -> EnclaveReturn {
     let delta_index = ptr::read(delta_index_);
     let encrypted_delta = slice::from_raw_parts(enc_delta, delta_len);
     let key = DeltaKey::new(*contract_address, Stype::Delta(delta_index));
@@ -58,7 +58,7 @@ pub unsafe extern "C" fn ocall_new_delta(db_ptr: *const RawPointer,
 
 
 #[no_mangle]
-pub unsafe extern "C" fn ocall_get_state_size(db_ptr: *const RawPointer, addr: &ContractAddress, state_size: *mut usize) -> EnclaveReturn {
+pub unsafe extern "C" fn ocall_get_state_size(db_ptr: *const RawPointer, addr: &Hash256, state_size: *mut usize) -> EnclaveReturn {
     let mut cache_id = addr.to_vec();
     let _state_key = DeltaKey::new(*addr, Stype::State);
     let db: &mut DB = match (*db_ptr).get_mut_ref() {
@@ -82,7 +82,7 @@ pub unsafe extern "C" fn ocall_get_state_size(db_ptr: *const RawPointer, addr: &
 
 
 #[no_mangle]
-pub unsafe extern "C" fn ocall_get_state(db_ptr: *const RawPointer, addr: &ContractAddress, state_ptr: *mut u8, state_size: usize) -> EnclaveReturn {
+pub unsafe extern "C" fn ocall_get_state(db_ptr: *const RawPointer, addr: &Hash256, state_ptr: *mut u8, state_size: usize) -> EnclaveReturn {
     let mut cache_id = addr.to_vec();
     cache_id.extend_from_slice(&state_size.to_be_bytes());
 
@@ -115,7 +115,7 @@ pub unsafe extern "C" fn ocall_get_state(db_ptr: *const RawPointer, addr: &Contr
 
 
 #[no_mangle]
-pub unsafe extern "C" fn ocall_get_deltas_sizes(db_ptr: *const RawPointer, addr: &ContractAddress,
+pub unsafe extern "C" fn ocall_get_deltas_sizes(db_ptr: *const RawPointer, addr: &Hash256,
                                                 start: *const u32, end: *const u32,
                                                 res_ptr: *mut usize, res_len: usize) -> EnclaveReturn {
 
@@ -156,9 +156,9 @@ pub unsafe extern "C" fn ocall_get_deltas_sizes(db_ptr: *const RawPointer, addr:
 
 
 #[no_mangle]
-pub unsafe extern "C" fn ocall_get_deltas(db_ptr: *const RawPointer, addr: &ContractAddress,
-                                             start: *const u32, end: *const u32,
-                                             res_ptr: *mut u8, res_len: usize) -> EnclaveReturn {
+pub unsafe extern "C" fn ocall_get_deltas(db_ptr: *const RawPointer, addr: &Hash256,
+                                          start: *const u32, end: *const u32,
+                                          res_ptr: *mut u8, res_len: usize) -> EnclaveReturn {
     let mut cache_id = addr.to_vec();
     cache_id.extend_from_slice(&(*start).to_be_bytes());
     cache_id.extend_from_slice(&(*end).to_be_bytes());
@@ -199,7 +199,7 @@ pub unsafe extern "C" fn ocall_get_deltas(db_ptr: *const RawPointer, addr: &Cont
 
 #[no_mangle]
 pub unsafe extern "C" fn ocall_remove_delta(db_ptr: *const RawPointer,
-                                            contract_address: &ContractAddress, delta_index_: *const u32) -> EnclaveReturn {
+                                            contract_address: &Hash256, delta_index_: *const u32) -> EnclaveReturn {
     let delta_index = ptr::read(delta_index_);
     let key = DeltaKey::new(*contract_address, Stype::Delta(delta_index));
     let db: &mut DB = match (*db_ptr).get_mut_ref() {
@@ -223,7 +223,7 @@ pub unsafe extern "C" fn ocall_remove_delta(db_ptr: *const RawPointer,
     }
 }
 
-fn get_deltas(db: &mut DB, addr: ContractAddress, start: u32, end: u32) -> ResultTypeVec<(DeltaKey, Vec<u8>)> {
+fn get_deltas(db: &mut DB, addr: Hash256, start: u32, end: u32) -> ResultTypeVec<(DeltaKey, Vec<u8>)> {
     let key_start = DeltaKey::new(addr, Stype::Delta(start));
     let key_end = DeltaKey::new(addr, Stype::Delta(end));
 
diff --git a/enigma-core/app/src/km_u.rs b/enigma-core/app/src/km_u.rs
index 21d120cb..b00c750d 100644
--- a/enigma-core/app/src/km_u.rs
+++ b/enigma-core/app/src/km_u.rs
@@ -3,7 +3,7 @@
 use crate::common_u::errors::EnclaveFailError;
 use crate::db::DB;
 use enigma_types::traits::SliceCPtr;
-use enigma_types::{EnclaveReturn, ContractAddress, PubKey, RawPointer};
+use enigma_types::{EnclaveReturn, Hash256, PubKey, RawPointer};
 use failure::Error;
 use sgx_types::{sgx_enclave_id_t, sgx_status_t};
 use crate::auto_ffi::{ecall_ptt_req, ecall_ptt_res, ecall_build_state, ecall_get_user_key};
@@ -11,7 +11,7 @@ use crate::auto_ffi::{ecall_ptt_req, ecall_ptt_res, ecall_build_state, ecall_get
 /// This function builds the states that it received in ptt_req and ptt_res
 /// It returns a Vec of the failed contract addresses
 #[logfn(TRACE)]
-pub fn ptt_build_state(db: &mut DB, eid: sgx_enclave_id_t) -> Result<Vec<ContractAddress>, Error> {
+pub fn ptt_build_state(db: &mut DB, eid: sgx_enclave_id_t) -> Result<Vec<Hash256>, Error> {
     let mut ret = EnclaveReturn::Success;
     let mut failed_ptr = 0u64;
 
@@ -28,10 +28,10 @@ pub fn ptt_build_state(db: &mut DB, eid: sgx_enclave_id_t) -> Result<Vec<Contrac
     }
     let box_ptr = failed_ptr as *mut Box<[u8]>;
     let part = unsafe { Box::from_raw(box_ptr) };
-    let part: Vec<ContractAddress> = part
+    let part: Vec<Hash256> = part
         .chunks(32)
         .map(|s| {
-            let mut arr = ContractAddress::default();
+            let mut arr = Hash256::default();
             arr.copy_from_slice(s);
             arr
         })
@@ -95,7 +95,7 @@ pub mod tests {
                     Stype::{Delta, State}, tests::create_test_db};
     use crate::esgx::{general::init_enclave_wrapper, equote};
     use self::cross_test_utils::*;
-    use enigma_types::{ContractAddress, DhKey};
+    use enigma_types::{Hash256, DhKey};
     use enigma_crypto::{KeyPair, symmetric, hash::{self, Sha256, Keccak256}};
     use rmp_serde::{Deserializer, Serializer};
     use serde::{Deserialize, Serialize};
@@ -171,7 +171,7 @@ pub mod tests {
         assert_ne!(sig.to_vec(), vec![0u8; 64]);
     }
 
-    pub fn instantiate_encryption_key(addresses: Vec<ContractAddress>, eid: sgx_enclave_id_t) {
+    pub fn instantiate_encryption_key(addresses: Vec<Hash256>, eid: sgx_enclave_id_t) {
         let req = ptt_req(eid).unwrap();
 
         let mut des = Deserializer::new(&req.0[..]);
@@ -223,7 +223,7 @@ pub mod tests {
 //        assert!(address_result.iter().all(|x| address_set.contains(x)));
     }
 
-    fn fill_the_db(db: &mut DB) -> (Vec<ContractAddress>, Vec<StateKey>) {
+    fn fill_the_db(db: &mut DB) -> (Vec<Hash256>, Vec<StateKey>) {
         let addresses = vec![b"first".sha256(), b"second".sha256(), b"third".sha256()];
         let mut stuff = vec![
             (DeltaKey { contract_address: addresses[2], key_type: State }, vec![8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8]),
diff --git a/enigma-core/app/src/main.rs b/enigma-core/app/src/main.rs
index 80b8d2d7..3d927410 100644
--- a/enigma-core/app/src/main.rs
+++ b/enigma-core/app/src/main.rs
@@ -2,6 +2,8 @@ extern crate enigma_core_app;
 #[macro_use]
 extern crate log;
 extern crate log_derive;
+#[macro_use]
+extern crate failure;
 
 use log::{debug, info};
 
@@ -20,12 +22,13 @@ use db::DB;
 use cli::Opt;
 use structopt::StructOpt;
 use futures::Future;
+use failure::{Fallible, format_err};
 
 
-fn main() {
+fn main() -> Fallible<()> {
     let opt: Opt = Opt::from_args();
 
-    let log_level = log::LevelFilter::from_str(&opt.log_level).unwrap();
+    let log_level = log::LevelFilter::from_str(&opt.log_level)?;
 
     let datadir = opt.data_dir.clone().unwrap_or_else(|| dirs::home_dir().unwrap().join(".enigma"));
     let hostname = os::hostname();
@@ -33,8 +36,10 @@ fn main() {
 
     debug!("CLI params: {:?}", opt);
 
-
-    let enclave = esgx::general::init_enclave_wrapper().map_err(|e| {error!("Init Enclave Failed {:?}", e);}).unwrap();
+    let enclave = esgx::general::init_enclave_wrapper().map_err(|e| {
+        error!("Init Enclave Failed sgx_status_t = {:?}", e);
+        failure::format_err!("Init Enclave Failed sgx_status_t = {}", e)
+    })?;
     let eid = enclave.geteid();
     info!("Init Enclave Successful. Enclave id {}", eid);
 
@@ -43,6 +48,7 @@ fn main() {
 
     server
         .run(move |multi| ipc_listener::handle_message(&mut db, multi, &opt.spid, eid, opt.retries))
-        .wait()
-        .unwrap();
-}
\ No newline at end of file
+        .wait()?;
+
+    Ok(())
+}
diff --git a/enigma-core/app/src/networking/ipc_listener.rs b/enigma-core/app/src/networking/ipc_listener.rs
index 7543420e..2f28ca93 100644
--- a/enigma-core/app/src/networking/ipc_listener.rs
+++ b/enigma-core/app/src/networking/ipc_listener.rs
@@ -72,7 +72,7 @@ pub(self) mod handling {
     use enigma_crypto::hash::Keccak256;
     use enigma_tools_u::esgx::equote as equote_tools;
     use enigma_tools_u::attestation_service::{service::AttestationService, constants::ATTESTATION_SERVICE_URL};
-    use enigma_types::ContractAddress;
+    use enigma_types::Hash256;
     use failure::Error;
     use hex::{FromHex, ToHex};
     use rmp_serde::Deserializer;
@@ -152,7 +152,7 @@ pub(self) mod handling {
 
     #[logfn(TRACE)]
     pub fn get_tip(db: &DB, input: &str) -> ResponseResult {
-        let address = ContractAddress::from_hex(&input)?;
+        let address = Hash256::from_hex(&input)?;
         let (tip_key, tip_data) = db.get_tip::<DeltaKey>(&address)?;
 
         let key = tip_key.key_type.unwrap_delta();
@@ -163,7 +163,8 @@ pub(self) mod handling {
     #[logfn(TRACE)]
     pub fn get_tips(db: &DB, input: &[String]) -> ResponseResult {
         let mut tips_results = Vec::with_capacity(input.len());
-        let addresses : Vec<ContractAddress> = input.iter().map(|data| ContractAddress::from_hex(&data).unwrap()).collect();
+        let addresses = input.iter()
+            .map(|data| Hash256::from_hex(&data)).collect::<Result<Vec<Hash256>,Error>>()?;
         let tips = db.get_tips::<DeltaKey>(&addresses)?;
         for (key, data) in tips {
             let delta = IpcDelta::from_delta_key(key, &data)?;
@@ -192,7 +193,7 @@ pub(self) mod handling {
     #[logfn(TRACE)]
     pub fn get_delta(db: &DB, input: IpcDelta) -> ResponseResult {
         let address = input.contract_address.ok_or(P2PErr { cmd: "GetDelta".to_string(), msg: "Address Missing".to_string() })?;
-        let address = ContractAddress::from_hex(&address)?;
+        let address = Hash256::from_hex(&address)?;
         let delta_key = DeltaKey::new(address, Stype::Delta(input.key));
         let delta = db.get_delta(delta_key)?;
         Ok(IpcResponse::GetDelta { result: IpcResults::Delta(delta.to_hex()) })
@@ -202,7 +203,7 @@ pub(self) mod handling {
     pub fn get_deltas(db: &DB, input: &[IpcDeltasRange]) -> ResponseResult {
         let mut results = Vec::with_capacity(input.len());
         for data in input {
-            let address = ContractAddress::from_hex(&data.address)?;
+            let address = Hash256::from_hex(&data.address)?;
             let from = DeltaKey::new(address, Stype::Delta(data.from));
             let to = DeltaKey::new(address, Stype::Delta(data.to));
 
@@ -222,14 +223,14 @@ pub(self) mod handling {
 
     #[logfn(TRACE)]
     pub fn get_contract(db: &DB, input: &str) -> ResponseResult {
-        let address = ContractAddress::from_hex(&input)?;
+        let address = Hash256::from_hex(&input)?;
         let data = db.get_contract(address).unwrap_or_default();
         Ok(IpcResponse::GetContract { result: IpcResults::GetContract{address: address.to_hex(), bytecode: data} })
     }
 
     #[logfn(TRACE)]
     pub fn update_new_contract(db: &mut DB, address: String, bytecode: &[u8]) -> ResponseResult {
-        let address_arr = ContractAddress::from_hex(&address)?;
+        let address_arr = Hash256::from_hex(&address)?;
         let delta_key = DeltaKey::new(address_arr, Stype::ByteCode);
         db.force_update(&delta_key, bytecode)?;
         Ok(IpcResponse::UpdateNewContract { address, result: IpcResults::Status(Status::Passed) })
@@ -238,7 +239,7 @@ pub(self) mod handling {
     #[logfn(TRACE)]
     pub fn update_new_contract_on_deployment(db: &mut DB, address: String, bytecode: &str, delta: IpcDelta) -> ResponseResult {
         let mut tuples = Vec::with_capacity(DEPLOYMENT_VALS_LEN);
-        let address_arr = ContractAddress::from_hex(&address)?;
+        let address_arr = Hash256::from_hex(&address)?;
 
         let bytecode = bytecode.from_hex()?;
         let bytecode_delta_key = DeltaKey::new(address_arr, Stype::ByteCode);
@@ -261,7 +262,7 @@ pub(self) mod handling {
 
     #[logfn(TRACE)]
     pub fn remove_contract(db: &mut DB, address: String) -> ResponseResult {
-        let addr_arr = ContractAddress::from_hex(&address)?;
+        let addr_arr = Hash256::from_hex(&address)?;
         // the key_type of dk is irrelevant since we are removing all the contract data
         let dk = DeltaKey::new(addr_arr, Stype::ByteCode);
         let result = match db.delete_contract(&dk) {
@@ -283,7 +284,7 @@ pub(self) mod handling {
 
         for delta in deltas.into_iter() {
             let address = delta.contract_address.ok_or(P2PErr { cmd: "UpdateDeltas".to_string(), msg: "Address Missing".to_string() })?;
-            let address = ContractAddress::from_hex(&address)?;
+            let address = Hash256::from_hex(&address)?;
             let data =
                 delta.data.ok_or(P2PErr { cmd: "UpdateDeltas".to_string(), msg: "Delta Data Missing".to_string() })?;
             let delta_key = DeltaKey::new(address, Stype::Delta(delta.key));
@@ -311,7 +312,7 @@ pub(self) mod handling {
     }
 
     fn delete_data_from_db(db: &mut DB, addr: &str, key_type: Stype) -> Result<IpcResults, Error> {
-        let addr_arr = ContractAddress::from_hex(addr)?;
+        let addr_arr = Hash256::from_hex(addr)?;
         let dk = DeltaKey::new(addr_arr, key_type);
         match db.delete(&dk) {
             Ok(_) => Ok(IpcResults::Status(Status::Passed)),
@@ -390,7 +391,7 @@ pub(self) mod handling {
 
     pub fn deploy_contract(db: &mut DB, input: IpcTask, eid: sgx_enclave_id_t) -> ResponseResult {
         let bytecode = input.pre_code.expect("Bytecode Missing");
-        let contract_address = ContractAddress::from_hex(&input.address)?;
+        let contract_address = Hash256::from_hex(&input.address)?;
         let enc_args = input.encrypted_args.from_hex()?;
         let constructor = input.encrypted_fn.from_hex()?;
         let mut user_pubkey = [0u8; 64];
@@ -425,7 +426,7 @@ pub(self) mod handling {
     #[logfn(DEBUG)]
     pub fn compute_task(db: &mut DB, input: IpcTask, eid: sgx_enclave_id_t) -> ResponseResult {
         let enc_args = input.encrypted_args.from_hex()?;
-        let address = ContractAddress::from_hex(&input.address)?;
+        let address = Hash256::from_hex(&input.address)?;
         let callable = input.encrypted_fn.from_hex()?;
         let mut user_pubkey = [0u8; 64];
         user_pubkey.clone_from_slice(&input.user_dhkey.from_hex()?);
@@ -460,7 +461,7 @@ mod test {
     use super::*;
     use crate::db::{DeltaKey, P2PCalls, Stype, tests::create_test_db};
     use serde_json::Value;
-    use enigma_types::ContractAddress;
+    use enigma_types::Hash256;
 
     pub const SPID: &str = "B0335FD3BC1CCA8F804EB98A6420592D";
     pub const RETRIES: u32 = 10;
@@ -495,7 +496,7 @@ mod test {
         let data: Vec<(DeltaKey, Vec<u8>)> = data
             .into_iter()
             .map(|tip| {
-                let contract_address: ContractAddress = serde_json::from_value(tip["address"].clone()).unwrap();
+                let contract_address: Hash256 = serde_json::from_value(tip["address"].clone()).unwrap();
                 let key: u32 = serde_json::from_value(tip["key"].clone()).unwrap();
                 let delta_key = DeltaKey { contract_address, key_type: Stype::Delta(key) };
                 let data: Vec<u8> = serde_json::from_value(tip["delta"].clone()).unwrap();
diff --git a/enigma-core/app/src/wasm_u/mod.rs b/enigma-core/app/src/wasm_u/mod.rs
index 7274ca6c..2defcb95 100644
--- a/enigma-core/app/src/wasm_u/mod.rs
+++ b/enigma-core/app/src/wasm_u/mod.rs
@@ -3,7 +3,7 @@ pub mod wasm;
 use crate::common_u::errors::EnclaveFailError;
 use crate::db::{Delta, DeltaKey, Stype};
 use std::{fmt, convert::TryFrom};
-use enigma_types::{EnclaveReturn, ExecuteResult, ContractAddress};
+use enigma_types::{EnclaveReturn, ExecuteResult, Hash256};
 use failure::Error;
 use sgx_types::*;
 
@@ -78,9 +78,9 @@ impl fmt::Debug for WasmTaskFailure{
     }
 }
 
-impl TryFrom<(ExecuteResult, ContractAddress, EnclaveReturn, sgx_status_t)> for WasmResult {
+impl TryFrom<(ExecuteResult, Hash256, EnclaveReturn, sgx_status_t)> for WasmResult {
     type Error = Error;
-    fn try_from(exec: (ExecuteResult, ContractAddress, EnclaveReturn, sgx_status_t)) -> Result<Self, Self::Error> {
+    fn try_from(exec: (ExecuteResult, Hash256, EnclaveReturn, sgx_status_t)) -> Result<Self, Self::Error> {
         let get_output  = |exec_result: ExecuteResult| -> Result<Box<[u8]>, Self::Error> {
             if exec_result.output.is_null() {
                 bail!("The 'output' pointer in ExecuteResult is null: {:?}", exec_result);
diff --git a/enigma-core/app/src/wasm_u/wasm.rs b/enigma-core/app/src/wasm_u/wasm.rs
index 244faaa6..3a4b2772 100755
--- a/enigma-core/app/src/wasm_u/wasm.rs
+++ b/enigma-core/app/src/wasm_u/wasm.rs
@@ -1,4 +1,4 @@
-use enigma_types::{ContractAddress, EnclaveReturn, ExecuteResult, PubKey, RawPointer, traits::SliceCPtr};
+use enigma_types::{Hash256, EnclaveReturn, ExecuteResult, PubKey, RawPointer, traits::SliceCPtr};
 use super::WasmResult;
 use crate::db::DB;
 use std::convert::TryInto;
@@ -7,8 +7,8 @@ use sgx_types::*;
 use crate::auto_ffi::{ecall_deploy, ecall_execute};
 
 #[logfn(TRACE)]
-pub fn deploy(db: &mut DB, eid: sgx_enclave_id_t,  bytecode: &[u8], constructor: &[u8], args: &[u8],
-              contract_address: &ContractAddress, user_pubkey: &PubKey, gas_limit: u64)-> Result<WasmResult, Error> {
+pub fn deploy(db: &mut DB, eid: sgx_enclave_id_t, bytecode: &[u8], constructor: &[u8], args: &[u8],
+              contract_address: &Hash256, user_pubkey: &PubKey, gas_limit: u64) -> Result<WasmResult, Error> {
     let mut retval = EnclaveReturn::Success;
     let mut result = ExecuteResult::default();
     let db_ptr = unsafe { RawPointer::new_mut(db) };
@@ -32,8 +32,8 @@ pub fn deploy(db: &mut DB, eid: sgx_enclave_id_t,  bytecode: &[u8], constructor:
 }
 
 #[logfn(TRACE)]
-pub fn execute(db: &mut DB, eid: sgx_enclave_id_t,  bytecode: &[u8], callable: &[u8], args: &[u8],
-               user_pubkey: &PubKey, contract_address: &ContractAddress, gas_limit: u64)-> Result<WasmResult,Error> {
+pub fn execute(db: &mut DB, eid: sgx_enclave_id_t, bytecode: &[u8], callable: &[u8], args: &[u8],
+               user_pubkey: &PubKey, contract_address: &Hash256, gas_limit: u64) -> Result<WasmResult,Error> {
     let mut retval = EnclaveReturn::Success;
     let mut result = ExecuteResult::default();
     let db_ptr = unsafe { RawPointer::new_mut(db) };
@@ -69,7 +69,7 @@ mod tests {
     use crate::db::{DB, tests::create_test_db};
     use crate::wasm_u::wasm;
     use self::ethabi::{Contract, Token, token::{LenientTokenizer, Tokenizer}};
-    use enigma_types::{ContractAddress, DhKey, PubKey};
+    use enigma_types::{Hash256, DhKey, PubKey};
     use enigma_crypto::symmetric;
     use hex::FromHex;
     use sgx_types::*;
@@ -88,7 +88,7 @@ mod tests {
         }
     }
 
-    fn compile_and_deploy_wasm_contract(db: &mut DB, eid: sgx_enclave_id_t, test_path: &str, contract_address: ContractAddress, constructor: &[u8], args: &[u8],  user_pubkey: &PubKey) -> WasmResult {
+    fn compile_and_deploy_wasm_contract(db: &mut DB, eid: sgx_enclave_id_t, test_path: &str, contract_address: Hash256, constructor: &[u8], args: &[u8], user_pubkey: &PubKey) -> WasmResult {
         let wasm_code = get_bytecode_from_path(test_path);
         println!("Bytecode size: {}KB\n", wasm_code.len() / 1024);
 
@@ -97,7 +97,7 @@ mod tests {
 
     fn compile_deploy_execute(db: &mut DB,
                               test_path: &str,
-                              contract_address: ContractAddress,
+                              contract_address: Hash256,
                               constructor: &str,
                               constructor_arguments: &[Token],
                               func: &str,
@@ -300,10 +300,10 @@ mod tests {
     }
 
     fn compile_deploy_contract_execute(db: &mut DB,
-                              test_path: &str,
-                              contract_address: ContractAddress,
-                              constructor: &str,
-                              constructor_arguments: &[Token]) -> (sgx_urts::SgxEnclave, WasmTaskResult) {
+                                       test_path: &str,
+                                       contract_address: Hash256,
+                                       constructor: &str,
+                                       constructor_arguments: &[Token]) -> (sgx_urts::SgxEnclave, WasmTaskResult) {
         let enclave = init_enclave_wrapper().unwrap();
         instantiate_encryption_key(vec![contract_address], enclave.geteid());
 
@@ -329,12 +329,12 @@ mod tests {
     }
 
     fn compile_compute_task_execute(db: &mut DB,
-                              enclave: &sgx_urts::SgxEnclave,
-                              deploy_res: &WasmTaskResult,
-                              func: &str,
-                              func_args: &[Token],
-                              contract_address: ContractAddress) -> (WasmTaskResult,
-                                                                     DhKey) {
+                                    enclave: &sgx_urts::SgxEnclave,
+                                    deploy_res: &WasmTaskResult,
+                                    func: &str,
+                                    func_args: &[Token],
+                                    contract_address: Hash256) -> (WasmTaskResult,
+                                                                   DhKey) {
         let exe_code = &deploy_res.output;
         let (keys, shared_key, _, _) = exchange_keys(enclave.geteid());
         let encrypted_callable = symmetric::encrypt(func.as_bytes(), &shared_key).unwrap();
diff --git a/enigma-core/app/tests/integration_utils/mod.rs b/enigma-core/app/tests/integration_utils/mod.rs
index 08c3c3d6..05f500be 100644
--- a/enigma-core/app/tests/integration_utils/mod.rs
+++ b/enigma-core/app/tests/integration_utils/mod.rs
@@ -15,7 +15,7 @@ extern crate rand;
 extern crate tempfile;
 
 use self::cross_test_utils::{generate_contract_address, generate_user_address, make_encrypted_response,
-                             get_fake_state_key, get_bytecode_from_path, ContractAddress,
+                             get_fake_state_key, get_bytecode_from_path, Hash256,
                              ERC20UserAddress, sign_message};
 use self::app::*;
 use self::futures::Future;
@@ -29,7 +29,6 @@ use self::regex::Regex;
 use self::hex::{ToHex, FromHex};
 use self::ethabi::{Token};
 use self::enigma_crypto::{asymmetric::KeyPair, symmetric};
-use self::enigma_types::Hash256;
 use self::rand::{thread_rng, Rng};
 use app::db::DB;
 use self::tempfile::TempDir;
@@ -149,7 +148,7 @@ pub fn parse_packed_msg(msg: &str) -> Value {
     Deserialize::deserialize(&mut Deserializer::new(&msg_bytes[..])).unwrap()
 }
 
-pub fn mock_principal_res(msg: &str, addrs: Vec<ContractAddress>) -> Vec<u8> {
+pub fn mock_principal_res(msg: &str, addrs: Vec<Hash256>) -> Vec<u8> {
     let unpacked_msg: Value = parse_packed_msg(msg);
     let enc_response: Value = make_encrypted_response(&unpacked_msg, addrs, None);
 
@@ -158,7 +157,7 @@ pub fn mock_principal_res(msg: &str, addrs: Vec<ContractAddress>) -> Vec<u8> {
     serialized_enc_response
 }
 
-pub fn run_ptt_round(port: &'static str, addrs: Vec<ContractAddress>) -> Value {
+pub fn run_ptt_round(port: &'static str, addrs: Vec<Hash256>) -> Value {
 
     // set encrypted request message to send to the principal node
     let msg_req = get_ptt_req_msg();
diff --git a/enigma-core/enclave/src/km_t/mod.rs b/enigma-core/enclave/src/km_t/mod.rs
index 7c523b7c..9c2c8d7c 100644
--- a/enigma-core/enclave/src/km_t/mod.rs
+++ b/enigma-core/enclave/src/km_t/mod.rs
@@ -9,15 +9,15 @@ use enigma_runtime_t::ocalls_t as runtime_ocalls_t;
 use enigma_tools_t::common::errors_t::EnclaveError;
 use enigma_tools_m::utils::LockExpectMutex;
 use enigma_crypto::{Encryption, CryptoError};
-use enigma_types::{ContractAddress, RawPointer, StateKey};
+use enigma_types::{Hash256, RawPointer, StateKey};
 use std::collections::HashMap;
 use std::sync::SgxMutex;
 
 lazy_static! {
-    pub static ref STATE_KEYS: SgxMutex<HashMap<ContractAddress, StateKey>> = SgxMutex::new(HashMap::new());
+    pub static ref STATE_KEYS: SgxMutex<HashMap<Hash256, StateKey>> = SgxMutex::new(HashMap::new());
 }
 
-pub fn get_state_key(address: ContractAddress) -> Result<StateKey, EnclaveError> {
+pub fn get_state_key(address: Hash256) -> Result<StateKey, EnclaveError> {
     let statekeys_guard = STATE_KEYS.lock_expect("State Keys");
     statekeys_guard
         .get(&address)
@@ -33,7 +33,7 @@ pub fn encrypt_state(state: ContractState) -> Result<EncryptedContractState<u8>,
     state.encrypt(&key)
 }
 
-pub fn get_state(db_ptr: *const RawPointer, addr: ContractAddress) -> Result<ContractState, EnclaveError> {
+pub fn get_state(db_ptr: *const RawPointer, addr: Hash256) -> Result<ContractState, EnclaveError> {
     let guard = STATE_KEYS.lock_expect("State Keys");
     let key = guard.get(&addr).ok_or(CryptoError::MissingKeyError { key_type: "State Key" })?;
 
diff --git a/enigma-core/enclave/src/km_t/principal.rs b/enigma-core/enclave/src/km_t/principal.rs
index 1f01acf9..ff52a4b6 100644
--- a/enigma-core/enclave/src/km_t/principal.rs
+++ b/enigma-core/enclave/src/km_t/principal.rs
@@ -8,7 +8,7 @@ use enigma_crypto::asymmetric::KeyPair;
 use enigma_crypto::{Encryption, CryptoError};
 use enigma_tools_m::primitives::km_primitives::MsgID;
 use enigma_tools_m::primitives::km_primitives::{PrincipalMessage, PrincipalMessageType};
-use enigma_types::{ContractAddress, StateKey, RawPointer};
+use enigma_types::{Hash256, StateKey, RawPointer};
 use std::collections::HashMap;
 use std::sync::SgxMutex;
 use std::u32;
@@ -51,7 +51,7 @@ pub(crate) fn ecall_ptt_res_internal(msg_slice: &[u8]) -> Result<(), EnclaveErro
     Ok(())
 }
 
-pub(crate) unsafe fn ecall_build_state_internal(db_ptr: *const RawPointer) -> Result<Vec<ContractAddress>, EnclaveError> {
+pub(crate) unsafe fn ecall_build_state_internal(db_ptr: *const RawPointer) -> Result<Vec<Hash256>, EnclaveError> {
     let guard = STATE_KEYS.lock_expect("State Keys");
     let mut failed_contracts = Vec::with_capacity(guard.len());
     debug_println!("building state for {} contracts", guard.len());
@@ -140,7 +140,7 @@ pub mod tests {
     use enigma_crypto::hash::Sha256;
     use enigma_crypto::asymmetric::KeyPair;
     use enigma_tools_m::primitives::km_primitives::{PrincipalMessage, PrincipalMessageType};
-    use enigma_types::{ContractAddress, RawPointer};
+    use enigma_types::{Hash256, RawPointer};
     use std::string::ToString;
 
 
@@ -165,7 +165,7 @@ pub mod tests {
 
         // Mimicking the Principal/KM Node
         let km_node_keys = KeyPair::new().unwrap();
-        let restype: Vec<(ContractAddress, StateKey)> = address.clone().into_iter().zip(state_keys.into_iter()).collect();
+        let restype: Vec<(Hash256, StateKey)> = address.clone().into_iter().zip(state_keys.into_iter()).collect();
 
         let res_obj = PrincipalMessage::new_id(PrincipalMessageType::Response(restype), req_obj.get_id(), km_node_keys.get_pubkey());
         let dh_key = km_node_keys.derive_key(&req_obj.get_pubkey()).unwrap();
@@ -180,7 +180,7 @@ pub mod tests {
         assert_eq!(ecall_build_state_internal(db_ptr).unwrap(), vec![address[2]])
     }
 
-    fn get_states_deltas(address: &[ContractAddress], keys: &[StateKey]) -> Vec<Vec<EncryptedPatch>> {
+    fn get_states_deltas(address: &[Hash256], keys: &[StateKey]) -> Vec<Vec<EncryptedPatch>> {
         let jsons: Vec<serde_json::Value> = vec![
             json!({"widget":{"debug":"on","window":{"title":"Sample Konfabulator Widget","name":"main_window","width":500,"height":500},"image":{"src":"Images/Sun.png","name":"sun1","hOffset":250,"vOffset":250,"alignment":"center"},"text":{"data":"Click Here","size":36,"style":"bold","name":"text1","hOffset":250,"vOffset":100,"alignment":"center","onMouseUp":"sun1.opacity = (sun1.opacity / 100) * 90;"}}}),
             serde_json::from_str(r#"{ "name": "John Doe", "age": 43, "phones": [ "+44 1234567", "+44 2345678" ] }"#).unwrap(),
diff --git a/enigma-core/enclave/src/lib.rs b/enigma-core/enclave/src/lib.rs
index f5cb2f37..f58c9f3c 100755
--- a/enigma-core/enclave/src/lib.rs
+++ b/enigma-core/enclave/src/lib.rs
@@ -46,7 +46,7 @@ use enigma_tools_t::{
     quote_t, storage_t,
 };
 use enigma_types::{
-    ContractAddress, DhKey, EnclaveReturn, ExecuteResult, Hash256, PubKey, RawPointer, ResultStatus,
+    DhKey, EnclaveReturn, ExecuteResult, Hash256, PubKey, RawPointer, ResultStatus,
 };
 
 use sgx_types::*;
@@ -91,7 +91,7 @@ pub unsafe extern "C" fn ecall_execute(
     args: *const u8,
     args_len: usize,
     user_key: &[u8; 64],
-    contract_address: &ContractAddress,
+    contract_address: &Hash256,
     gas_limit: *const u64,
     db_ptr: *const RawPointer,
     result: &mut ExecuteResult,
@@ -147,7 +147,7 @@ pub unsafe extern "C" fn ecall_deploy(
     constructor_len: usize,
     args: *const u8,
     args_len: usize,
-    address: &ContractAddress,
+    address: &Hash256,
     user_key: &PubKey,
     gas_limit: *const u64,
     db_ptr: *const RawPointer,
@@ -320,7 +320,7 @@ unsafe fn ecall_execute_internal(
     args: &[u8],
     user_key: &PubKey,
     io_key: &DhKey,
-    address: ContractAddress,
+    address: Hash256,
     gas_limit: u64,
     db_ptr: *const RawPointer,
     result: &mut ExecuteResult,
@@ -374,7 +374,7 @@ unsafe fn ecall_deploy_internal(
     bytecode: &[u8],
     constructor: &[u8],
     args: &[u8],
-    address: ContractAddress,
+    address: Hash256,
     user_key: &PubKey,
     io_key: &DhKey,
     gas_limit: u64,
diff --git a/enigma-principal/app/Cargo.lock b/enigma-principal/app/Cargo.lock
index c5b2f945..9cc73110 100644
--- a/enigma-principal/app/Cargo.lock
+++ b/enigma-principal/app/Cargo.lock
@@ -7,10 +7,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -33,7 +33,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "arrayref"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -51,9 +51,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "atty"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -63,6 +64,11 @@ name = "autocfg"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "autocfg"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "backtrace"
 version = "0.3.38"
@@ -91,6 +97,11 @@ dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "base64"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "bitflags"
 version = "1.2.1"
@@ -98,12 +109,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "blake2b_simd"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -136,10 +147,10 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -184,9 +195,9 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -207,8 +218,8 @@ name = "chrono"
 version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -218,11 +229,11 @@ version = "2.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -234,18 +245,9 @@ dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "colour"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "constant_time_eq"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -267,8 +269,8 @@ dependencies = [
  "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -355,7 +357,7 @@ name = "crypto-mac"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -375,10 +377,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "ident_case 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -388,7 +390,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "darling_core 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -399,7 +401,7 @@ dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -426,13 +428,13 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "dtoa"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -447,7 +449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.20"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -462,8 +464,8 @@ dependencies = [
  "libsecp256k1 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "ring 0.14.6 (git+https://github.com/elichai/ring.git?rev=sgx-0.14.6)",
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -471,7 +473,7 @@ dependencies = [
 name = "enigma-principal-app"
 version = "0.3.0"
 dependencies = [
- "colour 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "enigma-crypto 0.3.0",
  "enigma-tools-m 0.3.0",
@@ -482,21 +484,24 @@ dependencies = [
  "ethabi 8.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethereum-types 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hex-serde 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-http-server 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-test 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log-derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rmp-serde 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "secp256k1 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "sgx_types 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
  "sgx_urts 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
  "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thiserror 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "web3 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -515,9 +520,9 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log-derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rmp-serde 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -532,19 +537,20 @@ dependencies = [
  "ethabi 8.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethereum-types 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "gethostname 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gethostname 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log-derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log4rs 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
- "reqwest 0.9.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.10.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "rlp 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "sgx_types 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
  "sgx_urts 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
+ "thiserror 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "web3 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -555,8 +561,8 @@ version = "0.3.0"
 dependencies = [
  "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "cbindgen 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -564,7 +570,7 @@ name = "envy"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -610,10 +616,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethereum-types 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -656,9 +662,9 @@ name = "failure_derive"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -675,7 +681,7 @@ dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -738,7 +744,7 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -760,7 +766,7 @@ dependencies = [
 
 [[package]]
 name = "gethostname"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -769,12 +775,12 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -782,11 +788,11 @@ name = "globset"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bstr 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -798,8 +804,8 @@ dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -824,12 +830,26 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.3"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "hex"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "hex-serde"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "hmac"
 version = "0.4.2"
@@ -852,12 +872,12 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.1.20"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -867,7 +887,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -881,7 +901,7 @@ name = "humantime"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -893,11 +913,11 @@ dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -908,7 +928,7 @@ dependencies = [
  "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -937,7 +957,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -947,7 +967,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -971,15 +991,15 @@ name = "impl-serde"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "indexmap"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1000,7 +1020,7 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1010,9 +1030,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1024,8 +1044,8 @@ dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1049,7 +1069,7 @@ dependencies = [
  "jsonrpc-core 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1062,7 +1082,7 @@ dependencies = [
  "jsonrpc-core 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1077,8 +1097,8 @@ dependencies = [
  "jsonrpc-core-client 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-pubsub 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1105,7 +1125,7 @@ name = "libsecp256k1"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "digest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hmac-drbg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1137,7 +1157,7 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1149,7 +1169,7 @@ version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1159,9 +1179,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "darling 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1183,10 +1203,10 @@ dependencies = [
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log-mdc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-value 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread-id 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1205,7 +1225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "memchr"
-version = "2.2.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1218,7 +1238,7 @@ dependencies = [
 
 [[package]]
 name = "mime"
-version = "0.3.14"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1226,7 +1246,7 @@ name = "mime_guess"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1285,9 +1305,9 @@ dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.10.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1311,27 +1331,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "num-integer"
-version = "0.1.41"
+version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.11.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1342,7 +1362,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "openssl"
-version = "0.10.26"
+version = "0.10.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1350,7 +1370,7 @@ dependencies = [
  "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1360,10 +1380,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.53"
+version = "0.9.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cc 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1375,7 +1395,7 @@ name = "ordered-float"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1392,7 +1412,7 @@ version = "3.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1419,7 +1439,7 @@ name = "parking_lot"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1507,7 +1527,7 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1521,13 +1541,13 @@ dependencies = [
  "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "quick-error"
-version = "1.2.2"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1543,7 +1563,7 @@ name = "quote"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1599,10 +1619,10 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1645,7 +1665,7 @@ name = "rand_core"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1727,29 +1747,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "redox_users"
-version = "0.3.1"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "regex"
-version = "1.3.1"
+version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.12"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1762,31 +1781,31 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.9.22"
+version = "0.9.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
  "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1811,16 +1830,16 @@ name = "rlp"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rmp"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1829,8 +1848,8 @@ version = "0.13.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rmp 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rmp 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1839,18 +1858,19 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rmp 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rmp 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rust-argon2"
-version = "0.5.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1865,7 +1885,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "rustc-hex"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1947,10 +1967,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
-version = "1.0.103"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1959,27 +1979,27 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.103"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.42"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1987,9 +2007,9 @@ name = "serde_urlencoded"
 version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1998,21 +2018,21 @@ name = "serde_yaml"
 version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "sgx_types"
 version = "1.0.9"
-source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#2042ce64fd377e790584c96a4bfd4c32de2d03ea"
+source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#46837a05facee93622cdf5c3a1d542525c4fce75"
 
 [[package]]
 name = "sgx_urts"
 version = "1.0.9"
-source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#2042ce64fd377e790584c96a4bfd4c32de2d03ea"
+source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#46837a05facee93622cdf5c3a1d542525c4fce75"
 dependencies = [
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "sgx_types 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
@@ -2032,7 +2052,7 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2061,7 +2081,7 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.0.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -2094,7 +2114,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "strsim"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -2129,10 +2149,10 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2142,9 +2162,9 @@ name = "synstructure"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2155,28 +2175,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
  "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "term"
-version = "0.5.2"
+name = "textwrap"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "textwrap"
-version = "0.11.0"
+name = "thiserror"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "thiserror-impl 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2191,7 +2219,7 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "0.3.6"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2223,7 +2251,7 @@ dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2232,7 +2260,7 @@ dependencies = [
  "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-udp 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2301,7 +2329,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2324,7 +2352,7 @@ dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2356,7 +2384,7 @@ dependencies = [
 
 [[package]]
 name = "tokio-threadpool"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2365,7 +2393,7 @@ dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2426,7 +2454,7 @@ name = "toml"
 version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2468,7 +2496,7 @@ dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "crunchy 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2489,10 +2517,10 @@ dependencies = [
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2502,7 +2530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -2540,7 +2568,7 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2588,7 +2616,7 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.7.0"
+version = "0.9.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -2608,9 +2636,9 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-timer 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2672,24 +2700,26 @@ dependencies = [
 
 [metadata]
 "checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
-"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
+"checksum aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5f56c476256dc249def911d6f7580b5fc7e875895b5d7ee88f5d602208035744"
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 "checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5"
 "checksum arc-swap 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "bc4662175ead9cd84451d5c35070517777949a2ed84551764129cedb88384841"
-"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
+"checksum arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
 "checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
 "checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
-"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 "checksum backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)" = "690a62be8920ccf773ee00ef0968649b0e724cda8bd5b12286302b4ae955fdf5"
 "checksum backtrace-sys 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)" = "5b3a000b9c543553af61bc01cbfc403b04b5caa9e421033866f2e98061eb3e61"
 "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
+"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0"
+"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
 "checksum block-buffer 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1339a1042f5d9f295737ad4d9a6ab6bf81c84a933dba110b9200cd6d1448b814"
 "checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
 "checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-"checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"
+"checksum bstr 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "fe8a65814ca90dfc9705af76bb6ba3c6e2534489a72270e797e603783bb4990b"
 "checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
 "checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
@@ -2701,8 +2731,7 @@ dependencies = [
 "checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01"
 "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-"checksum colour 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83a328d8ddb37e76b43ee7da69a58f59c0c72d5cf8c091d004712f3154b41cd7"
-"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
+"checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 "checksum cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5"
 "checksum cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c"
 "checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
@@ -2722,10 +2751,10 @@ dependencies = [
 "checksum digest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e5b29bf156f3f4b3c4f610a25ff69370616ae6e0657d416de22645483e72af0a"
 "checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
 "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
-"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
+"checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
 "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
 "checksum elastic-array-plus 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "562cc8504a01eb20c10fb154abd7c4baeb9beba2329cf85838ee2bd48a468b18"
-"checksum encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)" = "87240518927716f79692c2ed85bfe6e98196d18c6401ec75355760233a7e12e9"
+"checksum encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28"
 "checksum envy 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "20664407d5097b5a861dffb0c32af2be7215a0050415cb50232aec36d73f69df"
 "checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9"
 "checksum etcommon-bigint 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "e8375b615f02fc1ea1aea0a323e11c1084c841bd530a6dc57b9e1da80a502abd"
@@ -2749,16 +2778,18 @@ dependencies = [
 "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
 "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
 "checksum generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fceb69994e330afed50c93524be68c42fa898c2d9fd4ee8da03bd7363acd26f2"
-"checksum gethostname 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4ab273ca2a31eb6ca40b15837ccf1aa59a43c5db69ac10c542be342fae2e01d"
-"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
+"checksum gethostname 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e692e296bfac1d2533ef168d0b60ff5897b8b70a4009276834014dd8924cc028"
+"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
 "checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2"
 "checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
 "checksum heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
-"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
+"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
+"checksum hex-serde 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3486d7bc9e52c4c5fc1856ae8a5e4ab41d2499fc20bbc44492e244e8bf1b7012"
 "checksum hmac 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7a13f4163aa0c5ca1be584aace0e2212b2e41be5478218d4f657f5f778b2ae2a"
 "checksum hmac-drbg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4fe727d41d2eec0a6574d887914347e5ff96a3b87177817e2a9820c5c87fecc2"
-"checksum http 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "2790658cddc82e82b08e25176c431d7015a0adeb1718498715cbd20138a0bf68"
+"checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
 "checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
 "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 "checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
@@ -2770,10 +2801,10 @@ dependencies = [
 "checksum impl-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d2050d823639fbeae26b2b5ba09aca8907793117324858070ade0673c49f793b"
 "checksum impl-rlp 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8f7a72f11830b52333f36e3b09a288333888bf54380fd0ac0790a3c31ab0f3c5"
 "checksum impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "58e3cae7e99c7ff5a995da2cf78dd0a5383740eda71d98cf7b1910c301ac69b8"
-"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
+"checksum indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b54058f0a6ff80b6803da8faf8997cde53872b38f4023728f6830b06cd3c0dc"
 "checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
 "checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
-"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
+"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
 "checksum jsonrpc-core 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97b83fdc5e0218128d0d270f2f2e7a5ea716f3240c8518a58bc89e6716ba8581"
 "checksum jsonrpc-core-client 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c889ca27072f038496a62f38356e8f827acf194d7276030120265362b2974eab"
 "checksum jsonrpc-http-server 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541257be6c8f75a41812575150dfa1120d3ee3a852601f2ca8ac9bcb73575c4e"
@@ -2787,16 +2818,16 @@ dependencies = [
 "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
 "checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff"
-"checksum lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e57b3997725d2b60dbec1297f6c2e2957cc383db1cebd6be812163f969c7d586"
+"checksum lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b"
 "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 "checksum log-derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2c7f436d3b5b51857b145075009f3a0d88dd37d2e93f42bb227045f4562a131e"
 "checksum log-mdc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7"
 "checksum log4rs 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e229f32d17a1a822df4bb22ffdf1c7449d0ece700f310e87254a297be31c3b63"
 "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 "checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
+"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223"
 "checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
-"checksum mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "dd1d63acd1b78403cc0c325605908475dd9b9a3acbf65ed8bcab97e27014afcf"
+"checksum mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 "checksum mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599"
 "checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625"
 "checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
@@ -2805,13 +2836,13 @@ dependencies = [
 "checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e"
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
-"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"
-"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
+"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
+"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
+"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
 "checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585"
+"checksum openssl 0.10.27 (registry+https://github.com/rust-lang/crates.io-index)" = "e176a45fedd4c990e26580847a525e39e16ec32ac78957dbf62ded31b3abfd6f"
 "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
+"checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
 "checksum ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518"
 "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
 "checksum parity-codec 3.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "2b9df1283109f542d8852cd6b30e9341acc2137481eb6157d2e62af68b0afec9"
@@ -2827,16 +2858,16 @@ dependencies = [
 "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 "checksum primitive-types 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2288eb2a39386c4bc817974cc413afe173010dc80e470fcb1e9a35580869f024"
 "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
+"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
 "checksum publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b"
-"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
+"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
 "checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c"
 "checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
 "checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
 "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
+"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
 "checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
 "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
@@ -2851,20 +2882,20 @@ dependencies = [
 "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
 "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
 "checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d"
-"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
-"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
+"checksum redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
+"checksum regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8"
+"checksum regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-"checksum reqwest 0.9.22 (registry+https://github.com/rust-lang/crates.io-index)" = "2c2064233e442ce85c77231ebd67d9eca395207dec2127fe0bbedde4bd29a650"
+"checksum reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab"
 "checksum ring 0.14.6 (git+https://github.com/elichai/ring.git?rev=sgx-0.14.6)" = "<none>"
 "checksum rlp 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3a44d5ae8afcb238af8b75640907edc6c931efcfab2c854e81ed35fa080f84cd"
-"checksum rmp 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f594cb7ff8f1c5a7907f6be91f15795c8301e0d5718eb007fb5832723dd716e"
+"checksum rmp 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "0f10b46df14cf1ee1ac7baa4d2fbc2c52c0622a4b82fa8740e37bc452ac0184f"
 "checksum rmp-serde 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)" = "011e1d58446e9fa3af7cdc1fb91295b10621d3ac4cb3a85cc86385ee9ca50cd3"
 "checksum rmp-serde 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4a31c0798045f039ace94e0166f76478b3ba83116ec7c9d4bc934c5b13b8df21"
-"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
+"checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 "checksum rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0ceb8ce7a5e520de349e1fa172baeba4a9e8d5ef06c47471863530bc4972ee1e"
-"checksum rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "403bb3a286107a04825a5f82e1270acc1e14028d3d554d7a1e08914549575ab8"
+"checksum rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
 "checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
@@ -2876,36 +2907,37 @@ dependencies = [
 "checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702"
+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
 "checksum serde-value 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7a663f873dedc4eac1a559d4c6bc0d0b2c34dc5ac4702e105014b8281489e44f"
-"checksum serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0"
-"checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043"
+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+"checksum serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "21b01d7f0288608a01dca632cf1df859df6fd6ffa885300fc275ce2ba6221953"
 "checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
 "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
 "checksum sgx_types 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)" = "<none>"
 "checksum sgx_urts 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)" = "<none>"
 "checksum sha2 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d963c78ce367df26d7ea8b8cc655c651b42e8a1e584e869c1e17dae3ccb116a"
-"checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d"
+"checksum sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0"
 "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
-"checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86"
+"checksum smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc"
 "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5"
 "checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-"checksum strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6"
+"checksum strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
 "checksum structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7"
 "checksum structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107"
 "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238"
+"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
 "checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-"checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+"checksum thiserror 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "205684fd018ca14432b12cce6ea3d46763311a571c3d294e71ba3f01adcf1aad"
+"checksum thiserror-impl 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "57e4d2e50ca050ed44fb58309bdce3efa79948f84f9993ad1978de5eebdce5a7"
 "checksum thread-id 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1"
-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d8a021c69bb74a44ccedb824a046447e2c84a01df9e5c20779750acb38e11b2"
 "checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
@@ -2919,7 +2951,7 @@ dependencies = [
 "checksum tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "6732fe6b53c8d11178dcb77ac6d9682af27fc6d4cb87789449152e5377377146"
 "checksum tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76"
 "checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
-"checksum tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2bd2c6a3885302581f4401c82af70d792bb9df1700e7437b0aeb4ada94d5388c"
+"checksum tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c32ffea4827978e9aa392d2f743d973c1dfa3730a2ed3f22ce1e6984da848c"
 "checksum tokio-timer 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6131e780037787ff1b3f8aad9da83bca02438b72277850dd6ad0d455e0e20efc"
 "checksum tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1739638e364e558128461fc1ad84d997702c8e31c2e6b18fb99842268199e827"
 "checksum tokio-udp 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f02298505547f73e60f568359ef0d016d5acd6e830ab9bc7c4a5b3403440121b"
@@ -2933,22 +2965,22 @@ dependencies = [
 "checksum uint 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2143cded94692b156c356508d92888acc824db5bffc0b4089732264c6fcf86d4"
 "checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-"checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf"
+"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
 "checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
-"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 "checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f"
 "checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
 "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-"checksum url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61"
+"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
 "checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
 "checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
 "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 "checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
 "checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
-"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
+"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 "checksum web3 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "076f34ed252d74a8521e3b013254b1a39f94a98f23aae7cfc85cda6e7b395664"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
diff --git a/enigma-principal/app/Cargo.toml b/enigma-principal/app/Cargo.toml
index e465f536..a6f030fc 100644
--- a/enigma-principal/app/Cargo.toml
+++ b/enigma-principal/app/Cargo.toml
@@ -13,6 +13,7 @@ enigma-tools-m = { path = "../../enigma-tools-m" }
 ethabi = "8.0.1"
 etcommon-rlp = "0.2"
 failure = "0.1.3"
+thiserror = "1.0.9"
 rustc-hex = "1.0.0"
 serde_json = "1.0"
 serde = "1.0"
@@ -20,12 +21,14 @@ serde_derive = "1.0"
 rmp-serde = "0.13.7"
 structopt = "0.2.10"
 url = "1.7.1"
-colour = "0.3"
+crossbeam-utils = "0.7"
 dirs = "1.0"
 web3 = { version  = "0.8", default-features = false, features=["http", "tls"]  }
 jsonrpc-http-server = "11.0.0"
 log = "0.4.6"
 log-derive = "0.3"
+lazy_static = "1.3.0"
+hex-serde = "0.1.0"
 envy = "0.3.2"
 itertools = "0.8.1"
 secp256k1 = "0.12"
diff --git a/enigma-principal/app/src/boot_network/deploy_scripts.rs b/enigma-principal/app/src/boot_network/deploy_scripts.rs
deleted file mode 100644
index d70bfc5a..00000000
--- a/enigma-principal/app/src/boot_network/deploy_scripts.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use enigma_tools_u::web3_utils::w3utils;
-use failure::Error;
-use rustc_hex::ToHex;
-use std::{str, sync::Arc, thread, time};
-use web3::{
-    contract::{Contract, Options},
-    futures::Future,
-    transports::Http,
-    types::Address,
-    Web3,
-};
-
-/// TESTING: deploy the dummy contract
-fn deploy_dummy_miner(w3: &Web3<Http>, deployer: &str) -> Result<Contract<Http>, Error> {
-    // contract path
-    let path = "../app/tests/principal_node/contracts/Dummy.json";
-    // build deploy params
-    let gas_limit: u64 = 5_999_999;
-    let poll_interval: u64 = 1;
-    let confirmations: usize = 0;
-    let (abi, bytecode) = w3utils::load_contract_abi_bytecode(path)?;
-
-    let tx = w3utils::DeployParams::new(deployer, abi, bytecode, gas_limit, poll_interval, confirmations)?;
-    // deploy
-    let contract = w3utils::deploy_contract(&w3, &tx, ())?;
-    Ok(contract)
-}
-
-/// TESTING: mimic block creation to test the watch blocks method of the principal node
-pub fn forward_blocks(w3: &Arc<Web3<Http>>, interval: u64, deployer: Address) -> Result<(), Error> {
-    let contract = deploy_dummy_miner(&w3, &deployer.to_fixed_bytes().to_hex())?;
-    println!("deployed dummy contract at address = {:?}", contract.address());
-    loop {
-        let gas_limit: u64 = 5_999_999;
-        let mut options = Options::default();
-        options.gas = Some(gas_limit.into());
-        // contract.call("mine",(),deployer,options ).wait().expect("error calling mine on miner.");
-        let res = contract.call("mine", (), deployer, options).wait();
-        match res {
-            Ok(_) => println!("\u{2692}"),
-            Err(e) => println!("[-] error mining block =>{:?}", e),
-        };
-        thread::sleep(time::Duration::from_secs(interval));
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use esgx::general::init_enclave_wrapper;
-    use std::env;
-
-    /// This function is important to enable testing both on the CI server and local.
-    /// On the CI Side:
-    /// The ethereum network url is being set into env variable 'NODE_URL' and taken from there.
-    /// Anyone can modify it by simply doing $export NODE_URL=<some ethereum node url> and then running the tests.
-    /// The default is set to ganache cli "http://localhost:8545"
-    fn get_node_url() -> String { env::var("NODE_URL").unwrap_or("http://localhost:8545".to_string()) }
-
-    #[test]
-    fn test_deploy_enigma_contract_environment() {
-        let enclave = init_enclave_wrapper().unwrap();
-        let _eid = enclave.geteid();
-        // load the config
-        //        let deploy_config = "../app/tests/principal_node/contracts/deploy_config.json";
-        //        let mut config = deploy_scripts::load_config(deploy_config).unwrap();
-        //        // modify to dynamic address
-        //        config.set_ethereum_url(get_node_url());
-        // deploy all contracts.
-        //        let signer_addr = get_signing_address(eid).unwrap();
-        //        let _enigma_contract = EnigmaContract::deploy_contract(Path::new(&config.enigma_token_contract_path),
-        //                                                               Path::new(&config.enigma_contract_path),
-        //                                                               &get_node_url(),
-        //                                                               None,
-        //                                                               &signer_addr).unwrap();
-    }
-
-}
diff --git a/enigma-principal/app/src/boot_network/mod.rs b/enigma-principal/app/src/boot_network/mod.rs
deleted file mode 100644
index 4b0b0abe..00000000
--- a/enigma-principal/app/src/boot_network/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod deploy_scripts;
-pub mod keys_provider_http;
-pub mod principal_manager;
-pub mod principal_utils;
diff --git a/enigma-principal/app/src/boot_network/principal_manager.rs b/enigma-principal/app/src/boot_network/principal_manager.rs
deleted file mode 100644
index 7f0dea11..00000000
--- a/enigma-principal/app/src/boot_network/principal_manager.rs
+++ /dev/null
@@ -1,503 +0,0 @@
-use std::{fs::File, io::prelude::*, str, sync::Arc, thread};
-
-use failure::Error;
-use rustc_hex::ToHex;
-use serde_derive::*;
-use serde_json;
-use sgx_types::sgx_enclave_id_t;
-use web3::{
-    futures::Future,
-    transports::Http,
-    types::{Address, H160, H256, U256},
-    Web3,
-};
-use envy;
-
-use enigma_crypto::EcdsaSign;
-use boot_network::{deploy_scripts, keys_provider_http::PrincipalHttpServer, principal_utils::Principal};
-use enigma_tools_u::{
-    attestation_service::service,
-    esgx::equote::retry_quote,
-    web3_utils::enigma_contract::{ContractFuncs, ContractQueries, EnigmaContract},
-};
-use epoch_u::epoch_provider::EpochProvider;
-use esgx;
-use enigma_tools_u::common_u::errors::Web3Error;
-use std::path::PathBuf;
-
-use secp256k1::key::SecretKey;
-use secp256k1::Message;
-use secp256k1::Secp256k1;
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct PrincipalConfig {
-    // Path to IEnigma.Json ** probably a good place to document that IEnigma.Json is used because parsing the entire Enigma.json will fail to due missing types
-    pub enigma_contract_path: String,
-    // Not 100% sure on this one. Path to where we download the enigma.json ABI from? Either way, probably unused
-    pub enigma_contract_remote_path: String,
-    // Address of the deployed contract -- expected to be set externally
-    pub enigma_contract_address: String,
-    // Ethereum address of the *operating address* of the KM
-    pub account_address: String,
-    // Chain ID of the ethereum node we're working with
-    pub chain_id: u64,
-    // TODO: Not sure what this does
-    pub test_net: bool,
-    // Flag whether we're using a predefined private key (true) or self-generated keys in SGX (false)
-    pub with_private_key: bool,
-    // Private key, as hex string (without "0x"). Only used if with_private_key is set to true
-    pub private_key: String,
-    // Uh
-    pub url: String,
-    // Length of epoch in blocks
-    pub epoch_size: usize,
-    // TODO: this
-    pub polling_interval: u64,
-    // TODO: this
-    pub max_epochs: Option<usize>,
-    // TODO: this
-    pub spid: String,
-    // Address of SGX attestation proxy (enigma attestation service)
-    pub attestation_service_url: String,
-    // Number of retires before we give up on connection to attestation service?
-    pub attestation_retries: u32,
-    // JSON-RPC port. Usually 3040
-    pub http_port: u16,
-    // Number of confirmations on-chain before accepting a transaction as complete
-    pub confirmations: u64,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct RegistrationParams {
-    pub signing_address: String,
-    pub report: String,
-    pub signature: String,
-}
-
-pub struct ReportManager {
-    pub config: PrincipalConfig,
-    as_service: service::AttestationService,
-    pub eid: sgx_enclave_id_t,
-}
-
-pub struct PrincipalManager {
-    pub config: PrincipalConfig,
-    pub contract: Arc<EnigmaContract>,
-    pub report_manager: ReportManager,
-    pub eid: sgx_enclave_id_t,
-}
-
-pub struct SgxEthereumSigner {
-    eid: sgx_enclave_id_t,
-}
-
-impl SgxEthereumSigner {
-    pub fn new(eid: sgx_enclave_id_t) -> SgxEthereumSigner {
-        SgxEthereumSigner{ eid }
-    }
-}
-
-impl EcdsaSign for SgxEthereumSigner {
-    fn sign_hashed(&self, to_sign: &[u8; 32]) -> [u8; 65] {
-        match esgx::equote::sign_ethereum(self.eid, to_sign) {
-            Ok(sig) => sig,
-            Err(err) => {
-                panic!("Error signing data: {:?}", err);
-            }
-            // println!("Signed data: {:?}", sig.to_vec().to_hex());
-        }
-    }
-}
-
-pub struct PrivateKeyEthereumSigner {
-    private_key: [u8; 32]
-}
-
-impl PrivateKeyEthereumSigner {
-    pub fn new(private_key: [u8; 32]) -> PrivateKeyEthereumSigner {
-        PrivateKeyEthereumSigner{ private_key }
-    }
-}
-
-impl EcdsaSign for PrivateKeyEthereumSigner {
-    fn sign_hashed(&self, to_sign: &[u8; 32]) -> [u8; 65] {
-        let s = Secp256k1::signing_only();
-        let msg = Message::from_slice(to_sign).unwrap();
-        let key = SecretKey::from_slice(&self.private_key).unwrap();
-        let (v, sig_bytes) = s.sign_recoverable(&msg, &key).serialize_compact();
-
-        let mut sig_recoverable: [u8; 65] = [0u8; 65];
-        sig_recoverable[0..64].copy_from_slice(&sig_bytes);
-        sig_recoverable[64] = (v.to_i32() + 27) as u8;
-        sig_recoverable
-    }
-}
-
-impl ReportManager {
-    pub fn new(config: PrincipalConfig, eid: sgx_enclave_id_t) -> Result<Self, Error> {
-        let as_service = service::AttestationService::new_with_retries(&config.attestation_service_url, config.attestation_retries);
-        Ok(ReportManager { config, as_service, eid })
-    }
-
-    pub fn get_signing_address(&self) -> Result<String, Error> {
-        let _signing_address = esgx::equote::get_register_signing_address(self.eid)?;
-        let signing_address = _signing_address.to_vec().to_hex();
-        Ok(signing_address)
-    }
-
-    pub fn get_ethereum_address(&self) -> Result<String, Error> {
-        if self.config.with_private_key {
-            return Ok(self.config.account_address.clone());
-        }
-        let _signing_address = esgx::equote::get_ethereum_address(self.eid)?;
-        let signing_address = _signing_address.to_vec().to_hex();
-        Ok(signing_address)
-    }
-
-    #[logfn(DEBUG)]
-    pub fn get_registration_params(&self) -> Result<RegistrationParams, Error> {
-        let signing_address = self.get_signing_address()?;
-        let mode = option_env!("SGX_MODE").unwrap_or_default();
-        let enc_quote = retry_quote(self.eid, &self.config.spid, 18)?;
-
-        let report: String;
-        let signature: String;
-        if mode == "SW" {
-            // Software Mode
-            println!("Simulation mode");
-            report = enc_quote;
-            signature = String::new();
-        } else {
-            // Hardware Mode
-            println!("Hardware mode");
-            let response = self.as_service.get_report(enc_quote)?;
-            report = response.result.report_string;
-            signature = response.result.signature;
-        }
-        Ok(RegistrationParams { signing_address, report, signature })
-    }
-}
-
-impl PrincipalConfig {
-    // load json config into the struct
-    #[logfn(DEBUG)]
-    pub fn load_config(config_path: &str) -> Result<PrincipalConfig, Error> {
-        info!("loading Principal config");
-        // All configurations from env should be with the same names of the
-        // PrincipalConfig struct fields in uppercase letters
-        match envy::from_env::<PrincipalConfig>() {
-            Ok(config) => Ok(config),
-            Err(_) => {
-                info!("trying to load from path: {:?}", config_path);
-                let mut f = File::open(config_path)?;
-
-                let mut contents = String::new();
-                f.read_to_string(&mut contents)?;
-
-                Ok(serde_json::from_str(&contents)?)
-            }
-        }
-    }
-}
-impl PrincipalManager {
-    pub fn get_web3(&self) -> Arc<Web3<Http>> { Arc::clone(&self.contract.web3) }
-}
-
-// General interface of a Sampler == The entity that manages the principal node logic.
-pub trait Sampler {
-    /// load with config from file
-    fn new(config: PrincipalConfig, contract: Arc<EnigmaContract>, report_manager: ReportManager) -> Result<Self, Error>
-        where Self: Sized;
-
-    fn get_signing_address(&self) -> Result<H160, Error>;
-
-    fn get_contract_address(&self) -> Address;
-
-    fn get_account_address(&self) -> Address;
-
-    fn get_network_url(&self) -> String;
-
-    fn get_block_number(&self) -> Result<U256, Error>;
-
-    fn register<G: Into<U256>>(&self, signing_address: H160, gas_limit: G) -> Result<H256, Error>;
-
-    fn verify_identity_or_register<G: Into<U256>>(&self, gas_limit: G) -> Result<Option<H256>, Error>;
-
-    /// after initiation, this will run the principal node and block.
-    fn run<G: Into<U256>>(&self, path: PathBuf, reset_epoch: bool, gas: G) -> Result<(), Error>;
-}
-
-impl Sampler for PrincipalManager {
-    fn new(config: PrincipalConfig, contract: Arc<EnigmaContract>, report_manager: ReportManager) -> Result<Self, Error> {
-        let eid = report_manager.eid;
-        //        let registration_params = report_manager.get_registration_params()?;
-        Ok(PrincipalManager { config, contract, report_manager, eid })
-    }
-
-    fn get_signing_address(&self) -> Result<H160, Error> {
-        let sig_addr = self.report_manager.get_signing_address()?;
-        Ok(sig_addr.parse()?)
-    }
-
-    fn get_contract_address(&self) -> Address { self.contract.address() }
-
-    // noinspection RsBorrowChecker
-    fn get_account_address(&self) -> Address { self.contract.account }
-
-    fn get_network_url(&self) -> String { self.config.url.clone() }
-
-    fn get_block_number(&self) -> Result<U256, Error> {
-        let block_number = match self.get_web3().eth().block_number().wait() {
-            Ok(block_number) => block_number,
-            Err(err) => return Err(Web3Error {
-                message: format!("Current block number not available: {:?}", err),
-            }.into()),
-        };
-        Ok(block_number)
-    }
-
-    #[logfn(DEBUG)]
-    fn register<G: Into<U256>>(&self, signing_address: H160, gas_limit: G) -> Result<H256, Error> {
-        let registration_params = self.report_manager.get_registration_params()?;
-        // the register method on the Enigma contract expects a staking address
-        // since it's suited for the workers as well.
-        // staking is irrelevant for the KM and therefore we are sending an empty address
-        let staking_address = H160::zero();
-        println!("Registering");
-        let receipt = self.contract.register(
-            staking_address,
-            signing_address,
-            registration_params.report,
-            registration_params.signature,
-            gas_limit,
-            self.config.confirmations as usize,
-        )?;
-        Ok(receipt.transaction_hash)
-    }
-
-    /// Verifies whether the worker is registered in the Enigma contract.
-    /// If not, create a `register` transaction.
-    ///
-    /// # Arguments
-    ///
-    /// * `gas_limit` - The gas limit of the `register` transaction
-    #[logfn(DEBUG)]
-    fn verify_identity_or_register<G: Into<U256>>(&self, gas_limit: G) -> Result<Option<H256>, Error> {
-        let signing_address = self.get_signing_address()?;
-        let registered_signing_address = self.contract.get_signing_address()?;
-        if signing_address == registered_signing_address {
-            debug!("Already registered with enigma signing address {:?}", registered_signing_address);
-            Ok(None)
-        } else {
-            let tx = self.register(signing_address, gas_limit)?;
-            debug!("Registered by transaction {:?}", tx);
-            Ok(Some(tx))
-        }
-    }
-
-    /// Warms up the application.
-    /// 1. Register the worker if not already registered
-    /// 2. Create an `EpochProvider` which loads the local `EpochState` if available
-    /// 3. Start the JSON-RPC server
-    /// 4. Watch the blocks for new epochs
-    ///
-    /// # Arguments
-    ///
-    /// * `path` - path to the directory in which we store the epoch state.
-    /// * `reset_epoch` - If true, reset the epoch state
-    /// * `gas_limit` - The gas limit for all Enigma contract transactions
-    #[logfn(INFO)]
-    fn run<G: Into<U256>>(&self, path: PathBuf, reset_epoch: bool, gas_limit: G) -> Result<(), Error> {
-        let gas_limit: U256 = gas_limit.into();
-        self.verify_identity_or_register(gas_limit)?;
-        // get enigma contract
-        // Start the WorkerParameterized Web3 log filter
-        let eid: Arc<sgx_enclave_id_t> = Arc::new(self.eid);
-        let epoch_provider = Arc::new(EpochProvider::new(eid, path, self.contract.clone())?);
-        if reset_epoch {
-            epoch_provider.epoch_state_manager.reset()?;
-        }
-
-        // Start the JSON-RPC Server
-        let port = self.config.http_port;
-        let server_ep = Arc::clone(&epoch_provider);
-        thread::spawn(move || {
-            let server = PrincipalHttpServer::new(server_ep, port);
-            server.start();
-        });
-
-        // watch blocks
-        let polling_interval = self.config.polling_interval;
-        let epoch_size = self.config.epoch_size;
-        self.contract.watch_blocks(
-            epoch_size,
-            polling_interval,
-            epoch_provider,
-            gas_limit,
-            self.config.confirmations as usize,
-            self.config.max_epochs,
-        );
-        Ok(())
-    }
-}
-
-/// Helper method to start 'miner' that simulates blocks.
-pub fn run_miner(account: Address, w3: Arc<Web3<Http>>, interval: u64) -> thread::JoinHandle<()> {
-    thread::spawn(move || {
-        deploy_scripts::forward_blocks(&Arc::clone(&w3), interval, account).unwrap();
-    })
-}
-
-//////////////////////// TESTS  /////////////////////////////////////////
-
-#[cfg(test)]
-mod test {
-    extern crate tempfile;
-    use std::{env, path::Path, sync::Arc, sync::Mutex, thread, time};
-    use self::tempfile::TempDir;
-
-    use web3::{
-        futures::{Future, stream::Stream},
-        transports::Http,
-        types::{FilterBuilder, Log},
-        Web3,
-    };
-
-    use enigma_tools_u::web3_utils::{enigma_contract::EnigmaContract, w3utils};
-    use epoch_u::epoch_types::{WorkersParameterizedEvent, WORKER_PARAMETERIZED_EVENT};
-    use esgx::general::init_enclave_wrapper;
-
-    use super::*;
-
-    const GAS_LIMIT: usize = 5999999;
-    /// This function is important to enable testing both on the CI server and local.
-        /// On the CI Side:
-        /// The ethereum network url is being set into env variable 'NODE_URL' and taken from there.
-        /// Anyone can modify it by simply doing $export NODE_URL=<some ethereum node url> and then running the tests.
-        /// The default is set to ganache cli "http://localhost:8545"
-    pub fn get_node_url() -> String { env::var("NODE_URL").unwrap_or(String::from("http://localhost:8545")) }
-
-    /// helps in assertion to check if a random event was indeed broadcast.
-    pub fn filter_random(w3: &Arc<Web3<Http>>, contract_addr: Option<&str>, event_name: &str) -> Result<Vec<Log>, Error> {
-        let logs = w3utils::filter_blocks(w3, contract_addr, event_name)?;
-        Ok(logs)
-    }
-
-    #[logfn(DEBUG)]
-    pub fn get_config() -> Result<PrincipalConfig, Error> {
-        let config_path = "../app/tests/principal_node/config/principal_test_config.json";
-        let config = PrincipalConfig::load_config(config_path)?;
-        Ok(config)
-    }
-
-    pub fn init_no_deploy(eid: u64) -> Result<PrincipalManager, Error> {
-        let mut config = get_config()?;
-        let enclave_manager = ReportManager::new(config.clone(), eid)?;
-        let ethereum_signer = Box::new(SgxEthereumSigner{eid}) as Box<dyn EcdsaSign + Send + Sync>;
-        let contract = Arc::new(EnigmaContract::from_deployed(
-            &config.enigma_contract_address,
-            Path::new(&config.enigma_contract_path),
-            Some(&config.account_address),
-            config.chain_id,
-            &config.url,
-            ethereum_signer,
-        )?);
-        let _gas_limit = 5_999_999;
-        config.max_epochs = None;
-        let principal: PrincipalManager = PrincipalManager::new(config.clone(), contract, enclave_manager).unwrap();
-        Ok(principal)
-    }
-
-    // TODO: The two tests below require the Enigma contract to be deployed
-    /// Not a standalone unit test, must be coordinated with the Enigma Contract tests
-    #[test]
-    #[ignore]
-    fn test_set_worker_params() {
-        let tempdir = tempfile::tempdir().unwrap();
-        let gas_limit: U256 = 5999999.into();
-        let enclave = init_enclave_wrapper().unwrap();
-        let eid = enclave.geteid();
-        let principal = init_no_deploy(eid).unwrap();
-        principal.verify_identity_or_register(gas_limit).unwrap();
-
-        let block_number = principal.get_block_number().unwrap();
-        let eid_safe = Arc::new(eid);
-        let epoch_provider = EpochProvider::new(eid_safe, tempdir.into_path(), principal.contract.clone()).unwrap();
-        epoch_provider.epoch_state_manager.reset().unwrap();
-        epoch_provider.set_worker_params(block_number, gas_limit, 0).unwrap();
-    }
-
-    /// This test is more like a system-test than a unit-test.
-    /// It is only dependent on an ethereum node running under the NODE_URL evn var or the default localhost:8545
-    /// First it deploys all the contracts related (EnigmaToken, Enigma) and runs miner to simulate blocks.
-    /// Second, it spawns a background thread to poll for events and searchses for the WorkersParameterized event.
-    /// Then, the principal register (full process including quote) and then,
-    ///  starts watching blocks and emits random with WorkersParameterized event.
-    /// The testing is looking for atleast 2 emmits of the WorkersParameterized event and compares the event triggerd
-    /// If the event name is different or if it takes more than 30 seconds then the test will fail.
-    #[test]
-    #[ignore]
-    fn test_full_principal_logic() {
-        let tempdir = tempfile::tempdir().unwrap();
-        let _gas_limit: U256 = 5999999.into();
-        let enclave = init_enclave_wrapper().unwrap();
-        let eid = enclave.geteid();
-        let principal = init_no_deploy(eid).unwrap();
-        let account = principal.get_account_address();
-
-        // run simulated miner
-        run_miner(account, Arc::clone(&principal.contract.web3), 1);
-
-        let contract = Arc::clone(&principal.contract);
-        let child = thread::spawn(move || {
-            let event = WorkersParameterizedEvent::new();
-            let event_sig = event.0.signature();
-            let filter = FilterBuilder::default()
-                .address(vec![contract.address()])
-                .topics(Some(vec![event_sig.into()]), None, None, None)
-                .build();
-
-            let event_future = contract
-                .web3
-                .eth_filter()
-                .create_logs_filter(filter)
-                .then(|filter| {
-                    filter.unwrap().stream(time::Duration::from_secs(1)).for_each(|log| {
-                        println!("Got {} log: {:?}", WORKER_PARAMETERIZED_EVENT, log);
-                        Ok(())
-                    })
-                })
-                .map_err(|err| eprintln!("Unable to process WorkersParameterized log: {:?}", err));
-            event_future.wait().unwrap();
-        });
-
-        // run principal
-        principal.run(tempdir.into_path(), true, GAS_LIMIT).unwrap();
-        child.join().unwrap();
-    }
-
-    #[test]
-    fn test_load_config_from_env() {
-        env::set_var("ENIGMA_CONTRACT_PATH", "../app/tests/principal_node/contracts/IEnigma.json");
-        env::set_var("ENIGMA_CONTRACT_REMOTE_PATH","");
-        env::set_var("ENIGMA_CONTRACT_ADDRESS", "59d3631c86BbE35EF041872d502F218A39FBa150");
-        env::set_var("ACCOUNT_ADDRESS","1df62f291b2e969fb0849d99d9ce41e2f137006e");
-        env::set_var("TEST_NET","true");
-        env::set_var("WITH_PRIVATE_KEY", "false");
-        env::set_var("PRIVATE_KEY", "");
-        env::set_var("URL", "http://172.20.0.2:9545");
-        env::set_var("EPOCH_SIZE", "10");
-        env::set_var("POLLING_INTERVAL", "1");
-        env::set_var("MAX_EPOCHS","10");
-        env::set_var("SPID", "B0335FD3BC1CCA8F804EB98A6420592D");
-        env::set_var("ATTESTATION_SERVICE_URL", "https://sgx.enigma.co/api");
-        env::set_var("ATTESTATION_RETRIES", "11");
-        env::set_var("HTTP_PORT","3040");
-        env::set_var("CONFIRMATIONS","0");
-        env::set_var("CHAIN_ID", "13");
-        let config = PrincipalConfig::load_config("this is not a path").unwrap();
-        assert_eq!(config.polling_interval, 1);
-        assert_eq!(config.http_port, 3040);
-        assert_eq!(config.attestation_retries, 11);
-    }
-}
diff --git a/enigma-principal/app/src/boot_network/principal_utils.rs b/enigma-principal/app/src/boot_network/principal_utils.rs
deleted file mode 100644
index 20e60ed8..00000000
--- a/enigma-principal/app/src/boot_network/principal_utils.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-use std::{sync::Arc, thread, time};
-
-use web3::{futures::Future, types::U256};
-
-use enigma_tools_u::web3_utils::enigma_contract::EnigmaContract;
-use epoch_u::epoch_provider::EpochProvider;
-
-// this trait should extend the EnigmaContract into Principal specific functions.
-pub trait Principal {
-    fn watch_blocks<G: Into<U256>>(
-        &self,
-        epoch_size: usize,
-        polling_interval: u64,
-        epoch_provider: Arc<EpochProvider>,
-        gas_limit: G,
-        confirmations: usize,
-        max_epochs: Option<usize>
-    );
-}
-
-impl Principal for EnigmaContract {
-    /// Watches the blocks for new epoch using the epoch size and the previous epoch block number.
-    /// For each new epoch, set the worker parameters.
-    #[logfn(INFO)]
-    fn watch_blocks<G: Into<U256>>(
-        &self,
-        epoch_size: usize,
-        polling_interval: u64,
-        epoch_provider: Arc<EpochProvider>,
-        gas_limit: G,
-        confirmations: usize,
-        max_epochs: Option<usize>
-    ) {
-        let gas_limit: U256 = gas_limit.into();
-        let max_epochs = max_epochs.unwrap_or(0);
-        let mut epoch_counter = 0;
-        loop {
-            let block_number = match self.web3.eth().block_number().wait() {
-                Ok(block_number) => block_number,
-                Err(err) => {
-                    error!("Unable to fetch block number: {:?}", err);
-                    thread::sleep(time::Duration::from_secs(polling_interval));
-                    continue;
-                }
-            };
-            let curr_block = block_number.low_u64() as usize;
-            let prev_block = match epoch_provider.epoch_state_manager.last(true) {
-                Ok(state) => state.confirmed_state.unwrap().ether_block_number,
-                Err(_) => U256::zero(),
-            };
-            let prev_block_ref = prev_block.low_u64() as usize;
-            trace!("Blocks @ previous: {}, current: {}, next: {}", prev_block_ref, curr_block, (prev_block_ref + epoch_size));
-            if prev_block_ref == 0 || curr_block >= (prev_block_ref + epoch_size) {
-                trace!("New epoch for block number {} [epoch size {}]", curr_block, epoch_size);
-                epoch_provider
-                    .set_worker_params(block_number, gas_limit, confirmations)
-                    .expect("Unable to set worker params. Please recover manually.");
-            } else {
-                trace!("Epoch still active");
-            }
-            thread::sleep(time::Duration::from_secs(polling_interval));
-            if max_epochs != 0 {
-                // in order to avoid overflow - don't increment when max_epochs is 0
-                epoch_counter += 1;
-                if epoch_counter == max_epochs {
-                    error!("reached max_epochs {} , stopping.", max_epochs);
-                    break;
-                }
-            }
-        }
-    }
-}
diff --git a/enigma-principal/app/src/cli/app.rs b/enigma-principal/app/src/cli/app.rs
deleted file mode 100644
index bd2fa0d8..00000000
--- a/enigma-principal/app/src/cli/app.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use boot_network::{
-    keys_provider_http::{PrincipalHttpServer, StateKeyRequest},
-    principal_manager::{
-        self,
-        PrincipalManager,
-        ReportManager,
-        Sampler,
-        PrincipalConfig,
-        SgxEthereumSigner,
-        PrivateKeyEthereumSigner
-    },
-};
-use cli;
-use enigma_crypto::EcdsaSign;
-use enigma_tools_u::{esgx::general::storage_dir, web3_utils::enigma_contract::EnigmaContract};
-use epoch_u::epoch_provider::EpochProvider;
-use esgx::general::ENCLAVE_DIR;
-use failure::Error;
-use sgx_types::sgx_enclave_id_t;
-use std::{fs::File, io::prelude::*, path::Path, sync::Arc};
-use structopt::StructOpt;
-use rustc_hex::FromHex;
-
-pub fn create_signer(eid: sgx_enclave_id_t, with_private_key: bool, private_key: &[u8]) -> Box<dyn EcdsaSign + Send + Sync> {
-    if with_private_key {
-        let mut pk_32 = [0u8; 32];
-        pk_32.copy_from_slice(private_key);
-        let signer = Box::new(PrivateKeyEthereumSigner::new(pk_32)) as Box<dyn EcdsaSign + Send + Sync>;
-        signer
-    } else {
-        let signer = Box::new(SgxEthereumSigner::new(eid)) as Box<dyn EcdsaSign + Send + Sync>;
-        signer
-    }
-}
-
-#[logfn(INFO)]
-pub fn start(eid: sgx_enclave_id_t) -> Result<(), Error> {
-    let opt = cli::options::Opt::from_args();
-    let mut principal_config = PrincipalConfig::load_config(opt.principal_config.as_str())?;
-    let report_manager = ReportManager::new(principal_config.clone(), eid)?;
-    let signing_address = report_manager.get_signing_address()?;
-    let ethereum_address = report_manager.get_ethereum_address()?;
-    let mut path = storage_dir(ENCLAVE_DIR)?;
-
-    let private_key = principal_config.private_key.from_hex()?;
-
-    let ethereum_signer = create_signer(eid, principal_config.with_private_key, &private_key);
-
-    if opt.info {
-        cli::options::print_info(&signing_address, &ethereum_address);
-    } else if opt.sign_address {
-        path.push("principal-sign-addr.txt");
-        let mut file = File::create(&path)?;
-        let prefixed_signing_address = format!("0x{}", signing_address);
-        file.write_all(prefixed_signing_address.as_bytes())?;
-        println!("Wrote signing address: {:?} in file: {:?}", prefixed_signing_address, path);
-
-        path.pop();
-        path.push("ethereum-account-addr.txt");
-        let mut file = File::create(&path)?;
-        let prefixed_ethereum_address = format!("0x{}", ethereum_address);
-        file.write_all(prefixed_ethereum_address.as_bytes())?;
-        println!("Wrote ethereum address: {:?} in file: {:?}", prefixed_ethereum_address, path);
-
-    } else if opt.deploy {
-        unimplemented!("Self-deploy mode not yet implemented. Fix issues with linked libraries in the Enigma contract.");
-    } else {
-        println!("[Mode:] run node NO DEPLOY.");
-        // step1 : build the config of the principal node
-        // optional : set time limit for the principal node
-        let contract_address = opt.contract_address.unwrap_or_else(|| principal_config.enigma_contract_address.clone());
-        let enigma_contract = Arc::new(EnigmaContract::from_deployed(
-            &contract_address,
-            Path::new(&principal_config.enigma_contract_path),
-            Some(&ethereum_address),
-            principal_config.chain_id,
-            &principal_config.url,
-            ethereum_signer,
-        )?);
-
-        principal_config.max_epochs = if opt.time_to_live > 0 { Some(opt.time_to_live) } else { None };
-
-        let gas_limit = 5_999_999;
-
-        let principal: PrincipalManager = PrincipalManager::new(principal_config.clone(), enigma_contract, report_manager)?;
-        println!("Connected to the Enigma contract: {:?} with account: {:?}", &contract_address, principal.get_account_address());
-
-        // step 2 optional - run miner to simulate blocks
-        let join_handle = if opt.mine > 0 {
-            Some(principal_manager::run_miner(principal.get_account_address(), principal.get_web3(), opt.mine as u64))
-        } else {
-            None
-        };
-
-        let eid_safe = Arc::new(eid);
-        //TODO: Ugly, refactor to instantiate only once, consider passing to the run method
-        let epoch_provider = EpochProvider::new(eid_safe, path.clone(), principal.contract.clone())?;
-        if opt.reset_epoch_state {
-            epoch_provider.epoch_state_manager.reset()?;
-        }
-        // step3 : run the principal manager
-        if opt.register {
-            match principal.verify_identity_or_register(gas_limit)? {
-                Some(tx) => println!("Registered Principal with tx: {:?}", tx),
-                None => println!("Principal already registered"),
-            };
-        } else if opt.set_worker_params {
-            let block_number = principal.get_block_number()?;
-            let tx = epoch_provider.set_worker_params(block_number, gas_limit, principal_config.confirmations as usize)?;
-            println!("The setWorkersParams tx: {:?}", tx);
-        } else if opt.confirm_worker_params {
-            let block_number = principal.get_block_number()?;
-            let tx = epoch_provider.confirm_worker_params(block_number, gas_limit, principal_config.confirmations as usize)?;
-            println!("The setWorkersParams tx: {:?}", tx);
-        } else if opt.get_state_keys.is_some() {
-            let request: StateKeyRequest = serde_json::from_str(&opt.get_state_keys.unwrap())?;
-            let response = PrincipalHttpServer::get_state_keys(&epoch_provider, request)?;
-            println!("The getStateKeys response: {}", serde_json::to_string(&response)?);
-        } else {
-            principal.run(path, false, gas_limit).unwrap();
-        }
-        if let Some(t) = join_handle {
-            t.join().unwrap();
-        }
-    }
-    Ok(())
-}
diff --git a/enigma-principal/app/src/cli/mod.rs b/enigma-principal/app/src/cli/mod.rs
deleted file mode 100644
index ddab52a3..00000000
--- a/enigma-principal/app/src/cli/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod app;
-pub mod options;
diff --git a/enigma-principal/app/src/cli/options.rs b/enigma-principal/app/src/cli/options.rs
deleted file mode 100644
index 47bc496e..00000000
--- a/enigma-principal/app/src/cli/options.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use structopt::StructOpt;
-use url::Url;
-
-#[derive(StructOpt, Debug)]
-#[structopt(name = "basic")]
-pub struct Opt {
-    /// Run info mode and shutdown. (Not actually running the node)
-    #[structopt(short = "i", long = "info")]
-    pub info: bool,
-
-    /// Output the signing address only
-    #[structopt(short = "w", long = "write-sign-address")]
-    pub sign_address: bool,
-
-    /// Run the Register procedure and shutdown
-    #[structopt(short = "r", long = "register")]
-    pub register: bool,
-
-    /// Run the Set Worker Params procedure and shutdown
-    #[structopt(short = "p", long = "set-worker-params")]
-    pub set_worker_params: bool,
-
-    /// Confirm the Worker Params in the local state and shutdown
-    #[structopt(short = "f", long = "confirm-worker-params")]
-    pub confirm_worker_params: bool,
-
-    /// Get state keys and shutdown
-    #[structopt(short = "k", long = "get-state-keys")]
-    pub get_state_keys: Option<String>,
-
-    /// Optional: The Enigma contract address, use the config if not provided
-    #[structopt(short = "c", long = "contract-address")]
-    pub contract_address: Option<String>,
-
-    /// Optional: Reset the Epoch state in storage
-    #[structopt(short = "s", long = "reset-epoch-state")]
-    pub reset_epoch_state: bool,
-
-    /// Optional: Deploy the Enigma contract related infrastructure
-    #[structopt(short = "d", long = "deploy")]
-    pub deploy: bool,
-
-    /// Optional currently ignored: Deploy to a different network (not the localhost:port)
-    #[structopt(short = "n", long = "network", default_value = "http://.c")]
-    pub network: Url,
-
-    /// Optional: simulate blocks mining --mine <>
-    #[structopt(short = "m", long = "mine", default_value = "0")]
-    pub mine: usize,
-
-    /// Optional: how many loops to perform (seconds) for the principal in time (TTL)
-    #[structopt(short = "x", long = "time-to-live", default_value = "0")]
-    pub time_to_live: usize,
-
-    /// Optional: if --deploy then change default to custom config file
-    #[structopt(short = "y", long = "deploy-config", default_value = "../app/tests/principal_node/config/deploy_config.json")]
-    pub deploy_config: String,
-
-    /// Optional: change the default principal node config
-    #[structopt(short = "z", long = "principal-config", default_value = "../app/tests/principal_node/config/principal_test_config.json")]
-    pub principal_config: String,
-
-    /// Optional: change the minimum log level
-    #[structopt(short = "l", long = "log-level", default_value = "info")]
-    pub log_level: String,
-}
-
-// fn all_colours() {
-//    black!("black ");
-//    red!("red ");
-//    green!("green ");
-//    yellow!("yellow ");
-//    blue!("blue ");
-//    magenta!("magenta ");
-//    cyan!("cyan ");
-//    white!("white ");
-//    dark_black!("dark_black ");
-//    dark_red!("dark_red ");
-//    dark_green!("dark_green ");
-//    dark_yellow!("dark_yellow ");
-//    dark_blue!("dark_blue ");
-//    dark_magenta!("dark_magenta ");
-//    dark_cyan!("dark_cyan ");
-//    dark_white!("dark_white ");
-//    prnt!("default colour\n\n");
-//}
-
-pub fn print_logo() {
-    yellow!("<>------------------------------------------<>\n");
-    magenta!(
-        "
-\t╔═╗ ┌┐┌ ┬ ┌─┐ ┌┬┐ ┌─┐
-\t║╣  │││ │ │ ┬ │││ ├─┤
-\t╚═╝ ┘└┘ ┴ └─┘ ┴ ┴ ┴ ┴ \n
-\t╔═╗ ┬─┐ ┬ ┌┐┌ ┌─┐ ┬ ┌─┐ ┌─┐ ┬
-\t╠═╝ ├┬┘ │ │││ │   │ ├─┘ ├─┤ │
-\t╩   ┴└─ ┴ ┘└┘ └─┘ ┴ ┴   ┴ ┴ ┴─┘\n
-\t╔╗╔ ┌─┐ ┌┬┐ ┌─┐
-\t║║║ │ │  ││ ├┤
-\t╝╚╝ └─┘ ─┴┘ └─┘\n"
-    );
-    yellow!("<>------------------------------------------<>\n");
-}
-pub fn print_info(signing_address: &str, ethereum_address: &str) {
-    print_logo();
-    yellow!("<>------------------------------------------<>\n");
-    green!("--info                                 => Print the signing address and help.\n");
-    green!("--verbose                              => Verbosity of the log output (up to 5 -vvvvv).\n");
-    green!("--debug-stdout                         => Print the debugging directly to stdout.\n");
-    green!("--write-sign-address                   => Write the signing address to ~/.enigma/principal-sign-addr.txt.\n");
-    green!("--register                             => Run the Register procedure and shutdown.\n");
-    green!("--set-worker-params                    => Run the Set Worker Params procedure and shutdown.\n");
-    green!("--confirm-worker-params                => Confirm the Worker Params in the local state and shutdown.\n");
-    green!("--get-state-keys                       => Get the state keys from the message and shutdown.\n");
-    green!("--contract-address                     => The Enigma contract address, use the config if not provided.\n");
-    green!("--reset-epoch-state                    => Optional: Reset the Epoch state in storage.\n");
-    green!("--deploy                               => Optional, deploy the Enigma contract.\n");
-    green!("--network                              => Currently ignored, use a custom network (use config file instead).\n");
-    green!("--mine <speed>                         => Optional, simulate new blocks, speed = seconds interval.\n");
-    green!("--time-to-live <time>                  => Optional, kill the principal node after aprox <time> seconds.\n");
-    green!("--deploy-config <path from current>    => Optional, if --deploy load deployment config from custom path.\n");
-    green!("--principal-config <path from current> => Optional, load the principal config from custom path.\n");
-    yellow!("<>------------------------------------------<>\n");
-    red!("Enigma address                  => 0x{}\n", signing_address);
-    red!("Ethereum address                => 0x{}\n", ethereum_address);
-    yellow!("<>------------------------------------------<>\n");
-}
diff --git a/enigma-principal/app/src/common_u/custom_errors.rs b/enigma-principal/app/src/common_u/custom_errors.rs
new file mode 100644
index 00000000..bd8ec0b6
--- /dev/null
+++ b/enigma-principal/app/src/common_u/custom_errors.rs
@@ -0,0 +1,90 @@
+use thiserror::Error;
+use failure::Error as GenericErr;
+use sgx_types::sgx_status_t;
+
+use enigma_types;
+use enigma_tools_u::common_u::errors::Web3Error;
+
+#[derive(Error, Debug)]
+pub enum ControllerError {
+    #[error(transparent)]
+    ConfigError(#[from] ConfigError),
+    #[error(transparent)]
+    HTTPServerError(#[from] HTTPServerError),
+    #[error("Error in Controller: {0}")]
+    VerifierError(VerifierError),
+    #[error("Error in Controller: {0}")]
+    EnclaveError(EnclaveError),
+    #[error("Error in Controller: {0}")]
+    EpochError(EpochError),
+    #[error(transparent)]
+    ContractError(#[from] Web3Error),
+    #[error("Error while trying to produce quote")]
+    QuoteErr,
+    #[error("the error received is: {0}")]
+    Other(GenericErr)
+}
+
+#[derive(Error, Debug)]
+pub enum ConfigError {
+    #[error("Unable to open config file")]
+    FileDoesntExist,
+    #[error("Unable to convert file content to string")]
+    NotAString,
+    #[error("Cannot parse data")]
+    CouldntParse,
+}
+
+#[derive(Error, Debug)]
+pub enum HTTPServerError {
+    #[error("Input signature got an unexpected size: {0} bytes. Expected 65 bytes.")]
+    BadSigLen(usize),
+    #[error(transparent)]
+    EpochError(#[from] EpochError),
+    #[error("an error occurred in the pubkey recovery")]
+    KeyRecoveryErr,
+    #[error("error while trying to parse the message received")]
+    InvalidMessage,
+}
+
+#[derive(Error, Debug)]
+pub enum EpochError {
+    #[error("Epoch has yet to be confirmed")]
+    UnconfirmedState,
+}
+
+#[derive(Error, Debug)]
+pub enum EnclaveError {
+    #[error("Error inside the enclave: {err:?} with status: {status:?}")]
+    Failure {
+        err: enigma_types::EnclaveReturn,
+        status: sgx_status_t
+    },
+    #[error("Error returned from inside the enclave")]
+    Unspecified,
+    #[error(transparent)]
+    HTTPServerError(#[from] HTTPServerError),
+}
+
+#[derive(Error, Debug)]
+pub enum VerifierError {
+    #[error("Error occurred while trying to create all directories")]
+    CreateErr,
+    #[error("Error occurred while trying to read the stored SignedEpochs")]
+    ReadErr,
+    #[error("Error occurred while trying to write to the stored SignedEpochs")]
+    WriteErr,
+    #[error("Unable to lock the list of epochs")]
+    LockErr,
+    #[error("An unconfirmed Epoch must be appended only after a confirmed Epoch")]
+    UnexpectedUnconfirmedErr,
+    #[error("A Confirmed epoch already exists- either the last epoch wasn't stored or confirmation was done")]
+    UnexpectedConfirmedErr,
+    #[error("Requested epochs don't exist")]
+    EpochsDontExistErr,
+    #[error(transparent)]
+    EpochErr(#[from] EpochError),
+    #[error("{0}")]
+    Other(String),
+
+}
diff --git a/enigma-principal/app/src/common_u/mod.rs b/enigma-principal/app/src/common_u/mod.rs
index 629e98fb..a116486e 100644
--- a/enigma-principal/app/src/common_u/mod.rs
+++ b/enigma-principal/app/src/common_u/mod.rs
@@ -1 +1,2 @@
 pub mod errors;
+pub mod custom_errors;
\ No newline at end of file
diff --git a/enigma-principal/app/src/controller/boot_network.rs b/enigma-principal/app/src/controller/boot_network.rs
new file mode 100644
index 00000000..62fc41a7
--- /dev/null
+++ b/enigma-principal/app/src/controller/boot_network.rs
@@ -0,0 +1,121 @@
+use std::sync::Arc;
+use std::{fs::File, io::prelude::*, path::Path};
+
+use sgx_types::sgx_enclave_id_t;
+use structopt::StructOpt;
+use rustc_hex::{FromHex, ToHex};
+use crossbeam_utils::thread;
+
+use controller::{
+    km_http_server::KMHttpServer,
+    km_utils::{
+        KMConfig,
+        SgxEthereumSigner,
+        PrivateKeyEthereumSigner
+    },
+};
+use common_u::custom_errors::{ControllerError, EnclaveError, VerifierError, ConfigError};
+use esgx::general::ENCLAVE_DIR;
+use esgx::equote;
+use controller;
+use enigma_crypto::EcdsaSign;
+use enigma_tools_u::{esgx::general::storage_dir, web3_utils::enigma_contract::EnigmaContract};
+use controller::km_controller::KMController;
+use epochs::epoch_trigger::EthereumTracker;
+
+pub fn create_signer(eid: sgx_enclave_id_t, with_private_key: bool, private_key: &[u8]) -> Box<dyn EcdsaSign + Send + Sync> {
+    if with_private_key {
+        let mut pk_32 = [0u8; 32];
+        pk_32.copy_from_slice(private_key);
+        let signer = Box::new(PrivateKeyEthereumSigner::new(pk_32)) as Box<dyn EcdsaSign + Send + Sync>;
+        signer
+    } else {
+        let signer = Box::new(SgxEthereumSigner::new(eid)) as Box<dyn EcdsaSign + Send + Sync>;
+        signer
+    }
+}
+
+fn get_signing_address(eid: sgx_enclave_id_t) -> Result<String, EnclaveError> {
+    Ok(equote::get_register_signing_address(eid).or(Err(EnclaveError::Unspecified))?.to_hex())
+}
+
+fn get_ethereum_address(eid: sgx_enclave_id_t, config: KMConfig) -> Result<String, EnclaveError> {
+    if config.with_private_key {
+        return Ok(config.account_address);
+    }
+    Ok(equote::get_ethereum_address(eid).or(Err(EnclaveError::Unspecified))?.to_hex())
+}
+
+#[logfn(INFO)]
+pub fn start(eid: sgx_enclave_id_t) -> Result<(), ControllerError> {
+    let opt = controller::options::Opt::from_args();
+    let config = KMConfig::load_config(opt.principal_config.as_str())?;
+
+    let mut path = storage_dir(ENCLAVE_DIR).or(Err(ControllerError::VerifierError(VerifierError::CreateErr)))?;
+    let ethereum_address = get_ethereum_address(eid, config.clone()).map_err(ControllerError::EnclaveError)?;
+
+    if opt.sign_address {
+        path.push("principal-sign-addr.txt");
+        let mut file = File::create(&path).or( Err(ControllerError::VerifierError(VerifierError::CreateErr)))?;
+
+        let signing_address = get_signing_address(eid).map_err(ControllerError::EnclaveError)?;
+        let prefixed_signing_address = format!("0x{}", signing_address);
+
+        file.write_all(prefixed_signing_address.as_bytes()).or(Err(ControllerError::VerifierError(VerifierError::WriteErr)))?;
+        println!("Wrote signing address: {:?} in file: {:?}", prefixed_signing_address, path);
+
+        path.pop();
+        path.push("ethereum-account-addr.txt");
+        let mut file = File::create(&path).or( Err(ControllerError::VerifierError(VerifierError::CreateErr)))?;
+
+        let prefixed_ethereum_address = format!("0x{}", ethereum_address);
+
+        file.write_all(prefixed_ethereum_address.as_bytes()).or( Err(ControllerError::VerifierError(VerifierError::WriteErr)))?;
+        println!("Wrote ethereum address: {:?} in file: {:?}", prefixed_ethereum_address, path);
+
+    } else {
+        let private_key = config.private_key.from_hex().or( Err(ConfigError::CouldntParse))?;
+        let ethereum_signer = create_signer(eid, config.with_private_key, &private_key);
+
+        let contract_address = opt.contract_address.unwrap_or_else(|| config.enigma_contract_address.clone());
+        let enigma_contract = EnigmaContract::from_deployed(
+            &contract_address,
+            Path::new(&config.enigma_contract_path),
+            Some(&ethereum_address),
+            config.chain_id,
+            &config.url,
+            ethereum_signer,
+        ).map_err(ControllerError::Other)?;
+
+        let controller = KMController::new(eid, path.clone(), enigma_contract, config)?;
+        println!("Connected to the Enigma contract: {:?} with account: {:?}", &contract_address, controller.contract.get_km_account());
+
+        run(opt.reset_epoch_state, controller)?;
+    }
+    Ok(())
+}
+
+#[logfn(INFO)]
+fn run(reset_epoch: bool, controller: KMController) -> Result<(), ControllerError> {
+    controller.verify_identity_or_register()?;
+    if reset_epoch {
+        controller.epoch_verifier.reset().map_err( ControllerError::VerifierError)?;
+    }
+
+    let port = controller.config.http_port;
+    let controller1 = Arc::new(controller);
+    let controller2 = Arc::clone(&controller1);
+    thread::scope(|s| {
+        s.spawn(|_| {
+            let server = KMHttpServer::new(controller1, port);
+            server.start();
+        });
+        s.spawn(|_| {
+            controller2.epoch_trigger(
+                controller2.config.epoch_size,
+                controller2.config.polling_interval,
+                 controller2.config.confirmations as usize,
+            );
+        });
+    }).or(Err(ControllerError::Other(failure::format_err!("One of the threads crashed :/"))))
+}
diff --git a/enigma-principal/app/src/boot_network/config.json b/enigma-principal/app/src/controller/config.json
similarity index 86%
rename from enigma-principal/app/src/boot_network/config.json
rename to enigma-principal/app/src/controller/config.json
index b00b3888..05b3fabe 100644
--- a/enigma-principal/app/src/boot_network/config.json
+++ b/enigma-principal/app/src/controller/config.json
@@ -1,15 +1,12 @@
 {
     "enigma_contract_path": "../app/tests/principal_node/contracts/IEnigma.json",
-    "enigma_contract_remote_path": "",
     "enigma_contract_address": "cfeD223fAb2A41b5a5a5F9AaAe2D1e882cb6Fe2D",
     "account_address": "6330a553fc93768f612722bb8c2ec78ac90b3bbc",
-    "test_net": true,
     "with_private_key": false,
     "private_key": "",
     "url": "http://localhost:9545",
     "epoch_size": 10,
     "polling_interval": 1,
-    "max_epochs": 0,
     "spid": "B0335FD3BC1CCA8F804EB98A6420592D",
     "attestation_service_url": "https://sgx.enigma.co/api",
     "http_port": 3040,
diff --git a/enigma-principal/app/src/controller/km_controller.rs b/enigma-principal/app/src/controller/km_controller.rs
new file mode 100644
index 00000000..5e109160
--- /dev/null
+++ b/enigma-principal/app/src/controller/km_controller.rs
@@ -0,0 +1,407 @@
+use std::path::PathBuf;
+use std::clone::Clone;
+
+use ethabi::{Log, RawLog};
+use sgx_types::sgx_enclave_id_t;
+use web3::types::{H256, TransactionReceipt, U256, H160};
+use rustc_hex::ToHex;
+
+use enigma_tools_m::keeper_types::InputWorkerParams;
+use enigma_tools_u::web3_utils::enigma_contract::{ContractFuncs, ContractQueries, EnigmaContract};
+use enigma_tools_u::common_u::errors::Web3Error;
+use enigma_tools_u::esgx::equote::retry_quote;
+use enigma_tools_u::attestation_service::service::AttestationService;
+
+use controller::km_utils::KMConfig;
+use epochs::epoch_keeper_u::set_or_verify_worker_params;
+use esgx::equote;
+use common_u::custom_errors::{ControllerError, EnclaveError, EpochError};
+use epochs::verifier::EpochVerifier;
+use epochs::epoch_types::{SignedEpoch, WORKER_PARAMETERIZED_EVENT, WorkersParameterizedEvent};
+
+lazy_static!{ pub static ref GAS_LIMIT: U256 = 5_999_999.into(); }
+
+
+pub struct KMController {
+    pub contract: EnigmaContract,
+    pub epoch_verifier: EpochVerifier,
+    pub eid: sgx_enclave_id_t,
+    pub config: KMConfig,
+}
+
+impl KMController {
+    pub fn new(eid: sgx_enclave_id_t, dir_path: PathBuf, contract: EnigmaContract, config: KMConfig) -> Result<KMController, ControllerError> {
+        let epoch_verifier = EpochVerifier::new(dir_path).map_err(ControllerError::VerifierError)?;
+        let controller = Self { contract, epoch_verifier, eid, config };
+        controller.verify_worker_params()?;
+        Ok(controller)
+    }
+
+    /// Find confirmed `EpochState` by block number
+    ///
+    /// # Arguments
+    /// * `block_number` - A block number in the desired epoch
+    pub fn find_epoch(&self, block_number: U256) -> Result<SignedEpoch, ControllerError> {
+        self.epoch_verifier.get_confirmed_by_block_number(block_number).map_err(ControllerError::VerifierError)
+    }
+
+    /// Find the last confirmed `EpochState`
+    pub fn find_last_epoch(&self) -> Result<SignedEpoch, ControllerError> {
+        if self.epoch_verifier.is_last_unconfirmed().map_err(ControllerError::VerifierError)? {
+            return Err(ControllerError::EpochError(EpochError::UnconfirmedState));
+        }
+        self.epoch_verifier.last(true).map_err(ControllerError::VerifierError)
+    }
+
+    #[logfn(DEBUG)]
+    fn parse_worker_parameterized(&self, receipt: &TransactionReceipt) -> Result<Log, ControllerError> {
+        let log = receipt.logs.get(0).ok_or(Web3Error {
+            message: format!("A connection error occurred with the Smart Contract- workerParams did not return a log response" ),
+        })?.clone();
+        let raw_log = RawLog { topics: log.topics, data: log.data.0 };
+        let event = WorkersParameterizedEvent::new();
+        let result = event.0.parse_log(raw_log).map_err(|err|
+            Web3Error {
+                message: format!("Unable to parse {} event: {:?}", WORKER_PARAMETERIZED_EVENT, err),
+            })?;
+        debug!("Parsed the {} event: {:?}", WORKER_PARAMETERIZED_EVENT, result);
+        Ok(result)
+    }
+
+    #[logfn(DEBUG)]
+    fn verify_worker_params(&self) -> Result<(), ControllerError> {
+        for signed_epoch in self.epoch_verifier
+            .get_all_confirmed()
+            .map_err(ControllerError::VerifierError)?
+            .iter()
+            {
+            // if the epoch is confirmed by the Enigma Contract
+            if signed_epoch.confirmed_state.is_some() {
+                // Get the km_block_number which indicates where to take the list of active workers from
+                let km_block_number = signed_epoch.get_km_block_num();
+                let (workers, stakes) = self.contract.get_active_workers(km_block_number).map_err(ControllerError::Other)?;
+                let worker_params = InputWorkerParams { km_block_number, workers, stakes };
+                set_or_verify_worker_params(self.eid, &worker_params, Some(signed_epoch.clone())).map_err(ControllerError::EnclaveError)?;
+            }
+        }
+        Ok(())
+    }
+
+    pub fn get_signing_address(&self) -> Result<H160, ControllerError> {
+        Ok(equote::get_register_signing_address(self.eid).
+            or( Err(ControllerError::EnclaveError(EnclaveError::Unspecified)))?.into())
+    }
+
+//    pub fn get_ethereum_address(&self) -> Result<H160, Error> {
+//        if self.config.with_private_key {
+//            return Ok(H160::from_slice(&self.config.account_address.clone().from_hex()?));
+//        }
+//        Ok(equote::get_ethereum_address(self.eid)?.into())
+//    }
+
+
+    #[logfn(DEBUG)]
+    fn register(&self) -> Result<H256, ControllerError> {
+        let signing_address = self.get_signing_address()?;
+        let mode = option_env!("SGX_MODE").unwrap_or_default();
+        let mut enc_quote = retry_quote(self.eid, &self.config.spid, 18).or(Err(ControllerError::QuoteErr))?;
+
+        let mut signature = String::new();
+        if mode == "HW" {
+            // Hardware Mode
+            println!("Hardware mode");
+            let attestation = AttestationService::new_with_retries(&self.config.attestation_service_url, self.config.attestation_retries);
+            let response = attestation.get_report(enc_quote).or(Err(ControllerError::QuoteErr))?;
+            enc_quote = response.result.report_string;
+            signature = response.result.signature;
+        }
+        // the register method on the Enigma contract expects a staking address
+        // since it's suited for the workers as well.
+        // staking is irrelevant for the KM and therefore we are sending an empty address
+        let staking_address = H160::zero();
+        println!("Registering");
+        let receipt = self.contract.register(
+            staking_address,
+            signing_address,
+            enc_quote,
+            signature,
+            *GAS_LIMIT,
+            self.config.confirmations as usize,
+        ).map_err(ControllerError::Other)?;
+        Ok(receipt.transaction_hash)
+    }
+
+    /// Verifies whether the worker is registered in the Enigma contract.
+    /// If not, create a `register` transaction.
+    #[logfn(DEBUG)]
+    pub fn verify_identity_or_register(&self) -> Result<Option<H256>, ControllerError> {
+        let signing_address = self.get_signing_address()?;
+        let registered_signing_address = self.contract.get_signing_address().map_err(ControllerError::Other)?;
+        if signing_address == registered_signing_address {
+            debug!("Already registered with enigma signing address {:?}", registered_signing_address);
+            Ok(None)
+        } else {
+            let tx = self.register()?;
+            debug!("Registered by transaction {:?}", tx);
+            Ok(Some(tx))
+        }
+    }
+
+    /// Seal the epoch data in the enclave, get a random seed and submit to the Enigma contract
+    /// The enclave signs on:
+    ///  - The worker parameters active at the specified block number
+    ///  - The random seed generated by the enclave
+    ///  - The sealed nonce incremented for each random seed generated
+    /// The Enigma contract verifies the signature. It will revert if:
+    ///  - The nonce incremented by the contract does not match the nonce incremented by the enclave
+    ///    this prevents the Principal node operator from updating the seed without publishing
+    ///    a transaction.
+    ///  - The list of active worker parameters does not match the sealed epoch data. This prevents
+    ///    the enclave operator from tempering with worker parameters in order to modify the
+    ///    result of the worker selection.
+    ///
+    /// # Arguments
+    ///
+    /// * `block_number` - The block number marking the active worker list
+    /// * `confirmations` - The number of blocks required to confirm the `setWorkersParams` transaction
+    pub fn set_worker_params(&self, block_number: U256,  confirmations: usize) -> Result<H256, ControllerError> {
+        self.set_worker_params_internal(block_number, confirmations, None)
+    }
+
+    #[logfn(DEBUG)]
+    fn set_worker_params_internal(&self, km_block_number: U256, confirmations: usize, epoch_state: Option<SignedEpoch>) -> Result<H256, ControllerError> {
+        let (workers, stakes) = self.contract.get_active_workers(km_block_number).map_err(ControllerError::Other)?;
+        let worker_params = InputWorkerParams { km_block_number, workers, stakes };
+        let mut epoch = set_or_verify_worker_params(self.eid, &worker_params, epoch_state).map_err(ControllerError::EnclaveError)?;
+
+        debug!("Storing unconfirmed EpochState: {:?}", epoch);
+        self.epoch_verifier.append_unconfirmed(epoch.clone()).map_err(ControllerError::VerifierError)?;
+
+        debug!("Waiting for setWorkerParams({:?}, {:?}, {:?})", km_block_number, epoch.get_seed(), epoch.get_sig());
+        let receipt = self.contract
+            .set_workers_params(km_block_number, epoch.get_seed(), epoch.get_sig(), *GAS_LIMIT, confirmations)
+            .map_err(ControllerError::Other)?;
+        debug!("Got the receipt: {:?}", receipt);
+
+        let log = self.parse_worker_parameterized(&receipt)?;
+        match log.params.into_iter().find(|x| x.name == "firstBlockNumber") {
+            Some(param) => {
+                let ether_block_number = param.value.to_uint().unwrap();
+                if ether_block_number < km_block_number {
+                    Err(Web3Error { message: "The block number given by the Enigma Contract is smaller than the one defined by the KM".to_string() })?;
+                }
+                self.confirm_epoch(&mut epoch, ether_block_number, worker_params)?;
+                debug!("Storing confirmed epoch state: {:?}", epoch);
+
+                self.epoch_verifier.confirm_last(epoch).map_err(ControllerError::VerifierError)?;
+                Ok(receipt.transaction_hash)
+            }
+            None => Err(Web3Error { message: "firstBlockNumber not found in receipt log".to_string() })?,
+        }
+    }
+
+    /// Build a local mapping of smart contract address => selected worker for the epoch
+    ///
+    /// # Arguments
+    ///
+    /// * `epoch_state` - The mutable `EpochState` to be confirmed
+    /// * `worker_params` - The `InputWorkerParams` used to run the worker selection algorithm
+    #[logfn(DEBUG)]
+    pub fn confirm_epoch(&self, epoch_state: &mut SignedEpoch, ether_block_number: U256, worker_params: InputWorkerParams) -> Result<(), ControllerError> {
+        let sc_addresses = self.contract.get_all_secret_contract_addresses()
+            .map_err(ControllerError::Other)?;
+
+        debug!("The secret contract addresses: {:?}",
+               sc_addresses.iter().map(|item| {item.to_hex()}).collect::<Vec<String>>());
+        epoch_state.confirm(ether_block_number, &worker_params, sc_addresses);
+        Ok(())
+    }
+}
+
+//////////////////////// TESTS  /////////////////////////////////////////
+
+#[cfg(test)]
+pub mod test {
+    extern crate tempfile;
+    use std::collections::HashMap;
+    use std::path::Path;
+    use self::tempfile::tempdir;
+    use web3::futures::Future;
+    use web3::types::{Bytes, H160};
+    use enigma_types::Hash256;
+    use controller::km_utils::{SgxEthereumSigner};
+    use enigma_crypto::EcdsaSign;
+    use esgx::general::init_enclave_wrapper;
+    use epochs::epoch_types::ConfirmedEpochState;
+    use super::*;
+    use common_u::custom_errors::ConfigError;
+    use enigma_tools_u::common_u::errors::Web3Error;
+
+    #[logfn(DEBUG)]
+    pub fn get_config() -> Result<KMConfig, ConfigError> {
+        let config_path = "../app/tests/principal_node/config/principal_test_config.json";
+        let config = KMConfig::load_config(config_path)?;
+        Ok(config)
+    }
+
+    pub fn init_no_deploy(eid: u64) -> Result<KMController, ControllerError> {
+        let config = get_config().map_err(ControllerError::ConfigError)?;
+        let ethereum_signer = Box::new(SgxEthereumSigner::new(eid)) as Box<dyn EcdsaSign + Send + Sync>;
+        let contract = EnigmaContract::from_deployed(
+            &config.enigma_contract_address,
+            Path::new(&config.enigma_contract_path),
+            Some(&config.account_address),
+            config.chain_id,
+            &config.url,
+            ethereum_signer,
+        ).or( Err(ControllerError::ContractError(
+            Web3Error{message: String::from("An error occurred while trying to deploy the contract")})))?;
+       let path = tempdir().unwrap().into_path();
+       KMController::new(eid, path, contract, config)
+    }
+
+    #[test]
+    #[ignore]
+    fn test_set_worker_params() {
+        let enclave = init_enclave_wrapper().unwrap();
+        let eid = enclave.geteid();
+        let controller = init_no_deploy(eid).unwrap();
+        controller.verify_identity_or_register().unwrap();
+
+        let block_number = controller.contract.web3.eth().block_number().wait().unwrap();
+        controller.epoch_verifier.reset().unwrap();
+        controller.set_worker_params(block_number,  0).unwrap();
+    }
+
+    pub const WORKER_SIGN_ADDRESS: [u8; 20] =
+        [95, 53, 26, 193, 96, 206, 55, 206, 15, 120, 191, 101, 13, 44, 28, 237, 80, 151, 54, 182];
+
+    pub fn setup_epoch_storage_dir() -> PathBuf {
+        let tempdir = tempfile::tempdir().unwrap();
+        let temp_path = tempdir.into_path();
+        println!("path is: {:?}", temp_path);
+        temp_path
+    }
+
+    // TODO: The two tests below require the Enigma contract to be deployed
+    /// Not a standalone unit test, must be coordinated with the Enigma Contract tests
+//    #[test]
+//    #[ignore]
+//    fn test_set_worker_params() {
+//        let tempdir = tempfile::tempdir().unwrap();
+//        let gas_limit: U256 = 5999999.into();
+//        let enclave = init_enclave_wrapper().unwrap();
+//        let eid = enclave.geteid();
+//        let principal = init_no_deploy(eid).unwrap();
+//        principal.verify_identity_or_register(gas_limit).unwrap();
+//
+//        let block_number = principal.get_block_number().unwrap();
+//        let eid_safe = eid;
+//        let epoch_provider = KMController::new(eid_safe, tempdir.into_path(), principal.contract.clone()).unwrap();
+//        epoch_provider.epoch_state_manager.reset().unwrap();
+//        epoch_provider.set_worker_params(block_number, gas_limit, 0).unwrap();
+//    }
+
+    /// This test is more like a system-test than a unit-test.
+    /// It is only dependent on an ethereum node running under the NODE_URL evn var or the default localhost:8545
+    /// First it deploys all the contracts related (EnigmaToken, Enigma) and runs miner to simulate blocks.
+    /// Second, it spawns a background thread to poll for events and searchses for the WorkersParameterized event.
+    /// Then, the principal register (full process including quote) and then,
+    ///  starts watching blocks and emits random with WorkersParameterized event.
+    /// The testing is looking for at least 2 emmits of the WorkersParameterized event and compares the event triggerd
+    /// If the event name is different or if it takes more than 30 seconds then the test will fail.
+//    #[test]
+//    #[ignore]
+//    fn test_full_principal_logic() {
+//        let controller = init_no_deploy(eid).unwrap();
+//        let account = controller.get_account_address();
+//
+//        let contract = &controller.contract;
+//        thread::scope(|s| {
+//            // run simulated miner
+//            s.spawn(|_| {
+//                let interval = 1;
+//                deploy_scripts::forward_blocks(&controller.contract.web3, interval, account).unwrap();
+//            });
+//            s.spawn(|_| {
+//                let event = WorkersParameterizedEvent::new();
+//                let event_sig = event.0.signature();
+//                let filter = FilterBuilder::default()
+//                    .address(vec![contract.address()])
+//                    .topics(Some(vec![event_sig.into()]), None, None, None)
+//                    .build();
+//
+//                let event_future = contract
+//                    .web3
+//                    .eth_filter()
+//                    .create_logs_filter(filter)
+//                    .then(|filter| {
+//                        filter.unwrap().stream(time::Duration::from_secs(1)).for_each(|log| {
+//                            println!("Got {} log: {:?}", WORKER_PARAMETERIZED_EVENT, log);
+//                            Ok(())
+//                        })
+//                    })
+//                    .map_err(|err| eprintln!("Unable to process WorkersParameterized log: {:?}", err));
+//                event_future.wait().unwrap();
+//            });
+//            s.spawn(|_| {
+//                // run principal
+//                controller.run(tempdir.into_path(), true).unwrap();
+//            });
+//        });
+//    }
+
+    #[test]
+    fn test_store_epoch_state() {
+        let path = setup_epoch_storage_dir();
+        let epoch_manager_calculated = EpochVerifier::new(path.clone()).unwrap();
+
+        let mut selected_workers: HashMap<Hash256, H160> = HashMap::new();
+        let mock_address = [1u8; 32];
+        selected_workers.insert(Hash256::from(mock_address), H160(WORKER_SIGN_ADDRESS));
+        let ether_block_number = U256::from(3);
+        let confirmed_state = Some(ConfirmedEpochState { selected_workers, ether_block_number });
+
+        let seed = U256::from(1);
+        let mock_sig = [1u8; 65];
+        let sig = Bytes::from(mock_sig.to_vec());
+        let nonce = U256::from(0);
+        let km_block_number = U256::from(2);
+
+        let mut epoch = SignedEpoch::new(seed, sig, nonce, km_block_number);
+        epoch.confirmed_state = confirmed_state;
+        epoch_manager_calculated.append_unconfirmed(epoch.clone()).unwrap();
+
+        let epoch_manager_accepted = EpochVerifier::new(path).unwrap();
+        assert_eq!(format!("{:?}", epoch_manager_accepted.epoch_list.lock().unwrap().iter().last().unwrap()), format!("{:?}", epoch));
+    }
+
+    #[test]
+    fn test_store_and_reset_epoch_state() {
+        let path = setup_epoch_storage_dir();
+        let epoch_manager_calculated = EpochVerifier::new(path.clone()).unwrap();
+
+        let mut selected_workers: HashMap<Hash256, H160> = HashMap::new();
+        let mock_address = [1u8; 32];
+        selected_workers.insert(Hash256::from(mock_address), H160(WORKER_SIGN_ADDRESS));
+        let ether_block_number = U256::from(4);
+        let confirmed_state = Some(ConfirmedEpochState { selected_workers, ether_block_number });
+
+        let seed = U256::from(1);
+        let mock_sig = [1u8; 65];
+        let sig = Bytes::from(mock_sig.to_vec());
+        let nonce = U256::from(0);
+        let km_block_number = U256::from(4);
+
+        let mut epoch = SignedEpoch::new(seed, sig, nonce, km_block_number);
+        epoch.confirmed_state = confirmed_state;
+        epoch_manager_calculated.append_unconfirmed(epoch).unwrap();
+
+        epoch_manager_calculated.reset().unwrap();
+        let epoch_manager_accepted = EpochVerifier::new(path).unwrap();
+
+        assert!(epoch_manager_accepted.epoch_list.lock().unwrap().is_empty());
+
+
+    }
+}
diff --git a/enigma-principal/app/src/boot_network/keys_provider_http.rs b/enigma-principal/app/src/controller/km_http_server.rs
similarity index 50%
rename from enigma-principal/app/src/boot_network/keys_provider_http.rs
rename to enigma-principal/app/src/controller/km_http_server.rs
index b3a0b3d7..556a0399 100644
--- a/enigma-principal/app/src/boot_network/keys_provider_http.rs
+++ b/enigma-principal/app/src/controller/km_http_server.rs
@@ -1,184 +1,154 @@
-use std::{convert::TryInto, sync::Arc};
+use std::sync::Arc;
 
-use enigma_tools_m::{
-    primitives::km_primitives::PrincipalMessage,
-    utils::EthereumAddress,
-};
-use failure::Error;
 use jsonrpc_http_server::{
     jsonrpc_core::{Error as ServerError, ErrorCode, IoHandler, Params, Value},
     ServerBuilder,
 };
-use rustc_hex::{FromHex, ToHex};
 use serde::{Deserialize, Serialize};
+use web3::types::{U256, H160};
 
+use enigma_tools_m::{
+    primitives::km_primitives::PrincipalMessage,
+    utils::EthereumAddress,
+};
 use enigma_crypto::KeyPair;
-use enigma_types::{ContractAddress, EnclaveReturn};
+use enigma_types::{EnclaveReturn, Hash256};
 use enigma_tools_u::web3_utils::enigma_contract::ContractQueries;
-use epoch_u::{epoch_provider::EpochProvider, epoch_types::EpochState};
-use esgx::keys_keeper_u::get_enc_state_keys;
+
+use controller::km_controller::KMController;
+use epochs::epoch_types::SignedEpoch;
+use state_keys::keys_keeper_u::get_enc_state_keys;
 use esgx;
-use common_u::errors::{RequestValueErr, EnclaveFailError, EpochStateTransitionErr, JSON_RPC_ERROR_ILLEGAL_STATE, JSON_RPC_ERROR_WORKER_NOT_AUTHORIZED};
-use web3::types::{U256, H160};
+use common_u::errors::JSON_RPC_ERROR_WORKER_NOT_AUTHORIZED;
+use common_u::custom_errors::{HTTPServerError, ControllerError, EnclaveError};
 
 
 const METHOD_GET_STATE_KEYS: &str = "getStateKeys";
 const METHOD_GET_HEALTH_CHECK: &str = "getHealthCheck";
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct StringWrapper(pub String);
-
-impl TryInto<Vec<u8>> for StringWrapper {
-    type Error = Error;
-
-    fn try_into(self) -> Result<Vec<u8>, Self::Error> { Ok(self.0.from_hex()?) }
-}
-
-impl TryInto<[u8; 65]> for StringWrapper {
-    type Error = Error;
-
-    fn try_into(self) -> Result<[u8; 65], Self::Error> {
-        let bytes = self.0.from_hex()?;
-        if bytes.len() != 65 {
-            return Err(RequestValueErr {
-                request: METHOD_GET_STATE_KEYS.to_string(),
-                message: format!("Cannot create a 65 bytes array from a {} size slice.", bytes.len()),
-            }.into());
-        }
-        let mut slice: [u8; 65] = [0; 65];
-        slice.copy_from_slice(&bytes);
-        Ok(slice)
-    }
-}
-
-impl TryInto<U256> for StringWrapper {
-    type Error = Error;
-
-    fn try_into(self) -> Result<U256, Self::Error> {
-        let result = U256::from_dec_str(&self.0);
-        if let Ok(v) = result {
-            Ok(v)
-        } else {
-            Err(RequestValueErr {
-                request: METHOD_GET_STATE_KEYS.to_string(),
-                message: "Cannot create a number.".to_string(),
-            }.into())
-        }
-    }
-}
-
 #[derive(Deserialize, Debug, Clone)]
 pub struct StateKeyRequest {
-    pub data: StringWrapper,
-    pub sig: StringWrapper,
-    pub block_number: Option<StringWrapper>,
-    pub addresses: Option<Vec<String>>,
+    #[serde(with = "hex_serde")]
+    data: Vec<u8>,
+    #[serde(with = "hex_serde")]
+    sig: Vec<u8>,
+    block_number: Option<U256>,
+    addresses: Option<Vec<Hash256>>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct StateKeyResponse {
-    pub data: StringWrapper,
-    pub sig: StringWrapper,
+    #[serde(with = "hex_serde")]
+    data: Vec<u8>,
+    #[serde(with = "hex_serde")]
+    sig: Vec<u8>,
 }
 
-impl<H: ToHex> From<H> for StringWrapper {
-    fn from(bytes: H) -> Self { StringWrapper(bytes.to_hex()) }
+impl StateKeyResponse {
+    pub fn new(data: Vec<u8>, sig: Vec<u8>) -> Self {
+        StateKeyResponse{data, sig}
+    }
 }
 
-pub struct PrincipalHttpServer {
-    epoch_provider: Arc<EpochProvider>,
+pub struct KMHttpServer {
+    controller: Arc<KMController>,
     pub port: u16,
 }
 
 impl StateKeyRequest {
-    pub fn get_data(&self) -> Result<Vec<u8>, Error> { Ok(self.data.0.from_hex()?) }
+    pub fn new(data: Vec<u8>, sig: Vec<u8>, block_number: Option<U256>, addresses: Option<Vec<Hash256>>) -> Self {
+        StateKeyRequest{data, sig, block_number, addresses}
+    }
 
-    pub fn get_sig(&self) -> Result<[u8; 65], Error> {
-        self.sig.clone().try_into()
+    pub fn get_data(&self) -> Vec<u8> { self.data.clone() }
+
+    pub fn get_sig(&self) -> Result<[u8; 65], HTTPServerError> {
+        let mut sig = [0u8; 65];
+        if sig.len() != self.sig.len() {
+            return Err(HTTPServerError::BadSigLen(self.sig.len()))
+        }
+        sig.copy_from_slice(&self.sig);
+        Ok(sig)
     }
 }
 
-impl PrincipalHttpServer {
-    pub fn new(epoch_provider: Arc<EpochProvider>, port: u16) -> PrincipalHttpServer { PrincipalHttpServer { epoch_provider, port } }
+impl KMHttpServer {
+    pub fn new(controller: Arc<KMController>, port: u16) -> KMHttpServer { KMHttpServer { controller, port } }
 
     #[logfn(DEBUG)]
-    fn find_epoch_contract_addresses(request: &StateKeyRequest, msg: &PrincipalMessage, epoch_state: &EpochState) -> Result<Vec<ContractAddress>, Error> {
-        let image = msg.to_sign()?;
+    fn find_epoch_contract_addresses(request: &StateKeyRequest, msg: &PrincipalMessage, epoch_state: &SignedEpoch) -> Result<Vec<Hash256>, HTTPServerError> {
+        let image = msg.to_sign().or( Err(HTTPServerError::InvalidMessage))?;
         let sig = request.get_sig()?;
-        let worker = KeyPair::recover(&image, sig)?.address();
+        let worker = KeyPair::recover(&image, sig).or( Err(HTTPServerError::KeyRecoveryErr))?.address();
         trace!("Searching contract addresses for recovered worker: {:?}", worker.to_vec());
-        let addrs = epoch_state.get_contract_addresses(&worker.into())?;
-        Ok(addrs)
+        Ok(epoch_state.get_contract_addresses(&worker.into())?)
     }
 
     #[logfn(DEBUG)]
-    pub fn get_state_keys(epoch_provider: &EpochProvider, request: StateKeyRequest) -> Result<Value, Error> {
-        let epoch_state = match request.block_number.clone() {
-            Some(block_number) => epoch_provider.find_epoch(block_number.try_into()?)?,
-            None => epoch_provider.find_last_epoch()?,
+    pub fn get_state_keys(&self, request: StateKeyRequest) -> Result<Value, ControllerError> {
+        let signed_epoch = match request.block_number {
+            Some(block_number) => self.controller.find_epoch(block_number)?,
+            None => self.controller.find_last_epoch()?,
         };
-        let addresses = &request.addresses;
-        let addrs: Vec<ContractAddress> = {
-            if let Some(addrs) = addresses {
-                let res: Result<Vec<ContractAddress>, _>  = addrs.iter().map(|item| ContractAddress::from_hex(item)).collect();
-                res?
-            }
-            else{
-                let msg = PrincipalMessage::from_message(&request.get_data()?)?;
-                Self::find_epoch_contract_addresses(&request, &msg, &epoch_state)?
-            }
+        let addrs = match request.addresses.clone() {
+            Some(addrs) => addrs,
+            None => {
+                let msg = PrincipalMessage::from_message(&request.get_data())
+                    .or( Err(ControllerError::HTTPServerError(HTTPServerError::InvalidMessage)))?;
+                Self::find_epoch_contract_addresses(&request, &msg, &signed_epoch)?
+            },
         };
-        let response = get_enc_state_keys(*epoch_provider.eid, request, epoch_state.nonce, &addrs)?;
-        let response_data = serde_json::to_value(&response)?;
+        let response =
+            get_enc_state_keys(self.controller.eid, request, signed_epoch.get_nonce(), &addrs)
+                .map_err(ControllerError::EnclaveError)?;
+        let response_data = serde_json::to_value(&response)
+            .or( Err(ControllerError::HTTPServerError(HTTPServerError::InvalidMessage)))?;
         Ok(response_data)
     }
 
-    fn handle_error(internal_err: Error) -> ServerError {
-        if let Some(err) = internal_err.downcast_ref::<EnclaveFailError>() {
-            error!("{:?}", internal_err.as_fail());
-            let server_err = match &err.err {
-                EnclaveReturn::WorkerAuthError => {
-                    ServerError {
-                        code: ErrorCode::ServerError(JSON_RPC_ERROR_WORKER_NOT_AUTHORIZED),
-                        message: format!("Worker not authorized to request the keys: {:?}.", err),
-                        data: None,
-                    }
-                }
-                _ => {
-                    ServerError {
-                        code: ErrorCode::InternalError,
-                        message: format!("Internal error in enclave: {:?}", err),
-                        data: None,
-                    }
+    fn handle_error(internal_err: ControllerError) -> ServerError {
+        match internal_err {
+            ControllerError::EnclaveError(
+                EnclaveError::Failure {
+                    err: e @ EnclaveReturn::WorkerAuthError,
+                    ..
                 }
-            };
-            return server_err;
-        }
-        if let Some(err) = internal_err.downcast_ref::<EpochStateTransitionErr>() {
-            return ServerError {
-                code: ErrorCode::ServerError(JSON_RPC_ERROR_ILLEGAL_STATE),
-                message: format!("Illegal state: {} for this request. Try again later.", err.current_state),
+            ) => ServerError {
+                code: ErrorCode::ServerError(JSON_RPC_ERROR_WORKER_NOT_AUTHORIZED),
+                message: format!("Worker not authorized to request the keys: {:?}.", e),
+                data: None,
+            },
+            ControllerError::EnclaveError(
+                EnclaveError::Failure { err: e @ _, .. }
+            ) => ServerError {
+                code: ErrorCode::InternalError,
+                message: format!("Internal error in enclave: {:?}", e),
                 data: None,
-            };
+            },
+            ControllerError::EnclaveError(e @ _) => ServerError {
+                code: ErrorCode::InternalError,
+                message: format!("Internal error: {:?}", e),
+                data: None,
+            },
+            _ => ServerError {
+                code: ErrorCode::InternalError,
+                message: format!("Internal error: {:?}", internal_err),
+                data: None,
+            }
         }
-        return ServerError {
-            code: ErrorCode::InternalError,
-            message: format!("Internal error: {:?}", internal_err),
-            data: None,
-        };
     }
 
     /// This function is used to make sure the km is up and running.
     /// it can be requested via the jsonRPC server using the following command:
     /// curl -sb -o /dev/null -X POST -d '{"jsonrpc": "2.0", "id": "1", "method": "getHealthCheck", "params": []}' -H "Content-Type: application/json" 127.0.0.1:3040
-    pub fn health_check(epoch_provider: &EpochProvider) -> Value {
+    pub fn health_check(&self) -> Value {
         // Ethereum
-        let contract_signing_address = match epoch_provider.contract.get_signing_address() {
+        let contract_signing_address = match self.controller.contract.get_signing_address() {
             Ok(addr) => addr,
             Err(_) => return Value::Bool(false),
         };
         // Enclave
-        let enclave_signing_address: H160 = match esgx::equote::get_register_signing_address(*epoch_provider.eid) {
+        let enclave_signing_address: H160 = match esgx::equote::get_register_signing_address(self.controller.eid) {
             Ok(addr) => addr.into(),
             Err(_) => return Value::Bool(false),
         };
@@ -190,18 +160,18 @@ impl PrincipalHttpServer {
     /// Example:
     /// curl -X POST --data '{"jsonrpc": "2.0", "id": "1", "method": "getStateKeys", "params": ["84a46461746181a75265717565737493dc0020cca7cc937b64ccb8cccacca5cc8f03721bccb6ccbacccf5c78cccb235fccebcce0cce70b1bcc84cccdcc99541461cca0cc8edc002016367accacccb67a4a017ccc8dcca8ccabcc95682ccccb390863780f7114ccddcca0cca0cce0ccc55644ccc7ccc4dc0020ccb1cce9cc9324505bccd32dcca0cce1ccf85dcccf5e19cca0cc9dccb0481ecc8a15ccf62c41cceb320304cca8cce927a269649c1363ccb3301c101f33cce1cc9a0524a67072656669789e456e69676d61204d657373616765a67075626b6579dc0040cce5ccbe28cc9dcc9a2eccbd08ccc0457a5f16ccdfcc9fccdc256c5d5f6c3514cccdcc95ccb47c11ccc4cccd3e31ccf0cce4ccefccc83ccc80cce8121c3939ccbb2561cc80ccec48ccbecca8ccc569ccd2cca3ccda6bcce415ccfa20cc9bcc98ccda", "43f19586b0a0ae626b9418fe8355888013be1c9b4263a4b3a27953de641991e936ed6c4076a2a383b3b001936bf0eb6e23c78fbec1ee36f19c6a9d24d75e9e081c"]}' -H "Content-Type: application/json" http://127.0.0.1:3040/
     #[logfn(DEBUG)]
-    pub fn start(&self) {
+    pub fn start(self) {
+        let server1 = Arc::new(self);
+        let server2 = Arc::clone(&server1);
+        let port = server2.port;
         let mut io = IoHandler::default();
-        let epoch_provider = Arc::clone(&self.epoch_provider);
-        let port = self.port;
         io.add_method(METHOD_GET_STATE_KEYS, move |params: Params| {
             let request = params.parse::<StateKeyRequest>()?;
-            let body = Self::get_state_keys(&epoch_provider, request).map_err(Self::handle_error)?; // Not sure that this is the best idiom
+            let body = server1.get_state_keys(request).map_err(Self::handle_error)?; // Not sure that this is the best idiom
             Ok(body)
         });
-        let hc_epoch_provider = Arc::clone(&self.epoch_provider);
-        io.add_method(METHOD_GET_HEALTH_CHECK, move |_| {
-            let body = Self::health_check(&hc_epoch_provider);
+            io.add_method(METHOD_GET_HEALTH_CHECK, move |_| {
+            let body = server2.health_check();
             Ok(body)
         });
         let server =
@@ -218,17 +188,15 @@ mod test {
     extern crate jsonrpc_test as test;
 
     use std::collections::HashMap;
-    use std::thread;
 
     use rustc_hex::FromHex;
-    use serde_json::error::ErrorCode::EofWhileParsingObject;
     use web3::types::{H160, U256};
     use web3::types::Bytes;
 
-    use enigma_types::{ContractAddress, Hash256};
-    use epoch_u::epoch_types::ConfirmedEpochState;
-    use esgx::epoch_keeper_u::set_or_verify_worker_params;
-    use esgx::epoch_keeper_u::tests::get_worker_params;
+    use enigma_types::{Hash256};
+    use epochs::epoch_types::ConfirmedEpochState;
+    use epochs::epoch_keeper_u::set_or_verify_worker_params;
+    use epochs::epoch_keeper_u::tests::get_worker_params;
     use esgx::general::init_enclave_wrapper;
 
     use super::*;
@@ -254,14 +222,14 @@ mod test {
             io.add_method(METHOD_GET_STATE_KEYS, move |params: Params| {
                 let request = params.parse::<StateKeyRequest>().unwrap();
                 println!("Calling get_enc_state_keys");
-                let address = ContractAddress::from(REF_CONTRACT_ADDR);
-                let response = get_enc_state_keys(eid, request, epoch_state.nonce, &[address]).unwrap();
+                let address = Hash256::from(REF_CONTRACT_ADDR);
+                let response = get_enc_state_keys(eid, request, epoch_state.get_nonce(), &[address]).unwrap();
                 let response_data = serde_json::to_value(&response).unwrap();
                 Ok(response_data)
             });
             test::Rpc::from(io)
         };
-        for i in 0..5 {
+        for _ in 0..5 {
             let response = rpc.request(METHOD_GET_STATE_KEYS, &(REF_MSG, REF_SIG, Value::Null, Value::Null));
             assert!(response.contains(REF_RESPONSE));
         }
@@ -270,8 +238,8 @@ mod test {
 
     #[test]
     pub fn test_find_epoch_contract_addresses() {
-        let msg = REF_MSG.from_hex().unwrap();
-        let request = StateKeyRequest { data: StringWrapper(msg.to_hex()), sig: StringWrapper(REF_SIG.to_string()), block_number: None, addresses: None };
+        let data = REF_MSG.from_hex().unwrap();
+        let request = StateKeyRequest { data, sig: REF_SIG.from_hex().unwrap(), block_number: None, addresses: None };
         let address = Hash256::from(REF_CONTRACT_ADDR);
         let mut selected_workers: HashMap<Hash256, H160> = HashMap::new();
         selected_workers.insert(address, H160(REF_WORKER));
@@ -281,9 +249,10 @@ mod test {
         let sig = Bytes::from(REF_SIG.from_hex().unwrap());
         let nonce = U256::from(0);
         let km_block_number = U256::from(1);
-        let epoch_state = EpochState { seed, sig, nonce, km_block_number, confirmed_state };
-        let msg = PrincipalMessage::from_message(&request.get_data().unwrap()).unwrap();
-        let results = PrincipalHttpServer::find_epoch_contract_addresses(&request, &msg, &epoch_state).unwrap();
+        let mut epoch = SignedEpoch::new(seed, sig, nonce, km_block_number);
+        epoch.confirmed_state = confirmed_state;
+        let msg = PrincipalMessage::from_message(&request.get_data()).unwrap();
+        let results = KMHttpServer::find_epoch_contract_addresses(&request, &msg, &epoch).unwrap();
         assert_eq!(results, vec![address])
     }
 }
diff --git a/enigma-principal/app/src/controller/km_utils.rs b/enigma-principal/app/src/controller/km_utils.rs
new file mode 100644
index 00000000..4f7903a6
--- /dev/null
+++ b/enigma-principal/app/src/controller/km_utils.rs
@@ -0,0 +1,145 @@
+use std::{fs::File, io::prelude::*, str};
+
+use serde_derive::*;
+use serde_json;
+use sgx_types::sgx_enclave_id_t;
+use envy;
+use secp256k1::key::SecretKey;
+use secp256k1::Message;
+use secp256k1::Secp256k1;
+
+use enigma_crypto::EcdsaSign;
+
+use esgx;
+use common_u::custom_errors::ConfigError;
+
+pub struct SgxEthereumSigner {
+    eid: sgx_enclave_id_t,
+}
+
+impl SgxEthereumSigner {
+    pub fn new(eid: sgx_enclave_id_t) -> SgxEthereumSigner {
+        SgxEthereumSigner{ eid }
+    }
+}
+
+impl EcdsaSign for SgxEthereumSigner {
+    fn sign_hashed(&self, to_sign: &[u8; 32]) -> [u8; 65] {
+        match esgx::equote::sign_ethereum(self.eid, to_sign) {
+            Ok(sig) => sig,
+            Err(err) => {
+                panic!("Error signing data: {:?}", err);
+            }
+        }
+    }
+}
+
+pub struct PrivateKeyEthereumSigner {
+    private_key: [u8; 32]
+}
+
+impl PrivateKeyEthereumSigner {
+    pub fn new(private_key: [u8; 32]) -> PrivateKeyEthereumSigner {
+        PrivateKeyEthereumSigner{ private_key }
+    }
+}
+
+impl EcdsaSign for PrivateKeyEthereumSigner {
+    fn sign_hashed(&self, to_sign: &[u8; 32]) -> [u8; 65] {
+        let s = Secp256k1::signing_only();
+        let msg = Message::from_slice(to_sign).unwrap();
+        let key = SecretKey::from_slice(&self.private_key).unwrap();
+        let (v, sig_bytes) = s.sign_recoverable(&msg, &key).serialize_compact();
+
+        let mut sig_recoverable: [u8; 65] = [0u8; 65];
+        sig_recoverable[0..64].copy_from_slice(&sig_bytes);
+        sig_recoverable[64] = (v.to_i32() + 27) as u8;
+        sig_recoverable
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct KMConfig {
+    // Path to IEnigma.Json ** probably a good place to document that IEnigma.Json is used because parsing the entire Enigma.json will fail to due missing types
+    pub enigma_contract_path: String,
+    // Address of the deployed contract -- expected to be set externally
+    pub enigma_contract_address: String,
+    // Ethereum address of the *operating address* of the KM
+    pub account_address: String,
+    // Chain ID of the ethereum node we're working with
+    pub chain_id: u64,
+    // Flag whether we're using a predefined private key (true) or self-generated keys in SGX (false)
+    pub with_private_key: bool,
+    // Private key, as hex string (without "0x"). Only used if with_private_key is set to true
+    pub private_key: String,
+    // Uh
+    pub url: String,
+    // Length of epoch in blocks
+    pub epoch_size: usize,
+    // TODO: this
+    pub polling_interval: u64,
+    // TODO: this
+    pub spid: String,
+    // Address of SGX attestation proxy (enigma attestation service)
+    pub attestation_service_url: String,
+    // Number of retires before we give up on connection to attestation service?
+    pub attestation_retries: u32,
+    // JSON-RPC port. Usually 3040
+    pub http_port: u16,
+    // Number of confirmations on-chain before accepting a transaction as complete
+    pub confirmations: u64,
+}
+
+impl KMConfig {
+    // load json config into the struct
+    #[logfn(DEBUG)]
+    pub fn load_config(config_path: &str) -> Result<KMConfig, ConfigError> {
+        info!("loading Principal config");
+        // All configurations from env should be with the same names of the
+        // PrincipalConfig struct fields in uppercase letters
+        match envy::from_env::<KMConfig>() {
+            Ok(config) => Ok(config),
+            Err(_) => {
+                info!("trying to load from path: {:?}", config_path);
+                let mut f = File::open(config_path).or(Err(ConfigError::FileDoesntExist))?;
+
+                let mut contents = String::new();
+                f.read_to_string(&mut contents).or(Err(ConfigError::NotAString))?;
+
+                serde_json::from_str(&contents).or(Err(ConfigError::CouldntParse))
+            }
+        }
+    }
+}
+
+//////////////////////// TESTS  /////////////////////////////////////////
+
+#[cfg(test)]
+mod test {
+    extern crate tempfile;
+    use std::env;
+
+    use super::*;
+
+    #[test]
+    fn test_load_config_from_env() {
+        env::set_var("ENIGMA_CONTRACT_PATH", "../app/tests/principal_node/contracts/IEnigma.json");
+        env::set_var("ENIGMA_CONTRACT_ADDRESS", "59d3631c86BbE35EF041872d502F218A39FBa150");
+        env::set_var("ACCOUNT_ADDRESS","1df62f291b2e969fb0849d99d9ce41e2f137006e");
+        env::set_var("WITH_PRIVATE_KEY", "false");
+        env::set_var("PRIVATE_KEY", "");
+        env::set_var("URL", "http://172.20.0.2:9545");
+        env::set_var("EPOCH_SIZE", "10");
+        env::set_var("POLLING_INTERVAL", "1");
+        env::set_var("SPID", "B0335FD3BC1CCA8F804EB98A6420592D");
+        env::set_var("ATTESTATION_SERVICE_URL", "https://sgx.enigma.co/api");
+        env::set_var("ATTESTATION_RETRIES", "11");
+        env::set_var("HTTP_PORT","3040");
+        env::set_var("CONFIRMATIONS","0");
+        env::set_var("CHAIN_ID", "13");
+        let config = KMConfig::load_config("this is not a path").unwrap();
+        assert_eq!(config.polling_interval, 1);
+        assert_eq!(config.http_port, 3040);
+        assert_eq!(config.attestation_retries, 11);
+    }
+}
diff --git a/enigma-principal/app/src/controller/mod.rs b/enigma-principal/app/src/controller/mod.rs
new file mode 100644
index 00000000..a77ac4e7
--- /dev/null
+++ b/enigma-principal/app/src/controller/mod.rs
@@ -0,0 +1,5 @@
+pub mod km_controller;
+pub mod km_utils;
+pub mod boot_network;
+pub mod options;
+pub mod km_http_server;
\ No newline at end of file
diff --git a/enigma-principal/app/src/controller/options.rs b/enigma-principal/app/src/controller/options.rs
new file mode 100644
index 00000000..2d94456d
--- /dev/null
+++ b/enigma-principal/app/src/controller/options.rs
@@ -0,0 +1,35 @@
+use structopt::StructOpt;
+use url::Url;
+
+#[derive(StructOpt, Debug)]
+#[structopt(name = "basic")]
+pub struct Opt {
+
+    /// Output the signing address only
+    #[structopt(short = "w", long = "write-sign-address")]
+    pub sign_address: bool,
+
+    /// Optional: The Enigma contract address, use the config if not provided
+    #[structopt(short = "c", long = "contract-address")]
+    pub contract_address: Option<String>,
+
+    /// Optional: Reset the Epoch state in storage
+    #[structopt(short = "s", long = "reset-epoch-state")]
+    pub reset_epoch_state: bool,
+
+    /// Optional currently ignored: Deploy to a different network (not the localhost:port)
+    #[structopt(short = "n", long = "network", default_value = "http://.c")]
+    pub network: Url,
+
+    /// Optional: if --deploy then change default to custom config file
+    #[structopt(short = "y", long = "deploy-config", default_value = "../app/tests/principal_node/config/deploy_config.json")]
+    pub deploy_config: String,
+
+    /// Optional: change the default principal node config
+    #[structopt(short = "z", long = "principal-config", default_value = "../app/tests/principal_node/config/principal_test_config.json")]
+    pub principal_config: String,
+
+    /// Optional: change the minimum log level
+    #[structopt(short = "l", long = "log-level", default_value = "info")]
+    pub log_level: String,
+}
diff --git a/enigma-principal/app/src/epoch_u/epoch_provider.rs b/enigma-principal/app/src/epoch_u/epoch_provider.rs
deleted file mode 100644
index 8b3efb1f..00000000
--- a/enigma-principal/app/src/epoch_u/epoch_provider.rs
+++ /dev/null
@@ -1,445 +0,0 @@
-use std::{
-    fs::{self, File},
-    io::prelude::*,
-    ops::Deref,
-    path::PathBuf,
-    sync::{Arc, Mutex},
-};
-use std::clone::Clone;
-use std::sync::MutexGuard;
-
-use enigma_tools_m::keeper_types::{InputWorkerParams, EPOCH_CAP};
-use ethabi::{Log, RawLog};
-use failure::Error;
-use rmp_serde::{Deserializer, Serializer};
-use serde::{Deserialize, Serialize};
-use sgx_types::sgx_enclave_id_t;
-use web3::types::{H256, TransactionReceipt, U256};
-use rustc_hex::ToHex;
-
-use common_u::errors::{EpochStateIOErr, EpochStateTransitionErr, EpochStateUndefinedErr};
-use enigma_tools_u::web3_utils::enigma_contract::{ContractFuncs, ContractQueries, EnigmaContract};
-use enigma_tools_u::common_u::errors::Web3Error;
-use epoch_u::epoch_types::{ConfirmedEpochState, EPOCH_STATE_UNCONFIRMED, EpochState, WORKER_PARAMETERIZED_EVENT, WorkersParameterizedEvent};
-use esgx::epoch_keeper_u::set_or_verify_worker_params;
-use esgx::general::{EPOCH_DIR, EPOCH_FILE};
-use std::mem::replace;
-
-#[derive(Debug)]
-pub struct EpochStateManager {
-    pub epoch_state_list: Mutex<Vec<EpochState>>,
-    pub cap: usize,
-    pub state_path: PathBuf,
-}
-
-impl EpochStateManager {
-    pub fn new(mut state_path: PathBuf, cap: usize) -> Result<Self, Error> {
-        state_path.push(EPOCH_DIR);
-        if !state_path.exists() {
-            fs::create_dir_all(&state_path)?;
-        }
-        state_path.push(EPOCH_FILE);
-        Self::create_from_path(state_path, cap)
-    }
-
-    /// create an EpochStateManager object given the path from which we retrieve
-    /// the epoch states and the cap amount of epochs to handle backwards.
-    fn create_from_path(state_path: PathBuf, cap: usize) -> Result<EpochStateManager, Error> {
-        let epoch_states = match File::open(&state_path) {
-            Ok(mut f) => {
-                let mut buf = Vec::new();
-                f.read_to_end(&mut buf)?;
-                let mut des = Deserializer::new(&buf[..]);
-                let mut data: Vec<EpochState> = Deserialize::deserialize(&mut des).unwrap_or_default();
-                trace!("Found epoch state list");
-                if cap < data.len() {
-                    return Err(EpochStateIOErr { message: format!("The EpochState entries exceed the cap: {}", cap) }.into());
-                }
-                let mut capped_data = Vec::with_capacity(cap);
-                capped_data.append(&mut data);
-                capped_data
-            }
-            Err(_) => {
-                trace!("No existing epoch state");
-                vec![]
-            }
-        };
-        let epoch_state_list = Mutex::new(epoch_states);
-        Ok(EpochStateManager {epoch_state_list, cap, state_path})
-    }
-
-    /// Lock the `EpochState` list `Mutex`, or wait and retry
-    pub fn lock_guard_or_wait(&self) -> Result<MutexGuard<Vec<EpochState>>, Error> {
-        let guard = match self.epoch_state_list.lock() {
-            Ok(guard) => guard,
-            Err(err) => return Err(EpochStateIOErr {
-                message: format!("Cannot lock EpochState: {:?}", err),
-            }.into()),
-        };
-        Ok(guard)
-    }
-
-    /// Checks if the latest `EpochState` is unconfirmed
-    fn is_last_unconfirmed(&self) -> Result<bool, Error> {
-        let guard = self.lock_guard_or_wait()?;
-        if guard.is_empty() {
-            drop(guard);
-            return Ok(false);
-        }
-        let last = guard.iter().last();
-        //TODO: why borrow checker fails here
-//        mem::drop(guard);
-        let epoch_state = match last {
-            Some(epoch_state) => epoch_state,
-            None => {
-                return Err(EpochStateUndefinedErr {}.into());
-            }
-        };
-        let is_unconfirmed = match &epoch_state.confirmed_state {
-            Some(_) => false,
-            None => true,
-        };
-        Ok(is_unconfirmed)
-    }
-
-    /// Return a list of all confirmed `EpochState`
-    pub fn get_all_confirmed(&self) -> Result<Vec<EpochState>, Error> {
-        let guard = self.lock_guard_or_wait()?;
-        let mut result: Vec<EpochState> = vec![];
-        for epoch_state in guard.iter() {
-            if epoch_state.confirmed_state.is_some() {
-                result.push(epoch_state.clone());
-            }
-        }
-        Ok(result)
-    }
-
-    /// Returns the confirmed `EpochState` for the epoch of the block number
-    /// # Arguments
-    ///
-    /// * `block_number` - A block number in the desired epoch
-    pub fn get_confirmed_by_block_number(&self, block_number: U256) -> Result<EpochState, Error> {
-        let mut result: Option<&EpochState> = None;
-        let epoch_states = self.get_all_confirmed()?;
-        for epoch_state in epoch_states.iter() {
-            let confirmed: &ConfirmedEpochState = epoch_state.confirmed_state.as_ref().unwrap();
-            if confirmed.ether_block_number <= block_number {
-                result = Some(epoch_state);
-            }
-        }
-        match result {
-            Some(epoch_state) => Ok(epoch_state.clone()),
-            None => {
-                Err(EpochStateTransitionErr { current_state: EPOCH_STATE_UNCONFIRMED.to_string() }.into())
-            }
-        }
-    }
-
-    /// Returns the most recent `EpochState` stored in memory
-    /// # Arguments
-    ///
-    /// * `exclude_unconfirmed` - Exclude any unconfirmed state
-    pub fn last(&self, exclude_unconfirmed: bool) -> Result<EpochState, Error> {
-        let guard = self.lock_guard_or_wait()?;
-        let mut epoch_state_val: Option<EpochState> = None;
-        for epoch_state in guard.iter().rev() {
-            if (exclude_unconfirmed && epoch_state.confirmed_state.is_some()) || !exclude_unconfirmed {
-                epoch_state_val = Some(epoch_state.clone());
-                break;
-            }
-        }
-        drop(guard);
-        Ok(epoch_state_val.ok_or(EpochStateUndefinedErr{})?)
-    }
-
-    #[logfn(DEBUG)]
-    fn store_epoch_state(&self) -> Result<(), Error> {
-        let guard = self.lock_guard_or_wait()?;
-        let epoch_state_list = guard.deref().clone();
-        drop(guard);
-        if epoch_state_list.is_empty() {
-            return Ok(fs::remove_file(&self.state_path).unwrap_or_else(|_| trace!("No epoch state file to remove")));
-        }
-        let mut file = File::create(&self.state_path).
-            map_err(|e| EpochStateIOErr { message: format!("Unable to write the EpochState list: {}", e)})?;
-        let mut buf = Vec::new();
-        epoch_state_list.serialize(&mut Serializer::new(&mut buf)).
-            map_err(|e| EpochStateIOErr { message: format!("Unable to write the EpochState list: {}", e)})?;
-        file.write_all(&buf).
-            map_err(|e| EpochStateIOErr { message: format!("Unable to write the EpochState list: {}", e)})?;
-        trace!("Saved epoch state list {:?} to {:?}", epoch_state_list, &self.state_path);
-        Ok(())
-    }
-
-    /// Empty the `EpochState` list both in memory and to disk
-    pub fn reset(&self) -> Result<(), Error> {
-        let mut guard = self.lock_guard_or_wait()?;
-        replace(&mut *guard, vec![]);
-        drop(guard);
-        self.store_epoch_state()
-    }
-
-    /// Append a new unconfirmed `EpochState` to the list and persist to disk
-    /// # Arguments
-    ///
-    /// * `epoch_state` - The unconfirmed `EpochState` to append
-    pub fn append_unconfirmed(&self, epoch_state: EpochState) -> Result<(), Error> {
-        if self.is_last_unconfirmed()? {
-            bail!("An unconfirmed EpochState must be appended after a confirmed");
-        }
-        let mut guard = self.lock_guard_or_wait()?;
-        // Remove the first item of the list an shift left if the capacity is reached
-        if guard.len() == self.cap {
-            let epoch_state = guard.remove(0);
-            trace!("Removed first EpochState of capped list: {:?}", epoch_state);
-        }
-        guard.push(epoch_state);
-        drop(guard);
-        self.store_epoch_state()
-    }
-
-    /// Confirm the last unconfirmed `EpochState`
-    /// # Arguments
-    ///
-    /// * `epoch_state` - The confirmed `EpochState`
-    pub fn confirm_last(&self, epoch_state: EpochState) -> Result<(), Error> {
-        let mut guard = self.lock_guard_or_wait()?;
-        if let Some(last) = guard.last_mut() {
-            if last.confirmed_state.is_some() {
-                bail!("Last EpochState already confirmed: {:?}", last);
-            }
-            *last = epoch_state;
-        } else {
-            bail!("Cannot confirm the last EpochState of an empty list");
-        }
-        drop(guard);
-        self.store_epoch_state()
-    }
-}
-
-pub struct EpochProvider {
-    pub contract: Arc<EnigmaContract>,
-    pub epoch_state_manager: Arc<EpochStateManager>,
-    pub eid: Arc<sgx_enclave_id_t>,
-}
-
-impl EpochProvider {
-    pub fn new(eid: Arc<sgx_enclave_id_t>, dir_path: PathBuf, contract: Arc<EnigmaContract>) -> Result<EpochProvider, Error> {
-        let epoch_state_manager = Arc::new(EpochStateManager::new(dir_path, EPOCH_CAP)?);
-        let epoch_provider = Self { contract, epoch_state_manager, eid };
-        epoch_provider.verify_worker_params()?;
-        Ok(epoch_provider)
-    }
-
-    /// Find confirmed `EpochState` by block number
-    /// # Arguments
-    ///
-    /// * `block_number` - A block number in the desired epoch
-    pub fn find_epoch(&self, block_number: U256) -> Result<EpochState, Error> {
-        self.epoch_state_manager.get_confirmed_by_block_number(block_number)
-    }
-
-    /// Find the last confirmed `EpochState`
-    pub fn find_last_epoch(&self) -> Result<EpochState, Error> {
-        if self.epoch_state_manager.is_last_unconfirmed()? {
-            return Err(EpochStateTransitionErr { current_state: format!("{}, waiting for confirmation from Ethereum", EPOCH_STATE_UNCONFIRMED) }.into());
-        }
-        self.epoch_state_manager.last(true)
-    }
-
-    #[logfn(DEBUG)]
-    fn parse_worker_parameterized(&self, receipt: &TransactionReceipt) -> Result<Log, Error> {
-        let log = receipt.logs[0].clone();
-        let raw_log = RawLog { topics: log.topics, data: log.data.0 };
-        let event = WorkersParameterizedEvent::new();
-        let result = match event.0.parse_log(raw_log) {
-            Ok(result) => result,
-            Err(err) => return Err(Web3Error {
-                message: format!("Unable to parse {} event: {:?}", WORKER_PARAMETERIZED_EVENT, err),
-            }.into()),
-        };
-        debug!("Parsed the {} event: {:?}", WORKER_PARAMETERIZED_EVENT, result);
-        Ok(result)
-    }
-
-    #[logfn(DEBUG)]
-    fn verify_worker_params(&self) -> Result<(), Error> {
-        for epoch_state in self.epoch_state_manager.get_all_confirmed()?.iter() {
-            // if the epoch is confirmed by the Enigma Contract
-            if let Some(_) = &epoch_state.confirmed_state {
-                // Get the km_block_number which indicates where to take the list of active workers from
-                let km_block_number = epoch_state.km_block_number;
-                let (workers, stakes) = self.contract.get_active_workers(km_block_number)?;
-                let worker_params = InputWorkerParams { km_block_number, workers, stakes };
-                set_or_verify_worker_params(*self.eid, &worker_params, Some(epoch_state.clone()))?;
-            }
-        }
-        Ok(())
-    }
-
-    /// Seal the epoch data in the enclave, get a random seed and submit to the Enigma contract
-    /// The enclave signs on:
-    ///  - The worker parameters active at the specified block number
-    ///  - The random seed generated by the enclave
-    ///  - The sealed nonce incremented for each random seed generated
-    /// The Enigma contract verifies the signature. It will revert if:
-    ///  - The nonce incremented by the contract does not match the nonce incremented by the enclave
-    ///    this prevents the Principal node operator from updating the seed without publishing
-    ///    a transaction.
-    ///  - The list of active worker parameters does not match the sealed epoch data. This prevents
-    ///    the enclave operator from tempering with worker parameters in order to modify the
-    ///    result of the worker selection.
-    ///
-    /// # Arguments
-    ///
-    /// * `block_number` - The block number marking the active worker list
-    /// * `gas_limit` - The gas limit of the `setWorkersParams` transaction
-    /// * `confirmations` - The number of blocks required to confirm the `setWorkersParams` transaction
-    pub fn set_worker_params<G: Into<U256>>(&self, block_number: U256, gas_limit: G, confirmations: usize) -> Result<H256, Error> {
-        self.set_worker_params_internal(block_number, gas_limit, confirmations, None)
-    }
-
-    /// Similar to `set_worker_params` but using the EpochState in storage
-    ///
-    /// # Arguments
-    ///
-    /// * `block_number` - The block number marking the active worker list
-    /// * `gas_limit` - The gas limit of the `setWorkersParams` transaction
-    /// * `confirmations` - The number of blocks required to confirm the `setWorkersParams` transaction
-    #[logfn(DEBUG)]
-    pub fn confirm_worker_params<G: Into<U256>>(&self, block_number: U256, gas_limit: G, confirmations: usize) -> Result<H256, Error> {
-        if !self.epoch_state_manager.is_last_unconfirmed()? {
-            bail!("The last EpochState is already confirmed");
-        }
-        let epoch_state = self.epoch_state_manager.last(false)?;
-        info!("Confirming EpochState by verifying with the enclave and calling setWorkerParams: {:?}", epoch_state);
-        self.set_worker_params_internal(block_number, gas_limit, confirmations, Some(epoch_state))
-    }
-
-    #[logfn(DEBUG)]
-    fn set_worker_params_internal<G: Into<U256>>(&self, km_block_number: U256, gas_limit: G, confirmations: usize, epoch_state: Option<EpochState>) -> Result<H256, Error> {
-        let (workers, stakes) = self.contract.get_active_workers(km_block_number)?;
-        let worker_params = InputWorkerParams { km_block_number, workers, stakes };
-        let mut epoch_state = set_or_verify_worker_params(*self.eid, &worker_params, epoch_state)?;
-
-        debug!("Storing unconfirmed EpochState: {:?}", epoch_state);
-        self.epoch_state_manager.append_unconfirmed(epoch_state.clone())?;
-
-        debug!("Waiting for setWorkerParams({:?}, {:?}, {:?})", km_block_number, epoch_state.seed, epoch_state.sig);
-        let receipt = self.contract.set_workers_params(km_block_number, epoch_state.seed, epoch_state.sig.clone(), gas_limit, confirmations)?;
-        debug!("Got the receipt: {:?}", receipt);
-
-        let log = self.parse_worker_parameterized(&receipt)?;
-        match log.params.into_iter().find(|x| x.name == "firstBlockNumber") {
-            Some(param) => {
-                let ether_block_number = param.value.to_uint().unwrap();
-                if ether_block_number < km_block_number {
-                    return Err(Web3Error { message: "The block number given by the Enigma Contract is smaller than the one defined by the KM".to_string() }.into());
-                }
-                self.confirm_epoch(&mut epoch_state, ether_block_number, worker_params)?;
-                debug!("Storing confirmed epoch state: {:?}", epoch_state);
-
-                self.epoch_state_manager.confirm_last(epoch_state)?;
-                Ok(receipt.transaction_hash)
-            }
-            None => return Err(Web3Error { message: "firstBlockNumber not found in receipt log".to_string() }.into()),
-        }
-    }
-
-    /// Build a local mapping of smart contract address => selected worker for the epoch
-    ///
-    /// # Arguments
-    ///
-    /// * `epoch_state` - The mutable `EpochState` to be confirmed
-    /// * `worker_params` - The `InputWorkerParams` used to run the worker selection algorithm
-    #[logfn(DEBUG)]
-    pub fn confirm_epoch(&self, epoch_state: &mut EpochState, ether_block_number: U256, worker_params: InputWorkerParams) -> Result<(), Error> {
-        let sc_addresses = self.contract.get_all_secret_contract_addresses()?;
-
-        debug!("The secret contract addresses: {:?}",
-               sc_addresses.iter().map(|item| {item.to_hex()}).collect::<Vec<String>>());
-        epoch_state.confirm(ether_block_number, &worker_params, sc_addresses)?;
-        Ok(())
-    }
-}
-
-//////////////////////// TESTS  /////////////////////////////////////////
-
-#[cfg(test)]
-pub mod test {
-    extern crate tempfile;
-
-    use self::tempfile::TempDir;
-    use std::collections::HashMap;
-
-    use web3::types::{Bytes, H160};
-
-    use enigma_tools_u::{esgx::general::storage_dir};
-    use enigma_types::ContractAddress;
-
-    use super::*;
-
-    pub const WORKER_SIGN_ADDRESS: [u8; 20] =
-        [95, 53, 26, 193, 96, 206, 55, 206, 15, 120, 191, 101, 13, 44, 28, 237, 80, 151, 54, 182];
-
-    pub fn setup_epoch_storage_dir() -> PathBuf {
-        let tempdir = tempfile::tempdir().unwrap();
-        let mut temp_path = tempdir.into_path();
-        println!("path is: {:?}", temp_path);
-        temp_path
-    }
-
-    #[test]
-    fn test_store_epoch_state() {
-        let path = setup_epoch_storage_dir();
-        let cap: usize = 2;
-        let epoch_manager_calculated = EpochStateManager::new(path.clone(), cap).unwrap();
-
-        let mut selected_workers: HashMap<ContractAddress, H160> = HashMap::new();
-        let mock_address = [1u8; 32];
-        selected_workers.insert(ContractAddress::from(mock_address), H160(WORKER_SIGN_ADDRESS));
-        let ether_block_number = U256::from(3);
-        let confirmed_state = Some(ConfirmedEpochState { selected_workers, ether_block_number });
-
-        let seed = U256::from(1);
-        let mock_sig = [1u8; 65];
-        let sig = Bytes::from(mock_sig.to_vec());
-        let nonce = U256::from(0);
-        let km_block_number = U256::from(2);
-
-        let epoch_state = EpochState { seed, sig, nonce, km_block_number, confirmed_state };
-        epoch_manager_calculated.append_unconfirmed(epoch_state.clone()).unwrap();
-
-        let epoch_manager_accepted = EpochStateManager::new(path, cap).unwrap();
-        assert_eq!(format!("{:?}", epoch_manager_accepted.epoch_state_list.lock().unwrap().iter().last().unwrap()), format!("{:?}", epoch_state));
-    }
-
-    #[test]
-    fn test_store_and_reset_epoch_state() {
-        let path = setup_epoch_storage_dir();
-        let cap: usize = 2;
-        let epoch_manager_calculated = EpochStateManager::new(path.clone(), cap).unwrap();
-
-        let mut selected_workers: HashMap<ContractAddress, H160> = HashMap::new();
-        let mock_address = [1u8; 32];
-        selected_workers.insert(ContractAddress::from(mock_address), H160(WORKER_SIGN_ADDRESS));
-        let ether_block_number = U256::from(4);
-        let confirmed_state = Some(ConfirmedEpochState { selected_workers, ether_block_number });
-
-        let seed = U256::from(1);
-        let mock_sig = [1u8; 65];
-        let sig = Bytes::from(mock_sig.to_vec());
-        let nonce = U256::from(0);
-        let km_block_number = U256::from(4);
-
-        let epoch_state = EpochState { seed, sig, nonce, km_block_number, confirmed_state };
-        epoch_manager_calculated.append_unconfirmed(epoch_state.clone()).unwrap();
-
-        epoch_manager_calculated.reset().unwrap();
-        let epoch_manager_accepted = EpochStateManager::new(path, cap).unwrap();
-
-        assert!(epoch_manager_accepted.epoch_state_list.lock().unwrap().is_empty());
-
-
-    }
-}
diff --git a/enigma-principal/app/src/epoch_u/mod.rs b/enigma-principal/app/src/epoch_u/mod.rs
deleted file mode 100644
index ff17cd2a..00000000
--- a/enigma-principal/app/src/epoch_u/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod epoch_provider;
-pub mod epoch_types;
diff --git a/enigma-principal/app/src/esgx/epoch_keeper_u.rs b/enigma-principal/app/src/epochs/epoch_keeper_u.rs
similarity index 83%
rename from enigma-principal/app/src/esgx/epoch_keeper_u.rs
rename to enigma-principal/app/src/epochs/epoch_keeper_u.rs
index 594c0e9a..a4f1e6e4 100644
--- a/enigma-principal/app/src/esgx/epoch_keeper_u.rs
+++ b/enigma-principal/app/src/epochs/epoch_keeper_u.rs
@@ -1,12 +1,12 @@
-use enigma_tools_m::keeper_types::InputWorkerParams;
-use failure::Error;
 use rustc_hex::ToHex;
 use sgx_types::{sgx_enclave_id_t, sgx_status_t};
 use web3::types::{Bytes, U256};
 
-use common_u::errors::EnclaveFailError;
+use enigma_tools_m::keeper_types::InputWorkerParams;
 use enigma_types::{EnclaveReturn, traits::SliceCPtr};
-use epoch_u::epoch_types::{encode, EpochState};
+
+use common_u::custom_errors::EnclaveError;
+use epochs::epoch_types::{encode, SignedEpoch};
 
 extern "C" {
     fn ecall_set_worker_params(
@@ -33,10 +33,10 @@ extern "C" {
 /// let sig = set_worker_params(enclave.geteid(), worker_params, None).unwrap();
 /// ```
 #[logfn(DEBUG)]
-pub fn set_or_verify_worker_params(eid: sgx_enclave_id_t, worker_params: &InputWorkerParams, epoch_state: Option<EpochState>) -> Result<EpochState, Error> {
+pub fn set_or_verify_worker_params(eid: sgx_enclave_id_t, worker_params: &InputWorkerParams, epoch: Option<SignedEpoch>) -> Result<SignedEpoch, EnclaveError> {
     let mut retval: EnclaveReturn = EnclaveReturn::Success;
-    let (nonce_in, seed_in) = match epoch_state.clone() {
-        Some(e) => (e.nonce.into(), e.seed.into()),
+    let (nonce_in, seed_in) = match epoch.clone() {
+        Some(e) => (e.get_nonce().into(), e.get_seed().into()),
         None => ([0; 32], [0; 32])
     };
     debug!("Calling enclave set_worker_params with nonce/seed: {:?}/{:?}", nonce_in.to_vec().to_hex(), seed_in.to_vec().to_hex());
@@ -58,26 +58,25 @@ pub fn set_or_verify_worker_params(eid: sgx_enclave_id_t, worker_params: &InputW
         )
     };
     if retval != EnclaveReturn::Success || status != sgx_status_t::SGX_SUCCESS {
-        return Err(EnclaveFailError { err: retval, status }.into());
+        return Err(EnclaveError::Failure { err: retval, status });
     }
-    // If an `EpochState` was given and the ecall succeeded, it is considered verified
-    // Otherwise, build a new `EpochState` from the parameters of the new epoch
-    let epoch_state_out = match epoch_state {
-        Some(epoch_state) => epoch_state,
+    // If an `Epoch` was given and the ecall succeeded, it is considered verified
+    // Otherwise, build a new `Epoch` from the parameters of the new epoch
+    let epoch_out = match epoch {
+        Some(epoch) => epoch,
         None => {
             let seed = U256::from_big_endian(&rand_out);
             let sig = Bytes(sig_out.to_vec());
             let nonce = U256::from_big_endian(&nonce_out);
-            EpochState::new(seed, sig, nonce, worker_params.km_block_number)
+            SignedEpoch::new(seed, sig, nonce, worker_params.km_block_number)
         }
     };
-    Ok(epoch_state_out)
+    Ok(epoch_out)
 }
 
 #[cfg(test)]
 pub mod tests {
-    use rustc_hex::{FromHex, ToHex};
-    use web3::types::{Address, H160, H256};
+    use web3::types::H160;
 
     use esgx::general::init_enclave_wrapper;
 
@@ -116,7 +115,7 @@ pub mod tests {
         let stakes: Vec<u64> = vec![90000000000];
         let km_block_number = 1;
         let worker_params = get_worker_params(km_block_number, workers, stakes);
-        for i in 0..5 {
+        for _ in 0..5 {
             let epoch_state = set_or_verify_worker_params(enclave.geteid(), &worker_params, None).unwrap();
             assert!(epoch_state.confirmed_state.is_none());
         }
diff --git a/enigma-principal/app/src/epochs/epoch_trigger.rs b/enigma-principal/app/src/epochs/epoch_trigger.rs
new file mode 100644
index 00000000..e5f5d582
--- /dev/null
+++ b/enigma-principal/app/src/epochs/epoch_trigger.rs
@@ -0,0 +1,42 @@
+use std::{thread, time};
+
+use web3::{futures::Future, types::U256};
+
+use controller::km_controller::KMController;
+use common_u::custom_errors::VerifierError;
+
+/// this trait should extend the EnigmaContract into Principal specific functions.
+pub trait EthereumTracker {
+    fn epoch_trigger(&self, epoch_size: usize, polling_interval: u64, confirmations: usize) -> Result<(), VerifierError>;
+}
+
+impl EthereumTracker for KMController {
+    /// Watches the blocks for new epoch using the epoch size and the previous epoch block number.
+    /// For each new epoch, set the worker parameters.
+    #[logfn(INFO)]
+    fn epoch_trigger(&self, epoch_size: usize, polling_interval: u64, confirmations: usize) -> Result<(), VerifierError> {
+        loop {
+            let block_number = match self.contract.web3.eth().block_number().wait() {
+                Ok(block_number) => block_number,
+                Err(err) => {
+                    error!("Unable to fetch block number: {:?}", err);
+                    thread::sleep(time::Duration::from_secs(polling_interval));
+                    continue;
+                }
+            };
+            let curr_block = block_number.low_u64() as usize;
+            let prev_block = match self.epoch_verifier.last(true) {
+                Ok(state) => state.confirmed_state.ok_or(VerifierError::UnexpectedUnconfirmedErr)?.ether_block_number,
+                Err(_) => U256::zero(),
+            };
+            let prev_block_ref = prev_block.low_u64() as usize;
+            if prev_block_ref == 0 || curr_block >= (prev_block_ref + epoch_size) {
+                self
+                    .set_worker_params(block_number, confirmations)
+                    .expect("Unable to set worker params. Please recover manually.");
+            }
+            thread::sleep(time::Duration::from_secs(polling_interval));
+        }
+        Ok(())
+    }
+}
diff --git a/enigma-principal/app/src/epoch_u/epoch_types.rs b/enigma-principal/app/src/epochs/epoch_types.rs
similarity index 84%
rename from enigma-principal/app/src/epoch_u/epoch_types.rs
rename to enigma-principal/app/src/epochs/epoch_types.rs
index ffe1acc5..1917d34f 100644
--- a/enigma-principal/app/src/epoch_u/epoch_types.rs
+++ b/enigma-principal/app/src/epochs/epoch_types.rs
@@ -1,18 +1,16 @@
 use std::collections::HashMap;
-use rustc_hex::ToHex;
 
-use enigma_tools_m::keeper_types::InputWorkerParams;
+use rustc_hex::ToHex;
 use ethabi::{Event, EventParam, ParamType};
-use failure::Error;
 pub use rlp::{decode, Encodable, encode, RlpStream};
 use serde::{Deserialize, Serialize};
 use web3::types::{Address, Bytes, H160, U256};
 
-use enigma_types::ContractAddress;
+use enigma_tools_m::keeper_types::InputWorkerParams;
 use enigma_types::Hash256;
-use common_u::errors::EpochStateTransitionErr;
 
-pub const EPOCH_STATE_UNCONFIRMED: &str = "UNCONFIRMED";
+use common_u::custom_errors::EpochError;
+
 pub const WORKER_PARAMETERIZED_EVENT: &str = "WorkersParameterized";
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -24,22 +22,30 @@ pub struct ConfirmedEpochState {
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
-pub struct EpochState {
-    pub seed: U256,
-    pub sig: Bytes,
-    pub nonce: U256,
+pub struct SignedEpoch {
+    seed: U256,
+    sig: Bytes,
+    nonce: U256,
     /// The km_block_number is the block in which the KM decided to start a new epoch and
     /// the active workers are concluded from for the epoch
     /// (It might differ from the ether_block_number due to latency in networks)
-    pub km_block_number: U256,
+    km_block_number: U256,
     pub confirmed_state: Option<ConfirmedEpochState>,
 }
 
-impl EpochState {
+impl SignedEpoch {
     pub fn new(seed: U256, sig: Bytes, nonce: U256, km_block_number: U256) -> Self {
         Self { seed, sig, nonce, km_block_number, confirmed_state: None }
     }
 
+    pub fn get_nonce(&self) -> U256 { self.nonce }
+
+    pub fn get_seed(&self) -> U256 { self.seed }
+
+    pub fn get_km_block_num(&self) -> U256 { self.km_block_number }
+
+    pub fn get_sig(&self) -> Bytes { self.sig.clone() }
+
     /// Build a local mapping of smart contract address => selected worker for the epoch
     ///
     /// # Arguments
@@ -47,11 +53,9 @@ impl EpochState {
     /// * `worker_params` - The `InputWorkerParams` used to run the worker selection algorithm
     /// * `sc_addresses` - The Secret Contract addresses for which to retrieve the selected worker
     #[logfn(DEBUG)]
-    pub fn confirm(
-        &mut self, ether_block_number: U256, worker_params: &InputWorkerParams, sc_addresses: Vec<ContractAddress>,
-    ) -> Result<(), Error> {
+    pub fn confirm(&mut self, ether_block_number: U256, worker_params: &InputWorkerParams, sc_addresses: Vec<Hash256>) {
         info!("Confirmed epoch with worker params: {:?}", worker_params);
-        let mut selected_workers: HashMap<ContractAddress, Address> = HashMap::new();
+        let mut selected_workers: HashMap<Hash256, Address> = HashMap::new();
         for sc_address in sc_addresses {
             match worker_params.get_selected_worker(sc_address, self.seed) {
                 Some(worker) => {
@@ -67,7 +71,6 @@ impl EpochState {
             }
         }
         self.confirmed_state = Some(ConfirmedEpochState { selected_workers, ether_block_number });
-        Ok(())
     }
 
     /// Returns the contract address that the worker is selected to work on during this epoch
@@ -76,10 +79,10 @@ impl EpochState {
     ///
     /// * `worker` - The worker signing address
     #[logfn(DEBUG)]
-    pub fn get_contract_addresses(&self, worker: &H160) -> Result<Vec<ContractAddress>, Error> {
+    pub fn get_contract_addresses(&self, worker: &H160) -> Result<Vec<Hash256>, EpochError> {
         let addrs = match &self.confirmed_state {
             Some(state) => {
-                let mut addrs: Vec<ContractAddress> = Vec::new();
+                let mut addrs: Vec<Hash256> = Vec::new();
                 for (&addr, account) in &state.selected_workers {
                     if account == worker {
                         addrs.push(addr);
@@ -87,7 +90,7 @@ impl EpochState {
                 }
                 addrs
             }
-            None => return Err(EpochStateTransitionErr { current_state: EPOCH_STATE_UNCONFIRMED.to_string() }.into()),
+            None => return Err(EpochError::UnconfirmedState),
         };
         Ok(addrs)
     }
diff --git a/enigma-principal/app/src/epochs/mod.rs b/enigma-principal/app/src/epochs/mod.rs
new file mode 100644
index 00000000..c495eaab
--- /dev/null
+++ b/enigma-principal/app/src/epochs/mod.rs
@@ -0,0 +1,4 @@
+pub mod epoch_keeper_u;
+pub mod epoch_types;
+pub mod epoch_trigger;
+pub mod verifier;
diff --git a/enigma-principal/app/src/epochs/verifier.rs b/enigma-principal/app/src/epochs/verifier.rs
new file mode 100644
index 00000000..db01d6d9
--- /dev/null
+++ b/enigma-principal/app/src/epochs/verifier.rs
@@ -0,0 +1,203 @@
+use std::{
+    fs::{self, File},
+    io::prelude::*,
+    ops::Deref,
+    path::PathBuf,
+    sync::Mutex,
+};
+use std::clone::Clone;
+use std::sync::MutexGuard;
+use std::mem::replace;
+
+use rmp_serde::{Deserializer, Serializer};
+use serde::{Deserialize, Serialize};
+use web3::types::U256;
+
+use enigma_tools_m::keeper_types::EPOCH_CAP;
+
+use epochs::epoch_types::{ConfirmedEpochState, SignedEpoch};
+use esgx::general::{EPOCH_DIR, EPOCH_FILE};
+use common_u::custom_errors::{VerifierError, EpochError};
+
+#[derive(Debug)]
+pub struct EpochVerifier {
+    pub epoch_list: Mutex<Vec<SignedEpoch>>,
+    state_path: PathBuf,
+}
+
+impl EpochVerifier {
+    pub fn new(mut state_path: PathBuf) -> Result<Self, VerifierError> {
+        state_path.push(EPOCH_DIR);
+        if !state_path.exists() {
+            fs::create_dir_all(&state_path).or( Err(VerifierError::CreateErr))?;
+        }
+        state_path.push(EPOCH_FILE);
+        Self::create_from_path(state_path)
+    }
+    /// create an EpochVerifier object given the path from which we retrieve
+    /// the epoch states and we use the cap amount of epochs as well to handle backwards.
+    fn create_from_path(state_path: PathBuf) -> Result<EpochVerifier, VerifierError> {
+        let signed_epochs = match File::open(&state_path) {
+            Ok(mut f) => {
+                let mut buf = Vec::new();
+                f.read_to_end(&mut buf).or(Err(VerifierError::ReadErr))?;
+                let mut des = Deserializer::new(&buf[..]);
+                let mut data: Vec<SignedEpoch> = Deserialize::deserialize(&mut des).unwrap_or_default();
+                trace!("Found epoch state list");
+                let mut capped_data = Vec::with_capacity(EPOCH_CAP);
+                match EPOCH_CAP < data.len() {
+                    true => {
+                        for _ in 0..EPOCH_CAP {
+                            capped_data.push(data
+                                .iter()
+                                .max_by_key(|epoch| epoch.get_nonce())
+                                .ok_or(VerifierError::EpochsDontExistErr)?
+                                .clone()
+                            )
+                        }
+                        capped_data
+                    }
+                    false =>  {
+                        capped_data.append(&mut data);
+                        capped_data
+                    }
+                }
+            }
+            Err(_) => {
+                trace!("No existing epoch state");
+                vec![]
+            }
+        };
+        let epoch_list = Mutex::new(signed_epochs);
+        Ok(EpochVerifier { epoch_list, state_path})
+    }
+
+    /// Lock the `EpochState` list `Mutex`, or wait and retry
+    pub fn lock_guard_or_wait(&self) -> Result<MutexGuard<Vec<SignedEpoch>>, VerifierError> {
+         self.epoch_list.lock().or(Err(VerifierError::LockErr))
+    }
+
+    /// Checks if the latest `EpochState` is unconfirmed
+    pub fn is_last_unconfirmed(&self) -> Result<bool, VerifierError> {
+        let guard = self.lock_guard_or_wait()?;
+        if guard.is_empty() {
+            drop(guard);
+            return Ok(false);
+        }
+        let last_epoch = guard.iter().last().ok_or(VerifierError::EpochsDontExistErr)?;
+
+        let is_unconfirmed = match &last_epoch.confirmed_state {
+            Some(_) => false,
+            None => true,
+        };
+        Ok(is_unconfirmed)
+    }
+
+    /// Return a list of all confirmed `SignedEpoch`s
+    pub fn get_all_confirmed(&self) -> Result<Vec<SignedEpoch>, VerifierError> {
+        let guard = self.lock_guard_or_wait()?;
+        Ok(guard.iter().filter(|epoch| epoch.confirmed_state.is_some()).cloned().collect())
+    }
+
+    /// Returns the confirmed `SignedEpoch` for the epoch of the given block number
+    /// # Arguments
+    ///
+    /// * `block_number` - A block number in the desired epoch
+    pub fn get_confirmed_by_block_number(&self, block_number: U256) -> Result<SignedEpoch, VerifierError> {
+        let mut result: Option<&SignedEpoch> = None;
+        let epochs = self.get_all_confirmed()?;
+        for epoch in epochs.iter() {
+            let confirmed: &ConfirmedEpochState = epoch.confirmed_state.as_ref().
+                ok_or(VerifierError::Other("Unexpected behaviour in get_all_confirmed. \
+                All epochs should be with a value in confirmed_state".to_string()))?;
+            if confirmed.ether_block_number <= block_number {
+                result = Some(epoch);
+            }
+        }
+        match result {
+            Some(epoch_state) => Ok(epoch_state.clone()),
+            None => {
+                Err(VerifierError::EpochErr(EpochError::UnconfirmedState))
+            }
+        }
+    }
+
+    /// Returns the most recent `SignedEpoch` stored in memory
+    /// # Arguments
+    ///
+    /// * `exclude_unconfirmed` - Exclude any unconfirmed state
+    pub fn last(&self, exclude_unconfirmed: bool) -> Result<SignedEpoch, VerifierError> {
+        let guard = self.lock_guard_or_wait()?;
+        let mut epoch_state_val: Option<SignedEpoch> = None;
+        for epoch_state in guard.iter().rev() {
+            if (exclude_unconfirmed && epoch_state.confirmed_state.is_some()) || !exclude_unconfirmed {
+                epoch_state_val = Some(epoch_state.clone());
+                break;
+            }
+        }
+        drop(guard);
+        epoch_state_val.ok_or(VerifierError::EpochsDontExistErr)
+    }
+
+    #[logfn(DEBUG)]
+    fn store_signed_epoch(&self) -> Result<(), VerifierError> {
+        let guard = self.lock_guard_or_wait()?;
+        let epoch_list = guard.deref().clone();
+        drop(guard);
+        if epoch_list.is_empty() {
+            return Ok(fs::remove_file(&self.state_path).or(Err(VerifierError::EpochsDontExistErr))?);
+        }
+        let mut file = File::create(&self.state_path).or( Err(VerifierError::CreateErr))?;
+        let mut buf = Vec::new();
+        epoch_list.serialize(&mut Serializer::new(&mut buf)).or( Err(VerifierError::WriteErr))?;
+        file.write_all(&buf).or( Err(VerifierError::WriteErr))?;
+        trace!("Saved epoch state list {:?} to {:?}", epoch_list, &self.state_path);
+        Ok(())
+    }
+
+    /// Empty the `SignedEpoch` list both on memory and disk
+    pub fn reset(&self) -> Result<(), VerifierError> {
+        let mut guard = self.lock_guard_or_wait()?;
+        replace(&mut *guard, vec![]);
+        drop(guard);
+        self.store_signed_epoch()
+    }
+
+    /// Append a new unconfirmed `SignedEpoch` to the list and persist to disk
+    /// # Arguments
+    ///
+    /// * `signed_epoch` - The unconfirmed `SignedEpoch` to append
+    pub fn append_unconfirmed(&self, signed_epoch: SignedEpoch) -> Result<(), VerifierError> {
+        if self.is_last_unconfirmed()? {
+            return Err(VerifierError::UnexpectedUnconfirmedErr)
+        }
+        let mut guard = self.lock_guard_or_wait()?;
+        // Remove the first item of the list an shift left if the capacity is reached
+        if guard.len() == EPOCH_CAP {
+            let removed_epoch = guard.remove(0);
+            trace!("Removed first EpochState of capped list: {:?}", removed_epoch);
+        }
+        guard.push(signed_epoch);
+        drop(guard);
+        self.store_signed_epoch()
+    }
+
+    /// Confirm the last unconfirmed `SignedEpoch`
+    /// # Arguments
+    ///
+    /// * `signed_epoch` - The confirmed `SignedEpoch`
+    pub fn confirm_last(&self, signed_epoch: SignedEpoch) -> Result<(), VerifierError> {
+        let mut guard = self.lock_guard_or_wait()?;
+        if let Some(last) = guard.last_mut() {
+            if last.confirmed_state.is_some() {
+               return Err(VerifierError::UnexpectedConfirmedErr)
+            }
+            *last = signed_epoch;
+        } else {
+            // the epoch data doesn't exist- some error occurred earlier
+            return Err(VerifierError::EpochsDontExistErr)
+        }
+        drop(guard);
+        self.store_signed_epoch()
+    }
+}
\ No newline at end of file
diff --git a/enigma-principal/app/src/esgx/equote.rs b/enigma-principal/app/src/esgx/equote.rs
index a54e70fe..ee18f69f 100644
--- a/enigma-principal/app/src/esgx/equote.rs
+++ b/enigma-principal/app/src/esgx/equote.rs
@@ -1,7 +1,7 @@
-use common_u::errors;
 use failure::Error;
 use sgx_types::*;
-use std::str;
+
+use common_u::errors;
 
 extern "C" {
     fn ecall_get_signing_address(eid: sgx_enclave_id_t, pubkey: &mut [u8; 20]) -> sgx_status_t;
@@ -13,15 +13,6 @@ extern "C" {
 extern "C" {
     fn ecall_sign_ethereum(eid: sgx_enclave_id_t, data: &[u8; 32], sig: &mut [u8; 65]) -> sgx_status_t;
 }
-// this struct is returned during the process registration back to the surface.
-// quote: the base64 encoded quote
-// address : the clear text public key for ecdsa signing and registration
-#[derive(Serialize, Deserialize, Debug)]
-pub struct GetRegisterResult {
-    pub errored: bool,
-    pub quote: String,
-    pub address: String,
-}
 
 // wrapper function for getting the enclave public sign key (the one attached with produce_quote())
 #[logfn(TRACE)]
@@ -35,7 +26,7 @@ pub fn get_register_signing_address(eid: sgx_enclave_id_t) -> Result<[u8; 20], E
     }
 }
 
-// wrapper function for getting the enclave public sign key (the one attached with produce_quote())
+// wrapper function for getting the Ethereum account address
 pub fn get_ethereum_address(eid: sgx_enclave_id_t) -> Result<[u8; 20], Error> {
     let mut address = [0u8; 20];
     let status = unsafe { ecall_get_ethereum_address(eid, &mut address) };
diff --git a/enigma-principal/app/src/esgx/general.rs b/enigma-principal/app/src/esgx/general.rs
index 9a8a735f..5d214fa2 100644
--- a/enigma-principal/app/src/esgx/general.rs
+++ b/enigma-principal/app/src/esgx/general.rs
@@ -1,7 +1,9 @@
-use enigma_tools_u::{self, esgx::general::storage_dir};
+use std::fs;
+
 use sgx_types::*;
 use sgx_urts::SgxEnclave;
-use std::{fs, path};
+
+use enigma_tools_u::{self, esgx::general::storage_dir};
 
 static ENCLAVE_FILE: &'static str = "../bin/enclave.signed.so";
 pub static ENCLAVE_DIR: &'static str = ".enigma";
diff --git a/enigma-principal/app/src/esgx/mod.rs b/enigma-principal/app/src/esgx/mod.rs
index f4d6897f..337679c7 100644
--- a/enigma-principal/app/src/esgx/mod.rs
+++ b/enigma-principal/app/src/esgx/mod.rs
@@ -1,4 +1,2 @@
-pub mod epoch_keeper_u;
 pub mod equote;
 pub mod general;
-pub mod keys_keeper_u;
diff --git a/enigma-principal/app/src/main.rs b/enigma-principal/app/src/main.rs
index 086c8138..9b439a6c 100644
--- a/enigma-principal/app/src/main.rs
+++ b/enigma-principal/app/src/main.rs
@@ -1,14 +1,13 @@
 #![feature(integer_atomics)]
 #![feature(arbitrary_self_types)]
 
-#[macro_use]
-extern crate colour;
 extern crate dirs;
 extern crate enigma_crypto;
 extern crate enigma_tools_m;
 extern crate enigma_tools_u;
 extern crate enigma_types;
 extern crate ethabi;
+extern crate thiserror;
 #[macro_use]
 extern crate failure;
 extern crate jsonrpc_http_server;
@@ -17,11 +16,12 @@ extern crate jsonrpc_http_server;
 extern crate log;
 #[macro_use]
 extern crate log_derive;
-
+#[macro_use]
+extern crate lazy_static;
 extern crate rlp;
 extern crate rustc_hex;
+extern crate hex_serde;
 extern crate serde;
-#[macro_use]
 extern crate serde_derive;
 extern crate serde_json;
 extern crate sgx_types;
@@ -32,13 +32,13 @@ extern crate web3;
 extern crate rmp_serde;
 extern crate envy;
 extern crate itertools;
-
+extern crate crossbeam_utils;
 extern crate secp256k1;
 
 
 use std::str::FromStr;
 
-use cli::options::Opt;
+use controller::options::Opt;
 use enigma_tools_u::common_u::logging;
 use enigma_tools_u::common_u::os;
 
@@ -46,10 +46,10 @@ pub use enigma_tools_u::esgx::ocalls_u::{ocall_get_home, ocall_save_to_memory};
 use structopt::StructOpt;
 
 // enigma modules
-mod boot_network;
-mod cli;
+mod epochs;
+mod state_keys;
 mod common_u;
-mod epoch_u;
+mod controller;
 mod esgx;
 
 fn main() {
@@ -65,7 +65,7 @@ fn main() {
 
     let enclave = esgx::general::init_enclave_wrapper().expect("[-] Init Enclave Failed");
     let eid = enclave.geteid();
-    cli::app::start(eid).unwrap();
+    controller::boot_network::start(eid).unwrap();
     info!("[+] Init Enclave Successful {}!", eid);
 
     // drop enclave when done
@@ -74,21 +74,13 @@ fn main() {
 
 #[cfg(test)]
 mod tests {
-    use enigma_tools_u::common_u::logging;
     use esgx::general::init_enclave_wrapper;
-    use log::LevelFilter;
     use sgx_types::{sgx_enclave_id_t, sgx_status_t};
-    use std::path::Path;
 
     extern "C" {
         fn ecall_run_tests(eid: sgx_enclave_id_t) -> sgx_status_t;
     }
 
-    pub fn log_to_stdout(level: Option<LevelFilter>) {
-        let level = level.unwrap_or_else(|| LevelFilter::max());
-        logging::init_logger(level, ".", "Tests".to_string()).unwrap();
-    }
-
     #[test]
     pub fn test_enclave_internal() {
         // initiate the enclave
diff --git a/enigma-principal/app/src/esgx/keys_keeper_u.rs b/enigma-principal/app/src/state_keys/keys_keeper_u.rs
similarity index 71%
rename from enigma-principal/app/src/esgx/keys_keeper_u.rs
rename to enigma-principal/app/src/state_keys/keys_keeper_u.rs
index bb7c405f..e84274db 100644
--- a/enigma-principal/app/src/esgx/keys_keeper_u.rs
+++ b/enigma-principal/app/src/state_keys/keys_keeper_u.rs
@@ -1,12 +1,12 @@
-use std::{convert::TryInto, mem};
+use std::mem;
 
-use failure::Error;
 use sgx_types::{sgx_enclave_id_t, sgx_status_t};
 use web3::types::U256;
 
-use boot_network::keys_provider_http::{StateKeyRequest, StateKeyResponse, StringWrapper};
-use common_u::errors::EnclaveFailError;
-use enigma_types::{ContractAddress, EnclaveReturn, traits::SliceCPtr};
+use enigma_types::{Hash256, EnclaveReturn, traits::SliceCPtr};
+
+use controller::km_http_server::{StateKeyRequest, StateKeyResponse};
+use common_u::custom_errors::EnclaveError;
 
 extern "C" {
     fn ecall_get_enc_state_keys(
@@ -33,13 +33,12 @@ extern "C" {
 /// let response = get_enc_state_keys(enclave.geteid(), request, nonce, None).unwrap();
 /// ```
 #[logfn(DEBUG)]
-pub fn get_enc_state_keys(eid: sgx_enclave_id_t, request: StateKeyRequest, epoch_nonce: U256, sc_addrs: &[ContractAddress]) -> Result<StateKeyResponse, Error> {
+pub fn get_enc_state_keys(eid: sgx_enclave_id_t, request: StateKeyRequest, epoch_nonce: U256, sc_addrs: &[Hash256]) -> Result<StateKeyResponse, EnclaveError> {
     let mut retval: EnclaveReturn = EnclaveReturn::Success;
     let mut sig_out: [u8; 65] = [0; 65];
     let mut response_ptr = 0u64;
     let epoch_nonce: [u8; 32] = epoch_nonce.into();
-
-    let msg_bytes: Vec<u8> = request.data.try_into()?;
+    let msg_bytes = request.get_data();
     let status = unsafe {
         ecall_get_enc_state_keys(
             eid,
@@ -48,30 +47,31 @@ pub fn get_enc_state_keys(eid: sgx_enclave_id_t, request: StateKeyRequest, epoch
             msg_bytes.len(),
             sc_addrs.as_c_ptr() as *const u8,
             mem::size_of_val(sc_addrs),
-            &request.sig.try_into()?,
+            &request.get_sig()?,
             &epoch_nonce,
             &mut response_ptr as *mut u64,
             &mut sig_out,
         )
     };
     if retval != EnclaveReturn::Success || status != sgx_status_t::SGX_SUCCESS {
-        return Err(EnclaveFailError { err: retval, status }.into());
+        return Err(EnclaveError::Failure { err: retval, status });
     }
     let box_ptr = response_ptr as *mut Box<[u8]>;
     let response = unsafe { Box::from_raw(box_ptr) };
-    Ok(StateKeyResponse { data: StringWrapper::from(&response[..]), sig: StringWrapper::from(&sig_out[..]) })
+    Ok(StateKeyResponse::new( response.to_vec(), sig_out.to_vec()))
 }
 
 #[cfg(test)]
 pub mod tests {
+    use super::*;
+
     use sgx_urts::SgxEnclave;
+    use rustc_hex::FromHex;
 
-    use esgx::epoch_keeper_u::set_or_verify_worker_params;
-    use esgx::epoch_keeper_u::tests::get_worker_params;
+    use epochs::epoch_keeper_u::set_or_verify_worker_params;
+    use epochs::epoch_keeper_u::tests::get_worker_params;
     use esgx::general::init_enclave_wrapper;
 
-    use super::*;
-
     fn init_enclave() -> SgxEnclave {
         let enclave = match init_enclave_wrapper() {
             Ok(r) => {
@@ -96,14 +96,14 @@ pub mod tests {
         let stakes: Vec<u64> = vec![10000000000];
         let km_block_number = 1;
         let worker_params = get_worker_params(km_block_number, workers, stakes);
-        let epoch_state = set_or_verify_worker_params(enclave.geteid(), &worker_params, None).unwrap();
+        let signed_epoch = set_or_verify_worker_params(enclave.geteid(), &worker_params, None).unwrap();
 
         // From the km_primitives uint tests
-        let msg = StringWrapper("83a464617461a752657175657374a269649cccd763674174cc9b3f300dccd2ccb0cc8ba67075626b6579dc0040ccc90b2205ccf9cc9358661320ccffccb763ccb57614ccf8ccaa1fccb86d6a087869ccd81acce5ccf16fcc9206cc98344136cca4ccefccb105ccbbccca1c5057ccba25067eccc101cc82ccee21445cccf91e79ccb176447239".to_string());
-        let sig = StringWrapper("2535cfe1bcea215dc552acbca1a213354e055709f8e071c593bb9a8c1551b7791d6fd611ded1912065b3b518f6a75a1c78643b0a2e06397707b21768be637cb41b".to_string());
+        let msg = "83a464617461a752657175657374a269649cccd763674174cc9b3f300dccd2ccb0cc8ba67075626b6579dc0040ccc90b2205ccf9cc9358661320ccffccb763ccb57614ccf8ccaa1fccb86d6a087869ccd81acce5ccf16fcc9206cc98344136cca4ccefccb105ccbbccca1c5057ccba25067eccc101cc82ccee21445cccf91e79ccb176447239";
+        let sig = "2535cfe1bcea215dc552acbca1a213354e055709f8e071c593bb9a8c1551b7791d6fd611ded1912065b3b518f6a75a1c78643b0a2e06397707b21768be637cb41b";
 
-        let request = StateKeyRequest { data: msg, sig, block_number: None, addresses: None };
-        let response = get_enc_state_keys(enclave.geteid(), request, epoch_state.nonce, &[]).unwrap();
+        let request = StateKeyRequest::new(msg.from_hex().unwrap(), sig.from_hex().unwrap(), None, None);
+        get_enc_state_keys(enclave.geteid(), request, signed_epoch.get_nonce(), &[]).unwrap();
 
         enclave.destroy();
     }
diff --git a/enigma-principal/app/src/state_keys/mod.rs b/enigma-principal/app/src/state_keys/mod.rs
new file mode 100644
index 00000000..08c4b0c5
--- /dev/null
+++ b/enigma-principal/app/src/state_keys/mod.rs
@@ -0,0 +1 @@
+pub mod keys_keeper_u;
diff --git a/enigma-principal/app/tests/principal_node/config/principal_test_config.json b/enigma-principal/app/tests/principal_node/config/principal_test_config.json
index ac15fe1f..aa8eead2 100644
--- a/enigma-principal/app/tests/principal_node/config/principal_test_config.json
+++ b/enigma-principal/app/tests/principal_node/config/principal_test_config.json
@@ -1,15 +1,12 @@
 {
     "enigma_contract_path": "../app/tests/principal_node/contracts/IEnigma.json",
-    "enigma_contract_remote_path": "",
     "enigma_contract_address": "7beB1C37a25d099f1f1bC28929d66a4ffd2E286E",
     "account_address": "6330a553fc93768f612722bb8c2ec78ac90b3bbc",
-    "test_net": true,
     "with_private_key": false,
     "private_key": "",
     "url": "http://localhost:9545",
     "epoch_size": 10,
     "polling_interval": 1,
-    "max_epochs": 0,
     "spid": "B0335FD3BC1CCA8F804EB98A6420592D",
     "attestation_service_url": "https://sgx.enigma.co/api",
     "attestation_retries": 10,
diff --git a/enigma-principal/app/tests/principal_node/contracts/principal_test_config.json b/enigma-principal/app/tests/principal_node/contracts/principal_test_config.json
index a8e8059c..af7d0e2a 100644
--- a/enigma-principal/app/tests/principal_node/contracts/principal_test_config.json
+++ b/enigma-principal/app/tests/principal_node/contracts/principal_test_config.json
@@ -1,15 +1,12 @@
 {
     "enigma_contract_path": "../app/tests/principal_node/contracts/Enigma.json",
-    "enigma_contract_remote_path": "",
     "enigma_contract_address": "f25186B5081Ff5cE73482AD761DB0eB0d25abfBF",
     "account_address": "627306090abab3a6e1400e9345bc60c78a8bef57",
-    "test_net": true,
     "with_private_key": false,
     "private_key": "",
     "url": "http://localhost:8545",
     "epoch_size": 2,
     "polling_interval": 1,
-    "max_epochs": 0,
     "spid": "B0335FD3BC1CCA8F804EB98A6420592D",
     "attestation_service_url": "https://sgx.enigma.co/api"
 }
\ No newline at end of file
diff --git a/enigma-principal/enclave/Cargo.lock b/enigma-principal/enclave/Cargo.lock
index 40dc4cbf..3945ae1a 100644
--- a/enigma-principal/enclave/Cargo.lock
+++ b/enigma-principal/enclave/Cargo.lock
@@ -10,7 +10,7 @@ dependencies = [
 
 [[package]]
 name = "arrayref"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -23,9 +23,10 @@ dependencies = [
 
 [[package]]
 name = "atty"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -108,9 +109,9 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -118,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.47"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -132,17 +133,17 @@ version = "2.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "constant_time_eq"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -155,7 +156,7 @@ name = "crypto-mac"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -175,10 +176,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "ident_case 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -188,7 +189,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "darling_core 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -220,11 +221,11 @@ dependencies = [
  "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "libsecp256k1 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ring 0.14.6 (git+https://github.com/elichai/ring.git?rev=sgx-0.14.6)",
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sgx_trts 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
  "sgx_tstd 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
  "sgx_types 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
- "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -242,7 +243,7 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log-derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rmp-serde 0.14.0 (git+https://github.com/enigmampc/msgpack-rust.git?rev=0.14.0-sgx-1.0.9)",
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.103 (git+https://github.com/mesalock-linux/serde-sgx.git?rev=sgx_1.0.9)",
  "serde_json 1.0.40 (git+https://github.com/enigmampc/serde-json-sgx.git?rev=1.0.39-sgx-1.0.9)",
  "sgx_tstd 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
@@ -263,7 +264,7 @@ dependencies = [
  "parity-wasm 0.31.3 (git+https://github.com/enigmampc/parity-wasm.git?branch=enigma)",
  "pwasm-utils 0.5.0 (git+https://github.com/enigmampc/wasm-utils.git?rev=0.5.0-sgx-1.0.9)",
  "rmp-serde 0.14.0 (git+https://github.com/enigmampc/msgpack-rust.git?rev=0.14.0-sgx-1.0.9)",
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.103 (git+https://github.com/mesalock-linux/serde-sgx.git?rev=sgx_1.0.9)",
  "serde_json 1.0.40 (git+https://github.com/enigmampc/serde-json-sgx.git?rev=1.0.39-sgx-1.0.9)",
  "sgx_trts 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
@@ -280,9 +281,9 @@ version = "0.3.0"
 dependencies = [
  "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "cbindgen 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.103 (git+https://github.com/mesalock-linux/serde-sgx.git?rev=sgx_1.0.9)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -296,7 +297,7 @@ dependencies = [
  "ethabi 8.0.1 (git+https://github.com/enigmampc/ethabi.git?rev=8.0.1-sgx-1.0.9)",
  "ethereum-types 0.7.0 (git+https://github.com/enigmampc/parity-common.git?rev=0.7.0-sgx-1.0.9)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sgx_trts 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
  "sgx_tstd 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
  "sgx_tunittest 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
@@ -385,9 +386,9 @@ name = "failure_derive"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -402,7 +403,7 @@ version = "0.4.0"
 source = "git+https://github.com/enigmampc/parity-common.git?rev=0.7.0-sgx-1.0.9#8795e50bb84c6d5a8c213ce59bbc442fa743f08e"
 dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -435,12 +436,20 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -486,7 +495,7 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -518,7 +527,7 @@ name = "libsecp256k1"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "digest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hmac-drbg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -541,9 +550,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "darling 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -603,7 +612,7 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -633,7 +642,7 @@ name = "quote"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -649,10 +658,10 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -686,7 +695,7 @@ name = "rand_core"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -723,7 +732,7 @@ name = "ring"
 version = "0.14.6"
 source = "git+https://github.com/elichai/ring.git?rev=sgx-0.14.6#1454e91f6395f6f42033402da38b394bb4941a05"
 dependencies = [
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -736,7 +745,7 @@ name = "rlp"
 version = "0.4.2"
 source = "git+https://github.com/enigmampc/parity-common.git?rev=0.7.0-sgx-1.0.9#8795e50bb84c6d5a8c213ce59bbc442fa743f08e"
 dependencies = [
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -770,7 +779,7 @@ dependencies = [
 
 [[package]]
 name = "rustc-hex"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -789,10 +798,10 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.103"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -800,19 +809,19 @@ name = "serde_derive"
 version = "1.0.103"
 source = "git+https://github.com/mesalock-linux/serde-sgx.git?rev=sgx_1.0.9#2db1fd3880d2a938bade73f0647b243ccfb3206b"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.103"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -828,18 +837,18 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.42"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "sgx_alloc"
 version = "1.0.9"
-source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#2042ce64fd377e790584c96a4bfd4c32de2d03ea"
+source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#46837a05facee93622cdf5c3a1d542525c4fce75"
 dependencies = [
  "sgx_trts 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
 ]
@@ -847,9 +856,9 @@ dependencies = [
 [[package]]
 name = "sgx_backtrace_sys"
 version = "1.0.9"
-source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#2042ce64fd377e790584c96a4bfd4c32de2d03ea"
+source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#46837a05facee93622cdf5c3a1d542525c4fce75"
 dependencies = [
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
  "sgx_build_helper 0.1.0 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
  "sgx_libc 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
 ]
@@ -857,17 +866,17 @@ dependencies = [
 [[package]]
 name = "sgx_build_helper"
 version = "0.1.0"
-source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#2042ce64fd377e790584c96a4bfd4c32de2d03ea"
+source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#46837a05facee93622cdf5c3a1d542525c4fce75"
 
 [[package]]
 name = "sgx_demangle"
 version = "1.0.9"
-source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#2042ce64fd377e790584c96a4bfd4c32de2d03ea"
+source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#46837a05facee93622cdf5c3a1d542525c4fce75"
 
 [[package]]
 name = "sgx_libc"
 version = "1.0.9"
-source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#2042ce64fd377e790584c96a4bfd4c32de2d03ea"
+source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#46837a05facee93622cdf5c3a1d542525c4fce75"
 dependencies = [
  "sgx_types 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
 ]
@@ -875,7 +884,7 @@ dependencies = [
 [[package]]
 name = "sgx_tcrypto"
 version = "1.0.9"
-source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#2042ce64fd377e790584c96a4bfd4c32de2d03ea"
+source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#46837a05facee93622cdf5c3a1d542525c4fce75"
 dependencies = [
  "sgx_types 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
 ]
@@ -883,7 +892,7 @@ dependencies = [
 [[package]]
 name = "sgx_tprotected_fs"
 version = "1.0.9"
-source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#2042ce64fd377e790584c96a4bfd4c32de2d03ea"
+source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#46837a05facee93622cdf5c3a1d542525c4fce75"
 dependencies = [
  "sgx_trts 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
  "sgx_types 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
@@ -892,7 +901,7 @@ dependencies = [
 [[package]]
 name = "sgx_trts"
 version = "1.0.9"
-source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#2042ce64fd377e790584c96a4bfd4c32de2d03ea"
+source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#46837a05facee93622cdf5c3a1d542525c4fce75"
 dependencies = [
  "sgx_libc 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
  "sgx_types 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
@@ -901,7 +910,7 @@ dependencies = [
 [[package]]
 name = "sgx_tse"
 version = "1.0.9"
-source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#2042ce64fd377e790584c96a4bfd4c32de2d03ea"
+source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#46837a05facee93622cdf5c3a1d542525c4fce75"
 dependencies = [
  "sgx_types 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
 ]
@@ -909,7 +918,7 @@ dependencies = [
 [[package]]
 name = "sgx_tseal"
 version = "1.0.9"
-source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#2042ce64fd377e790584c96a4bfd4c32de2d03ea"
+source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#46837a05facee93622cdf5c3a1d542525c4fce75"
 dependencies = [
  "sgx_tcrypto 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
  "sgx_trts 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
@@ -920,7 +929,7 @@ dependencies = [
 [[package]]
 name = "sgx_tstd"
 version = "1.0.9"
-source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#2042ce64fd377e790584c96a4bfd4c32de2d03ea"
+source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#46837a05facee93622cdf5c3a1d542525c4fce75"
 dependencies = [
  "sgx_alloc 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
  "sgx_backtrace_sys 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
@@ -935,7 +944,7 @@ dependencies = [
 [[package]]
 name = "sgx_tunittest"
 version = "1.0.9"
-source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#2042ce64fd377e790584c96a4bfd4c32de2d03ea"
+source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#46837a05facee93622cdf5c3a1d542525c4fce75"
 dependencies = [
  "sgx_tstd 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
 ]
@@ -943,12 +952,12 @@ dependencies = [
 [[package]]
 name = "sgx_types"
 version = "1.0.9"
-source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#2042ce64fd377e790584c96a4bfd4c32de2d03ea"
+source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#46837a05facee93622cdf5c3a1d542525c4fce75"
 
 [[package]]
 name = "sgx_unwind"
 version = "0.0.1"
-source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#2042ce64fd377e790584c96a4bfd4c32de2d03ea"
+source = "git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9#46837a05facee93622cdf5c3a1d542525c4fce75"
 dependencies = [
  "sgx_build_helper 0.1.0 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
  "sgx_trts 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)",
@@ -968,7 +977,7 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -994,7 +1003,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "strsim"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1009,10 +1018,10 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1022,9 +1031,9 @@ name = "synstructure"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1035,7 +1044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
  "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1046,7 +1055,7 @@ name = "textwrap"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1062,7 +1071,7 @@ name = "toml"
 version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1077,12 +1086,12 @@ source = "git+https://github.com/enigmampc/parity-common.git?rev=0.7.0-sgx-1.0.9
 dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "crunchy 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "unicode-width"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1107,7 +1116,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "wasi"
-version = "0.7.0"
+version = "0.9.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1151,9 +1160,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [metadata]
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
+"checksum arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
 "checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
-"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 "checksum block-buffer 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1339a1042f5d9f295737ad4d9a6ab6bf81c84a933dba110b9200cd6d1448b814"
@@ -1165,10 +1174,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
 "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum cbindgen 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1f861ef68cabbb271d373a7795014052bff37edce22c620d95e395e8719d7dc5"
-"checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"
+"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
 "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
-"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
+"checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 "checksum crunchy 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 "checksum crypto-mac 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "779015233ac67d65098614aec748ac1c756ab6677fa2e14cf8b37c08dfed1198"
 "checksum darling 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858"
@@ -1192,13 +1201,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
 "checksum generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fceb69994e330afed50c93524be68c42fa898c2d9fd4ee8da03bd7363acd26f2"
-"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
+"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
 "checksum hmac 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7a13f4163aa0c5ca1be584aace0e2212b2e41be5478218d4f657f5f778b2ae2a"
 "checksum hmac-drbg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4fe727d41d2eec0a6574d887914347e5ff96a3b87177817e2a9820c5c87fecc2"
 "checksum ident_case 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 "checksum impl-rlp 0.2.0 (git+https://github.com/enigmampc/parity-common.git?rev=0.7.0-sgx-1.0.9)" = "<none>"
 "checksum itoa 0.4.4 (git+https://github.com/mesalock-linux/itoa-sgx.git?rev=sgx_1.0.9)" = "<none>"
-"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
+"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
 "checksum json-patch 0.2.5 (git+https://github.com/enigmampc/json-patch.git?rev=0.2.5-sgx-1.0.9)" = "<none>"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
@@ -1213,12 +1223,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 "checksum primitive-types 0.5.1 (git+https://github.com/enigmampc/parity-common.git?rev=0.7.0-sgx-1.0.9)" = "<none>"
 "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
+"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
 "checksum pwasm-utils 0.5.0 (git+https://github.com/enigmampc/wasm-utils.git?rev=0.5.0-sgx-1.0.9)" = "<none>"
 "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
 "checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
+"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 "checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
 "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
 "checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
@@ -1232,14 +1242,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rmp 0.8.7 (git+https://github.com/enigmampc/msgpack-rust.git?rev=0.14.0-sgx-1.0.9)" = "<none>"
 "checksum rmp-serde 0.14.0 (git+https://github.com/enigmampc/msgpack-rust.git?rev=0.14.0-sgx-1.0.9)" = "<none>"
 "checksum rustc-hex 2.0.1 (git+https://github.com/enigmampc/rustc-hex.git?rev=2.0.1-sgx-1.0.9)" = "<none>"
-"checksum rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "403bb3a286107a04825a5f82e1270acc1e14028d3d554d7a1e08914549575ab8"
+"checksum rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
 "checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
 "checksum serde 1.0.103 (git+https://github.com/mesalock-linux/serde-sgx.git?rev=sgx_1.0.9)" = "<none>"
-"checksum serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702"
+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
 "checksum serde_derive 1.0.103 (git+https://github.com/mesalock-linux/serde-sgx.git?rev=sgx_1.0.9)" = "<none>"
-"checksum serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0"
+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
 "checksum serde_json 1.0.40 (git+https://github.com/enigmampc/serde-json-sgx.git?rev=1.0.39-sgx-1.0.9)" = "<none>"
-"checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043"
+"checksum serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "21b01d7f0288608a01dca632cf1df859df6fd6ffa885300fc275ce2ba6221953"
 "checksum sgx_alloc 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)" = "<none>"
 "checksum sgx_backtrace_sys 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)" = "<none>"
 "checksum sgx_build_helper 0.1.0 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)" = "<none>"
@@ -1255,13 +1265,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum sgx_types 1.0.9 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)" = "<none>"
 "checksum sgx_unwind 0.0.1 (git+https://github.com/baidu/rust-sgx-sdk.git?rev=v1.0.9)" = "<none>"
 "checksum sha2 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d963c78ce367df26d7ea8b8cc655c651b42e8a1e584e869c1e17dae3ccb116a"
-"checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d"
+"checksum sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0"
 "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 "checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-"checksum strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6"
+"checksum strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
 "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238"
+"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
 "checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
@@ -1269,12 +1279,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
 "checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
 "checksum uint 0.8.1 (git+https://github.com/enigmampc/parity-common.git?rev=0.7.0-sgx-1.0.9)" = "<none>"
-"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 "checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
 "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
-"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
+"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 "checksum wasmi 0.4.5 (git+https://github.com/enigmampc/wasmi?rev=0.4.2-sgx-1.0.9)" = "<none>"
 "checksum wasmi-validation 0.1.0 (git+https://github.com/enigmampc/wasmi?rev=0.4.2-sgx-1.0.9)" = "<none>"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
diff --git a/enigma-principal/enclave/src/epoch_keeper_t/epoch_t.rs b/enigma-principal/enclave/src/epoch_keeper_t/epoch_t.rs
index fecbca48..7e571df9 100644
--- a/enigma-principal/enclave/src/epoch_keeper_t/epoch_t.rs
+++ b/enigma-principal/enclave/src/epoch_keeper_t/epoch_t.rs
@@ -1,6 +1,6 @@
-use enigma_tools_m::keeper_types::{InputWorkerParams, RawEncodable};
+use enigma_tools_m::keeper_types::{InputWorkerParams};
 use ethabi::Bytes;
-use ethereum_types::{H160, H256, U256, BigEndianHash};
+use ethereum_types::{H160, U256};
 use std::string::ToString;
 use std::vec::Vec;
 
@@ -8,7 +8,7 @@ use enigma_tools_t::common::errors_t::{
     EnclaveError::{self, SystemError},
     EnclaveSystemError,
 };
-use enigma_types::ContractAddress;
+use enigma_types::Hash256;
 use super::nested_encoding::NestedSerialization;
 
 pub type EpochNonce = [u8; 32];
@@ -22,7 +22,7 @@ pub struct Epoch {
 }
 
 impl Epoch {
-    pub fn get_selected_worker(&self, sc_addr: ContractAddress) -> Result<H160, EnclaveError> {
+    pub fn get_selected_worker(&self, sc_addr: Hash256) -> Result<H160, EnclaveError> {
         self.worker_params
             .get_selected_worker(sc_addr, self.seed)
             .ok_or_else(|| SystemError(EnclaveSystemError::WorkerAuthError { err: "Worker selection returns nothing.".to_string() }))
diff --git a/enigma-principal/enclave/src/epoch_keeper_t/mod.rs b/enigma-principal/enclave/src/epoch_keeper_t/mod.rs
index dde595c6..3f2a1414 100644
--- a/enigma-principal/enclave/src/epoch_keeper_t/mod.rs
+++ b/enigma-principal/enclave/src/epoch_keeper_t/mod.rs
@@ -1,6 +1,6 @@
 use core::clone::Clone;
 
-use enigma_tools_m::keeper_types::{decode, EPOCH_CAP, InputWorkerParams, RawEncodable};
+use enigma_tools_m::keeper_types::{decode, EPOCH_CAP, InputWorkerParams};
 use enigma_tools_m::utils::LockExpectMutex;
 use ethereum_types::{H256, U256, BigEndianHash};
 use rustc_hex::ToHex;
@@ -18,7 +18,7 @@ use enigma_tools_t::{
     },
     document_storage_t::{is_document, load_sealed_document, save_sealed_document, SEAL_LOG_SIZE, SealedDocumentStorage},
 };
-use enigma_types::{ContractAddress, Hash256};
+use enigma_types::{Hash256};
 use epoch_keeper_t::epoch_t::{Epoch, EpochMarker, EpochNonce};
 use ocalls_t;
 
@@ -168,7 +168,7 @@ pub(crate) fn ecall_set_worker_params_internal(worker_params_rlp: &[u8], seed_in
     }
     // Add the `Epoch` to the epoch cache regardless of weather it was created or recovered from a sealed marker
     match guard.insert(epoch.nonce.clone(), epoch.clone()) {
-        Some(prev) => debug_println!("New epoch stored successfully"),
+        Some(_) => debug_println!("New epoch stored successfully"),
         None => debug_println!("Initial epoch stored successfully"),
     }
     let msg = epoch.encode_for_hashing();
@@ -177,7 +177,7 @@ pub(crate) fn ecall_set_worker_params_internal(worker_params_rlp: &[u8], seed_in
     Ok(())
 }
 
-pub(crate) fn ecall_get_epoch_worker_internal(sc_addr: ContractAddress, nonce: U256) -> Result<[u8; 20], EnclaveError> {
+pub(crate) fn ecall_get_epoch_worker_internal(sc_addr: Hash256, nonce: U256) -> Result<[u8; 20], EnclaveError> {
     let guard = EPOCH.lock_expect("Epoch");
     let epoch = get_epoch_from_cache(&guard, nonce)?;
     debug_println!("Running worker selection using Epoch: {:?}", epoch);
@@ -188,9 +188,7 @@ pub(crate) fn ecall_get_epoch_worker_internal(sc_addr: ContractAddress, nonce: U
 
 pub mod tests {
     use ethereum_types::{H160, U256};
-    use rustc_hex::FromHex;
     use std::prelude::v1::Vec;
-    use std::string::String;
 
     use super::*;
 
@@ -202,8 +200,8 @@ pub mod tests {
             stakes: vec![U256::from(1), U256::from(1), U256::from(1), U256::from(1)],
         };
         let epoch = Epoch { nonce: U256::from(0), seed: U256::from(1), worker_params };
-        let sc_addr = ContractAddress::from([1u8; 32]);
-        let worker = epoch.get_selected_worker(sc_addr).unwrap();
+        let sc_addr = Hash256::from([1u8; 32]);
+        let _worker = epoch.get_selected_worker(sc_addr).unwrap();
     }
 
     pub fn test_create_epoch_image() {
diff --git a/enigma-principal/enclave/src/keys_keeper_t/mod.rs b/enigma-principal/enclave/src/keys_keeper_t/mod.rs
index 09c1e973..a054bd0c 100644
--- a/enigma-principal/enclave/src/keys_keeper_t/mod.rs
+++ b/enigma-principal/enclave/src/keys_keeper_t/mod.rs
@@ -6,7 +6,6 @@ use sgx_trts::trts::rsgx_read_rand;
 use std::{collections::HashMap, path, sync::SgxMutex, vec::Vec, string::String};
 
 use enigma_crypto::{asymmetric::KeyPair, Encryption};
-use enigma_crypto::hash::Keccak256;
 use enigma_tools_t::{
     common::errors_t::{
             EnclaveError::{self, *},
@@ -15,19 +14,18 @@ use enigma_tools_t::{
     document_storage_t::{is_document, load_sealed_document, save_sealed_document, SEAL_LOG_SIZE, SealedDocumentStorage},
 };
 use enigma_tools_m::utils::LockExpectMutex;
-use enigma_types::{ContractAddress, Hash256, StateKey};
+use enigma_types::{Hash256, StateKey};
 use epoch_keeper_t::ecall_get_epoch_worker_internal;
 use ocalls_t;
 use ethereum_types::U256;
 use rustc_hex::ToHex;
 
 use crate::SIGNING_KEY;
-use sgx_types::uint8_t;
 
 const STATE_KEYS_DIR: &str = "state-keys";
 
 lazy_static! {
-    pub static ref STATE_KEY_STORE: SgxMutex<HashMap<ContractAddress, StateKey>> = SgxMutex::new(HashMap::new());
+    pub static ref STATE_KEY_STORE: SgxMutex<HashMap<Hash256, StateKey>> = SgxMutex::new(HashMap::new());
 }
 
 /// The state keys root path is guaranteed to exist of the enclave was initialized
@@ -37,14 +35,14 @@ fn get_state_keys_root_path() -> path::PathBuf {
     path_buf
 }
 
-fn get_document_path(sc_addr: &ContractAddress) -> path::PathBuf {
+fn get_document_path(sc_addr: &Hash256) -> path::PathBuf {
     get_state_keys_root_path().join(format!("{}.{}", sc_addr.to_hex::<String>(), "sealed"))
 }
 
 /// Read state keys from the cache and sealed documents.
 /// Adds keys to the cache after unsealing.
-fn get_state_keys(keys_map: &mut HashMap<ContractAddress, StateKey>,
-                  sc_addrs: &[ContractAddress]) -> Result<Vec<Option<StateKey>>, EnclaveError> {
+fn get_state_keys(keys_map: &mut HashMap<Hash256, StateKey>,
+                  sc_addrs: &[Hash256]) -> Result<Vec<Option<StateKey>>, EnclaveError> {
     let mut results: Vec<Option<StateKey>> = Vec::new();
     for &addr in sc_addrs {
         let key = match keys_map.get(&addr) {
@@ -79,8 +77,8 @@ fn get_state_keys(keys_map: &mut HashMap<ContractAddress, StateKey>,
 }
 
 /// Creates new state keys both in the cache and as sealed documents
-fn new_state_keys(keys_map: &mut HashMap<ContractAddress, StateKey>,
-                  sc_addrs: &[ContractAddress]) -> Result<Vec<StateKey>, EnclaveError> {
+fn new_state_keys(keys_map: &mut HashMap<Hash256, StateKey>,
+                  sc_addrs: &[Hash256]) -> Result<Vec<StateKey>, EnclaveError> {
     let mut results: Vec<StateKey> = Vec::new();
     for &addr in sc_addrs {
         let mut doc: SealedDocumentStorage<StateKey> = SealedDocumentStorage {
@@ -104,15 +102,15 @@ fn new_state_keys(keys_map: &mut HashMap<ContractAddress, StateKey>,
     Ok(results)
 }
 
-fn build_get_state_keys_response(sc_addrs: Vec<ContractAddress>) -> Result<Vec<(ContractAddress, StateKey)>, EnclaveError> {
-    let mut response_data: Vec<(ContractAddress, StateKey)> = Vec::new();
+fn build_get_state_keys_response(sc_addrs: Vec<Hash256>) -> Result<Vec<(Hash256, StateKey)>, EnclaveError> {
+    let mut response_data: Vec<(Hash256, StateKey)> = Vec::new();
     if sc_addrs.is_empty() {
         return Ok(response_data);
     }
     let mut guard = STATE_KEY_STORE.lock_expect("State Key Store");
     let keys = get_state_keys(&mut guard, &sc_addrs)?;
     // Create the state keys not found in storage
-    let mut new_addrs: Vec<ContractAddress> = Vec::new();
+    let mut new_addrs: Vec<Hash256> = Vec::new();
     for (i, key) in keys.iter().enumerate() {
         if key.is_none() {
             new_addrs.push(sc_addrs[i]);
@@ -133,15 +131,19 @@ fn build_get_state_keys_response(sc_addrs: Vec<ContractAddress>) -> Result<Vec<(
 
 /// Get encrypted state keys
 pub(crate) fn ecall_get_enc_state_keys_internal(
-    msg_bytes: &[u8], sc_addrs: Vec<ContractAddress>, sig: [u8; 65], epoch_nonce: [u8; 32],
-    sig_out: &mut [u8; 65]) -> Result<Vec<u8>, EnclaveError> {
+    msg_bytes: &[u8],
+    sc_addrs: Vec<Hash256>,
+    sig: [u8; 65],
+    epoch_nonce: [u8; 32],
+    sig_out: &mut [u8; 65]
+) -> Result<Vec<u8>, EnclaveError> {
     let msg = PrincipalMessage::from_message(msg_bytes)?;
     let user_pubkey = msg.get_pubkey();
     let msg_id = msg.get_id();
     // Create the request image before the worker selection guard to avoid cloning the message data
     let image = msg.to_sign()?;
     let recovered_addr = KeyPair::recover(&image, sig)?.address();
-    let nonce = U256::from(epoch_nonce.as_ref());
+    let nonce = U256::from(&epoch_nonce);
     for sc_addr in sc_addrs.clone() {
         let worker_addr = ecall_get_epoch_worker_internal(sc_addr, nonce)?;
         if worker_addr != recovered_addr {
@@ -181,7 +183,7 @@ pub mod tests {
             "9F86D081884C7D659A2FEAA0C55AD015A3BF4F1B2B0B822CD15D6C15B0F00A08".from_hex().unwrap(),
             "60303AE22B998861BCE3B28F33EEC1BE758A213C86C93C076DBE9F558C11C752".from_hex().unwrap(),
         ];
-        let mut sc_addrs: Vec<ContractAddress> = Vec::new();
+        let mut sc_addrs: Vec<Hash256> = Vec::new();
         for (_i, addr) in data.iter().enumerate() {
             let mut a: Hash256 = [0u8; 32].into();
             a.copy_from_slice(addr);
diff --git a/enigma-principal/enclave/src/lib.rs b/enigma-principal/enclave/src/lib.rs
index 76925947..9413f8c3 100644
--- a/enigma-principal/enclave/src/lib.rs
+++ b/enigma-principal/enclave/src/lib.rs
@@ -24,12 +24,12 @@ extern crate sgx_types;
 extern crate rustc_hex;
 
 use enigma_tools_m::utils::EthereumAddress;
-use sgx_types::{sgx_report_t, sgx_status_t, sgx_target_info_t, uint8_t};
+use sgx_types::{sgx_report_t, sgx_status_t, sgx_target_info_t};
 use std::{mem, slice};
 
 use enigma_crypto::asymmetric;
 use enigma_tools_t::{esgx::ocalls_t, quote_t, storage_t};
-use enigma_types::{ContractAddress, EnclaveReturn};
+use enigma_types::{Hash256, EnclaveReturn};
 
 use crate::{epoch_keeper_t::ecall_set_worker_params_internal, keys_keeper_t::ecall_get_enc_state_keys_internal};
 
@@ -110,7 +110,7 @@ pub unsafe extern "C" fn ecall_get_enc_state_keys(msg: *const u8, msg_len: usize
                                                   epoch_nonce: &[u8; 32], serialized_ptr: *mut u64,
                                                   sig_out: &mut [u8; 65]) -> EnclaveReturn {
     let msg_bytes = slice::from_raw_parts(msg, msg_len);
-    let addrs_bytes = slice::from_raw_parts(addrs as *const ContractAddress, addrs_len / mem::size_of::<ContractAddress>()).to_vec();
+    let addrs_bytes = slice::from_raw_parts(addrs as *const Hash256, addrs_len / mem::size_of::<Hash256>()).to_vec();
     let response = match ecall_get_enc_state_keys_internal(msg_bytes, addrs_bytes, *sig, *epoch_nonce, sig_out) {
         Ok(response) => response,
         Err(err) => {
diff --git a/enigma-runtime-t/src/data/delta.rs b/enigma-runtime-t/src/data/delta.rs
index 1a259505..13edcb50 100644
--- a/enigma-runtime-t/src/data/delta.rs
+++ b/enigma-runtime-t/src/data/delta.rs
@@ -1,7 +1,7 @@
 use enigma_tools_t::common::errors_t::EnclaveError;
 use enigma_crypto::hash::Keccak256;
 use enigma_crypto::{symmetric, Encryption};
-use enigma_types::{Hash256, ContractAddress, StateKey};
+use enigma_types::{Hash256, StateKey};
 use json_patch;
 use rmps::{Deserializer, Serializer};
 use serde::{Deserialize, Serialize};
@@ -12,7 +12,7 @@ pub struct StatePatch {
     pub patch: json_patch::Patch,
     pub previous_hash: Hash256,
     #[serde(skip)]
-    pub contract_address: ContractAddress,
+    pub contract_address: Hash256,
     #[serde(skip)]
     pub index: u32,
 }
@@ -20,7 +20,7 @@ pub struct StatePatch {
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Default)]
 pub struct EncryptedPatch {
     pub data: Vec<u8>,
-    pub contract_address: ContractAddress,
+    pub contract_address: Hash256,
     pub index: u32,
 }
 
diff --git a/enigma-runtime-t/src/data/mod.rs b/enigma-runtime-t/src/data/mod.rs
index 3a6ac789..958721f2 100644
--- a/enigma-runtime-t/src/data/mod.rs
+++ b/enigma-runtime-t/src/data/mod.rs
@@ -22,7 +22,7 @@ pub mod tests {
     use crate::data::*;
     use enigma_crypto::hash::Sha256;
     use enigma_crypto::Encryption;
-    use enigma_types::ContractAddress;
+    use enigma_types::Hash256;
     use json_patch;
     use serde_json::{self, Map, Value};
     use std::string::String;
@@ -105,7 +105,7 @@ pub mod tests {
 
     pub fn test_encrypt_patch() {
         let s = "[{\"op\":\"replace\",\"path\":\"/author/name2\",\"value\":\"Lennon\"},{\"op\":\"add\",\"path\":\"/tags/2\",\"value\":\"third\"},{\"op\":\"remove\",\"path\":\"/title\"}]";
-        let contract_address: ContractAddress = [1u8; 32].into();
+        let contract_address: Hash256 = [1u8; 32].into();
         let index = 99;
         let patch = StatePatch { patch: serde_json::from_str(s).unwrap(), previous_hash: [0u8; 32].into(), contract_address, index };
 
@@ -120,7 +120,7 @@ pub mod tests {
 
     pub fn test_decrypt_patch() {
         let s = "[{\"op\":\"replace\",\"path\":\"/author/name2\",\"value\":\"Lennon\"},{\"op\":\"add\",\"path\":\"/tags/2\",\"value\":\"third\"},{\"op\":\"remove\",\"path\":\"/title\"}]";
-        let contract_address: ContractAddress = [1u8; 32].into();
+        let contract_address: Hash256 = [1u8; 32].into();
         let patch = StatePatch { patch: serde_json::from_str(s).unwrap(), previous_hash: [0u8; 32].into(), contract_address, index: 0 };
 
         let key = b"EnigmaMPC".sha256();
diff --git a/enigma-runtime-t/src/data/state.rs b/enigma-runtime-t/src/data/state.rs
index 30704f13..10076a97 100644
--- a/enigma-runtime-t/src/data/state.rs
+++ b/enigma-runtime-t/src/data/state.rs
@@ -1,8 +1,7 @@
 use crate::data::{DeltasInterface, IOInterface, StatePatch};
 use enigma_tools_t::common::errors_t::{EnclaveError, EnclaveError::*, EnclaveSystemError::*};
-use enigma_types::{ContractAddress, StateKey};
+use enigma_types::{Hash256, StateKey};
 use enigma_crypto::{symmetric, Encryption};
-use enigma_types::Hash256;
 use json_patch;
 use rmps::{Deserializer, Serializer};
 use serde::{Deserialize, Serialize};
@@ -14,7 +13,7 @@ use data::EncryptedPatch;
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, Default)]
 pub struct ContractState {
     #[serde(skip)]
-    pub contract_address: ContractAddress,
+    pub contract_address: Hash256,
     pub json: Value,
     pub delta_hash: Hash256,
     pub delta_index: u32,
@@ -22,12 +21,12 @@ pub struct ContractState {
 
 #[derive(Debug, PartialEq, Clone)]
 pub struct EncryptedContractState<T> {
-    pub contract_address: ContractAddress,
+    pub contract_address: Hash256,
     pub json: Vec<T>,
 }
 
 impl ContractState {
-    pub fn new(contract_address: ContractAddress) -> ContractState {
+    pub fn new(contract_address: Hash256) -> ContractState {
         let json = serde_json::from_str("{}").unwrap();
         ContractState { contract_address, json,.. Default::default() }
     }
diff --git a/enigma-runtime-t/src/ocalls_t.rs b/enigma-runtime-t/src/ocalls_t.rs
index bf6f23ed..b1897ad7 100644
--- a/enigma-runtime-t/src/ocalls_t.rs
+++ b/enigma-runtime-t/src/ocalls_t.rs
@@ -1,26 +1,26 @@
 use crate::data::{EncryptedContractState, EncryptedPatch};
 use enigma_tools_t::common::errors_t::{EnclaveError, EnclaveError::*, EnclaveSystemError::*};
-use enigma_types::{ContractAddress, EnclaveReturn, traits::SliceCPtr, RawPointer};
+use enigma_types::{Hash256, EnclaveReturn, traits::SliceCPtr, RawPointer};
 use sgx_types::sgx_status_t;
 use std::string::ToString;
 use std::vec::Vec;
 
 extern "C" {
-    fn ocall_get_deltas_sizes(retval: *mut EnclaveReturn, db_ptr: *const RawPointer, addr: &ContractAddress,
+    fn ocall_get_deltas_sizes(retval: *mut EnclaveReturn, db_ptr: *const RawPointer, addr: &Hash256,
                               start: *const u32, end: *const u32,
                               res_ptr: *mut usize, res_len: usize) -> sgx_status_t;
-    fn ocall_get_deltas(retval: *mut EnclaveReturn, db_ptr: *const RawPointer, addr: &ContractAddress,
+    fn ocall_get_deltas(retval: *mut EnclaveReturn, db_ptr: *const RawPointer, addr: &Hash256,
                         start: *const u32, end: *const u32,
                         res_ptr: *mut u8, res_len: usize) -> sgx_status_t;
     fn ocall_new_delta(retval: *mut EnclaveReturn, db_ptr: *const RawPointer,
                        enc_delta: *const u8, delta_len: usize,
-                       contract_address: &ContractAddress, delta_index_: *const u32) -> sgx_status_t;
+                       contract_address: &Hash256, delta_index_: *const u32) -> sgx_status_t;
     fn ocall_remove_delta(retval: *mut EnclaveReturn, db_ptr: *const RawPointer,
-                       contract_address: &ContractAddress, delta_index_: *const u32) -> sgx_status_t;
+                          contract_address: &Hash256, delta_index_: *const u32) -> sgx_status_t;
 
-    fn ocall_get_state_size(retval: *mut EnclaveReturn, db_ptr: *const RawPointer, addr: &ContractAddress, state_len: *mut usize) -> sgx_status_t;
-    fn ocall_get_state(retval: *mut EnclaveReturn, db_ptr: *const RawPointer, addr: &ContractAddress, state_ptr: *mut u8, state_len: usize) -> sgx_status_t;
-    fn ocall_update_state(retval: *mut EnclaveReturn, db_ptr: *const RawPointer, id: &ContractAddress, enc_delta: *const u8, delta_len: usize) -> sgx_status_t;
+    fn ocall_get_state_size(retval: *mut EnclaveReturn, db_ptr: *const RawPointer, addr: &Hash256, state_len: *mut usize) -> sgx_status_t;
+    fn ocall_get_state(retval: *mut EnclaveReturn, db_ptr: *const RawPointer, addr: &Hash256, state_ptr: *mut u8, state_len: usize) -> sgx_status_t;
+    fn ocall_update_state(retval: *mut EnclaveReturn, db_ptr: *const RawPointer, id: &Hash256, enc_delta: *const u8, delta_len: usize) -> sgx_status_t;
 }
 
 pub unsafe fn save_state(db_ptr: *const RawPointer, enc: &EncryptedContractState<u8>) -> Result<(), EnclaveError> {
@@ -74,7 +74,7 @@ pub fn remove_delta(db_ptr: *const RawPointer, enc: &EncryptedPatch) -> Result<(
     }
 }
 
-pub fn get_state(db_ptr: *const RawPointer, contract_address: ContractAddress) -> Result<EncryptedContractState<u8>, EnclaveError> {
+pub fn get_state(db_ptr: *const RawPointer, contract_address: Hash256) -> Result<EncryptedContractState<u8>, EnclaveError> {
     let mut retval = EnclaveReturn::default();
     let mut state_len = 0usize;
     let status = unsafe { ocall_get_state_size(&mut retval, db_ptr, &contract_address, &mut state_len) };
@@ -96,7 +96,7 @@ pub fn get_state(db_ptr: *const RawPointer, contract_address: ContractAddress) -
     Ok(EncryptedContractState { contract_address, json: state })
 }
 
-pub fn get_deltas(db_ptr: *const RawPointer, contract_address: ContractAddress, start: u32, end: u32) -> Result<Vec<EncryptedPatch>, EnclaveError> {
+pub fn get_deltas(db_ptr: *const RawPointer, contract_address: Hash256, start: u32, end: u32) -> Result<Vec<EncryptedPatch>, EnclaveError> {
     let len = (end - start) as usize;
     let mut deltas_buff = vec![0usize; len];
     let mut retval = EnclaveReturn::default();
@@ -137,7 +137,7 @@ pub fn get_deltas(db_ptr: *const RawPointer, contract_address: ContractAddress,
 pub mod tests {
     use super::{get_deltas, get_state, save_delta, save_state, EncryptedContractState, EncryptedPatch};
     use crate::data::ContractState;
-    use enigma_types::{ContractAddress, RawPointer};
+    use enigma_types::{Hash256, RawPointer};
     use enigma_crypto::hash::Sha256;
     use enigma_crypto::Encryption;
     use serde_json::Value;
@@ -193,7 +193,7 @@ pub mod tests {
         assert!(res.is_ok());
     }
 
-    unsafe fn save_deltas(db_ptr: *const RawPointer, start: u32, end: u32, contract_address: &ContractAddress) -> Vec<EncryptedPatch> {
+    unsafe fn save_deltas(db_ptr: *const RawPointer, start: u32, end: u32, contract_address: &Hash256) -> Vec<EncryptedPatch> {
         let mut deltas = Vec::new();
         for i in start..end {
             let mut delta_data = b"data".sha256().to_vec();
diff --git a/enigma-tools-m/src/keeper_types.rs b/enigma-tools-m/src/keeper_types.rs
index 2e7c94c0..00d7f62a 100644
--- a/enigma-tools-m/src/keeper_types.rs
+++ b/enigma-tools-m/src/keeper_types.rs
@@ -8,7 +8,7 @@ use bigint;
 use crate::ethabi::{encode, Address, Bytes, Token};
 use crate::ethereum_types::{H160, U256};
 use enigma_crypto::hash::Keccak256;
-use enigma_types::ContractAddress;
+use enigma_types::Hash256;
 pub use rlp::{decode, encode as rlpEncode, Encodable, Decodable, DecoderError, UntrustedRlp, RlpStream};
 
 pub const EPOCH_CAP: usize = 2;
@@ -32,7 +32,7 @@ pub trait RawEncodable {
 #[derive(Clone)]
 struct WorkerSelectionToken {
     pub seed: U256,
-    pub sc_addr: ContractAddress,
+    pub sc_addr: Hash256,
     pub nonce: U256,
 }
 
@@ -60,7 +60,7 @@ impl InputWorkerParams {
     /// * `seed` - The random seed for the selected epoch
     ///
     #[logfn(DEBUG)]
-    pub fn get_selected_worker(&self, sc_addr: ContractAddress, seed: U256) -> Option<Address> {
+    pub fn get_selected_worker(&self, sc_addr: Hash256, seed: U256) -> Option<Address> {
         debug!("Finding selected worker for sc_addr: {:?} and seed: {:?}", sc_addr, seed);
         let workers = self.get_selected_workers(sc_addr, seed, None);
         if workers.is_empty() {
@@ -71,7 +71,7 @@ impl InputWorkerParams {
     }
 
     #[logfn(DEBUG)]
-    fn get_selected_workers(&self, sc_addr: ContractAddress, seed: U256, group_size: Option<u64>) -> Vec<Address> {
+    fn get_selected_workers(&self, sc_addr: Hash256, seed: U256, group_size: Option<u64>) -> Vec<Address> {
         let mut selected_workers = Vec::new();
         if self.workers.is_empty() || self.workers.len() != self.stakes.len() {
             debug!("Invalid worker selection parameters {:?}", self);
diff --git a/enigma-tools-m/src/primitives/km_primitives.rs b/enigma-tools-m/src/primitives/km_primitives.rs
index d9bacdb4..62dd0976 100644
--- a/enigma-tools-m/src/primitives/km_primitives.rs
+++ b/enigma-tools-m/src/primitives/km_primitives.rs
@@ -8,7 +8,7 @@ use crate::rmp_serde::{Deserializer, Serializer};
 use crate::serde::{Deserialize, Serialize};
 use crate::serde_json;
 use enigma_crypto::{rand, symmetric, CryptoError, Encryption, hash};
-use enigma_types::{ContractAddress, DhKey, PubKey, StateKey};
+use enigma_types::{Hash256, DhKey, PubKey, StateKey};
 
 /// A Message ID type, used to identify each message to the response.
 pub type MsgID = [u8; 12];
@@ -31,7 +31,7 @@ pub fn verify_key_size(pubkey: &[u8]) -> Result<(), ToolsError> {
 #[serde(crate = "crate::serde")]
 pub enum PrincipalMessageType {
     /// A Response from the KM node, containing a list of (Address, Key) tuples.
-    Response(Vec<(ContractAddress, StateKey)>),
+    Response(Vec<(Hash256, StateKey)>),
     /// A Request for the KM node.
     // todo: split PrincipalMessage into PrincipalRequestMessage and PrincipalResponseMessage
     // todo: in order to remove redundant fields (data is not needed for ptt request)
diff --git a/enigma-tools-u/Cargo.toml b/enigma-tools-u/Cargo.toml
index 444123a7..315eed4f 100644
--- a/enigma-tools-u/Cargo.toml
+++ b/enigma-tools-u/Cargo.toml
@@ -23,6 +23,7 @@ log = "0.4"
 log4rs = {version = "0.9.0", features = ["rolling_file_appender"] }
 log-derive = "0.3"
 dirs = "1.0.4"
+thiserror = "1.0.10"
 tiny-keccak = { version = "1.5.0", features = ["keccak"] }
 # TODO: Change after a new version is released.
 # Add more transport layers via features if needed.
diff --git a/enigma-tools-u/src/common_u/errors.rs b/enigma-tools-u/src/common_u/errors.rs
index 8ea23eb3..b796c65e 100644
--- a/enigma-tools-u/src/common_u/errors.rs
+++ b/enigma-tools-u/src/common_u/errors.rs
@@ -1,32 +1,34 @@
+use thiserror::Error;
+
 use sgx_types::sgx_status_t;
 
 // error while request attestation service
-#[derive(Fail, Debug)]
-#[fail(display = "Error while using the attestation service info = ({})", message)]
+#[derive(Error, Debug)]
+#[error("Error while using the attestation service info = ({message:?})")]
 pub struct AttestationServiceErr {
     pub message: String,
 }
 
-#[derive(Fail, Debug)]
-#[fail(display = "Error while decoding the quote = ({})", message)]
+#[derive(Error, Debug)]
+#[error("Error while decoding the quote = ({message:?})")]
 pub struct QuoteErr {
     pub message: String,
 }
 
-#[derive(Fail, Debug)]
-#[fail(display = "Error while decoding the quote = ({})", message)]
+#[derive(Error, Debug)]
+#[error("Error while decoding the quote = ({message:?})")]
 pub struct WasmError {
     pub message: String,
 }
 
-#[derive(Fail, Debug)]
-#[fail(display = "Error while using the web3 server = ({})", message)]
+#[derive(Error, Debug)]
+#[error("Error while using the web3 server = ({message:?})")]
 pub struct Web3Error {
     pub message: String,
 }
 
-#[derive(Fail, Debug)]
-#[fail(display = "SGX Ecall Failed function: {}, status: {}", function, status)]
+#[derive(Error, Debug)]
+#[error("SGX Ecall Failed function: {function:?}, status: {status:?}")]
 pub struct SgxError {
     pub status: sgx_status_t,
     pub function: &'static str,
diff --git a/enigma-tools-u/src/lib.rs b/enigma-tools-u/src/lib.rs
index ce48801e..9f926e8c 100644
--- a/enigma-tools-u/src/lib.rs
+++ b/enigma-tools-u/src/lib.rs
@@ -21,6 +21,7 @@ extern crate sgx_urts;
 #[macro_use]
 extern crate log;
 extern crate log4rs;
+extern crate thiserror;
 
 #[macro_use]
 extern crate log_derive;
diff --git a/enigma-tools-u/src/tests/web3_tests/principal_test_config.json b/enigma-tools-u/src/tests/web3_tests/principal_test_config.json
index e5f997d2..75f6f385 100644
--- a/enigma-tools-u/src/tests/web3_tests/principal_test_config.json
+++ b/enigma-tools-u/src/tests/web3_tests/principal_test_config.json
@@ -1,9 +1,7 @@
 {
     "ENIGMA_CONTRACT_PATH" : "../app/tests/principal_node/contracts/Enigma.json",
-    "ENIGMA_CONTRACT_REMOTE_PATH" : "",
     "ENIGMA_CONTRACT_ADDRESS" : "f25186B5081Ff5cE73482AD761DB0eB0d25abfBF",
     "ACCOUNT_ADDRESS" : "627306090abab3a6e1400e9345bc60c78a8bef57",
-    "TEST_NET" : true,
     "WITH_PRIVATE_KEY" : false,
     "PRIVATE_KEY" : "",
     "URL" : "http://localhost:8545",
diff --git a/enigma-tools-u/src/web3_utils/enigma_contract.rs b/enigma-tools-u/src/web3_utils/enigma_contract.rs
index 9a145d05..e9f57623 100644
--- a/enigma-tools-u/src/web3_utils/enigma_contract.rs
+++ b/enigma-tools-u/src/web3_utils/enigma_contract.rs
@@ -1,6 +1,5 @@
 use std::path::Path;
 use std::str;
-use std::sync::Arc;
 
 use failure::Error;
 use hex::{FromHex};
@@ -11,7 +10,7 @@ use web3::types::{Address, Bytes, H160, H256, TransactionReceipt, U256};
 use web3::Web3;
 
 use enigma_crypto::EcdsaSign;
-use enigma_types::ContractAddress;
+use enigma_types::Hash256;
 
 use crate::common_u::errors;
 use crate::web3_utils::w3utils;
@@ -21,12 +20,13 @@ use super::contract_ext::signed_call_with_confirmations;
 // Creating another one means more threads and more things to handle.
 // Important!! When the eloop is dropped the Web3/Contract will stop to work!
 
+
 pub struct EnigmaContract {
-    pub web3: Arc<Web3<Http>>,
+    pub web3: Web3<Http>,
     pub eloop: EventLoopHandle,
     pub w3_contract: Contract<Http>,
     ethabi_contract: ethabi::Contract, // This should match the `ethabi::Contract` in `self.web3_contract`
-    pub account: Address,
+    account: Address,
     pub chain_id: u64,
     pub signer: Box<dyn EcdsaSign + Send + Sync>,
 }
@@ -63,24 +63,26 @@ impl EnigmaContract {
         let abi_json = w3utils::load_contract_abi(abi_path)?;
         let ethabi_contract = ethabi::Contract::load(abi_json.as_bytes()).map_err(|e| failure::err_msg(e.to_string()))?;
         let w3_contract = Contract::new(web3.eth(), contract_address.parse()?, ethabi_contract.clone());
-        Ok(EnigmaContract { web3: Arc::new(web3), eloop, w3_contract, ethabi_contract, account, signer, chain_id })
+        Ok(EnigmaContract { web3, eloop, w3_contract, ethabi_contract, account, signer, chain_id })
     }
 
     pub fn address(&self) -> Address { self.w3_contract.address() }
+
+    pub fn get_km_account(&self) -> Address {self.account}
 }
 
-pub trait ContractFuncs<G> {
-    fn register(&self, staking_address: H160, signing_address: H160, report: String, signature: String, gas: G, confirmations: usize) -> Result<TransactionReceipt, Error>;
+pub trait ContractFuncs {
+    fn register(&self, staking_address: H160, signing_address: H160, report: String, signature: String, gas: U256, confirmations: usize) -> Result<TransactionReceipt, Error>;
 
-    fn set_workers_params(&self, block_number: U256, seed: U256, sig: Bytes, gas: G, confirmations: usize) -> Result<TransactionReceipt, Error>;
+    fn set_workers_params(&self, block_number: U256, seed: U256, sig: Bytes, gas: U256, confirmations: usize) -> Result<TransactionReceipt, Error>;
 }
 
-impl<G: Into<U256>> ContractFuncs<G> for EnigmaContract {
+impl ContractFuncs for EnigmaContract {
     #[logfn(DEBUG)]
-    fn register(&self, staking_address: H160, signing_address: H160, report: String, signature: String, gas: G, confirmations: usize) -> Result<TransactionReceipt, Error> {
+    fn register(&self, staking_address: H160, signing_address: H160, report: String, signature: String, gas: U256, confirmations: usize) -> Result<TransactionReceipt, Error> {
         // register
         let mut opts = Options::default();
-        opts.gas = Some(gas.into());
+        opts.gas = Some(gas);
         // call the register function
         let report = report.as_bytes().to_vec();
         let signature = signature.from_hex()?;
@@ -104,9 +106,9 @@ impl<G: Into<U256>> ContractFuncs<G> for EnigmaContract {
     }
 
     #[logfn(DEBUG)]
-    fn set_workers_params(&self, block_number: U256, seed: U256, sig: Bytes, gas: G, confirmations: usize) -> Result<TransactionReceipt, Error> {
+    fn set_workers_params(&self, block_number: U256, seed: U256, sig: Bytes, gas: U256, confirmations: usize) -> Result<TransactionReceipt, Error> {
         let mut opts: Options = Options::default();
-        opts.gas = Some(gas.into());
+        opts.gas = Some(gas);
         let call = signed_call_with_confirmations(
             &self.web3,
             &self.ethabi_contract,
@@ -140,10 +142,10 @@ pub trait ContractQueries {
 
     // getSecretContractAddresses
     // input: uint _start, uint _stop
-    fn get_secret_contract_addresses(&self, start: U256, stop: U256) -> Result<Vec<ContractAddress>, Error>;
+    fn get_secret_contract_addresses(&self, start: U256, stop: U256) -> Result<Vec<Hash256>, Error>;
 
     // getAllSecretContractAddresses
-    fn get_all_secret_contract_addresses(&self) -> Result<Vec<ContractAddress>, Error>;
+    fn get_all_secret_contract_addresses(&self) -> Result<Vec<Hash256>, Error>;
 }
 
 impl ContractQueries for EnigmaContract {
@@ -179,7 +181,7 @@ impl ContractQueries for EnigmaContract {
     }
 
     #[logfn(INFO)]
-    fn get_secret_contract_addresses(&self, start: U256, stop: U256) -> Result<Vec<ContractAddress>, Error> {
+    fn get_secret_contract_addresses(&self, start: U256, stop: U256) -> Result<Vec<Hash256>, Error> {
         let addrs: Vec<H256> =
             match self.w3_contract.query("getSecretContractAddresses", (start, stop), self.account, Options::default(), None).wait() {
                 Ok(addrs) => addrs,
@@ -187,15 +189,15 @@ impl ContractQueries for EnigmaContract {
                     return Err(errors::Web3Error { message: format!("Unable to query getSecretContractAddresses: {:?}", e) }.into())
                 }
             };
-        Ok(addrs.into_iter().map(|a|ContractAddress::from(a.0)).collect())
+        Ok(addrs.into_iter().map(|a| Hash256::from(a.0)).collect())
     }
 
     #[logfn(DEBUG)]
-    fn get_all_secret_contract_addresses(&self) -> Result<Vec<ContractAddress>, Error> {
+    fn get_all_secret_contract_addresses(&self) -> Result<Vec<Hash256>, Error> {
         self.w3_contract
             .query("getAllSecretContractAddresses", (),self.account, Options::default(), None)
             .wait()
-            .map(|addrs: Vec<H256>| addrs.into_iter().map(|a| ContractAddress::from(a.0 )).collect())
+            .map(|addrs: Vec<H256>| addrs.into_iter().map(|a| Hash256::from(a.0 )).collect())
             .map_err(|e| errors::Web3Error { message: format!("Unable to query getAllSecretContractAddresses: {:?}", e) }.into())
     }
 }