From 3d2e9efb1ed856f68a42662875e4e9df97908958 Mon Sep 17 00:00:00 2001
From: NikVolf <nikvolf@gmail.com>
Date: Mon, 27 Mar 2017 18:39:21 +0300
Subject: [PATCH 001/117] P1, P2 definition

---
 Cargo.lock             |  2 +-
 ethcore/src/builtin.rs | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1a25c8553..3b5eded0a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -180,7 +180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "bn"
 version = "0.4.3"
-source = "git+https://github.com/paritytech/bn#59d848e642ad1ff0d60e39348576a6f11ee123b8"
+source = "git+https://github.com/paritytech/bn#5df8d83c19f3fb97ae3fdefa5bad5279babe795e"
 dependencies = [
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ethcore/src/builtin.rs b/ethcore/src/builtin.rs
index bdedd5739..c240250df 100644
--- a/ethcore/src/builtin.rs
+++ b/ethcore/src/builtin.rs
@@ -191,6 +191,9 @@ struct Bn128AddImpl;
 #[derive(Debug)]
 struct Bn128MulImpl;
 
+#[derive(Debug)]
+struct Bn128ParingImpl;
+
 impl Impl for Identity {
 	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), Error> {
 		output.write(0, input);
@@ -393,6 +396,31 @@ impl Impl for Bn128MulImpl {
 	}	
 }
 
+impl Impl for Bn128ParingImpl {
+	// Can fail if any of the 2 points does not belong the bn128 curve
+	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), Error> {
+		use bn::{Fq, Fq2, AffineG1, AffineG2};
+
+		let p1 = AffineG1::new(
+			Fq::from_str("1").expect("1 is a valid field element"),
+			Fq::from_str("2").expect("2 is a valid field element"),
+		).expect("Generator P1(1, 2) is a valid curve point");
+
+		let p2 = AffineG2::new(
+			Fq2::new(
+				Fq::from_str("1").expect("1 is a valid field element"),
+				Fq::from_str("2").expect("2 is a valid field element"),				
+			),
+			Fq2::new(
+				Fq::from_str("1").expect("1 is a valid field element"),
+				Fq::from_str("2").expect("2 is a valid field element"),				
+			),			
+		).expect("Generator P2(i+2b, i+2b) is a valid curve point");
+
+		Ok(())
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::{Builtin, Linear, ethereum_builtin, Pricer, Modexp};

From 9271dd0cc7f6d2185d720378494f6872ff616b75 Mon Sep 17 00:00:00 2001
From: NikVolf <nikvolf@gmail.com>
Date: Mon, 27 Mar 2017 19:44:35 +0300
Subject: [PATCH 002/117] wip

---
 ethcore/src/builtin.rs | 93 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 85 insertions(+), 8 deletions(-)

diff --git a/ethcore/src/builtin.rs b/ethcore/src/builtin.rs
index c240250df..f5e500154 100644
--- a/ethcore/src/builtin.rs
+++ b/ethcore/src/builtin.rs
@@ -396,17 +396,18 @@ impl Impl for Bn128MulImpl {
 	}	
 }
 
-impl Impl for Bn128ParingImpl {
-	// Can fail if any of the 2 points does not belong the bn128 curve
-	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), Error> {
-		use bn::{Fq, Fq2, AffineG1, AffineG2};
+mod bn128_gen {
+	use bn::{AffineG1, AffineG2, Fq, Fq2, G1, G2, Gt, pairing};
 
-		let p1 = AffineG1::new(
+	lazy_static! {
+		pub static ref P1: G1 = G1::from(AffineG1::new(
 			Fq::from_str("1").expect("1 is a valid field element"),
 			Fq::from_str("2").expect("2 is a valid field element"),
-		).expect("Generator P1(1, 2) is a valid curve point");
+		).expect("Generator P1(1, 2) is a valid curve point"));
+	}
 
-		let p2 = AffineG2::new(
+	lazy_static! {
+		pub static ref P2: G2 = G2::from(AffineG2::new(
 			Fq2::new(
 				Fq::from_str("1").expect("1 is a valid field element"),
 				Fq::from_str("2").expect("2 is a valid field element"),				
@@ -415,7 +416,83 @@ impl Impl for Bn128ParingImpl {
 				Fq::from_str("1").expect("1 is a valid field element"),
 				Fq::from_str("2").expect("2 is a valid field element"),				
 			),			
-		).expect("Generator P2(i+2b, i+2b) is a valid curve point");
+		).expect("Generator P2(i+2b, i+2b) is a valid curve point"));
+	}	
+
+
+	lazy_static! {
+		pub static ref P1xP2: Gt = pairing(P1.clone(), P2.clone());
+	}		
+}
+
+impl Impl for Bn128ParingImpl {
+	// Can fail if any of the 2 points does not belong the bn128 curve
+	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), Error> {
+		use bn::{AffineG1, AffineG2, Fq, Fq2, pairing, G1, G2};
+
+		let elements = input.len() / 192; // (a, b_a, b_b - each 64-byte affine coordinates)
+		if input.len() % 192 != 0 { 
+			return Err("Invalid input length, must be multiple of 192 (3 * (32*2))".into()) 
+		}
+		let ret_val = if input.len() == 0 {
+			U256::one()
+		} else {
+			let mut vals = Vec::new();
+			for idx in 0..elements {
+				let a_x = Fq::from_slice(&input[idx*192..idx*192+32])
+					.map_err(|_| Error::from("Invalid a argument x coordinate"))?;
+
+				let a_y = Fq::from_slice(&input[idx*192+32..idx*192+64])
+					.map_err(|_| Error::from("Invalid a argument y coordinate"))?;
+
+				let b_b_x = Fq::from_slice(&input[idx*192+64..idx*192+96])
+					.map_err(|_| Error::from("Invalid b argument imaginary coeff x coordinate"))?;
+
+				let b_b_y = Fq::from_slice(&input[idx*192+96..idx*192+128])
+					.map_err(|_| Error::from("Invalid b argument imaginary coeff y coordinate"))?;
+
+				let b_a_x = Fq::from_slice(&input[idx*192+128..idx*192+160])
+					.map_err(|_| Error::from("Invalid b argument real coeff x coordinate"))?;					
+
+				let b_a_y = Fq::from_slice(&input[idx*192+160..idx*192+192])
+					.map_err(|_| Error::from("Invalid b argument real coeff y coordinate"))?;					
+				
+				vals.push((
+					G1::from(
+						AffineG1::new(a_x, a_y).map_err(|_| Error::from("Invalid a argument - not on curve"))?
+					),
+					G2::from(
+						AffineG2::new(
+							Fq2::new(b_a_x, b_a_y),
+							Fq2::new(b_b_x, b_b_y),
+						).map_err(|_| Error::from("Invalid b argument - not on curve"))?
+					),
+				));
+			};
+			let mul = if elements == 1 {
+				let (a, b) = vals[0];
+				pairing(a, b)
+			} else {
+				let mut drain = vals.drain(..);				
+				let mut mul = { 
+					let (a, b) = drain.next()
+						.expect("Checked above that elements > 1, so 0th element should exist; qed"); 
+					pairing(a, b) 
+				};
+				for _ in 1..elements { 
+					let (a, b) = drain.next()
+						.expect("idx-th element should exist, because we do next() no more than elements-1 times; qed");
+					mul = mul * pairing(a, b);
+				}
+				mul
+			};
+
+			if mul == *bn128_gen::P1xP2 {
+				U256::one()
+			} else {
+				U256::zero()
+			}
+		};
 
 		Ok(())
 	}

From d34aec29ed412792db18ac20aaf5090bdd8a3ffa Mon Sep 17 00:00:00 2001
From: NikVolf <nikvolf@gmail.com>
Date: Mon, 27 Mar 2017 21:34:02 +0300
Subject: [PATCH 003/117] finalize

---
 ethcore/res/ethereum/foundation.json |  1 +
 ethcore/src/builtin.rs               | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ethcore/res/ethereum/foundation.json b/ethcore/res/ethereum/foundation.json
index 54f10b70c..68b74a0f5 100644
--- a/ethcore/res/ethereum/foundation.json
+++ b/ethcore/res/ethereum/foundation.json
@@ -192,6 +192,7 @@
 		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x7fffffffffffff", "pricing": { "modexp": { "divisor": 20 } } } },
 		"0000000000000000000000000000000000000006": { "builtin": { "name": "bn128_add", "activate_at": "0x7fffffffffffff", "pricing": { "linear": { "base": 999999, "word": 0 } } } },
 		"0000000000000000000000000000000000000007": { "builtin": { "name": "bn128_mul", "activate_at": "0x7fffffffffffff", "pricing": { "linear": { "base": 999999, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "bn128_pairing", "activate_at": "0x7fffffffffffff", "pricing": { "linear": { "base": 999999, "word": 0 } } } },
 		"3282791d6fd713f1e94f4bfd565eaa78b3a0599d": {
 			"balance": "1337000000000000000000"
 		},
diff --git a/ethcore/src/builtin.rs b/ethcore/src/builtin.rs
index f5e500154..cc214f2a3 100644
--- a/ethcore/src/builtin.rs
+++ b/ethcore/src/builtin.rs
@@ -158,6 +158,7 @@ fn ethereum_builtin(name: &str) -> Box<Impl> {
 		"modexp" => Box::new(ModexpImpl) as Box<Impl>,
 		"bn128_add" => Box::new(Bn128AddImpl) as Box<Impl>,
 		"bn128_mul" => Box::new(Bn128MulImpl) as Box<Impl>,
+		"bn128_pairing" => Box::new(Bn128ParingImpl) as Box<Impl>,
 		_ => panic!("invalid builtin name: {}", name),
 	}
 }
@@ -409,19 +410,18 @@ mod bn128_gen {
 	lazy_static! {
 		pub static ref P2: G2 = G2::from(AffineG2::new(
 			Fq2::new(
-				Fq::from_str("1").expect("1 is a valid field element"),
-				Fq::from_str("2").expect("2 is a valid field element"),				
+				Fq::from_str("10857046999023057135944570762232829481370756359578518086990519993285655852781").expect("1 is a valid field element"),
+				Fq::from_str("11559732032986387107991004021392285783925812861821192530917403151452391805634").expect("2 is a valid field element"),				
 			),
 			Fq2::new(
-				Fq::from_str("1").expect("1 is a valid field element"),
-				Fq::from_str("2").expect("2 is a valid field element"),				
+				Fq::from_str("8495653923123431417604973247489272438418190587263600148770280649306958101930").expect("1 is a valid field element"),
+				Fq::from_str("4082367875863433681332203403145435568316851327593401208105741076214120093531").expect("2 is a valid field element"),				
 			),			
-		).expect("Generator P2(i+2b, i+2b) is a valid curve point"));
+		).expect("Generator P2(10857046999023057135944570762232829481370756359578518086990519993285655852781 + 11559732032986387107991004021392285783925812861821192530917403151452391805634i, 8495653923123431417604973247489272438418190587263600148770280649306958101930 + 4082367875863433681332203403145435568316851327593401208105741076214120093531i) is a valid curve point"));
 	}	
 
-
 	lazy_static! {
-		pub static ref P1xP2: Gt = pairing(P1.clone(), P2.clone());
+		pub static ref P1_P2_PAIRING: Gt = pairing(P1.clone(), P2.clone());
 	}		
 }
 
@@ -481,19 +481,23 @@ impl Impl for Bn128ParingImpl {
 				};
 				for _ in 1..elements { 
 					let (a, b) = drain.next()
-						.expect("idx-th element should exist, because we do next() no more than elements-1 times; qed");
+						.expect("this element should exist, because we do next() no more than elements-1 times; qed");
 					mul = mul * pairing(a, b);
 				}
 				mul
 			};
 
-			if mul == *bn128_gen::P1xP2 {
+			if mul == *bn128_gen::P1_P2_PAIRING {
 				U256::one()
 			} else {
 				U256::zero()
 			}
 		};
 
+		let mut buf = [0u8; 32];
+		ret_val.to_big_endian(&mut buf);
+		output.write(0, &buf);
+
 		Ok(())
 	}
 }

From 2f30b030605ec17c0c6feecb926c9a34d78404b1 Mon Sep 17 00:00:00 2001
From: NikVolf <nikvolf@gmail.com>
Date: Tue, 28 Mar 2017 01:38:04 +0300
Subject: [PATCH 004/117] some tests

---
 ethcore/src/builtin.rs | 76 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/ethcore/src/builtin.rs b/ethcore/src/builtin.rs
index cc214f2a3..0113e94f2 100644
--- a/ethcore/src/builtin.rs
+++ b/ethcore/src/builtin.rs
@@ -507,6 +507,7 @@ mod tests {
 	use super::{Builtin, Linear, ethereum_builtin, Pricer, Modexp};
 	use ethjson;
 	use util::{U256, BytesRef};
+	use rustc_serialize::hex::FromHex;
 
 	#[test]
 	fn identity() {
@@ -822,7 +823,82 @@ mod tests {
 			assert!(res.is_err(), "There should be built-in error here");
 		}		
 	}
+
+	fn builitin_pairing() -> Builtin {
+		Builtin {
+			pricer: Box::new(Linear { base: 0, word: 0 }),
+			native: ethereum_builtin("bn128_pairing"),
+			activate_at: 0,
+		}
+	}
+
+	fn empty_test(f: Builtin, expected: Vec<u8>) {
+		let mut empty = [0u8; 0];
+		let input = BytesRef::Fixed(&mut empty);		
+
+		let mut output = vec![0u8; expected.len()];
+
+		f.execute(&input[..], &mut BytesRef::Fixed(&mut output[..])).expect("Builtin should not fail");
+		assert_eq!(output, expected);		
+	}
+
+	fn error_test(f: Builtin, input: &[u8], msg_contains: Option<&str>) {
+		let mut output = vec![0u8; 64];
+		let res = f.execute(input, &mut BytesRef::Fixed(&mut output[..]));
+		if let Some(msg) = msg_contains {
+			if let Err(e) = res {
+				if !e.0.contains(msg) {
+					panic!("There should be error containing '{}' here, but got: '{}'", msg, e.0);
+				}
+			}
+		} else {
+			assert!(res.is_err(), "There should be built-in error here");
+		}
+	}
+
+	fn bytes(s: &'static str) -> Vec<u8> {
+		FromHex::from_hex(s).expect("static str should contain valid hex bytes")
+	}
 	
+	#[test]
+	fn bn128_pairing_empty() {
+		// should not fail, because empty input is a valid input of 0 elements
+		empty_test(
+			builitin_pairing(), 
+			bytes("0000000000000000000000000000000000000000000000000000000000000001"),
+		);
+	}
+
+	#[test]
+	fn bn128_pairing_notcurve() {
+		// should fail - point not on curve
+		error_test(
+			builitin_pairing(),
+			&bytes("\
+				1111111111111111111111111111111111111111111111111111111111111111\
+				1111111111111111111111111111111111111111111111111111111111111111\
+				1111111111111111111111111111111111111111111111111111111111111111\
+				1111111111111111111111111111111111111111111111111111111111111111\
+				1111111111111111111111111111111111111111111111111111111111111111\
+				1111111111111111111111111111111111111111111111111111111111111111"
+			),
+			Some("not on curve"),
+		);
+	}
+
+	#[test]
+	fn bn128_pairing_fragmented() {
+		// should fail - input length is invalid
+		error_test(
+			builitin_pairing(),
+			&bytes("\
+				1111111111111111111111111111111111111111111111111111111111111111\
+				1111111111111111111111111111111111111111111111111111111111111111\
+				111111111111111111111111111111"
+			),
+			Some("Invalid input length"),
+		);
+	}	
 
 	#[test]
 	#[should_panic]

From a529427bc935303890dbec53868858bf8715c20a Mon Sep 17 00:00:00 2001
From: NikVolf <nikvolf@gmail.com>
Date: Tue, 28 Mar 2017 01:42:37 +0300
Subject: [PATCH 005/117] bump bn lib

---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3b5eded0a..26fec8a73 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -179,8 +179,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "bn"
-version = "0.4.3"
-source = "git+https://github.com/paritytech/bn#5df8d83c19f3fb97ae3fdefa5bad5279babe795e"
+version = "0.4.4"
+source = "git+https://github.com/paritytech/bn#b97e95a45f4484a41a515338c4f0e093bf6675e0"
 dependencies = [
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -387,7 +387,7 @@ version = "1.7.0"
 dependencies = [
  "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bloomchain 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "bn 0.4.3 (git+https://github.com/paritytech/bn)",
+ "bn 0.4.4 (git+https://github.com/paritytech/bn)",
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2642,7 +2642,7 @@ dependencies = [
 "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
 "checksum blastfig 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "09640e0509d97d5cdff03a9f5daf087a8e04c735c3b113a75139634a19cfc7b2"
 "checksum bloomchain 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3f421095d2a76fc24cd3fb3f912b90df06be7689912b1bdb423caefae59c258d"
-"checksum bn 0.4.3 (git+https://github.com/paritytech/bn)" = "<none>"
+"checksum bn 0.4.4 (git+https://github.com/paritytech/bn)" = "<none>"
 "checksum byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c40977b0ee6b9885c9013cd41d9feffdd22deb3bb4dc3a71d901cc7a77de18c8"
 "checksum bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c129aff112dcc562970abb69e2508b40850dd24c274761bb50fb8a0067ba6c27"
 "checksum bytes 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "46112a0060ae15e3a3f9a445428a53e082b91215b744fa27a1948842f4a64b96"

From 569d63d0c99db7abe6215bb9ec2394dfdf1f2c82 Mon Sep 17 00:00:00 2001
From: NikVolf <nikvolf@gmail.com>
Date: Fri, 31 Mar 2017 17:46:44 +0300
Subject: [PATCH 006/117] fix assertions

---
 ethcore/src/builtin.rs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ethcore/src/builtin.rs b/ethcore/src/builtin.rs
index 0113e94f2..a2677abc7 100644
--- a/ethcore/src/builtin.rs
+++ b/ethcore/src/builtin.rs
@@ -410,14 +410,18 @@ mod bn128_gen {
 	lazy_static! {
 		pub static ref P2: G2 = G2::from(AffineG2::new(
 			Fq2::new(
-				Fq::from_str("10857046999023057135944570762232829481370756359578518086990519993285655852781").expect("1 is a valid field element"),
-				Fq::from_str("11559732032986387107991004021392285783925812861821192530917403151452391805634").expect("2 is a valid field element"),				
+				Fq::from_str("10857046999023057135944570762232829481370756359578518086990519993285655852781")
+					.expect("a valid field element"),
+				Fq::from_str("11559732032986387107991004021392285783925812861821192530917403151452391805634")
+					.expect("a valid field element"),
 			),
 			Fq2::new(
-				Fq::from_str("8495653923123431417604973247489272438418190587263600148770280649306958101930").expect("1 is a valid field element"),
-				Fq::from_str("4082367875863433681332203403145435568316851327593401208105741076214120093531").expect("2 is a valid field element"),				
+				Fq::from_str("8495653923123431417604973247489272438418190587263600148770280649306958101930")
+					.expect("a valid field element"),
+				Fq::from_str("4082367875863433681332203403145435568316851327593401208105741076214120093531")
+					.expect("a valid field element"),
 			),			
-		).expect("Generator P2(10857046999023057135944570762232829481370756359578518086990519993285655852781 + 11559732032986387107991004021392285783925812861821192530917403151452391805634i, 8495653923123431417604973247489272438418190587263600148770280649306958101930 + 4082367875863433681332203403145435568316851327593401208105741076214120093531i) is a valid curve point"));
+		).expect("the generator P2(10857046999023057135944570762232829481370756359578518086990519993285655852781 + 11559732032986387107991004021392285783925812861821192530917403151452391805634i, 8495653923123431417604973247489272438418190587263600148770280649306958101930 + 4082367875863433681332203403145435568316851327593401208105741076214120093531i) is a valid curve point"));
 	}	
 
 	lazy_static! {

From d6baadbaf2b24660066c30d41b8915e769ad7682 Mon Sep 17 00:00:00 2001
From: NikVolf <nikvolf@gmail.com>
Date: Fri, 31 Mar 2017 17:53:26 +0300
Subject: [PATCH 007/117] fix doc comment about failing

---
 ethcore/src/builtin.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ethcore/src/builtin.rs b/ethcore/src/builtin.rs
index a2677abc7..efe59d43f 100644
--- a/ethcore/src/builtin.rs
+++ b/ethcore/src/builtin.rs
@@ -430,11 +430,14 @@ mod bn128_gen {
 }
 
 impl Impl for Bn128ParingImpl {
-	// Can fail if any of the 2 points does not belong the bn128 curve
+	/// Can fail if:
+	///     - input length is not a multiple of 192
+	///     - any of odd points does not belong to bn128 curve
+	///     - any of even points does not belong to the twisted bn128 curve over the field F_p^2 = F_p[i] / (i^2 + 1)
 	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), Error> {
 		use bn::{AffineG1, AffineG2, Fq, Fq2, pairing, G1, G2};
 
-		let elements = input.len() / 192; // (a, b_a, b_b - each 64-byte affine coordinates)
+		let elements = input.len() / 192; // (a, b_a, b_b - each 64-byte affine coordinate)
 		if input.len() % 192 != 0 { 
 			return Err("Invalid input length, must be multiple of 192 (3 * (32*2))".into()) 
 		}

From df72c9c6cc77ad32a97b85afc1722e3ea35e5eba Mon Sep 17 00:00:00 2001
From: NikVolf <nikvolf@gmail.com>
Date: Mon, 3 Apr 2017 12:57:18 +0300
Subject: [PATCH 008/117] fold multiplication

---
 ethcore/src/builtin.rs | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/ethcore/src/builtin.rs b/ethcore/src/builtin.rs
index efe59d43f..88cf357a3 100644
--- a/ethcore/src/builtin.rs
+++ b/ethcore/src/builtin.rs
@@ -435,9 +435,9 @@ impl Impl for Bn128ParingImpl {
 	///     - any of odd points does not belong to bn128 curve
 	///     - any of even points does not belong to the twisted bn128 curve over the field F_p^2 = F_p[i] / (i^2 + 1)
 	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), Error> {
-		use bn::{AffineG1, AffineG2, Fq, Fq2, pairing, G1, G2};
+		use bn::{AffineG1, AffineG2, Fq, Fq2, pairing, G1, G2, Gt};
 
-		let elements = input.len() / 192; // (a, b_a, b_b - each 64-byte affine coordinate)
+		let elements = input.len() / 192; // (a, b_a, b_b - each 64-byte affine coordinates)
 		if input.len() % 192 != 0 { 
 			return Err("Invalid input length, must be multiple of 192 (3 * (32*2))".into()) 
 		}
@@ -476,23 +476,8 @@ impl Impl for Bn128ParingImpl {
 					),
 				));
 			};
-			let mul = if elements == 1 {
-				let (a, b) = vals[0];
-				pairing(a, b)
-			} else {
-				let mut drain = vals.drain(..);				
-				let mut mul = { 
-					let (a, b) = drain.next()
-						.expect("Checked above that elements > 1, so 0th element should exist; qed"); 
-					pairing(a, b) 
-				};
-				for _ in 1..elements { 
-					let (a, b) = drain.next()
-						.expect("this element should exist, because we do next() no more than elements-1 times; qed");
-					mul = mul * pairing(a, b);
-				}
-				mul
-			};
+
+			let mul = vals.into_iter().fold(Gt::one(), |s, (a, b)| s * pairing(a, b));
 
 			if mul == *bn128_gen::P1_P2_PAIRING {
 				U256::one()

From 9bcd1245d9d669c436a0a397adc6c0f1d4b89282 Mon Sep 17 00:00:00 2001
From: NikVolf <nikvolf@gmail.com>
Date: Thu, 6 Apr 2017 11:04:28 +0300
Subject: [PATCH 009/117] fix typo

---
 ethcore/src/builtin.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ethcore/src/builtin.rs b/ethcore/src/builtin.rs
index 88cf357a3..32087be96 100644
--- a/ethcore/src/builtin.rs
+++ b/ethcore/src/builtin.rs
@@ -158,7 +158,7 @@ fn ethereum_builtin(name: &str) -> Box<Impl> {
 		"modexp" => Box::new(ModexpImpl) as Box<Impl>,
 		"bn128_add" => Box::new(Bn128AddImpl) as Box<Impl>,
 		"bn128_mul" => Box::new(Bn128MulImpl) as Box<Impl>,
-		"bn128_pairing" => Box::new(Bn128ParingImpl) as Box<Impl>,
+		"bn128_pairing" => Box::new(Bn128PairingImpl) as Box<Impl>,
 		_ => panic!("invalid builtin name: {}", name),
 	}
 }
@@ -193,7 +193,7 @@ struct Bn128AddImpl;
 struct Bn128MulImpl;
 
 #[derive(Debug)]
-struct Bn128ParingImpl;
+struct Bn128PairingImpl;
 
 impl Impl for Identity {
 	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), Error> {
@@ -429,7 +429,7 @@ mod bn128_gen {
 	}		
 }
 
-impl Impl for Bn128ParingImpl {
+impl Impl for Bn128PairingImpl {
 	/// Can fail if:
 	///     - input length is not a multiple of 192
 	///     - any of odd points does not belong to bn128 curve

From a254b2098fd029ee03724e3898a69562e2787bcb Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Tue, 11 Apr 2017 17:07:04 +0200
Subject: [PATCH 010/117] more useful Engine::verify_seal

---
 ethcore/src/block.rs                   | 11 +++++---
 ethcore/src/engines/authority_round.rs |  4 +--
 ethcore/src/engines/basic_authority.rs |  2 +-
 ethcore/src/engines/instant_seal.rs    |  2 +-
 ethcore/src/engines/mod.rs             | 36 ++++++++++++++++++++++----
 ethcore/src/engines/tendermint/mod.rs  |  2 +-
 ethcore/src/miner/miner.rs             |  2 +-
 ethcore/src/snapshot/mod.rs            |  2 +-
 8 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/ethcore/src/block.rs b/ethcore/src/block.rs
index 12e77d41b..6ec2584ec 100644
--- a/ethcore/src/block.rs
+++ b/ethcore/src/block.rs
@@ -26,7 +26,7 @@ use util::error::{Mismatch, OutOfBounds};
 
 use basic_types::{LogBloom, Seal};
 use env_info::{EnvInfo, LastHashes};
-use engines::Engine;
+use engines::{Engine, ValidationProof};
 use error::{Error, BlockError, TransactionError};
 use factory::Factories;
 use header::Header;
@@ -484,10 +484,15 @@ impl LockedBlock {
 	/// Provide a valid seal in order to turn this into a `SealedBlock`.
 	/// This does check the validity of `seal` with the engine.
 	/// Returns the `ClosedBlock` back again if the seal is no good.
-	pub fn try_seal(self, engine: &Engine, seal: Vec<Bytes>) -> Result<SealedBlock, (Error, LockedBlock)> {
+	pub fn try_seal(
+		self,
+		engine: &Engine,
+		seal: Vec<Bytes>,
+		proof: Option<ValidationProof>,
+	) -> Result<SealedBlock, (Error, LockedBlock)> {
 		let mut s = self;
 		s.block.header.set_seal(seal);
-		match engine.verify_block_seal(&s.block.header) {
+		match engine.verify_block_seal(&s.block.header, proof) {
 			Err(e) => Err((e, s)),
 			_ => Ok(SealedBlock { block: s.block, uncle_bytes: s.uncle_bytes }),
 		}
diff --git a/ethcore/src/engines/authority_round.rs b/ethcore/src/engines/authority_round.rs
index e6cbdb531..acc276d21 100644
--- a/ethcore/src/engines/authority_round.rs
+++ b/ethcore/src/engines/authority_round.rs
@@ -464,14 +464,14 @@ mod tests {
 
 		engine.set_signer(tap.clone(), addr1, "1".into());
 		if let Seal::Regular(seal) = engine.generate_seal(b1.block()) {
-			assert!(b1.clone().try_seal(engine, seal).is_ok());
+			assert!(b1.clone().try_seal(engine, seal, None).is_ok());
 			// Second proposal is forbidden.
 			assert!(engine.generate_seal(b1.block()) == Seal::None);
 		}
 
 		engine.set_signer(tap, addr2, "2".into());
 		if let Seal::Regular(seal) = engine.generate_seal(b2.block()) {
-			assert!(b2.clone().try_seal(engine, seal).is_ok());
+			assert!(b2.clone().try_seal(engine, seal, None).is_ok());
 			// Second proposal is forbidden.
 			assert!(engine.generate_seal(b2.block()) == Seal::None);
 		}
diff --git a/ethcore/src/engines/basic_authority.rs b/ethcore/src/engines/basic_authority.rs
index e5a53d4e9..fe27994e4 100644
--- a/ethcore/src/engines/basic_authority.rs
+++ b/ethcore/src/engines/basic_authority.rs
@@ -258,7 +258,7 @@ mod tests {
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, addr, (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b = b.close_and_lock();
 		if let Seal::Regular(seal) = engine.generate_seal(b.block()) {
-			assert!(b.try_seal(engine, seal).is_ok());
+			assert!(b.try_seal(engine, seal, None).is_ok());
 		}
 	}
 
diff --git a/ethcore/src/engines/instant_seal.rs b/ethcore/src/engines/instant_seal.rs
index 45bede9f4..5d05dd83f 100644
--- a/ethcore/src/engines/instant_seal.rs
+++ b/ethcore/src/engines/instant_seal.rs
@@ -89,7 +89,7 @@ mod tests {
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, Address::default(), (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b = b.close_and_lock();
 		if let Seal::Regular(seal) = engine.generate_seal(b.block()) {
-			assert!(b.try_seal(engine, seal).is_ok());
+			assert!(b.try_seal(engine, seal, None).is_ok());
 		}
 	}
 
diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
index 438b9bda0..76a0d790b 100644
--- a/ethcore/src/engines/mod.rs
+++ b/ethcore/src/engines/mod.rs
@@ -33,18 +33,20 @@ pub use self::authority_round::AuthorityRound;
 pub use self::tendermint::Tendermint;
 
 use std::sync::Weak;
-use util::*;
-use ethkey::Signature;
+
 use account_provider::AccountProvider;
 use block::ExecutedBlock;
 use builtin::Builtin;
+use client::Client;
 use env_info::EnvInfo;
 use error::{Error, TransactionError};
-use spec::CommonParams;
 use evm::Schedule;
 use header::Header;
+use spec::CommonParams;
 use transaction::{UnverifiedTransaction, SignedTransaction};
-use client::Client;
+
+use ethkey::Signature;
+use util::*;
 
 /// Voting errors.
 #[derive(Debug)]
@@ -59,6 +61,8 @@ pub enum EngineError {
 	UnexpectedMessage,
 	/// Seal field has an unexpected size.
 	BadSealFieldSize(OutOfBounds<usize>),
+	/// Needs a validation proof for the given block hash before verification can continue.
+	NeedsValidationProof(H256),
 }
 
 impl fmt::Display for EngineError {
@@ -70,6 +74,7 @@ impl fmt::Display for EngineError {
 			NotAuthorized(ref address) => format!("Signer {} is not authorized.", address),
 			UnexpectedMessage => "This Engine should not be fed messages.".into(),
 			BadSealFieldSize(ref oob) => format!("Seal field has an unexpected length: {}", oob),
+			NeedsValidationProof(ref hash) => format!("Needs validation proof of block {} to verify seal.", hash),
 		};
 
 		f.write_fmt(format_args!("Engine error ({})", msg))
@@ -87,6 +92,12 @@ pub enum Seal {
 	None,
 }
 
+/// A validation proof, required for validation of a block header.
+pub type ValidationProof = Vec<DBValue>;
+
+/// Type alias for a function we can make calls through synchronously.
+pub type Call = Fn(Address, Bytes) -> Result<Bytes, String>;
+
 /// A consensus mechanism for the chain. Generally either proof-of-work or proof-of-stake-based.
 /// Provides hooks into each of the major parts of block import.
 pub trait Engine : Sync + Send {
@@ -180,10 +191,25 @@ pub trait Engine : Sync + Send {
 	/// Verify the seal of a block. This is an auxilliary method that actually just calls other `verify_` methods
 	/// to get the job done. By default it must pass `verify_basic` and `verify_block_unordered`. If more or fewer
 	/// methods are needed for an Engine, this may be overridden.
-	fn verify_block_seal(&self, header: &Header) -> Result<(), Error> {
+	fn verify_block_seal(&self, header: &Header, _proof: Option<ValidationProof>) -> Result<(), Error> {
 		self.verify_block_basic(header, None).and_then(|_| self.verify_block_unordered(header, None))
 	}
 
+	/// Generate a validation proof for the given block header.
+	///
+	/// All values queried during execution of given  will go into the proof.
+	/// This may only be called for blocks indicated in "needs validation proof"
+	/// errors.
+	///
+	/// Engines which don't draw consensus information from the state (e.g. PoW)
+	/// don't need to change anything here.
+	///
+	/// Engines which do draw consensus information from the state may only do so
+	/// here.
+	fn generate_validation_proof(&self, _call: &Call) -> ValidationProof {
+		ValidationProof::default()
+	}
+
 	/// Populate a header's fields based on its parent's header.
 	/// Usually implements the chain scoring rule based on weight.
 	/// The gas floor target must not be lower than the engine's minimum gas limit.
diff --git a/ethcore/src/engines/tendermint/mod.rs b/ethcore/src/engines/tendermint/mod.rs
index 8c8094117..e88803ce2 100644
--- a/ethcore/src/engines/tendermint/mod.rs
+++ b/ethcore/src/engines/tendermint/mod.rs
@@ -864,7 +864,7 @@ mod tests {
 		let proposer = insert_and_register(&tap, spec.engine.as_ref(), "1");
 
 		let (b, seal) = propose_default(&spec, proposer);
-		assert!(b.lock().try_seal(spec.engine.as_ref(), seal).is_ok());
+		assert!(b.lock().try_seal(spec.engine.as_ref(), seal, None).is_ok());
 	}
 
 	#[test]
diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
index ac1695b52..8337ef2d8 100644
--- a/ethcore/src/miner/miner.rs
+++ b/ethcore/src/miner/miner.rs
@@ -1133,7 +1133,7 @@ impl MinerService for Miner {
 				|b| &b.hash() == &block_hash
 			) {
 				trace!(target: "miner", "Submitted block {}={}={} with seal {:?}", block_hash, b.hash(), b.header().bare_hash(), seal);
-				b.lock().try_seal(&*self.engine, seal).or_else(|(e, _)| {
+				b.lock().try_seal(&*self.engine, seal, None).or_else(|(e, _)| {
 					warn!(target: "miner", "Mined solution rejected: {}", e);
 					Err(Error::PowInvalid)
 				})
diff --git a/ethcore/src/snapshot/mod.rs b/ethcore/src/snapshot/mod.rs
index 69dbc943d..0ef263476 100644
--- a/ethcore/src/snapshot/mod.rs
+++ b/ethcore/src/snapshot/mod.rs
@@ -567,7 +567,7 @@ pub fn verify_old_block(rng: &mut OsRng, header: &Header, engine: &Engine, chain
 	if always || rng.gen::<f32>() <= POW_VERIFY_RATE {
 		match chain.block_header(header.parent_hash()) {
 			Some(parent) => engine.verify_block_family(header, &parent, body),
-			None => engine.verify_block_seal(header),
+			None => engine.verify_block_seal(header, None), // TODO: fetch validation proof as necessary.
 		}
 	} else {
 		engine.verify_block_basic(header, body)

From 7723d6281bcd11c7bd4da101c02fc70e78bbf303 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Wed, 12 Apr 2017 12:46:25 +0200
Subject: [PATCH 011/117] starting memoized validatorset

---
 ethcore/src/engines/mod.rs                    |  2 +-
 ethcore/src/engines/validator_set/mod.rs      | 41 +++++++++++++++++++
 ethcore/src/engines/validator_set/multi.rs    | 19 ++++++++-
 .../src/engines/validator_set/simple_list.rs  |  9 ++--
 4 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
index 76a0d790b..0ae353a56 100644
--- a/ethcore/src/engines/mod.rs
+++ b/ethcore/src/engines/mod.rs
@@ -206,7 +206,7 @@ pub trait Engine : Sync + Send {
 	///
 	/// Engines which do draw consensus information from the state may only do so
 	/// here.
-	fn generate_validation_proof(&self, _call: &Call) -> ValidationProof {
+	fn generate_validation_proof(&self, header: &Header, _call: &Call) -> ValidationProof {
 		ValidationProof::default()
 	}
 
diff --git a/ethcore/src/engines/validator_set/mod.rs b/ethcore/src/engines/validator_set/mod.rs
index cbbedfb33..a2f6d1075 100644
--- a/ethcore/src/engines/validator_set/mod.rs
+++ b/ethcore/src/engines/validator_set/mod.rs
@@ -25,11 +25,15 @@ use std::sync::Weak;
 use util::{Address, H256};
 use ethjson::spec::ValidatorSet as ValidatorSpec;
 use client::Client;
+use receipt::Receipt;
+
 use self::simple_list::SimpleList;
 use self::contract::ValidatorContract;
 use self::safe_contract::ValidatorSafeContract;
 use self::multi::Multi;
 
+pub type Call = Fn(Address, Vec<u8>) -> Result<Vec<u8>, String>;
+
 /// Creates a validator set from spec.
 pub fn new_validator_set(spec: ValidatorSpec) -> Box<ValidatorSet> {
 	match spec {
@@ -42,7 +46,12 @@ pub fn new_validator_set(spec: ValidatorSpec) -> Box<ValidatorSet> {
 	}
 }
 
+/// A validator set.
 pub trait ValidatorSet: Send + Sync {
+	/// Get this validator set as a flexible validator set.
+	/// Returning `None` indicates this is only usable for
+	/// full nodes.
+	fn as_memoized(&self) -> Option<&Memoized> { None }
 	/// Checks if a given address is a validator.
 	fn contains(&self, parent_block_hash: &H256, address: &Address) -> bool;
 	/// Draws an validator nonce modulo number of validators.
@@ -56,3 +65,35 @@ pub trait ValidatorSet: Send + Sync {
 	/// Allows blockchain state access.
 	fn register_contract(&self, _client: Weak<Client>) {}
 }
+
+/// A flexible validator set can track its changes.
+pub trait FlexibleValidatorSet: Send + Sync {
+	/// Whether a validator set may have changed at this header.
+	fn has_possibly_changed(&self, header: &Header) -> bool;
+
+	/// Whether a validator set has changed at this header, given the block receipts.
+	/// Called after `has_possibly_changed`.
+	/// `Some` indicates the validator set has changed at this header and the new
+	/// expected validator set.
+	/// `None` indicates no change.
+	fn has_changed(&self, header: &Header, receipts: &[Receipt]) -> Option<SimpleList>;
+
+	/// Fetch validators at a block synchronously.
+	fn fetch_validators(&self, header: &Header, call: &Call) -> Result<SimpleList, String>;
+}
+
+/// A memoized flexible validator set
+pub struct Memoized {
+	inner: Box<FlexibleValidatorSet>,
+	memo: Mutex<(SimpleList, (H256, u64))>,
+}
+
+impl Memoized {
+	/// Denote that the
+	pub fn use_memo_at(&self, list: SimpleList)
+}
+
+impl ValidatorSet for Memoized {
+	fn as_memoized(&self) -> Option<&Memoized> { Some(self) }
+}
+
diff --git a/ethcore/src/engines/validator_set/multi.rs b/ethcore/src/engines/validator_set/multi.rs
index 5027f23cd..8527a8aa9 100644
--- a/ethcore/src/engines/validator_set/multi.rs
+++ b/ethcore/src/engines/validator_set/multi.rs
@@ -40,7 +40,7 @@ impl Multi {
 		}
 	}
 
-	fn correct_set(&self, bh: &H256) -> Option<&Box<ValidatorSet>> {
+	fn correct_set(&self, bh: &H256) -> Option<&ValidatorSet> {
 		match self
 			.block_number
 			.read()(bh)
@@ -55,7 +55,7 @@ impl Multi {
 				) {
 			Ok((block, set)) => {
 				trace!(target: "engine", "Multi ValidatorSet retrieved for block {}.", block);
-				Some(set)
+				Some(&*set)
 			},
 			Err(e) => {
 				debug!(target: "engine", "ValidatorSet could not be recovered: {}", e);
@@ -66,6 +66,21 @@ impl Multi {
 }
 
 impl ValidatorSet for Multi {
+	fn has_possibly_changed(&self, header: &Header) -> bool {
+		// if the sets are the same for each header, compare those.
+		// otherwise, the sets have almost certainly changed.
+		match (self.correct_set(&header.hash()), self.correct_set(header.parent_hash())) {
+			(Some(a), Some(b)) if a as *const _ == b as *const _ => { a.has_possibly_changed(header) },
+			_ => true,
+		}
+	}
+
+	fn has_changed(&self, header: &Header, receipts: &[Receipt]) -> Option<Vec<Address>> {
+
+	}
+
+	fn fetch(&self) ->
+
 	fn contains(&self, bh: &H256, address: &Address) -> bool {
 		self.correct_set(bh).map_or(false, |set| set.contains(bh, address))
 	}
diff --git a/ethcore/src/engines/validator_set/simple_list.rs b/ethcore/src/engines/validator_set/simple_list.rs
index 2d7687979..cc4259fac 100644
--- a/ethcore/src/engines/validator_set/simple_list.rs
+++ b/ethcore/src/engines/validator_set/simple_list.rs
@@ -22,13 +22,11 @@ use super::ValidatorSet;
 #[derive(Debug, PartialEq, Eq, Default)]
 pub struct SimpleList {
 	validators: Vec<Address>,
-	validator_n: usize,
 }
 
 impl SimpleList {
 	pub fn new(validators: Vec<Address>) -> Self {
 		SimpleList {
-			validator_n: validators.len(),
 			validators: validators,
 		}
 	}
@@ -36,7 +34,7 @@ impl SimpleList {
 
 impl HeapSizeOf for SimpleList {
 	fn heap_size_of_children(&self) -> usize {
-		self.validators.heap_size_of_children() + self.validator_n.heap_size_of_children()
+		self.validators.heap_size_of_children()
 	}
 }
 
@@ -46,11 +44,12 @@ impl ValidatorSet for SimpleList {
 	}
 
 	fn get(&self, _bh: &H256, nonce: usize) -> Address {
-		self.validators.get(nonce % self.validator_n).expect("There are validator_n authorities; taking number modulo validator_n gives number in validator_n range; qed").clone()
+		let validator_n = self.validators.len();
+		self.validators.get(nonce % validator_n).expect("There are validator_n authorities; taking number modulo validator_n gives number in validator_n range; qed").clone()
 	}
 
 	fn count(&self, _bh: &H256) -> usize {
-		self.validator_n
+		self.validators.len()
 	}
 }
 

From 2d8a8bd3e5fcd77e3c81165268e6b4729a85e5bf Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Wed, 12 Apr 2017 14:41:19 +0200
Subject: [PATCH 012/117] engine changes

---
 ethcore/src/block.rs                       |  5 +--
 ethcore/src/engines/authority_round.rs     |  4 +-
 ethcore/src/engines/basic_authority.rs     |  2 +-
 ethcore/src/engines/instant_seal.rs        |  2 +-
 ethcore/src/engines/mod.rs                 | 52 ++++++++++++++--------
 ethcore/src/engines/tendermint/mod.rs      |  2 +-
 ethcore/src/engines/validator_set/mod.rs   | 39 ----------------
 ethcore/src/engines/validator_set/multi.rs | 17 +------
 ethcore/src/miner/miner.rs                 |  2 +-
 ethcore/src/snapshot/mod.rs                |  2 +-
 10 files changed, 43 insertions(+), 84 deletions(-)

diff --git a/ethcore/src/block.rs b/ethcore/src/block.rs
index 6ec2584ec..8da7c14b2 100644
--- a/ethcore/src/block.rs
+++ b/ethcore/src/block.rs
@@ -26,7 +26,7 @@ use util::error::{Mismatch, OutOfBounds};
 
 use basic_types::{LogBloom, Seal};
 use env_info::{EnvInfo, LastHashes};
-use engines::{Engine, ValidationProof};
+use engines::Engine;
 use error::{Error, BlockError, TransactionError};
 use factory::Factories;
 use header::Header;
@@ -488,11 +488,10 @@ impl LockedBlock {
 		self,
 		engine: &Engine,
 		seal: Vec<Bytes>,
-		proof: Option<ValidationProof>,
 	) -> Result<SealedBlock, (Error, LockedBlock)> {
 		let mut s = self;
 		s.block.header.set_seal(seal);
-		match engine.verify_block_seal(&s.block.header, proof) {
+		match engine.verify_block_seal(&s.block.header) {
 			Err(e) => Err((e, s)),
 			_ => Ok(SealedBlock { block: s.block, uncle_bytes: s.uncle_bytes }),
 		}
diff --git a/ethcore/src/engines/authority_round.rs b/ethcore/src/engines/authority_round.rs
index acc276d21..e6cbdb531 100644
--- a/ethcore/src/engines/authority_round.rs
+++ b/ethcore/src/engines/authority_round.rs
@@ -464,14 +464,14 @@ mod tests {
 
 		engine.set_signer(tap.clone(), addr1, "1".into());
 		if let Seal::Regular(seal) = engine.generate_seal(b1.block()) {
-			assert!(b1.clone().try_seal(engine, seal, None).is_ok());
+			assert!(b1.clone().try_seal(engine, seal).is_ok());
 			// Second proposal is forbidden.
 			assert!(engine.generate_seal(b1.block()) == Seal::None);
 		}
 
 		engine.set_signer(tap, addr2, "2".into());
 		if let Seal::Regular(seal) = engine.generate_seal(b2.block()) {
-			assert!(b2.clone().try_seal(engine, seal, None).is_ok());
+			assert!(b2.clone().try_seal(engine, seal).is_ok());
 			// Second proposal is forbidden.
 			assert!(engine.generate_seal(b2.block()) == Seal::None);
 		}
diff --git a/ethcore/src/engines/basic_authority.rs b/ethcore/src/engines/basic_authority.rs
index fe27994e4..e5a53d4e9 100644
--- a/ethcore/src/engines/basic_authority.rs
+++ b/ethcore/src/engines/basic_authority.rs
@@ -258,7 +258,7 @@ mod tests {
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, addr, (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b = b.close_and_lock();
 		if let Seal::Regular(seal) = engine.generate_seal(b.block()) {
-			assert!(b.try_seal(engine, seal, None).is_ok());
+			assert!(b.try_seal(engine, seal).is_ok());
 		}
 	}
 
diff --git a/ethcore/src/engines/instant_seal.rs b/ethcore/src/engines/instant_seal.rs
index 5d05dd83f..45bede9f4 100644
--- a/ethcore/src/engines/instant_seal.rs
+++ b/ethcore/src/engines/instant_seal.rs
@@ -89,7 +89,7 @@ mod tests {
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, Address::default(), (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b = b.close_and_lock();
 		if let Seal::Regular(seal) = engine.generate_seal(b.block()) {
-			assert!(b.try_seal(engine, seal, None).is_ok());
+			assert!(b.try_seal(engine, seal).is_ok());
 		}
 	}
 
diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
index 0ae353a56..e4bc514b7 100644
--- a/ethcore/src/engines/mod.rs
+++ b/ethcore/src/engines/mod.rs
@@ -44,6 +44,7 @@ use evm::Schedule;
 use header::Header;
 use spec::CommonParams;
 use transaction::{UnverifiedTransaction, SignedTransaction};
+use receipt::Receipt;
 
 use ethkey::Signature;
 use util::*;
@@ -61,8 +62,6 @@ pub enum EngineError {
 	UnexpectedMessage,
 	/// Seal field has an unexpected size.
 	BadSealFieldSize(OutOfBounds<usize>),
-	/// Needs a validation proof for the given block hash before verification can continue.
-	NeedsValidationProof(H256),
 }
 
 impl fmt::Display for EngineError {
@@ -74,7 +73,6 @@ impl fmt::Display for EngineError {
 			NotAuthorized(ref address) => format!("Signer {} is not authorized.", address),
 			UnexpectedMessage => "This Engine should not be fed messages.".into(),
 			BadSealFieldSize(ref oob) => format!("Seal field has an unexpected length: {}", oob),
-			NeedsValidationProof(ref hash) => format!("Needs validation proof of block {} to verify seal.", hash),
 		};
 
 		f.write_fmt(format_args!("Engine error ({})", msg))
@@ -92,12 +90,29 @@ pub enum Seal {
 	None,
 }
 
-/// A validation proof, required for validation of a block header.
-pub type ValidationProof = Vec<DBValue>;
-
 /// Type alias for a function we can make calls through synchronously.
 pub type Call = Fn(Address, Bytes) -> Result<Bytes, String>;
 
+/// Results of a query of whether a validation proof is necessary at a block.
+pub enum RequiresProof {
+	/// Cannot determine until more data is passed.
+	Unsure(Unsure),
+	/// Validation proof not required.
+	No,
+	/// Validation proof required.
+	Yes,
+}
+
+/// More data required to determine if a validation proof is required.
+pub enum Unsure {
+	/// Needs the body.
+	NeedsBody,
+	/// Needs the receipts.
+	NeedsReceipts,
+	/// Needs both body and receipts.
+	NeedsBoth,
+}
+
 /// A consensus mechanism for the chain. Generally either proof-of-work or proof-of-stake-based.
 /// Provides hooks into each of the major parts of block import.
 pub trait Engine : Sync + Send {
@@ -191,23 +206,22 @@ pub trait Engine : Sync + Send {
 	/// Verify the seal of a block. This is an auxilliary method that actually just calls other `verify_` methods
 	/// to get the job done. By default it must pass `verify_basic` and `verify_block_unordered`. If more or fewer
 	/// methods are needed for an Engine, this may be overridden.
-	fn verify_block_seal(&self, header: &Header, _proof: Option<ValidationProof>) -> Result<(), Error> {
+	fn verify_block_seal(&self, header: &Header) -> Result<(), Error> {
 		self.verify_block_basic(header, None).and_then(|_| self.verify_block_unordered(header, None))
 	}
 
-	/// Generate a validation proof for the given block header.
+	/// Re-do all verification for a header with the given contract-calling interface
 	///
-	/// All values queried during execution of given  will go into the proof.
-	/// This may only be called for blocks indicated in "needs validation proof"
-	/// errors.
-	///
-	/// Engines which don't draw consensus information from the state (e.g. PoW)
-	/// don't need to change anything here.
-	///
-	/// Engines which do draw consensus information from the state may only do so
-	/// here.
-	fn generate_validation_proof(&self, header: &Header, _call: &Call) -> ValidationProof {
-		ValidationProof::default()
+	/// This will be used to generate proofs of validation as well as verify them.
+	fn verify_with_state(&self, _header: &Header, _call: &Call) -> Result<(), Error> {
+		Ok(())
+	}
+
+	/// Whether a proof is required for the given header.
+	fn proof_required(&self, _header: Header, _block: Option<&[u8]>, _receipts: Option<&[Receipt]>)
+		-> RequiresProof
+	{
+		RequiresProof::No
 	}
 
 	/// Populate a header's fields based on its parent's header.
diff --git a/ethcore/src/engines/tendermint/mod.rs b/ethcore/src/engines/tendermint/mod.rs
index e88803ce2..8c8094117 100644
--- a/ethcore/src/engines/tendermint/mod.rs
+++ b/ethcore/src/engines/tendermint/mod.rs
@@ -864,7 +864,7 @@ mod tests {
 		let proposer = insert_and_register(&tap, spec.engine.as_ref(), "1");
 
 		let (b, seal) = propose_default(&spec, proposer);
-		assert!(b.lock().try_seal(spec.engine.as_ref(), seal, None).is_ok());
+		assert!(b.lock().try_seal(spec.engine.as_ref(), seal).is_ok());
 	}
 
 	#[test]
diff --git a/ethcore/src/engines/validator_set/mod.rs b/ethcore/src/engines/validator_set/mod.rs
index a2f6d1075..2c00c43b0 100644
--- a/ethcore/src/engines/validator_set/mod.rs
+++ b/ethcore/src/engines/validator_set/mod.rs
@@ -25,15 +25,12 @@ use std::sync::Weak;
 use util::{Address, H256};
 use ethjson::spec::ValidatorSet as ValidatorSpec;
 use client::Client;
-use receipt::Receipt;
 
 use self::simple_list::SimpleList;
 use self::contract::ValidatorContract;
 use self::safe_contract::ValidatorSafeContract;
 use self::multi::Multi;
 
-pub type Call = Fn(Address, Vec<u8>) -> Result<Vec<u8>, String>;
-
 /// Creates a validator set from spec.
 pub fn new_validator_set(spec: ValidatorSpec) -> Box<ValidatorSet> {
 	match spec {
@@ -48,10 +45,6 @@ pub fn new_validator_set(spec: ValidatorSpec) -> Box<ValidatorSet> {
 
 /// A validator set.
 pub trait ValidatorSet: Send + Sync {
-	/// Get this validator set as a flexible validator set.
-	/// Returning `None` indicates this is only usable for
-	/// full nodes.
-	fn as_memoized(&self) -> Option<&Memoized> { None }
 	/// Checks if a given address is a validator.
 	fn contains(&self, parent_block_hash: &H256, address: &Address) -> bool;
 	/// Draws an validator nonce modulo number of validators.
@@ -65,35 +58,3 @@ pub trait ValidatorSet: Send + Sync {
 	/// Allows blockchain state access.
 	fn register_contract(&self, _client: Weak<Client>) {}
 }
-
-/// A flexible validator set can track its changes.
-pub trait FlexibleValidatorSet: Send + Sync {
-	/// Whether a validator set may have changed at this header.
-	fn has_possibly_changed(&self, header: &Header) -> bool;
-
-	/// Whether a validator set has changed at this header, given the block receipts.
-	/// Called after `has_possibly_changed`.
-	/// `Some` indicates the validator set has changed at this header and the new
-	/// expected validator set.
-	/// `None` indicates no change.
-	fn has_changed(&self, header: &Header, receipts: &[Receipt]) -> Option<SimpleList>;
-
-	/// Fetch validators at a block synchronously.
-	fn fetch_validators(&self, header: &Header, call: &Call) -> Result<SimpleList, String>;
-}
-
-/// A memoized flexible validator set
-pub struct Memoized {
-	inner: Box<FlexibleValidatorSet>,
-	memo: Mutex<(SimpleList, (H256, u64))>,
-}
-
-impl Memoized {
-	/// Denote that the
-	pub fn use_memo_at(&self, list: SimpleList)
-}
-
-impl ValidatorSet for Memoized {
-	fn as_memoized(&self) -> Option<&Memoized> { Some(self) }
-}
-
diff --git a/ethcore/src/engines/validator_set/multi.rs b/ethcore/src/engines/validator_set/multi.rs
index 8527a8aa9..3ae93b0f5 100644
--- a/ethcore/src/engines/validator_set/multi.rs
+++ b/ethcore/src/engines/validator_set/multi.rs
@@ -55,7 +55,7 @@ impl Multi {
 				) {
 			Ok((block, set)) => {
 				trace!(target: "engine", "Multi ValidatorSet retrieved for block {}.", block);
-				Some(&*set)
+				Some(&**set)
 			},
 			Err(e) => {
 				debug!(target: "engine", "ValidatorSet could not be recovered: {}", e);
@@ -66,21 +66,6 @@ impl Multi {
 }
 
 impl ValidatorSet for Multi {
-	fn has_possibly_changed(&self, header: &Header) -> bool {
-		// if the sets are the same for each header, compare those.
-		// otherwise, the sets have almost certainly changed.
-		match (self.correct_set(&header.hash()), self.correct_set(header.parent_hash())) {
-			(Some(a), Some(b)) if a as *const _ == b as *const _ => { a.has_possibly_changed(header) },
-			_ => true,
-		}
-	}
-
-	fn has_changed(&self, header: &Header, receipts: &[Receipt]) -> Option<Vec<Address>> {
-
-	}
-
-	fn fetch(&self) ->
-
 	fn contains(&self, bh: &H256, address: &Address) -> bool {
 		self.correct_set(bh).map_or(false, |set| set.contains(bh, address))
 	}
diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
index 8337ef2d8..ac1695b52 100644
--- a/ethcore/src/miner/miner.rs
+++ b/ethcore/src/miner/miner.rs
@@ -1133,7 +1133,7 @@ impl MinerService for Miner {
 				|b| &b.hash() == &block_hash
 			) {
 				trace!(target: "miner", "Submitted block {}={}={} with seal {:?}", block_hash, b.hash(), b.header().bare_hash(), seal);
-				b.lock().try_seal(&*self.engine, seal, None).or_else(|(e, _)| {
+				b.lock().try_seal(&*self.engine, seal).or_else(|(e, _)| {
 					warn!(target: "miner", "Mined solution rejected: {}", e);
 					Err(Error::PowInvalid)
 				})
diff --git a/ethcore/src/snapshot/mod.rs b/ethcore/src/snapshot/mod.rs
index 0ef263476..1c3b4366b 100644
--- a/ethcore/src/snapshot/mod.rs
+++ b/ethcore/src/snapshot/mod.rs
@@ -567,7 +567,7 @@ pub fn verify_old_block(rng: &mut OsRng, header: &Header, engine: &Engine, chain
 	if always || rng.gen::<f32>() <= POW_VERIFY_RATE {
 		match chain.block_header(header.parent_hash()) {
 			Some(parent) => engine.verify_block_family(header, &parent, body),
-			None => engine.verify_block_seal(header, None), // TODO: fetch validation proof as necessary.
+			None => engine.verify_block_seal(header), // TODO: fetch validation proof as necessary.
 		}
 	} else {
 		engine.verify_block_basic(header, body)

From 2f5a774325f59da2f647ac336abf8aabccd58c93 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Wed, 12 Apr 2017 15:54:23 +0200
Subject: [PATCH 013/117] add validator contracts to native_contracts bin

---
 ethcore/native_contracts/build.rs             | 8 ++++++++
 ethcore/native_contracts/generator/src/lib.rs | 4 ++--
 ethcore/native_contracts/src/lib.rs           | 4 ++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ethcore/native_contracts/build.rs b/ethcore/native_contracts/build.rs
index 91eaa86cd..0a080e801 100644
--- a/ethcore/native_contracts/build.rs
+++ b/ethcore/native_contracts/build.rs
@@ -22,9 +22,15 @@ use std::io::Write;
 
 // TODO: `include!` these from files where they're pretty-printed?
 const REGISTRY_ABI: &'static str = r#"[{"constant":true,"inputs":[{"name":"_data","type":"address"}],"name":"canReverse","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"bytes32"}],"name":"setData","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"}],"name":"confirmReverse","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserve","outputs":[{"name":"success","type":"bool"}],"payable":true,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"drop","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_amount","type":"uint256"}],"name":"setFee","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_to","type":"address"}],"name":"transfer","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getData","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserved","outputs":[{"name":"reserved","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"},{"name":"_who","type":"address"}],"name":"proposeReverse","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"hasReverse","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"getOwner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"getReverse","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_data","type":"address"}],"name":"reverse","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"uint256"}],"name":"setUint","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"},{"name":"_who","type":"address"}],"name":"confirmReverseAs","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"removeReverse","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"address"}],"name":"setAddress","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"}]"#;
+
 const SERVICE_TRANSACTION_ABI: &'static str = r#"[{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"}],"name":"certify","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"}],"name":"revoke","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"delegate","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setDelegate","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"}],"name":"certified","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"get","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"}]"#;
+
 const SECRETSTORE_ACL_STORAGE_ABI: &'static str = r#"[{"constant":true,"inputs":[{"name":"user","type":"address"},{"name":"document","type":"bytes32"}],"name":"checkPermissions","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"}]"#;
 
+const VALIDATOR_SET_ABI: &'static str = r#"[{"constant":true,"inputs":[],"name":"getValidators","outputs":[{"name":"","type":"address[]"}],"payable":false,"type":"function"}]"#;
+
+const VALIDATOR_REPORT_ABI: &'static str = r#"[{"constant":false,"inputs":[{"name":"validator","type":"address"}],"name":"reportMalicious","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"validator","type":"address"}],"name":"reportBenign","outputs":[],"payable":false,"type":"function"}]"#;
+
 fn build_file(name: &str, abi: &str, filename: &str) {
 	let code = ::native_contract_generator::generate_module(name, abi).unwrap();
 
@@ -39,4 +45,6 @@ fn main() {
 	build_file("Registry", REGISTRY_ABI, "registry.rs");
 	build_file("ServiceTransactionChecker", SERVICE_TRANSACTION_ABI, "service_transaction.rs");
 	build_file("SecretStoreAclStorage", SECRETSTORE_ACL_STORAGE_ABI, "secretstore_acl_storage.rs");
+	build_file("ValidatorSet", VALIDATOR_SET_ABI, "validator_set.rs");
+	build_file("ValidatorReport", VALIDATOR_REPORT_ABI, "validator_report.rs");
 }
diff --git a/ethcore/native_contracts/generator/src/lib.rs b/ethcore/native_contracts/generator/src/lib.rs
index f49caf227..363e76ea1 100644
--- a/ethcore/native_contracts/generator/src/lib.rs
+++ b/ethcore/native_contracts/generator/src/lib.rs
@@ -299,10 +299,10 @@ fn detokenize(name: &str, output_type: ParamType) -> String {
 		ParamType::Bool => format!("{}.to_bool()", name),
 		ParamType::String => format!("{}.to_string()", name),
 		ParamType::Array(kind) => {
-			let read_array = format!("x.into_iter().map(|a| {{ {} }}).collect::<Option<Vec<_>>()",
+			let read_array = format!("x.into_iter().map(|a| {{ {} }}).collect::<Option<Vec<_>>>()",
 				detokenize("a", *kind));
 
-			format!("{}.to_array().and_then(|x| {})",
+			format!("{}.to_array().and_then(|x| {{ {} }})",
 				name, read_array)
 		}
 		ParamType::FixedArray(_, _) => panic!("Fixed-length arrays not supported.")
diff --git a/ethcore/native_contracts/src/lib.rs b/ethcore/native_contracts/src/lib.rs
index e894a636f..1aaaf07b1 100644
--- a/ethcore/native_contracts/src/lib.rs
+++ b/ethcore/native_contracts/src/lib.rs
@@ -26,7 +26,11 @@ extern crate ethcore_util as util;
 mod registry;
 mod service_transaction;
 mod secretstore_acl_storage;
+mod validator_set;
+mod validator_report;
 
 pub use self::registry::Registry;
 pub use self::service_transaction::ServiceTransactionChecker;
 pub use self::secretstore_acl_storage::SecretStoreAclStorage;
+pub use self::validator_set::ValidatorSet;
+pub use self::validator_report::ValidatorReport;

From 0f80c57dcaac179b29b077ece375ee91d0886ba2 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Wed, 12 Apr 2017 16:15:35 +0200
Subject: [PATCH 014/117] use native contracts in `ValidatorSet`

---
 ethcore/native_contracts/generator/src/lib.rs |   8 +-
 .../native_contracts/src/validator_report.rs  |  22 ++++
 ethcore/native_contracts/src/validator_set.rs |  22 ++++
 ethcore/src/engines/validator_set/contract.rs | 104 +++++-------------
 .../engines/validator_set/safe_contract.rs    |  96 +++++-----------
 5 files changed, 107 insertions(+), 145 deletions(-)
 create mode 100644 ethcore/native_contracts/src/validator_report.rs
 create mode 100644 ethcore/native_contracts/src/validator_set.rs

diff --git a/ethcore/native_contracts/generator/src/lib.rs b/ethcore/native_contracts/generator/src/lib.rs
index 363e76ea1..28d658cb3 100644
--- a/ethcore/native_contracts/generator/src/lib.rs
+++ b/ethcore/native_contracts/generator/src/lib.rs
@@ -46,7 +46,7 @@ pub fn generate_module(struct_name: &str, abi: &str) -> Result<String, Error> {
 
 	Ok(format!(r##"
 use byteorder::{{BigEndian, ByteOrder}};
-use futures::{{future, Future, BoxFuture}};
+use futures::{{future, Future, IntoFuture, BoxFuture}};
 use ethabi::{{Contract, Interface, Token}};
 use util::{{self, Uint}};
 
@@ -99,7 +99,10 @@ fn generate_functions(contract: &Contract) -> Result<String, Error> {
 /// Inputs: {abi_inputs:?}
 /// Outputs: {abi_outputs:?}
 pub fn {snake_name}<F, U>(&self, call: F, {params}) -> BoxFuture<{output_type}, String>
-	where F: Fn(util::Address, Vec<u8>) -> U, U: Future<Item=Vec<u8>, Error=String> + Send + 'static
+	where
+	    F: Fn(util::Address, Vec<u8>) -> U,
+	    U: IntoFuture<Item=Vec<u8>, Error=String>,
+		U::Future: Send + 'static
 {{
 	let function = self.contract.function(r#"{abi_name}"#.to_string())
 		.expect("function existence checked at compile-time; qed");
@@ -111,6 +114,7 @@ pub fn {snake_name}<F, U>(&self, call: F, {params}) -> BoxFuture<{output_type},
 	}};
 
 	call_future
+		.into_future()
 		.and_then(move |out| function.decode_output(out).map_err(|e| format!("{{:?}}", e)))
 		.map(::std::collections::VecDeque::from)
 		.and_then(|mut outputs| {decode_outputs})
diff --git a/ethcore/native_contracts/src/validator_report.rs b/ethcore/native_contracts/src/validator_report.rs
new file mode 100644
index 000000000..d77b07c71
--- /dev/null
+++ b/ethcore/native_contracts/src/validator_report.rs
@@ -0,0 +1,22 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+#![allow(unused_mut, unused_variables, unused_imports)]
+
+//! Validator reporting.
+// TODO: testing.
+
+include!(concat!(env!("OUT_DIR"), "/validator_report.rs"));
diff --git a/ethcore/native_contracts/src/validator_set.rs b/ethcore/native_contracts/src/validator_set.rs
new file mode 100644
index 000000000..0a69913e0
--- /dev/null
+++ b/ethcore/native_contracts/src/validator_set.rs
@@ -0,0 +1,22 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+#![allow(unused_mut, unused_variables, unused_imports)]
+
+//! Validator set contract.
+// TODO: testing.
+
+include!(concat!(env!("OUT_DIR"), "/validator_set.rs"));
diff --git a/ethcore/src/engines/validator_set/contract.rs b/ethcore/src/engines/validator_set/contract.rs
index adfdd1225..c45e8c479 100644
--- a/ethcore/src/engines/validator_set/contract.rs
+++ b/ethcore/src/engines/validator_set/contract.rs
@@ -18,27 +18,46 @@
 /// It can also report validators for misbehaviour with two levels: `reportMalicious` and `reportBenign`.
 
 use std::sync::Weak;
+use futures::Future;
 use util::*;
 use client::{Client, BlockChainClient};
+
+use native_contracts::ValidatorReport as Provider;
+
 use super::ValidatorSet;
 use super::safe_contract::ValidatorSafeContract;
 
-/// The validator contract should have the following interface:
-/// [{"constant":true,"inputs":[],"name":"getValidators","outputs":[{"name":"","type":"address[]"}],"payable":false,"type":"function"}]
+/// A validator contract with reporting.
 pub struct ValidatorContract {
 	validators: ValidatorSafeContract,
-	provider: RwLock<Option<provider::Contract>>,
+	provider: Provider,
+	client: RwLock<Option<Weak<Client>>>, // TODO [keorn]: remove
 }
 
 impl ValidatorContract {
 	pub fn new(contract_address: Address) -> Self {
 		ValidatorContract {
 			validators: ValidatorSafeContract::new(contract_address),
-			provider: RwLock::new(None),
+			provider: Provider::new(contract_address),
+			client: RwLock::new(None),
 		}
 	}
 }
 
+impl ValidatorContract {
+	// could be `impl Trait`.
+	// note: dispatches transactions to network as well as execute.
+	// TODO [keorn]: Make more general.
+	fn transact(&self) -> Box<Fn(Address, Vec<u8>) -> Result<Vec<u8>, String>> {
+		let client = self.client.read().clone();
+		Box::new(move |a, d| client.as_ref()
+			.and_then(Weak::upgrade)
+			.ok_or("No client!".into())
+			.and_then(|c| c.transact_contract(a, d).map_err(|e| format!("Transaction import error: {}", e)))
+			.map(|_| Default::default()))
+	}
+}
+
 impl ValidatorSet for ValidatorContract {
 	fn contains(&self, bh: &H256, address: &Address) -> bool {
 		self.validators.contains(bh, address)
@@ -53,85 +72,22 @@ impl ValidatorSet for ValidatorContract {
 	}
 
 	fn report_malicious(&self, address: &Address) {
-		if let Some(ref provider) = *self.provider.read() {
-			match provider.report_malicious(address) {
-				Ok(_) => warn!(target: "engine", "Reported malicious validator {}", address),
-				Err(s) => warn!(target: "engine", "Validator {} could not be reported {}", address, s),
-			}
-		} else {
-			warn!(target: "engine", "Malicious behaviour could not be reported: no provider contract.")
+		match self.provider.report_malicious(&*self.transact(), *address).wait() {
+			Ok(_) => warn!(target: "engine", "Reported malicious validator {}", address),
+			Err(s) => warn!(target: "engine", "Validator {} could not be reported {}", address, s),
 		}
 	}
 
 	fn report_benign(&self, address: &Address) {
-		if let Some(ref provider) = *self.provider.read() {
-			match provider.report_benign(address) {
-				Ok(_) => warn!(target: "engine", "Reported benign validator misbehaviour {}", address),
-				Err(s) => warn!(target: "engine", "Validator {} could not be reported {}", address, s),
-			}
-		} else {
-			warn!(target: "engine", "Benign misbehaviour could not be reported: no provider contract.")
+		match self.provider.report_benign(&*self.transact(), *address).wait() {
+			Ok(_) => warn!(target: "engine", "Reported benign validator misbehaviour {}", address),
+			Err(s) => warn!(target: "engine", "Validator {} could not be reported {}", address, s),
 		}
 	}
 
 	fn register_contract(&self, client: Weak<Client>) {
 		self.validators.register_contract(client.clone());
-		let transact = move |a, d| client
-			.upgrade()
-			.ok_or("No client!".into())
-			.and_then(|c| c.transact_contract(a, d).map_err(|e| format!("Transaction import error: {}", e)))
-			.map(|_| Default::default());
-		*self.provider.write() = Some(provider::Contract::new(self.validators.address, transact));
-	}
-}
-
-mod provider {
-	// Autogenerated from JSON contract definition using Rust contract convertor.
-	#![allow(unused_imports)]
-	use std::string::String;
-	use std::result::Result;
-	use std::fmt;
-	use {util, ethabi};
-	use util::{Uint};
-
-	pub struct Contract {
-		contract: ethabi::Contract,
-		address: util::Address,
-		do_call: Box<Fn(util::Address, Vec<u8>) -> Result<Vec<u8>, String> + Send + Sync + 'static>,
-	}
-	impl Contract {
-		pub fn new<F>(address: util::Address, do_call: F) -> Self where F: Fn(util::Address, Vec<u8>) -> Result<Vec<u8>, String> + Send + Sync + 'static {
-			Contract {
-				contract: ethabi::Contract::new(ethabi::Interface::load(b"[{\"constant\":false,\"inputs\":[{\"name\":\"validator\",\"type\":\"address\"}],\"name\":\"reportMalicious\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"validator\",\"type\":\"address\"}],\"name\":\"reportBenign\",\"outputs\":[],\"payable\":false,\"type\":\"function\"}]").expect("JSON is autogenerated; qed")),
-				address: address,
-				do_call: Box::new(do_call),
-			}
-		}
-		fn as_string<T: fmt::Debug>(e: T) -> String { format!("{:?}", e) }
-
-		/// Auto-generated from: `{"constant":false,"inputs":[{"name":"validator","type":"address"}],"name":"reportMalicious","outputs":[],"payable":false,"type":"function"}`
-		#[allow(dead_code)]
-		pub fn report_malicious(&self, validator: &util::Address) -> Result<(), String> {
-			let call = self.contract.function("reportMalicious".into()).map_err(Self::as_string)?;
-			let data = call.encode_call(
-				vec![ethabi::Token::Address(validator.clone().0)]
-			).map_err(Self::as_string)?;
-			call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-
-			Ok(())
-		}
-
-		/// Auto-generated from: `{"constant":false,"inputs":[{"name":"validator","type":"address"}],"name":"reportBenign","outputs":[],"payable":false,"type":"function"}`
-		#[allow(dead_code)]
-		pub fn report_benign(&self, validator: &util::Address) -> Result<(), String> {
-			let call = self.contract.function("reportBenign".into()).map_err(Self::as_string)?;
-			let data = call.encode_call(
-				vec![ethabi::Token::Address(validator.clone().0)]
-			).map_err(Self::as_string)?;
-			call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-
-			Ok(())
-		}
+		*self.client.write() = Some(client);
 	}
 }
 
diff --git a/ethcore/src/engines/validator_set/safe_contract.rs b/ethcore/src/engines/validator_set/safe_contract.rs
index 0a0eaecfd..958f3e0a0 100644
--- a/ethcore/src/engines/validator_set/safe_contract.rs
+++ b/ethcore/src/engines/validator_set/safe_contract.rs
@@ -17,24 +17,26 @@
 /// Validator set maintained in a contract, updated using `getValidators` method.
 
 use std::sync::Weak;
-use ethabi;
+use futures::Future;
+use native_contracts::ValidatorSet as Provider;
+
 use util::*;
 use util::cache::MemoryLruCache;
+
 use types::ids::BlockId;
 use client::{Client, BlockChainClient};
+
 use super::ValidatorSet;
 use super::simple_list::SimpleList;
 
 const MEMOIZE_CAPACITY: usize = 500;
-const CONTRACT_INTERFACE: &'static [u8] = b"[{\"constant\":true,\"inputs\":[],\"name\":\"getValidators\",\"outputs\":[{\"name\":\"\",\"type\":\"address[]\"}],\"payable\":false,\"type\":\"function\"}]";
-const GET_VALIDATORS: &'static str = "getValidators";
 
 /// The validator contract should have the following interface:
-/// [{"constant":true,"inputs":[],"name":"getValidators","outputs":[{"name":"","type":"address[]"}],"payable":false,"type":"function"}]
 pub struct ValidatorSafeContract {
 	pub address: Address,
 	validators: RwLock<MemoryLruCache<H256, SimpleList>>,
-	provider: RwLock<Option<provider::Contract>>,
+	provider: Provider,
+	client: RwLock<Option<Weak<Client>>>, // TODO [keorn]: remove
 }
 
 impl ValidatorSafeContract {
@@ -42,26 +44,30 @@ impl ValidatorSafeContract {
 		ValidatorSafeContract {
 			address: contract_address,
 			validators: RwLock::new(MemoryLruCache::new(MEMOIZE_CAPACITY)),
-			provider: RwLock::new(None),
+			provider: Provider::new(contract_address),
+			client: RwLock::new(None),
 		}
 	}
 
+	fn do_call(&self, id: BlockId) -> Box<Fn(Address, Vec<u8>) -> Result<Vec<u8>, String>> {
+		let client = self.client.read().clone();
+		Box::new(move |addr, data| client.as_ref()
+			.and_then(Weak::upgrade)
+			.ok_or("No client!".into())
+			.and_then(|c| c.call_contract(id, addr, data)))
+	}
+
 	/// Queries the state and gets the set of validators.
 	fn get_list(&self, block_hash: H256) -> Option<SimpleList> {
-		if let Some(ref provider) = *self.provider.read() {
-			match provider.get_validators(BlockId::Hash(block_hash)) {
-				Ok(new) => {
-					debug!(target: "engine", "Set of validators obtained: {:?}", new);
-					Some(SimpleList::new(new))
-				},
-				Err(s) => {
-					debug!(target: "engine", "Set of validators could not be updated: {}", s);
-					None
-				},
-			}
-		} else {
-			warn!(target: "engine", "Set of validators could not be updated: no provider contract.");
-			None
+		match self.provider.get_validators(&*self.do_call(BlockId::Hash(block_hash))).wait() {
+			Ok(new) => {
+				debug!(target: "engine", "Set of validators obtained: {:?}", new);
+				Some(SimpleList::new(new))
+			},
+			Err(s) => {
+				debug!(target: "engine", "Set of validators could not be updated: {}", s);
+				None
+			},
 		}
 	}
 }
@@ -114,55 +120,7 @@ impl ValidatorSet for ValidatorSafeContract {
 
 	fn register_contract(&self, client: Weak<Client>) {
 		trace!(target: "engine", "Setting up contract caller.");
-		let contract = ethabi::Contract::new(ethabi::Interface::load(CONTRACT_INTERFACE).expect("JSON interface is valid; qed"));
-		let call = contract.function(GET_VALIDATORS.into()).expect("Method name is valid; qed");
-		let data = call.encode_call(vec![]).expect("get_validators does not take any arguments; qed");
-		let contract_address = self.address.clone();
-		let do_call = move |id| client
-			.upgrade()
-			.ok_or("No client!".into())
-			.and_then(|c| c.call_contract(id, contract_address.clone(), data.clone()))
-			.map(|raw_output| call.decode_output(raw_output).expect("ethabi is correct; qed"));
-		*self.provider.write() = Some(provider::Contract::new(do_call));
-	}
-}
-
-mod provider {
-	use std::string::String;
-	use std::result::Result;
-	use {util, ethabi};
-	use types::ids::BlockId;
-
-	pub struct Contract {
-		do_call: Box<Fn(BlockId) -> Result<Vec<ethabi::Token>, String> + Send + Sync + 'static>,
-	}
-
-	impl Contract {
-		pub fn new<F>(do_call: F) -> Self where F: Fn(BlockId) -> Result<Vec<ethabi::Token>, String> + Send + Sync + 'static {
-			Contract {
-				do_call: Box::new(do_call),
-			}
-		}
-
-		/// Gets validators from contract with interface: `{"constant":true,"inputs":[],"name":"getValidators","outputs":[{"name":"","type":"address[]"}],"payable":false,"type":"function"}`
-		pub fn get_validators(&self, id: BlockId) -> Result<Vec<util::Address>, String> {
-			Ok((self.do_call)(id)?
-				 .into_iter()
-				 .rev()
-				 .collect::<Vec<_>>()
-				 .pop()
-				 .expect("get_validators returns one argument; qed")
-				 .to_array()
-				 .and_then(|v| v
-					 .into_iter()
-					 .map(|a| a.to_address())
-					 .collect::<Option<Vec<[u8; 20]>>>())
-				 .expect("get_validators returns a list of addresses; qed")
-				 .into_iter()
-				 .map(util::Address::from)
-				 .collect::<Vec<_>>()
-			)
-		}
+		*self.client.write() = Some(client);
 	}
 }
 

From ec922ee5e4d954a5acffe44e62c8a6ba85954e4d Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Wed, 12 Apr 2017 16:42:19 +0200
Subject: [PATCH 015/117] supply optional call context to validator sets

---
 ethcore/src/engines/validator_set/contract.rs | 24 +++++++-----
 ethcore/src/engines/validator_set/mod.rs      | 37 +++++++++++++++++--
 ethcore/src/engines/validator_set/multi.rs    | 31 ++++++++++------
 .../engines/validator_set/safe_contract.rs    | 33 +++++++++--------
 .../src/engines/validator_set/simple_list.rs  | 12 ++++--
 5 files changed, 94 insertions(+), 43 deletions(-)

diff --git a/ethcore/src/engines/validator_set/contract.rs b/ethcore/src/engines/validator_set/contract.rs
index c45e8c479..12d816246 100644
--- a/ethcore/src/engines/validator_set/contract.rs
+++ b/ethcore/src/engines/validator_set/contract.rs
@@ -18,12 +18,14 @@
 /// It can also report validators for misbehaviour with two levels: `reportMalicious` and `reportBenign`.
 
 use std::sync::Weak;
-use futures::Future;
 use util::*;
-use client::{Client, BlockChainClient};
 
+use futures::Future;
 use native_contracts::ValidatorReport as Provider;
 
+use client::{Client, BlockChainClient};
+use engines::Call;
+
 use super::ValidatorSet;
 use super::safe_contract::ValidatorSafeContract;
 
@@ -48,7 +50,7 @@ impl ValidatorContract {
 	// could be `impl Trait`.
 	// note: dispatches transactions to network as well as execute.
 	// TODO [keorn]: Make more general.
-	fn transact(&self) -> Box<Fn(Address, Vec<u8>) -> Result<Vec<u8>, String>> {
+	fn transact(&self) -> Box<Call> {
 		let client = self.client.read().clone();
 		Box::new(move |a, d| client.as_ref()
 			.and_then(Weak::upgrade)
@@ -59,16 +61,20 @@ impl ValidatorContract {
 }
 
 impl ValidatorSet for ValidatorContract {
-	fn contains(&self, bh: &H256, address: &Address) -> bool {
-		self.validators.contains(bh, address)
+	fn default_caller(&self, id: ::ids::BlockId) -> Box<Call> {
+		self.validators.default_caller(id)
 	}
 
-	fn get(&self, bh: &H256, nonce: usize) -> Address {
-		self.validators.get(bh, nonce)
+	fn contains_with_caller(&self, bh: &H256, address: &Address, caller: &Call) -> bool {
+		self.validators.contains_with_caller(bh, address, caller)
 	}
 
-	fn count(&self, bh: &H256) -> usize {
-		self.validators.count(bh)
+	fn get_with_caller(&self, bh: &H256, nonce: usize, caller: &Call) -> Address {
+		self.validators.get_with_caller(bh, nonce, caller)
+	}
+
+	fn count_with_caller(&self, bh: &H256, caller: &Call) -> usize {
+		self.validators.count_with_caller(bh, caller)
 	}
 
 	fn report_malicious(&self, address: &Address) {
diff --git a/ethcore/src/engines/validator_set/mod.rs b/ethcore/src/engines/validator_set/mod.rs
index 2c00c43b0..707b5adf5 100644
--- a/ethcore/src/engines/validator_set/mod.rs
+++ b/ethcore/src/engines/validator_set/mod.rs
@@ -22,6 +22,7 @@ mod contract;
 mod multi;
 
 use std::sync::Weak;
+use ids::BlockId;
 use util::{Address, H256};
 use ethjson::spec::ValidatorSet as ValidatorSpec;
 use client::Client;
@@ -31,6 +32,8 @@ use self::contract::ValidatorContract;
 use self::safe_contract::ValidatorSafeContract;
 use self::multi::Multi;
 
+use super::Call;
+
 /// Creates a validator set from spec.
 pub fn new_validator_set(spec: ValidatorSpec) -> Box<ValidatorSet> {
 	match spec {
@@ -44,13 +47,39 @@ pub fn new_validator_set(spec: ValidatorSpec) -> Box<ValidatorSet> {
 }
 
 /// A validator set.
+// TODO [keorn]: remove internal callers.
 pub trait ValidatorSet: Send + Sync {
-	/// Checks if a given address is a validator.
-	fn contains(&self, parent_block_hash: &H256, address: &Address) -> bool;
+	/// Get the default "Call" helper, for use in general operation.
+	fn default_caller(&self, block_id: BlockId) -> Box<Call>;
+
+	/// Checks if a given address is a validator,
+	/// using underlying, default call mechanism.
+	fn contains(&self, parent: &H256, address: &Address) -> bool {
+		let default = self.default_caller(BlockId::Hash(*parent));
+		self.contains_with_caller(parent, address, &*default)
+	}
 	/// Draws an validator nonce modulo number of validators.
-	fn get(&self, parent_block_hash: &H256, nonce: usize) -> Address;
+	fn get(&self, parent: &H256, nonce: usize) -> Address {
+		let default = self.default_caller(BlockId::Hash(*parent));
+		self.get_with_caller(parent, nonce, &*default)
+	}
 	/// Returns the current number of validators.
-	fn count(&self, parent_block_hash: &H256) -> usize;
+	fn count(&self, parent: &H256) -> usize {
+		let default = self.default_caller(BlockId::Hash(*parent));
+		self.count_with_caller(parent, &*default)
+	}
+
+	/// Checks if a given address is a validator, with the given function
+	/// for executing synchronous calls to contracts.
+	fn contains_with_caller(&self, parent_block_hash: &H256, address: &Address, caller: &Call) -> bool;
+
+	/// Draws an validator nonce modulo number of validators.
+	///
+	fn get_with_caller(&self, parent_block_hash: &H256, nonce: usize, caller: &Call) -> Address;
+
+	/// Returns the current number of validators.
+	fn count_with_caller(&self, parent_block_hash: &H256, caller: &Call) -> usize;
+
 	/// Notifies about malicious behaviour.
 	fn report_malicious(&self, _validator: &Address) {}
 	/// Notifies about benign misbehaviour.
diff --git a/ethcore/src/engines/validator_set/multi.rs b/ethcore/src/engines/validator_set/multi.rs
index 3ae93b0f5..f098ca343 100644
--- a/ethcore/src/engines/validator_set/multi.rs
+++ b/ethcore/src/engines/validator_set/multi.rs
@@ -18,13 +18,14 @@
 
 use std::collections::BTreeMap;
 use std::sync::Weak;
+use engines::Call;
 use util::{H256, Address, RwLock};
 use ids::BlockId;
 use header::BlockNumber;
 use client::{Client, BlockChainClient};
 use super::ValidatorSet;
 
-type BlockNumberLookup = Box<Fn(&H256) -> Result<BlockNumber, String> + Send + Sync + 'static>;
+type BlockNumberLookup = Box<Fn(BlockId) -> Result<BlockNumber, String> + Send + Sync + 'static>;
 
 pub struct Multi {
 	sets: BTreeMap<BlockNumber, Box<ValidatorSet>>,
@@ -40,10 +41,10 @@ impl Multi {
 		}
 	}
 
-	fn correct_set(&self, bh: &H256) -> Option<&ValidatorSet> {
+	fn correct_set(&self, id: BlockId) -> Option<&ValidatorSet> {
 		match self
 			.block_number
-			.read()(bh)
+			.read()(id)
 			.map(|parent_block| self
 					 .sets
 					 .iter()
@@ -66,16 +67,24 @@ impl Multi {
 }
 
 impl ValidatorSet for Multi {
-	fn contains(&self, bh: &H256, address: &Address) -> bool {
-		self.correct_set(bh).map_or(false, |set| set.contains(bh, address))
+	fn default_caller(&self, block_id: BlockId) -> Box<Call> {
+		self.correct_set(block_id).map(|set| set.default_caller(block_id))
+			.unwrap_or(Box::new(|_, _| Err("No validator set for given ID.".into())))
 	}
 
-	fn get(&self, bh: &H256, nonce: usize) -> Address {
-		self.correct_set(bh).map_or_else(Default::default, |set| set.get(bh, nonce))
+	fn contains_with_caller(&self, bh: &H256, address: &Address, caller: &Call) -> bool {
+		self.correct_set(BlockId::Hash(*bh))
+			.map_or(false, |set| set.contains_with_caller(bh, address, caller))
 	}
 
-	fn count(&self, bh: &H256) -> usize {
-		self.correct_set(bh).map_or_else(usize::max_value, |set| set.count(bh))
+	fn get_with_caller(&self, bh: &H256, nonce: usize, caller: &Call) -> Address {
+		self.correct_set(BlockId::Hash(*bh))
+			.map_or_else(Default::default, |set| set.get_with_caller(bh, nonce, caller))
+	}
+
+	fn count_with_caller(&self, bh: &H256, caller: &Call) -> usize {
+		self.correct_set(BlockId::Hash(*bh))
+			.map_or_else(usize::max_value, |set| set.count_with_caller(bh, caller))
 	}
 
 	fn report_malicious(&self, validator: &Address) {
@@ -94,10 +103,10 @@ impl ValidatorSet for Multi {
 		for set in self.sets.values() {
 			set.register_contract(client.clone());
 		}
-		*self.block_number.write() = Box::new(move |hash| client
+		*self.block_number.write() = Box::new(move |id| client
 			.upgrade()
 			.ok_or("No client!".into())
-			.and_then(|c| c.block_number(BlockId::Hash(*hash)).ok_or("Unknown block".into())));
+			.and_then(|c| c.block_number(id).ok_or("Unknown block".into())));
 	}
 }
 
diff --git a/ethcore/src/engines/validator_set/safe_contract.rs b/ethcore/src/engines/validator_set/safe_contract.rs
index 958f3e0a0..8a0599dde 100644
--- a/ethcore/src/engines/validator_set/safe_contract.rs
+++ b/ethcore/src/engines/validator_set/safe_contract.rs
@@ -23,6 +23,7 @@ use native_contracts::ValidatorSet as Provider;
 use util::*;
 use util::cache::MemoryLruCache;
 
+use engines::Call;
 use types::ids::BlockId;
 use client::{Client, BlockChainClient};
 
@@ -49,17 +50,9 @@ impl ValidatorSafeContract {
 		}
 	}
 
-	fn do_call(&self, id: BlockId) -> Box<Fn(Address, Vec<u8>) -> Result<Vec<u8>, String>> {
-		let client = self.client.read().clone();
-		Box::new(move |addr, data| client.as_ref()
-			.and_then(Weak::upgrade)
-			.ok_or("No client!".into())
-			.and_then(|c| c.call_contract(id, addr, data)))
-	}
-
 	/// Queries the state and gets the set of validators.
-	fn get_list(&self, block_hash: H256) -> Option<SimpleList> {
-		match self.provider.get_validators(&*self.do_call(BlockId::Hash(block_hash))).wait() {
+	fn get_list(&self, caller: &Call) -> Option<SimpleList> {
+		match self.provider.get_validators(caller).wait() {
 			Ok(new) => {
 				debug!(target: "engine", "Set of validators obtained: {:?}", new);
 				Some(SimpleList::new(new))
@@ -73,14 +66,22 @@ impl ValidatorSafeContract {
 }
 
 impl ValidatorSet for ValidatorSafeContract {
-	fn contains(&self, block_hash: &H256, address: &Address) -> bool {
+	fn default_caller(&self, id: BlockId) -> Box<Call> {
+		let client = self.client.read().clone();
+		Box::new(move |addr, data| client.as_ref()
+			.and_then(Weak::upgrade)
+			.ok_or("No client!".into())
+			.and_then(|c| c.call_contract(id, addr, data)))
+	}
+
+	fn contains_with_caller(&self, block_hash: &H256, address: &Address, caller: &Call) -> bool {
 		let mut guard = self.validators.write();
 		let maybe_existing = guard
 			.get_mut(block_hash)
 			.map(|list| list.contains(block_hash, address));
 		maybe_existing
 			.unwrap_or_else(|| self
-				.get_list(block_hash.clone())
+				.get_list(caller)
 				.map_or(false, |list| {
 					let contains = list.contains(block_hash, address);
 					guard.insert(block_hash.clone(), list);
@@ -88,14 +89,14 @@ impl ValidatorSet for ValidatorSafeContract {
 				 }))
 	}
 
-	fn get(&self, block_hash: &H256, nonce: usize) -> Address {
+	fn get_with_caller(&self, block_hash: &H256, nonce: usize, caller: &Call) -> Address {
 		let mut guard = self.validators.write();
 		let maybe_existing = guard
 			.get_mut(block_hash)
 			.map(|list| list.get(block_hash, nonce));
 		maybe_existing
 			.unwrap_or_else(|| self
-				.get_list(block_hash.clone())
+				.get_list(caller)
 				.map_or_else(Default::default, |list| {
 					let address = list.get(block_hash, nonce);
 					guard.insert(block_hash.clone(), list);
@@ -103,14 +104,14 @@ impl ValidatorSet for ValidatorSafeContract {
 				 }))
 	}
 
-	fn count(&self, block_hash: &H256) -> usize {
+	fn count_with_caller(&self, block_hash: &H256, caller: &Call) -> usize {
 		let mut guard = self.validators.write();
 		let maybe_existing = guard
 			.get_mut(block_hash)
 			.map(|list| list.count(block_hash));
 		maybe_existing
 			.unwrap_or_else(|| self
-				.get_list(block_hash.clone())
+				.get_list(caller)
 				.map_or_else(usize::max_value, |list| {
 					let address = list.count(block_hash);
 					guard.insert(block_hash.clone(), list);
diff --git a/ethcore/src/engines/validator_set/simple_list.rs b/ethcore/src/engines/validator_set/simple_list.rs
index cc4259fac..ac82cf76f 100644
--- a/ethcore/src/engines/validator_set/simple_list.rs
+++ b/ethcore/src/engines/validator_set/simple_list.rs
@@ -17,6 +17,8 @@
 /// Preconfigured validator list.
 
 use util::{H256, Address, HeapSizeOf};
+
+use engines::Call;
 use super::ValidatorSet;
 
 #[derive(Debug, PartialEq, Eq, Default)]
@@ -39,16 +41,20 @@ impl HeapSizeOf for SimpleList {
 }
 
 impl ValidatorSet for SimpleList {
-	fn contains(&self, _bh: &H256, address: &Address) -> bool {
+	fn default_caller(&self, _block_id: ::ids::BlockId) -> Box<Call> {
+		Box::new(|_, _| Err("Simple list doesn't require calls.".into()))
+	}
+
+	fn contains_with_caller(&self, _bh: &H256, address: &Address, _: &Call) -> bool {
 		self.validators.contains(address)
 	}
 
-	fn get(&self, _bh: &H256, nonce: usize) -> Address {
+	fn get_with_caller(&self, _bh: &H256, nonce: usize, _: &Call) -> Address {
 		let validator_n = self.validators.len();
 		self.validators.get(nonce % validator_n).expect("There are validator_n authorities; taking number modulo validator_n gives number in validator_n range; qed").clone()
 	}
 
-	fn count(&self, _bh: &H256) -> usize {
+	fn count_with_caller(&self, _bh: &H256, _: &Call) -> usize {
 		self.validators.len()
 	}
 }

From 34a1512ff07b74993ec45206e4a5af9612425fc0 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Wed, 12 Apr 2017 18:55:38 +0200
Subject: [PATCH 016/117] skeleton for proof checking

---
 ethcore/src/engines/authority_round.rs        | 14 +++++-
 ethcore/src/engines/basic_authority.rs        | 18 ++++++--
 ethcore/src/engines/mod.rs                    | 17 ++++---
 ethcore/src/engines/validator_set/contract.rs | 11 +++++
 ethcore/src/engines/validator_set/mod.rs      | 23 +++++++++-
 ethcore/src/engines/validator_set/multi.rs    | 44 ++++++++++++-------
 .../engines/validator_set/safe_contract.rs    | 14 ++++++
 .../src/engines/validator_set/simple_list.rs  | 17 +++++++
 8 files changed, 131 insertions(+), 27 deletions(-)

diff --git a/ethcore/src/engines/authority_round.rs b/ethcore/src/engines/authority_round.rs
index e6cbdb531..e57fb27bc 100644
--- a/ethcore/src/engines/authority_round.rs
+++ b/ethcore/src/engines/authority_round.rs
@@ -25,7 +25,7 @@ use rlp::{UntrustedRlp, encode};
 use account_provider::AccountProvider;
 use block::*;
 use spec::CommonParams;
-use engines::{Engine, Seal, EngineError};
+use engines::{Call, Engine, Seal, EngineError};
 use header::Header;
 use error::{Error, TransactionError, BlockError};
 use evm::Schedule;
@@ -358,6 +358,18 @@ impl Engine for AuthorityRound {
 		Ok(())
 	}
 
+	// the proofs we need just allow us to get the full validator set.
+	fn prove_with_caller(&self, header: &Header, caller: &Call) -> Result<Bytes, Error> {
+		self.validators.generate_proof(header, caller)
+			.map_err(|e| EngineError::InsufficientProof(e).into())
+	}
+
+	fn proof_required(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
+		-> super::RequiresProof
+	{
+		self.validators.proof_required(header, block, receipts)
+	}
+
 	fn verify_transaction_basic(&self, t: &UnverifiedTransaction, header: &Header) -> result::Result<(), Error> {
 		t.check_low_s()?;
 
diff --git a/ethcore/src/engines/basic_authority.rs b/ethcore/src/engines/basic_authority.rs
index e5a53d4e9..a785b360a 100644
--- a/ethcore/src/engines/basic_authority.rs
+++ b/ethcore/src/engines/basic_authority.rs
@@ -23,7 +23,7 @@ use account_provider::AccountProvider;
 use block::*;
 use builtin::Builtin;
 use spec::CommonParams;
-use engines::{Engine, Seal};
+use engines::{Engine, EngineError, Seal, Call, RequiresProof};
 use env_info::EnvInfo;
 use error::{BlockError, Error};
 use evm::Schedule;
@@ -51,8 +51,7 @@ impl From<ethjson::spec::BasicAuthorityParams> for BasicAuthorityParams {
 	}
 }
 
-/// Engine using `BasicAuthority` proof-of-work consensus algorithm, suitable for Ethereum
-/// mainnet chains in the Olympic, Frontier and Homestead eras.
+/// Engine using `BasicAuthority`, trivial proof-of-authority consensus.
 pub struct BasicAuthority {
 	params: CommonParams,
 	gas_limit_bound_divisor: U256,
@@ -139,6 +138,7 @@ impl Engine for BasicAuthority {
 
 	fn verify_block_family(&self, header: &Header, parent: &Header, _block: Option<&[u8]>) -> result::Result<(), Error> {
 		use rlp::UntrustedRlp;
+
 		// Check if the signature belongs to a validator, can depend on parent state.
 		let sig = UntrustedRlp::new(&header.seal()[0]).as_val::<H520>()?;
 		let signer = public_to_address(&recover(&sig.into(), &header.bare_hash())?);
@@ -164,6 +164,18 @@ impl Engine for BasicAuthority {
 		Ok(())
 	}
 
+	// the proofs we need just allow us to get the full validator set.
+	fn prove_with_caller(&self, header: &Header, caller: &Call) -> Result<Bytes, Error> {
+		self.validators.generate_proof(header, caller)
+			.map_err(|e| EngineError::InsufficientProof(e).into())
+	}
+
+	fn proof_required(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
+		-> RequiresProof
+	{
+		self.validators.proof_required(header, block, receipts)
+	}
+
 	fn register_client(&self, client: Weak<Client>) {
 		self.validators.register_contract(client);
 	}
diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
index e4bc514b7..f1e0a4d43 100644
--- a/ethcore/src/engines/mod.rs
+++ b/ethcore/src/engines/mod.rs
@@ -62,6 +62,8 @@ pub enum EngineError {
 	UnexpectedMessage,
 	/// Seal field has an unexpected size.
 	BadSealFieldSize(OutOfBounds<usize>),
+	/// Validation proof insufficient.
+	InsufficientProof(String),
 }
 
 impl fmt::Display for EngineError {
@@ -73,6 +75,7 @@ impl fmt::Display for EngineError {
 			NotAuthorized(ref address) => format!("Signer {} is not authorized.", address),
 			UnexpectedMessage => "This Engine should not be fed messages.".into(),
 			BadSealFieldSize(ref oob) => format!("Seal field has an unexpected length: {}", oob),
+			InsufficientProof(ref msg) => format!("Insufficient validation proof: {}", msg),
 		};
 
 		f.write_fmt(format_args!("Engine error ({})", msg))
@@ -99,8 +102,9 @@ pub enum RequiresProof {
 	Unsure(Unsure),
 	/// Validation proof not required.
 	No,
-	/// Validation proof required.
-	Yes,
+	/// Validation proof required, and the expected output
+	/// if it can be recovered.
+	Yes(Option<Bytes>),
 }
 
 /// More data required to determine if a validation proof is required.
@@ -213,12 +217,15 @@ pub trait Engine : Sync + Send {
 	/// Re-do all verification for a header with the given contract-calling interface
 	///
 	/// This will be used to generate proofs of validation as well as verify them.
-	fn verify_with_state(&self, _header: &Header, _call: &Call) -> Result<(), Error> {
-		Ok(())
+	/// Must be called on blocks that have already passed basic verification.
+	///
+	/// Return the "validation proof" generated.
+	fn prove_with_caller(&self, _header: &Header, _caller: &Call) -> Result<Bytes, Error> {
+		Ok(Vec::new())
 	}
 
 	/// Whether a proof is required for the given header.
-	fn proof_required(&self, _header: Header, _block: Option<&[u8]>, _receipts: Option<&[Receipt]>)
+	fn proof_required(&self, _header: &Header, _block: Option<&[u8]>, _receipts: Option<&[Receipt]>)
 		-> RequiresProof
 	{
 		RequiresProof::No
diff --git a/ethcore/src/engines/validator_set/contract.rs b/ethcore/src/engines/validator_set/contract.rs
index 12d816246..5c4af4ba7 100644
--- a/ethcore/src/engines/validator_set/contract.rs
+++ b/ethcore/src/engines/validator_set/contract.rs
@@ -25,6 +25,7 @@ use native_contracts::ValidatorReport as Provider;
 
 use client::{Client, BlockChainClient};
 use engines::Call;
+use header::Header;
 
 use super::ValidatorSet;
 use super::safe_contract::ValidatorSafeContract;
@@ -65,6 +66,16 @@ impl ValidatorSet for ValidatorContract {
 		self.validators.default_caller(id)
 	}
 
+	fn proof_required(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
+		-> ::engines::RequiresProof
+	{
+		self.validators.proof_required(header, block, receipts)
+	}
+
+	fn generate_proof(&self, header: &Header, caller: &Call) -> Result<Vec<u8>, String> {
+		self.validators.generate_proof(header, caller)
+	}
+
 	fn contains_with_caller(&self, bh: &H256, address: &Address, caller: &Call) -> bool {
 		self.validators.contains_with_caller(bh, address, caller)
 	}
diff --git a/ethcore/src/engines/validator_set/mod.rs b/ethcore/src/engines/validator_set/mod.rs
index 707b5adf5..d5abf430d 100644
--- a/ethcore/src/engines/validator_set/mod.rs
+++ b/ethcore/src/engines/validator_set/mod.rs
@@ -26,6 +26,7 @@ use ids::BlockId;
 use util::{Address, H256};
 use ethjson::spec::ValidatorSet as ValidatorSpec;
 use client::Client;
+use header::Header;
 
 use self::simple_list::SimpleList;
 use self::contract::ValidatorContract;
@@ -47,9 +48,10 @@ pub fn new_validator_set(spec: ValidatorSpec) -> Box<ValidatorSet> {
 }
 
 /// A validator set.
-// TODO [keorn]: remove internal callers.
 pub trait ValidatorSet: Send + Sync {
 	/// Get the default "Call" helper, for use in general operation.
+	// TODO [keorn]: this is a hack intended to migrate off of
+	// a strict dependency on state always being available.
 	fn default_caller(&self, block_id: BlockId) -> Box<Call>;
 
 	/// Checks if a given address is a validator,
@@ -63,12 +65,31 @@ pub trait ValidatorSet: Send + Sync {
 		let default = self.default_caller(BlockId::Hash(*parent));
 		self.get_with_caller(parent, nonce, &*default)
 	}
+
 	/// Returns the current number of validators.
 	fn count(&self, parent: &H256) -> usize {
 		let default = self.default_caller(BlockId::Hash(*parent));
 		self.count_with_caller(parent, &*default)
 	}
 
+	/// Whether a validation proof is required at the given block.
+	/// Usually indicates that the validator set changed at the given block.
+	///
+	/// Should not inspect state! This is used in situations where
+	/// state is not generally available.
+	///
+	/// Return `Ok` with a flag indicating whether it changed at the given header,
+	/// or `Unsure` indicating a need for more information.
+	///
+	/// This may or may not be called in a loop.
+	fn proof_required(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
+		-> super::RequiresProof;
+
+	/// Generate a validation proof at the given header.
+	/// Must interact with state only through the given caller!
+	/// Otherwise, generated proofs may be wrong.
+	fn generate_proof(&self, header: &Header, caller: &Call) -> Result<Vec<u8>, String>;
+
 	/// Checks if a given address is a validator, with the given function
 	/// for executing synchronous calls to contracts.
 	fn contains_with_caller(&self, parent_block_hash: &H256, address: &Address, caller: &Call) -> bool;
diff --git a/ethcore/src/engines/validator_set/multi.rs b/ethcore/src/engines/validator_set/multi.rs
index f098ca343..78270c4af 100644
--- a/ethcore/src/engines/validator_set/multi.rs
+++ b/ethcore/src/engines/validator_set/multi.rs
@@ -18,10 +18,10 @@
 
 use std::collections::BTreeMap;
 use std::sync::Weak;
-use engines::Call;
+use engines::{Call, RequiresProof};
 use util::{H256, Address, RwLock};
 use ids::BlockId;
-use header::BlockNumber;
+use header::{BlockNumber, Header};
 use client::{Client, BlockChainClient};
 use super::ValidatorSet;
 
@@ -42,21 +42,9 @@ impl Multi {
 	}
 
 	fn correct_set(&self, id: BlockId) -> Option<&ValidatorSet> {
-		match self
-			.block_number
-			.read()(id)
-			.map(|parent_block| self
-					 .sets
-					 .iter()
-					 .rev()
-					 .find(|&(block, _)| *block <= parent_block + 1)
-					 .expect("constructor validation ensures that there is at least one validator set for block 0;
-									 block 0 is less than any uint;
-									 qed")
-				) {
-			Ok((block, set)) => {
-				trace!(target: "engine", "Multi ValidatorSet retrieved for block {}.", block);
-				Some(&**set)
+		match self.block_number.read()(id).map(|parent_block| self.correct_set_by_number(parent_block)) {
+			Ok(set) => {
+				Some(set)
 			},
 			Err(e) => {
 				debug!(target: "engine", "ValidatorSet could not be recovered: {}", e);
@@ -64,6 +52,18 @@ impl Multi {
 			},
 		}
 	}
+
+	fn correct_set_by_number(&self, parent_block: BlockNumber) -> &ValidatorSet {
+		let (block, set) = self.sets.iter()
+			.rev()
+			.find(|&(block, _)| *block <= parent_block + 1)
+			.expect("constructor validation ensures that there is at least one validator set for block 0;
+					 block 0 is less than any uint;
+					 qed");
+
+		trace!(target: "engine", "Multi ValidatorSet retrieved for block {}.", block);
+		&**set
+	}
 }
 
 impl ValidatorSet for Multi {
@@ -72,6 +72,16 @@ impl ValidatorSet for Multi {
 			.unwrap_or(Box::new(|_, _| Err("No validator set for given ID.".into())))
 	}
 
+	fn proof_required(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
+		-> RequiresProof
+	{
+		self.correct_set_by_number(header.number()).proof_required(header, block, receipts)
+	}
+
+	fn generate_proof(&self, header: &Header, caller: &Call) -> Result<Vec<u8>, String> {
+		self.correct_set_by_number(header.number()).generate_proof(header, caller)
+	}
+
 	fn contains_with_caller(&self, bh: &H256, address: &Address, caller: &Call) -> bool {
 		self.correct_set(BlockId::Hash(*bh))
 			.map_or(false, |set| set.contains_with_caller(bh, address, caller))
diff --git a/ethcore/src/engines/validator_set/safe_contract.rs b/ethcore/src/engines/validator_set/safe_contract.rs
index 8a0599dde..61e16e198 100644
--- a/ethcore/src/engines/validator_set/safe_contract.rs
+++ b/ethcore/src/engines/validator_set/safe_contract.rs
@@ -26,6 +26,7 @@ use util::cache::MemoryLruCache;
 use engines::Call;
 use types::ids::BlockId;
 use client::{Client, BlockChainClient};
+use header::Header;
 
 use super::ValidatorSet;
 use super::simple_list::SimpleList;
@@ -74,6 +75,19 @@ impl ValidatorSet for ValidatorSafeContract {
 			.and_then(|c| c.call_contract(id, addr, data)))
 	}
 
+	fn proof_required(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
+		-> ::engines::RequiresProof
+	{
+		// TODO: check blooms first and then logs for the
+		// ValidatorsChanged([parent_hash, nonce], new_validators) log event.
+		::engines::RequiresProof::No
+	}
+
+	fn generate_proof(&self, header: &Header, caller: &Call) -> Result<Vec<u8>, String> {
+		self.get_list(caller).map(|list| ::rlp::encode_list(&list.into_inner()).to_vec())
+			.ok_or_else(|| "Caller insufficient to get validator list.".into())
+	}
+
 	fn contains_with_caller(&self, block_hash: &H256, address: &Address, caller: &Call) -> bool {
 		let mut guard = self.validators.write();
 		let maybe_existing = guard
diff --git a/ethcore/src/engines/validator_set/simple_list.rs b/ethcore/src/engines/validator_set/simple_list.rs
index ac82cf76f..e513212a6 100644
--- a/ethcore/src/engines/validator_set/simple_list.rs
+++ b/ethcore/src/engines/validator_set/simple_list.rs
@@ -19,6 +19,7 @@
 use util::{H256, Address, HeapSizeOf};
 
 use engines::Call;
+use header::Header;
 use super::ValidatorSet;
 
 #[derive(Debug, PartialEq, Eq, Default)]
@@ -27,11 +28,17 @@ pub struct SimpleList {
 }
 
 impl SimpleList {
+	/// Create a new `SimpleList`.
 	pub fn new(validators: Vec<Address>) -> Self {
 		SimpleList {
 			validators: validators,
 		}
 	}
+
+	/// Convert into inner representation.
+	pub fn into_inner(self) -> Vec<Address> {
+		self.validators
+	}
 }
 
 impl HeapSizeOf for SimpleList {
@@ -45,6 +52,16 @@ impl ValidatorSet for SimpleList {
 		Box::new(|_, _| Err("Simple list doesn't require calls.".into()))
 	}
 
+	fn proof_required(&self, _header: &Header, _block: Option<&[u8]>, _receipts: Option<&[::receipt::Receipt]>)
+		-> ::engines::RequiresProof
+	{
+		::engines::RequiresProof::No
+	}
+
+	fn generate_proof(&self, _header: &Header, _caller: &Call) -> Result<Vec<u8>, String> {
+		Ok(Vec::new())
+	}
+
 	fn contains_with_caller(&self, _bh: &H256, address: &Address, _: &Call) -> bool {
 		self.validators.contains(address)
 	}

From b4f3e30cd6827d404182aad45dc748712fbef150 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Wed, 12 Apr 2017 22:10:18 +0200
Subject: [PATCH 017/117] detect changes in safe_contract

---
 ethcore/native_contracts/build.rs             |   4 +-
 ethcore/native_contracts/generator/src/lib.rs |   7 +-
 .../engines/validator_set/safe_contract.rs    | 132 ++++++++++++++++--
 3 files changed, 132 insertions(+), 11 deletions(-)

diff --git a/ethcore/native_contracts/build.rs b/ethcore/native_contracts/build.rs
index 0a080e801..7da55a977 100644
--- a/ethcore/native_contracts/build.rs
+++ b/ethcore/native_contracts/build.rs
@@ -27,7 +27,9 @@ const SERVICE_TRANSACTION_ABI: &'static str = r#"[{"constant":false,"inputs":[{"
 
 const SECRETSTORE_ACL_STORAGE_ABI: &'static str = r#"[{"constant":true,"inputs":[{"name":"user","type":"address"},{"name":"document","type":"bytes32"}],"name":"checkPermissions","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"}]"#;
 
-const VALIDATOR_SET_ABI: &'static str = r#"[{"constant":true,"inputs":[],"name":"getValidators","outputs":[{"name":"","type":"address[]"}],"payable":false,"type":"function"}]"#;
+// be very careful changing these: ensure `ethcore/engines` validator sets have corresponding
+// changes.
+const VALIDATOR_SET_ABI: &'static str = r#"[{"constant":true,"inputs":[],"name":"transitionNonce","outputs":[{"name":"nonce","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getValidators","outputs":[{"name":"validators","type":"address[]"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"_parent_hash","type":"bytes32"},{"indexed":true,"name":"_nonce","type":"uint256"},{"indexed":false,"name":"_new_set","type":"address[]"}],"name":"ValidatorsChanged","type":"event"}]"#;
 
 const VALIDATOR_REPORT_ABI: &'static str = r#"[{"constant":false,"inputs":[{"name":"validator","type":"address"}],"name":"reportMalicious","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"validator","type":"address"}],"name":"reportBenign","outputs":[],"payable":false,"type":"function"}]"#;
 
diff --git a/ethcore/native_contracts/generator/src/lib.rs b/ethcore/native_contracts/generator/src/lib.rs
index 28d658cb3..76985e682 100644
--- a/ethcore/native_contracts/generator/src/lib.rs
+++ b/ethcore/native_contracts/generator/src/lib.rs
@@ -47,7 +47,7 @@ pub fn generate_module(struct_name: &str, abi: &str) -> Result<String, Error> {
 	Ok(format!(r##"
 use byteorder::{{BigEndian, ByteOrder}};
 use futures::{{future, Future, IntoFuture, BoxFuture}};
-use ethabi::{{Contract, Interface, Token}};
+use ethabi::{{Contract, Interface, Token, Event}};
 use util::{{self, Uint}};
 
 pub struct {name} {{
@@ -70,6 +70,11 @@ impl {name} {{
 		}}
 	}}
 
+	/// Access the underlying `ethabi` contract.
+	pub fn contract(this: &Self) -> &Contract {{
+		&this.contract
+	}}
+
 	{functions}
 }}
 "##,
diff --git a/ethcore/src/engines/validator_set/safe_contract.rs b/ethcore/src/engines/validator_set/safe_contract.rs
index 61e16e198..de7ecb3a2 100644
--- a/ethcore/src/engines/validator_set/safe_contract.rs
+++ b/ethcore/src/engines/validator_set/safe_contract.rs
@@ -23,16 +23,25 @@ use native_contracts::ValidatorSet as Provider;
 use util::*;
 use util::cache::MemoryLruCache;
 
-use engines::Call;
-use types::ids::BlockId;
+use basic_types::LogBloom;
 use client::{Client, BlockChainClient};
+use engines::Call;
 use header::Header;
+use ids::BlockId;
+use log_entry::LogEntry;
 
 use super::ValidatorSet;
 use super::simple_list::SimpleList;
 
 const MEMOIZE_CAPACITY: usize = 500;
 
+// TODO: ethabi should be able to generate this.
+const EVENT_NAME: &'static [u8] = &*b"ValidatorsChanged(bytes32,uint256,address[])";
+
+lazy_static! {
+	static ref EVENT_NAME_HASH: H256 = EVENT_NAME.sha3();
+}
+
 /// The validator contract should have the following interface:
 pub struct ValidatorSafeContract {
 	pub address: Address,
@@ -41,6 +50,14 @@ pub struct ValidatorSafeContract {
 	client: RwLock<Option<Weak<Client>>>, // TODO [keorn]: remove
 }
 
+fn encode_proof(nonce: U256, validators: &[Address]) -> Bytes {
+	use rlp::RlpStream;
+
+	let mut stream = RlpStream::new_list(2);
+	stream.append(&nonce).append_list(validators);
+	stream.drain().to_vec()
+}
+
 impl ValidatorSafeContract {
 	pub fn new(contract_address: Address) -> Self {
 		ValidatorSafeContract {
@@ -64,6 +81,40 @@ impl ValidatorSafeContract {
 			},
 		}
 	}
+
+	/// Queries for the current validator set transition nonce.
+	fn get_nonce(&self, caller: &Call) -> Option<::util::U256> {
+		match self.provider.transition_nonce(caller).wait() {
+			Ok(nonce) => Some(nonce),
+			Err(s) => {
+				debug!(target: "engine", "Unable to fetch transition nonce: {}", s);
+				None
+			}
+		}
+	}
+
+	// Whether the header matches the expected bloom.
+	//
+	// The expected log should have 3 topics:
+	//   1. ETHABI-encoded log name.
+	//   2. the block's parent hash.
+	//   3. the "nonce": n for the nth transition in history.
+	//
+	// We can only search for the first 2, since we don't have the third
+	// just yet.
+	//
+	// The parent hash is included to prevent
+	// malicious actors from brute forcing other logs that would
+	// produce the same bloom.
+	//
+	// The log data is an array of all new validator addresses.
+	fn expected_bloom(&self, header: &Header) -> LogBloom {
+		LogEntry {
+			address: self.address,
+			topics: vec![*EVENT_NAME_HASH, *header.parent_hash()],
+			data: Vec::new(), // irrelevant for bloom.
+		}.bloom()
+	}
 }
 
 impl ValidatorSet for ValidatorSafeContract {
@@ -75,17 +126,80 @@ impl ValidatorSet for ValidatorSafeContract {
 			.and_then(|c| c.call_contract(id, addr, data)))
 	}
 
-	fn proof_required(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
+	fn proof_required(&self, header: &Header, _block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
 		-> ::engines::RequiresProof
 	{
-		// TODO: check blooms first and then logs for the
-		// ValidatorsChanged([parent_hash, nonce], new_validators) log event.
-		::engines::RequiresProof::No
+		let bloom = self.expected_bloom(header);
+		let header_bloom = header.log_bloom();
+
+		if &bloom & header_bloom != bloom { return ::engines::RequiresProof::No }
+
+		match receipts {
+			None => ::engines::RequiresProof::Unsure(::engines::Unsure::NeedsReceipts),
+			Some(receipts) => {
+				let check_log = |log: &LogEntry| {
+					log.address == self.address &&
+						log.topics.len() == 3 &&
+						log.topics[0] == *EVENT_NAME_HASH &&
+						log.topics[1] == *header.parent_hash()
+						// don't have anything to compare nonce to yet.
+				};
+
+				let event = Provider::contract(&self.provider)
+					.event("ValidatorsChanged".into())
+					.expect("Contract known ahead of time to have `ValidatorsChanged` event; qed");
+
+				let mut decoded_events = receipts.iter()
+					.filter(|r| &bloom & &r.log_bloom == bloom)
+					.flat_map(|r| r.logs.iter())
+					.filter(move |l| check_log(l))
+					.filter_map(|log| {
+						let topics = log.topics.iter().map(|x| x.0.clone()).collect();
+						match event.decode_log(topics, log.data.clone()) {
+							Ok(decoded) => Some(decoded),
+							Err(_) => None,
+						}
+					});
+
+
+				// TODO: are multiple transitions per block possible?
+				match decoded_events.next() {
+					None => ::engines::RequiresProof::No,
+					Some(matched_event) => {
+						// decode log manually until the native contract generator is
+						// good enough to do it for us.
+						let &(_, _, ref nonce_token) = &matched_event.params[2];
+						let &(_, _, ref validators_token) = &matched_event.params[3];
+
+						let nonce: Option<U256> = nonce_token.clone().to_uint()
+							.map(H256).map(Into::into);
+						let validators = validators_token.clone().to_array()
+							.and_then(|a| a.into_iter()
+								.map(|x| x.to_address().map(H160))
+								.collect::<Option<Vec<_>>>()
+							);
+
+						match (nonce, validators) {
+							(Some(nonce), Some(validators)) =>
+								::engines::RequiresProof::Yes(Some(encode_proof(nonce, &validators))),
+							_ => {
+								debug!(target: "engine", "Successfully decoded log turned out to be bad.");
+								::engines::RequiresProof::No
+							}
+						}
+					}
+				}
+			}
+		}
 	}
 
-	fn generate_proof(&self, header: &Header, caller: &Call) -> Result<Vec<u8>, String> {
-		self.get_list(caller).map(|list| ::rlp::encode_list(&list.into_inner()).to_vec())
-			.ok_or_else(|| "Caller insufficient to get validator list.".into())
+	// the proof we generate is an RLP list containing two parts.
+	//   (nonce, validators)
+	fn generate_proof(&self, _header: &Header, caller: &Call) -> Result<Vec<u8>, String> {
+		match (self.get_nonce(caller), self.get_list(caller)) {
+			(Some(nonce), Some(list)) => Ok(encode_proof(nonce, &list.into_inner())),
+			_ => Err("Caller insufficient to generate validator proof.".into()),
+		}
 	}
 
 	fn contains_with_caller(&self, block_hash: &H256, address: &Address, caller: &Call) -> bool {

From 314af4cdae217355cd52d70fc3ea81b77ded498b Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Thu, 6 Apr 2017 19:26:17 +0200
Subject: [PATCH 018/117] Use in-memory database in tests

---
 ethcore/src/block.rs                   |  15 ++--
 ethcore/src/blockchain/blockchain.rs   |  12 +--
 ethcore/src/client/client.rs           |   2 +-
 ethcore/src/engines/authority_round.rs |   4 +-
 ethcore/src/engines/basic_authority.rs |   3 +-
 ethcore/src/engines/instant_seal.rs    |   3 +-
 ethcore/src/engines/tendermint/mod.rs  |   4 +-
 ethcore/src/ethereum/ethash.rs         |   6 +-
 ethcore/src/ethereum/mod.rs            |   3 +-
 ethcore/src/executive.rs               |  39 +++-----
 ethcore/src/externalities.rs           |  15 ++--
 ethcore/src/json_tests/executive.rs    |   3 +-
 ethcore/src/json_tests/state.rs        |   2 +-
 ethcore/src/miner/miner.rs             |  11 ++-
 ethcore/src/spec/spec.rs               |   3 +-
 ethcore/src/state/mod.rs               |  97 +++++++-------------
 ethcore/src/state_db.rs                |   3 +-
 ethcore/src/tests/client.rs            |  63 +++++--------
 ethcore/src/tests/helpers.rs           | 118 ++++++-------------------
 19 files changed, 130 insertions(+), 276 deletions(-)

diff --git a/ethcore/src/block.rs b/ethcore/src/block.rs
index 12e77d41b..46a0db733 100644
--- a/ethcore/src/block.rs
+++ b/ethcore/src/block.rs
@@ -667,8 +667,7 @@ mod tests {
 		use spec::*;
 		let spec = Spec::new_test();
 		let genesis_header = spec.genesis_header();
-		let mut db_result = get_temp_state_db();
-		let db = spec.ensure_db_good(db_result.take(), &Default::default()).unwrap();
+		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(&*spec.engine, Default::default(), false, db, &genesis_header, last_hashes, Address::zero(), (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b = b.close_and_lock();
@@ -682,16 +681,14 @@ mod tests {
 		let engine = &*spec.engine;
 		let genesis_header = spec.genesis_header();
 
-		let mut db_result = get_temp_state_db();
-		let db = spec.ensure_db_good(db_result.take(), &Default::default()).unwrap();
+		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes.clone(), Address::zero(), (3141562.into(), 31415620.into()), vec![]).unwrap()
 			.close_and_lock().seal(engine, vec![]).unwrap();
 		let orig_bytes = b.rlp_bytes();
 		let orig_db = b.drain();
 
-		let mut db_result = get_temp_state_db();
-		let db = spec.ensure_db_good(db_result.take(), &Default::default()).unwrap();
+		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let e = enact_and_seal(&orig_bytes, engine, false, db, &genesis_header, last_hashes, Default::default()).unwrap();
 
 		assert_eq!(e.rlp_bytes(), orig_bytes);
@@ -708,8 +705,7 @@ mod tests {
 		let engine = &*spec.engine;
 		let genesis_header = spec.genesis_header();
 
-		let mut db_result = get_temp_state_db();
-		let db = spec.ensure_db_good(db_result.take(), &Default::default()).unwrap();
+		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let mut open_block = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes.clone(), Address::zero(), (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let mut uncle1_header = Header::new();
@@ -723,8 +719,7 @@ mod tests {
 		let orig_bytes = b.rlp_bytes();
 		let orig_db = b.drain();
 
-		let mut db_result = get_temp_state_db();
-		let db = spec.ensure_db_good(db_result.take(), &Default::default()).unwrap();
+		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let e = enact_and_seal(&orig_bytes, engine, false, db, &genesis_header, last_hashes, Default::default()).unwrap();
 
 		let bytes = e.rlp_bytes();
diff --git a/ethcore/src/blockchain/blockchain.rs b/ethcore/src/blockchain/blockchain.rs
index 8986dc6b8..39c1039ca 100644
--- a/ethcore/src/blockchain/blockchain.rs
+++ b/ethcore/src/blockchain/blockchain.rs
@@ -1791,15 +1791,13 @@ mod tests {
 
 	#[test]
 	fn can_contain_arbitrary_block_sequence() {
-		let bc_result = generate_dummy_blockchain(50);
-		let bc = bc_result.reference();
+		let bc = generate_dummy_blockchain(50);
 		assert_eq!(bc.best_block_number(), 49);
 	}
 
 	#[test]
 	fn can_collect_garbage() {
-		let bc_result = generate_dummy_blockchain(3000);
-		let bc = bc_result.reference();
+		let bc = generate_dummy_blockchain(3000);
 
 		assert_eq!(bc.best_block_number(), 2999);
 		let best_hash = bc.best_block_hash();
@@ -1818,15 +1816,13 @@ mod tests {
 
 	#[test]
 	fn can_contain_arbitrary_block_sequence_with_extra() {
-		let bc_result = generate_dummy_blockchain_with_extra(25);
-		let bc = bc_result.reference();
+		let bc = generate_dummy_blockchain_with_extra(25);
 		assert_eq!(bc.best_block_number(), 24);
 	}
 
 	#[test]
 	fn can_contain_only_genesis_block() {
-		let bc_result = generate_dummy_empty_blockchain();
-		let bc = bc_result.reference();
+		let bc = generate_dummy_empty_blockchain();
 		assert_eq!(bc.best_block_number(), 0);
 	}
 
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 4bd29d100..2ad4fa8d6 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -1717,7 +1717,7 @@ mod tests {
 			// Separate thread uncommited transaction
 			let go = Arc::new(AtomicBool::new(false));
 			let go_thread = go.clone();
-			let another_client = client.reference().clone();
+			let another_client = client.clone();
 			thread::spawn(move || {
 				let mut batch = DBTransaction::new();
 				another_client.chain.read().insert_block(&mut batch, &new_block, Vec::new());
diff --git a/ethcore/src/engines/authority_round.rs b/ethcore/src/engines/authority_round.rs
index e6cbdb531..2e8e3932c 100644
--- a/ethcore/src/engines/authority_round.rs
+++ b/ethcore/src/engines/authority_round.rs
@@ -454,8 +454,8 @@ mod tests {
 		let spec = Spec::new_test_round();
 		let engine = &*spec.engine;
 		let genesis_header = spec.genesis_header();
-		let db1 = spec.ensure_db_good(get_temp_state_db().take(), &Default::default()).unwrap();
-		let db2 = spec.ensure_db_good(get_temp_state_db().take(), &Default::default()).unwrap();
+		let db1 = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
+		let db2 = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b1 = OpenBlock::new(engine, Default::default(), false, db1, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b1 = b1.close_and_lock();
diff --git a/ethcore/src/engines/basic_authority.rs b/ethcore/src/engines/basic_authority.rs
index e5a53d4e9..19867a648 100644
--- a/ethcore/src/engines/basic_authority.rs
+++ b/ethcore/src/engines/basic_authority.rs
@@ -252,8 +252,7 @@ mod tests {
 		let engine = &*spec.engine;
 		engine.set_signer(Arc::new(tap), addr, "".into());
 		let genesis_header = spec.genesis_header();
-		let mut db_result = get_temp_state_db();
-		let db = spec.ensure_db_good(db_result.take(), &Default::default()).unwrap();
+		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, addr, (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b = b.close_and_lock();
diff --git a/ethcore/src/engines/instant_seal.rs b/ethcore/src/engines/instant_seal.rs
index 45bede9f4..88672c6f4 100644
--- a/ethcore/src/engines/instant_seal.rs
+++ b/ethcore/src/engines/instant_seal.rs
@@ -82,8 +82,7 @@ mod tests {
 	fn instant_can_seal() {
 		let spec = Spec::new_instant();
 		let engine = &*spec.engine;
-		let mut db_result = get_temp_state_db();
-		let db = spec.ensure_db_good(db_result.take(), &Default::default()).unwrap();
+		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let genesis_header = spec.genesis_header();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, Address::default(), (3141562.into(), 31415620.into()), vec![]).unwrap();
diff --git a/ethcore/src/engines/tendermint/mod.rs b/ethcore/src/engines/tendermint/mod.rs
index 8c8094117..cb284d3c4 100644
--- a/ethcore/src/engines/tendermint/mod.rs
+++ b/ethcore/src/engines/tendermint/mod.rs
@@ -676,8 +676,8 @@ mod tests {
 	}
 
 	fn propose_default(spec: &Spec, proposer: Address) -> (ClosedBlock, Vec<Bytes>) {
-		let mut db_result = get_temp_state_db();
-		let db = spec.ensure_db_good(db_result.take(), &Default::default()).unwrap();
+		let db = get_temp_state_db();
+		let db = spec.ensure_db_good(db, &Default::default()).unwrap();
 		let genesis_header = spec.genesis_header();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(spec.engine.as_ref(), Default::default(), false, db.boxed_clone(), &genesis_header, last_hashes, proposer, (3141562.into(), 31415620.into()), vec![]).unwrap();
diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs
index 5bc31c5d9..88655fa86 100644
--- a/ethcore/src/ethereum/ethash.rs
+++ b/ethcore/src/ethereum/ethash.rs
@@ -524,8 +524,7 @@ mod tests {
 		let spec = new_morden();
 		let engine = &*spec.engine;
 		let genesis_header = spec.genesis_header();
-		let mut db_result = get_temp_state_db();
-		let db = spec.ensure_db_good(db_result.take(), &Default::default()).unwrap();
+		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, Address::zero(), (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b = b.close();
@@ -537,8 +536,7 @@ mod tests {
 		let spec = new_morden();
 		let engine = &*spec.engine;
 		let genesis_header = spec.genesis_header();
-		let mut db_result = get_temp_state_db();
-		let db = spec.ensure_db_good(db_result.take(), &Default::default()).unwrap();
+		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let mut b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, Address::zero(), (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let mut uncle = Header::new();
diff --git a/ethcore/src/ethereum/mod.rs b/ethcore/src/ethereum/mod.rs
index ce8b84b31..b54401572 100644
--- a/ethcore/src/ethereum/mod.rs
+++ b/ethcore/src/ethereum/mod.rs
@@ -94,8 +94,7 @@ mod tests {
 		let spec = new_morden();
 		let engine = &spec.engine;
 		let genesis_header = spec.genesis_header();
-		let mut db_result = get_temp_state_db();
-		let db = spec.ensure_db_good(db_result.take(), &Default::default()).unwrap();
+		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let s = State::from_existing(db, genesis_header.state_root().clone(), engine.account_start_nonce(), Default::default()).unwrap();
 		assert_eq!(s.balance(&"0000000000000000000000000000000000000001".into()).unwrap(), 1u64.into());
 		assert_eq!(s.balance(&"0000000000000000000000000000000000000002".into()).unwrap(), 1u64.into());
diff --git a/ethcore/src/executive.rs b/ethcore/src/executive.rs
index 4183a5005..5e0ee5662 100644
--- a/ethcore/src/executive.rs
+++ b/ethcore/src/executive.rs
@@ -554,8 +554,7 @@ mod tests {
 		params.gas = U256::from(100_000);
 		params.code = Some(Arc::new("3331600055".from_hex().unwrap()));
 		params.value = ActionValue::Transfer(U256::from(0x7));
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		state.add_balance(&sender, &U256::from(0x100u64), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(0);
@@ -613,8 +612,7 @@ mod tests {
 		params.gas = U256::from(100_000);
 		params.code = Some(Arc::new(code));
 		params.value = ActionValue::Transfer(U256::from(100));
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(0);
@@ -672,8 +670,7 @@ mod tests {
 		params.code = Some(Arc::new(code));
 		params.value = ActionValue::Transfer(U256::from(100));
 		params.call_type = CallType::Call;
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(5);
@@ -783,8 +780,7 @@ mod tests {
 		params.gas = U256::from(100_000);
 		params.code = Some(Arc::new(code));
 		params.value = ActionValue::Transfer(100.into());
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(5);
@@ -871,8 +867,7 @@ mod tests {
 		params.gas = U256::from(100_000);
 		params.code = Some(Arc::new(code));
 		params.value = ActionValue::Transfer(U256::from(100));
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(0);
@@ -923,8 +918,7 @@ mod tests {
 		params.gas = U256::from(100_000);
 		params.code = Some(Arc::new(code));
 		params.value = ActionValue::Transfer(U256::from(100));
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(1024);
@@ -981,8 +975,7 @@ mod tests {
 		params.code = Some(Arc::new(code_a.clone()));
 		params.value = ActionValue::Transfer(U256::from(100_000));
 
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		state.init_code(&address_a, code_a.clone()).unwrap();
 		state.init_code(&address_b, code_b.clone()).unwrap();
 		state.add_balance(&sender, &U256::from(100_000), CleanupMode::NoEmpty).unwrap();
@@ -1029,8 +1022,7 @@ mod tests {
 		params.address = address.clone();
 		params.gas = U256::from(100_000);
 		params.code = Some(Arc::new(code.clone()));
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		state.init_code(&address, code).unwrap();
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(0);
@@ -1062,8 +1054,7 @@ mod tests {
 		let sender = t.sender();
 		let contract = contract_address(&sender, &U256::zero());
 
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		state.add_balance(&sender, &U256::from(18), CleanupMode::NoEmpty).unwrap();
 		let mut info = EnvInfo::default();
 		info.gas_limit = U256::from(100_000);
@@ -1100,8 +1091,7 @@ mod tests {
 		}.sign(keypair.secret(), None);
 		let sender = t.sender();
 
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		state.add_balance(&sender, &U256::from(17), CleanupMode::NoEmpty).unwrap();
 		let mut info = EnvInfo::default();
 		info.gas_limit = U256::from(100_000);
@@ -1133,8 +1123,7 @@ mod tests {
 		}.sign(keypair.secret(), None);
 		let sender = t.sender();
 
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		state.add_balance(&sender, &U256::from(17), CleanupMode::NoEmpty).unwrap();
 		let mut info = EnvInfo::default();
 		info.gas_used = U256::from(20_000);
@@ -1168,8 +1157,7 @@ mod tests {
 		}.sign(keypair.secret(), None);
 		let sender = t.sender();
 
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		state.add_balance(&sender, &U256::from(100_017), CleanupMode::NoEmpty).unwrap();
 		let mut info = EnvInfo::default();
 		info.gas_limit = U256::from(100_000);
@@ -1203,8 +1191,7 @@ mod tests {
 		params.gas = U256::from(0x0186a0);
 		params.code = Some(Arc::new(code));
 		params.value = ActionValue::Transfer(U256::from_str("0de0b6b3a7640000").unwrap());
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		state.add_balance(&sender, &U256::from_str("152d02c7e14af6800000").unwrap(), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(0);
diff --git a/ethcore/src/externalities.rs b/ethcore/src/externalities.rs
index 893ba03be..8591f15fd 100644
--- a/ethcore/src/externalities.rs
+++ b/ethcore/src/externalities.rs
@@ -346,7 +346,6 @@ mod tests {
 	use evm::Ext;
 	use state::{State, Substate};
 	use tests::helpers::*;
-	use devtools::GuardedTempResult;
 	use super::*;
 	use trace::{NoopTracer, NoopVMTracer};
 	use types::executed::CallType;
@@ -373,7 +372,7 @@ mod tests {
 	}
 
 	struct TestSetup {
-		state: GuardedTempResult<State<::state_db::StateDB>>,
+		state: State<::state_db::StateDB>,
 		engine: Arc<Engine>,
 		sub_state: Substate,
 		env_info: EnvInfo
@@ -399,7 +398,7 @@ mod tests {
 	#[test]
 	fn can_be_created() {
 		let mut setup = TestSetup::new();
-		let state = setup.state.reference_mut();
+		let state = &mut setup.state;
 		let mut tracer = NoopTracer;
 		let mut vm_tracer = NoopVMTracer;
 
@@ -412,7 +411,7 @@ mod tests {
 	#[test]
 	fn can_return_block_hash_no_env() {
 		let mut setup = TestSetup::new();
-		let state = setup.state.reference_mut();
+		let state = &mut setup.state;
 		let mut tracer = NoopTracer;
 		let mut vm_tracer = NoopVMTracer;
 
@@ -437,7 +436,7 @@ mod tests {
 			last_hashes.push(test_hash.clone());
 			env_info.last_hashes = Arc::new(last_hashes);
 		}
-		let state = setup.state.reference_mut();
+		let state = &mut setup.state;
 		let mut tracer = NoopTracer;
 		let mut vm_tracer = NoopVMTracer;
 
@@ -453,7 +452,7 @@ mod tests {
 	#[should_panic]
 	fn can_call_fail_empty() {
 		let mut setup = TestSetup::new();
-		let state = setup.state.reference_mut();
+		let state = &mut setup.state;
 		let mut tracer = NoopTracer;
 		let mut vm_tracer = NoopVMTracer;
 
@@ -481,7 +480,7 @@ mod tests {
 		let log_topics = vec![H256::from("af0fa234a6af46afa23faf23bcbc1c1cb4bcb7bcbe7e7e7ee3ee2edddddddddd")];
 
 		let mut setup = TestSetup::new();
-		let state = setup.state.reference_mut();
+		let state = &mut setup.state;
 		let mut tracer = NoopTracer;
 		let mut vm_tracer = NoopVMTracer;
 
@@ -499,7 +498,7 @@ mod tests {
 		let refund_account = &Address::new();
 
 		let mut setup = TestSetup::new();
-		let state = setup.state.reference_mut();
+		let state = &mut setup.state;
 		let mut tracer = NoopTracer;
 		let mut vm_tracer = NoopVMTracer;
 
diff --git a/ethcore/src/json_tests/executive.rs b/ethcore/src/json_tests/executive.rs
index 844fa08f5..9526e5ec2 100644
--- a/ethcore/src/json_tests/executive.rs
+++ b/ethcore/src/json_tests/executive.rs
@@ -215,8 +215,7 @@ fn do_json_test_for(vm_type: &VMType, json_data: &[u8]) -> Vec<String> {
 		}
 
 		let out_of_gas = vm.out_of_gas();
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		state.populate_from(From::from(vm.pre_state.clone()));
 		let info = From::from(vm.env);
 		let engine = TestEngine::new(1);
diff --git a/ethcore/src/json_tests/state.rs b/ethcore/src/json_tests/state.rs
index e4b9390db..d0b18d99c 100644
--- a/ethcore/src/json_tests/state.rs
+++ b/ethcore/src/json_tests/state.rs
@@ -56,7 +56,7 @@ pub fn json_chain_test(json_data: &[u8]) -> Vec<String> {
 					let post_root: H256 = state.hash.into();
 					let transaction = multitransaction.select(&state.indexes).into();
 
-					let mut state = get_temp_mem_state();
+					let mut state = get_temp_state();
 					state.populate_from(pre.clone());
 					state.commit().expect(&format!("State test {} failed due to internal error.", name));
 					let _res = state.apply(&env, &**engine, &transaction, false);
diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
index ac1695b52..0347e984f 100644
--- a/ethcore/src/miner/miner.rs
+++ b/ethcore/src/miner/miner.rs
@@ -1413,19 +1413,18 @@ mod tests {
 	fn internal_seals_without_work() {
 		let miner = Miner::with_spec(&Spec::new_instant());
 
-		let c = generate_dummy_client(2);
-		let client = c.reference().as_ref();
+		let client = generate_dummy_client(2);
 
-		assert_eq!(miner.import_external_transactions(client, vec![transaction().into()]).pop().unwrap().unwrap(), TransactionImportResult::Current);
+		assert_eq!(miner.import_external_transactions(&*client, vec![transaction().into()]).pop().unwrap().unwrap(), TransactionImportResult::Current);
 
-		miner.update_sealing(client);
+		miner.update_sealing(&*client);
 		client.flush_queue();
 		assert!(miner.pending_block().is_none());
 		assert_eq!(client.chain_info().best_block_number, 3 as BlockNumber);
 
-		assert_eq!(miner.import_own_transaction(client, PendingTransaction::new(transaction().into(), None)).unwrap(), TransactionImportResult::Current);
+		assert_eq!(miner.import_own_transaction(&*client, PendingTransaction::new(transaction().into(), None)).unwrap(), TransactionImportResult::Current);
 
-		miner.update_sealing(client);
+		miner.update_sealing(&*client);
 		client.flush_queue();
 		assert!(miner.pending_block().is_none());
 		assert_eq!(client.chain_info().best_block_number, 4 as BlockNumber);
diff --git a/ethcore/src/spec/spec.rs b/ethcore/src/spec/spec.rs
index 9051bcbcf..35f1ca983 100644
--- a/ethcore/src/spec/spec.rs
+++ b/ethcore/src/spec/spec.rs
@@ -392,8 +392,7 @@ mod tests {
 	#[test]
 	fn genesis_constructor() {
 		let spec = Spec::new_test_constructor();
-		let mut db_result = get_temp_state_db();
-		let db = spec.ensure_db_good(db_result.take(), &Default::default()).unwrap();
+		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let state = State::from_existing(db.boxed_clone(), spec.state_root(), spec.engine.account_start_nonce(), Default::default()).unwrap();
 		let expected = H256::from_str("0000000000000000000000000000000000000000000000000000000000000001").unwrap();
 		assert_eq!(state.storage_at(&Address::from_str("0000000000000000000000000000000000000005").unwrap(), &H256::zero()).unwrap(), expected);
diff --git a/ethcore/src/state/mod.rs b/ethcore/src/state/mod.rs
index b1594dd9b..12d7718cc 100644
--- a/ethcore/src/state/mod.rs
+++ b/ethcore/src/state/mod.rs
@@ -939,7 +939,6 @@ mod tests {
 	use ethkey::Secret;
 	use util::{U256, H256, Address, Hashable};
 	use tests::helpers::*;
-	use devtools::*;
 	use env_info::EnvInfo;
 	use spec::*;
 	use transaction::*;
@@ -955,8 +954,7 @@ mod tests {
 	fn should_apply_create_transaction() {
 		init_log();
 
-		let temp = RandomTempPath::new();
-		let mut state = get_temp_state_in(temp.as_path());
+		let mut state = get_temp_state();
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
@@ -998,9 +996,8 @@ mod tests {
 
 		let a = Address::zero();
 
-		let temp = RandomTempPath::new();
 		let mut state = {
-			let mut state = get_temp_state_in(temp.as_path());
+			let mut state = get_temp_state();
 			assert_eq!(state.exists(&a).unwrap(), false);
 			state.inc_nonce(&a).unwrap();
 			state.commit().unwrap();
@@ -1015,8 +1012,7 @@ mod tests {
 	fn should_trace_failed_create_transaction() {
 		init_log();
 
-		let temp = RandomTempPath::new();
-		let mut state = get_temp_state_in(temp.as_path());
+		let mut state = get_temp_state();
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
@@ -1052,8 +1048,7 @@ mod tests {
 	fn should_trace_call_transaction() {
 		init_log();
 
-		let temp = RandomTempPath::new();
-		let mut state = get_temp_state_in(temp.as_path());
+		let mut state = get_temp_state();
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
@@ -1095,8 +1090,7 @@ mod tests {
 	fn should_trace_basic_call_transaction() {
 		init_log();
 
-		let temp = RandomTempPath::new();
-		let mut state = get_temp_state_in(temp.as_path());
+		let mut state = get_temp_state();
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
@@ -1137,8 +1131,7 @@ mod tests {
 	fn should_trace_call_transaction_to_builtin() {
 		init_log();
 
-		let temp = RandomTempPath::new();
-		let mut state = get_temp_state_in(temp.as_path());
+		let mut state = get_temp_state();
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
@@ -1179,8 +1172,7 @@ mod tests {
 	fn should_not_trace_subcall_transaction_to_builtin() {
 		init_log();
 
-		let temp = RandomTempPath::new();
-		let mut state = get_temp_state_in(temp.as_path());
+		let mut state = get_temp_state();
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
@@ -1222,8 +1214,7 @@ mod tests {
 	fn should_not_trace_callcode() {
 		init_log();
 
-		let temp = RandomTempPath::new();
-		let mut state = get_temp_state_in(temp.as_path());
+		let mut state = get_temp_state();
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
@@ -1281,8 +1272,7 @@ mod tests {
 	fn should_not_trace_delegatecall() {
 		init_log();
 
-		let temp = RandomTempPath::new();
-		let mut state = get_temp_state_in(temp.as_path());
+		let mut state = get_temp_state();
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
@@ -1343,8 +1333,7 @@ mod tests {
 	fn should_trace_failed_call_transaction() {
 		init_log();
 
-		let temp = RandomTempPath::new();
-		let mut state = get_temp_state_in(temp.as_path());
+		let mut state = get_temp_state();
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
@@ -1383,8 +1372,7 @@ mod tests {
 	fn should_trace_call_with_subcall_transaction() {
 		init_log();
 
-		let temp = RandomTempPath::new();
-		let mut state = get_temp_state_in(temp.as_path());
+		let mut state = get_temp_state();
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
@@ -1443,8 +1431,7 @@ mod tests {
 	fn should_trace_call_with_basic_subcall_transaction() {
 		init_log();
 
-		let temp = RandomTempPath::new();
-		let mut state = get_temp_state_in(temp.as_path());
+		let mut state = get_temp_state();
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
@@ -1498,8 +1485,7 @@ mod tests {
 	fn should_not_trace_call_with_invalid_basic_subcall_transaction() {
 		init_log();
 
-		let temp = RandomTempPath::new();
-		let mut state = get_temp_state_in(temp.as_path());
+		let mut state = get_temp_state();
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
@@ -1541,8 +1527,7 @@ mod tests {
 	fn should_trace_failed_subcall_transaction() {
 		init_log();
 
-		let temp = RandomTempPath::new();
-		let mut state = get_temp_state_in(temp.as_path());
+		let mut state = get_temp_state();
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
@@ -1597,8 +1582,7 @@ mod tests {
 	fn should_trace_call_with_subcall_with_subcall_transaction() {
 		init_log();
 
-		let temp = RandomTempPath::new();
-		let mut state = get_temp_state_in(temp.as_path());
+		let mut state = get_temp_state();
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
@@ -1672,8 +1656,7 @@ mod tests {
 	fn should_trace_failed_subcall_with_subcall_transaction() {
 		init_log();
 
-		let temp = RandomTempPath::new();
-		let mut state = get_temp_state_in(temp.as_path());
+		let mut state = get_temp_state();
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
@@ -1745,8 +1728,7 @@ mod tests {
 	fn should_trace_suicide() {
 		init_log();
 
-		let temp = RandomTempPath::new();
-		let mut state = get_temp_state_in(temp.as_path());
+		let mut state = get_temp_state();
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
@@ -1797,9 +1779,8 @@ mod tests {
 	#[test]
 	fn code_from_database() {
 		let a = Address::zero();
-		let temp = RandomTempPath::new();
 		let (root, db) = {
-			let mut state = get_temp_state_in(temp.as_path());
+			let mut state = get_temp_state();
 			state.require_or_from(&a, false, ||Account::new_contract(42.into(), 0.into()), |_|{}).unwrap();
 			state.init_code(&a, vec![1, 2, 3]).unwrap();
 			assert_eq!(state.code(&a).unwrap(), Some(Arc::new([1u8, 2, 3].to_vec())));
@@ -1815,9 +1796,8 @@ mod tests {
 	#[test]
 	fn storage_at_from_database() {
 		let a = Address::zero();
-		let temp = RandomTempPath::new();
 		let (root, db) = {
-			let mut state = get_temp_state_in(temp.as_path());
+			let mut state = get_temp_state();
 			state.set_storage(&a, H256::from(&U256::from(1u64)), H256::from(&U256::from(69u64))).unwrap();
 			state.commit().unwrap();
 			state.drop()
@@ -1830,9 +1810,8 @@ mod tests {
 	#[test]
 	fn get_from_database() {
 		let a = Address::zero();
-		let temp = RandomTempPath::new();
 		let (root, db) = {
-			let mut state = get_temp_state_in(temp.as_path());
+			let mut state = get_temp_state();
 			state.inc_nonce(&a).unwrap();
 			state.add_balance(&a, &U256::from(69u64), CleanupMode::NoEmpty).unwrap();
 			state.commit().unwrap();
@@ -1848,8 +1827,7 @@ mod tests {
 	#[test]
 	fn remove() {
 		let a = Address::zero();
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		assert_eq!(state.exists(&a).unwrap(), false);
 		assert_eq!(state.exists_and_not_null(&a).unwrap(), false);
 		state.inc_nonce(&a).unwrap();
@@ -1865,8 +1843,7 @@ mod tests {
 	#[test]
 	fn empty_account_is_not_created() {
 		let a = Address::zero();
-		let path = RandomTempPath::new();
-		let db = get_temp_state_db_in(path.as_path());
+		let db = get_temp_state_db();
 		let (root, db) = {
 			let mut state = State::new(db, U256::from(0), Default::default());
 			state.add_balance(&a, &U256::default(), CleanupMode::NoEmpty).unwrap(); // create an empty account
@@ -1881,8 +1858,7 @@ mod tests {
 	#[test]
 	fn empty_account_exists_when_creation_forced() {
 		let a = Address::zero();
-		let path = RandomTempPath::new();
-		let db = get_temp_state_db_in(path.as_path());
+		let db = get_temp_state_db();
 		let (root, db) = {
 			let mut state = State::new(db, U256::from(0), Default::default());
 			state.add_balance(&a, &U256::default(), CleanupMode::ForceCreate).unwrap(); // create an empty account
@@ -1897,9 +1873,8 @@ mod tests {
 	#[test]
 	fn remove_from_database() {
 		let a = Address::zero();
-		let temp = RandomTempPath::new();
 		let (root, db) = {
-			let mut state = get_temp_state_in(temp.as_path());
+			let mut state = get_temp_state();
 			state.inc_nonce(&a).unwrap();
 			state.commit().unwrap();
 			assert_eq!(state.exists(&a).unwrap(), true);
@@ -1925,8 +1900,7 @@ mod tests {
 
 	#[test]
 	fn alter_balance() {
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		let a = Address::zero();
 		let b = 1u64.into();
 		state.add_balance(&a, &U256::from(69u64), CleanupMode::NoEmpty).unwrap();
@@ -1947,8 +1921,7 @@ mod tests {
 
 	#[test]
 	fn alter_nonce() {
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		let a = Address::zero();
 		state.inc_nonce(&a).unwrap();
 		assert_eq!(state.nonce(&a).unwrap(), U256::from(1u64));
@@ -1964,8 +1937,7 @@ mod tests {
 
 	#[test]
 	fn balance_nonce() {
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		let a = Address::zero();
 		assert_eq!(state.balance(&a).unwrap(), U256::from(0u64));
 		assert_eq!(state.nonce(&a).unwrap(), U256::from(0u64));
@@ -1976,8 +1948,7 @@ mod tests {
 
 	#[test]
 	fn ensure_cached() {
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		let a = Address::zero();
 		state.require(&a, false).unwrap();
 		state.commit().unwrap();
@@ -1986,8 +1957,7 @@ mod tests {
 
 	#[test]
 	fn checkpoint_basic() {
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		let a = Address::zero();
 		state.checkpoint();
 		state.add_balance(&a, &U256::from(69u64), CleanupMode::NoEmpty).unwrap();
@@ -2003,8 +1973,7 @@ mod tests {
 
 	#[test]
 	fn checkpoint_nested() {
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		let a = Address::zero();
 		state.checkpoint();
 		state.checkpoint();
@@ -2018,16 +1987,14 @@ mod tests {
 
 	#[test]
 	fn create_empty() {
-		let mut state_result = get_temp_state();
-		let mut state = state_result.reference_mut();
+		let mut state = get_temp_state();
 		state.commit().unwrap();
 		assert_eq!(state.root().hex(), "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421");
 	}
 
 	#[test]
 	fn should_not_panic_on_state_diff_with_storage() {
-		let state = get_temp_state();
-		let mut state = state.reference().clone();
+		let mut state = get_temp_state();
 
 		let a: Address = 0xa.into();
 		state.init_code(&a, b"abcdefg".to_vec()).unwrap();;
diff --git a/ethcore/src/state_db.rs b/ethcore/src/state_db.rs
index 2831d2f9b..6bf8bbd8e 100644
--- a/ethcore/src/state_db.rs
+++ b/ethcore/src/state_db.rs
@@ -463,8 +463,7 @@ mod tests {
 	fn state_db_smoke() {
 		init_log();
 
-		let mut state_db_result = get_temp_state_db();
-		let state_db = state_db_result.take();
+		let state_db = get_temp_state_db();
 		let root_parent = H256::random();
 		let address = Address::random();
 		let h0 = H256::random();
diff --git a/ethcore/src/tests/client.rs b/ethcore/src/tests/client.rs
index e61edd478..6f0d7bc26 100644
--- a/ethcore/src/tests/client.rs
+++ b/ethcore/src/tests/client.rs
@@ -72,8 +72,7 @@ fn should_return_registrar() {
 
 #[test]
 fn returns_state_root_basic() {
-	let client_result = generate_dummy_client(6);
-	let client = client_result.reference();
+	let client = generate_dummy_client(6);
 	let test_spec = get_test_spec();
 	let genesis_header = test_spec.genesis_header();
 
@@ -125,8 +124,7 @@ fn query_none_block() {
 
 #[test]
 fn query_bad_block() {
-	let client_result = get_test_client_with_blocks(vec![get_bad_state_dummy_block()]);
-	let client = client_result.reference();
+	let client = get_test_client_with_blocks(vec![get_bad_state_dummy_block()]);
 	let bad_block: Option<_> = client.block_header(BlockId::Number(1));
 
 	assert!(bad_block.is_none());
@@ -135,8 +133,7 @@ fn query_bad_block() {
 #[test]
 fn returns_chain_info() {
 	let dummy_block = get_good_dummy_block();
-	let client_result = get_test_client_with_blocks(vec![dummy_block.clone()]);
-	let client = client_result.reference();
+	let client = get_test_client_with_blocks(vec![dummy_block.clone()]);
 	let block = BlockView::new(&dummy_block);
 	let info = client.chain_info();
 	assert_eq!(info.best_block_hash, block.header().hash());
@@ -145,8 +142,7 @@ fn returns_chain_info() {
 #[test]
 fn returns_logs() {
 	let dummy_block = get_good_dummy_block();
-	let client_result = get_test_client_with_blocks(vec![dummy_block.clone()]);
-	let client = client_result.reference();
+	let client = get_test_client_with_blocks(vec![dummy_block.clone()]);
 	let logs = client.logs(Filter {
 		from_block: BlockId::Earliest,
 		to_block: BlockId::Latest,
@@ -160,8 +156,7 @@ fn returns_logs() {
 #[test]
 fn returns_logs_with_limit() {
 	let dummy_block = get_good_dummy_block();
-	let client_result = get_test_client_with_blocks(vec![dummy_block.clone()]);
-	let client = client_result.reference();
+	let client = get_test_client_with_blocks(vec![dummy_block.clone()]);
 	let logs = client.logs(Filter {
 		from_block: BlockId::Earliest,
 		to_block: BlockId::Latest,
@@ -175,8 +170,7 @@ fn returns_logs_with_limit() {
 #[test]
 fn returns_block_body() {
 	let dummy_block = get_good_dummy_block();
-	let client_result = get_test_client_with_blocks(vec![dummy_block.clone()]);
-	let client = client_result.reference();
+	let client = get_test_client_with_blocks(vec![dummy_block.clone()]);
 	let block = BlockView::new(&dummy_block);
 	let body = client.block_body(BlockId::Hash(block.header().hash())).unwrap();
 	let body = body.rlp();
@@ -187,8 +181,7 @@ fn returns_block_body() {
 
 #[test]
 fn imports_block_sequence() {
-	let client_result = generate_dummy_client(6);
-	let client = client_result.reference();
+	let client = generate_dummy_client(6);
 	let block = client.block_header(BlockId::Number(5)).unwrap();
 
 	assert!(!block.into_inner().is_empty());
@@ -196,8 +189,7 @@ fn imports_block_sequence() {
 
 #[test]
 fn can_collect_garbage() {
-	let client_result = generate_dummy_client(100);
-	let client = client_result.reference();
+	let client = generate_dummy_client(100);
 	client.tick();
 	assert!(client.blockchain_cache_info().blocks < 100 * 1024);
 }
@@ -205,19 +197,16 @@ fn can_collect_garbage() {
 
 #[test]
 fn can_generate_gas_price_median() {
-	let client_result = generate_dummy_client_with_data(3, 1, slice_into![1, 2, 3]);
-	let client = client_result.reference();
+	let client = generate_dummy_client_with_data(3, 1, slice_into![1, 2, 3]);
 	assert_eq!(Some(&U256::from(2)), client.gas_price_corpus(3).median());
 
-	let client_result = generate_dummy_client_with_data(4, 1, slice_into![1, 4, 3, 2]);
-	let client = client_result.reference();
+	let client = generate_dummy_client_with_data(4, 1, slice_into![1, 4, 3, 2]);
 	assert_eq!(Some(&U256::from(3)), client.gas_price_corpus(3).median());
 }
 
 #[test]
 fn can_generate_gas_price_histogram() {
-	let client_result = generate_dummy_client_with_data(20, 1, slice_into![6354,8593,6065,4842,7845,7002,689,4958,4250,6098,5804,4320,643,8895,2296,8589,7145,2000,2512,1408]);
-	let client = client_result.reference();
+	let client = generate_dummy_client_with_data(20, 1, slice_into![6354,8593,6065,4842,7845,7002,689,4958,4250,6098,5804,4320,643,8895,2296,8589,7145,2000,2512,1408]);
 
 	let hist = client.gas_price_corpus(20).histogram(5).unwrap();
 	let correct_hist = ::stats::Histogram { bucket_bounds: vec_into![643, 2294, 3945, 5596, 7247, 8898], counts: vec![4,2,4,6,4] };
@@ -226,32 +215,29 @@ fn can_generate_gas_price_histogram() {
 
 #[test]
 fn empty_gas_price_histogram() {
-	let client_result = generate_dummy_client_with_data(20, 0, slice_into![]);
-	let client = client_result.reference();
+	let client = generate_dummy_client_with_data(20, 0, slice_into![]);
 
 	assert!(client.gas_price_corpus(20).histogram(5).is_none());
 }
 
 #[test]
 fn corpus_is_sorted() {
-	let client_result = generate_dummy_client_with_data(2, 1, slice_into![U256::from_str("11426908979").unwrap(), U256::from_str("50426908979").unwrap()]);
-	let client = client_result.reference();
+	let client = generate_dummy_client_with_data(2, 1, slice_into![U256::from_str("11426908979").unwrap(), U256::from_str("50426908979").unwrap()]);
 	let corpus = client.gas_price_corpus(20);
 	assert!(corpus[0] < corpus[1]);
 }
 
 #[test]
 fn can_handle_long_fork() {
-	let client_result = generate_dummy_client(1200);
-	let client = client_result.reference();
+	let client = generate_dummy_client(1200);
 	for _ in 0..20 {
 		client.import_verified_blocks();
 	}
 	assert_eq!(1200, client.chain_info().best_block_number);
 
-	push_blocks_to_client(client, 45, 1201, 800);
-	push_blocks_to_client(client, 49, 1201, 800);
-	push_blocks_to_client(client, 53, 1201, 600);
+	push_blocks_to_client(&client, 45, 1201, 800);
+	push_blocks_to_client(&client, 49, 1201, 800);
+	push_blocks_to_client(&client, 53, 1201, 600);
 
 	for _ in 0..400 {
 		client.import_verified_blocks();
@@ -262,8 +248,7 @@ fn can_handle_long_fork() {
 #[test]
 fn can_mine() {
 	let dummy_blocks = get_good_dummy_block_seq(2);
-	let client_result = get_test_client_with_blocks(vec![dummy_blocks[0].clone()]);
-	let client = client_result.reference();
+	let client = get_test_client_with_blocks(vec![dummy_blocks[0].clone()]);
 
 	let b = client.prepare_open_block(Address::default(), (3141562.into(), 31415620.into()), vec![]).close();
 
@@ -329,14 +314,13 @@ fn does_not_propagate_delayed_transactions() {
 		value: 0.into(),
 		data: Vec::new(),
 	}.sign(secret, None), None);
-	let client_result = generate_dummy_client(1);
-	let client = client_result.reference();
+	let client = generate_dummy_client(1);
 
-	client.miner().import_own_transaction(&**client, tx0).unwrap();
-	client.miner().import_own_transaction(&**client, tx1).unwrap();
+	client.miner().import_own_transaction(&*client, tx0).unwrap();
+	client.miner().import_own_transaction(&*client, tx1).unwrap();
 	assert_eq!(0, client.ready_transactions().len());
 	assert_eq!(2, client.miner().pending_transactions().len());
-	push_blocks_to_client(client, 53, 2, 2);
+	push_blocks_to_client(&client, 53, 2, 2);
 	client.flush_queue();
 	assert_eq!(2, client.ready_transactions().len());
 	assert_eq!(2, client.miner().pending_transactions().len());
@@ -346,8 +330,7 @@ fn does_not_propagate_delayed_transactions() {
 fn transaction_proof() {
 	use ::client::ProvingBlockChainClient;
 
-	let client_result = generate_dummy_client(0);
-	let client = client_result.reference();
+	let client = generate_dummy_client(0);
 	let address = Address::random();
 	let test_spec = Spec::new_test();
 	for _ in 0..20 {
diff --git a/ethcore/src/tests/helpers.rs b/ethcore/src/tests/helpers.rs
index 70269b6e4..1391c37f4 100644
--- a/ethcore/src/tests/helpers.rs
+++ b/ethcore/src/tests/helpers.rs
@@ -30,7 +30,6 @@ use engines::Engine;
 use env_info::EnvInfo;
 use ethereum;
 use ethereum::ethash::EthashParams;
-use devtools::*;
 use miner::Miner;
 use header::Header;
 use transaction::{Action, Transaction, SignedTransaction};
@@ -133,28 +132,26 @@ pub fn create_test_block_with_data(header: &Header, transactions: &[SignedTransa
 	rlp.out()
 }
 
-pub fn generate_dummy_client(block_number: u32) -> GuardedTempResult<Arc<Client>> {
+pub fn generate_dummy_client(block_number: u32) -> Arc<Client> {
 	generate_dummy_client_with_spec_and_data(Spec::new_test, block_number, 0, &[])
 }
 
-pub fn generate_dummy_client_with_data(block_number: u32, txs_per_block: usize, tx_gas_prices: &[U256]) -> GuardedTempResult<Arc<Client>> {
+pub fn generate_dummy_client_with_data(block_number: u32, txs_per_block: usize, tx_gas_prices: &[U256]) -> Arc<Client> {
 	generate_dummy_client_with_spec_and_data(Spec::new_null, block_number, txs_per_block, tx_gas_prices)
 }
 
 
-pub fn generate_dummy_client_with_spec_and_data<F>(get_test_spec: F, block_number: u32, txs_per_block: usize, tx_gas_prices: &[U256]) -> GuardedTempResult<Arc<Client>> where F: Fn()->Spec {
+pub fn generate_dummy_client_with_spec_and_data<F>(get_test_spec: F, block_number: u32, txs_per_block: usize, tx_gas_prices: &[U256]) -> Arc<Client> where F: Fn()->Spec {
 	generate_dummy_client_with_spec_accounts_and_data(get_test_spec, None, block_number, txs_per_block, tx_gas_prices)
 }
 
-pub fn generate_dummy_client_with_spec_and_accounts<F>(get_test_spec: F, accounts: Option<Arc<AccountProvider>>) -> GuardedTempResult<Arc<Client>> where F: Fn()->Spec {
+pub fn generate_dummy_client_with_spec_and_accounts<F>(get_test_spec: F, accounts: Option<Arc<AccountProvider>>) -> Arc<Client> where F: Fn()->Spec {
 	generate_dummy_client_with_spec_accounts_and_data(get_test_spec, accounts, 0, 0, &[])
 }
 
-pub fn generate_dummy_client_with_spec_accounts_and_data<F>(get_test_spec: F, accounts: Option<Arc<AccountProvider>>, block_number: u32, txs_per_block: usize, tx_gas_prices: &[U256]) -> GuardedTempResult<Arc<Client>> where F: Fn()->Spec {
-	let dir = RandomTempPath::new();
+pub fn generate_dummy_client_with_spec_accounts_and_data<F>(get_test_spec: F, accounts: Option<Arc<AccountProvider>>, block_number: u32, txs_per_block: usize, tx_gas_prices: &[U256]) -> Arc<Client> where F: Fn()->Spec {
 	let test_spec = get_test_spec();
-	let db_config = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
-	let client_db = Arc::new(Database::open(&db_config, dir.as_path().to_str().unwrap()).unwrap());
+	let client_db = new_db();
 
 	let client = Client::new(
 		ClientConfig::default(),
@@ -165,8 +162,7 @@ pub fn generate_dummy_client_with_spec_accounts_and_data<F>(get_test_spec: F, ac
 	).unwrap();
 	let test_engine = &*test_spec.engine;
 
-	let mut db_result = get_temp_state_db();
-	let mut db = test_spec.ensure_db_good(db_result.take(), &Default::default()).unwrap();
+	let mut db = test_spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 	let genesis_header = test_spec.genesis_header();
 
 	let mut rolling_timestamp = 40;
@@ -220,11 +216,7 @@ pub fn generate_dummy_client_with_spec_accounts_and_data<F>(get_test_spec: F, ac
 	}
 	client.flush_queue();
 	client.import_verified_blocks();
-
-	GuardedTempResult::<Arc<Client>> {
-		_temp: dir,
-		result: Some(client)
-	}
+	client
 }
 
 pub fn push_blocks_to_client(client: &Arc<Client>, timestamp_salt: u64, starting_number: usize, block_number: usize) {
@@ -256,11 +248,9 @@ pub fn push_blocks_to_client(client: &Arc<Client>, timestamp_salt: u64, starting
 	}
 }
 
-pub fn get_test_client_with_blocks(blocks: Vec<Bytes>) -> GuardedTempResult<Arc<Client>> {
-	let dir = RandomTempPath::new();
+pub fn get_test_client_with_blocks(blocks: Vec<Bytes>) -> Arc<Client> {
 	let test_spec = get_test_spec();
-	let db_config = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
-	let client_db = Arc::new(Database::open(&db_config, dir.as_path().to_str().unwrap()).unwrap());
+	let client_db = new_db();
 
 	let client = Client::new(
 		ClientConfig::default(),
@@ -277,23 +267,15 @@ pub fn get_test_client_with_blocks(blocks: Vec<Bytes>) -> GuardedTempResult<Arc<
 	}
 	client.flush_queue();
 	client.import_verified_blocks();
-
-	GuardedTempResult::<Arc<Client>> {
-		_temp: dir,
-		result: Some(client)
-	}
+	client
 }
 
-fn new_db(path: &str) -> Arc<Database> {
-	Arc::new(
-		Database::open(&DatabaseConfig::with_columns(::db::NUM_COLUMNS), path)
-		.expect("Opening database for tests should always work.")
-	)
+fn new_db() -> Arc<KeyValueDB> {
+	Arc::new(::util::kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)))
 }
 
-pub fn generate_dummy_blockchain(block_number: u32) -> GuardedTempResult<BlockChain> {
-	let temp = RandomTempPath::new();
-	let db = new_db(temp.as_str());
+pub fn generate_dummy_blockchain(block_number: u32) -> BlockChain {
+	let db = new_db();
 	let bc = BlockChain::new(BlockChainConfig::default(), &create_unverifiable_block(0, H256::zero()), db.clone());
 
 	let mut batch = db.transaction();
@@ -302,16 +284,11 @@ pub fn generate_dummy_blockchain(block_number: u32) -> GuardedTempResult<BlockCh
 		bc.commit();
 	}
 	db.write(batch).unwrap();
-
-	GuardedTempResult::<BlockChain> {
-		_temp: temp,
-		result: Some(bc)
-	}
+	bc
 }
 
-pub fn generate_dummy_blockchain_with_extra(block_number: u32) -> GuardedTempResult<BlockChain> {
-	let temp = RandomTempPath::new();
-	let db = new_db(temp.as_str());
+pub fn generate_dummy_blockchain_with_extra(block_number: u32) -> BlockChain {
+	let db = new_db();
 	let bc = BlockChain::new(BlockChainConfig::default(), &create_unverifiable_block(0, H256::zero()), db.clone());
 
 
@@ -321,69 +298,29 @@ pub fn generate_dummy_blockchain_with_extra(block_number: u32) -> GuardedTempRes
 		bc.commit();
 	}
 	db.write(batch).unwrap();
-
-	GuardedTempResult::<BlockChain> {
-		_temp: temp,
-		result: Some(bc)
-	}
+	bc
 }
 
-pub fn generate_dummy_empty_blockchain() -> GuardedTempResult<BlockChain> {
-	let temp = RandomTempPath::new();
-	let db = new_db(temp.as_str());
+pub fn generate_dummy_empty_blockchain() -> BlockChain {
+	let db = new_db();
 	let bc = BlockChain::new(BlockChainConfig::default(), &create_unverifiable_block(0, H256::zero()), db.clone());
-
-	GuardedTempResult::<BlockChain> {
-		_temp: temp,
-		result: Some(bc)
-	}
+	bc
 }
 
-pub fn get_temp_state_db() -> GuardedTempResult<StateDB> {
-	let temp = RandomTempPath::new();
-	let journal_db = get_temp_state_db_in(temp.as_path());
-
-	GuardedTempResult {
-		_temp: temp,
-		result: Some(journal_db)
-	}
-}
-
-pub fn get_temp_state() -> GuardedTempResult<State<::state_db::StateDB>> {
-	let temp = RandomTempPath::new();
-	let journal_db = get_temp_state_db_in(temp.as_path());
-
-	GuardedTempResult {
-	    _temp: temp,
-		result: Some(State::new(journal_db, U256::from(0), Default::default())),
-	}
-}
-
-pub fn get_temp_mem_state() -> State<::state_db::StateDB> {
-	let journal_db = get_temp_mem_state_db();
+pub fn get_temp_state() -> State<::state_db::StateDB> {
+	let journal_db = get_temp_state_db();
 	State::new(journal_db, U256::from(0), Default::default())
 }
 
-pub fn get_temp_state_db_in(path: &Path) -> StateDB {
-	let db = new_db(path.to_str().expect("Only valid utf8 paths for tests."));
-	let journal_db = journaldb::new(db.clone(), journaldb::Algorithm::EarlyMerge, ::db::COL_STATE);
-	StateDB::new(journal_db, 5 * 1024 * 1024)
-}
-
-pub fn get_temp_mem_state_db() -> StateDB {
-	let db = Arc::new(::util::kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)));
+pub fn get_temp_state_db() -> StateDB {
+	let db = new_db();
 	let journal_db = journaldb::new(db, journaldb::Algorithm::EarlyMerge, ::db::COL_STATE);
 	StateDB::new(journal_db, 5 * 1024 * 1024)
 }
 
-pub fn get_temp_state_in(path: &Path) -> State<::state_db::StateDB> {
-	let journal_db = get_temp_state_db_in(path);
-	State::new(journal_db, U256::from(0), Default::default())
-}
-
 pub fn get_good_dummy_block_seq(count: usize) -> Vec<Bytes> {
 	let test_spec = get_test_spec();
-  	get_good_dummy_block_fork_seq(1, count, &test_spec.genesis_header().hash())
+	get_good_dummy_block_fork_seq(1, count, &test_spec.genesis_header().hash())
 }
 
 pub fn get_good_dummy_block_fork_seq(start_number: usize, count: usize, parent_hash: &H256) -> Vec<Bytes> {
@@ -405,7 +342,6 @@ pub fn get_good_dummy_block_fork_seq(start_number: usize, count: usize, parent_h
 		rolling_timestamp = rolling_timestamp + 10;
 
 		r.push(create_test_block(&block_header));
-
 	}
 	r
 }

From ea09aa584d0f2a47105cf15875e7ec72097ea557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Thu, 13 Apr 2017 16:32:07 +0200
Subject: [PATCH 019/117] WebSockets RPC server (#5425)

* Basic WS server.

* CLI for WS server.

* Bump jsonrpc

* Fixing test.
---
 .gitlab-ci.yml                 |   2 +-
 Cargo.lock                     | 139 ++++++++++++++++++++-------------
 Cargo.toml                     |  10 +--
 dapps/src/rpc.rs               |   2 +-
 parity/cli/config.full.toml    |   8 ++
 parity/cli/config.toml         |   3 +
 parity/cli/mod.rs              |  43 +++++++++-
 parity/cli/usage.txt           |  23 +++++-
 parity/configuration.rs        |  38 ++++++++-
 parity/dapps.rs                |   2 +-
 parity/informant.rs            |   4 +-
 parity/main.rs                 |   8 +-
 parity/rpc.rs                  | 123 +++++++++++++++++++++++------
 parity/rpc_apis.rs             |  12 +--
 parity/run.rs                  |   9 ++-
 parity/signer.rs               |  12 +--
 rpc/Cargo.toml                 |   5 +-
 rpc/rpctest/Cargo.toml         |   4 +-
 rpc/rpctest/src/main.rs        |  10 +--
 rpc/src/lib.rs                 |  29 ++++++-
 rpc/src/v1/types/provenance.rs |   7 ++
 rpc_cli/Cargo.toml             |   2 +-
 rpc_cli/src/lib.rs             |   8 +-
 rpc_client/Cargo.toml          |   2 +-
 rpc_client/src/lib.rs          |  12 +--
 scripts/targets.sh             |   2 +-
 signer/Cargo.toml              |   2 +-
 signer/src/lib.rs              |   8 +-
 28 files changed, 388 insertions(+), 141 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d90c5d4e..1c2ad13d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -541,7 +541,7 @@ test-windows:
     - git submodule update --init --recursive
   script:
     - set RUST_BACKTRACE=1
-    - echo cargo test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p ethcore-dapps -p ethcore-rpc -p ethcore-signer -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity %CARGOFLAGS% --verbose --release
+    - echo cargo test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p ethcore-dapps -p parity-rpc -p ethcore-signer -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity %CARGOFLAGS% --verbose --release
   tags:
     - rust-windows
   allow_failure: true
diff --git a/Cargo.lock b/Cargo.lock
index d8561cd11..8208f583e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -18,7 +18,6 @@ dependencies = [
  "ethcore-ipc-tests 0.1.0",
  "ethcore-light 1.7.0",
  "ethcore-logger 1.7.0",
- "ethcore-rpc 1.7.0",
  "ethcore-secretstore 1.0.0",
  "ethcore-signer 1.7.0",
  "ethcore-stratum 1.7.0",
@@ -38,6 +37,7 @@ dependencies = [
  "parity-ipfs-api 1.7.0",
  "parity-local-store 0.1.0",
  "parity-reactor 0.1.0",
+ "parity-rpc 1.7.0",
  "parity-rpc-client 1.4.0",
  "parity-updater 1.7.0",
  "path 0.1.0",
@@ -592,49 +592,6 @@ dependencies = [
  "tiny-keccak 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "ethcore-rpc"
-version = "1.7.0"
-dependencies = [
- "cid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethash 1.7.0",
- "ethcore 1.7.0",
- "ethcore-devtools 1.7.0",
- "ethcore-io 1.7.0",
- "ethcore-ipc 1.7.0",
- "ethcore-light 1.7.0",
- "ethcore-logger 1.7.0",
- "ethcore-util 1.7.0",
- "ethcrypto 0.1.0",
- "ethjson 0.1.0",
- "ethkey 0.2.0",
- "ethstore 0.1.0",
- "ethsync 1.7.0",
- "fetch 0.1.0",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-http-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-ipc-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-macros 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-minihttp-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "multihash 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-reactor 0.1.0",
- "parity-updater 1.7.0",
- "rlp 0.1.0",
- "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "stats 0.1.0",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "transient-hashmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "ethcore-secretstore"
 version = "1.0.0"
@@ -674,12 +631,12 @@ dependencies = [
  "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore-devtools 1.7.0",
  "ethcore-io 1.7.0",
- "ethcore-rpc 1.7.0",
  "ethcore-util 1.7.0",
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-rpc 1.7.0",
  "parity-ui 1.7.0",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1080,7 +1037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "jsonrpc-core"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#32c1c083139db50db6a5d532ccfc2004236dbfc3"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
 dependencies = [
  "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1092,7 +1049,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-http-server"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#32c1c083139db50db6a5d532ccfc2004236dbfc3"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
 dependencies = [
  "hyper 0.10.0-a.0 (git+https://github.com/paritytech/hyper)",
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@@ -1105,7 +1062,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-ipc-server"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#32c1c083139db50db6a5d532ccfc2004236dbfc3"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
 dependencies = [
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@@ -1117,7 +1074,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-macros"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#32c1c083139db50db6a5d532ccfc2004236dbfc3"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
 dependencies = [
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-pubsub 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@@ -1127,7 +1084,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-minihttp-server"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#32c1c083139db50db6a5d532ccfc2004236dbfc3"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
 dependencies = [
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@@ -1141,7 +1098,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-pubsub"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#32c1c083139db50db6a5d532ccfc2004236dbfc3"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
 dependencies = [
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1151,7 +1108,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-server-utils"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#32c1c083139db50db6a5d532ccfc2004236dbfc3"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
 dependencies = [
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1162,7 +1119,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-tcp-server"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#32c1c083139db50db6a5d532ccfc2004236dbfc3"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
 dependencies = [
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@@ -1172,6 +1129,17 @@ dependencies = [
  "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "jsonrpc-ws-server"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
+dependencies = [
+ "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
+ "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
+ "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ws 0.6.0 (git+https://github.com/tomusdrw/ws-rs)",
+]
+
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
@@ -1708,16 +1676,60 @@ dependencies = [
  "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "parity-rpc"
+version = "1.7.0"
+dependencies = [
+ "cid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethash 1.7.0",
+ "ethcore 1.7.0",
+ "ethcore-devtools 1.7.0",
+ "ethcore-io 1.7.0",
+ "ethcore-ipc 1.7.0",
+ "ethcore-light 1.7.0",
+ "ethcore-logger 1.7.0",
+ "ethcore-util 1.7.0",
+ "ethcrypto 0.1.0",
+ "ethjson 0.1.0",
+ "ethkey 0.2.0",
+ "ethstore 0.1.0",
+ "ethsync 1.7.0",
+ "fetch 0.1.0",
+ "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
+ "jsonrpc-http-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
+ "jsonrpc-ipc-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
+ "jsonrpc-macros 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
+ "jsonrpc-minihttp-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
+ "jsonrpc-ws-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
+ "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "multihash 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-reactor 0.1.0",
+ "parity-updater 1.7.0",
+ "rlp 0.1.0",
+ "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stats 0.1.0",
+ "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "transient-hashmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "parity-rpc-client"
 version = "1.4.0"
 dependencies = [
- "ethcore-rpc 1.7.0",
  "ethcore-signer 1.7.0",
  "ethcore-util 1.7.0",
  "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-rpc 1.7.0",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2081,9 +2093,9 @@ name = "rpc-cli"
 version = "1.4.0"
 dependencies = [
  "ethcore-bigint 0.1.2",
- "ethcore-rpc 1.7.0",
  "ethcore-util 1.7.0",
  "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-rpc 1.7.0",
  "parity-rpc-client 1.4.0",
  "rpassword 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2710,6 +2722,21 @@ dependencies = [
  "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "ws"
+version = "0.6.0"
+source = "git+https://github.com/tomusdrw/ws-rs#3259e7ca906c848beae109eb32e492871f8f397d"
+dependencies = [
+ "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha1 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "ws2_32-sys"
 version = "0.2.1"
@@ -2824,6 +2851,7 @@ dependencies = [
 "checksum jsonrpc-pubsub 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)" = "<none>"
 "checksum jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)" = "<none>"
 "checksum jsonrpc-tcp-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)" = "<none>"
+"checksum jsonrpc-ws-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)" = "<none>"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 "checksum lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "49247ec2a285bb3dcb23cbd9c35193c025e7251bfce77c1d5da97e6362dffe7f"
@@ -2981,6 +3009,7 @@ dependencies = [
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum ws 0.5.3 (git+https://github.com/paritytech/ws-rs.git?branch=parity-1.7)" = "<none>"
+"checksum ws 0.6.0 (git+https://github.com/tomusdrw/ws-rs)" = "<none>"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
 "checksum xdg 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "77b831a5ba77110f438f0ac5583aafeb087f70432998ba6b7dcb1d32185db453"
 "checksum xml-rs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "65e74b96bd3179209dc70a980da6df843dff09e46eee103a0376c0949257e3ef"
diff --git a/Cargo.toml b/Cargo.toml
index 09af66e09..37effabb5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,6 @@ ethcore = { path = "ethcore" }
 ethcore-util = { path = "util" }
 ethcore-io = { path = "util/io" }
 ethcore-devtools = { path = "devtools" }
-ethcore-rpc = { path = "rpc" }
 ethcore-signer = { path = "signer" }
 ethcore-ipc = { path = "ipc/rpc" }
 ethcore-ipc-nano = { path = "ipc/nano" }
@@ -45,12 +44,13 @@ ethkey = { path = "ethkey" }
 evmbin = { path = "evmbin" }
 rlp = { path = "util/rlp" }
 rpc-cli = { path = "rpc_cli" }
-parity-rpc-client = { path = "rpc_client" }
 parity-hash-fetch = { path = "hash-fetch" }
 parity-ipfs-api = { path = "ipfs" }
-parity-updater = { path = "updater" }
-parity-reactor = { path = "util/reactor" }
 parity-local-store = { path = "local-store" }
+parity-reactor = { path = "util/reactor" }
+parity-rpc = { path = "rpc" }
+parity-rpc-client = { path = "rpc_client" }
+parity-updater = { path = "updater" }
 path = { path = "util/path" }
 
 parity-dapps = { path = "dapps", optional = true }
@@ -85,7 +85,7 @@ ui-precompiled = [
 dapps = ["parity-dapps"]
 ipc = ["ethcore/ipc", "ethsync/ipc"]
 jit = ["ethcore/jit"]
-dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "ethcore-rpc/dev", "parity-dapps/dev", "ethcore-signer/dev"]
+dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "parity-rpc/dev", "parity-dapps/dev", "ethcore-signer/dev"]
 json-tests = ["ethcore/json-tests"]
 test-heavy = ["ethcore/test-heavy"]
 ethkey-cli = ["ethcore/ethkey-cli"]
diff --git a/dapps/src/rpc.rs b/dapps/src/rpc.rs
index b743408dc..74c6d8d89 100644
--- a/dapps/src/rpc.rs
+++ b/dapps/src/rpc.rs
@@ -17,7 +17,7 @@
 use std::sync::Arc;
 use hyper;
 
-use ethcore_rpc::{Metadata, Origin};
+use parity_rpc::{Metadata, Origin};
 use jsonrpc_core::{Middleware, MetaIoHandler};
 use jsonrpc_http_server::{self as http, AccessControlAllowOrigin, HttpMetaExtractor};
 use jsonrpc_http_server::tokio_core::reactor::Remote;
diff --git a/parity/cli/config.full.toml b/parity/cli/config.full.toml
index 7301afa50..64ddd20e9 100644
--- a/parity/cli/config.full.toml
+++ b/parity/cli/config.full.toml
@@ -52,6 +52,14 @@ cors = "null"
 apis = ["web3", "eth", "net", "parity", "traces", "rpc"]
 hosts = ["none"]
 
+[websockets]
+disable = false
+port = 8546
+interface = "local"
+origins = ["none"]
+apis = ["web3", "eth", "net", "parity", "traces", "rpc"]
+hosts = ["none"]
+
 [ipc]
 disable = false
 path = "$HOME/.parity/jsonrpc.ipc"
diff --git a/parity/cli/config.toml b/parity/cli/config.toml
index b7f2936a1..b6695f3f5 100644
--- a/parity/cli/config.toml
+++ b/parity/cli/config.toml
@@ -24,6 +24,9 @@ allow_ips = "public"
 reserved_only = true
 reserved_peers = "./path/to/reserved_peers"
 
+[websockets]
+disable = true
+origins = ["none"]
 
 [rpc]
 disable = true
diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs
index 002ce6efb..ed1b6526f 100644
--- a/parity/cli/mod.rs
+++ b/parity/cli/mod.rs
@@ -170,6 +170,20 @@ usage! {
 		flag_jsonrpc_threads: Option<usize> = None,
 			or |c: &Config| otry!(c.rpc).threads.map(Some),
 
+		// WS
+		flag_no_ws: bool = false,
+			or |c: &Config| otry!(c.websockets).disable.clone(),
+		flag_ws_port: u16 = 8546u16,
+			or |c: &Config| otry!(c.websockets).port.clone(),
+		flag_ws_interface: String  = "local",
+			or |c: &Config| otry!(c.websockets).interface.clone(),
+		flag_ws_apis: String = "web3,eth,net,parity,traces,rpc",
+			or |c: &Config| otry!(c.websockets).apis.as_ref().map(|vec| vec.join(",")),
+		flag_ws_origins: String = "none",
+			or |c: &Config| otry!(c.websockets).origins.as_ref().map(|vec| vec.join(",")),
+		flag_ws_hosts: String = "none",
+			or |c: &Config| otry!(c.websockets).hosts.as_ref().map(|vec| vec.join(",")),
+
 		// IPC
 		flag_no_ipc: bool = false,
 			or |c: &Config| otry!(c.ipc).disable.clone(),
@@ -363,6 +377,7 @@ struct Config {
 	ui: Option<Ui>,
 	network: Option<Network>,
 	rpc: Option<Rpc>,
+	websockets: Option<Ws>,
 	ipc: Option<Ipc>,
 	dapps: Option<Dapps>,
 	secretstore: Option<SecretStore>,
@@ -440,6 +455,16 @@ struct Rpc {
 	threads: Option<usize>,
 }
 
+#[derive(Default, Debug, PartialEq, RustcDecodable)]
+struct Ws {
+	disable: Option<bool>,
+	port: Option<u16>,
+	interface: Option<String>,
+	apis: Option<Vec<String>>,
+	origins: Option<Vec<String>>,
+	hosts: Option<Vec<String>>,
+}
+
 #[derive(Default, Debug, PartialEq, RustcDecodable)]
 struct Ipc {
 	disable: Option<bool>,
@@ -554,7 +579,7 @@ struct Misc {
 mod tests {
 	use super::{
 		Args, ArgsError,
-		Config, Operating, Account, Ui, Network, Rpc, Ipc, Dapps, Ipfs, Mining, Footprint,
+		Config, Operating, Account, Ui, Network, Ws, Rpc, Ipc, Dapps, Ipfs, Mining, Footprint,
 		Snapshots, VM, Misc, SecretStore,
 	};
 	use toml;
@@ -699,6 +724,14 @@ mod tests {
 			flag_jsonrpc_hosts: "none".into(),
 			flag_jsonrpc_threads: None,
 
+			// WS
+			flag_no_ws: false,
+			flag_ws_port: 8546u16,
+			flag_ws_interface: "local".into(),
+			flag_ws_apis: "web3,eth,net,parity,traces,rpc".into(),
+			flag_ws_origins: "none".into(),
+			flag_ws_hosts: "none".into(),
+
 			// IPC
 			flag_no_ipc: false,
 			flag_ipc_path: "$HOME/.parity/jsonrpc.ipc".into(),
@@ -899,6 +932,14 @@ mod tests {
 				reserved_only: Some(true),
 				no_serve_light: None,
 			}),
+			websockets: Some(Ws {
+				disable: Some(true),
+				port: None,
+				interface: None,
+				apis: None,
+				origins: Some(vec!["none".into()]),
+				hosts: None,
+			}),
 			rpc: Some(Rpc {
 				disable: Some(true),
 				port: Some(8180),
diff --git a/parity/cli/usage.txt b/parity/cli/usage.txt
index 16f04e55e..17b6ce2b8 100644
--- a/parity/cli/usage.txt
+++ b/parity/cli/usage.txt
@@ -157,7 +157,28 @@ API and Console Options:
                                    vectors. Special options: "all", "none",
                                    (default: {flag_jsonrpc_hosts}).
   --jsonrpc-threads THREADS        Enables experimental faster implementation of JSON-RPC server.
-                                   Requires Dapps server to be disabled using --no-dapps. (default: {flag_jsonrpc_threads:?})
+                                   Requires Dapps server to be disabled
+                                   using --no-dapps. (default: {flag_jsonrpc_threads:?})
+
+  --no-ws                          Disable the WebSockets server. (default: {flag_no_ws})
+  --ws-port PORT                   Specify the port portion of the WebSockets server
+                                   (default: {flag_ws_port}).
+  --ws-interface IP                Specify the hostname portion of the WebSockets
+                                   server, IP should be an interface's IP address, or
+                                   all (all interfaces) or local (default: {flag_ws_interface}).
+  --ws-apis APIS                   Specify the APIs available through the WebSockets
+                                   interface. APIS is a comma-delimited list of API
+                                   name. Possible name are web3, eth, net, personal,
+                                   parity, parity_set, traces, rpc, parity_accounts.
+                                   (default: {flag_ws_apis}).
+  --ws-origins URL                 Specify Origin header values allowed to connect.
+                                   Special options: "all", "none".
+                                   (default: {flag_ws_origins})
+  --ws-hosts HOSTS                 List of allowed Host header values. This option will
+                                   validate the Host header sent by the browser, it
+                                   is additional security against some attack
+                                   vectors. Special options: "all", "none",
+                                   (default: {flag_ws_hosts}).
 
   --no-ipc                         Disable JSON-RPC over IPC service. (default: {flag_no_ipc})
   --ipc-path PATH                  Specify custom path for JSON-RPC over IPC service
diff --git a/parity/configuration.rs b/parity/configuration.rs
index fe26613d3..724633c28 100644
--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@@ -30,9 +30,9 @@ use ethcore::client::{VMType};
 use ethcore::miner::{MinerOptions, Banning, StratumOptions};
 use ethcore::verification::queue::VerifierSettings;
 
-use rpc::{IpcConfiguration, HttpConfiguration};
+use rpc::{IpcConfiguration, HttpConfiguration, WsConfiguration};
 use rpc_apis::ApiSet;
-use ethcore_rpc::NetworkSettings;
+use parity_rpc::NetworkSettings;
 use cache::CacheConfig;
 use helpers::{to_duration, to_mode, to_block_id, to_u256, to_pending_set, to_price, replace_home, replace_home_for_db,
 geth_ipc_path, parity_ipc_path, to_bootnodes, to_addresses, to_address, to_gas_limit, to_queue_strategy};
@@ -114,6 +114,7 @@ impl Configuration {
 		};
 		let update_policy = self.update_policy()?;
 		let logger_config = self.logger_config();
+		let ws_conf = self.ws_config()?;
 		let http_conf = self.http_config()?;
 		let ipc_conf = self.ipc_config()?;
 		let net_conf = self.net_config()?;
@@ -352,6 +353,7 @@ impl Configuration {
 				daemon: daemon,
 				logger_config: logger_config.clone(),
 				miner_options: miner_options,
+				ws_conf: ws_conf,
 				http_conf: http_conf,
 				ipc_conf: ipc_conf,
 				net_conf: net_conf,
@@ -757,6 +759,14 @@ impl Configuration {
 		Self::hosts(&self.args.flag_jsonrpc_hosts)
 	}
 
+	fn ws_hosts(&self) -> Option<Vec<String>> {
+		Self::hosts(&self.args.flag_ws_hosts)
+	}
+
+	fn ws_origins(&self) -> Option<Vec<String>> {
+		Self::hosts(&self.args.flag_ws_origins)
+	}
+
 	fn ipfs_hosts(&self) -> Option<Vec<String>> {
 		Self::hosts(&self.args.flag_ipfs_api_hosts)
 	}
@@ -801,6 +811,19 @@ impl Configuration {
 		Ok(conf)
 	}
 
+	fn ws_config(&self) -> Result<WsConfiguration, String> {
+		let conf = WsConfiguration {
+			enabled: self.ws_enabled(),
+			interface: self.ws_interface(),
+			port: self.args.flag_ws_port,
+			apis: self.args.flag_ws_apis.parse()?,
+			hosts: self.ws_hosts(),
+			origins: self.ws_origins()
+		};
+
+		Ok(conf)
+	}
+
 	fn network_settings(&self) -> NetworkSettings {
 		NetworkSettings {
 			name: self.args.flag_identity.clone(),
@@ -913,6 +936,10 @@ impl Configuration {
 		Self::interface(&self.network_settings().rpc_interface)
 	}
 
+	fn ws_interface(&self) -> String {
+		Self::interface(&self.args.flag_ws_interface)
+	}
+
 	fn ipfs_interface(&self) -> String {
 		Self::interface(&self.args.flag_ipfs_api_interface)
 	}
@@ -965,6 +992,10 @@ impl Configuration {
 		!self.args.flag_jsonrpc_off && !self.args.flag_no_jsonrpc
 	}
 
+	fn ws_enabled(&self) -> bool {
+		!self.args.flag_no_ws
+	}
+
 	fn dapps_enabled(&self) -> bool {
 		!self.args.flag_dapps_off && !self.args.flag_no_dapps && self.rpc_enabled() && cfg!(feature = "dapps")
 	}
@@ -1000,7 +1031,7 @@ impl Configuration {
 mod tests {
 	use super::*;
 	use cli::Args;
-	use ethcore_rpc::NetworkSettings;
+	use parity_rpc::NetworkSettings;
 	use ethcore::client::{VMType, BlockId};
 	use ethcore::miner::{MinerOptions, PrioritizationStrategy};
 	use helpers::{default_network_config};
@@ -1204,6 +1235,7 @@ mod tests {
 			daemon: None,
 			logger_config: Default::default(),
 			miner_options: Default::default(),
+			ws_conf: Default::default(),
 			http_conf: Default::default(),
 			ipc_conf: Default::default(),
 			net_conf: default_network_config(),
diff --git a/parity/dapps.rs b/parity/dapps.rs
index 28264e270..b2dfe16d4 100644
--- a/parity/dapps.rs
+++ b/parity/dapps.rs
@@ -109,7 +109,7 @@ pub use self::server::{SyncStatus, Middleware, dapps_middleware};
 mod server {
 	use super::Dependencies;
 	use std::path::PathBuf;
-	use ethcore_rpc::{hyper, RequestMiddleware, RequestMiddlewareAction};
+	use parity_rpc::{hyper, RequestMiddleware, RequestMiddlewareAction};
 
 	pub type SyncStatus = Fn() -> bool;
 
diff --git a/parity/informant.rs b/parity/informant.rs
index 4145b0282..6b21eefc0 100644
--- a/parity/informant.rs
+++ b/parity/informant.rs
@@ -30,8 +30,8 @@ use ethcore::service::ClientIoMessage;
 use ethcore::snapshot::service::Service as SnapshotService;
 use ethcore::snapshot::{RestorationStatus, SnapshotService as SS};
 use number_prefix::{binary_prefix, Standalone, Prefixed};
-use ethcore_rpc::{is_major_importing};
-use ethcore_rpc::informant::RpcStats;
+use parity_rpc::{is_major_importing};
+use parity_rpc::informant::RpcStats;
 
 pub struct Informant {
 	report: RwLock<Option<ClientReport>>,
diff --git a/parity/main.rs b/parity/main.rs
index 0d55055da..c61d414be 100644
--- a/parity/main.rs
+++ b/parity/main.rs
@@ -51,18 +51,18 @@ extern crate ethcore_ipc_hypervisor as hypervisor;
 extern crate ethcore_ipc_nano as nanoipc;
 extern crate ethcore_light as light;
 extern crate ethcore_logger;
-extern crate ethcore_rpc;
 extern crate ethcore_signer;
 extern crate ethcore_util as util;
 extern crate ethkey;
 extern crate ethsync;
 extern crate parity_hash_fetch as hash_fetch;
 extern crate parity_ipfs_api;
-extern crate parity_reactor;
-extern crate parity_updater as updater;
 extern crate parity_local_store as local_store;
-extern crate rpc_cli;
+extern crate parity_reactor;
+extern crate parity_rpc;
+extern crate parity_updater as updater;
 extern crate path;
+extern crate rpc_cli;
 
 #[macro_use]
 extern crate log as rlog;
diff --git a/parity/rpc.rs b/parity/rpc.rs
index 70a91c851..1fc503767 100644
--- a/parity/rpc.rs
+++ b/parity/rpc.rs
@@ -14,19 +14,20 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::{io, fmt};
+use std::io;
 use std::sync::Arc;
 
 use dapps;
 use dir::default_data_path;
-use ethcore_rpc::informant::{RpcStats, Middleware};
-use ethcore_rpc::{self as rpc, HttpServerError, Metadata, Origin, AccessControlAllowOrigin, Host};
+use parity_rpc::informant::{RpcStats, Middleware};
+use parity_rpc::{self as rpc, HttpServerError, Metadata, Origin, DomainsValidation};
 use helpers::parity_ipc_path;
 use jsonrpc_core::MetaIoHandler;
 use parity_reactor::TokioRemote;
 use rpc_apis::{self, ApiSet};
 
-pub use ethcore_rpc::{IpcServer, HttpServer, RequestMiddleware};
+pub use parity_rpc::{IpcServer, HttpServer, RequestMiddleware};
+pub use parity_rpc::ws::Server as WsServer;
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct HttpConfiguration {
@@ -71,12 +72,25 @@ impl Default for IpcConfiguration {
 	}
 }
 
-impl fmt::Display for IpcConfiguration {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		if self.enabled {
-			write!(f, "endpoint address [{}], api list [{:?}]", self.socket_addr, self.apis)
-		} else {
-			write!(f, "disabled")
+#[derive(Debug, PartialEq)]
+pub struct WsConfiguration {
+	pub enabled: bool,
+	pub interface: String,
+	pub port: u16,
+	pub apis: ApiSet,
+	pub origins: Option<Vec<String>>,
+	pub hosts: Option<Vec<String>>,
+}
+
+impl Default for WsConfiguration {
+	fn default() -> Self {
+		WsConfiguration {
+			enabled: true,
+			interface: "127.0.0.1".into(),
+			port: 8546,
+			apis: ApiSet::UnsafeContext,
+			origins: Some(Vec::new()),
+			hosts: Some(Vec::new()),
 		}
 	}
 }
@@ -112,12 +126,71 @@ impl rpc::IpcMetaExtractor<Metadata> for RpcExtractor {
 	}
 }
 
+impl rpc::ws::MetaExtractor<Metadata> for RpcExtractor {
+	fn extract(&self, req: &rpc::ws::RequestContext) -> Metadata {
+		let mut metadata = Metadata::default();
+		let id = req.session_id as u64;
+		metadata.origin = Origin::Ws(id.into());
+		metadata
+	}
+}
+
+struct WsStats {
+	stats: Arc<RpcStats>,
+}
+
+impl rpc::ws::SessionStats for WsStats {
+	fn open_session(&self, _id: rpc::ws::SessionId) {
+		self.stats.open_session()
+	}
+
+	fn close_session(&self, _id: rpc::ws::SessionId) {
+		self.stats.close_session()
+	}
+}
+
 fn setup_apis<D>(apis: ApiSet, deps: &Dependencies<D>) -> MetaIoHandler<Metadata, Middleware<D::Notifier>>
 	where D: rpc_apis::Dependencies
 {
 	rpc_apis::setup_rpc(deps.stats.clone(), &*deps.apis, apis)
 }
 
+pub fn new_ws<D: rpc_apis::Dependencies>(
+	conf: WsConfiguration,
+	deps: &Dependencies<D>,
+) -> Result<Option<WsServer>, String> {
+	if !conf.enabled {
+		return Ok(None);
+	}
+
+	let url = format!("{}:{}", conf.interface, conf.port);
+	let addr = url.parse().map_err(|_| format!("Invalid WebSockets listen host/port given: {}", url))?;
+	let handler = setup_apis(conf.apis, deps);
+	let remote = deps.remote.clone();
+	let allowed_origins = into_domains(conf.origins);
+	let allowed_hosts = into_domains(conf.hosts);
+
+	let start_result = rpc::start_ws(
+		&addr,
+		handler,
+		remote,
+		allowed_origins,
+		allowed_hosts,
+		RpcExtractor,
+		WsStats {
+			stats: deps.stats.clone(),
+		},
+	);
+
+	match start_result {
+		Ok(server) => Ok(Some(server)),
+		Err(rpc::ws::Error::Io(ref err)) if err.kind() == io::ErrorKind::AddrInUse => Err(
+			format!("WebSockets address {} is already in use, make sure that another instance of an Ethereum client is not running or change the address using the --ws-port and --ws-interface options.", url)
+		),
+		Err(e) => Err(format!("WebSockets error: {:?}", e)),
+	}
+}
+
 pub fn new_http<D: rpc_apis::Dependencies>(
 	conf: HttpConfiguration,
 	deps: &Dependencies<D>,
@@ -128,17 +201,17 @@ pub fn new_http<D: rpc_apis::Dependencies>(
 	}
 
 	let url = format!("{}:{}", conf.interface, conf.port);
-	let addr = url.parse().map_err(|_| format!("Invalid JSONRPC listen host/port given: {}", url))?;
+	let addr = url.parse().map_err(|_| format!("Invalid HTTP JSON-RPC listen host/port given: {}", url))?;
 	let handler = setup_apis(conf.apis, deps);
 	let remote = deps.remote.clone();
 
-	let cors_domains: Option<Vec<_>> = conf.cors.map(|domains| domains.into_iter().map(AccessControlAllowOrigin::from).collect());
-	let allowed_hosts: Option<Vec<_>> = conf.hosts.map(|hosts| hosts.into_iter().map(Host::from).collect());
+	let cors_domains = into_domains(conf.cors);
+	let allowed_hosts = into_domains(conf.hosts);
 
 	let start_result = rpc::start_http(
 		&addr,
-		cors_domains.into(),
-		allowed_hosts.into(),
+		cors_domains,
+		allowed_hosts,
 		handler,
 		remote,
 		RpcExtractor,
@@ -153,16 +226,17 @@ pub fn new_http<D: rpc_apis::Dependencies>(
 
 	match start_result {
 		Ok(server) => Ok(Some(server)),
-		Err(HttpServerError::Io(err)) => match err.kind() {
-			io::ErrorKind::AddrInUse => Err(
-				format!("RPC address {} is already in use, make sure that another instance of an Ethereum client is not running or change the address using the --jsonrpc-port and --jsonrpc-interface options.", url)
-			),
-			_ => Err(format!("RPC io error: {}", err)),
-		},
-		Err(e) => Err(format!("RPC error: {:?}", e)),
+		Err(HttpServerError::Io(ref err)) if err.kind() == io::ErrorKind::AddrInUse => Err(
+			format!("HTTP address {} is already in use, make sure that another instance of an Ethereum client is not running or change the address using the --jsonrpc-port and --jsonrpc-interface options.", url)
+		),
+		Err(e) => Err(format!("HTTP error: {:?}", e)),
 	}
 }
 
+fn into_domains<T: From<String>>(items: Option<Vec<String>>) -> DomainsValidation<T> {
+	items.map(|vals| vals.into_iter().map(T::from).collect()).into()
+}
+
 pub fn new_ipc<D: rpc_apis::Dependencies>(
 	conf: IpcConfiguration,
 	dependencies: &Dependencies<D>
@@ -170,18 +244,19 @@ pub fn new_ipc<D: rpc_apis::Dependencies>(
 	if !conf.enabled {
 		return Ok(None);
 	}
+
 	let handler = setup_apis(conf.apis, dependencies);
 	let remote = dependencies.remote.clone();
 	match rpc::start_ipc(&conf.socket_addr, handler, remote, RpcExtractor) {
 		Ok(server) => Ok(Some(server)),
-		Err(io_error) => Err(format!("RPC io error: {}", io_error)),
+		Err(io_error) => Err(format!("IPC error: {}", io_error)),
 	}
 }
 
 #[cfg(test)]
 mod tests {
 	use super::RpcExtractor;
-	use ethcore_rpc::{HttpMetaExtractor, Origin};
+	use parity_rpc::{HttpMetaExtractor, Origin};
 
 	#[test]
 	fn should_extract_rpc_origin() {
diff --git a/parity/rpc_apis.rs b/parity/rpc_apis.rs
index 538808909..15fe660b2 100644
--- a/parity/rpc_apis.rs
+++ b/parity/rpc_apis.rs
@@ -20,15 +20,15 @@ use std::collections::HashSet;
 use std::str::FromStr;
 use std::sync::Arc;
 
-pub use ethcore_rpc::SignerService;
+pub use parity_rpc::SignerService;
 
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::Client;
 use ethcore::miner::{Miner, ExternalMiner};
 use ethcore::snapshot::SnapshotService;
-use ethcore_rpc::{Metadata, NetworkSettings};
-use ethcore_rpc::informant::{ActivityNotifier, Middleware, RpcStats, ClientNotifier};
-use ethcore_rpc::dispatch::{FullDispatcher, LightDispatcher};
+use parity_rpc::{Metadata, NetworkSettings};
+use parity_rpc::informant::{ActivityNotifier, Middleware, RpcStats, ClientNotifier};
+use parity_rpc::dispatch::{FullDispatcher, LightDispatcher};
 use ethsync::{ManageNetwork, SyncProvider, LightSync};
 use hash_fetch::fetch::Client as FetchClient;
 use jsonrpc_core::{MetaIoHandler};
@@ -203,7 +203,7 @@ impl Dependencies for FullDependencies {
 	}
 
 	fn extend_with_set(&self, handler: &mut MetaIoHandler<Metadata, Middleware>, apis: &[Api]) {
-		use ethcore_rpc::v1::*;
+		use parity_rpc::v1::*;
 
 		macro_rules! add_signing_methods {
 			($namespace:ident, $handler:expr, $deps:expr) => {
@@ -331,7 +331,7 @@ impl Dependencies for LightDependencies {
 
 	fn activity_notifier(&self) -> Self::Notifier { LightClientNotifier }
 	fn extend_with_set(&self, handler: &mut MetaIoHandler<Metadata, Middleware<Self::Notifier>>, apis: &[Api]) {
-		use ethcore_rpc::v1::*;
+		use parity_rpc::v1::*;
 
 		let dispatcher = LightDispatcher::new(
 			self.sync.clone(),
diff --git a/parity/run.rs b/parity/run.rs
index 70a23f934..a76c6a4ca 100644
--- a/parity/run.rs
+++ b/parity/run.rs
@@ -18,7 +18,7 @@ use std::sync::Arc;
 use std::net::{TcpListener};
 use ctrlc::CtrlC;
 use fdlimit::raise_fd_limit;
-use ethcore_rpc::{NetworkSettings, informant, is_major_importing};
+use parity_rpc::{NetworkSettings, informant, is_major_importing};
 use ethsync::NetworkConfiguration;
 use util::{Colour, version, Mutex, Condvar};
 use io::{MayPanic, ForwardPanic, PanicHandler};
@@ -80,6 +80,7 @@ pub struct RunCmd {
 	pub daemon: Option<String>,
 	pub logger_config: LogConfig,
 	pub miner_options: MinerOptions,
+	pub ws_conf: rpc::WsConfiguration,
 	pub http_conf: rpc::HttpConfiguration,
 	pub ipc_conf: rpc::IpcConfiguration,
 	pub net_conf: NetworkConfiguration,
@@ -295,7 +296,8 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) ->
 	};
 
 	// start rpc servers
-	let _http_server = rpc::new_http(cmd.http_conf, &dependencies, None)?;
+	let _ws_server = rpc::new_ws(cmd.ws_conf, &dependencies)?;
+	let _http_server = rpc::new_http(cmd.http_conf.clone(), &dependencies, None)?;
 	let _ipc_server = rpc::new_ipc(cmd.ipc_conf, &dependencies)?;
 
 	// the signer server
@@ -636,6 +638,7 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 	let dapps_middleware = dapps::new(cmd.dapps_conf.clone(), dapps_deps)?;
 
 	// start rpc servers
+	let ws_server = rpc::new_ws(cmd.ws_conf, &dependencies)?;
 	let http_server = rpc::new_http(cmd.http_conf.clone(), &dependencies, dapps_middleware)?;
 	let ipc_server = rpc::new_ipc(cmd.ipc_conf, &dependencies)?;
 
@@ -716,7 +719,7 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 	let restart = wait_for_exit(panic_handler, Some(updater), Some(client), can_restart);
 
 	// drop this stuff as soon as exit detected.
-	drop((http_server, ipc_server, signer_server, secretstore_key_server, ipfs_server, event_loop));
+	drop((ws_server, http_server, ipc_server, signer_server, secretstore_key_server, ipfs_server, event_loop));
 
 	info!("Finishing work, please wait...");
 
diff --git a/parity/signer.rs b/parity/signer.rs
index 29429311e..1ab53ea69 100644
--- a/parity/signer.rs
+++ b/parity/signer.rs
@@ -22,8 +22,8 @@ pub use ethcore_signer::Server as SignerServer;
 
 use ansi_term::Colour;
 use dir::default_data_path;
-use ethcore_rpc::informant::RpcStats;
-use ethcore_rpc::{self, ConfirmationsQueue};
+use parity_rpc::informant::RpcStats;
+use parity_rpc::{self, ConfirmationsQueue};
 use ethcore_signer as signer;
 use helpers::replace_home;
 use parity_reactor::TokioRemote;
@@ -69,10 +69,10 @@ pub struct NewToken {
 
 #[derive(Debug, Default, Clone)]
 pub struct StandardExtractor;
-impl signer::MetaExtractor<ethcore_rpc::Metadata> for StandardExtractor {
-	fn extract_metadata(&self, session: &H256) -> ethcore_rpc::Metadata {
-		let mut metadata = ethcore_rpc::Metadata::default();
-		metadata.origin = ethcore_rpc::Origin::Signer((*session).into());
+impl signer::MetaExtractor<parity_rpc::Metadata> for StandardExtractor {
+	fn extract_metadata(&self, session: &H256) -> parity_rpc::Metadata {
+		let mut metadata = parity_rpc::Metadata::default();
+		metadata.origin = parity_rpc::Origin::Signer((*session).into());
 		metadata
 	}
 }
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 8b694b765..87e340b02 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
-description = "Ethcore jsonrpc"
-name = "ethcore-rpc"
+description = "Parity JSON-RPC servers."
+name = "parity-rpc"
 version = "1.7.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
@@ -25,6 +25,7 @@ rust-crypto = "0.2.36"
 jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
 jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
 jsonrpc-minihttp-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
+jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
 jsonrpc-ipc-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
 jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
 
diff --git a/rpc/rpctest/Cargo.toml b/rpc/rpctest/Cargo.toml
index 369de1c99..258af2f39 100644
--- a/rpc/rpctest/Cargo.toml
+++ b/rpc/rpctest/Cargo.toml
@@ -8,10 +8,10 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
 docopt = "0.7"
-rustc-serialize = "0.3"
 ethcore = { path = "../../ethcore" }
 ethcore-devtools = { path = "../../devtools" }
-ethcore-rpc = { path = ".." }
 ethcore-util = { path = "../../util" }
 ethjson = { path = "../../json" }
+parity-rpc = { path = ".." }
+rustc-serialize = "0.3"
 serde_json = "0.8"
diff --git a/rpc/rpctest/src/main.rs b/rpc/rpctest/src/main.rs
index 6776a913a..d65d2462a 100644
--- a/rpc/rpctest/src/main.rs
+++ b/rpc/rpctest/src/main.rs
@@ -16,13 +16,13 @@
 
 extern crate ctrlc;
 extern crate docopt;
-extern crate rustc_serialize;
-extern crate serde_json;
-extern crate ethjson;
-extern crate ethcore_util as util;
 extern crate ethcore;
 extern crate ethcore_devtools as devtools;
-extern crate ethcore_rpc as rpc;
+extern crate ethcore_util as util;
+extern crate ethjson;
+extern crate parity_rpc as rpc;
+extern crate rustc_serialize;
+extern crate serde_json;
 
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex, Condvar};
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index 1d3f4285d..53b8f994c 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -66,6 +66,8 @@ extern crate ethjson;
 #[cfg(test)]
 extern crate ethcore_devtools as devtools;
 
+pub extern crate jsonrpc_ws_server as ws;
+
 mod metadata;
 pub mod v1;
 
@@ -73,7 +75,7 @@ pub use ipc::{Server as IpcServer, MetaExtractor as IpcMetaExtractor, RequestCon
 pub use http::{
 	hyper,
 	RequestMiddleware, RequestMiddlewareAction,
-	AccessControlAllowOrigin, Host,
+	AccessControlAllowOrigin, Host, DomainsValidation
 };
 
 pub use v1::{SigningQueue, SignerService, ConfirmationsQueue, NetworkSettings, Metadata, Origin, informant, dispatch};
@@ -193,3 +195,28 @@ pub fn start_ipc<M, S, H, T>(
 		.session_metadata_extractor(extractor)
 		.start(addr)
 }
+
+/// Start WS server and return `Server` handle.
+pub fn start_ws<M, S, H, T, U>(
+	addr: &SocketAddr,
+	handler: H,
+	remote: tokio_core::reactor::Remote,
+	allowed_origins: ws::DomainsValidation<ws::Origin>,
+	allowed_hosts: ws::DomainsValidation<ws::Host>,
+	extractor: T,
+	stats: U,
+) -> Result<ws::Server, ws::Error> where
+	M: jsonrpc_core::Metadata,
+	S: jsonrpc_core::Middleware<M>,
+	H: Into<jsonrpc_core::MetaIoHandler<M, S>>,
+	T: ws::MetaExtractor<M>,
+	U: ws::SessionStats,
+{
+	ws::ServerBuilder::new(handler)
+		.event_loop_remote(remote)
+		.allowed_origins(allowed_origins)
+		.allowed_hosts(allowed_hosts)
+		.session_meta_extractor(extractor)
+		.session_stats(stats)
+		.start(addr)
+}
diff --git a/rpc/src/v1/types/provenance.rs b/rpc/src/v1/types/provenance.rs
index 1e014dd5f..81201f8e4 100644
--- a/rpc/src/v1/types/provenance.rs
+++ b/rpc/src/v1/types/provenance.rs
@@ -33,6 +33,9 @@ pub enum Origin {
 	/// IPC server (includes session hash)
 	#[serde(rename="ipc")]
 	Ipc(H256),
+	/// WS server (includes session hash)
+	#[serde(rename="ws")]
+	Ws(H256),
 	/// Signer (includes session hash)
 	#[serde(rename="signer")]
 	Signer(H256),
@@ -53,6 +56,7 @@ impl fmt::Display for Origin {
 			Origin::Rpc(ref origin) => write!(f, "RPC (service: {})", origin),
 			Origin::Dapps(ref origin) => write!(f, "Dapp {}", origin),
 			Origin::Ipc(ref session) => write!(f, "IPC (session: {})", session),
+			Origin::Ws(ref session) => write!(f, "WebSocket (session: {})", session),
 			Origin::Signer(ref session) => write!(f, "UI (session: {})", session),
 			Origin::Unknown => write!(f, "unknown origin"),
 		}
@@ -112,6 +116,7 @@ mod tests {
 		let o3 = Origin::Ipc(5.into());
 		let o4 = Origin::Signer(10.into());
 		let o5 = Origin::Unknown;
+		let o6 = Origin::Ws(5.into());
 
 		// when
 		let res1 = serde_json::to_string(&o1).unwrap();
@@ -119,6 +124,7 @@ mod tests {
 		let res3 = serde_json::to_string(&o3).unwrap();
 		let res4 = serde_json::to_string(&o4).unwrap();
 		let res5 = serde_json::to_string(&o5).unwrap();
+		let res6 = serde_json::to_string(&o6).unwrap();
 
 		// then
 		assert_eq!(res1, r#"{"rpc":"test service"}"#);
@@ -126,6 +132,7 @@ mod tests {
 		assert_eq!(res3, r#"{"ipc":"0x0000000000000000000000000000000000000000000000000000000000000005"}"#);
 		assert_eq!(res4, r#"{"signer":"0x000000000000000000000000000000000000000000000000000000000000000a"}"#);
 		assert_eq!(res5, r#""unknown""#);
+		assert_eq!(res6, r#"{"ws":"0x0000000000000000000000000000000000000000000000000000000000000005"}"#);
 	}
 
 	#[test]
diff --git a/rpc_cli/Cargo.toml b/rpc_cli/Cargo.toml
index 8169d3b71..bb3588015 100644
--- a/rpc_cli/Cargo.toml
+++ b/rpc_cli/Cargo.toml
@@ -10,6 +10,6 @@ version = "1.4.0"
 futures = "0.1"
 rpassword = "0.3.0"
 ethcore-bigint = { path = "../util/bigint" }
-ethcore-rpc = { path = "../rpc" }
+parity-rpc = { path = "../rpc" }
 parity-rpc-client = { path = "../rpc_client" }
 ethcore-util = { path = "../util" }
diff --git a/rpc_cli/src/lib.rs b/rpc_cli/src/lib.rs
index 0cfb54353..8d00405b5 100644
--- a/rpc_cli/src/lib.rs
+++ b/rpc_cli/src/lib.rs
@@ -1,10 +1,10 @@
 extern crate futures;
-
-extern crate ethcore_util as util;
-extern crate ethcore_rpc as rpc;
-extern crate ethcore_bigint as bigint;
 extern crate rpassword;
 
+extern crate ethcore_util as util;
+extern crate ethcore_bigint as bigint;
+
+extern crate parity_rpc as rpc;
 extern crate parity_rpc_client as client;
 
 use rpc::v1::types::{U256, ConfirmationRequest};
diff --git a/rpc_client/Cargo.toml b/rpc_client/Cargo.toml
index 7b6be3bb2..c4e68acef 100644
--- a/rpc_client/Cargo.toml
+++ b/rpc_client/Cargo.toml
@@ -16,6 +16,6 @@ tempdir = "0.3.5"
 url = "1.2.0"
 jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
 ws = { git = "https://github.com/paritytech/ws-rs.git", branch = "parity-1.7" }
-ethcore-rpc = { path = "../rpc" }
+parity-rpc = { path = "../rpc" }
 ethcore-signer = { path = "../signer" }
 ethcore-util = { path = "../util" }
diff --git a/rpc_client/src/lib.rs b/rpc_client/src/lib.rs
index 7bc265250..e2f53e606 100644
--- a/rpc_client/src/lib.rs
+++ b/rpc_client/src/lib.rs
@@ -1,17 +1,17 @@
 pub mod client;
 pub mod signer_client;
 
-extern crate ws;
 extern crate ethcore_signer;
-extern crate url;
-extern crate futures;
 extern crate ethcore_util as util;
-extern crate ethcore_rpc as rpc;
+extern crate futures;
+extern crate jsonrpc_core;
+extern crate parity_rpc as rpc;
+extern crate rand;
 extern crate serde;
 extern crate serde_json;
-extern crate rand;
 extern crate tempdir;
-extern crate jsonrpc_core;
+extern crate url;
+extern crate ws;
 
 #[macro_use]
 extern crate log;
diff --git a/scripts/targets.sh b/scripts/targets.sh
index 040485d85..f3ae6a2d5 100644
--- a/scripts/targets.sh
+++ b/scripts/targets.sh
@@ -6,7 +6,7 @@ export TARGETS="
 	-p ethcore \
 	-p ethcore-bigint\
 	-p parity-dapps \
-	-p ethcore-rpc \
+	-p parity-rpc \
 	-p ethcore-signer \
 	-p ethcore-util \
 	-p ethcore-network \
diff --git a/signer/Cargo.toml b/signer/Cargo.toml
index bed1c461a..4f7c0f179 100644
--- a/signer/Cargo.toml
+++ b/signer/Cargo.toml
@@ -20,7 +20,7 @@ ws = { git = "https://github.com/paritytech/ws-rs.git", branch = "parity-1.7" }
 parity-dapps-glue = { version = "1.7", optional = true }
 ethcore-util = { path = "../util" }
 ethcore-io = { path = "../util/io" }
-ethcore-rpc = { path = "../rpc" }
+parity-rpc = { path = "../rpc" }
 ethcore-devtools = { path = "../devtools" }
 parity-ui = { path = "../dapps/ui", version = "1.4", optional = true }
 
diff --git a/signer/src/lib.rs b/signer/src/lib.rs
index d211e2eac..a1c935c5b 100644
--- a/signer/src/lib.rs
+++ b/signer/src/lib.rs
@@ -32,13 +32,13 @@
 //! extern crate jsonrpc_core;
 //! extern crate jsonrpc_server_utils;
 //! extern crate ethcore_signer;
-//! extern crate ethcore_rpc;
+//! extern crate parity_rpc;
 //!
 //! use std::sync::Arc;
 //! use jsonrpc_core::IoHandler;
 //! use jsonrpc_server_utils::reactor::RpcEventLoop;
 //! use ethcore_signer::ServerBuilder;
-//! use ethcore_rpc::ConfirmationsQueue;
+//! use parity_rpc::ConfirmationsQueue;
 //!
 //!	fn main() {
 //!	 let queue = Arc::new(ConfirmationsQueue::default());
@@ -55,11 +55,11 @@ extern crate log;
 extern crate env_logger;
 extern crate rand;
 
-extern crate ethcore_util as util;
-extern crate ethcore_rpc as rpc;
 extern crate ethcore_io as io;
+extern crate ethcore_util as util;
 extern crate jsonrpc_core;
 extern crate jsonrpc_server_utils;
+extern crate parity_rpc as rpc;
 extern crate ws;
 
 extern crate ethcore_devtools as devtools;

From 715d5daafe1f1c32878aea26ba32ad038bb4f9ca Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Thu, 13 Apr 2017 20:24:21 +0200
Subject: [PATCH 020/117] ChainVerifier for memoizing validator sets

---
 ethcore/res/ethereum/tests                    |   2 +-
 ethcore/src/client/client.rs                  |  22 ++
 ethcore/src/engines/authority_round.rs        | 197 ++++++++++++------
 ethcore/src/engines/basic_authority.rs        |  43 +++-
 ethcore/src/engines/chain_verifier.rs         |  42 ++++
 ethcore/src/engines/mod.rs                    |  45 ++--
 ethcore/src/engines/validator_set/contract.rs |   6 +-
 ethcore/src/engines/validator_set/mod.rs      |   5 +-
 ethcore/src/engines/validator_set/multi.rs    |   4 +
 .../engines/validator_set/safe_contract.rs    |   9 +
 .../src/engines/validator_set/simple_list.rs  |   7 +-
 ethcore/src/ethereum/ethash.rs                |  19 +-
 12 files changed, 311 insertions(+), 90 deletions(-)
 create mode 100644 ethcore/src/engines/chain_verifier.rs

diff --git a/ethcore/res/ethereum/tests b/ethcore/res/ethereum/tests
index 9028c4801..d52059307 160000
--- a/ethcore/res/ethereum/tests
+++ b/ethcore/res/ethereum/tests
@@ -1 +1 @@
-Subproject commit 9028c4801fd39fbb71a9796979182549a24e81c8
+Subproject commit d520593078fa0849dcd1f907e44ed0a616892e33
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 4bd29d100..13cb95afe 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -569,11 +569,33 @@ impl Client {
 		//let traces = From::from(block.traces().clone().unwrap_or_else(Vec::new));
 
 		let mut batch = DBTransaction::new();
+
+		// generate validation proof if the engine requires them.
+		// TODO: make conditional?
+		let generate_proof = {
+			use engines::RequiresProof;
+			match self.engine.proof_required(block.header(), Some(block_data), Some(&receipts)) {
+				RequiresProof::Yes(_) => true,
+				RequiresProof::No => false,
+				RequiresProof::Unsure(_) => {
+					warn!(target: "client", "Detected invalid engine implementation.");
+					warn!(target: "client", "Engine claims to require more block data, but everything provided.");
+					false
+				}
+			}
+		};
+
 		// CHECK! I *think* this is fine, even if the state_root is equal to another
 		// already-imported block of the same number.
 		// TODO: Prove it with a test.
 		let mut state = block.drain();
 
+		if generate_proof {
+			debug!(target: "client", "Generating validation proof for block {}", hash);
+
+			// TODO
+		}
+
 		state.journal_under(&mut batch, number, hash).expect("DB commit failed");
 		let route = chain.insert_block(&mut batch, block_data, receipts);
 		self.tracedb.read().import(&mut batch, TraceImportRequest {
diff --git a/ethcore/src/engines/authority_round.rs b/ethcore/src/engines/authority_round.rs
index e57fb27bc..8e8450768 100644
--- a/ethcore/src/engines/authority_round.rs
+++ b/ethcore/src/engines/authority_round.rs
@@ -37,7 +37,7 @@ use transaction::UnverifiedTransaction;
 use client::{Client, EngineClient};
 use state::CleanupMode;
 use super::signer::EngineSigner;
-use super::validator_set::{ValidatorSet, new_validator_set};
+use super::validator_set::{ValidatorSet, SimpleList, new_validator_set};
 
 /// `AuthorityRound` params.
 #[derive(Debug, PartialEq)]
@@ -75,27 +75,76 @@ impl From<ethjson::spec::AuthorityRoundParams> for AuthorityRoundParams {
 	}
 }
 
-/// Engine using `AuthorityRound` proof-of-work consensus algorithm, suitable for Ethereum
-/// mainnet chains in the Olympic, Frontier and Homestead eras.
+// Helper for managing the step.
+#[derive(Debug)]
+struct Step {
+	calibrate: bool, // whether calibration is enabled.
+	inner: AtomicUsize,
+	duration: Duration,
+}
+
+impl Step {
+	fn load(&self) -> usize { self.inner.load(AtomicOrdering::SeqCst) }
+	fn duration_remaining(&self) -> Duration {
+		let now = unix_now();
+		let step_end = self.duration * (self.load() as u32 + 1);
+		if step_end > now {
+			step_end - now
+		} else {
+			Duration::from_secs(0)
+		}
+	}
+	fn increment(&self) {
+		self.inner.fetch_add(1, AtomicOrdering::SeqCst);
+	}
+	fn calibrate(&self) {
+		if self.calibrate {
+			let new_step = unix_now().as_secs() / self.duration.as_secs();
+			self.inner.store(new_step as usize, AtomicOrdering::SeqCst);
+		}
+	}
+	fn is_future(&self, given: usize) -> bool {
+		if given > self.load() + 1 {
+			// Make absolutely sure that the given step is correct.
+			self.calibrate();
+			given > self.load() + 1
+		} else {
+			false
+		}
+	}
+}
+
+/// Engine using `AuthorityRound` proof-of-authority BFT consensus.
 pub struct AuthorityRound {
 	params: CommonParams,
 	gas_limit_bound_divisor: U256,
 	block_reward: U256,
 	registrar: Address,
-	step_duration: Duration,
 	builtins: BTreeMap<Address, Builtin>,
 	transition_service: IoService<()>,
-	step: AtomicUsize,
+	step: Arc<Step>,
 	proposed: AtomicBool,
 	client: RwLock<Option<Weak<EngineClient>>>,
 	signer: EngineSigner,
 	validators: Box<ValidatorSet>,
-	/// Is this Engine just for testing (prevents step calibration).
-	calibrate_step: bool,
 	validate_score_transition: u64,
 	eip155_transition: u64,
 }
 
+// header-chain validator.
+struct ChainVerifier {
+	step: Arc<Step>,
+	subchain_validators: SimpleList,
+}
+
+impl super::ChainVerifier for ChainVerifier {
+	fn verify_light(&self, header: &Header) -> Result<(), Error> {
+		// always check the seal since it's fast.
+		// nothing heavier to do.
+		verify_external(header, &self.subchain_validators, &*self.step)
+	}
+}
+
 fn header_step(header: &Header) -> Result<usize, ::rlp::DecoderError> {
 	UntrustedRlp::new(&header.seal().get(0).expect("was either checked with verify_block_basic or is genesis; has 2 fields; qed (Make sure the spec file has a correct genesis seal)")).as_val()
 }
@@ -104,6 +153,26 @@ fn header_signature(header: &Header) -> Result<Signature, ::rlp::DecoderError> {
 	UntrustedRlp::new(&header.seal().get(1).expect("was checked with verify_block_basic; has 2 fields; qed")).as_val::<H520>().map(Into::into)
 }
 
+fn verify_external(header: &Header, validators: &ValidatorSet, step: &Step) -> Result<(), Error> {
+	let header_step = header_step(header)?;
+
+	// Give one step slack if step is lagging, double vote is still not possible.
+	if step.is_future(header_step) {
+		trace!(target: "engine", "verify_block_unordered: block from the future");
+		validators.report_benign(header.author());
+		Err(BlockError::InvalidSeal)?
+	} else {
+		let proposer_signature = header_signature(header)?;
+		let correct_proposer = validators.get(header.parent_hash(), header_step);
+		if !verify_address(&correct_proposer, &proposer_signature, &header.bare_hash())? {
+			trace!(target: "engine", "verify_block_unordered: bad proposer for step: {}", header_step);
+			Err(EngineError::NotProposer(Mismatch { expected: correct_proposer, found: header.author().clone() }))?
+		} else {
+			Ok(())
+		}
+	}
+}
+
 trait AsMillis {
 	fn as_millis(&self) -> u64;
 }
@@ -125,15 +194,17 @@ impl AuthorityRound {
 				gas_limit_bound_divisor: our_params.gas_limit_bound_divisor,
 				block_reward: our_params.block_reward,
 				registrar: our_params.registrar,
-				step_duration: our_params.step_duration,
 				builtins: builtins,
 				transition_service: IoService::<()>::start()?,
-				step: AtomicUsize::new(initial_step),
+				step: Arc::new(Step {
+					inner: AtomicUsize::new(initial_step),
+					calibrate: our_params.start_step.is_none(),
+					duration: our_params.step_duration,
+				}),
 				proposed: AtomicBool::new(false),
 				client: RwLock::new(None),
 				signer: Default::default(),
 				validators: new_validator_set(our_params.validators),
-				calibrate_step: our_params.start_step.is_none(),
 				validate_score_transition: our_params.validate_score_transition,
 				eip155_transition: our_params.eip155_transition,
 			});
@@ -145,22 +216,6 @@ impl AuthorityRound {
 		Ok(engine)
 	}
 
-	fn calibrate_step(&self) {
-		if self.calibrate_step {
-			self.step.store((unix_now().as_secs() / self.step_duration.as_secs()) as usize, AtomicOrdering::SeqCst);
-		}
-	}
-
-	fn remaining_step_duration(&self) -> Duration {
-		let now = unix_now();
-		let step_end = self.step_duration * (self.step.load(AtomicOrdering::SeqCst) as u32 + 1);
-		if step_end > now {
-			step_end - now
-		} else {
-			Duration::from_secs(0)
-		}
-	}
-
 	fn step_proposer(&self, bh: &H256, step: usize) -> Address {
 		self.validators.get(bh, step)
 	}
@@ -168,16 +223,6 @@ impl AuthorityRound {
 	fn is_step_proposer(&self, bh: &H256, step: usize, address: &Address) -> bool {
 		self.step_proposer(bh, step) == *address
 	}
-
-	fn is_future_step(&self, step: usize) -> bool {
-		if step > self.step.load(AtomicOrdering::SeqCst) + 1 {
-			// Make absolutely sure that the step is correct.
-			self.calibrate_step();
-			step > self.step.load(AtomicOrdering::SeqCst) + 1
-		} else {
-			false
-		}
-	}
 }
 
 fn unix_now() -> Duration {
@@ -193,7 +238,8 @@ const ENGINE_TIMEOUT_TOKEN: TimerToken = 23;
 impl IoHandler<()> for TransitionHandler {
 	fn initialize(&self, io: &IoContext<()>) {
 		if let Some(engine) = self.engine.upgrade() {
-			io.register_timer_once(ENGINE_TIMEOUT_TOKEN, engine.remaining_step_duration().as_millis())
+			let remaining = engine.step.duration_remaining();
+			io.register_timer_once(ENGINE_TIMEOUT_TOKEN, remaining.as_millis())
 				.unwrap_or_else(|e| warn!(target: "engine", "Failed to start consensus step timer: {}.", e))
 		}
 	}
@@ -202,7 +248,8 @@ impl IoHandler<()> for TransitionHandler {
 		if timer == ENGINE_TIMEOUT_TOKEN {
 			if let Some(engine) = self.engine.upgrade() {
 				engine.step();
-				io.register_timer_once(ENGINE_TIMEOUT_TOKEN, engine.remaining_step_duration().as_millis())
+				let remaining = engine.step.duration_remaining();
+				io.register_timer_once(ENGINE_TIMEOUT_TOKEN, remaining.as_millis())
 					.unwrap_or_else(|e| warn!(target: "engine", "Failed to restart consensus step timer: {}.", e))
 			}
 		}
@@ -224,7 +271,7 @@ impl Engine for AuthorityRound {
 	fn builtins(&self) -> &BTreeMap<Address, Builtin> { &self.builtins }
 
 	fn step(&self) {
-		self.step.fetch_add(1, AtomicOrdering::SeqCst);
+		self.step.increment();
 		self.proposed.store(false, AtomicOrdering::SeqCst);
 		if let Some(ref weak) = *self.client.read() {
 			if let Some(c) = weak.upgrade() {
@@ -247,7 +294,7 @@ impl Engine for AuthorityRound {
 
 	fn populate_from_parent(&self, header: &mut Header, parent: &Header, gas_floor_target: U256, _gas_ceil_target: U256) {
 		// Chain scoring: total weight is sqrt(U256::max_value())*height - step
-		let new_difficulty = U256::from(U128::max_value()) + header_step(parent).expect("Header has been verified; qed").into() - self.step.load(AtomicOrdering::SeqCst).into();
+		let new_difficulty = U256::from(U128::max_value()) + header_step(parent).expect("Header has been verified; qed").into() - self.step.load().into();
 		header.set_difficulty(new_difficulty);
 		header.set_gas_limit({
 			let gas_limit = parent.gas_limit().clone();
@@ -271,7 +318,7 @@ impl Engine for AuthorityRound {
 	fn generate_seal(&self, block: &ExecutedBlock) -> Seal {
 		if self.proposed.load(AtomicOrdering::SeqCst) { return Seal::None; }
 		let header = block.header();
-		let step = self.step.load(AtomicOrdering::SeqCst);
+		let step = self.step.load();
 		if self.is_step_proposer(header.parent_hash(), step, header.author()) {
 			if let Ok(signature) = self.signer.sign(header.bare_hash()) {
 				trace!(target: "engine", "generate_seal: Issuing a block for step {}.", step);
@@ -319,32 +366,19 @@ impl Engine for AuthorityRound {
 		Ok(())
 	}
 
-	/// Do the validator and gas limit validation.
+	/// Do the step and gas limit validation.
 	fn verify_block_family(&self, header: &Header, parent: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
 		let step = header_step(header)?;
-		// Give one step slack if step is lagging, double vote is still not possible.
-		if self.is_future_step(step) {
-			trace!(target: "engine", "verify_block_unordered: block from the future");
-			self.validators.report_benign(header.author());
-			Err(BlockError::InvalidSeal)?
-		} else {
-			let proposer_signature = header_signature(header)?;
-			let correct_proposer = self.step_proposer(header.parent_hash(), step);
-			if !verify_address(&correct_proposer, &proposer_signature, &header.bare_hash())? {
-				trace!(target: "engine", "verify_block_unordered: bad proposer for step: {}", step);
-				Err(EngineError::NotProposer(Mismatch { expected: correct_proposer, found: header.author().clone() }))?
-			}
-		}
 
 		// Do not calculate difficulty for genesis blocks.
 		if header.number() == 0 {
 			return Err(From::from(BlockError::RidiculousNumber(OutOfBounds { min: Some(1), max: None, found: header.number() })));
 		}
 
-		// Check if parent is from a previous step.
+		// Ensure header is from the step after parent.
 		let parent_step = header_step(parent)?;
-		if step == parent_step {
-			trace!(target: "engine", "Multiple blocks proposed for step {}.", step);
+		if step <= parent_step {
+			trace!(target: "engine", "Multiple blocks proposed for step {}.", parent_step);
 			self.validators.report_malicious(header.author());
 			Err(EngineError::DoubleVote(header.author().clone()))?;
 		}
@@ -358,6 +392,11 @@ impl Engine for AuthorityRound {
 		Ok(())
 	}
 
+	// Check the validators.
+	fn verify_block_external(&self, header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
+		verify_external(header, &*self.validators, &*self.step)
+	}
+
 	// the proofs we need just allow us to get the full validator set.
 	fn prove_with_caller(&self, header: &Header, caller: &Call) -> Result<Bytes, Error> {
 		self.validators.generate_proof(header, caller)
@@ -370,6 +409,16 @@ impl Engine for AuthorityRound {
 		self.validators.proof_required(header, block, receipts)
 	}
 
+	fn chain_verifier(&self, header: &Header, proof: Bytes) -> Result<Box<super::ChainVerifier>, Error> {
+		// extract a simple list from the proof.
+		let simple_list = self.validators.chain_verifier(header, proof)?;
+
+		Ok(Box::new(ChainVerifier {
+			step: self.step.clone(),
+			subchain_validators: simple_list,
+		}))
+	}
+
 	fn verify_transaction_basic(&self, t: &UnverifiedTransaction, header: &Header) -> result::Result<(), Error> {
 		t.check_low_s()?;
 
@@ -453,7 +502,7 @@ mod tests {
 		let mut header: Header = Header::default();
 		header.set_seal(vec![encode(&H520::default()).to_vec()]);
 
-		let verify_result = engine.verify_block_family(&header, &Default::default(), None);
+		let verify_result = engine.verify_block_external(&header, None);
 		assert!(verify_result.is_err());
 	}
 
@@ -507,9 +556,11 @@ mod tests {
 		// Two validators.
 		// Spec starts with step 2.
 		header.set_seal(vec![encode(&2usize).to_vec(), encode(&(&*signature as &[u8])).to_vec()]);
-		assert!(engine.verify_block_family(&header, &parent_header, None).is_err());
+		assert!(engine.verify_block_family(&header, &parent_header, None).is_ok());
+		assert!(engine.verify_block_external(&header, None).is_err());
 		header.set_seal(vec![encode(&1usize).to_vec(), encode(&(&*signature as &[u8])).to_vec()]);
 		assert!(engine.verify_block_family(&header, &parent_header, None).is_ok());
+		assert!(engine.verify_block_external(&header, None).is_ok());
 	}
 
 	#[test]
@@ -532,7 +583,33 @@ mod tests {
 		// Spec starts with step 2.
 		header.set_seal(vec![encode(&1usize).to_vec(), encode(&(&*signature as &[u8])).to_vec()]);
 		assert!(engine.verify_block_family(&header, &parent_header, None).is_ok());
+		assert!(engine.verify_block_external(&header, None).is_ok());
 		header.set_seal(vec![encode(&5usize).to_vec(), encode(&(&*signature as &[u8])).to_vec()]);
+		assert!(engine.verify_block_family(&header, &parent_header, None).is_ok());
+		assert!(engine.verify_block_external(&header, None).is_err());
+	}
+
+	#[test]
+	fn rejects_step_backwards() {
+				let tap = AccountProvider::transient_provider();
+		let addr = tap.insert_account(Secret::from_slice(&"0".sha3()).unwrap(), "0").unwrap();
+
+		let mut parent_header: Header = Header::default();
+		parent_header.set_seal(vec![encode(&4usize).to_vec()]);
+		parent_header.set_gas_limit(U256::from_str("222222").unwrap());
+		let mut header: Header = Header::default();
+		header.set_number(1);
+		header.set_gas_limit(U256::from_str("222222").unwrap());
+		header.set_author(addr);
+
+		let engine = Spec::new_test_round().engine;
+
+		let signature = tap.sign(addr, Some("0".into()), header.bare_hash()).unwrap();
+		// Two validators.
+		// Spec starts with step 2.
+		header.set_seal(vec![encode(&5usize).to_vec(), encode(&(&*signature as &[u8])).to_vec()]);
+		assert!(engine.verify_block_family(&header, &parent_header, None).is_ok());
+		header.set_seal(vec![encode(&3usize).to_vec(), encode(&(&*signature as &[u8])).to_vec()]);
 		assert!(engine.verify_block_family(&header, &parent_header, None).is_err());
 	}
 }
diff --git a/ethcore/src/engines/basic_authority.rs b/ethcore/src/engines/basic_authority.rs
index a785b360a..25cdd765f 100644
--- a/ethcore/src/engines/basic_authority.rs
+++ b/ethcore/src/engines/basic_authority.rs
@@ -31,7 +31,7 @@ use ethjson;
 use header::Header;
 use client::Client;
 use super::signer::EngineSigner;
-use super::validator_set::{ValidatorSet, new_validator_set};
+use super::validator_set::{ValidatorSet, SimpleList, new_validator_set};
 
 /// `BasicAuthority` params.
 #[derive(Debug, PartialEq)]
@@ -51,6 +51,27 @@ impl From<ethjson::spec::BasicAuthorityParams> for BasicAuthorityParams {
 	}
 }
 
+struct ChainVerifier(SimpleList);
+
+impl super::ChainVerifier for ChainVerifier {
+	fn verify_light(&self, header: &Header) -> Result<(), Error> {
+		verify_external(header, &self.0)
+	}
+}
+
+fn verify_external(header: &Header, validators: &ValidatorSet) -> Result<(), Error> {
+	use rlp::UntrustedRlp;
+
+	// Check if the signature belongs to a validator, can depend on parent state.
+	let sig = UntrustedRlp::new(&header.seal()[0]).as_val::<H520>()?;
+	let signer = public_to_address(&recover(&sig.into(), &header.bare_hash())?);
+
+	match validators.contains(header.parent_hash(), &signer) {
+		false => Err(BlockError::InvalidSeal.into()),
+		true => Ok(())
+	}
+}
+
 /// Engine using `BasicAuthority`, trivial proof-of-authority consensus.
 pub struct BasicAuthority {
 	params: CommonParams,
@@ -137,15 +158,6 @@ impl Engine for BasicAuthority {
 	}
 
 	fn verify_block_family(&self, header: &Header, parent: &Header, _block: Option<&[u8]>) -> result::Result<(), Error> {
-		use rlp::UntrustedRlp;
-
-		// Check if the signature belongs to a validator, can depend on parent state.
-		let sig = UntrustedRlp::new(&header.seal()[0]).as_val::<H520>()?;
-		let signer = public_to_address(&recover(&sig.into(), &header.bare_hash())?);
-		if !self.validators.contains(header.parent_hash(), &signer) {
-			return Err(BlockError::InvalidSeal)?;
-		}
-
 		// Do not calculate difficulty for genesis blocks.
 		if header.number() == 0 {
 			return Err(From::from(BlockError::RidiculousNumber(OutOfBounds { min: Some(1), max: None, found: header.number() })));
@@ -164,6 +176,10 @@ impl Engine for BasicAuthority {
 		Ok(())
 	}
 
+	fn verify_block_external(&self, header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
+		verify_external(header, &*self.validators)
+	}
+
 	// the proofs we need just allow us to get the full validator set.
 	fn prove_with_caller(&self, header: &Header, caller: &Call) -> Result<Bytes, Error> {
 		self.validators.generate_proof(header, caller)
@@ -176,6 +192,13 @@ impl Engine for BasicAuthority {
 		self.validators.proof_required(header, block, receipts)
 	}
 
+	fn chain_verifier(&self, header: &Header, proof: Bytes) -> Result<Box<super::ChainVerifier>, Error> {
+		// extract a simple list from the proof.
+		let simple_list = self.validators.chain_verifier(header, proof)?;
+
+		Ok(Box::new(ChainVerifier(simple_list)))
+	}
+
 	fn register_client(&self, client: Weak<Client>) {
 		self.validators.register_contract(client);
 	}
diff --git a/ethcore/src/engines/chain_verifier.rs b/ethcore/src/engines/chain_verifier.rs
new file mode 100644
index 000000000..399832fe9
--- /dev/null
+++ b/ethcore/src/engines/chain_verifier.rs
@@ -0,0 +1,42 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+// Chain verifiers.
+
+use error::Error;
+use header::Header;
+
+/// Sequential chain verifier.
+///
+/// See docs on `Engine` relating to proving functions for more details.
+/// Headers here will have already passed "basic" verification.
+pub trait ChainVerifier {
+	/// Lightly verify the next block header.
+	/// This may not be a header that requires a proof.
+	fn verify_light(&self, header: &Header) -> Result<(), Error>;
+
+	/// Perform potentially heavier checks on the next block header.
+	fn verify_heavy(&self, header: &Header) -> Result<(), Error> {
+		self.verify_light(header)
+	}
+}
+
+/// No-op chain verifier.
+pub struct NoOp;
+
+impl ChainVerifier for NoOp {
+	fn verify_light(&self, _header: &Header) -> Result<(), Error> { Ok(()) }
+}
diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
index f1e0a4d43..7d4906dd2 100644
--- a/ethcore/src/engines/mod.rs
+++ b/ethcore/src/engines/mod.rs
@@ -16,20 +16,22 @@
 
 //! Consensus engine specification and basic implementations.
 
-mod transition;
-mod vote_collector;
-mod null_engine;
-mod instant_seal;
-mod basic_authority;
 mod authority_round;
-mod tendermint;
-mod validator_set;
+mod basic_authority;
+mod chain_verifier;
+mod instant_seal;
+mod null_engine;
 mod signer;
+mod tendermint;
+mod transition;
+mod validator_set;
+mod vote_collector;
 
-pub use self::null_engine::NullEngine;
-pub use self::instant_seal::InstantSeal;
-pub use self::basic_authority::BasicAuthority;
 pub use self::authority_round::AuthorityRound;
+pub use self::basic_authority::BasicAuthority;
+pub use self::chain_verifier::ChainVerifier;
+pub use self::instant_seal::InstantSeal;
+pub use self::null_engine::NullEngine;
 pub use self::tendermint::Tendermint;
 
 use std::sync::Weak;
@@ -182,6 +184,9 @@ pub trait Engine : Sync + Send {
 	/// may be provided for additional checks. Returns either a null `Ok` or a general error detailing the problem with import.
 	fn verify_block_family(&self, _header: &Header, _parent: &Header, _block: Option<&[u8]>) -> Result<(), Error> { Ok(()) }
 
+	/// Phase 4 verification. Verify block header against potentially external data.
+	fn verify_block_external(&self, _header: &Header, _block: Option<&[u8]>) -> Result<(), Error> { Ok(()) }
+
 	/// Additional verification for transactions in blocks.
 	// TODO: Add flags for which bits of the transaction to check.
 	// TODO: consider including State in the params.
@@ -214,13 +219,21 @@ pub trait Engine : Sync + Send {
 		self.verify_block_basic(header, None).and_then(|_| self.verify_block_unordered(header, None))
 	}
 
-	/// Re-do all verification for a header with the given contract-calling interface
+	/// Generate validation proof.
 	///
 	/// This will be used to generate proofs of validation as well as verify them.
 	/// Must be called on blocks that have already passed basic verification.
 	///
 	/// Return the "validation proof" generated.
-	fn prove_with_caller(&self, _header: &Header, _caller: &Call) -> Result<Bytes, Error> {
+	/// This must be usable to generate a `ChainVerifier` for verifying all blocks
+	/// from the supplied header up to the next one where proof is required.
+	///
+	/// For example, for PoA chains the proof will be a validator set,
+	/// and the corresponding `ChainVerifier` can be used to correctly validate
+	/// all blocks produced under that `ValidatorSet`
+	fn prove_with_caller(&self, _header: &Header, _caller: &Call)
+		-> Result<Vec<u8>, Error>
+	{
 		Ok(Vec::new())
 	}
 
@@ -231,6 +244,14 @@ pub trait Engine : Sync + Send {
 		RequiresProof::No
 	}
 
+	/// Create a subchain verifier from validation proof.
+	///
+	/// The proof should be one generated by `prove_with_caller`.
+	/// See docs of `prove_with_caller` for description.
+	fn chain_verifier(&self, _header: &Header, _proof: Bytes) -> Result<Box<ChainVerifier>, Error> {
+		Ok(Box::new(self::chain_verifier::NoOp))
+	}
+
 	/// Populate a header's fields based on its parent's header.
 	/// Usually implements the chain scoring rule based on weight.
 	/// The gas floor target must not be lower than the engine's minimum gas limit.
diff --git a/ethcore/src/engines/validator_set/contract.rs b/ethcore/src/engines/validator_set/contract.rs
index 5c4af4ba7..db6e8ed2c 100644
--- a/ethcore/src/engines/validator_set/contract.rs
+++ b/ethcore/src/engines/validator_set/contract.rs
@@ -76,6 +76,10 @@ impl ValidatorSet for ValidatorContract {
 		self.validators.generate_proof(header, caller)
 	}
 
+	fn chain_verifier(&self, header: &Header, proof: Vec<u8>) -> Result<super::SimpleList, ::error::Error> {
+		self.validators.chain_verifier(header, proof)
+	}
+
 	fn contains_with_caller(&self, bh: &H256, address: &Address, caller: &Call) -> bool {
 		self.validators.contains_with_caller(bh, address, caller)
 	}
@@ -153,7 +157,7 @@ mod tests {
 		header.set_parent_hash(client.chain_info().best_block_hash);
 
 		// `reportBenign` when the designated proposer releases block from the future (bad clock).
-		assert!(client.engine().verify_block_family(&header, &header, None).is_err());
+		assert!(client.engine().verify_block_external(&header, None).is_err());
 		// Seal a block.
 		client.engine().step();
 		assert_eq!(client.chain_info().best_block_number, 1);
diff --git a/ethcore/src/engines/validator_set/mod.rs b/ethcore/src/engines/validator_set/mod.rs
index d5abf430d..48269e20f 100644
--- a/ethcore/src/engines/validator_set/mod.rs
+++ b/ethcore/src/engines/validator_set/mod.rs
@@ -28,7 +28,7 @@ use ethjson::spec::ValidatorSet as ValidatorSpec;
 use client::Client;
 use header::Header;
 
-use self::simple_list::SimpleList;
+pub use self::simple_list::SimpleList;
 use self::contract::ValidatorContract;
 use self::safe_contract::ValidatorSafeContract;
 use self::multi::Multi;
@@ -90,6 +90,9 @@ pub trait ValidatorSet: Send + Sync {
 	/// Otherwise, generated proofs may be wrong.
 	fn generate_proof(&self, header: &Header, caller: &Call) -> Result<Vec<u8>, String>;
 
+	/// Create a fully self-contained validator set from the given proof.
+	fn chain_verifier(&self, header: &Header, proof: Vec<u8>) -> Result<SimpleList, ::error::Error>;
+
 	/// Checks if a given address is a validator, with the given function
 	/// for executing synchronous calls to contracts.
 	fn contains_with_caller(&self, parent_block_hash: &H256, address: &Address, caller: &Call) -> bool;
diff --git a/ethcore/src/engines/validator_set/multi.rs b/ethcore/src/engines/validator_set/multi.rs
index 78270c4af..b7a13c5e3 100644
--- a/ethcore/src/engines/validator_set/multi.rs
+++ b/ethcore/src/engines/validator_set/multi.rs
@@ -82,6 +82,10 @@ impl ValidatorSet for Multi {
 		self.correct_set_by_number(header.number()).generate_proof(header, caller)
 	}
 
+	fn chain_verifier(&self, header: &Header, proof: Vec<u8>) -> Result<super::SimpleList, ::error::Error> {
+		self.correct_set_by_number(header.number()).chain_verifier(header, proof)
+	}
+
 	fn contains_with_caller(&self, bh: &H256, address: &Address, caller: &Call) -> bool {
 		self.correct_set(BlockId::Hash(*bh))
 			.map_or(false, |set| set.contains_with_caller(bh, address, caller))
diff --git a/ethcore/src/engines/validator_set/safe_contract.rs b/ethcore/src/engines/validator_set/safe_contract.rs
index de7ecb3a2..2af389484 100644
--- a/ethcore/src/engines/validator_set/safe_contract.rs
+++ b/ethcore/src/engines/validator_set/safe_contract.rs
@@ -202,6 +202,15 @@ impl ValidatorSet for ValidatorSafeContract {
 		}
 	}
 
+	fn chain_verifier(&self, _header: &Header, proof: Vec<u8>) -> Result<SimpleList, ::error::Error> {
+		use rlp::UntrustedRlp;
+
+		let rlp = UntrustedRlp::new(&proof);
+		let validators: Vec<Address> = rlp.list_at(1)?;
+
+		Ok(SimpleList::new(validators))
+	}
+
 	fn contains_with_caller(&self, block_hash: &H256, address: &Address, caller: &Call) -> bool {
 		let mut guard = self.validators.write();
 		let maybe_existing = guard
diff --git a/ethcore/src/engines/validator_set/simple_list.rs b/ethcore/src/engines/validator_set/simple_list.rs
index e513212a6..339585d7d 100644
--- a/ethcore/src/engines/validator_set/simple_list.rs
+++ b/ethcore/src/engines/validator_set/simple_list.rs
@@ -22,7 +22,8 @@ use engines::Call;
 use header::Header;
 use super::ValidatorSet;
 
-#[derive(Debug, PartialEq, Eq, Default)]
+/// Validator set containing a known set of addresses.
+#[derive(Clone, Debug, PartialEq, Eq, Default)]
 pub struct SimpleList {
 	validators: Vec<Address>,
 }
@@ -62,6 +63,10 @@ impl ValidatorSet for SimpleList {
 		Ok(Vec::new())
 	}
 
+	fn chain_verifier(&self, _header: &Header, _: Vec<u8>) -> Result<SimpleList, ::error::Error> {
+		Ok(self.clone())
+	}
+
 	fn contains_with_caller(&self, _bh: &H256, address: &Address, _: &Call) -> bool {
 		self.validators.contains(address)
 	}
diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs
index 5bc31c5d9..585fd29aa 100644
--- a/ethcore/src/ethereum/ethash.rs
+++ b/ethcore/src/ethereum/ethash.rs
@@ -139,17 +139,24 @@ pub struct Ethash {
 
 impl Ethash {
 	/// Create a new instance of Ethash engine
-	pub fn new(params: CommonParams, ethash_params: EthashParams, builtins: BTreeMap<Address, Builtin>) -> Self {
-		Ethash {
+	pub fn new(params: CommonParams, ethash_params: EthashParams, builtins: BTreeMap<Address, Builtin>) -> Arc<Self> {
+		Arc::new(Ethash {
 			params: params,
 			ethash_params: ethash_params,
 			builtins: builtins,
 			pow: EthashManager::new(),
-		}
+		})
 	}
 }
 
-impl Engine for Ethash {
+impl ::engines::ChainVerifier for Arc<Ethash> {
+	fn verify_light(&self, _header: &Header) -> Result<(), Error> { Ok(()) }
+	fn verify_heavy(&self, header: &Header) -> Result<(), Error> {
+		self.verify_block_unordered(header, None)
+	}
+}
+
+impl Engine for Arc<Ethash> {
 	fn name(&self) -> &str { "Ethash" }
 	fn version(&self) -> SemanticVersion { SemanticVersion::new(1, 0, 0) }
 	// Two fields - mix
@@ -385,6 +392,10 @@ impl Engine for Ethash {
 
 		Ok(())
 	}
+
+	fn chain_verifier(&self, _header: &Header, _proof: Vec<u8>) -> Result<Box<::engines::ChainVerifier>, Error> {
+		Ok(Box::new(self.clone()))
+	}
 }
 
 // Try to round gas_limit a bit so that:

From e1fa4ab8ec3c1e86a16539c6ac96c07582112ee6 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Thu, 13 Apr 2017 20:31:29 +0200
Subject: [PATCH 021/117] verify_external in verifier trait

---
 ethcore/src/client/client.rs               | 6 ++++++
 ethcore/src/verification/canon_verifier.rs | 4 ++++
 ethcore/src/verification/noop_verifier.rs  | 4 ++++
 ethcore/src/verification/verifier.rs       | 2 ++
 4 files changed, 16 insertions(+)

diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 13cb95afe..03353a2a4 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -380,6 +380,12 @@ impl Client {
 			return Err(());
 		};
 
+		let verify_external_result = self.verifier.verify_block_external(header, &block.bytes, engine);
+		if let Err(e) = verify_external_result {
+			warn!(target: "client", "Stage 4 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
+			return Err(());
+		};
+
 		// Check if Parent is in chain
 		let chain_has_parent = chain.block_header(header.parent_hash());
 		if let Some(parent) = chain_has_parent {
diff --git a/ethcore/src/verification/canon_verifier.rs b/ethcore/src/verification/canon_verifier.rs
index 849f7caad..a5d8fe73f 100644
--- a/ethcore/src/verification/canon_verifier.rs
+++ b/ethcore/src/verification/canon_verifier.rs
@@ -34,4 +34,8 @@ impl Verifier for CanonVerifier {
 	fn verify_block_final(&self, expected: &Header, got: &Header) -> Result<(), Error> {
 		verification::verify_block_final(expected, got)
 	}
+
+	fn verify_block_external(&self, header: &Header, bytes: &[u8], engine: &Engine) -> Result<(), Error> {
+		engine.verify_block_external(header, Some(bytes))
+	}
 }
diff --git a/ethcore/src/verification/noop_verifier.rs b/ethcore/src/verification/noop_verifier.rs
index 2fcd877f5..8464ba1e2 100644
--- a/ethcore/src/verification/noop_verifier.rs
+++ b/ethcore/src/verification/noop_verifier.rs
@@ -34,4 +34,8 @@ impl Verifier for NoopVerifier {
 	fn verify_block_final(&self, _expected: &Header, _got: &Header) -> Result<(), Error> {
 		Ok(())
 	}
+
+	fn verify_block_external(&self, _header: &Header, _bytes: &[u8], _engine: &Engine) -> Result<(), Error> {
+		Ok(())
+	}
 }
diff --git a/ethcore/src/verification/verifier.rs b/ethcore/src/verification/verifier.rs
index e5dabd392..55b711c1c 100644
--- a/ethcore/src/verification/verifier.rs
+++ b/ethcore/src/verification/verifier.rs
@@ -27,4 +27,6 @@ pub trait Verifier: Send + Sync {
 	fn verify_block_family(&self, header: &Header, bytes: &[u8], engine: &Engine, bc: &BlockProvider) -> Result<(), Error>;
 	/// Do a final verification check for an enacted header vs its expected counterpart.
 	fn verify_block_final(&self, expected: &Header, got: &Header) -> Result<(), Error>;
+	/// Verify a block, inspecing external state.
+	fn verify_block_external(&self, header: &Header, bytes: &[u8], engine: &Engine) -> Result<(), Error>;
 }

From f6f9816ef4a35d5e3af0c8f59dd1e4df80260b54 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Tue, 18 Apr 2017 14:19:10 +0200
Subject: [PATCH 022/117] epoch verifier rename

---
 ethcore/src/client/client.rs                  | 10 ++--
 ethcore/src/engines/authority_round.rs        | 23 +++++----
 ethcore/src/engines/basic_authority.rs        | 31 +++++++-----
 .../{chain_verifier.rs => epoch_verifier.rs}  | 18 ++++---
 ethcore/src/engines/mod.rs                    | 48 ++++++++++---------
 ethcore/src/engines/validator_set/contract.rs | 14 +++---
 ethcore/src/engines/validator_set/mod.rs      | 26 ++++++----
 ethcore/src/engines/validator_set/multi.rs    | 32 +++++++------
 .../engines/validator_set/safe_contract.rs    | 27 ++++++-----
 .../src/engines/validator_set/simple_list.rs  | 14 +++---
 ethcore/src/ethereum/ethash.rs                | 13 ++++-
 11 files changed, 148 insertions(+), 108 deletions(-)
 rename ethcore/src/engines/{chain_verifier.rs => epoch_verifier.rs} (75%)

diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 03353a2a4..a91294e27 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -579,11 +579,11 @@ impl Client {
 		// generate validation proof if the engine requires them.
 		// TODO: make conditional?
 		let generate_proof = {
-			use engines::RequiresProof;
-			match self.engine.proof_required(block.header(), Some(block_data), Some(&receipts)) {
-				RequiresProof::Yes(_) => true,
-				RequiresProof::No => false,
-				RequiresProof::Unsure(_) => {
+			use engines::EpochChange;
+			match self.engine.is_epoch_end(block.header(), Some(block_data), Some(&receipts)) {
+				EpochChange::Yes(_) => true,
+				EpochChange::No => false,
+				EpochChange::Unsure(_) => {
 					warn!(target: "client", "Detected invalid engine implementation.");
 					warn!(target: "client", "Engine claims to require more block data, but everything provided.");
 					false
diff --git a/ethcore/src/engines/authority_round.rs b/ethcore/src/engines/authority_round.rs
index 8e8450768..1f3edf57c 100644
--- a/ethcore/src/engines/authority_round.rs
+++ b/ethcore/src/engines/authority_round.rs
@@ -132,12 +132,14 @@ pub struct AuthorityRound {
 }
 
 // header-chain validator.
-struct ChainVerifier {
+struct EpochVerifier {
+	epoch_number: U256,
 	step: Arc<Step>,
 	subchain_validators: SimpleList,
 }
 
-impl super::ChainVerifier for ChainVerifier {
+impl super::EpochVerifier for EpochVerifier {
+	fn epoch_number(&self) -> U256 { self.epoch_number.clone() }
 	fn verify_light(&self, header: &Header) -> Result<(), Error> {
 		// always check the seal since it's fast.
 		// nothing heavier to do.
@@ -398,22 +400,23 @@ impl Engine for AuthorityRound {
 	}
 
 	// the proofs we need just allow us to get the full validator set.
-	fn prove_with_caller(&self, header: &Header, caller: &Call) -> Result<Bytes, Error> {
-		self.validators.generate_proof(header, caller)
+	fn epoch_proof(&self, header: &Header, caller: &Call) -> Result<Bytes, Error> {
+		self.validators.epoch_proof(header, caller)
 			.map_err(|e| EngineError::InsufficientProof(e).into())
 	}
 
-	fn proof_required(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
-		-> super::RequiresProof
+	fn is_epoch_end(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
+		-> super::EpochChange
 	{
-		self.validators.proof_required(header, block, receipts)
+		self.validators.is_epoch_end(header, block, receipts)
 	}
 
-	fn chain_verifier(&self, header: &Header, proof: Bytes) -> Result<Box<super::ChainVerifier>, Error> {
+	fn epoch_verifier(&self, header: &Header, proof: &[u8]) -> Result<Box<super::EpochVerifier>, Error> {
 		// extract a simple list from the proof.
-		let simple_list = self.validators.chain_verifier(header, proof)?;
+		let (num, simple_list) = self.validators.epoch_set(header, proof)?;
 
-		Ok(Box::new(ChainVerifier {
+		Ok(Box::new(EpochVerifier {
+			epoch_number: num,
 			step: self.step.clone(),
 			subchain_validators: simple_list,
 		}))
diff --git a/ethcore/src/engines/basic_authority.rs b/ethcore/src/engines/basic_authority.rs
index 25cdd765f..94c3fe578 100644
--- a/ethcore/src/engines/basic_authority.rs
+++ b/ethcore/src/engines/basic_authority.rs
@@ -23,7 +23,7 @@ use account_provider::AccountProvider;
 use block::*;
 use builtin::Builtin;
 use spec::CommonParams;
-use engines::{Engine, EngineError, Seal, Call, RequiresProof};
+use engines::{Engine, EngineError, Seal, Call, EpochChange};
 use env_info::EnvInfo;
 use error::{BlockError, Error};
 use evm::Schedule;
@@ -51,11 +51,15 @@ impl From<ethjson::spec::BasicAuthorityParams> for BasicAuthorityParams {
 	}
 }
 
-struct ChainVerifier(SimpleList);
+struct EpochVerifier {
+	epoch_number: U256,
+	list: SimpleList,
+}
 
-impl super::ChainVerifier for ChainVerifier {
+impl super::EpochVerifier for EpochVerifier {
+	fn epoch_number(&self) -> U256 { self.epoch_number.clone() }
 	fn verify_light(&self, header: &Header) -> Result<(), Error> {
-		verify_external(header, &self.0)
+		verify_external(header, &self.list)
 	}
 }
 
@@ -181,22 +185,25 @@ impl Engine for BasicAuthority {
 	}
 
 	// the proofs we need just allow us to get the full validator set.
-	fn prove_with_caller(&self, header: &Header, caller: &Call) -> Result<Bytes, Error> {
-		self.validators.generate_proof(header, caller)
+	fn epoch_proof(&self, header: &Header, caller: &Call) -> Result<Bytes, Error> {
+		self.validators.epoch_proof(header, caller)
 			.map_err(|e| EngineError::InsufficientProof(e).into())
 	}
 
-	fn proof_required(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
-		-> RequiresProof
+	fn is_epoch_end(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
+		-> EpochChange
 	{
-		self.validators.proof_required(header, block, receipts)
+		self.validators.is_epoch_end(header, block, receipts)
 	}
 
-	fn chain_verifier(&self, header: &Header, proof: Bytes) -> Result<Box<super::ChainVerifier>, Error> {
+	fn epoch_verifier(&self, header: &Header, proof: &[u8]) -> Result<Box<super::EpochVerifier>, Error> {
 		// extract a simple list from the proof.
-		let simple_list = self.validators.chain_verifier(header, proof)?;
+		let (num, simple_list) = self.validators.epoch_set(header, proof)?;
 
-		Ok(Box::new(ChainVerifier(simple_list)))
+		Ok(Box::new(EpochVerifier {
+			epoch_number: num,
+			list: simple_list,
+		}))
 	}
 
 	fn register_client(&self, client: Weak<Client>) {
diff --git a/ethcore/src/engines/chain_verifier.rs b/ethcore/src/engines/epoch_verifier.rs
similarity index 75%
rename from ethcore/src/engines/chain_verifier.rs
rename to ethcore/src/engines/epoch_verifier.rs
index 399832fe9..fd0847e76 100644
--- a/ethcore/src/engines/chain_verifier.rs
+++ b/ethcore/src/engines/epoch_verifier.rs
@@ -14,18 +14,21 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-// Chain verifiers.
+// Epoch verifiers.
 
 use error::Error;
 use header::Header;
+use util::U256;
 
-/// Sequential chain verifier.
+/// Verifier for all blocks within an epoch without accessing
 ///
 /// See docs on `Engine` relating to proving functions for more details.
-/// Headers here will have already passed "basic" verification.
-pub trait ChainVerifier {
+pub trait EpochVerifier: Sync {
+	/// Get the epoch number.
+	fn epoch_number(&self) -> U256;
+
 	/// Lightly verify the next block header.
-	/// This may not be a header that requires a proof.
+	/// This may not be a header belonging to a different epoch.
 	fn verify_light(&self, header: &Header) -> Result<(), Error>;
 
 	/// Perform potentially heavier checks on the next block header.
@@ -34,9 +37,10 @@ pub trait ChainVerifier {
 	}
 }
 
-/// No-op chain verifier.
+/// Special "no-op" verifier for stateless, epoch-less engines.
 pub struct NoOp;
 
-impl ChainVerifier for NoOp {
+impl EpochVerifier for NoOp {
+	fn epoch_number(&self) -> U256 { 0.into() }
 	fn verify_light(&self, _header: &Header) -> Result<(), Error> { Ok(()) }
 }
diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
index 7d4906dd2..b67afdf2f 100644
--- a/ethcore/src/engines/mod.rs
+++ b/ethcore/src/engines/mod.rs
@@ -18,7 +18,7 @@
 
 mod authority_round;
 mod basic_authority;
-mod chain_verifier;
+mod epoch_verifier;
 mod instant_seal;
 mod null_engine;
 mod signer;
@@ -29,7 +29,7 @@ mod vote_collector;
 
 pub use self::authority_round::AuthorityRound;
 pub use self::basic_authority::BasicAuthority;
-pub use self::chain_verifier::ChainVerifier;
+pub use self::epoch_verifier::EpochVerifier;
 pub use self::instant_seal::InstantSeal;
 pub use self::null_engine::NullEngine;
 pub use self::tendermint::Tendermint;
@@ -98,18 +98,19 @@ pub enum Seal {
 /// Type alias for a function we can make calls through synchronously.
 pub type Call = Fn(Address, Bytes) -> Result<Bytes, String>;
 
-/// Results of a query of whether a validation proof is necessary at a block.
-pub enum RequiresProof {
+/// Results of a query of whether an epoch change occurred at the given block.
+#[derive(Debug, Clone, PartialEq)]
+pub enum EpochChange {
 	/// Cannot determine until more data is passed.
 	Unsure(Unsure),
-	/// Validation proof not required.
+	/// No epoch change.
 	No,
 	/// Validation proof required, and the expected output
-	/// if it can be recovered.
-	Yes(Option<Bytes>),
+	Yes(Bytes),
 }
 
-/// More data required to determine if a validation proof is required.
+/// More data required to determine if an epoch change occurred at a given block.
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub enum Unsure {
 	/// Needs the body.
 	NeedsBody,
@@ -219,37 +220,38 @@ pub trait Engine : Sync + Send {
 		self.verify_block_basic(header, None).and_then(|_| self.verify_block_unordered(header, None))
 	}
 
-	/// Generate validation proof.
+	/// Generate epoch change proof.
 	///
-	/// This will be used to generate proofs of validation as well as verify them.
+	/// This will be used to generate proofs of epoch change as well as verify them.
 	/// Must be called on blocks that have already passed basic verification.
 	///
-	/// Return the "validation proof" generated.
-	/// This must be usable to generate a `ChainVerifier` for verifying all blocks
+	/// Return the "epoch proof" generated.
+	/// This must be usable to generate a `EpochVerifier` for verifying all blocks
 	/// from the supplied header up to the next one where proof is required.
 	///
 	/// For example, for PoA chains the proof will be a validator set,
-	/// and the corresponding `ChainVerifier` can be used to correctly validate
+	/// and the corresponding `EpochVerifier` can be used to correctly validate
 	/// all blocks produced under that `ValidatorSet`
-	fn prove_with_caller(&self, _header: &Header, _caller: &Call)
+	fn epoch_proof(&self, _header: &Header, _caller: &Call)
 		-> Result<Vec<u8>, Error>
 	{
 		Ok(Vec::new())
 	}
 
-	/// Whether a proof is required for the given header.
-	fn proof_required(&self, _header: &Header, _block: Option<&[u8]>, _receipts: Option<&[Receipt]>)
-		-> RequiresProof
+	/// Whether an epoch change occurred at the given header.
+	/// Should not interact with state.
+	fn is_epoch_end(&self, _header: &Header, _block: Option<&[u8]>, _receipts: Option<&[Receipt]>)
+		-> EpochChange
 	{
-		RequiresProof::No
+		EpochChange::No
 	}
 
-	/// Create a subchain verifier from validation proof.
+	/// Create an epoch verifier from validation proof.
 	///
-	/// The proof should be one generated by `prove_with_caller`.
-	/// See docs of `prove_with_caller` for description.
-	fn chain_verifier(&self, _header: &Header, _proof: Bytes) -> Result<Box<ChainVerifier>, Error> {
-		Ok(Box::new(self::chain_verifier::NoOp))
+	/// The proof should be one generated by `epoch_proof`.
+	/// See docs of `epoch_proof` for description.
+	fn epoch_verifier(&self, _header: &Header, _proof: &[u8]) -> Result<Box<EpochVerifier>, Error> {
+		Ok(Box::new(self::epoch_verifier::NoOp))
 	}
 
 	/// Populate a header's fields based on its parent's header.
diff --git a/ethcore/src/engines/validator_set/contract.rs b/ethcore/src/engines/validator_set/contract.rs
index db6e8ed2c..0fdef84a3 100644
--- a/ethcore/src/engines/validator_set/contract.rs
+++ b/ethcore/src/engines/validator_set/contract.rs
@@ -66,18 +66,18 @@ impl ValidatorSet for ValidatorContract {
 		self.validators.default_caller(id)
 	}
 
-	fn proof_required(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
-		-> ::engines::RequiresProof
+	fn is_epoch_end(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
+		-> ::engines::EpochChange
 	{
-		self.validators.proof_required(header, block, receipts)
+		self.validators.is_epoch_end(header, block, receipts)
 	}
 
-	fn generate_proof(&self, header: &Header, caller: &Call) -> Result<Vec<u8>, String> {
-		self.validators.generate_proof(header, caller)
+	fn epoch_proof(&self, header: &Header, caller: &Call) -> Result<Vec<u8>, String> {
+		self.validators.epoch_proof(header, caller)
 	}
 
-	fn chain_verifier(&self, header: &Header, proof: Vec<u8>) -> Result<super::SimpleList, ::error::Error> {
-		self.validators.chain_verifier(header, proof)
+	fn epoch_set(&self, header: &Header, proof: &[u8]) -> Result<(U256, super::SimpleList), ::error::Error> {
+		self.validators.epoch_set(header, proof)
 	}
 
 	fn contains_with_caller(&self, bh: &H256, address: &Address, caller: &Call) -> bool {
diff --git a/ethcore/src/engines/validator_set/mod.rs b/ethcore/src/engines/validator_set/mod.rs
index 48269e20f..e9dc333c5 100644
--- a/ethcore/src/engines/validator_set/mod.rs
+++ b/ethcore/src/engines/validator_set/mod.rs
@@ -23,7 +23,7 @@ mod multi;
 
 use std::sync::Weak;
 use ids::BlockId;
-use util::{Address, H256};
+use util::{Address, H256, U256};
 use ethjson::spec::ValidatorSet as ValidatorSpec;
 use client::Client;
 use header::Header;
@@ -72,26 +72,32 @@ pub trait ValidatorSet: Send + Sync {
 		self.count_with_caller(parent, &*default)
 	}
 
-	/// Whether a validation proof is required at the given block.
+	/// Whether this block is the last one in its epoch.
 	/// Usually indicates that the validator set changed at the given block.
 	///
 	/// Should not inspect state! This is used in situations where
 	/// state is not generally available.
 	///
-	/// Return `Ok` with a flag indicating whether it changed at the given header,
+	/// Return `Yes` or `No` indicating whether it changed at the given header,
 	/// or `Unsure` indicating a need for more information.
 	///
-	/// This may or may not be called in a loop.
-	fn proof_required(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
-		-> super::RequiresProof;
+	/// If block or receipts are provided, do not return `Unsure` indicating
+	/// need for them.
+	fn is_epoch_end(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
+		-> super::EpochChange;
 
-	/// Generate a validation proof at the given header.
+	/// Generate epoch proof.
 	/// Must interact with state only through the given caller!
 	/// Otherwise, generated proofs may be wrong.
-	fn generate_proof(&self, header: &Header, caller: &Call) -> Result<Vec<u8>, String>;
+	fn epoch_proof(&self, header: &Header, caller: &Call) -> Result<Vec<u8>, String>;
 
-	/// Create a fully self-contained validator set from the given proof.
-	fn chain_verifier(&self, header: &Header, proof: Vec<u8>) -> Result<SimpleList, ::error::Error>;
+	/// Recover the validator set for all
+	///
+	/// May fail if the given header doesn't kick off an epoch or
+	/// the proof is invalid.
+	///
+	/// Returns the epoch number and proof.
+	fn epoch_set(&self, header: &Header, proof: &[u8]) -> Result<(U256, SimpleList), ::error::Error>;
 
 	/// Checks if a given address is a validator, with the given function
 	/// for executing synchronous calls to contracts.
diff --git a/ethcore/src/engines/validator_set/multi.rs b/ethcore/src/engines/validator_set/multi.rs
index b7a13c5e3..eecf88432 100644
--- a/ethcore/src/engines/validator_set/multi.rs
+++ b/ethcore/src/engines/validator_set/multi.rs
@@ -18,8 +18,8 @@
 
 use std::collections::BTreeMap;
 use std::sync::Weak;
-use engines::{Call, RequiresProof};
-use util::{H256, Address, RwLock};
+use engines::{Call, EpochChange};
+use util::{H256, Address, RwLock, U256};
 use ids::BlockId;
 use header::{BlockNumber, Header};
 use client::{Client, BlockChainClient};
@@ -43,9 +43,7 @@ impl Multi {
 
 	fn correct_set(&self, id: BlockId) -> Option<&ValidatorSet> {
 		match self.block_number.read()(id).map(|parent_block| self.correct_set_by_number(parent_block)) {
-			Ok(set) => {
-				Some(set)
-			},
+			Ok((_, set)) => Some(set),
 			Err(e) => {
 				debug!(target: "engine", "ValidatorSet could not be recovered: {}", e);
 				None
@@ -53,7 +51,9 @@ impl Multi {
 		}
 	}
 
-	fn correct_set_by_number(&self, parent_block: BlockNumber) -> &ValidatorSet {
+	// get correct set by block number, along with block number at which
+	// this set was activated.
+	fn correct_set_by_number(&self, parent_block: BlockNumber) -> (BlockNumber, &ValidatorSet) {
 		let (block, set) = self.sets.iter()
 			.rev()
 			.find(|&(block, _)| *block <= parent_block + 1)
@@ -62,7 +62,7 @@ impl Multi {
 					 qed");
 
 		trace!(target: "engine", "Multi ValidatorSet retrieved for block {}.", block);
-		&**set
+		(*block, &**set)
 	}
 }
 
@@ -72,18 +72,22 @@ impl ValidatorSet for Multi {
 			.unwrap_or(Box::new(|_, _| Err("No validator set for given ID.".into())))
 	}
 
-	fn proof_required(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
-		-> RequiresProof
+	fn is_epoch_end(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
+		-> EpochChange
 	{
-		self.correct_set_by_number(header.number()).proof_required(header, block, receipts)
+		self.correct_set_by_number(header.number()).1.is_epoch_end(header, block, receipts)
 	}
 
-	fn generate_proof(&self, header: &Header, caller: &Call) -> Result<Vec<u8>, String> {
-		self.correct_set_by_number(header.number()).generate_proof(header, caller)
+	fn epoch_proof(&self, header: &Header, caller: &Call) -> Result<Vec<u8>, String> {
+		self.correct_set_by_number(header.number()).1.epoch_proof(header, caller)
 	}
 
-	fn chain_verifier(&self, header: &Header, proof: Vec<u8>) -> Result<super::SimpleList, ::error::Error> {
-		self.correct_set_by_number(header.number()).chain_verifier(header, proof)
+	fn epoch_set(&self, header: &Header, proof: &[u8]) -> Result<(U256, super::SimpleList), ::error::Error> {
+		// "multi" epoch is the inner set's epoch plus the transition block to that set.
+		// ensures epoch increases monotonically.
+		let (set_block, set) = self.correct_set_by_number(header.number());
+		let (inner_epoch, list) = set.epoch_set(header, proof)?;
+		Ok((U256::from(set_block) + inner_epoch, list))
 	}
 
 	fn contains_with_caller(&self, bh: &H256, address: &Address, caller: &Call) -> bool {
diff --git a/ethcore/src/engines/validator_set/safe_contract.rs b/ethcore/src/engines/validator_set/safe_contract.rs
index 2af389484..3284ec5ab 100644
--- a/ethcore/src/engines/validator_set/safe_contract.rs
+++ b/ethcore/src/engines/validator_set/safe_contract.rs
@@ -126,16 +126,16 @@ impl ValidatorSet for ValidatorSafeContract {
 			.and_then(|c| c.call_contract(id, addr, data)))
 	}
 
-	fn proof_required(&self, header: &Header, _block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
-		-> ::engines::RequiresProof
+	fn is_epoch_end(&self, header: &Header, _block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
+		-> ::engines::EpochChange
 	{
 		let bloom = self.expected_bloom(header);
 		let header_bloom = header.log_bloom();
 
-		if &bloom & header_bloom != bloom { return ::engines::RequiresProof::No }
+		if &bloom & header_bloom != bloom { return ::engines::EpochChange::No }
 
 		match receipts {
-			None => ::engines::RequiresProof::Unsure(::engines::Unsure::NeedsReceipts),
+			None => ::engines::EpochChange::Unsure(::engines::Unsure::NeedsReceipts),
 			Some(receipts) => {
 				let check_log = |log: &LogEntry| {
 					log.address == self.address &&
@@ -149,7 +149,11 @@ impl ValidatorSet for ValidatorSafeContract {
 					.event("ValidatorsChanged".into())
 					.expect("Contract known ahead of time to have `ValidatorsChanged` event; qed");
 
+				// iterate in reverse because only the _last_ change in a given
+				// block actually has any effect.
+				// the contract should only increment the nonce once.
 				let mut decoded_events = receipts.iter()
+					.rev()
 					.filter(|r| &bloom & &r.log_bloom == bloom)
 					.flat_map(|r| r.logs.iter())
 					.filter(move |l| check_log(l))
@@ -164,7 +168,7 @@ impl ValidatorSet for ValidatorSafeContract {
 
 				// TODO: are multiple transitions per block possible?
 				match decoded_events.next() {
-					None => ::engines::RequiresProof::No,
+					None => ::engines::EpochChange::No,
 					Some(matched_event) => {
 						// decode log manually until the native contract generator is
 						// good enough to do it for us.
@@ -181,10 +185,10 @@ impl ValidatorSet for ValidatorSafeContract {
 
 						match (nonce, validators) {
 							(Some(nonce), Some(validators)) =>
-								::engines::RequiresProof::Yes(Some(encode_proof(nonce, &validators))),
+								::engines::EpochChange::Yes(encode_proof(nonce, &validators)),
 							_ => {
 								debug!(target: "engine", "Successfully decoded log turned out to be bad.");
-								::engines::RequiresProof::No
+								::engines::EpochChange::No
 							}
 						}
 					}
@@ -195,20 +199,21 @@ impl ValidatorSet for ValidatorSafeContract {
 
 	// the proof we generate is an RLP list containing two parts.
 	//   (nonce, validators)
-	fn generate_proof(&self, _header: &Header, caller: &Call) -> Result<Vec<u8>, String> {
+	fn epoch_proof(&self, _header: &Header, caller: &Call) -> Result<Vec<u8>, String> {
 		match (self.get_nonce(caller), self.get_list(caller)) {
 			(Some(nonce), Some(list)) => Ok(encode_proof(nonce, &list.into_inner())),
 			_ => Err("Caller insufficient to generate validator proof.".into()),
 		}
 	}
 
-	fn chain_verifier(&self, _header: &Header, proof: Vec<u8>) -> Result<SimpleList, ::error::Error> {
+	fn epoch_set(&self, _header: &Header, proof: &[u8]) -> Result<(U256, SimpleList), ::error::Error> {
 		use rlp::UntrustedRlp;
 
-		let rlp = UntrustedRlp::new(&proof);
+		let rlp = UntrustedRlp::new(proof);
+		let nonce: U256 = rlp.val_at(0)?;
 		let validators: Vec<Address> = rlp.list_at(1)?;
 
-		Ok(SimpleList::new(validators))
+		Ok((nonce, SimpleList::new(validators)))
 	}
 
 	fn contains_with_caller(&self, block_hash: &H256, address: &Address, caller: &Call) -> bool {
diff --git a/ethcore/src/engines/validator_set/simple_list.rs b/ethcore/src/engines/validator_set/simple_list.rs
index 339585d7d..59209fac0 100644
--- a/ethcore/src/engines/validator_set/simple_list.rs
+++ b/ethcore/src/engines/validator_set/simple_list.rs
@@ -16,7 +16,7 @@
 
 /// Preconfigured validator list.
 
-use util::{H256, Address, HeapSizeOf};
+use util::{H256, Address, HeapSizeOf, U256};
 
 use engines::Call;
 use header::Header;
@@ -53,18 +53,18 @@ impl ValidatorSet for SimpleList {
 		Box::new(|_, _| Err("Simple list doesn't require calls.".into()))
 	}
 
-	fn proof_required(&self, _header: &Header, _block: Option<&[u8]>, _receipts: Option<&[::receipt::Receipt]>)
-		-> ::engines::RequiresProof
+	fn is_epoch_end(&self, _header: &Header, _block: Option<&[u8]>, _receipts: Option<&[::receipt::Receipt]>)
+		-> ::engines::EpochChange
 	{
-		::engines::RequiresProof::No
+		::engines::EpochChange::No
 	}
 
-	fn generate_proof(&self, _header: &Header, _caller: &Call) -> Result<Vec<u8>, String> {
+	fn epoch_proof(&self, _header: &Header, _caller: &Call) -> Result<Vec<u8>, String> {
 		Ok(Vec::new())
 	}
 
-	fn chain_verifier(&self, _header: &Header, _: Vec<u8>) -> Result<SimpleList, ::error::Error> {
-		Ok(self.clone())
+	fn epoch_set(&self, _header: &Header, _: &[u8]) -> Result<(U256, SimpleList), ::error::Error> {
+		Ok((0.into(), self.clone()))
 	}
 
 	fn contains_with_caller(&self, _bh: &H256, address: &Address, _: &Call) -> bool {
diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs
index 585fd29aa..867d4f775 100644
--- a/ethcore/src/ethereum/ethash.rs
+++ b/ethcore/src/ethereum/ethash.rs
@@ -149,7 +149,16 @@ impl Ethash {
 	}
 }
 
-impl ::engines::ChainVerifier for Arc<Ethash> {
+// TODO [rphmeier]
+//
+// for now, this is different than Ethash's own epochs, and signal
+// "consensus epochs".
+// in this sense, `Ethash` is epochless: the same `EpochVerifier` can be used
+// for any block in the chain.
+// in the future, we might move the Ethash epoch
+// caching onto this mechanism as well.
+impl ::engines::EpochVerifier for Arc<Ethash> {
+	fn epoch_number(&self) -> U256 { 0.into() }
 	fn verify_light(&self, _header: &Header) -> Result<(), Error> { Ok(()) }
 	fn verify_heavy(&self, header: &Header) -> Result<(), Error> {
 		self.verify_block_unordered(header, None)
@@ -393,7 +402,7 @@ impl Engine for Arc<Ethash> {
 		Ok(())
 	}
 
-	fn chain_verifier(&self, _header: &Header, _proof: Vec<u8>) -> Result<Box<::engines::ChainVerifier>, Error> {
+	fn epoch_verifier(&self, _header: &Header, _proof: &[u8]) -> Result<Box<::engines::EpochVerifier>, Error> {
 		Ok(Box::new(self.clone()))
 	}
 }

From 0180b21dd17ce9caf921d6fb87aab314447a58f2 Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@parity.io>
Date: Tue, 18 Apr 2017 14:55:25 +0200
Subject: [PATCH 023/117] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f668f3218..c74b51a58 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Be sure to check out [our wiki][wiki-url] for more information.
 Parity's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing Parity using the sophisticated and
 cutting-edge Rust programming language. Parity is licensed under the GPLv3, and can be used for all your Ethereum needs.
 
-Parity comes with a built-in wallet. To access [Parity Wallet](http://127.0.0.1:8080/) simply go to http://127.0.0.1:8080/. It
+Parity comes with a built-in wallet. To access [Parity Wallet](http://web3.site/) simply go to http://web3.site/ (if you don't have access to the internet, but still want to use the service, you can also use http://127.0.0.1:8180/). It
 includes various functionality allowing you to:
 - create and manage your Ethereum accounts;
 - manage your Ether and any Ethereum tokens;

From 6da6c755a5c862e3110552c2c22206161ff271a0 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Tue, 18 Apr 2017 15:45:15 +0200
Subject: [PATCH 024/117] iterate DB by prefix

---
 util/src/kvdb.rs          | 73 +++++++++++++++++++++++++++++----------
 util/src/migration/mod.rs |  7 +++-
 2 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/util/src/kvdb.rs b/util/src/kvdb.rs
index 5d4c02152..056b49c65 100644
--- a/util/src/kvdb.rs
+++ b/util/src/kvdb.rs
@@ -167,6 +167,10 @@ pub trait KeyValueDB: Sync + Send {
 	/// Iterate over flushed data for a given column.
 	fn iter<'a>(&'a self, col: Option<u32>) -> Box<Iterator<Item=(Box<[u8]>, Box<[u8]>)> + 'a>;
 
+	/// Iterate over flushed data for a given column, starting from a given prefix.
+	fn iter_from_prefix<'a>(&'a self, col: Option<u32>, prefix: &'a [u8])
+		-> Box<Iterator<Item=(Box<[u8]>, Box<[u8]>)> + 'a>;
+
 	/// Attempt to replace this database with a new one located at the given path.
 	fn restore(&self, new_db: &str) -> Result<(), UtilError>;
 }
@@ -247,7 +251,21 @@ impl KeyValueDB for InMemory {
 					.into_iter()
 					.map(|(k, v)| (k.into_boxed_slice(), v.to_vec().into_boxed_slice()))
 			),
-			None => Box::new(None.into_iter())
+			None => Box::new(None.into_iter()),
+		}
+	}
+
+	fn iter_from_prefix<'a>(&'a self, col: Option<u32>, prefix: &'a [u8])
+		-> Box<Iterator<Item=(Box<[u8]>, Box<[u8]>)> + 'a>
+	{
+		match self.columns.read().get(&col) {
+			Some(map) => Box::new(
+				map.clone()
+					.into_iter()
+					.skip_while(move |&(ref k, _)| !k.starts_with(prefix))
+					.map(|(k, v)| (k.into_boxed_slice(), v.to_vec().into_boxed_slice()))
+			),
+			None => Box::new(None.into_iter()),
 		}
 	}
 
@@ -691,23 +709,17 @@ impl Database {
 	/// Get value by partial key. Prefix size should match configured prefix size. Only searches flushed values.
 	// TODO: support prefix seek for unflushed data
 	pub fn get_by_prefix(&self, col: Option<u32>, prefix: &[u8]) -> Option<Box<[u8]>> {
-		match *self.db.read() {
-			Some(DBAndColumns { ref db, ref cfs }) => {
-				let mut iter = col.map_or_else(|| db.iterator_opt(IteratorMode::From(prefix, Direction::Forward), &self.read_opts),
-					|c| db.iterator_cf_opt(cfs[c as usize], IteratorMode::From(prefix, Direction::Forward), &self.read_opts)
-						.expect("iterator params are valid; qed"));
-				match iter.next() {
-					// TODO: use prefix_same_as_start read option (not availabele in C API currently)
-					Some((k, v)) => if k[0 .. prefix.len()] == prefix[..] { Some(v) } else { None },
-					_ => None
-				}
-			},
-			None => None,
-		}
+		self.iter_from_prefix(col, prefix).and_then(|mut iter| {
+			match iter.next() {
+				// TODO: use prefix_same_as_start read option (not availabele in C API currently)
+				Some((k, v)) => if k[0 .. prefix.len()] == prefix[..] { Some(v) } else { None },
+				_ => None
+			}
+		})
 	}
 
 	/// Get database iterator for flushed data.
-	pub fn iter(&self, col: Option<u32>) -> DatabaseIterator {
+	pub fn iter(&self, col: Option<u32>) -> Option<DatabaseIterator> {
 		//TODO: iterate over overlay
 		match *self.db.read() {
 			Some(DBAndColumns { ref db, ref cfs }) => {
@@ -717,12 +729,28 @@ impl Database {
 						.expect("iterator params are valid; qed")
 				);
 
-				DatabaseIterator {
+				Some(DatabaseIterator {
 					iter: iter,
 					_marker: PhantomData,
-				}
+				})
 			},
-			None => panic!("Not supported yet") //TODO: return an empty iterator or change return type
+			None => None,
+		}
+	}
+
+	fn iter_from_prefix(&self, col: Option<u32>, prefix: &[u8]) -> Option<DatabaseIterator> {
+		match *self.db.read() {
+			Some(DBAndColumns { ref db, ref cfs }) => {
+				let iter = col.map_or_else(|| db.iterator_opt(IteratorMode::From(prefix, Direction::Forward), &self.read_opts),
+					|c| db.iterator_cf_opt(cfs[c as usize], IteratorMode::From(prefix, Direction::Forward), &self.read_opts)
+						.expect("iterator params are valid; qed"));
+
+				Some(DatabaseIterator {
+					iter: iter,
+					_marker: PhantomData,
+				})
+			},
+			None => None,
 		}
 	}
 
@@ -836,7 +864,14 @@ impl KeyValueDB for Database {
 
 	fn iter<'a>(&'a self, col: Option<u32>) -> Box<Iterator<Item=(Box<[u8]>, Box<[u8]>)> + 'a> {
 		let unboxed = Database::iter(self, col);
-		Box::new(unboxed)
+		Box::new(unboxed.into_iter().flat_map(|inner| inner))
+	}
+
+	fn iter_from_prefix<'a>(&'a self, col: Option<u32>, prefix: &'a [u8])
+		-> Box<Iterator<Item=(Box<[u8]>, Box<[u8]>)> + 'a>
+	{
+		let unboxed = Database::iter_from_prefix(self, col, prefix);
+		Box::new(unboxed.into_iter().flat_map(|inner| inner))
 	}
 
 	fn restore(&self, new_db: &str) -> Result<(), UtilError> {
diff --git a/util/src/migration/mod.rs b/util/src/migration/mod.rs
index 6ec465517..93a98f1dc 100644
--- a/util/src/migration/mod.rs
+++ b/util/src/migration/mod.rs
@@ -157,7 +157,12 @@ impl<T: SimpleMigration> Migration for T {
 	fn migrate(&mut self, source: Arc<Database>, config: &Config, dest: &mut Database, col: Option<u32>) -> Result<(), Error> {
 		let mut batch = Batch::new(config, col);
 
-		for (key, value) in source.iter(col) {
+		let iter = match source.iter(col) {
+			Some(iter) => iter,
+			None => return Ok(()),
+		};
+
+		for (key, value) in iter {
 			if let Some((key, value)) = self.simple_migrate(key.to_vec(), value.to_vec()) {
 				batch.insert(key, value, dest)?;
 			}

From b50fb71dd1d29dfde2a6c7e1830447cf30896c31 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Wed, 19 Apr 2017 14:30:00 +0200
Subject: [PATCH 025/117] EIP-86 (#4697)

* EIP-86

* Disable EIP-86 auto activation for now
---
 ethcore/light/src/client/mod.rs               |   7 ++
 ethcore/res/ethereum/classic.json             |   3 +-
 ethcore/res/ethereum/eip150_test.json         |   3 +-
 ethcore/res/ethereum/eip161_test.json         |   3 +-
 ethcore/res/ethereum/expanse.json             |   3 +-
 ethcore/res/ethereum/foundation.json          |   3 +-
 ethcore/res/ethereum/frontier_like_test.json  |   3 +-
 ethcore/res/ethereum/frontier_test.json       |   3 +-
 ethcore/res/ethereum/homestead_test.json      |   3 +-
 ethcore/res/ethereum/morden.json              |   3 +-
 ethcore/res/ethereum/olympic.json             |   3 +-
 ethcore/res/ethereum/ropsten.json             |   3 +-
 ethcore/res/ethereum/tests                    |   2 +-
 ethcore/res/ethereum/transition_test.json     |   5 +-
 ethcore/res/null.json                         |   3 +-
 ethcore/src/client/client.rs                  |  21 ++--
 ethcore/src/client/test_client.rs             |   4 +-
 ethcore/src/client/traits.rs                  |   3 +
 ethcore/src/engines/authority_round.rs        |  19 +--
 ethcore/src/engines/basic_authority.rs        |  17 +--
 ethcore/src/engines/instant_seal.rs           |   7 +-
 ethcore/src/engines/mod.rs                    |  17 +--
 ethcore/src/engines/null_engine.rs            |   4 +-
 ethcore/src/engines/tendermint/mod.rs         |  19 +--
 .../engines/validator_set/safe_contract.rs    |   7 +-
 ethcore/src/ethereum/ethash.rs                |  53 +++-----
 ethcore/src/evm/ext.rs                        |  13 +-
 ethcore/src/evm/instructions.rs               |   3 +
 ethcore/src/evm/interpreter/gasometer.rs      |   2 +-
 ethcore/src/evm/interpreter/mod.rs            |  12 +-
 ethcore/src/evm/mod.rs                        |   2 +-
 ethcore/src/evm/schedule.rs                   |  16 ++-
 ethcore/src/evm/tests.rs                      |   4 +-
 ethcore/src/executive.rs                      |  77 ++++++++----
 ethcore/src/externalities.rs                  |  20 +--
 ethcore/src/json_tests/executive.rs           |  15 ++-
 ethcore/src/json_tests/state.rs               |  19 ++-
 ethcore/src/json_tests/transaction.rs         |  24 ++--
 ethcore/src/lib.rs                            |   1 +
 ethcore/src/miner/miner.rs                    |  15 ++-
 ethcore/src/spec/spec.rs                      |   5 +
 ethcore/src/state/mod.rs                      |   2 +-
 ethcore/src/tests/client.rs                   |   2 +-
 ethcore/src/tests/helpers.rs                  |   5 +-
 ethcore/src/types/transaction.rs              | 116 +++++++++++++-----
 evmbin/src/ext.rs                             |   6 +-
 json/src/spec/params.rs                       |   3 +
 json/src/state/test.rs                        |   2 +-
 json/src/state/transaction.rs                 |   2 +-
 parity/rpc_apis.rs                            |   1 +
 rpc/src/v1/impls/eth.rs                       |   9 +-
 rpc/src/v1/impls/light/eth.rs                 |   7 +-
 rpc/src/v1/impls/light/parity.rs              |   9 +-
 rpc/src/v1/impls/parity.rs                    |  11 +-
 rpc/src/v1/impls/parity_set.rs                |   9 +-
 rpc/src/v1/tests/mocked/parity_set.rs         |   2 +-
 rpc/src/v1/tests/mocked/signing.rs            |   2 +-
 rpc/src/v1/types/transaction.rs               |  49 ++++----
 sync/src/tests/consensus.rs                   |  36 +++---
 59 files changed, 433 insertions(+), 289 deletions(-)

diff --git a/ethcore/light/src/client/mod.rs b/ethcore/light/src/client/mod.rs
index 6d241f7fd..7e6213273 100644
--- a/ethcore/light/src/client/mod.rs
+++ b/ethcore/light/src/client/mod.rs
@@ -106,6 +106,9 @@ pub trait LightChainClient: Send + Sync {
 
 	/// Get the `i`th CHT root.
 	fn cht_root(&self, i: usize) -> Option<H256>;
+
+	/// Get the EIP-86 transition block number.
+	fn eip86_transition(&self) -> u64;
 }
 
 /// Something which can be treated as a `LightChainClient`.
@@ -384,4 +387,8 @@ impl LightChainClient for Client {
 	fn cht_root(&self, i: usize) -> Option<H256> {
 		Client::cht_root(self, i)
 	}
+
+	fn eip86_transition(&self) -> u64 {
+		self.engine().params().eip86_transition
+	}
 }
diff --git a/ethcore/res/ethereum/classic.json b/ethcore/res/ethereum/classic.json
index f6d30c4d6..f7cb4daca 100644
--- a/ethcore/res/ethereum/classic.json
+++ b/ethcore/res/ethereum/classic.json
@@ -30,7 +30,8 @@
 		"chainID": "0x3d",
 		"forkBlock": "0x1d4c00",
 		"forkCanonHash": "0x94365e3a8c0b35089c1d1195081fe7489b528a84b22199c916180db8b28ade7f",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {
diff --git a/ethcore/res/ethereum/eip150_test.json b/ethcore/res/ethereum/eip150_test.json
index 8331c8fc2..3091ee27b 100644
--- a/ethcore/res/ethereum/eip150_test.json
+++ b/ethcore/res/ethereum/eip150_test.json
@@ -24,7 +24,8 @@
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
-		"eip98Transition": "0x7fffffffffffffff"
+		"eip98Transition": "0x7fffffffffffffff",
+		"eip86Transition": "0x7fffffffffffffff"
 	},
 	"genesis": {
 		"seal": {
diff --git a/ethcore/res/ethereum/eip161_test.json b/ethcore/res/ethereum/eip161_test.json
index 00885bae1..e6e8bf3bb 100644
--- a/ethcore/res/ethereum/eip161_test.json
+++ b/ethcore/res/ethereum/eip161_test.json
@@ -24,7 +24,8 @@
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
-		"eip98Transition": "0x7fffffffffffffff"
+		"eip98Transition": "0x7fffffffffffffff",
+		"eip86Transition": "0x7fffffffffffffff"
 	},
 	"genesis": {
 		"seal": {
diff --git a/ethcore/res/ethereum/expanse.json b/ethcore/res/ethereum/expanse.json
index 3ec04052b..b7d22ac3e 100644
--- a/ethcore/res/ethereum/expanse.json
+++ b/ethcore/res/ethereum/expanse.json
@@ -30,7 +30,8 @@
 		"networkID": "0x1",
 		"chainID": "0x2",
 		"subprotocolName": "exp",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {
diff --git a/ethcore/res/ethereum/foundation.json b/ethcore/res/ethereum/foundation.json
index 54f10b70c..8253987f3 100644
--- a/ethcore/res/ethereum/foundation.json
+++ b/ethcore/res/ethereum/foundation.json
@@ -147,7 +147,8 @@
 		"networkID" : "0x1",
 		"forkBlock": "0x1d4c00",
 		"forkCanonHash": "0x4985f5ca3d2afbec36529aa96f74de3cc10a2a4a6c44f2157a57d2c6059a11bb",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {
diff --git a/ethcore/res/ethereum/frontier_like_test.json b/ethcore/res/ethereum/frontier_like_test.json
index 7b73faa30..aab433033 100644
--- a/ethcore/res/ethereum/frontier_like_test.json
+++ b/ethcore/res/ethereum/frontier_like_test.json
@@ -143,7 +143,8 @@
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {
diff --git a/ethcore/res/ethereum/frontier_test.json b/ethcore/res/ethereum/frontier_test.json
index bf79729ba..6761c79f3 100644
--- a/ethcore/res/ethereum/frontier_test.json
+++ b/ethcore/res/ethereum/frontier_test.json
@@ -23,7 +23,8 @@
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {
diff --git a/ethcore/res/ethereum/homestead_test.json b/ethcore/res/ethereum/homestead_test.json
index 95bd85a94..25b061857 100644
--- a/ethcore/res/ethereum/homestead_test.json
+++ b/ethcore/res/ethereum/homestead_test.json
@@ -23,7 +23,8 @@
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {
diff --git a/ethcore/res/ethereum/morden.json b/ethcore/res/ethereum/morden.json
index 22f253bf8..495849daf 100644
--- a/ethcore/res/ethereum/morden.json
+++ b/ethcore/res/ethereum/morden.json
@@ -30,7 +30,8 @@
 		"chainID": "0x3e",
 		"forkBlock": "0x1b34d8",
 		"forkCanonHash": "0xf376243aeff1f256d970714c3de9fd78fa4e63cf63e32a51fe1169e375d98145",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {
diff --git a/ethcore/res/ethereum/olympic.json b/ethcore/res/ethereum/olympic.json
index baf1c7d05..3d2e7baf9 100644
--- a/ethcore/res/ethereum/olympic.json
+++ b/ethcore/res/ethereum/olympic.json
@@ -23,7 +23,8 @@
 		"maximumExtraDataSize": "0x0400",
 		"minGasLimit": "125000",
 		"networkID" : "0x0",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {
diff --git a/ethcore/res/ethereum/ropsten.json b/ethcore/res/ethereum/ropsten.json
index 539168279..1e350d636 100644
--- a/ethcore/res/ethereum/ropsten.json
+++ b/ethcore/res/ethereum/ropsten.json
@@ -27,7 +27,8 @@
 		"networkID" : "0x3",
 		"forkBlock": 641350,
 		"forkCanonHash": "0x8033403e9fe5811a7b6d6b469905915de1c59207ce2172cbcf5d6ff14fa6a2eb",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {
diff --git a/ethcore/res/ethereum/tests b/ethcore/res/ethereum/tests
index d52059307..ef191fdc6 160000
--- a/ethcore/res/ethereum/tests
+++ b/ethcore/res/ethereum/tests
@@ -1 +1 @@
-Subproject commit d520593078fa0849dcd1f907e44ed0a616892e33
+Subproject commit ef191fdc61cf76cdb9cdc147465fb447304b0ed2
diff --git a/ethcore/res/ethereum/transition_test.json b/ethcore/res/ethereum/transition_test.json
index 1b502f087..41251dc8c 100644
--- a/ethcore/res/ethereum/transition_test.json
+++ b/ethcore/res/ethereum/transition_test.json
@@ -139,11 +139,12 @@
 		}
 	},
 	"params": {
-		"eip98Transition": "0x7fffffffffffffff",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
-		"networkID" : "0x1"
+		"networkID" : "0x1",
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {
diff --git a/ethcore/res/null.json b/ethcore/res/null.json
index 3ec7ce75e..ffb0ea061 100644
--- a/ethcore/res/null.json
+++ b/ethcore/res/null.json
@@ -7,7 +7,8 @@
 		"accountStartNonce": "0x0",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
-		"networkID" : "0x2"
+		"networkID" : "0x2",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 2ad4fa8d6..e7755e4d0 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -960,7 +960,7 @@ impl BlockChainClient for Client {
 				return Err(err.into())
 			}
 		}
-		let lower = t.gas_required(&self.engine.schedule(&env_info)).into();
+		let lower = t.gas_required(&self.engine.schedule(env_info.number)).into();
 		if cond(lower)? {
 			trace!(target: "estimate_gas", "estimate_gas succeeded with {}", lower);
 			return Ok(lower)
@@ -1259,7 +1259,8 @@ impl BlockChainClient for Client {
 					.collect();
 				match (transaction, previous_receipts) {
 					(Some(transaction), Some(previous_receipts)) => {
-						Some(transaction_receipt(transaction, previous_receipts))
+						let schedule = self.engine().schedule(block_number);
+						Some(transaction_receipt(&schedule, transaction, previous_receipts))
 					},
 					_ => None,
 				}
@@ -1501,11 +1502,15 @@ impl BlockChainClient for Client {
 			})
 			.and_then(|a| if a.is_zero() { None } else { Some(a) })
 	}
+
+	fn eip86_transition(&self) -> u64 {
+		self.engine().params().eip86_transition
+	}
 }
 
 impl MiningBlockChainClient for Client {
 	fn latest_schedule(&self) -> Schedule {
-		self.engine.schedule(&self.latest_env_info())
+		self.engine.schedule(self.latest_env_info().number)
 	}
 
 	fn prepare_open_block(&self, author: Address, gas_range_target: (U256, U256), extra_data: Bytes) -> OpenBlock {
@@ -1655,7 +1660,7 @@ impl Drop for Client {
 
 /// Returns `LocalizedReceipt` given `LocalizedTransaction`
 /// and a vector of receipts from given block up to transaction index.
-fn transaction_receipt(mut tx: LocalizedTransaction, mut receipts: Vec<Receipt>) -> LocalizedReceipt {
+fn transaction_receipt(schedule: &Schedule, mut tx: LocalizedTransaction, mut receipts: Vec<Receipt>) -> LocalizedReceipt {
 	assert_eq!(receipts.len(), tx.transaction_index + 1, "All previous receipts are provided.");
 
 	let sender = tx.sender();
@@ -1674,12 +1679,12 @@ fn transaction_receipt(mut tx: LocalizedTransaction, mut receipts: Vec<Receipt>)
 		transaction_hash: transaction_hash,
 		transaction_index: transaction_index,
 		block_hash: block_hash,
-		block_number:block_number,
+		block_number: block_number,
 		cumulative_gas_used: receipt.gas_used,
 		gas_used: receipt.gas_used - prior_gas_used,
 		contract_address: match tx.action {
 			Action::Call(_) => None,
-			Action::Create => Some(contract_address(&sender, &tx.nonce))
+			Action::Create => Some(contract_address(schedule.create_address, &sender, &tx.nonce, &tx.data.sha3()))
 		},
 		logs: receipt.logs.into_iter().enumerate().map(|(i, log)| LocalizedLogEntry {
 			entry: log,
@@ -1734,6 +1739,7 @@ mod tests {
 	#[test]
 	fn should_return_correct_log_index() {
 		use super::transaction_receipt;
+		use evm::schedule::Schedule;
 		use ethkey::KeyPair;
 		use log_entry::{LogEntry, LocalizedLogEntry};
 		use receipt::{Receipt, LocalizedReceipt};
@@ -1743,6 +1749,7 @@ mod tests {
 		// given
 		let key = KeyPair::from_secret_slice(&"test".sha3()).unwrap();
 		let secret = key.secret();
+		let schedule = Schedule::new_homestead();
 
 		let block_number = 1;
 		let block_hash = 5.into();
@@ -1786,7 +1793,7 @@ mod tests {
 		}];
 
 		// when
-		let receipt = transaction_receipt(transaction, receipts);
+		let receipt = transaction_receipt(&schedule, transaction, receipts);
 
 		// then
 		assert_eq!(receipt, LocalizedReceipt {
diff --git a/ethcore/src/client/test_client.rs b/ethcore/src/client/test_client.rs
index 16f38203f..feda29107 100644
--- a/ethcore/src/client/test_client.rs
+++ b/ethcore/src/client/test_client.rs
@@ -353,7 +353,7 @@ pub fn get_temp_state_db() -> GuardedTempResult<StateDB> {
 
 impl MiningBlockChainClient for TestBlockChainClient {
 	fn latest_schedule(&self) -> Schedule {
-		Schedule::new_post_eip150(24576, true, true, true)
+		Schedule::new_post_eip150(24576, true, true, true, true)
 	}
 
 	fn prepare_open_block(&self, author: Address, gas_range_target: (U256, U256), extra_data: Bytes) -> OpenBlock {
@@ -756,6 +756,8 @@ impl BlockChainClient for TestBlockChainClient {
 	fn registrar_address(&self) -> Option<Address> { None }
 
 	fn registry_address(&self, _name: String) -> Option<Address> { None }
+
+	fn eip86_transition(&self) -> u64 { u64::max_value() }
 }
 
 impl ProvingBlockChainClient for TestBlockChainClient {
diff --git a/ethcore/src/client/traits.rs b/ethcore/src/client/traits.rs
index a612d8a77..8ccd022e2 100644
--- a/ethcore/src/client/traits.rs
+++ b/ethcore/src/client/traits.rs
@@ -272,6 +272,9 @@ pub trait BlockChainClient : Sync + Send {
 
 	/// Get the address of a particular blockchain service, if available.
 	fn registry_address(&self, name: String) -> Option<Address>;
+
+	/// Get the EIP-86 transition block number.
+	fn eip86_transition(&self) -> u64;
 }
 
 impl IpcConfig for BlockChainClient { }
diff --git a/ethcore/src/engines/authority_round.rs b/ethcore/src/engines/authority_round.rs
index 2e8e3932c..85c848d16 100644
--- a/ethcore/src/engines/authority_round.rs
+++ b/ethcore/src/engines/authority_round.rs
@@ -26,12 +26,11 @@ use account_provider::AccountProvider;
 use block::*;
 use spec::CommonParams;
 use engines::{Engine, Seal, EngineError};
-use header::Header;
+use header::{Header, BlockNumber};
 use error::{Error, TransactionError, BlockError};
 use evm::Schedule;
 use ethjson;
 use io::{IoContext, IoHandler, TimerToken, IoService};
-use env_info::EnvInfo;
 use builtin::Builtin;
 use transaction::UnverifiedTransaction;
 use client::{Client, EngineClient};
@@ -241,8 +240,9 @@ impl Engine for AuthorityRound {
 		]
 	}
 
-	fn schedule(&self, _env_info: &EnvInfo) -> Schedule {
-		Schedule::new_post_eip150(usize::max_value(), true, true, true)
+	fn schedule(&self, block_number: BlockNumber) -> Schedule {
+		let eip86 = block_number >= self.params.eip86_transition;
+		Schedule::new_post_eip150(usize::max_value(), true, true, true, eip86)
 	}
 
 	fn populate_from_parent(&self, header: &mut Header, parent: &Header, gas_floor_target: U256, _gas_ceil_target: U256) {
@@ -387,7 +387,6 @@ impl Engine for AuthorityRound {
 #[cfg(test)]
 mod tests {
 	use util::*;
-	use env_info::EnvInfo;
 	use header::Header;
 	use error::{Error, BlockError};
 	use ethkey::Secret;
@@ -408,15 +407,7 @@ mod tests {
 	#[test]
 	fn can_return_schedule() {
 		let engine = Spec::new_test_round().engine;
-		let schedule = engine.schedule(&EnvInfo {
-			number: 10000000,
-			author: 0.into(),
-			timestamp: 0,
-			difficulty: 0.into(),
-			last_hashes: Arc::new(vec![]),
-			gas_used: 0.into(),
-			gas_limit: 0.into(),
-		});
+		let schedule = engine.schedule(10000000);
 
 		assert!(schedule.stack_limit > 0);
 	}
diff --git a/ethcore/src/engines/basic_authority.rs b/ethcore/src/engines/basic_authority.rs
index 19867a648..43be5fe70 100644
--- a/ethcore/src/engines/basic_authority.rs
+++ b/ethcore/src/engines/basic_authority.rs
@@ -24,11 +24,10 @@ use block::*;
 use builtin::Builtin;
 use spec::CommonParams;
 use engines::{Engine, Seal};
-use env_info::EnvInfo;
 use error::{BlockError, Error};
 use evm::Schedule;
 use ethjson;
-use header::Header;
+use header::{Header, BlockNumber};
 use client::Client;
 use super::signer::EngineSigner;
 use super::validator_set::{ValidatorSet, new_validator_set};
@@ -86,7 +85,7 @@ impl Engine for BasicAuthority {
 	/// Additional engine-specific information for the user/developer concerning `header`.
 	fn extra_info(&self, _header: &Header) -> BTreeMap<String, String> { map!["signature".to_owned() => "TODO".to_owned()] }
 
-	fn schedule(&self, _env_info: &EnvInfo) -> Schedule {
+	fn schedule(&self, _block_number: BlockNumber) -> Schedule {
 		Schedule::new_homestead()
 	}
 
@@ -181,7 +180,6 @@ impl Engine for BasicAuthority {
 mod tests {
 	use util::*;
 	use block::*;
-	use env_info::EnvInfo;
 	use error::{BlockError, Error};
 	use tests::helpers::*;
 	use account_provider::AccountProvider;
@@ -206,16 +204,7 @@ mod tests {
 	#[test]
 	fn can_return_schedule() {
 		let engine = new_test_authority().engine;
-		let schedule = engine.schedule(&EnvInfo {
-			number: 10000000,
-			author: 0.into(),
-			timestamp: 0,
-			difficulty: 0.into(),
-			last_hashes: Arc::new(vec![]),
-			gas_used: 0.into(),
-			gas_limit: 0.into(),
-		});
-
+		let schedule = engine.schedule(10000000);
 		assert!(schedule.stack_limit > 0);
 	}
 
diff --git a/ethcore/src/engines/instant_seal.rs b/ethcore/src/engines/instant_seal.rs
index 88672c6f4..702afde4f 100644
--- a/ethcore/src/engines/instant_seal.rs
+++ b/ethcore/src/engines/instant_seal.rs
@@ -18,10 +18,10 @@ use std::collections::BTreeMap;
 use util::{Address, HashMap};
 use builtin::Builtin;
 use engines::{Engine, Seal};
-use env_info::EnvInfo;
 use spec::CommonParams;
 use evm::Schedule;
 use block::ExecutedBlock;
+use header::BlockNumber;
 
 /// An engine which does not provide any consensus mechanism, just seals blocks internally.
 pub struct InstantSeal {
@@ -58,8 +58,9 @@ impl Engine for InstantSeal {
 		&self.builtins
 	}
 
-	fn schedule(&self, _env_info: &EnvInfo) -> Schedule {
-		Schedule::new_post_eip150(usize::max_value(), true, true, true)
+	fn schedule(&self, block_number: BlockNumber) -> Schedule {
+		let eip86 = block_number >= self.params.eip86_transition;
+		Schedule::new_post_eip150(usize::max_value(), true, true, true, eip86)
 	}
 
 	fn seals_internally(&self) -> Option<bool> { Some(true) }
diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
index 438b9bda0..4de76f079 100644
--- a/ethcore/src/engines/mod.rs
+++ b/ethcore/src/engines/mod.rs
@@ -39,10 +39,10 @@ use account_provider::AccountProvider;
 use block::ExecutedBlock;
 use builtin::Builtin;
 use env_info::EnvInfo;
-use error::{Error, TransactionError};
+use error::Error;
 use spec::CommonParams;
 use evm::Schedule;
-use header::Header;
+use header::{Header, BlockNumber};
 use transaction::{UnverifiedTransaction, SignedTransaction};
 use client::Client;
 
@@ -107,8 +107,8 @@ pub trait Engine : Sync + Send {
 	/// Get the general parameters of the chain.
 	fn params(&self) -> &CommonParams;
 
-	/// Get the EVM schedule for the given `env_info`.
-	fn schedule(&self, env_info: &EnvInfo) -> Schedule;
+	/// Get the EVM schedule for the given `block_number`.
+	fn schedule(&self, block_number: BlockNumber) -> Schedule;
 
 	/// Builtin-contracts we would like to see in the chain.
 	/// (In principle these are just hints for the engine since that has the last word on them.)
@@ -156,14 +156,7 @@ pub trait Engine : Sync + Send {
 	// TODO: Add flags for which bits of the transaction to check.
 	// TODO: consider including State in the params.
 	fn verify_transaction_basic(&self, t: &UnverifiedTransaction, _header: &Header) -> Result<(), Error> {
-		t.check_low_s()?;
-
-		if let Some(n) = t.network_id() {
-			if n != self.params().chain_id {
-				return Err(TransactionError::InvalidNetworkId.into());
-			}
-		}
-
+		t.verify_basic(true, Some(self.params().network_id), true)?;
 		Ok(())
 	}
 
diff --git a/ethcore/src/engines/null_engine.rs b/ethcore/src/engines/null_engine.rs
index 0611fc08e..838ddf809 100644
--- a/ethcore/src/engines/null_engine.rs
+++ b/ethcore/src/engines/null_engine.rs
@@ -20,7 +20,7 @@ use builtin::Builtin;
 use engines::Engine;
 use spec::CommonParams;
 use evm::Schedule;
-use env_info::EnvInfo;
+use header::BlockNumber;
 
 /// An engine which does not provide any consensus mechanism and does not seal blocks.
 pub struct NullEngine {
@@ -57,7 +57,7 @@ impl Engine for NullEngine {
 		&self.builtins
 	}
 
-	fn schedule(&self, _env_info: &EnvInfo) -> Schedule {
+	fn schedule(&self, _block_number: BlockNumber) -> Schedule {
 		Schedule::new_homestead()
 	}
 }
diff --git a/ethcore/src/engines/tendermint/mod.rs b/ethcore/src/engines/tendermint/mod.rs
index cb284d3c4..65e11d19e 100644
--- a/ethcore/src/engines/tendermint/mod.rs
+++ b/ethcore/src/engines/tendermint/mod.rs
@@ -30,9 +30,8 @@ use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
 use util::*;
 use client::{Client, EngineClient};
 use error::{Error, BlockError};
-use header::Header;
+use header::{Header, BlockNumber};
 use builtin::Builtin;
-use env_info::EnvInfo;
 use rlp::UntrustedRlp;
 use ethkey::{recover, public_to_address, Signature};
 use account_provider::AccountProvider;
@@ -405,8 +404,9 @@ impl Engine for Tendermint {
 		]
 	}
 
-	fn schedule(&self, _env_info: &EnvInfo) -> Schedule {
-		Schedule::new_post_eip150(usize::max_value(), true, true, true)
+	fn schedule(&self, block_number: BlockNumber) -> Schedule {
+		let eip86 = block_number >= self.params.eip86_transition;
+		Schedule::new_post_eip150(usize::max_value(), true, true, true, eip86)
 	}
 
 	fn populate_from_parent(&self, header: &mut Header, parent: &Header, gas_floor_target: U256, _gas_ceil_target: U256) {
@@ -658,7 +658,6 @@ mod tests {
 	use block::*;
 	use error::{Error, BlockError};
 	use header::Header;
-	use env_info::EnvInfo;
 	use ethkey::Secret;
 	use client::chain_notify::ChainNotify;
 	use miner::MinerService;
@@ -740,15 +739,7 @@ mod tests {
 	#[test]
 	fn can_return_schedule() {
 		let engine = Spec::new_test_tendermint().engine;
-		let schedule = engine.schedule(&EnvInfo {
-			number: 10000000,
-			author: 0.into(),
-			timestamp: 0,
-			difficulty: 0.into(),
-			last_hashes: Arc::new(vec![]),
-			gas_used: 0.into(),
-			gas_limit: 0.into(),
-		});
+		let schedule = engine.schedule(10000000);
 
 		assert!(schedule.stack_limit > 0);
 	}
diff --git a/ethcore/src/engines/validator_set/safe_contract.rs b/ethcore/src/engines/validator_set/safe_contract.rs
index 0a0eaecfd..a9388bbbf 100644
--- a/ethcore/src/engines/validator_set/safe_contract.rs
+++ b/ethcore/src/engines/validator_set/safe_contract.rs
@@ -196,6 +196,7 @@ mod tests {
 		let s0 = Secret::from_slice(&"1".sha3()).unwrap();
 		let v0 = tap.insert_account(s0.clone(), "").unwrap();
 		let v1 = tap.insert_account(Secret::from_slice(&"0".sha3()).unwrap(), "").unwrap();
+		let network_id = Spec::new_validator_safe_contract().network_id();
 		let client = generate_dummy_client_with_spec_and_accounts(Spec::new_validator_safe_contract, Some(tap));
 		client.engine().register_client(Arc::downgrade(&client));
 		let validator_contract = Address::from_str("0000000000000000000000000000000000000005").unwrap();
@@ -209,7 +210,7 @@ mod tests {
 			action: Action::Call(validator_contract),
 			value: 0.into(),
 			data: "bfc708a000000000000000000000000082a978b3f5962a5b0957d9ee9eef472ee55b42f1".from_hex().unwrap(),
-		}.sign(&s0, None);
+		}.sign(&s0, Some(network_id));
 		client.miner().import_own_transaction(client.as_ref(), tx.into()).unwrap();
 		client.update_sealing();
 		assert_eq!(client.chain_info().best_block_number, 1);
@@ -221,7 +222,7 @@ mod tests {
 			action: Action::Call(validator_contract),
 			value: 0.into(),
 			data: "4d238c8e00000000000000000000000082a978b3f5962a5b0957d9ee9eef472ee55b42f1".from_hex().unwrap(),
-		}.sign(&s0, None);
+		}.sign(&s0, Some(network_id));
 		client.miner().import_own_transaction(client.as_ref(), tx.into()).unwrap();
 		client.update_sealing();
 		// The transaction is not yet included so still unable to seal.
@@ -240,7 +241,7 @@ mod tests {
 			action: Action::Call(Address::default()),
 			value: 0.into(),
 			data: Vec::new(),
-		}.sign(&s0, None);
+		}.sign(&s0, Some(network_id));
 		client.miner().import_own_transaction(client.as_ref(), tx.into()).unwrap();
 		client.update_sealing();
 		// Able to seal again.
diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs
index 88655fa86..ae865da4f 100644
--- a/ethcore/src/ethereum/ethash.rs
+++ b/ethcore/src/ethereum/ethash.rs
@@ -19,8 +19,8 @@ use util::*;
 use block::*;
 use builtin::Builtin;
 use env_info::EnvInfo;
-use error::{BlockError, TransactionError, Error};
-use header::Header;
+use error::{BlockError, Error, TransactionError};
+use header::{Header, BlockNumber};
 use state::CleanupMode;
 use spec::CommonParams;
 use transaction::UnverifiedTransaction;
@@ -167,19 +167,20 @@ impl Engine for Ethash {
 		map!["nonce".to_owned() => format!("0x{}", header.nonce().hex()), "mixHash".to_owned() => format!("0x{}", header.mix_hash().hex())]
 	}
 
-	fn schedule(&self, env_info: &EnvInfo) -> Schedule {
+	fn schedule(&self, block_number: BlockNumber) -> Schedule {
 		trace!(target: "client", "Creating schedule. fCML={}, bGCML={}", self.ethash_params.homestead_transition, self.ethash_params.eip150_transition);
 
-		if env_info.number < self.ethash_params.homestead_transition {
+		if block_number < self.ethash_params.homestead_transition {
 			Schedule::new_frontier()
-		} else if env_info.number < self.ethash_params.eip150_transition {
+		} else if block_number < self.ethash_params.eip150_transition {
 			Schedule::new_homestead()
 		} else {
 			Schedule::new_post_eip150(
 				self.ethash_params.max_code_size as usize,
-				env_info.number >= self.ethash_params.eip160_transition,
-				env_info.number >= self.ethash_params.eip161abc_transition,
-				env_info.number >= self.ethash_params.eip161d_transition
+				block_number >= self.ethash_params.eip160_transition,
+				block_number >= self.ethash_params.eip161abc_transition,
+				block_number >= self.ethash_params.eip161d_transition,
+				block_number >= self.params.eip86_transition
 			)
 		}
 	}
@@ -369,20 +370,13 @@ impl Engine for Ethash {
 	}
 
 	fn verify_transaction_basic(&self, t: &UnverifiedTransaction, header: &Header) -> result::Result<(), Error> {
-		if header.number() >= self.ethash_params.homestead_transition {
-			t.check_low_s()?;
-		}
-
-		if let Some(n) = t.network_id() {
-			if header.number() < self.ethash_params.eip155_transition || n != self.params().chain_id {
-				return Err(TransactionError::InvalidNetworkId.into())
-			}
-		}
-
 		if header.number() >= self.ethash_params.min_gas_price_transition && t.gas_price < self.ethash_params.min_gas_price {
 			return Err(TransactionError::InsufficientGasPrice { minimal: self.ethash_params.min_gas_price, got: t.gas_price }.into());
 		}
 
+		let check_low_s = header.number() >= self.ethash_params.homestead_transition;
+		let network_id = if header.number() >= self.ethash_params.eip155_transition { Some(self.params().chain_id) } else { None };
+		t.verify_basic(check_low_s, network_id, false)?;
 		Ok(())
 	}
 }
@@ -512,7 +506,6 @@ mod tests {
 	use block::*;
 	use tests::helpers::*;
 	use engines::Engine;
-	use env_info::EnvInfo;
 	use error::{BlockError, Error};
 	use header::Header;
 	use super::super::{new_morden, new_homestead_test};
@@ -559,28 +552,10 @@ mod tests {
 	#[test]
 	fn can_return_schedule() {
 		let engine = new_morden().engine;
-		let schedule = engine.schedule(&EnvInfo {
-			number: 10000000,
-			author: 0.into(),
-			timestamp: 0,
-			difficulty: 0.into(),
-			last_hashes: Arc::new(vec![]),
-			gas_used: 0.into(),
-			gas_limit: 0.into(),
-		});
-
+		let schedule = engine.schedule(10000000);
 		assert!(schedule.stack_limit > 0);
 
-		let schedule = engine.schedule(&EnvInfo {
-			number: 100,
-			author: 0.into(),
-			timestamp: 0,
-			difficulty: 0.into(),
-			last_hashes: Arc::new(vec![]),
-			gas_used: 0.into(),
-			gas_limit: 0.into(),
-		});
-
+		let schedule = engine.schedule(100);
 		assert!(!schedule.have_delegate_call);
 	}
 
diff --git a/ethcore/src/evm/ext.rs b/ethcore/src/evm/ext.rs
index 352ffb7d9..e6b644874 100644
--- a/ethcore/src/evm/ext.rs
+++ b/ethcore/src/evm/ext.rs
@@ -41,6 +41,17 @@ pub enum MessageCallResult {
 	Failed
 }
 
+/// Specifies how an address is calculated for a new contract.
+#[derive(Copy, Clone, PartialEq, Eq)]
+pub enum CreateContractAddress {
+	/// Address is calculated from nonce and sender. Pre EIP-86 (Metropolis)
+	FromSenderAndNonce,
+	/// Address is calculated from code hash. Default since EIP-86
+	FromCodeHash,
+	/// Address is calculated from code hash and sender. Used by CREATE_P2SH instruction.
+	FromSenderAndCodeHash,
+}
+
 /// Externalities interface for EVMs
 // TODO: [rob] associated error type instead of `trie::Result`. Not all EVMs are trie powered.
 pub trait Ext {
@@ -68,7 +79,7 @@ pub trait Ext {
 	/// Creates new contract.
 	///
 	/// Returns gas_left and contract address if contract creation was succesfull.
-	fn create(&mut self, gas: &U256, value: &U256, code: &[u8]) -> ContractCreateResult;
+	fn create(&mut self, gas: &U256, value: &U256, code: &[u8], address: CreateContractAddress) -> ContractCreateResult;
 
 	/// Message call.
 	///
diff --git a/ethcore/src/evm/instructions.rs b/ethcore/src/evm/instructions.rs
index d93ddc437..41c9e1ea1 100644
--- a/ethcore/src/evm/instructions.rs
+++ b/ethcore/src/evm/instructions.rs
@@ -278,6 +278,7 @@ lazy_static! {
 		arr[RETURN as usize] =			InstructionInfo::new("RETURN",			0, 2, 0, true, GasPriceTier::Zero);
 		arr[DELEGATECALL as usize] =	InstructionInfo::new("DELEGATECALL",	0, 6, 1, true, GasPriceTier::Special);
 		arr[SUICIDE as usize] = 		InstructionInfo::new("SUICIDE",			0, 1, 0, true, GasPriceTier::Special);
+		arr[CREATE_P2SH as usize] = 	InstructionInfo::new("CREATE_P2SH",		0, 3, 1, true, GasPriceTier::Special);
 		arr
 	};
 }
@@ -553,6 +554,8 @@ pub const CALLCODE: Instruction = 0xf2;
 pub const RETURN: Instruction = 0xf3;
 /// like CALLCODE but keeps caller's value and sender
 pub const DELEGATECALL: Instruction = 0xf4;
+/// create a new account and set creation address to sha3(sender + sha3(init code)) % 2**160
+pub const CREATE_P2SH: Instruction = 0xfb;
 /// halt execution and register account for later deletion
 pub const SUICIDE: Instruction = 0xff;
 
diff --git a/ethcore/src/evm/interpreter/gasometer.rs b/ethcore/src/evm/interpreter/gasometer.rs
index 9086200fa..fb0c86d35 100644
--- a/ethcore/src/evm/interpreter/gasometer.rs
+++ b/ethcore/src/evm/interpreter/gasometer.rs
@@ -223,7 +223,7 @@ impl<Gas: CostType> Gasometer<Gas> {
 
 				Request::GasMemProvide(gas, mem, Some(requested))
 			},
-			instructions::CREATE => {
+			instructions::CREATE | instructions::CREATE_P2SH => {
 				let gas = Gas::from(schedule.create_gas);
 				let mem = mem_needed(stack.peek(1), stack.peek(2))?;
 
diff --git a/ethcore/src/evm/interpreter/mod.rs b/ethcore/src/evm/interpreter/mod.rs
index 79304793e..7fbab7ebc 100644
--- a/ethcore/src/evm/interpreter/mod.rs
+++ b/ethcore/src/evm/interpreter/mod.rs
@@ -32,7 +32,7 @@ use std::marker::PhantomData;
 use action_params::{ActionParams, ActionValue};
 use types::executed::CallType;
 use evm::instructions::{self, Instruction, InstructionInfo};
-use evm::{self, MessageCallResult, ContractCreateResult, GasLeft, CostType};
+use evm::{self, MessageCallResult, ContractCreateResult, GasLeft, CostType, CreateContractAddress};
 use bit_set::BitSet;
 
 use util::*;
@@ -182,7 +182,9 @@ impl<Cost: CostType> Interpreter<Cost> {
 	fn verify_instruction(&self, ext: &evm::Ext, instruction: Instruction, info: &InstructionInfo, stack: &Stack<U256>) -> evm::Result<()> {
 		let schedule = ext.schedule();
 
-		if !schedule.have_delegate_call && instruction == instructions::DELEGATECALL {
+		if (instruction == instructions::DELEGATECALL && !schedule.have_delegate_call) ||
+			(instruction == instructions::CREATE_P2SH && !schedule.have_create_p2sh) {
+
 			return Err(evm::Error::BadInstruction {
 				instruction: instruction
 			});
@@ -266,10 +268,12 @@ impl<Cost: CostType> Interpreter<Cost> {
 			instructions::JUMPDEST => {
 				// ignore
 			},
-			instructions::CREATE => {
+			instructions::CREATE | instructions::CREATE_P2SH => {
 				let endowment = stack.pop_back();
 				let init_off = stack.pop_back();
 				let init_size = stack.pop_back();
+
+				let address_scheme = if instruction == instructions::CREATE { ext.schedule().create_address } else { CreateContractAddress::FromSenderAndCodeHash };
 				let create_gas = provided.expect("`provided` comes through Self::exec from `Gasometer::get_gas_cost_mem`; `gas_gas_mem_cost` guarantees `Some` when instruction is `CALL`/`CALLCODE`/`DELEGATECALL`/`CREATE`; this is `CREATE`; qed");
 
 				let contract_code = self.mem.read_slice(init_off, init_size);
@@ -280,7 +284,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 					return Ok(InstructionResult::UnusedGas(create_gas));
 				}
 
-				let create_result = ext.create(&create_gas.as_u256(), &endowment, contract_code);
+				let create_result = ext.create(&create_gas.as_u256(), &endowment, contract_code, address_scheme);
 				return match create_result {
 					ContractCreateResult::Created(address, gas_left) => {
 						stack.push(address_to_u256(address));
diff --git a/ethcore/src/evm/mod.rs b/ethcore/src/evm/mod.rs
index cc707d6ef..7906b81ff 100644
--- a/ethcore/src/evm/mod.rs
+++ b/ethcore/src/evm/mod.rs
@@ -32,7 +32,7 @@ mod tests;
 mod benches;
 
 pub use self::evm::{Evm, Error, Finalize, GasLeft, Result, CostType};
-pub use self::ext::{Ext, ContractCreateResult, MessageCallResult};
+pub use self::ext::{Ext, ContractCreateResult, MessageCallResult, CreateContractAddress};
 pub use self::factory::{Factory, VMType};
 pub use self::schedule::Schedule;
 pub use types::executed::CallType;
diff --git a/ethcore/src/evm/schedule.rs b/ethcore/src/evm/schedule.rs
index 70801983d..97df4d784 100644
--- a/ethcore/src/evm/schedule.rs
+++ b/ethcore/src/evm/schedule.rs
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Cost schedule and other parameterisations for the EVM.
+use evm::CreateContractAddress;
 
 /// Definition of the cost schedule and other parameterisations for the EVM.
 pub struct Schedule {
@@ -22,6 +23,8 @@ pub struct Schedule {
 	pub exceptional_failed_code_deposit: bool,
 	/// Does it have a delegate cal
 	pub have_delegate_call: bool,
+	/// Does it have a CREATE_P2SH instruction
+	pub have_create_p2sh: bool,
 	/// VM stack limit
 	pub stack_limit: usize,
 	/// Max number of nested calls/creates
@@ -99,6 +102,8 @@ pub struct Schedule {
 	pub no_empty: bool,
 	/// Kill empty accounts if touched.
 	pub kill_empty: bool,
+	/// Contract address generation scheme
+	pub create_address: CreateContractAddress,
 }
 
 impl Schedule {
@@ -113,10 +118,11 @@ impl Schedule {
 	}
 
 	/// Schedule for the post-EIP-150-era of the Ethereum main net.
-	pub fn new_post_eip150(max_code_size: usize, fix_exp: bool, no_empty: bool, kill_empty: bool) -> Schedule {
+	pub fn new_post_eip150(max_code_size: usize, fix_exp: bool, no_empty: bool, kill_empty: bool, have_create_p2sh: bool) -> Schedule {
 		Schedule {
 			exceptional_failed_code_deposit: true,
 			have_delegate_call: true,
+			have_create_p2sh: have_create_p2sh,
 			stack_limit: 1024,
 			max_depth: 1024,
 			tier_step_gas: [0, 2, 3, 5, 8, 10, 20, 0],
@@ -155,13 +161,20 @@ impl Schedule {
 			sub_gas_cap_divisor: Some(64),
 			no_empty: no_empty,
 			kill_empty: kill_empty,
+			create_address: if have_create_p2sh { CreateContractAddress::FromCodeHash } else { CreateContractAddress::FromSenderAndNonce },
 		}
 	}
 
+	/// Schedule for the Metropolis of the Ethereum main net.
+	pub fn new_metropolis() -> Schedule {
+		Self::new_post_eip150(24576, true, true, true, true)
+	}
+
 	fn new(efcd: bool, hdc: bool, tcg: usize) -> Schedule {
 		Schedule {
 			exceptional_failed_code_deposit: efcd,
 			have_delegate_call: hdc,
+			have_create_p2sh: false,
 			stack_limit: 1024,
 			max_depth: 1024,
 			tier_step_gas: [0, 2, 3, 5, 8, 10, 20, 0],
@@ -200,6 +213,7 @@ impl Schedule {
 			sub_gas_cap_divisor: None,
 			no_empty: false,
 			kill_empty: false,
+			create_address: CreateContractAddress::FromSenderAndNonce,
 		}
 	}
 }
diff --git a/ethcore/src/evm/tests.rs b/ethcore/src/evm/tests.rs
index 3002c170c..b5b2341aa 100644
--- a/ethcore/src/evm/tests.rs
+++ b/ethcore/src/evm/tests.rs
@@ -18,7 +18,7 @@ use util::*;
 use action_params::{ActionParams, ActionValue};
 use env_info::EnvInfo;
 use types::executed::CallType;
-use evm::{self, Ext, Schedule, Factory, GasLeft, VMType, ContractCreateResult, MessageCallResult};
+use evm::{self, Ext, Schedule, Factory, GasLeft, VMType, ContractCreateResult, MessageCallResult, CreateContractAddress};
 use std::fmt::Debug;
 
 pub struct FakeLogEntry {
@@ -111,7 +111,7 @@ impl Ext for FakeExt {
 		self.blockhashes.get(number).unwrap_or(&H256::new()).clone()
 	}
 
-	fn create(&mut self, gas: &U256, value: &U256, code: &[u8]) -> ContractCreateResult {
+	fn create(&mut self, gas: &U256, value: &U256, code: &[u8], _address: CreateContractAddress) -> ContractCreateResult {
 		self.calls.insert(FakeCall {
 			call_type: FakeCallType::Create,
 			gas: *gas,
diff --git a/ethcore/src/executive.rs b/ethcore/src/executive.rs
index 5e0ee5662..dc9dcec17 100644
--- a/ethcore/src/executive.rs
+++ b/ethcore/src/executive.rs
@@ -22,7 +22,7 @@ use engines::Engine;
 use types::executed::CallType;
 use env_info::EnvInfo;
 use error::ExecutionError;
-use evm::{self, Ext, Factory, Finalize};
+use evm::{self, Ext, Factory, Finalize, CreateContractAddress};
 use externalities::*;
 use trace::{FlatTrace, Tracer, NoopTracer, ExecutiveTracer, VMTrace, VMTracer, ExecutiveVMTracer, NoopVMTracer};
 use transaction::{Action, SignedTransaction};
@@ -34,14 +34,29 @@ pub use types::executed::{Executed, ExecutionResult};
 /// Maybe something like here: `https://github.com/ethereum/libethereum/blob/4db169b8504f2b87f7d5a481819cfb959fc65f6c/libethereum/ExtVM.cpp`
 const STACK_SIZE_PER_DEPTH: usize = 24*1024;
 
-/// Returns new address created from address and given nonce.
-pub fn contract_address(address: &Address, nonce: &U256) -> Address {
+/// Returns new address created from address, nonce, and code hash
+pub fn contract_address(address_scheme: CreateContractAddress, sender: &Address, nonce: &U256, code_hash: &H256) -> Address {
 	use rlp::RlpStream;
 
-	let mut stream = RlpStream::new_list(2);
-	stream.append(address);
-	stream.append(nonce);
-	From::from(stream.out().sha3())
+	match address_scheme {
+		CreateContractAddress::FromSenderAndNonce => {
+			let mut stream = RlpStream::new_list(2);
+			stream.append(sender);
+			stream.append(nonce);
+			From::from(stream.as_raw().sha3())
+		},
+		CreateContractAddress::FromCodeHash => {
+			let mut buffer = [0u8; 20 + 32];
+			&mut buffer[20..].copy_from_slice(&code_hash[..]);
+			From::from((&buffer[..]).sha3())
+		},
+		CreateContractAddress::FromSenderAndCodeHash => {
+			let mut buffer = [0u8; 20 + 32];
+			&mut buffer[..20].copy_from_slice(&sender[..]);
+			&mut buffer[20..].copy_from_slice(&code_hash[..]);
+			From::from((&buffer[..]).sha3())
+		},
+	}
 }
 
 /// Transaction execution options.
@@ -125,7 +140,7 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		let sender = t.sender();
 		let nonce = self.state.nonce(&sender)?;
 
-		let schedule = self.engine.schedule(self.info);
+		let schedule = self.engine.schedule(self.info.number);
 		let base_gas_required = U256::from(t.gas_required(&schedule));
 
 		if t.gas < base_gas_required {
@@ -160,17 +175,20 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		}
 
 		// NOTE: there can be no invalid transactions from this point.
-		self.state.inc_nonce(&sender)?;
+		if !t.is_unsigned() {
+			self.state.inc_nonce(&sender)?;
+		}
 		self.state.sub_balance(&sender, &U256::from(gas_cost))?;
 
 		let mut substate = Substate::new();
 
 		let (gas_left, output) = match t.action {
 			Action::Create => {
-				let new_address = contract_address(&sender, &nonce);
+				let code_hash = t.data.sha3();
+				let new_address = contract_address(schedule.create_address, &sender, &nonce, &code_hash);
 				let params = ActionParams {
 					code_address: new_address.clone(),
-					code_hash: t.data.sha3(),
+					code_hash: code_hash,
 					address: new_address,
 					sender: sender.clone(),
 					origin: sender.clone(),
@@ -253,7 +271,7 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		// backup used in case of running out of gas
 		self.state.checkpoint();
 
-		let schedule = self.engine.schedule(self.info);
+		let schedule = self.engine.schedule(self.info.number);
 
 		// at first, transfer value to destination
 		if let ActionValue::Transfer(val) = params.value {
@@ -365,8 +383,14 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		params: ActionParams,
 		substate: &mut Substate,
 		tracer: &mut T,
-		vm_tracer: &mut V
+		vm_tracer: &mut V,
 	) -> evm::Result<U256> where T: Tracer, V: VMTracer {
+
+		let schedule = self.engine.schedule(self.info.number);
+		if schedule.create_address != CreateContractAddress::FromSenderAndNonce && self.state.exists(&params.address)? {
+			return Err(evm::Error::OutOfGas);
+		}
+
 		// backup used in case of running out of gas
 		self.state.checkpoint();
 
@@ -374,7 +398,6 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		let mut unconfirmed_substate = Substate::new();
 
 		// create contract and transfer value to it if necessary
-		let schedule = self.engine.schedule(self.info);
 		let nonce_offset = if schedule.no_empty {1} else {0}.into();
 		let prev_bal = self.state.balance(&params.address)?;
 		if let ActionValue::Transfer(val) = params.value {
@@ -423,7 +446,7 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		trace: Vec<FlatTrace>,
 		vm_trace: Option<VMTrace>
 	) -> ExecutionResult {
-		let schedule = self.engine.schedule(self.info);
+		let schedule = self.engine.schedule(self.info.number);
 
 		// refunds from SSTORE nonzero -> zero
 		let sstore_refunds = U256::from(schedule.sstore_refund_gas) * substate.sstore_clears_count;
@@ -525,7 +548,7 @@ mod tests {
 	use util::bytes::BytesRef;
 	use action_params::{ActionParams, ActionValue};
 	use env_info::EnvInfo;
-	use evm::{Factory, VMType};
+	use evm::{Factory, VMType, CreateContractAddress};
 	use error::ExecutionError;
 	use state::{Substate, CleanupMode};
 	use tests::helpers::*;
@@ -540,14 +563,14 @@ mod tests {
 	fn test_contract_address() {
 		let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
 		let expected_address = Address::from_str("3f09c73a5ed19289fb9bdc72f1742566df146f56").unwrap();
-		assert_eq!(expected_address, contract_address(&address, &U256::from(88)));
+		assert_eq!(expected_address, contract_address(CreateContractAddress::FromSenderAndNonce, &address, &U256::from(88), &H256::default()));
 	}
 
 	// TODO: replace params with transactions!
 	evm_test!{test_sender_balance: test_sender_balance_jit, test_sender_balance_int}
 	fn test_sender_balance(factory: Factory) {
 		let sender = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
-		let address = contract_address(&sender, &U256::zero());
+		let address = contract_address(CreateContractAddress::FromSenderAndNonce, &sender, &U256::zero(), &H256::default());
 		let mut params = ActionParams::default();
 		params.address = address.clone();
 		params.sender = sender.clone();
@@ -602,7 +625,7 @@ mod tests {
 		let code = "7c601080600c6000396000f3006000355415600957005b60203560003555600052601d60036017f0600055".from_hex().unwrap();
 
 		let sender = Address::from_str("cd1722f3947def4cf144679da39c4c32bdc35681").unwrap();
-		let address = contract_address(&sender, &U256::zero());
+		let address = contract_address(CreateContractAddress::FromSenderAndNonce, &sender, &U256::zero(), &H256::default());
 		// TODO: add tests for 'callcreate'
 		//let next_address = contract_address(&address, &U256::zero());
 		let mut params = ActionParams::default();
@@ -658,7 +681,7 @@ mod tests {
 		let code = "7c601080600c6000396000f3006000355415600957005b60203560003555600052601d60036017f0600055".from_hex().unwrap();
 
 		let sender = Address::from_str("cd1722f3947def4cf144679da39c4c32bdc35681").unwrap();
-		let address = contract_address(&sender, &U256::zero());
+		let address = contract_address(CreateContractAddress::FromSenderAndNonce, &sender, &U256::zero(), &H256::default());
 		// TODO: add tests for 'callcreate'
 		//let next_address = contract_address(&address, &U256::zero());
 		let mut params = ActionParams::default();
@@ -770,7 +793,7 @@ mod tests {
 		let code = "601080600c6000396000f3006000355415600957005b60203560003555".from_hex().unwrap();
 
 		let sender = Address::from_str("cd1722f3947def4cf144679da39c4c32bdc35681").unwrap();
-		let address = contract_address(&sender, &U256::zero());
+		let address = contract_address(CreateContractAddress::FromSenderAndNonce, &sender, &U256::zero(), &H256::default());
 		// TODO: add tests for 'callcreate'
 		//let next_address = contract_address(&address, &U256::zero());
 		let mut params = ActionParams::default();
@@ -857,7 +880,7 @@ mod tests {
 		let code = "7c601080600c6000396000f3006000355415600957005b60203560003555600052601d600360e6f0600055".from_hex().unwrap();
 
 		let sender = Address::from_str("cd1722f3947def4cf144679da39c4c32bdc35681").unwrap();
-		let address = contract_address(&sender, &U256::zero());
+		let address = contract_address(CreateContractAddress::FromSenderAndNonce, &sender, &U256::zero(), &H256::default());
 		// TODO: add tests for 'callcreate'
 		//let next_address = contract_address(&address, &U256::zero());
 		let mut params = ActionParams::default();
@@ -909,8 +932,8 @@ mod tests {
 		let code = "7c601080600c6000396000f3006000355415600957005b60203560003555600052601d60036017f0".from_hex().unwrap();
 
 		let sender = Address::from_str("cd1722f3947def4cf144679da39c4c32bdc35681").unwrap();
-		let address = contract_address(&sender, &U256::zero());
-		let next_address = contract_address(&address, &U256::zero());
+		let address = contract_address(CreateContractAddress::FromSenderAndNonce, &sender, &U256::zero(), &H256::default());
+		let next_address = contract_address(CreateContractAddress::FromSenderAndNonce, &address, &U256::zero(), &H256::default());
 		let mut params = ActionParams::default();
 		params.address = address.clone();
 		params.sender = sender.clone();
@@ -1017,7 +1040,7 @@ mod tests {
 		// 55 - sstore
 		let sender = Address::from_str("cd1722f3947def4cf144679da39c4c32bdc35681").unwrap();
 		let code = "600160005401600055600060006000600060003060e05a03f1600155".from_hex().unwrap();
-		let address = contract_address(&sender, &U256::zero());
+		let address = contract_address(CreateContractAddress::FromSenderAndNonce, &sender, &U256::zero(), &H256::default());
 		let mut params = ActionParams::default();
 		params.address = address.clone();
 		params.gas = U256::from(100_000);
@@ -1052,7 +1075,7 @@ mod tests {
 			nonce: U256::zero()
 		}.sign(keypair.secret(), None);
 		let sender = t.sender();
-		let contract = contract_address(&sender, &U256::zero());
+		let contract = contract_address(CreateContractAddress::FromSenderAndNonce, &sender, &U256::zero(), &H256::default());
 
 		let mut state = get_temp_state();
 		state.add_balance(&sender, &U256::from(18), CleanupMode::NoEmpty).unwrap();
@@ -1181,7 +1204,7 @@ mod tests {
 		let code = "6064640fffffffff20600055".from_hex().unwrap();
 
 		let sender = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
-		let address = contract_address(&sender, &U256::zero());
+		let address = contract_address(CreateContractAddress::FromSenderAndNonce, &sender, &U256::zero(), &H256::default());
 		// TODO: add tests for 'callcreate'
 		//let next_address = contract_address(&address, &U256::zero());
 		let mut params = ActionParams::default();
diff --git a/ethcore/src/externalities.rs b/ethcore/src/externalities.rs
index 8591f15fd..0b849033e 100644
--- a/ethcore/src/externalities.rs
+++ b/ethcore/src/externalities.rs
@@ -21,8 +21,9 @@ use state::{Backend as StateBackend, State, Substate};
 use engines::Engine;
 use env_info::EnvInfo;
 use executive::*;
-use evm::{self, Schedule, Ext, ContractCreateResult, MessageCallResult, Factory};
+use evm::{self, Schedule, Ext, ContractCreateResult, MessageCallResult, Factory, CreateContractAddress};
 use types::executed::CallType;
+use types::transaction::UNSIGNED_SENDER;
 use trace::{Tracer, VMTracer};
 
 /// Policy for handling output data on `RETURN` opcode.
@@ -97,7 +98,7 @@ impl<'a, T: 'a, V: 'a, B: 'a> Externalities<'a, T, V, B>
 			depth: depth,
 			origin_info: origin_info,
 			substate: substate,
-			schedule: engine.schedule(env_info),
+			schedule: engine.schedule(env_info.number),
 			output: output,
 			tracer: tracer,
 			vm_tracer: vm_tracer,
@@ -147,10 +148,11 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for Externalities<'a, T, V, B>
 		}
 	}
 
-	fn create(&mut self, gas: &U256, value: &U256, code: &[u8]) -> ContractCreateResult {
+	fn create(&mut self, gas: &U256, value: &U256, code: &[u8], address_scheme: CreateContractAddress) -> ContractCreateResult {
 		// create new contract address
+		let code_hash = code.sha3();
 		let address = match self.state.nonce(&self.origin_info.address) {
-			Ok(nonce) => contract_address(&self.origin_info.address, &nonce),
+			Ok(nonce) => contract_address(address_scheme, &self.origin_info.address, &nonce, &code_hash),
 			Err(e) => {
 				debug!(target: "ext", "Database corruption encountered: {:?}", e);
 				return ContractCreateResult::Failed
@@ -167,14 +169,16 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for Externalities<'a, T, V, B>
 			gas_price: self.origin_info.gas_price,
 			value: ActionValue::Transfer(*value),
 			code: Some(Arc::new(code.to_vec())),
-			code_hash: code.sha3(),
+			code_hash: code_hash,
 			data: None,
 			call_type: CallType::None,
 		};
 
-		if let Err(e) = self.state.inc_nonce(&self.origin_info.address) {
-			debug!(target: "ext", "Database corruption encountered: {:?}", e);
-			return ContractCreateResult::Failed
+		if params.sender != UNSIGNED_SENDER {
+			if let Err(e) = self.state.inc_nonce(&self.origin_info.address) {
+				debug!(target: "ext", "Database corruption encountered: {:?}", e);
+				return ContractCreateResult::Failed
+			}
 		}
 		let mut ex = Executive::from_parent(self.state, self.env_info, self.engine, self.vm_factory, self.depth);
 
diff --git a/ethcore/src/json_tests/executive.rs b/ethcore/src/json_tests/executive.rs
index 9526e5ec2..c34ad69e3 100644
--- a/ethcore/src/json_tests/executive.rs
+++ b/ethcore/src/json_tests/executive.rs
@@ -21,7 +21,7 @@ use executive::*;
 use engines::Engine;
 use env_info::EnvInfo;
 use evm;
-use evm::{Schedule, Ext, Factory, Finalize, VMType, ContractCreateResult, MessageCallResult};
+use evm::{Schedule, Ext, Factory, Finalize, VMType, ContractCreateResult, MessageCallResult, CreateContractAddress};
 use externalities::*;
 use types::executed::CallType;
 use tests::helpers::*;
@@ -56,7 +56,8 @@ struct TestExt<'a, T: 'a, V: 'a, B: 'a>
 {
 	ext: Externalities<'a, T, V, B>,
 	callcreates: Vec<CallCreate>,
-	contract_address: Address
+	nonce: U256,
+	sender: Address,
 }
 
 impl<'a, T: 'a, V: 'a, B: 'a> TestExt<'a, T, V, B>
@@ -76,9 +77,10 @@ impl<'a, T: 'a, V: 'a, B: 'a> TestExt<'a, T, V, B>
 		vm_tracer: &'a mut V,
 	) -> trie::Result<Self> {
 		Ok(TestExt {
-			contract_address: contract_address(&address, &state.nonce(&address)?),
+			nonce: state.nonce(&address)?,
 			ext: Externalities::new(state, info, engine, vm_factory, depth, origin_info, substate, output, tracer, vm_tracer),
-			callcreates: vec![]
+			callcreates: vec![],
+			sender: address,
 		})
 	}
 }
@@ -114,14 +116,15 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for TestExt<'a, T, V, B>
 		self.ext.blockhash(number)
 	}
 
-	fn create(&mut self, gas: &U256, value: &U256, code: &[u8]) -> ContractCreateResult {
+	fn create(&mut self, gas: &U256, value: &U256, code: &[u8], address: CreateContractAddress) -> ContractCreateResult {
 		self.callcreates.push(CallCreate {
 			data: code.to_vec(),
 			destination: None,
 			gas_limit: *gas,
 			value: *value
 		});
-		ContractCreateResult::Created(self.contract_address.clone(), *gas)
+		let contract_address = contract_address(address, &self.sender, &self.nonce, &code.sha3());
+		ContractCreateResult::Created(contract_address, *gas)
 	}
 
 	fn call(&mut self,
diff --git a/ethcore/src/json_tests/state.rs b/ethcore/src/json_tests/state.rs
index d0b18d99c..c15847896 100644
--- a/ethcore/src/json_tests/state.rs
+++ b/ethcore/src/json_tests/state.rs
@@ -21,6 +21,8 @@ use ethereum;
 use spec::Spec;
 use ethjson;
 use ethjson::state::test::ForkSpec;
+use types::transaction::SignedTransaction;
+use env_info::EnvInfo;
 
 lazy_static! {
 	pub static ref FRONTIER: Spec = ethereum::new_frontier_test();
@@ -37,7 +39,7 @@ pub fn json_chain_test(json_data: &[u8]) -> Vec<String> {
 	for (name, test) in tests.into_iter() {
 		{
 			let multitransaction = test.transaction;
-			let env = test.env.into();
+			let env: EnvInfo = test.env.into();
 			let pre: PodState = test.pre_state.into();
 
 			for (spec, states) in test.post_states {
@@ -54,12 +56,15 @@ pub fn json_chain_test(json_data: &[u8]) -> Vec<String> {
 					let info = format!("   - {} | {:?} ({}/{}) ...", name, spec, i + 1, total);
 
 					let post_root: H256 = state.hash.into();
-					let transaction = multitransaction.select(&state.indexes).into();
-
+					let transaction: SignedTransaction = multitransaction.select(&state.indexes).into();
 					let mut state = get_temp_state();
 					state.populate_from(pre.clone());
-					state.commit().expect(&format!("State test {} failed due to internal error.", name));
-					let _res = state.apply(&env, &**engine, &transaction, false);
+					if transaction.verify_basic(true, None, env.number >= engine.params().eip86_transition).is_ok() {
+						state.commit().expect(&format!("State test {} failed due to internal error.", name));
+						let _res = state.apply(&env, &**engine, &transaction, false);
+					} else {
+						let _rest = state.commit();
+					}
 					if state.root() != &post_root {
 						println!("{} !!! State mismatch (got: {}, expect: {}", info, state.root(), post_root);
 						flushln!("{} fail", info);
@@ -73,7 +78,9 @@ pub fn json_chain_test(json_data: &[u8]) -> Vec<String> {
 
 	}
 
-	println!("!!! {:?} tests from failed.", failed.len());
+	if !failed.is_empty() {
+		println!("!!! {:?} tests failed.", failed.len());
+	}
 	failed
 }
 
diff --git a/ethcore/src/json_tests/transaction.rs b/ethcore/src/json_tests/transaction.rs
index f400180ee..a3c3c889d 100644
--- a/ethcore/src/json_tests/transaction.rs
+++ b/ethcore/src/json_tests/transaction.rs
@@ -18,35 +18,37 @@ use super::test_common::*;
 use evm;
 use ethjson;
 use rlp::UntrustedRlp;
-use transaction::{Action, UnverifiedTransaction};
-use ethstore::ethkey::public_to_address;
+use transaction::{Action, UnverifiedTransaction, SignedTransaction};
 
 fn do_json_test(json_data: &[u8]) -> Vec<String> {
 	let tests = ethjson::transaction::Test::load(json_data).unwrap();
 	let mut failed = Vec::new();
-	let old_schedule = evm::Schedule::new_frontier();
-	let new_schedule = evm::Schedule::new_homestead();
+	let frontier_schedule = evm::Schedule::new_frontier();
+	let homestead_schedule = evm::Schedule::new_homestead();
+	let metropolis_schedule = evm::Schedule::new_metropolis();
 	for (name, test) in tests.into_iter() {
 		let mut fail_unless = |cond: bool, title: &str| if !cond { failed.push(name.clone()); println!("Transaction failed: {:?}: {:?}", name, title); };
 
 		let number: Option<u64> = test.block_number.map(Into::into);
 		let schedule = match number {
-			None => &old_schedule,
-			Some(x) if x < 1_150_000 => &old_schedule,
-			Some(_) => &new_schedule
+			None => &frontier_schedule,
+			Some(x) if x < 1_150_000 => &frontier_schedule,
+			Some(x) if x < 3_000_000 => &homestead_schedule,
+			Some(_) => &metropolis_schedule
 		};
 		let allow_network_id_of_one = number.map_or(false, |n| n >= 2_675_000);
+		let allow_unsigned = number.map_or(false, |n| n >= 3_000_000);
 
 		let rlp: Vec<u8> = test.rlp.into();
 		let res = UntrustedRlp::new(&rlp)
 			.as_val()
 			.map_err(From::from)
-			.and_then(|t: UnverifiedTransaction| t.validate(schedule, schedule.have_delegate_call, allow_network_id_of_one));
+			.and_then(|t: UnverifiedTransaction| t.validate(schedule, schedule.have_delegate_call, allow_network_id_of_one, allow_unsigned));
 
 		fail_unless(test.transaction.is_none() == res.is_err(), "Validity different");
 		if let (Some(tx), Some(sender)) = (test.transaction, test.sender) {
 			let t = res.unwrap();
-			fail_unless(public_to_address(&t.recover_public().unwrap()) == sender.into(), "sender mismatch");
+			fail_unless(SignedTransaction::new(t.clone()).unwrap().sender() == sender.into(), "sender mismatch");
 			let is_acceptable_network_id = match t.network_id() {
 				None => true,
 				Some(1) if allow_network_id_of_one => true,
@@ -84,3 +86,7 @@ declare_test!{TransactionTests_Homestead_ttTransactionTestEip155VitaliksTests, "
 declare_test!{TransactionTests_EIP155_ttTransactionTest, "TransactionTests/EIP155/ttTransactionTest"}
 declare_test!{TransactionTests_EIP155_ttTransactionTestEip155VitaliksTests, "TransactionTests/EIP155/ttTransactionTestEip155VitaliksTests"}
 declare_test!{TransactionTests_EIP155_ttTransactionTestVRule, "TransactionTests/EIP155/ttTransactionTestVRule"}
+
+declare_test!{TransactionTests_Metropolis_ttMetropolisTest, "TransactionTests/Metropolis/ttMetropolisTest"}
+declare_test!{TransactionTests_Metropolis_ttTransactionTest, "TransactionTests/Metropolis/ttTransactionTest"}
+declare_test!{TransactionTests_Metropolis_ttTransactionTestZeroSig, "TransactionTests/Metropolis/ttTransactionTestZeroSig"}
diff --git a/ethcore/src/lib.rs b/ethcore/src/lib.rs
index 8f9ed2e5f..980bdd25c 100644
--- a/ethcore/src/lib.rs
+++ b/ethcore/src/lib.rs
@@ -170,3 +170,4 @@ mod json_tests;
 
 pub use types::*;
 pub use executive::contract_address;
+pub use evm::CreateContractAddress;
diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
index 0347e984f..286a89bc1 100644
--- a/ethcore/src/miner/miner.rs
+++ b/ethcore/src/miner/miner.rs
@@ -1048,7 +1048,7 @@ impl MinerService for Miner {
 								Action::Call(_) => None,
 								Action::Create => {
 									let sender = tx.sender();
-									Some(contract_address(&sender, &tx.nonce))
+									Some(contract_address(self.engine.schedule(pending.header().number()).create_address, &sender, &tx.nonce, &tx.data.sha3()))
 								}
 							},
 							logs: receipt.logs.clone(),
@@ -1327,6 +1327,10 @@ mod tests {
 	}
 
 	fn transaction() -> SignedTransaction {
+		transaction_with_network_id(2)
+	}
+
+	fn transaction_with_network_id(id: u64) -> SignedTransaction {
 		let keypair = Random.generate().unwrap();
 		Transaction {
 			action: Action::Create,
@@ -1335,7 +1339,7 @@ mod tests {
 			gas: U256::from(100_000),
 			gas_price: U256::zero(),
 			nonce: U256::zero(),
-		}.sign(keypair.secret(), None)
+		}.sign(keypair.secret(), Some(id))
 	}
 
 	#[test]
@@ -1411,18 +1415,19 @@ mod tests {
 
 	#[test]
 	fn internal_seals_without_work() {
-		let miner = Miner::with_spec(&Spec::new_instant());
+		let spec = Spec::new_instant();
+		let miner = Miner::with_spec(&spec);
 
 		let client = generate_dummy_client(2);
 
-		assert_eq!(miner.import_external_transactions(&*client, vec![transaction().into()]).pop().unwrap().unwrap(), TransactionImportResult::Current);
+		assert_eq!(miner.import_external_transactions(&*client, vec![transaction_with_network_id(spec.network_id()).into()]).pop().unwrap().unwrap(), TransactionImportResult::Current);
 
 		miner.update_sealing(&*client);
 		client.flush_queue();
 		assert!(miner.pending_block().is_none());
 		assert_eq!(client.chain_info().best_block_number, 3 as BlockNumber);
 
-		assert_eq!(miner.import_own_transaction(&*client, PendingTransaction::new(transaction().into(), None)).unwrap(), TransactionImportResult::Current);
+		assert_eq!(miner.import_own_transaction(&*client, PendingTransaction::new(transaction_with_network_id(spec.network_id()).into(), None)).unwrap(), TransactionImportResult::Current);
 
 		miner.update_sealing(&*client);
 		client.flush_queue();
diff --git a/ethcore/src/spec/spec.rs b/ethcore/src/spec/spec.rs
index 35f1ca983..c258d89cb 100644
--- a/ethcore/src/spec/spec.rs
+++ b/ethcore/src/spec/spec.rs
@@ -57,6 +57,8 @@ pub struct CommonParams {
 	pub eip98_transition: BlockNumber,
 	/// Validate block receipts root.
 	pub validate_receipts_transition: u64,
+	/// Number of first block where EIP-86 (Metropolis) rules begin.
+	pub eip86_transition: BlockNumber,
 }
 
 impl From<ethjson::spec::Params> for CommonParams {
@@ -71,6 +73,7 @@ impl From<ethjson::spec::Params> for CommonParams {
 			fork_block: if let (Some(n), Some(h)) = (p.fork_block, p.fork_hash) { Some((n.into(), h.into())) } else { None },
 			eip98_transition: p.eip98_transition.map_or(0, Into::into),
 			validate_receipts_transition: p.validate_receipts_transition.map_or(0, Into::into),
+			eip86_transition: p.eip86_transition.map_or(BlockNumber::max_value(), Into::into),
 		}
 	}
 }
@@ -306,6 +309,7 @@ impl Spec {
 				call_type: CallType::None,
 			};
 			let mut substate = Substate::new();
+			state.kill_account(address);
 			{
 				let mut exec = Executive::new(&mut state, &env_info, self.engine.as_ref(), &factories.vm);
 				if let Err(e) = exec.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer) {
@@ -391,6 +395,7 @@ mod tests {
 
 	#[test]
 	fn genesis_constructor() {
+		::ethcore_logger::init_log();
 		let spec = Spec::new_test_constructor();
 		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let state = State::from_existing(db.boxed_clone(), spec.state_root(), spec.engine.account_start_nonce(), Default::default()).unwrap();
diff --git a/ethcore/src/state/mod.rs b/ethcore/src/state/mod.rs
index 12d7718cc..639fac053 100644
--- a/ethcore/src/state/mod.rs
+++ b/ethcore/src/state/mod.rs
@@ -1279,7 +1279,7 @@ mod tests {
 		info.number = 0x789b0;
 		let engine = &*Spec::new_test().engine;
 
-		println!("schedule.have_delegate_call: {:?}", engine.schedule(&info).have_delegate_call);
+		println!("schedule.have_delegate_call: {:?}", engine.schedule(info.number).have_delegate_call);
 
 		let t = Transaction {
 			nonce: 0.into(),
diff --git a/ethcore/src/tests/client.rs b/ethcore/src/tests/client.rs
index 6f0d7bc26..755c9f3ef 100644
--- a/ethcore/src/tests/client.rs
+++ b/ethcore/src/tests/client.rs
@@ -162,7 +162,7 @@ fn returns_logs_with_limit() {
 		to_block: BlockId::Latest,
 		address: None,
 		topics: vec![],
-		limit: Some(2),
+		limit: None,
 	});
 	assert_eq!(logs.len(), 0);
 }
diff --git a/ethcore/src/tests/helpers.rs b/ethcore/src/tests/helpers.rs
index 1391c37f4..548187e48 100644
--- a/ethcore/src/tests/helpers.rs
+++ b/ethcore/src/tests/helpers.rs
@@ -27,7 +27,6 @@ use builtin::Builtin;
 use state::*;
 use evm::Schedule;
 use engines::Engine;
-use env_info::EnvInfo;
 use ethereum;
 use ethereum::ethash::EthashParams;
 use miner::Miner;
@@ -72,7 +71,7 @@ impl Engine for TestEngine {
 		self.engine.builtins()
 	}
 
-	fn schedule(&self, _env_info: &EnvInfo) -> Schedule {
+	fn schedule(&self, _block_number: u64) -> Schedule {
 		let mut schedule = Schedule::new_frontier();
 		schedule.max_depth = self.max_depth;
 		schedule
@@ -201,7 +200,7 @@ pub fn generate_dummy_client_with_spec_accounts_and_data<F>(get_test_spec: F, ac
 				action: Action::Create,
 				data: vec![],
 				value: U256::zero(),
-			}.sign(kp.secret(), None), None).unwrap();
+			}.sign(kp.secret(), Some(test_spec.network_id())), None).unwrap();
 			n += 1;
 		}
 
diff --git a/ethcore/src/types/transaction.rs b/ethcore/src/types/transaction.rs
index 79e27d97d..f9e9f2c47 100644
--- a/ethcore/src/types/transaction.rs
+++ b/ethcore/src/types/transaction.rs
@@ -19,13 +19,16 @@
 use std::ops::Deref;
 use rlp::*;
 use util::sha3::Hashable;
-use util::{H256, Address, U256, Bytes, HeapSizeOf};
+use util::{H256, Address, U256, Bytes, HeapSizeOf, Uint};
 use ethkey::{Signature, Secret, Public, recover, public_to_address, Error as EthkeyError};
 use error::*;
 use evm::Schedule;
 use header::BlockNumber;
 use ethjson;
 
+/// Fake address for unsigned transactions as defined by EIP-86.
+pub const UNSIGNED_SENDER: Address = ::util::H160([0xff; 20]);
+
 #[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "ipc", binary)]
 /// Transaction action type.
@@ -110,8 +113,8 @@ impl HeapSizeOf for Transaction {
 impl From<ethjson::state::Transaction> for SignedTransaction {
 	fn from(t: ethjson::state::Transaction) -> Self {
 		let to: Option<ethjson::hash::Address> = t.to.into();
-		let secret = Secret::from_slice(&t.secret.0).expect("Valid secret expected.");
-		Transaction {
+		let secret = t.secret.map(|s| Secret::from_slice(&s.0).expect("Valid secret expected."));
+		let tx = Transaction {
 			nonce: t.nonce.into(),
 			gas_price: t.gas_price.into(),
 			gas: t.gas_limit.into(),
@@ -121,7 +124,11 @@ impl From<ethjson::state::Transaction> for SignedTransaction {
 			},
 			value: t.value.into(),
 			data: t.data.into(),
-		}.sign(&secret, None)
+		};
+		match secret {
+			Some(s) => tx.sign(&s, None),
+			None => tx.null_sign(),
+		}
 	}
 }
 
@@ -180,8 +187,8 @@ impl Transaction {
 	pub fn invalid_sign(self) -> UnverifiedTransaction {
 		UnverifiedTransaction {
 			unsigned: self,
-			r: U256::default(),
-			s: U256::default(),
+			r: U256::one(),
+			s: U256::one(),
 			v: 0,
 			hash: 0.into(),
 		}.compute_hash()
@@ -192,13 +199,28 @@ impl Transaction {
 		SignedTransaction {
 			transaction: UnverifiedTransaction {
 				unsigned: self,
-				r: U256::default(),
-				s: U256::default(),
+				r: U256::one(),
+				s: U256::one(),
 				v: 0,
 				hash: 0.into(),
 			}.compute_hash(),
 			sender: from,
-			public: Public::default(),
+			public: None,
+		}
+	}
+
+	/// Add EIP-86 compatible empty signature.
+	pub fn null_sign(self) -> SignedTransaction {
+		SignedTransaction {
+			transaction: UnverifiedTransaction {
+				unsigned: self,
+				r: U256::zero(),
+				s: U256::zero(),
+				v: 0,
+				hash: 0.into(),
+			}.compute_hash(),
+			sender: UNSIGNED_SENDER,
+			public: None,
 		}
 	}
 
@@ -276,6 +298,11 @@ impl UnverifiedTransaction {
 		self
 	}
 
+	/// Checks is signature is empty.
+	pub fn is_unsigned(&self) -> bool {
+		self.r.is_zero() && self.s.is_zero()
+	}
+
 	/// Append object with a signature into RLP stream
 	fn rlp_append_sealed_transaction(&self, s: &mut RlpStream) {
 		s.begin_list(9);
@@ -307,6 +334,7 @@ impl UnverifiedTransaction {
 	/// The network ID, or `None` if this is a global transaction.
 	pub fn network_id(&self) -> Option<u64> {
 		match self.v {
+			v if self.is_unsigned() => Some(v),
 			v if v > 36 => Some((v - 35) / 2),
 			_ => None,
 		}
@@ -340,21 +368,33 @@ impl UnverifiedTransaction {
 	// TODO: consider use in block validation.
 	#[cfg(test)]
 	#[cfg(feature = "json-tests")]
-	pub fn validate(self, schedule: &Schedule, require_low: bool, allow_network_id_of_one: bool) -> Result<UnverifiedTransaction, Error> {
-		if require_low && !self.signature().is_low_s() {
+	pub fn validate(self, schedule: &Schedule, require_low: bool, allow_network_id_of_one: bool, allow_empty_signature: bool) -> Result<UnverifiedTransaction, Error> {
+		let chain_id = if allow_network_id_of_one { Some(1) } else { None };
+		self.verify_basic(require_low, chain_id, allow_empty_signature)?;
+		if !allow_empty_signature || !self.is_unsigned() {
+			self.recover_public()?;
+		}
+		if self.gas < U256::from(self.gas_required(&schedule)) {
+			return Err(TransactionError::InvalidGasLimit(::util::OutOfBounds{min: Some(U256::from(self.gas_required(&schedule))), max: None, found: self.gas}).into())
+		}
+		Ok(self)
+	}
+
+	/// Verify basic signature params. Does not attempt sender recovery.
+	pub fn verify_basic(&self, check_low_s: bool, chain_id: Option<u64>, allow_empty_signature: bool) -> Result<(), Error> {
+		if check_low_s && !(allow_empty_signature && self.is_unsigned()) {
+			self.check_low_s()?;
+		}
+		// EIP-86: Transactions of this form MUST have gasprice = 0, nonce = 0, value = 0, and do NOT increment the nonce of account 0.
+		if allow_empty_signature && self.is_unsigned() && !(self.gas_price.is_zero() && self.value.is_zero() && self.nonce.is_zero()) {
 			return Err(EthkeyError::InvalidSignature.into())
 		}
-		match self.network_id() {
-			None => {},
-			Some(1) if allow_network_id_of_one => {},
+		match (self.network_id(), chain_id) {
+			(None, _) => {},
+			(Some(n), Some(m)) if n == m => {},
 			_ => return Err(TransactionError::InvalidNetworkId.into()),
-		}
-		self.recover_public()?;
-		if self.gas < U256::from(self.gas_required(&schedule)) {
-			Err(TransactionError::InvalidGasLimit(::util::OutOfBounds{min: Some(U256::from(self.gas_required(&schedule))), max: None, found: self.gas}).into())
-		} else {
-			Ok(self)
-		}
+		};
+		Ok(())
 	}
 }
 
@@ -363,7 +403,7 @@ impl UnverifiedTransaction {
 pub struct SignedTransaction {
 	transaction: UnverifiedTransaction,
 	sender: Address,
-	public: Public,
+	public: Option<Public>,
 }
 
 impl HeapSizeOf for SignedTransaction {
@@ -392,13 +432,21 @@ impl From<SignedTransaction> for UnverifiedTransaction {
 impl SignedTransaction {
 	/// Try to verify transaction and recover sender.
 	pub fn new(transaction: UnverifiedTransaction) -> Result<Self, Error> {
-		let public = transaction.recover_public()?;
-		let sender = public_to_address(&public);
-		Ok(SignedTransaction {
-			transaction: transaction,
-			sender: sender,
-			public: public,
-		})
+		if transaction.is_unsigned() {
+			Ok(SignedTransaction {
+				transaction: transaction,
+				sender: UNSIGNED_SENDER,
+				public: None,
+			})
+		} else {
+			let public = transaction.recover_public()?;
+			let sender = public_to_address(&public);
+			Ok(SignedTransaction {
+				transaction: transaction,
+				sender: sender,
+				public: Some(public),
+			})
+		}
 	}
 
 	/// Returns transaction sender.
@@ -407,9 +455,14 @@ impl SignedTransaction {
 	}
 
 	/// Returns a public key of the sender.
-	pub fn public_key(&self) -> Public {
+	pub fn public_key(&self) -> Option<Public> {
 		self.public
 	}
+
+	/// Checks is signature is empty.
+	pub fn is_unsigned(&self) -> bool {
+		self.transaction.is_unsigned()
+	}
 }
 
 /// Signed Transaction that is a part of canon blockchain.
@@ -435,6 +488,9 @@ impl LocalizedTransaction {
 		if let Some(sender) = self.cached_sender {
 			return sender;
 		}
+		if self.is_unsigned() {
+			return UNSIGNED_SENDER.clone();
+		}
 		let sender = public_to_address(&self.recover_public()
 			.expect("LocalizedTransaction is always constructed from transaction from blockchain; Blockchain only stores verified transactions; qed"));
 		self.cached_sender = Some(sender);
diff --git a/evmbin/src/ext.rs b/evmbin/src/ext.rs
index a293ccc80..781120c36 100644
--- a/evmbin/src/ext.rs
+++ b/evmbin/src/ext.rs
@@ -20,7 +20,7 @@ use std::sync::Arc;
 use std::collections::HashMap;
 use util::{U256, H256, Address, Bytes, trie};
 use ethcore::client::EnvInfo;
-use ethcore::evm::{self, Ext, ContractCreateResult, MessageCallResult, Schedule, CallType};
+use ethcore::evm::{self, Ext, ContractCreateResult, MessageCallResult, Schedule, CallType, CreateContractAddress};
 
 pub struct FakeExt {
 	schedule: Schedule,
@@ -31,7 +31,7 @@ pub struct FakeExt {
 impl Default for FakeExt {
 	fn default() -> Self {
 		FakeExt {
-			schedule: Schedule::new_post_eip150(usize::max_value(), true, true, true),
+			schedule: Schedule::new_post_eip150(usize::max_value(), true, true, true, true),
 			store: HashMap::new(),
 			depth: 1,
 		}
@@ -68,7 +68,7 @@ impl Ext for FakeExt {
 		unimplemented!();
 	}
 
-	fn create(&mut self, _gas: &U256, _value: &U256, _code: &[u8]) -> ContractCreateResult {
+	fn create(&mut self, _gas: &U256, _value: &U256, _code: &[u8], _address: CreateContractAddress) -> ContractCreateResult {
 		unimplemented!();
 	}
 
diff --git a/json/src/spec/params.rs b/json/src/spec/params.rs
index aa2c15da4..31b5cf68a 100644
--- a/json/src/spec/params.rs
+++ b/json/src/spec/params.rs
@@ -56,6 +56,9 @@ pub struct Params {
 	/// See `CommonParams` docs.
 	#[serde(rename="validateReceiptsTransition")]
 	pub validate_receipts_transition: Option<Uint>,
+	/// See `CommonParams` docs.
+	#[serde(rename="eip86Transition")]
+	pub eip86_transition: Option<Uint>,
 }
 
 #[cfg(test)]
diff --git a/json/src/state/test.rs b/json/src/state/test.rs
index 5cc2b5f4f..ceaccfd17 100644
--- a/json/src/state/test.rs
+++ b/json/src/state/test.rs
@@ -75,7 +75,7 @@ pub struct MultiTransaction {
 	pub nonce: Uint,
 	/// Secret key.
 	#[serde(rename="secretKey")]
-	pub secret: H256,
+	pub secret: Option<H256>,
 	/// To.
 	pub to: MaybeEmpty<Address>,
 	/// Value set.
diff --git a/json/src/state/transaction.rs b/json/src/state/transaction.rs
index 608be68fe..606c40f21 100644
--- a/json/src/state/transaction.rs
+++ b/json/src/state/transaction.rs
@@ -36,7 +36,7 @@ pub struct Transaction {
 	pub nonce: Uint,
 	/// Secret key.
 	#[serde(rename="secretKey")]
-	pub secret: H256,
+	pub secret: Option<H256>,
 	/// To.
 	pub to: MaybeEmpty<Address>,
 	/// Value.
diff --git a/parity/rpc_apis.rs b/parity/rpc_apis.rs
index 15fe660b2..7643e0010 100644
--- a/parity/rpc_apis.rs
+++ b/parity/rpc_apis.rs
@@ -395,6 +395,7 @@ impl Dependencies for LightDependencies {
 						false => None,
 					};
 					handler.extend_with(light::ParityClient::new(
+						self.client.clone(),
 						Arc::new(dispatcher.clone()),
 						self.secret_store.clone(),
 						self.logger.clone(),
diff --git a/rpc/src/v1/impls/eth.rs b/rpc/src/v1/impls/eth.rs
index bce460350..17835485c 100644
--- a/rpc/src/v1/impls/eth.rs
+++ b/rpc/src/v1/impls/eth.rs
@@ -103,6 +103,7 @@ pub struct EthClient<C, SN: ?Sized, S: ?Sized, M, EM> where
 	external_miner: Arc<EM>,
 	seed_compute: Mutex<SeedHashCompute>,
 	options: EthClientOptions,
+	eip86_transition: u64,
 }
 
 impl<C, SN: ?Sized, S: ?Sized, M, EM> EthClient<C, SN, S, M, EM> where
@@ -131,6 +132,7 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> EthClient<C, SN, S, M, EM> where
 			external_miner: em.clone(),
 			seed_compute: Mutex::new(SeedHashCompute::new()),
 			options: options,
+			eip86_transition: client.eip86_transition(),
 		}
 	}
 
@@ -166,7 +168,7 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> EthClient<C, SN, S, M, EM> where
 						seal_fields: view.seal().into_iter().map(Into::into).collect(),
 						uncles: block.uncle_hashes().into_iter().map(Into::into).collect(),
 						transactions: match include_txs {
-							true => BlockTransactions::Full(block.view().localized_transactions().into_iter().map(Into::into).collect()),
+							true => BlockTransactions::Full(block.view().localized_transactions().into_iter().map(|t| Transaction::from_localized(t, self.eip86_transition)).collect()),
 							false => BlockTransactions::Hashes(block.transaction_hashes().into_iter().map(Into::into).collect()),
 						},
 						extra_data: Bytes::new(view.extra_data()),
@@ -180,7 +182,7 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> EthClient<C, SN, S, M, EM> where
 
 	fn transaction(&self, id: TransactionId) -> Result<Option<Transaction>, Error> {
 		match take_weak!(self.client).transaction(id) {
-			Some(t) => Ok(Some(Transaction::from(t))),
+			Some(t) => Ok(Some(Transaction::from_localized(t, self.eip86_transition))),
 			None => Ok(None),
 		}
 	}
@@ -507,7 +509,8 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> Eth for EthClient<C, SN, S, M, EM> where
 		let hash: H256 = hash.into();
 		let miner = take_weak!(self.miner);
 		let client = take_weak!(self.client);
-		Ok(self.transaction(TransactionId::Hash(hash))?.or_else(|| miner.transaction(client.chain_info().best_block_number, &hash).map(Into::into)))
+		let block_number = client.chain_info().best_block_number;
+		Ok(self.transaction(TransactionId::Hash(hash))?.or_else(|| miner.transaction(block_number, &hash).map(|t| Transaction::from_pending(t, block_number, self.eip86_transition))))
 	}
 
 	fn transaction_by_block_hash_and_index(&self, hash: RpcH256, index: Index) -> Result<Option<Transaction>, Error> {
diff --git a/rpc/src/v1/impls/light/eth.rs b/rpc/src/v1/impls/light/eth.rs
index bd55f8c63..e45397f7d 100644
--- a/rpc/src/v1/impls/light/eth.rs
+++ b/rpc/src/v1/impls/light/eth.rs
@@ -25,7 +25,7 @@ use jsonrpc_core::Error;
 use jsonrpc_macros::Trailing;
 
 use light::cache::Cache as LightDataCache;
-use light::client::Client as LightClient;
+use light::client::{Client as LightClient, LightChainClient};
 use light::{cht, TransactionQueue};
 use light::on_demand::{request, OnDemand};
 
@@ -123,6 +123,7 @@ impl EthClient {
 	fn rich_block(&self, id: BlockId, include_txs: bool) -> BoxFuture<Option<RichBlock>, Error> {
 		let (on_demand, sync) = (self.on_demand.clone(), self.sync.clone());
 		let (client, engine) = (self.client.clone(), self.client.engine().clone());
+		let eip86_transition = self.client.eip86_transition();
 
 		// helper for filling out a rich block once we've got a block and a score.
 		let fill_rich = move |block: encoded::Block, score: Option<U256>| {
@@ -149,8 +150,8 @@ impl EthClient {
 					seal_fields: header.seal().into_iter().cloned().map(Into::into).collect(),
 					uncles: block.uncle_hashes().into_iter().map(Into::into).collect(),
 					transactions: match include_txs {
-						true => BlockTransactions::Full(block.view().localized_transactions().into_iter().map(Into::into).collect()),
-						false => BlockTransactions::Hashes(block.transaction_hashes().into_iter().map(Into::into).collect()),
+						true => BlockTransactions::Full(block.view().localized_transactions().into_iter().map(|t| Transaction::from_localized(t, eip86_transition)).collect()),
+						_ => BlockTransactions::Hashes(block.transaction_hashes().into_iter().map(Into::into).collect()),
 					},
 					extra_data: Bytes::new(header.extra_data().to_vec()),
 				},
diff --git a/rpc/src/v1/impls/light/parity.rs b/rpc/src/v1/impls/light/parity.rs
index 96fdb61de..cacf33db5 100644
--- a/rpc/src/v1/impls/light/parity.rs
+++ b/rpc/src/v1/impls/light/parity.rs
@@ -28,6 +28,8 @@ use ethstore::random_phrase;
 use ethsync::LightSyncProvider;
 use ethcore::account_provider::AccountProvider;
 
+use light::client::LightChainClient;
+
 use jsonrpc_core::Error;
 use jsonrpc_macros::Trailing;
 use v1::helpers::{errors, ipfs, SigningQueue, SignerService, NetworkSettings};
@@ -53,11 +55,13 @@ pub struct ParityClient {
 	signer: Option<Arc<SignerService>>,
 	dapps_interface: Option<String>,
 	dapps_port: Option<u16>,
+	eip86_transition: u64,
 }
 
 impl ParityClient {
 	/// Creates new `ParityClient`.
 	pub fn new(
+		client: Arc<LightChainClient>,
 		light_dispatch: Arc<LightDispatcher>,
 		accounts: Arc<AccountProvider>,
 		logger: Arc<RotatingLogger>,
@@ -74,6 +78,7 @@ impl ParityClient {
 			signer: signer,
 			dapps_interface: dapps_interface,
 			dapps_port: dapps_port,
+			eip86_transition: client.eip86_transition(),
 		}
 	}
 
@@ -245,7 +250,7 @@ impl Parity for ParityClient {
 		Ok(
 			txq.ready_transactions(chain_info.best_block_number, chain_info.best_block_timestamp)
 				.into_iter()
-				.map(Into::into)
+				.map(|tx| Transaction::from_pending(tx, chain_info.best_block_number, self.eip86_transition))
 				.collect::<Vec<_>>()
 		)
 	}
@@ -256,7 +261,7 @@ impl Parity for ParityClient {
 		Ok(
 			txq.future_transactions(chain_info.best_block_number, chain_info.best_block_timestamp)
 				.into_iter()
-				.map(Into::into)
+				.map(|tx| Transaction::from_pending(tx, chain_info.best_block_number, self.eip86_transition))
 				.collect::<Vec<_>>()
 		)
 	}
diff --git a/rpc/src/v1/impls/parity.rs b/rpc/src/v1/impls/parity.rs
index 78592a91c..1b62b7f81 100644
--- a/rpc/src/v1/impls/parity.rs
+++ b/rpc/src/v1/impls/parity.rs
@@ -69,6 +69,7 @@ pub struct ParityClient<C, M, S: ?Sized, U> where
 	signer: Option<Arc<SignerService>>,
 	dapps_interface: Option<String>,
 	dapps_port: Option<u16>,
+	eip86_transition: u64,
 }
 
 impl<C, M, S: ?Sized, U> ParityClient<C, M, S, U> where
@@ -103,6 +104,7 @@ impl<C, M, S: ?Sized, U> ParityClient<C, M, S, U> where
 			signer: signer,
 			dapps_interface: dapps_interface,
 			dapps_port: dapps_port,
+			eip86_transition: client.eip86_transition(),
 		}
 	}
 
@@ -288,11 +290,13 @@ impl<C, M, S: ?Sized, U> Parity for ParityClient<C, M, S, U> where
 	}
 
 	fn pending_transactions(&self) -> Result<Vec<Transaction>, Error> {
-		Ok(take_weak!(self.miner).pending_transactions().into_iter().map(Into::into).collect::<Vec<_>>())
+		let block_number = take_weak!(self.client).chain_info().best_block_number;
+		Ok(take_weak!(self.miner).pending_transactions().into_iter().map(|t| Transaction::from_pending(t, block_number, self.eip86_transition)).collect::<Vec<_>>())
 	}
 
 	fn future_transactions(&self) -> Result<Vec<Transaction>, Error> {
-		Ok(take_weak!(self.miner).future_transactions().into_iter().map(Into::into).collect::<Vec<_>>())
+		let block_number = take_weak!(self.client).chain_info().best_block_number;
+		Ok(take_weak!(self.miner).future_transactions().into_iter().map(|t| Transaction::from_pending(t, block_number, self.eip86_transition)).collect::<Vec<_>>())
 	}
 
 	fn pending_transactions_stats(&self) -> Result<BTreeMap<H256, TransactionStats>, Error> {
@@ -305,9 +309,10 @@ impl<C, M, S: ?Sized, U> Parity for ParityClient<C, M, S, U> where
 
 	fn local_transactions(&self) -> Result<BTreeMap<H256, LocalTransactionStatus>, Error> {
 		let transactions = take_weak!(self.miner).local_transactions();
+		let block_number = take_weak!(self.client).chain_info().best_block_number;
 		Ok(transactions
 		   .into_iter()
-		   .map(|(hash, status)| (hash.into(), status.into()))
+		   .map(|(hash, status)| (hash.into(), LocalTransactionStatus::from(status, block_number, self.eip86_transition)))
 		   .collect()
 		)
 	}
diff --git a/rpc/src/v1/impls/parity_set.rs b/rpc/src/v1/impls/parity_set.rs
index 19483635c..7bd8bcb91 100644
--- a/rpc/src/v1/impls/parity_set.rs
+++ b/rpc/src/v1/impls/parity_set.rs
@@ -39,9 +39,12 @@ pub struct ParitySetClient<C, M, U, F = fetch::Client> {
 	updater: Weak<U>,
 	net: Weak<ManageNetwork>,
 	fetch: F,
+	eip86_transition: u64,
 }
 
-impl<C, M, U, F> ParitySetClient<C, M, U, F> {
+impl<C, M, U, F> ParitySetClient<C, M, U, F>
+	where C: MiningBlockChainClient + 'static,
+{
 	/// Creates new `ParitySetClient` with given `Fetch`.
 	pub fn new(client: &Arc<C>, miner: &Arc<M>, updater: &Arc<U>, net: &Arc<ManageNetwork>, fetch: F) -> Self {
 		ParitySetClient {
@@ -50,6 +53,7 @@ impl<C, M, U, F> ParitySetClient<C, M, U, F> {
 			updater: Arc::downgrade(updater),
 			net: Arc::downgrade(net),
 			fetch: fetch,
+			eip86_transition: client.eip86_transition(),
 		}
 	}
 }
@@ -175,8 +179,9 @@ impl<C, M, U, F> ParitySet for ParitySetClient<C, M, U, F> where
 	fn remove_transaction(&self, hash: H256) -> Result<Option<Transaction>, Error> {
 		let miner = take_weak!(self.miner);
 		let client = take_weak!(self.client);
+		let block_number = take_weak!(self.client).chain_info().best_block_number;
 		let hash = hash.into();
 
-		Ok(miner.remove_pending_transaction(&*client, &hash).map(Into::into))
+		Ok(miner.remove_pending_transaction(&*client, &hash).map(|t| Transaction::from_pending(t, block_number, self.eip86_transition)))
 	}
 }
diff --git a/rpc/src/v1/tests/mocked/parity_set.rs b/rpc/src/v1/tests/mocked/parity_set.rs
index 65d69775a..4383ee560 100644
--- a/rpc/src/v1/tests/mocked/parity_set.rs
+++ b/rpc/src/v1/tests/mocked/parity_set.rs
@@ -227,7 +227,7 @@ fn rpc_parity_remove_transaction() {
 	let hash = signed.hash();
 
 	let request = r#"{"jsonrpc": "2.0", "method": "parity_removeTransaction", "params":[""#.to_owned() + &format!("0x{:?}", hash) + r#""], "id": 1}"#;
-	let response = r#"{"jsonrpc":"2.0","result":{"blockHash":null,"blockNumber":null,"condition":null,"creates":null,"from":"0x0000000000000000000000000000000000000002","gas":"0x76c0","gasPrice":"0x9184e72a000","hash":"0x0072c69d780cdfbfc02fed5c7d184151f9a166971d045e55e27695aaa5bcb55e","input":"0x","networkId":null,"nonce":"0x1","publicKey":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","r":"0x0","raw":"0xe9018609184e72a0008276c0940000000000000000000000000000000000000005849184e72a80808080","s":"0x0","standardV":"0x4","to":"0x0000000000000000000000000000000000000005","transactionIndex":null,"v":"0x0","value":"0x9184e72a"},"id":1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":{"blockHash":null,"blockNumber":null,"condition":null,"creates":null,"from":"0x0000000000000000000000000000000000000002","gas":"0x76c0","gasPrice":"0x9184e72a000","hash":"0xa2e0da8a8064e0b9f93e95a53c2db6d01280efb8ac72a708d25487e67dd0f8fc","input":"0x","networkId":null,"nonce":"0x1","publicKey":null,"r":"0x1","raw":"0xe9018609184e72a0008276c0940000000000000000000000000000000000000005849184e72a80800101","s":"0x1","standardV":"0x4","to":"0x0000000000000000000000000000000000000005","transactionIndex":null,"v":"0x0","value":"0x9184e72a"},"id":1}"#;
 
 	miner.pending_transactions.lock().insert(hash, signed);
 	assert_eq!(io.handle_request_sync(&request), Some(response.to_owned()));
diff --git a/rpc/src/v1/tests/mocked/signing.rs b/rpc/src/v1/tests/mocked/signing.rs
index 70b163023..9307d95b6 100644
--- a/rpc/src/v1/tests/mocked/signing.rs
+++ b/rpc/src/v1/tests/mocked/signing.rs
@@ -304,7 +304,7 @@ fn should_add_sign_transaction_to_the_queue() {
 		r#""input":"0x","# +
 		&format!("\"networkId\":{},", t.network_id().map_or("null".to_owned(), |n| format!("{}", n))) +
 		r#""nonce":"0x1","# +
-		&format!("\"publicKey\":\"0x{:?}\",", t.public_key()) +
+		&format!("\"publicKey\":\"0x{:?}\",", t.public_key().unwrap()) +
 		&format!("\"r\":\"0x{}\",", U256::from(signature.r()).to_hex()) +
 		&format!("\"raw\":\"0x{}\",", rlp.to_hex()) +
 		&format!("\"s\":\"0x{}\",", U256::from(signature.s()).to_hex()) +
diff --git a/rpc/src/v1/types/transaction.rs b/rpc/src/v1/types/transaction.rs
index b40dec3fb..e8cd1602f 100644
--- a/rpc/src/v1/types/transaction.rs
+++ b/rpc/src/v1/types/transaction.rs
@@ -16,8 +16,9 @@
 
 use serde::{Serialize, Serializer};
 use serde::ser::SerializeStruct;
+use util::Hashable;
 use ethcore::miner;
-use ethcore::contract_address;
+use ethcore::{contract_address, CreateContractAddress};
 use ethcore::transaction::{LocalizedTransaction, Action, PendingTransaction, SignedTransaction};
 use v1::helpers::errors;
 use v1::types::{Bytes, H160, H256, U256, H512, TransactionCondition};
@@ -158,9 +159,11 @@ pub struct RichRawTransaction {
 	pub transaction: Transaction
 }
 
+
 impl From<SignedTransaction> for RichRawTransaction {
 	fn from(t: SignedTransaction) -> Self {
-		let tx: Transaction = t.into();
+		// TODO: change transition to 0 when EIP-86 is commonly used.
+		let tx: Transaction = Transaction::from_signed(t, 0, u64::max_value());
 		RichRawTransaction {
 			raw: tx.raw.clone(),
 			transaction: tx,
@@ -168,9 +171,11 @@ impl From<SignedTransaction> for RichRawTransaction {
 	}
 }
 
-impl From<LocalizedTransaction> for Transaction {
-	fn from(mut t: LocalizedTransaction) -> Transaction {
+impl Transaction {
+	/// Convert `LocalizedTransaction` into RPC Transaction.
+	pub fn from_localized(mut t: LocalizedTransaction, eip86_transition: u64) -> Transaction {
 		let signature = t.signature();
+		let scheme = if t.block_number >= eip86_transition { CreateContractAddress::FromCodeHash } else { CreateContractAddress::FromSenderAndNonce };
 		Transaction {
 			hash: t.hash().into(),
 			nonce: t.nonce.into(),
@@ -187,7 +192,7 @@ impl From<LocalizedTransaction> for Transaction {
 			gas: t.gas.into(),
 			input: Bytes::new(t.data.clone()),
 			creates: match t.action {
-				Action::Create => Some(contract_address(&t.sender(), &t.nonce).into()),
+				Action::Create => Some(contract_address(scheme, &t.sender(), &t.nonce, &t.data.sha3()).into()),
 				Action::Call(_) => None,
 			},
 			raw: ::rlp::encode(&t.signed).to_vec().into(),
@@ -200,11 +205,11 @@ impl From<LocalizedTransaction> for Transaction {
 			condition: None,
 		}
 	}
-}
 
-impl From<SignedTransaction> for Transaction {
-	fn from(t: SignedTransaction) -> Transaction {
+	/// Convert `SignedTransaction` into RPC Transaction.
+	pub fn from_signed(t: SignedTransaction, block_number: u64, eip86_transition: u64) -> Transaction {
 		let signature = t.signature();
+		let scheme = if block_number >= eip86_transition { CreateContractAddress::FromCodeHash } else { CreateContractAddress::FromSenderAndNonce };
 		Transaction {
 			hash: t.hash().into(),
 			nonce: t.nonce.into(),
@@ -221,11 +226,11 @@ impl From<SignedTransaction> for Transaction {
 			gas: t.gas.into(),
 			input: Bytes::new(t.data.clone()),
 			creates: match t.action {
-				Action::Create => Some(contract_address(&t.sender(), &t.nonce).into()),
+				Action::Create => Some(contract_address(scheme, &t.sender(), &t.nonce, &t.data.sha3()).into()),
 				Action::Call(_) => None,
 			},
 			raw: ::rlp::encode(&t).to_vec().into(),
-			public_key: Some(t.public_key().into()),
+			public_key: t.public_key().map(Into::into),
 			network_id: t.network_id(),
 			standard_v: t.standard_v().into(),
 			v: t.original_v().into(),
@@ -234,28 +239,28 @@ impl From<SignedTransaction> for Transaction {
 			condition: None,
 		}
 	}
-}
 
-impl From<PendingTransaction> for Transaction {
-	fn from(t: PendingTransaction) -> Transaction {
-		let mut r = Transaction::from(t.transaction);
+	/// Convert `PendingTransaction` into RPC Transaction.
+	pub fn from_pending(t: PendingTransaction, block_number: u64, eip86_transition: u64) -> Transaction {
+		let mut r = Transaction::from_signed(t.transaction, block_number, eip86_transition);
 		r.condition = t.condition.map(|b| b.into());
 		r
 	}
 }
 
-impl From<miner::LocalTransactionStatus> for LocalTransactionStatus {
-	fn from(s: miner::LocalTransactionStatus) -> Self {
+impl LocalTransactionStatus {
+	/// Convert `LocalTransactionStatus` into RPC `LocalTransactionStatus`.
+	pub fn from(s: miner::LocalTransactionStatus, block_number: u64, eip86_transition: u64) -> Self {
 		use ethcore::miner::LocalTransactionStatus::*;
 		match s {
 			Pending => LocalTransactionStatus::Pending,
 			Future => LocalTransactionStatus::Future,
-			Mined(tx) => LocalTransactionStatus::Mined(tx.into()),
-			Dropped(tx) => LocalTransactionStatus::Dropped(tx.into()),
-			Rejected(tx, err) => LocalTransactionStatus::Rejected(tx.into(), errors::transaction_message(err)),
-			Replaced(tx, gas_price, hash) => LocalTransactionStatus::Replaced(tx.into(), gas_price.into(), hash.into()),
-			Invalid(tx) => LocalTransactionStatus::Invalid(tx.into()),
-			Canceled(tx) => LocalTransactionStatus::Canceled(tx.into()),
+			Mined(tx) => LocalTransactionStatus::Mined(Transaction::from_signed(tx, block_number, eip86_transition)),
+			Dropped(tx) => LocalTransactionStatus::Dropped(Transaction::from_signed(tx, block_number, eip86_transition)),
+			Rejected(tx, err) => LocalTransactionStatus::Rejected(Transaction::from_signed(tx, block_number, eip86_transition), errors::transaction_message(err)),
+			Replaced(tx, gas_price, hash) => LocalTransactionStatus::Replaced(Transaction::from_signed(tx, block_number, eip86_transition), gas_price.into(), hash.into()),
+			Invalid(tx) => LocalTransactionStatus::Invalid(Transaction::from_signed(tx, block_number, eip86_transition)),
+			Canceled(tx) => LocalTransactionStatus::Canceled(Transaction::from_pending(tx, block_number, eip86_transition)),
 		}
 	}
 }
diff --git a/sync/src/tests/consensus.rs b/sync/src/tests/consensus.rs
index 00a7452c4..6b91b11c6 100644
--- a/sync/src/tests/consensus.rs
+++ b/sync/src/tests/consensus.rs
@@ -41,7 +41,7 @@ impl IoHandler<ClientIoMessage> for TestIoHandler {
 	}
 }
 
-fn new_tx(secret: &Secret, nonce: U256) -> PendingTransaction {
+fn new_tx(secret: &Secret, nonce: U256, network_id: u64) -> PendingTransaction {
 	let signed = Transaction {
 		nonce: nonce.into(),
 		gas_price: 0.into(),
@@ -49,7 +49,7 @@ fn new_tx(secret: &Secret, nonce: U256) -> PendingTransaction {
 		action: Action::Call(Address::default()),
 		value: 0.into(),
 		data: Vec::new(),
-	}.sign(secret, None);
+	}.sign(secret, Some(network_id));
 	PendingTransaction::new(signed, None)
 }
 
@@ -61,6 +61,7 @@ fn authority_round() {
 	ap.insert_account(s0.secret().clone(), "").unwrap();
 	ap.insert_account(s1.secret().clone(), "").unwrap();
 
+	let network_id = Spec::new_test_round().network_id();
 	let mut net = TestNet::with_spec_and_accounts(2, SyncConfig::default(), Spec::new_test_round, Some(ap));
 	let io_handler0: Arc<IoHandler<ClientIoMessage>> = Arc::new(TestIoHandler { client: net.peer(0).chain.clone() });
 	let io_handler1: Arc<IoHandler<ClientIoMessage>> = Arc::new(TestIoHandler { client: net.peer(1).chain.clone() });
@@ -74,15 +75,15 @@ fn authority_round() {
 	// exchange statuses
 	net.sync();
 	// Trigger block proposal
-	net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 0.into())).unwrap();
-	net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 0.into())).unwrap();
+	net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 0.into(), network_id)).unwrap();
+	net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 0.into(), network_id)).unwrap();
 	// Sync a block
 	net.sync();
 	assert_eq!(net.peer(0).chain.chain_info().best_block_number, 1);
 	assert_eq!(net.peer(1).chain.chain_info().best_block_number, 1);
 
-	net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 1.into())).unwrap();
-	net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 1.into())).unwrap();
+	net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 1.into(), network_id)).unwrap();
+	net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 1.into(), network_id)).unwrap();
 	// Move to next proposer step.
 	net.peer(0).chain.engine().step();
 	net.peer(1).chain.engine().step();
@@ -91,8 +92,8 @@ fn authority_round() {
 	assert_eq!(net.peer(1).chain.chain_info().best_block_number, 2);
 
 	// Fork the network with equal height.
-	net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 2.into())).unwrap();
-	net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 2.into())).unwrap();
+	net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 2.into(), network_id)).unwrap();
+	net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 2.into(), network_id)).unwrap();
 	// Let both nodes build one block.
 	net.peer(0).chain.engine().step();
 	let early_hash = net.peer(0).chain.chain_info().best_block_hash;
@@ -114,8 +115,8 @@ fn authority_round() {
 	assert_eq!(ci1.best_block_hash, early_hash);
 
 	// Selfish miner
-	net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 3.into())).unwrap();
-	net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 3.into())).unwrap();
+	net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 3.into(), network_id)).unwrap();
+	net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 3.into(), network_id)).unwrap();
 	// Node 0 is an earlier primary.
 	net.peer(0).chain.engine().step();
 	assert_eq!(net.peer(0).chain.chain_info().best_block_number, 4);
@@ -126,7 +127,7 @@ fn authority_round() {
 	// Node 1 makes 2 blocks, but is a later primary on the first one.
 	net.peer(1).chain.engine().step();
 	net.peer(1).chain.engine().step();
-	net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 4.into())).unwrap();
+	net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 4.into(), network_id)).unwrap();
 	net.peer(1).chain.engine().step();
 	net.peer(1).chain.engine().step();
 	assert_eq!(net.peer(1).chain.chain_info().best_block_number, 5);
@@ -147,6 +148,7 @@ fn tendermint() {
 	ap.insert_account(s0.secret().clone(), "").unwrap();
 	ap.insert_account(s1.secret().clone(), "").unwrap();
 
+	let network_id = Spec::new_test_tendermint().network_id();
 	let mut net = TestNet::with_spec_and_accounts(2, SyncConfig::default(), Spec::new_test_tendermint, Some(ap));
 	let io_handler0: Arc<IoHandler<ClientIoMessage>> = Arc::new(TestIoHandler { client: net.peer(0).chain.clone() });
 	let io_handler1: Arc<IoHandler<ClientIoMessage>> = Arc::new(TestIoHandler { client: net.peer(1).chain.clone() });
@@ -162,7 +164,7 @@ fn tendermint() {
 	// Exhange statuses
 	net.sync();
 	// Propose
-	net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 0.into())).unwrap();
+	net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 0.into(), network_id)).unwrap();
 	net.sync();
 	// Propose timeout, synchronous for now
 	net.peer(0).chain.engine().step();
@@ -173,7 +175,7 @@ fn tendermint() {
 	assert_eq!(net.peer(0).chain.chain_info().best_block_number, 1);
 	assert_eq!(net.peer(1).chain.chain_info().best_block_number, 1);
 
-	net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 0.into())).unwrap();
+	net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 0.into(), network_id)).unwrap();
 	// Commit timeout
 	net.peer(0).chain.engine().step();
 	net.peer(1).chain.engine().step();
@@ -187,8 +189,8 @@ fn tendermint() {
 	assert_eq!(net.peer(0).chain.chain_info().best_block_number, 2);
 	assert_eq!(net.peer(1).chain.chain_info().best_block_number, 2);
 
-	net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 1.into())).unwrap();
-	net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 1.into())).unwrap();
+	net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 1.into(), network_id)).unwrap();
+	net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 1.into(), network_id)).unwrap();
 	// Peers get disconnected.
 	// Commit
 	net.peer(0).chain.engine().step();
@@ -196,8 +198,8 @@ fn tendermint() {
 	// Propose
 	net.peer(0).chain.engine().step();
 	net.peer(1).chain.engine().step();
-	net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 2.into())).unwrap();
-	net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 2.into())).unwrap();
+	net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 2.into(), network_id)).unwrap();
+	net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 2.into(), network_id)).unwrap();
 	// Send different prevotes
 	net.sync();
 	// Prevote timeout

From 04e581db616416ddec966359492470b70cd56f5d Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Wed, 19 Apr 2017 14:48:02 +0200
Subject: [PATCH 026/117] Correct contract address for EIP-86

---
 ethcore/src/executive.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ethcore/src/executive.rs b/ethcore/src/executive.rs
index dc9dcec17..494d59db9 100644
--- a/ethcore/src/executive.rs
+++ b/ethcore/src/executive.rs
@@ -46,7 +46,7 @@ pub fn contract_address(address_scheme: CreateContractAddress, sender: &Address,
 			From::from(stream.as_raw().sha3())
 		},
 		CreateContractAddress::FromCodeHash => {
-			let mut buffer = [0u8; 20 + 32];
+			let mut buffer = [0xffu8; 20 + 32];
 			&mut buffer[20..].copy_from_slice(&code_hash[..]);
 			From::from((&buffer[..]).sha3())
 		},

From a278dd5a0a45510c3f593e3c8a1f8e36f58adde1 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Wed, 19 Apr 2017 14:58:19 +0200
Subject: [PATCH 027/117] store epoch transition proofs in DB

---
 Cargo.lock                                    | 10 +-
 ethcore/light/src/provider.rs                 |  2 +-
 ethcore/src/blockchain/blockchain.rs          | 18 ++++
 ethcore/src/blockchain/extras.rs              | 92 +++++++++++++++++-
 ethcore/src/blockchain/mod.rs                 |  1 +
 ethcore/src/client/client.rs                  | 96 ++++++++++++++-----
 ethcore/src/client/test_client.rs             |  2 +-
 ethcore/src/client/traits.rs                  |  4 +-
 ethcore/src/engines/authority_round.rs        |  4 +-
 ethcore/src/engines/basic_authority.rs        |  4 +-
 ethcore/src/engines/epoch_verifier.rs         |  5 +-
 ethcore/src/engines/mod.rs                    |  6 +-
 ethcore/src/engines/validator_set/contract.rs |  2 +-
 ethcore/src/engines/validator_set/mod.rs      |  4 +-
 ethcore/src/engines/validator_set/multi.rs    | 13 ++-
 .../engines/validator_set/safe_contract.rs    | 13 +--
 .../src/engines/validator_set/simple_list.rs  |  6 +-
 ethcore/src/ethereum/ethash.rs                |  2 +-
 ethcore/src/migrations/state/v7.rs            |  2 +-
 ethcore/src/migrations/v10.rs                 |  2 +-
 ethcore/src/migrations/v9.rs                  |  2 +-
 ethcore/src/tests/client.rs                   |  2 +-
 util/Cargo.toml                               |  2 +-
 util/rlp/Cargo.toml                           |  2 +-
 util/src/journaldb/mod.rs                     |  4 +-
 util/src/kvdb.rs                              |  3 +
 26 files changed, 234 insertions(+), 69 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 830e1e75a..20887561b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -339,8 +339,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "elastic-array"
-version = "0.6.0"
-source = "git+https://github.com/paritytech/elastic-array#346f1ba5982576dab9d0b8fa178b50e1db0a21cd"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/elastic-array?branch=0.7.0#970a11eca8a6b3591b476155c5896b4757b5c7b8"
 dependencies = [
  "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -713,7 +713,7 @@ version = "1.7.0"
 dependencies = [
  "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "elastic-array 0.6.0 (git+https://github.com/paritytech/elastic-array)",
+ "elastic-array 0.7.0 (git+https://github.com/paritytech/elastic-array?branch=0.7.0)",
  "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "eth-secp256k1 0.5.6 (git+https://github.com/paritytech/rust-secp256k1)",
  "ethcore-bigint 0.1.2",
@@ -2018,7 +2018,7 @@ name = "rlp"
 version = "0.1.0"
 dependencies = [
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "elastic-array 0.6.0 (git+https://github.com/paritytech/elastic-array)",
+ "elastic-array 0.7.0 (git+https://github.com/paritytech/elastic-array?branch=0.7.0)",
  "ethcore-bigint 0.1.2",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2790,7 +2790,7 @@ dependencies = [
 "checksum docopt 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab32ea6e284d87987066f21a9e809a73c14720571ef34516f0890b3d355ccfd8"
 "checksum dtoa 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5edd69c67b2f8e0911629b7e6b8a34cb3956613cd7c6e6414966dee349c2db4f"
 "checksum either 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3d2b503c86dad62aaf414ecf2b8c527439abedb3f8d812537f0b12bfd6f32a91"
-"checksum elastic-array 0.6.0 (git+https://github.com/paritytech/elastic-array)" = "<none>"
+"checksum elastic-array 0.7.0 (git+https://github.com/paritytech/elastic-array?branch=0.7.0)" = "<none>"
 "checksum env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e3856f1697098606fc6cb97a93de88ca3f3bc35bb878c725920e6e82ecf05e83"
 "checksum eth-secp256k1 0.5.6 (git+https://github.com/paritytech/rust-secp256k1)" = "<none>"
 "checksum ethabi 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "63df67d0af5e3cb906b667ca1a6e00baffbed87d0d8f5f78468a1f5eb3a66345"
diff --git a/ethcore/light/src/provider.rs b/ethcore/light/src/provider.rs
index e74ab1c70..3632783ca 100644
--- a/ethcore/light/src/provider.rs
+++ b/ethcore/light/src/provider.rs
@@ -258,7 +258,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 		}.fake_sign(req.from);
 
 		self.prove_transaction(transaction, id)
-			.map(|proof| ::request::ExecutionResponse { items: proof })
+			.map(|(_, proof)| ::request::ExecutionResponse { items: proof })
 	}
 
 	fn ready_transactions(&self) -> Vec<PendingTransaction> {
diff --git a/ethcore/src/blockchain/blockchain.rs b/ethcore/src/blockchain/blockchain.rs
index 8986dc6b8..00420e58f 100644
--- a/ethcore/src/blockchain/blockchain.rs
+++ b/ethcore/src/blockchain/blockchain.rs
@@ -797,6 +797,24 @@ impl BlockChain {
 		}
 	}
 
+	/// Insert an epoch transition. Provide an epoch number being transitioned to
+	/// and epoch transition object.
+	///
+	/// The block the transition occurred at should have already been inserted into the chain.
+	pub fn insert_epoch_transition(&self, batch: &mut DBTransaction, epoch_num: u64, transition: EpochTransition) {
+		let mut transitions = match self.db.read(db::COL_EXTRA, &epoch_num) {
+			Some(existing) => existing,
+			None => EpochTransitions {
+				number: epoch_num,
+				candidates: Vec::with_capacity(1),
+			}
+		};
+
+		transitions.candidates.push(transition);
+
+		batch.write(db::COL_EXTRA, &epoch_num, &transitions);
+	}
+
 	/// Add a child to a given block. Assumes that the block hash is in
 	/// the chain and the child's parent is this block.
 	///
diff --git a/ethcore/src/blockchain/extras.rs b/ethcore/src/blockchain/extras.rs
index 0c8616a45..b9fd5d3bd 100644
--- a/ethcore/src/blockchain/extras.rs
+++ b/ethcore/src/blockchain/extras.rs
@@ -18,6 +18,7 @@
 
 use bloomchain;
 use util::*;
+use util::kvdb::PREFIX_LEN as DB_PREFIX_LEN;
 use rlp::*;
 use header::BlockNumber;
 use receipt::Receipt;
@@ -37,6 +38,8 @@ pub enum ExtrasIndex {
 	BlocksBlooms = 3,
 	/// Block receipts index
 	BlockReceipts = 4,
+	/// Epoch transition data index.
+	EpochTransitions = 5,
 }
 
 fn with_index(hash: &H256, i: ExtrasIndex) -> H264 {
@@ -134,6 +137,39 @@ impl Key<BlockReceipts> for H256 {
 	}
 }
 
+/// length of epoch keys.
+pub const EPOCH_KEY_LEN: usize = DB_PREFIX_LEN + 16;
+
+/// epoch key prefix.
+/// used to iterate over all epoch transitions in order from genesis.
+pub fn epoch_key_prefix() -> [u8; DB_PREFIX_LEN] {
+	let mut arr = [0u8; DB_PREFIX_LEN];
+	arr[0] = ExtrasIndex::EpochTransitions as u8;
+
+	arr
+}
+
+pub struct EpochTransitionsKey([u8; EPOCH_KEY_LEN]);
+impl Deref for EpochTransitionsKey {
+	type Target = [u8];
+
+	fn deref(&self) -> &[u8] { &self.0[..] }
+}
+
+impl Key<EpochTransitions> for u64 {
+	type Target = EpochTransitionsKey;
+
+	fn key(&self) -> Self::Target {
+		let mut arr = [0u8; EPOCH_KEY_LEN];
+		arr[..DB_PREFIX_LEN].copy_from_slice(&epoch_key_prefix()[..]);
+
+		write!(&mut arr[DB_PREFIX_LEN..], "{:016x}", self)
+			.expect("format arg is valid; no more than 16 chars will be written; qed");
+
+		EpochTransitionsKey(arr)
+	}
+}
+
 /// Familial details concerning a block
 #[derive(Debug, Clone)]
 pub struct BlockDetails {
@@ -144,7 +180,7 @@ pub struct BlockDetails {
 	/// Parent block hash
 	pub parent: H256,
 	/// List of children block hashes
-	pub children: Vec<H256>
+	pub children: Vec<H256>,
 }
 
 impl HeapSizeOf for BlockDetails {
@@ -241,6 +277,60 @@ impl HeapSizeOf for BlockReceipts {
 	}
 }
 
+/// Candidate transitions to an epoch with specific number.
+#[derive(Clone)]
+pub struct EpochTransitions {
+	pub number: u64,
+	pub candidates: Vec<EpochTransition>,
+}
+
+impl Encodable for EpochTransitions {
+	fn rlp_append(&self, s: &mut RlpStream) {
+		s.begin_list(2).append(&self.number).append_list(&self.candidates);
+	}
+}
+
+impl Decodable for EpochTransitions {
+	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
+		Ok(EpochTransitions {
+			number: rlp.val_at(0)?,
+			candidates: rlp.list_at(1)?,
+		})
+	}
+}
+
+#[derive(Debug, Clone)]
+pub struct EpochTransition {
+	pub block_hash: H256, // block hash at which the transition occurred.
+	pub proof: Vec<u8>, // "transition/epoch" proof from the engine.
+	pub state_proof: Vec<DBValue>, // state items necessary to regenerate proof.
+}
+
+impl Encodable for EpochTransition {
+	fn rlp_append(&self, s: &mut RlpStream) {
+		s.begin_list(3)
+			.append(&self.block_hash)
+			.append(&self.proof)
+			.begin_list(self.state_proof.len());
+
+		for item in &self.state_proof {
+			s.append(&&**item);
+		}
+	}
+}
+
+impl Decodable for EpochTransition {
+	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
+		Ok(EpochTransition {
+			block_hash: rlp.val_at(0)?,
+			proof: rlp.val_at(1)?,
+			state_proof: rlp.at(2)?.iter().map(|x| {
+				Ok(DBValue::from_slice(x.data()?))
+			}).collect::<Result<Vec<_>, _>>()?,
+		})
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use rlp::*;
diff --git a/ethcore/src/blockchain/mod.rs b/ethcore/src/blockchain/mod.rs
index 55a67e2b6..2d6d6ddb3 100644
--- a/ethcore/src/blockchain/mod.rs
+++ b/ethcore/src/blockchain/mod.rs
@@ -31,5 +31,6 @@ pub mod generator;
 pub use self::blockchain::{BlockProvider, BlockChain};
 pub use self::cache::CacheSize;
 pub use self::config::Config;
+pub use self::extras::EpochTransition;
 pub use types::tree_route::TreeRoute;
 pub use self::import_route::ImportRoute;
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index a91294e27..ab9a07691 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -32,13 +32,13 @@ use util::kvdb::*;
 // other
 use basic_types::Seal;
 use block::*;
-use blockchain::{BlockChain, BlockProvider, TreeRoute, ImportRoute};
+use blockchain::{BlockChain, BlockProvider, EpochTransition, TreeRoute, ImportRoute};
 use blockchain::extras::TransactionAddress;
 use client::Error as ClientError;
 use client::{
 	BlockId, TransactionId, UncleId, TraceId, ClientConfig, BlockChainClient,
 	MiningBlockChainClient, EngineClient, TraceFilter, CallAnalytics, BlockImportError, Mode,
-	ChainNotify, PruningInfo,
+	ChainNotify, PruningInfo, ProvingBlockChainClient,
 };
 use encoded;
 use engines::Engine;
@@ -578,15 +578,15 @@ impl Client {
 
 		// generate validation proof if the engine requires them.
 		// TODO: make conditional?
-		let generate_proof = {
+		let entering_new_epoch = {
 			use engines::EpochChange;
 			match self.engine.is_epoch_end(block.header(), Some(block_data), Some(&receipts)) {
-				EpochChange::Yes(_) => true,
-				EpochChange::No => false,
+				EpochChange::Yes(e, p) => Some((block.header().clone(), e, p)),
+				EpochChange::No => None,
 				EpochChange::Unsure(_) => {
 					warn!(target: "client", "Detected invalid engine implementation.");
 					warn!(target: "client", "Engine claims to require more block data, but everything provided.");
-					false
+					None
 				}
 			}
 		};
@@ -596,14 +596,53 @@ impl Client {
 		// TODO: Prove it with a test.
 		let mut state = block.drain();
 
-		if generate_proof {
-			debug!(target: "client", "Generating validation proof for block {}", hash);
-
-			// TODO
-		}
-
 		state.journal_under(&mut batch, number, hash).expect("DB commit failed");
 		let route = chain.insert_block(&mut batch, block_data, receipts);
+
+		if let Some((header, epoch, expected)) = entering_new_epoch {
+			use std::cell::RefCell;
+			use std::collections::BTreeSet;
+
+			debug!(target: "client", "Generating validation proof for block {}", hash);
+
+			// proof is two-part. state items read in lexicographical order,
+			// and the secondary "proof" part.
+			let read_values = RefCell::new(BTreeSet::new());
+			let block_id = BlockId::Hash(hash.clone());
+			let proof = {
+				let call = |a, d| {
+					let tx = self.contract_call_tx(block_id, a, d);
+					let (result, items) = self.prove_transaction(tx, block_id)
+						.ok_or_else(|| format!("Unable to make call to generate epoch proof."))?;
+
+					read_values.borrow_mut().extend(items);
+					Ok(result)
+				};
+
+				self.engine.epoch_proof(&header, &call)
+			};
+
+			match proof {
+				Ok(proof) => {
+					if proof != expected {
+						warn!(target: "client", "Extracted epoch change proof different than expected.");
+						warn!(target: "client", "Using a custom engine implementation?");
+					}
+
+					// insert into database, using the generated proof.
+					chain.insert_epoch_transition(&mut batch, epoch, EpochTransition {
+						block_hash: hash.clone(),
+						proof: proof,
+						state_proof: read_values.into_inner().into_iter().collect(),
+					});
+				}
+				Err(e) => {
+					warn!(target: "client", "Error generating epoch change proof for block {}: {}", hash, e);
+					warn!(target: "client", "Snapshots generated by this node will be incomplete.");
+				}
+			}
+		}
+
 		self.tracedb.read().import(&mut batch, TraceImportRequest {
 			traces: traces.into(),
 			block_hash: hash.clone(),
@@ -893,6 +932,20 @@ impl Client {
 			}
 		}
 	}
+
+	// transaction for calling contracts from services like engine.
+	// from the null sender, with 50M gas.
+	fn contract_call_tx(&self, block_id: BlockId, address: Address, data: Bytes) -> SignedTransaction {
+		let from = Address::default();
+		Transaction {
+			nonce: self.nonce(&from, block_id).unwrap_or_else(|| self.engine.account_start_nonce()),
+			action: Action::Call(address),
+			gas: U256::from(50_000_000),
+			gas_price: U256::default(),
+			value: U256::default(),
+			data: data,
+		}.fake_sign(from)
+	}
 }
 
 impl snapshot::DatabaseRestore for Client {
@@ -1483,15 +1536,7 @@ impl BlockChainClient for Client {
 	}
 
 	fn call_contract(&self, block_id: BlockId, address: Address, data: Bytes) -> Result<Bytes, String> {
-		let from = Address::default();
-		let transaction = Transaction {
-			nonce: self.latest_nonce(&from),
-			action: Action::Call(address),
-			gas: U256::from(50_000_000),
-			gas_price: U256::default(),
-			value: U256::default(),
-			data: data,
-		}.fake_sign(from);
+		let transaction = self.contract_call_tx(block_id, address, data);
 
 		self.call(&transaction, block_id, Default::default())
 			.map_err(|e| format!("{:?}", e))
@@ -1643,7 +1688,7 @@ impl MayPanic for Client {
 	}
 }
 
-impl ::client::ProvingBlockChainClient for Client {
+impl ProvingBlockChainClient for Client {
 	fn prove_storage(&self, key1: H256, key2: H256, id: BlockId) -> Option<(Vec<Bytes>, H256)> {
 		self.state_at(id)
 			.and_then(move |state| state.prove_storage(key1, key2).ok())
@@ -1654,7 +1699,7 @@ impl ::client::ProvingBlockChainClient for Client {
 			.and_then(move |state| state.prove_account(key1).ok())
 	}
 
-	fn prove_transaction(&self, transaction: SignedTransaction, id: BlockId) -> Option<Vec<DBValue>> {
+	fn prove_transaction(&self, transaction: SignedTransaction, id: BlockId) -> Option<(Bytes, Vec<DBValue>)> {
 		let (state, mut env_info) = match (self.state_at(id), self.env_info(id)) {
 			(Some(s), Some(e)) => (s, e),
 			_ => return None,
@@ -1669,8 +1714,9 @@ impl ::client::ProvingBlockChainClient for Client {
 		let res = Executive::new(&mut state, &env_info, &*self.engine, &self.factories.vm).transact(&transaction, options);
 
 		match res {
-			Err(ExecutionError::Internal(_)) => return None,
-			_ => return Some(state.drop().1.extract_proof()),
+			Err(ExecutionError::Internal(_)) => None,
+			Err(_) => Some((Vec::new(), state.drop().1.extract_proof())),
+			Ok(res) => Some((res.output, state.drop().1.extract_proof())),
 		}
 	}
 }
diff --git a/ethcore/src/client/test_client.rs b/ethcore/src/client/test_client.rs
index 16f38203f..43d75cecd 100644
--- a/ethcore/src/client/test_client.rs
+++ b/ethcore/src/client/test_client.rs
@@ -767,7 +767,7 @@ impl ProvingBlockChainClient for TestBlockChainClient {
 		None
 	}
 
-	fn prove_transaction(&self, _: SignedTransaction, _: BlockId) -> Option<Vec<DBValue>> {
+	fn prove_transaction(&self, _: SignedTransaction, _: BlockId) -> Option<(Bytes, Vec<DBValue>)> {
 		None
 	}
 }
diff --git a/ethcore/src/client/traits.rs b/ethcore/src/client/traits.rs
index a612d8a77..e17c324aa 100644
--- a/ethcore/src/client/traits.rs
+++ b/ethcore/src/client/traits.rs
@@ -324,5 +324,7 @@ pub trait ProvingBlockChainClient: BlockChainClient {
 	fn prove_account(&self, key1: H256, id: BlockId) -> Option<(Vec<Bytes>, BasicAccount)>;
 
 	/// Prove execution of a transaction at the given block.
-	fn prove_transaction(&self, transaction: SignedTransaction, id: BlockId) -> Option<Vec<DBValue>>;
+	/// Returns the output of the call and a vector of database items necessary
+	/// to reproduce it.
+	fn prove_transaction(&self, transaction: SignedTransaction, id: BlockId) -> Option<(Bytes, Vec<DBValue>)>;
 }
diff --git a/ethcore/src/engines/authority_round.rs b/ethcore/src/engines/authority_round.rs
index 1f3edf57c..55640478e 100644
--- a/ethcore/src/engines/authority_round.rs
+++ b/ethcore/src/engines/authority_round.rs
@@ -133,13 +133,13 @@ pub struct AuthorityRound {
 
 // header-chain validator.
 struct EpochVerifier {
-	epoch_number: U256,
+	epoch_number: u64,
 	step: Arc<Step>,
 	subchain_validators: SimpleList,
 }
 
 impl super::EpochVerifier for EpochVerifier {
-	fn epoch_number(&self) -> U256 { self.epoch_number.clone() }
+	fn epoch_number(&self) -> u64 { self.epoch_number.clone() }
 	fn verify_light(&self, header: &Header) -> Result<(), Error> {
 		// always check the seal since it's fast.
 		// nothing heavier to do.
diff --git a/ethcore/src/engines/basic_authority.rs b/ethcore/src/engines/basic_authority.rs
index 94c3fe578..35db2a486 100644
--- a/ethcore/src/engines/basic_authority.rs
+++ b/ethcore/src/engines/basic_authority.rs
@@ -52,12 +52,12 @@ impl From<ethjson::spec::BasicAuthorityParams> for BasicAuthorityParams {
 }
 
 struct EpochVerifier {
-	epoch_number: U256,
+	epoch_number: u64,
 	list: SimpleList,
 }
 
 impl super::EpochVerifier for EpochVerifier {
-	fn epoch_number(&self) -> U256 { self.epoch_number.clone() }
+	fn epoch_number(&self) -> u64 { self.epoch_number.clone() }
 	fn verify_light(&self, header: &Header) -> Result<(), Error> {
 		verify_external(header, &self.list)
 	}
diff --git a/ethcore/src/engines/epoch_verifier.rs b/ethcore/src/engines/epoch_verifier.rs
index fd0847e76..62740fbd4 100644
--- a/ethcore/src/engines/epoch_verifier.rs
+++ b/ethcore/src/engines/epoch_verifier.rs
@@ -18,14 +18,13 @@
 
 use error::Error;
 use header::Header;
-use util::U256;
 
 /// Verifier for all blocks within an epoch without accessing
 ///
 /// See docs on `Engine` relating to proving functions for more details.
 pub trait EpochVerifier: Sync {
 	/// Get the epoch number.
-	fn epoch_number(&self) -> U256;
+	fn epoch_number(&self) -> u64;
 
 	/// Lightly verify the next block header.
 	/// This may not be a header belonging to a different epoch.
@@ -41,6 +40,6 @@ pub trait EpochVerifier: Sync {
 pub struct NoOp;
 
 impl EpochVerifier for NoOp {
-	fn epoch_number(&self) -> U256 { 0.into() }
+	fn epoch_number(&self) -> u64 { 0 }
 	fn verify_light(&self, _header: &Header) -> Result<(), Error> { Ok(()) }
 }
diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
index b67afdf2f..badac3cf2 100644
--- a/ethcore/src/engines/mod.rs
+++ b/ethcore/src/engines/mod.rs
@@ -96,7 +96,7 @@ pub enum Seal {
 }
 
 /// Type alias for a function we can make calls through synchronously.
-pub type Call = Fn(Address, Bytes) -> Result<Bytes, String>;
+pub type Call<'a> = Fn(Address, Bytes) -> Result<Bytes, String> + 'a;
 
 /// Results of a query of whether an epoch change occurred at the given block.
 #[derive(Debug, Clone, PartialEq)]
@@ -105,8 +105,8 @@ pub enum EpochChange {
 	Unsure(Unsure),
 	/// No epoch change.
 	No,
-	/// Validation proof required, and the expected output
-	Yes(Bytes),
+	/// Validation proof required, and the new epoch number and expected proof.
+	Yes(u64, Bytes),
 }
 
 /// More data required to determine if an epoch change occurred at a given block.
diff --git a/ethcore/src/engines/validator_set/contract.rs b/ethcore/src/engines/validator_set/contract.rs
index 0fdef84a3..22506c348 100644
--- a/ethcore/src/engines/validator_set/contract.rs
+++ b/ethcore/src/engines/validator_set/contract.rs
@@ -76,7 +76,7 @@ impl ValidatorSet for ValidatorContract {
 		self.validators.epoch_proof(header, caller)
 	}
 
-	fn epoch_set(&self, header: &Header, proof: &[u8]) -> Result<(U256, super::SimpleList), ::error::Error> {
+	fn epoch_set(&self, header: &Header, proof: &[u8]) -> Result<(u64, super::SimpleList), ::error::Error> {
 		self.validators.epoch_set(header, proof)
 	}
 
diff --git a/ethcore/src/engines/validator_set/mod.rs b/ethcore/src/engines/validator_set/mod.rs
index e9dc333c5..a7e0f196f 100644
--- a/ethcore/src/engines/validator_set/mod.rs
+++ b/ethcore/src/engines/validator_set/mod.rs
@@ -23,7 +23,7 @@ mod multi;
 
 use std::sync::Weak;
 use ids::BlockId;
-use util::{Address, H256, U256};
+use util::{Address, H256};
 use ethjson::spec::ValidatorSet as ValidatorSpec;
 use client::Client;
 use header::Header;
@@ -97,7 +97,7 @@ pub trait ValidatorSet: Send + Sync {
 	/// the proof is invalid.
 	///
 	/// Returns the epoch number and proof.
-	fn epoch_set(&self, header: &Header, proof: &[u8]) -> Result<(U256, SimpleList), ::error::Error>;
+	fn epoch_set(&self, header: &Header, proof: &[u8]) -> Result<(u64, SimpleList), ::error::Error>;
 
 	/// Checks if a given address is a validator, with the given function
 	/// for executing synchronous calls to contracts.
diff --git a/ethcore/src/engines/validator_set/multi.rs b/ethcore/src/engines/validator_set/multi.rs
index eecf88432..abb034698 100644
--- a/ethcore/src/engines/validator_set/multi.rs
+++ b/ethcore/src/engines/validator_set/multi.rs
@@ -19,7 +19,7 @@
 use std::collections::BTreeMap;
 use std::sync::Weak;
 use engines::{Call, EpochChange};
-use util::{H256, Address, RwLock, U256};
+use util::{H256, Address, RwLock};
 use ids::BlockId;
 use header::{BlockNumber, Header};
 use client::{Client, BlockChainClient};
@@ -75,19 +75,24 @@ impl ValidatorSet for Multi {
 	fn is_epoch_end(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
 		-> EpochChange
 	{
-		self.correct_set_by_number(header.number()).1.is_epoch_end(header, block, receipts)
+		let (set_block, set) = self.correct_set_by_number(header.number());
+
+		match set.is_epoch_end(header, block, receipts) {
+			EpochChange::Yes(num, proof) => EpochChange::Yes(set_block + num, proof),
+			other => other,
+		}
 	}
 
 	fn epoch_proof(&self, header: &Header, caller: &Call) -> Result<Vec<u8>, String> {
 		self.correct_set_by_number(header.number()).1.epoch_proof(header, caller)
 	}
 
-	fn epoch_set(&self, header: &Header, proof: &[u8]) -> Result<(U256, super::SimpleList), ::error::Error> {
+	fn epoch_set(&self, header: &Header, proof: &[u8]) -> Result<(u64, super::SimpleList), ::error::Error> {
 		// "multi" epoch is the inner set's epoch plus the transition block to that set.
 		// ensures epoch increases monotonically.
 		let (set_block, set) = self.correct_set_by_number(header.number());
 		let (inner_epoch, list) = set.epoch_set(header, proof)?;
-		Ok((U256::from(set_block) + inner_epoch, list))
+		Ok((set_block + inner_epoch, list))
 	}
 
 	fn contains_with_caller(&self, bh: &H256, address: &Address, caller: &Call) -> bool {
diff --git a/ethcore/src/engines/validator_set/safe_contract.rs b/ethcore/src/engines/validator_set/safe_contract.rs
index 3284ec5ab..cbfaa9883 100644
--- a/ethcore/src/engines/validator_set/safe_contract.rs
+++ b/ethcore/src/engines/validator_set/safe_contract.rs
@@ -165,8 +165,6 @@ impl ValidatorSet for ValidatorSafeContract {
 						}
 					});
 
-
-				// TODO: are multiple transitions per block possible?
 				match decoded_events.next() {
 					None => ::engines::EpochChange::No,
 					Some(matched_event) => {
@@ -184,8 +182,11 @@ impl ValidatorSet for ValidatorSafeContract {
 							);
 
 						match (nonce, validators) {
-							(Some(nonce), Some(validators)) =>
-								::engines::EpochChange::Yes(encode_proof(nonce, &validators)),
+							(Some(nonce), Some(validators)) => {
+								let proof = encode_proof(nonce, &validators);
+								let new_epoch = nonce.low_u64();
+								::engines::EpochChange::Yes(new_epoch, proof)
+							}
 							_ => {
 								debug!(target: "engine", "Successfully decoded log turned out to be bad.");
 								::engines::EpochChange::No
@@ -206,11 +207,11 @@ impl ValidatorSet for ValidatorSafeContract {
 		}
 	}
 
-	fn epoch_set(&self, _header: &Header, proof: &[u8]) -> Result<(U256, SimpleList), ::error::Error> {
+	fn epoch_set(&self, _header: &Header, proof: &[u8]) -> Result<(u64, SimpleList), ::error::Error> {
 		use rlp::UntrustedRlp;
 
 		let rlp = UntrustedRlp::new(proof);
-		let nonce: U256 = rlp.val_at(0)?;
+		let nonce: u64 = rlp.val_at(0)?;
 		let validators: Vec<Address> = rlp.list_at(1)?;
 
 		Ok((nonce, SimpleList::new(validators)))
diff --git a/ethcore/src/engines/validator_set/simple_list.rs b/ethcore/src/engines/validator_set/simple_list.rs
index 59209fac0..15cf141f6 100644
--- a/ethcore/src/engines/validator_set/simple_list.rs
+++ b/ethcore/src/engines/validator_set/simple_list.rs
@@ -16,7 +16,7 @@
 
 /// Preconfigured validator list.
 
-use util::{H256, Address, HeapSizeOf, U256};
+use util::{H256, Address, HeapSizeOf};
 
 use engines::Call;
 use header::Header;
@@ -63,8 +63,8 @@ impl ValidatorSet for SimpleList {
 		Ok(Vec::new())
 	}
 
-	fn epoch_set(&self, _header: &Header, _: &[u8]) -> Result<(U256, SimpleList), ::error::Error> {
-		Ok((0.into(), self.clone()))
+	fn epoch_set(&self, _header: &Header, _: &[u8]) -> Result<(u64, SimpleList), ::error::Error> {
+		Ok((0, self.clone()))
 	}
 
 	fn contains_with_caller(&self, _bh: &H256, address: &Address, _: &Call) -> bool {
diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs
index 867d4f775..548d0dbaa 100644
--- a/ethcore/src/ethereum/ethash.rs
+++ b/ethcore/src/ethereum/ethash.rs
@@ -158,7 +158,7 @@ impl Ethash {
 // in the future, we might move the Ethash epoch
 // caching onto this mechanism as well.
 impl ::engines::EpochVerifier for Arc<Ethash> {
-	fn epoch_number(&self) -> U256 { 0.into() }
+	fn epoch_number(&self) -> u64 { 0 }
 	fn verify_light(&self, _header: &Header) -> Result<(), Error> { Ok(()) }
 	fn verify_heavy(&self, header: &Header) -> Result<(), Error> {
 		self.verify_block_unordered(header, None)
diff --git a/ethcore/src/migrations/state/v7.rs b/ethcore/src/migrations/state/v7.rs
index e9da80c31..174945c9b 100644
--- a/ethcore/src/migrations/state/v7.rs
+++ b/ethcore/src/migrations/state/v7.rs
@@ -238,7 +238,7 @@ impl Migration for OverlayRecentV7 {
 		}
 
 		let mut count = 0;
-		for (key, value) in source.iter(None) {
+		for (key, value) in source.iter(None).into_iter().flat_map(|inner| inner) {
 			count += 1;
 			if count == 100_000 {
 				count = 0;
diff --git a/ethcore/src/migrations/v10.rs b/ethcore/src/migrations/v10.rs
index 45fc457bd..15abf4790 100644
--- a/ethcore/src/migrations/v10.rs
+++ b/ethcore/src/migrations/v10.rs
@@ -102,7 +102,7 @@ impl Migration for ToV10 {
 
 	fn migrate(&mut self, source: Arc<Database>, config: &Config, dest: &mut Database, col: Option<u32>) -> Result<(), Error> {
 		let mut batch = Batch::new(config, col);
-		for (key, value) in source.iter(col) {
+		for (key, value) in source.iter(col).into_iter().flat_map(|inner| inner) {
 			self.progress.tick();
 			batch.insert(key.to_vec(), value.to_vec(), dest)?;
 		}
diff --git a/ethcore/src/migrations/v9.rs b/ethcore/src/migrations/v9.rs
index 9a6eb5088..4ca6e3a82 100644
--- a/ethcore/src/migrations/v9.rs
+++ b/ethcore/src/migrations/v9.rs
@@ -59,7 +59,7 @@ impl Migration for ToV9 {
 	fn migrate(&mut self, source: Arc<Database>, config: &Config, dest: &mut Database, col: Option<u32>) -> Result<(), Error> {
 		let mut batch = Batch::new(config, self.column);
 
-		for (key, value) in source.iter(col) {
+		for (key, value) in source.iter(col).into_iter().flat_map(|inner| inner) {
 			self.progress.tick();
 			match self.extract {
 				Extract::Header => {
diff --git a/ethcore/src/tests/client.rs b/ethcore/src/tests/client.rs
index e61edd478..7d630fbee 100644
--- a/ethcore/src/tests/client.rs
+++ b/ethcore/src/tests/client.rs
@@ -367,7 +367,7 @@ fn transaction_proof() {
 		data: Vec::new(),
 	}.fake_sign(address);
 
-	let proof = client.prove_transaction(transaction.clone(), BlockId::Latest).unwrap();
+	let proof = client.prove_transaction(transaction.clone(), BlockId::Latest).unwrap().1;
 	let backend = state::backend::ProofCheck::new(&proof);
 
 	let mut factories = ::factory::Factories::default();
diff --git a/util/Cargo.toml b/util/Cargo.toml
index d4e2dcfb5..8b902467f 100644
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -16,7 +16,7 @@ time = "0.1.34"
 rocksdb = { git = "https://github.com/paritytech/rust-rocksdb" }
 eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
 rust-crypto = "0.2.34"
-elastic-array = { git = "https://github.com/paritytech/elastic-array" }
+elastic-array = "0.7.0"
 rlp = { path = "rlp" }
 heapsize = { version = "0.3", features = ["unstable"] }
 itertools = "0.5"
diff --git a/util/rlp/Cargo.toml b/util/rlp/Cargo.toml
index 17aed5dad..643e9dc99 100644
--- a/util/rlp/Cargo.toml
+++ b/util/rlp/Cargo.toml
@@ -6,7 +6,7 @@ version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-elastic-array = { git = "https://github.com/paritytech/elastic-array" }
+elastic-array = "0.7.0"
 ethcore-bigint = { path = "../bigint" }
 lazy_static = "0.2"
 rustc-serialize = "0.3"
diff --git a/util/src/journaldb/mod.rs b/util/src/journaldb/mod.rs
index e949b269f..84a71339a 100644
--- a/util/src/journaldb/mod.rs
+++ b/util/src/journaldb/mod.rs
@@ -125,8 +125,8 @@ pub fn new(backing: Arc<::kvdb::KeyValueDB>, algorithm: Algorithm, col: Option<u
 }
 
 // all keys must be at least 12 bytes
-const DB_PREFIX_LEN : usize = 12;
-const LATEST_ERA_KEY : [u8; DB_PREFIX_LEN] = [ b'l', b'a', b's', b't', 0, 0, 0, 0, 0, 0, 0, 0 ];
+const DB_PREFIX_LEN : usize = ::kvdb::PREFIX_LEN;
+const LATEST_ERA_KEY : [u8; ::kvdb::PREFIX_LEN] = [ b'l', b'a', b's', b't', 0, 0, 0, 0, 0, 0, 0, 0 ];
 
 #[cfg(test)]
 mod tests {
diff --git a/util/src/kvdb.rs b/util/src/kvdb.rs
index 056b49c65..8006c4ccb 100644
--- a/util/src/kvdb.rs
+++ b/util/src/kvdb.rs
@@ -36,6 +36,9 @@ use std::fs::File;
 const DB_BACKGROUND_FLUSHES: i32 = 2;
 const DB_BACKGROUND_COMPACTIONS: i32 = 2;
 
+/// Required length of prefixes.
+pub const PREFIX_LEN: usize = 12;
+
 /// Write transaction. Batches a sequence of put/delete operations for efficiency.
 #[derive(Default, Clone, PartialEq)]
 pub struct DBTransaction {

From e83de5cde2100647f90e8965103e6f5747a07b9b Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Wed, 19 Apr 2017 15:15:43 +0200
Subject: [PATCH 028/117] Store the pending requests per network version
 (#5405)

* Store the requests in LS per network version

* Fixing tests

* Add network switching test

* Fixes
---
 js/src/redux/providers/requestsActions.js     | 11 +++++-
 js/src/views/Application/Requests/requests.js |  2 +-
 .../Application/Requests/savedRequests.js     | 37 +++++++++++++++++--
 .../Requests/savedRequests.spec.js            | 25 +++++++++++--
 4 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/js/src/redux/providers/requestsActions.js b/js/src/redux/providers/requestsActions.js
index d31f0d1b3..970bcba91 100644
--- a/js/src/redux/providers/requestsActions.js
+++ b/js/src/redux/providers/requestsActions.js
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import BigNumber from 'bignumber.js';
+
 import { outTransaction } from '~/api/format/output';
 import { trackRequest as trackRequestUtil, parseTransactionReceipt } from '~/util/tx';
 import SavedRequests from '~/views/Application/Requests/savedRequests';
@@ -29,7 +31,7 @@ export const init = (api) => (dispatch) => {
     dispatch(watchRequest(request));
   });
 
-  api.on('connected', () => {
+  api.once('connected', () => {
     savedRequests.load(api).then((requests) => {
       requests.forEach((request) => dispatch(watchRequest(request)));
     });
@@ -48,7 +50,9 @@ export const watchRequest = (request) => (dispatch, getState) => {
 export const trackRequest = (requestId, { transactionHash = null } = {}) => (dispatch, getState) => {
   const { api } = getState();
 
-  trackRequestUtil(api, { requestId, transactionHash }, (error, data) => {
+  trackRequestUtil(api, { requestId, transactionHash }, (error, _data = {}) => {
+    const data = { ..._data };
+
     if (error) {
       console.error(error);
       return dispatch(setRequest(requestId, { error }));
@@ -61,6 +65,9 @@ export const trackRequest = (requestId, { transactionHash = null } = {}) => (dis
       const requestData = requests[requestId];
       let blockSubscriptionId = -1;
 
+      // Set the block height to 0 at the beggining
+      data.blockHeight = new BigNumber(0);
+
       // If the request was a contract deployment,
       // then add the contract with the saved metadata to the account
       if (requestData.metadata && requestData.metadata.deployment) {
diff --git a/js/src/views/Application/Requests/requests.js b/js/src/views/Application/Requests/requests.js
index 2c2224ea0..1054cc4e2 100644
--- a/js/src/views/Application/Requests/requests.js
+++ b/js/src/views/Application/Requests/requests.js
@@ -145,7 +145,7 @@ class Requests extends Component {
           />
           <div className={ styles.fill }>
             <ScrollableText
-              text={ error.text || error.message }
+              text={ error.text || error.message || error.toString() }
             />
           </div>
         </div>
diff --git a/js/src/views/Application/Requests/savedRequests.js b/js/src/views/Application/Requests/savedRequests.js
index ee5f78811..54f1a7a9a 100644
--- a/js/src/views/Application/Requests/savedRequests.js
+++ b/js/src/views/Application/Requests/savedRequests.js
@@ -21,9 +21,28 @@ import { ERROR_CODES } from '~/api/transport/error';
 export const LS_REQUESTS_KEY = '_parity::requests';
 
 export default class SavedRequests {
-  load (api) {
-    const requests = this._get();
+  network = null;
 
+  /**
+   * Load the network version, and then the related requests
+   */
+  load (api) {
+    return api.net.version()
+      .then((network) => {
+        this.network = network;
+        return this.loadRequests(api);
+      })
+      .catch((error) => {
+        console.error(error);
+        return [];
+      });
+  }
+
+  /**
+   * Load the requests of the current network
+   */
+  loadRequests (api) {
+    const requests = this._get();
     const promises = Object.values(requests).map((request) => {
       const { requestId, transactionHash } = request;
 
@@ -67,11 +86,21 @@ export default class SavedRequests {
   }
 
   _get () {
-    return store.get(LS_REQUESTS_KEY) || {};
+    const allRequests = store.get(LS_REQUESTS_KEY) || {};
+
+    return allRequests[this.network] || {};
   }
 
   _set (requests = {}) {
-    return store.set(LS_REQUESTS_KEY, requests);
+    const allRequests = store.get(LS_REQUESTS_KEY) || {};
+
+    if (Object.keys(requests).length > 0) {
+      allRequests[this.network] = requests;
+    } else {
+      delete allRequests[this.network];
+    }
+
+    return store.set(LS_REQUESTS_KEY, allRequests);
   }
 
   _requestExists (api, requestId) {
diff --git a/js/src/views/Application/Requests/savedRequests.spec.js b/js/src/views/Application/Requests/savedRequests.spec.js
index 7563c93c8..acf3adc39 100644
--- a/js/src/views/Application/Requests/savedRequests.spec.js
+++ b/js/src/views/Application/Requests/savedRequests.spec.js
@@ -19,27 +19,37 @@ import store from 'store';
 
 import SavedRequests, { LS_REQUESTS_KEY } from './savedRequests';
 
+const NETWORK_ID = 42;
 const DEFAULT_REQUEST = {
   requestId: '0x1',
   transaction: {}
 };
 
-const api = createApi();
+const api = createApi(NETWORK_ID);
+const api2 = createApi(1);
 const savedRequests = new SavedRequests();
 
-function createApi () {
+function createApi (networkVersion) {
   return {
     parity: {
       checkRequest: sinon.stub().resolves()
+    },
+    net: {
+      version: sinon.stub().resolves(networkVersion)
     }
   };
 }
 
 describe('views/Application/Requests/savedRequests', () => {
-  beforeEach(() => {
+  beforeEach((done) => {
     store.set(LS_REQUESTS_KEY, {
-      [DEFAULT_REQUEST.requestId]: DEFAULT_REQUEST
+      [NETWORK_ID]: {
+        [DEFAULT_REQUEST.requestId]: DEFAULT_REQUEST
+      }
     });
+
+    savedRequests.load(api)
+      .then(() => done());
   });
 
   afterEach(() => {
@@ -85,4 +95,11 @@ describe('views/Application/Requests/savedRequests', () => {
         expect(requests[0]).to.deep.equal(DEFAULT_REQUEST);
       });
   });
+
+  it('loads requests from the right network', () => {
+    return savedRequests.load(api2)
+      .then((requests) => {
+        expect(requests).to.deep.equal([]);
+      });
+  });
 });

From af868a7439fa50e6663d60fdff79a37a6a8b82de Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Wed, 19 Apr 2017 15:35:12 +0200
Subject: [PATCH 029/117] ensure genesis validator set in DB

---
 Cargo.lock                           |   8 +--
 ethcore/src/blockchain/blockchain.rs |   8 ++-
 ethcore/src/client/client.rs         | 100 +++++++++++++++------------
 3 files changed, 65 insertions(+), 51 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 20887561b..3298887d5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -340,7 +340,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "elastic-array"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/elastic-array?branch=0.7.0#970a11eca8a6b3591b476155c5896b4757b5c7b8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -713,7 +713,7 @@ version = "1.7.0"
 dependencies = [
  "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "elastic-array 0.7.0 (git+https://github.com/paritytech/elastic-array?branch=0.7.0)",
+ "elastic-array 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "eth-secp256k1 0.5.6 (git+https://github.com/paritytech/rust-secp256k1)",
  "ethcore-bigint 0.1.2",
@@ -2018,7 +2018,7 @@ name = "rlp"
 version = "0.1.0"
 dependencies = [
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "elastic-array 0.7.0 (git+https://github.com/paritytech/elastic-array?branch=0.7.0)",
+ "elastic-array 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore-bigint 0.1.2",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2790,7 +2790,7 @@ dependencies = [
 "checksum docopt 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab32ea6e284d87987066f21a9e809a73c14720571ef34516f0890b3d355ccfd8"
 "checksum dtoa 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5edd69c67b2f8e0911629b7e6b8a34cb3956613cd7c6e6414966dee349c2db4f"
 "checksum either 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3d2b503c86dad62aaf414ecf2b8c527439abedb3f8d812537f0b12bfd6f32a91"
-"checksum elastic-array 0.7.0 (git+https://github.com/paritytech/elastic-array?branch=0.7.0)" = "<none>"
+"checksum elastic-array 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71a64decd4b8cd06654a4e643c45cb558ad554abbffd82a7e16e34f45f51b605"
 "checksum env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e3856f1697098606fc6cb97a93de88ca3f3bc35bb878c725920e6e82ecf05e83"
 "checksum eth-secp256k1 0.5.6 (git+https://github.com/paritytech/rust-secp256k1)" = "<none>"
 "checksum ethabi 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "63df67d0af5e3cb906b667ca1a6e00baffbed87d0d8f5f78468a1f5eb3a66345"
diff --git a/ethcore/src/blockchain/blockchain.rs b/ethcore/src/blockchain/blockchain.rs
index 00420e58f..79169fd82 100644
--- a/ethcore/src/blockchain/blockchain.rs
+++ b/ethcore/src/blockchain/blockchain.rs
@@ -810,9 +810,11 @@ impl BlockChain {
 			}
 		};
 
-		transitions.candidates.push(transition);
-
-		batch.write(db::COL_EXTRA, &epoch_num, &transitions);
+		// ensure we don't write any duplicates.
+		if transitions.candidates.iter().find(|c| c.block_hash == transition.block_hash).is_none() {
+			transitions.candidates.push(transition);
+			batch.write(db::COL_EXTRA, &epoch_num, &transitions);
+		}
 	}
 
 	/// Add a child to a given block. Assumes that the block hash is in
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index ab9a07691..26d823dce 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -49,7 +49,7 @@ use evm::{Factory as EvmFactory, Schedule};
 use executive::{Executive, Executed, TransactOptions, contract_address};
 use factory::Factories;
 use futures::{future, Future};
-use header::BlockNumber;
+use header::{BlockNumber, Header};
 use io::*;
 use log_entry::LocalizedLogEntry;
 use miner::{Miner, MinerService, TransactionImportResult};
@@ -247,17 +247,29 @@ impl Client {
 			exit_handler: Mutex::new(None),
 		});
 
+		// prune old states.
 		{
 			let state_db = client.state_db.lock().boxed_clone();
 			let chain = client.chain.read();
 			client.prune_ancient(state_db, &chain)?;
 		}
 
+		// ensure genesis epoch proof in the DB.
+		{
+			let mut batch = DBTransaction::new();
+			let chain = client.chain.read();
+			client.generate_epoch_proof(&mut batch, &spec.genesis_header(), 0, &*chain);
+			client.db.read().write_buffered(batch);
+		}
+
 		if let Some(reg_addr) = client.additional_params().get("registrar").and_then(|s| Address::from_str(s).ok()) {
 			trace!(target: "client", "Found registrar at {}", reg_addr);
 			let registrar = Registry::new(reg_addr);
 			*client.registrar.lock() = Some(registrar);
 		}
+
+		// ensure buffered changes are flushed.
+		client.db.read().flush().map_err(ClientError::Database)?;
 		Ok(client)
 	}
 
@@ -581,7 +593,7 @@ impl Client {
 		let entering_new_epoch = {
 			use engines::EpochChange;
 			match self.engine.is_epoch_end(block.header(), Some(block_data), Some(&receipts)) {
-				EpochChange::Yes(e, p) => Some((block.header().clone(), e, p)),
+				EpochChange::Yes(e, _) => Some((block.header().clone(), e)),
 				EpochChange::No => None,
 				EpochChange::Unsure(_) => {
 					warn!(target: "client", "Detected invalid engine implementation.");
@@ -599,48 +611,8 @@ impl Client {
 		state.journal_under(&mut batch, number, hash).expect("DB commit failed");
 		let route = chain.insert_block(&mut batch, block_data, receipts);
 
-		if let Some((header, epoch, expected)) = entering_new_epoch {
-			use std::cell::RefCell;
-			use std::collections::BTreeSet;
-
-			debug!(target: "client", "Generating validation proof for block {}", hash);
-
-			// proof is two-part. state items read in lexicographical order,
-			// and the secondary "proof" part.
-			let read_values = RefCell::new(BTreeSet::new());
-			let block_id = BlockId::Hash(hash.clone());
-			let proof = {
-				let call = |a, d| {
-					let tx = self.contract_call_tx(block_id, a, d);
-					let (result, items) = self.prove_transaction(tx, block_id)
-						.ok_or_else(|| format!("Unable to make call to generate epoch proof."))?;
-
-					read_values.borrow_mut().extend(items);
-					Ok(result)
-				};
-
-				self.engine.epoch_proof(&header, &call)
-			};
-
-			match proof {
-				Ok(proof) => {
-					if proof != expected {
-						warn!(target: "client", "Extracted epoch change proof different than expected.");
-						warn!(target: "client", "Using a custom engine implementation?");
-					}
-
-					// insert into database, using the generated proof.
-					chain.insert_epoch_transition(&mut batch, epoch, EpochTransition {
-						block_hash: hash.clone(),
-						proof: proof,
-						state_proof: read_values.into_inner().into_iter().collect(),
-					});
-				}
-				Err(e) => {
-					warn!(target: "client", "Error generating epoch change proof for block {}: {}", hash, e);
-					warn!(target: "client", "Snapshots generated by this node will be incomplete.");
-				}
-			}
+		if let Some((header, epoch)) = entering_new_epoch {
+			self.generate_epoch_proof(&mut batch, &header, epoch, &chain);
 		}
 
 		self.tracedb.read().import(&mut batch, TraceImportRequest {
@@ -665,6 +637,46 @@ impl Client {
 		route
 	}
 
+	// generate an epoch transition proof at the given block, and write it into the given blockchain.
+	fn generate_epoch_proof(&self, batch: &mut DBTransaction, header: &Header, epoch_number: u64, chain: &BlockChain) {
+		use std::cell::RefCell;
+		use std::collections::BTreeSet;
+
+		let hash = header.hash();
+		debug!(target: "client", "Generating validation proof for block {}", hash);
+
+		// proof is two-part. state items read in lexicographical order,
+		// and the secondary "proof" part.
+		let read_values = RefCell::new(BTreeSet::new());
+		let block_id = BlockId::Hash(hash.clone());
+		let proof = {
+			let call = |a, d| {
+				let tx = self.contract_call_tx(block_id, a, d);
+				let (result, items) = self.prove_transaction(tx, block_id)
+					.ok_or_else(|| format!("Unable to make call to generate epoch proof."))?;
+
+				read_values.borrow_mut().extend(items);
+				Ok(result)
+			};
+
+			self.engine.epoch_proof(&header, &call)
+		};
+
+		// insert into database, using the generated proof.
+		match proof {
+			Ok(proof) =>
+				chain.insert_epoch_transition(batch, epoch_number, EpochTransition {
+					block_hash: hash.clone(),
+					proof: proof,
+					state_proof: read_values.into_inner().into_iter().collect(),
+				}),
+			Err(e) => {
+				warn!(target: "client", "Error generating epoch change proof for block {}: {}", hash, e);
+				warn!(target: "client", "Snapshots generated by this node will be incomplete.");
+			}
+		}
+	}
+
 	// prune ancient states until below the memory limit or only the minimum amount remain.
 	fn prune_ancient(&self, mut state_db: StateDB, chain: &BlockChain) -> Result<(), ClientError> {
 		let number = match state_db.journal_db().latest_era() {

From 8310877f257c33a574b4350161d0baf3297f8296 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Wed, 19 Apr 2017 13:42:54 +0000
Subject: [PATCH 030/117] [ci skip] js-precompiled 20170419-133906

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8208f583e..dccc2f8df 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1773,7 +1773,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#fb346e5f2925d1b2d533eb986bd2cefb962c7a88"
+source = "git+https://github.com/paritytech/js-precompiled.git#7b0c9ffdfa680f7792751f03d3490fc2a9fea23f"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 4f4b33ab7..da567a458 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.53",
+  "version": "1.7.54",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From e1e2674cd23e5db4902eb85fcb8784e321dd2c19 Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Wed, 19 Apr 2017 16:02:24 +0200
Subject: [PATCH 031/117] Show ETH value (even 0) if ETH transfert in
 transaction list (#5406)

---
 js/src/ui/TxList/TxRow/txRow.js | 37 +++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/js/src/ui/TxList/TxRow/txRow.js b/js/src/ui/TxList/TxRow/txRow.js
index 8d123c13c..1fcf54396 100644
--- a/js/src/ui/TxList/TxRow/txRow.js
+++ b/js/src/ui/TxList/TxRow/txRow.js
@@ -21,9 +21,10 @@ import { Link } from 'react-router';
 
 import { txLink } from '~/3rdparty/etherscan/links';
 
-import IdentityIcon from '../../IdentityIcon';
-import IdentityName from '../../IdentityName';
-import MethodDecoding from '../../MethodDecoding';
+import IdentityIcon from '~/ui/IdentityIcon';
+import IdentityName from '~/ui/IdentityName';
+import MethodDecoding from '~/ui/MethodDecoding';
+import MethodDecodingStore from '~/ui/MethodDecoding/methodDecodingStore';
 
 import styles from '../txList.css';
 
@@ -48,6 +49,29 @@ class TxRow extends Component {
     historic: true
   };
 
+  state = {
+    isContract: false,
+    isDeploy: false
+  };
+
+  methodDecodingStore = MethodDecodingStore.get(this.context.api);
+
+  componentWillMount () {
+    const { address, tx } = this.props;
+
+    this
+      .methodDecodingStore
+      .lookup(address, tx)
+      .then((lookup) => {
+        const newState = {
+          isContract: lookup.contract,
+          isDeploy: lookup.deploy
+        };
+
+        this.setState(newState);
+      });
+  }
+
   render () {
     const { address, className, historic, netVersion, tx } = this.props;
 
@@ -117,9 +141,14 @@ class TxRow extends Component {
 
   renderEtherValue (_value) {
     const { api } = this.context;
+    const { isContract, isDeploy } = this.state;
+
+    // Always show the value if ETH transfer, ie. not
+    // a contract or a deployment
+    const fullValue = !(isContract || isDeploy);
     const value = api.util.fromWei(_value);
 
-    if (value.eq(0)) {
+    if (value.eq(0) && !fullValue) {
       return <div className={ styles.value }>{ ' ' }</div>;
     }
 

From 23e7b53c138a564e2ad7fd22432b63c34d05895c Mon Sep 17 00:00:00 2001
From: Bas <h3ll0fr13nd@protonmail.com>
Date: Wed, 19 Apr 2017 16:08:47 +0200
Subject: [PATCH 032/117] nl i18n updated (#5461)

* Sync nl i18n to default

* Syntax fix in nl i18n

Tested locally

* nl translation improvements
---
 js/src/i18n/nl/account.js        |   6 +-
 js/src/i18n/nl/accounts.js       |   7 ++-
 js/src/i18n/nl/addAddress.js     |   3 +-
 js/src/i18n/nl/address.js        |  28 +++++++++
 js/src/i18n/nl/addresses.js      |  25 ++++++++
 js/src/i18n/nl/application.js    |   3 +
 js/src/i18n/nl/contract.js       |  24 ++++++-
 js/src/i18n/nl/contracts.js      |  28 +++++++++
 js/src/i18n/nl/createAccount.js  |  28 +++++----
 js/src/i18n/nl/createWallet.js   |   5 +-
 js/src/i18n/nl/dapps.js          |   3 +-
 js/src/i18n/nl/deployContract.js |   9 +++
 js/src/i18n/nl/faucet.js         |  28 +++++++++
 js/src/i18n/nl/firstRun.js       |  21 ++++++-
 js/src/i18n/nl/index.js          |  22 ++++++-
 js/src/i18n/nl/passwordChange.js |   1 +
 js/src/i18n/nl/saveContract.js   |  27 ++++++++
 js/src/i18n/nl/settings.js       |  20 ++++--
 js/src/i18n/nl/signer.js         | 103 +++++++++++++++++++++++++++++++
 js/src/i18n/nl/status.js         |  66 ++++++++++++++++++++
 js/src/i18n/nl/transfer.js       |  36 ++++++++++-
 js/src/i18n/nl/ui.js             |  97 ++++++++++++++++++++++++++---
 js/src/i18n/nl/upgradeParity.js  |   9 ++-
 js/src/i18n/nl/vaults.js         |  37 ++++++++++-
 js/src/i18n/nl/verification.js   |  85 +++++++++++++++++++++++++
 js/src/i18n/nl/wallet.js         |  45 ++++++++++++++
 js/src/i18n/nl/walletSettings.js |  26 +++++---
 js/src/i18n/nl/writeContract.js  |  62 +++++++++++++++++++
 28 files changed, 804 insertions(+), 50 deletions(-)
 create mode 100644 js/src/i18n/nl/address.js
 create mode 100644 js/src/i18n/nl/addresses.js
 create mode 100644 js/src/i18n/nl/contracts.js
 create mode 100644 js/src/i18n/nl/faucet.js
 create mode 100644 js/src/i18n/nl/saveContract.js
 create mode 100644 js/src/i18n/nl/signer.js
 create mode 100644 js/src/i18n/nl/status.js
 create mode 100644 js/src/i18n/nl/verification.js
 create mode 100644 js/src/i18n/nl/wallet.js
 create mode 100644 js/src/i18n/nl/writeContract.js

diff --git a/js/src/i18n/nl/account.js b/js/src/i18n/nl/account.js
index 57701292a..ee211bbca 100755
--- a/js/src/i18n/nl/account.js
+++ b/js/src/i18n/nl/account.js
@@ -16,13 +16,17 @@
 
 export default {
   button: {
-    delete: `verwijder account`,
+    delete: `verwijder`,
     edit: `bewerk`,
+    faucet: `Kovan ETH`,
     password: `wachtwoord`,
     shapeshift: `shapeshift`,
     transfer: `verzend`,
     verify: `verifieer`
   },
+  hardware: {
+    confirmDelete: `Weet je zeker dat je de volgende hardware adressen van je account lijst wilt verwijderen?`
+  },
   header: {
     outgoingTransactions: `{count} uitgaande transacties`,
     uuid: `uuid: {uuid}`
diff --git a/js/src/i18n/nl/accounts.js b/js/src/i18n/nl/accounts.js
index 315324632..e213bddb2 100755
--- a/js/src/i18n/nl/accounts.js
+++ b/js/src/i18n/nl/accounts.js
@@ -16,8 +16,8 @@
 
 export default {
   button: {
-    newAccount: `nieuw account`,
-    newWallet: `nieuw wallet`,
+    newAccount: `account`,
+    newWallet: `wallet`,
     vaults: `kluizen`
   },
   summary: {
@@ -27,5 +27,8 @@ export default {
   tooltip: {
     actions: `voor de huidige weergave zijn koppelingen beschikbaar op de werkbalk voor snelle toegang: het uitvoeren van acties of het creëren van een nieuw item`,
     overview: `hier vind je een overzichtelijke weergave van je accounts, waarin je meta informatie kunt bewerken en transacties kunt uitvoeren en bekijken`
+  },
+  tooltips: {
+    owner: `{name} (eigenaar)`
   }
 };
diff --git a/js/src/i18n/nl/addAddress.js b/js/src/i18n/nl/addAddress.js
index 1b2281888..e048988e9 100755
--- a/js/src/i18n/nl/addAddress.js
+++ b/js/src/i18n/nl/addAddress.js
@@ -19,6 +19,7 @@ export default {
     add: `Adres Opslaan`,
     close: `Annuleer`
   },
+  header: `Om een nieuwe invoer aan je adresboek toe te voegen, heb je het netwerk adres van het account nodig en kun je optioneel een beschrijving toevoegen. Zodra de nieuwe invoer is toegevoegd, zal het in je adresboek verschijnen.`,
   input: {
     address: {
       hint: `het netwerk adres van het item`,
@@ -33,5 +34,5 @@ export default {
       label: `Adres Naam`
     }
   },
-  label: `voeg opgeslagen adres toe`
+  label: `voeg een opgeslagen adres toe`
 };
diff --git a/js/src/i18n/nl/address.js b/js/src/i18n/nl/address.js
new file mode 100644
index 000000000..fc9d2eab1
--- /dev/null
+++ b/js/src/i18n/nl/address.js
@@ -0,0 +1,28 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  buttons: {
+    edit: `bewerken`,
+    forget: `vergeten`,
+    save: `opslaan`
+  },
+  delete: {
+    confirmInfo: `Weet je zeker dat je het volgende adres uit je adresboek wilt verwijderen?`,
+    title: `bevestig verwijderen`
+  },
+  title: `Adres Informatie`
+};
diff --git a/js/src/i18n/nl/addresses.js b/js/src/i18n/nl/addresses.js
new file mode 100644
index 000000000..c16c5f234
--- /dev/null
+++ b/js/src/i18n/nl/addresses.js
@@ -0,0 +1,25 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  buttons: {
+    add: `adres`
+  },
+  errors: {
+    invalidFile: `Het opgegeven bestand is ongeldig...`
+  },
+  title: `Opgeslagen Adressen`
+};
diff --git a/js/src/i18n/nl/application.js b/js/src/i18n/nl/application.js
index 1a6b2ee5c..bcb110b88 100755
--- a/js/src/i18n/nl/application.js
+++ b/js/src/i18n/nl/application.js
@@ -15,6 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 export default {
+  frame: {
+    error: `FOUT: Deze applicatie kan niet en zou niet geladen moeten worden in een embedded iFrame`
+  },
   status: {
     consensus: {
       capable: `Capable`,
diff --git a/js/src/i18n/nl/contract.js b/js/src/i18n/nl/contract.js
index 5f2ca39cc..9818f5edd 100755
--- a/js/src/i18n/nl/contract.js
+++ b/js/src/i18n/nl/contract.js
@@ -15,5 +15,27 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 export default {
-  minedBlock: `Opgenomen in blok #{blockNumber}`
+  buttons: {
+    close: `Sluit`,
+    details: `details`,
+    edit: `bewerken`,
+    execute: `uitvoeren`,
+    forget: `vergeten`
+  },
+  details: {
+    title: `contract details`
+  },
+  events: {
+    eventPending: `pending`,
+    noEvents: `Er zijn vanuit dit contract nog geen events verzonden.`,
+    title: `events`
+  },
+  minedBlock: `Opgenomen in blok #{blockNumber}`,
+  queries: {
+    buttons: {
+      query: `Query`
+    },
+    title: `queries`
+  },
+  title: `Contract Informatie`
 };
diff --git a/js/src/i18n/nl/contracts.js b/js/src/i18n/nl/contracts.js
new file mode 100644
index 000000000..18ab842a0
--- /dev/null
+++ b/js/src/i18n/nl/contracts.js
@@ -0,0 +1,28 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  buttons: {
+    deploy: `publiceer`,
+    develop: `ontwikkel`,
+    watch: `bekijk`
+  },
+  sortOrder: {
+    date: `datum`,
+    minedBlock: `opgenomen blok`
+  },
+  title: `Contracten`
+};
diff --git a/js/src/i18n/nl/createAccount.js b/js/src/i18n/nl/createAccount.js
index 69585df35..98b7ac26b 100755
--- a/js/src/i18n/nl/createAccount.js
+++ b/js/src/i18n/nl/createAccount.js
@@ -20,10 +20,6 @@ export default {
       hint: `Het netwerk adres van het account`,
       label: `adres`
     },
-    name: {
-      hint: `Een beschrijvende naam van het account`,
-      label: `account naam`
-    },
     phrase: {
       hint: `De account herstel zin`,
       label: `Eigenaar's herstel zin (houd deze woorden veilig en prive want hiermee kun je volledige, ongelimiteerde toegang tot het account verkrijgen).`
@@ -35,31 +31,38 @@ export default {
   button: {
     back: `Terug`,
     cancel: `Annuleer`,
-    close: `Sluit`,
     create: `Aanmaken`,
+    done: `Klaar`,
     import: `Importeer`,
     next: `Volgende`,
     print: `Herstel zin afdrukken`
   },
   creationType: {
     fromGeth: {
-      label: `Importeer accounts uit Geth keystore`
+      description: `Importeer accounts uit Geth keystore met het originele wachtwoord`,
+      label: `Geth keystore`
     },
     fromJSON: {
-      label: `Importeer account uit een opgeslagen JSON file`
+      description: `Importeer account uit een JSON sleutelbestand met het originele wachtwoord`,
+      label: `JSON bestand`
     },
     fromNew: {
-      label: `Handmatig account aanmaken`
+      description: `Selecteer je identiteits-icoon en kies je wachtwoord`,
+      label: `Nieuw Account`
     },
     fromPhrase: {
-      label: `Herstel account met een herstel zin`
+      description: `Herstel je account met een eerder bewaarde herstel zin en een nieuw wachtwoord`,
+      label: `Herstel zin`
     },
     fromPresale: {
-      label: `Importeer account van een Ethereum voor-verkoop (pre-sale) wallet`
+      description: `Importeer een Ethereum voor-verkoop (pre-sale) wallet bestand met het originele wachtwoord`,
+      label: `voor-verkoop wallet`
     },
     fromRaw: {
-      label: `Importeer een prive sleutel (raw private key)`
-    }
+      description: `Importeer een eerder gemaakte prive sleutel (raw private key) met een nieuw wachtwoord`,
+      label: `Prive sleutel`
+    },
+    info: `Selecteer de manier waarop je je account wilt aanmaken of importeren. Maak een nieuw account aan met een naam en wachtwoord, of importeer/herstel een bestaand account vanuit verschillende bronnen zoals een herstel zin of een sleutelbestand. Met behulp van deze wizard word je door het proces begeleid om een account aan te maken.`
   },
   newAccount: {
     hint: {
@@ -80,6 +83,7 @@ export default {
     }
   },
   newGeth: {
+    available: `Er zijn momenteel {count} importeerbare sleutels (keys) beschikbaar vanuit Geth keystore, welke nog niet in je Parity installatie beschikbaar zijn. Selecteer de accounts die je wilt importeren en ga verder naar de volgende stap om het importeren te voltooien.`,
     noKeys: `Er zijn momenteel geen importeerbare sleutels (keys) beschikbaar in de Geth keystore; of ze zijn al in je Parity installatie beschikbaar`
   },
   newImport: {
diff --git a/js/src/i18n/nl/createWallet.js b/js/src/i18n/nl/createWallet.js
index 6acd2e2c8..9f3419497 100644
--- a/js/src/i18n/nl/createWallet.js
+++ b/js/src/i18n/nl/createWallet.js
@@ -53,7 +53,7 @@ export default {
       label: `wallet naam`
     },
     ownerMulti: {
-      hint: `het eigenaars account van dit contract`,
+      hint: `het account wat eigenaar is van dit contract`,
       label: `van account (contract eigenaar)`
     },
     ownersMulti: {
@@ -80,6 +80,7 @@ export default {
   },
   states: {
     completed: `Het contract is succesvol aangemaakt`,
+    confirmationNeeded: `Voor het aanmaken van dit contract is bevestiging door andere eigenaren van het Wallet vereist`,
     preparing: `Transactie aan het voorbereiden voor verzending op het netwerk`,
     validatingCode: `De contract code van het aangemaakte contract wordt gevalideerd`,
     waitingConfirm: `Wachten tot de transactie bevestigd is in de Parity Secure Signer`,
@@ -93,7 +94,7 @@ export default {
   },
   type: {
     multisig: {
-      description: `Creëer/Maak een {link} Wallet aan`,
+      description: `Maak een {link} Wallet aan`,
       label: `Multi-Sig wallet`,
       link: `standaard multi-signature`
     },
diff --git a/js/src/i18n/nl/dapps.js b/js/src/i18n/nl/dapps.js
index 3c7cf6d7b..6949c4d48 100644
--- a/js/src/i18n/nl/dapps.js
+++ b/js/src/i18n/nl/dapps.js
@@ -36,11 +36,10 @@ export default {
   },
   external: {
     accept: `Ik begrijp dat deze toepassingen niet bij Parity zijn aangesloten`,
-    warning: `Deze applicaties gepuliceerd door derde partijen zijn niet bij Parity aangesloten, noch worden ze gepubliceerd door Parity. Alle applicaties blijven in beheer van hun eigen auteur. Zorg ervoor dat je snapt wat het doel van een applicatie is voordat je ermee aan de slag gaat.`
+    warning: `Deze applicaties zijn gepuliceerd door derde partijen welke niet verwant zijn aan Parity en zijn dus ook niet door Parity uitgebracht. Alle applicaties blijven in beheer van hun eigen auteur. Zorg ervoor dat je snapt wat het doel van een applicatie is voordat je ermee aan de slag gaat.`
   },
   label: `Gedecentraliseerde Applicaties`,
   permissions: {
-    description: `{activeIcon} account is beschikbaar voor applicaties, {defaultIcon} account is het standaard account`,
     label: `zichtbare dapp accounts`
   }
 };
diff --git a/js/src/i18n/nl/deployContract.js b/js/src/i18n/nl/deployContract.js
index 478992464..042d52276 100644
--- a/js/src/i18n/nl/deployContract.js
+++ b/js/src/i18n/nl/deployContract.js
@@ -37,6 +37,13 @@ export default {
       hint: `het account wat eigenaar is van dit contract`,
       label: `van account (contract eigenaar)`
     },
+    advanced: {
+      label: `geavanceerde verzend opties`
+    },
+    amount: {
+      hint: `de naar het contract te verzenden hoeveelheid`,
+      label: `te verzenden hoeveelheid (in {tag})`
+    },
     code: {
       hint: `de gecompileerde code van het aan te maken contract`,
       label: `code`
@@ -65,6 +72,7 @@ export default {
   },
   state: {
     completed: `Het contract is succesvol aangemaakt`,
+    confirmationNeeded: `Deze actie vereist de bevestiging van de andere eigenaren van het contract`,
     preparing: `Transactie aan het voorbereiden om te verzenden op het netwerk`,
     validatingCode: `De contract code van het aangemaakte contract valideren`,
     waitReceipt: `Wachten tot het aanmaken van het contract bevestigd is`,
@@ -74,6 +82,7 @@ export default {
     completed: `voltooid`,
     deployment: `aangemaakt`,
     details: `contract details`,
+    extras: `extra informatie`,
     failed: `aanmaken mislukt`,
     parameters: `contract parameters`,
     rejected: `afgewezen`
diff --git a/js/src/i18n/nl/faucet.js b/js/src/i18n/nl/faucet.js
new file mode 100644
index 000000000..f35acc0b7
--- /dev/null
+++ b/js/src/i18n/nl/faucet.js
@@ -0,0 +1,28 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  buttons: {
+    close: `sluit`,
+    done: `klaar`,
+    request: `verzoek`
+  },
+  summary: {
+    done: `Jouw Kovan ETH is aangevraagd bij het faucet, wat reageerde met het volgende bericht -`,
+    info: `Om een hoeveelheid Kovan ETH aan te vragen voor dit adres, moet je ervoor zorgen dat het adres op het mainnet sms-geverifieerd is. Zodra je dit uitvoert, zal het faucet Kovan ETH naar je huidige account verzenden.`
+  },
+  title: `Kovan ETH Faucet`
+};
diff --git a/js/src/i18n/nl/firstRun.js b/js/src/i18n/nl/firstRun.js
index d182c76e1..9c7c4cf5d 100755
--- a/js/src/i18n/nl/firstRun.js
+++ b/js/src/i18n/nl/firstRun.js
@@ -17,16 +17,33 @@
 export default {
   button: {
     close: `Sluiten`,
-    create: `creëer`,
-    next: `volgende`,
+    create: `Creëer`,
+    next: `Volgende`,
     print: `Woorden Afdrukken`,
     skip: `Overslaan`
   },
+  completed: {
+    congrats: `Gefeliciteerd! Je node configuratie is succesvol afgerond en het programma is klaar voor gebruikt.`,
+    next: `Om je snel aan de slag te laten gaan krijg je in de volgende stap een korte algemene inleiding in het gebruik van het programma en lopen we door de beschikbare funcies.`
+  },
   title: {
     completed: `voltooid`,
     newAccount: `nieuw account`,
     recovery: `herstelzin`,
     terms: `voorwaarden`,
     welcome: `welkom`
+  },
+  tnc: {
+    accept: `Ik accepteer de voorwaarden en condities`
+  },
+  welcome: {
+    description: `Als onderdeel van een nieuwe installatie, begeleiden we je in de enkele hierna volgende stappen met het configureren van je Parity node en jouw bijbehorende accounts. Ons doel hiervan is om het je zo gemakkelijk mogelijk te maken and zodat je binnen de kortste tijd klaar bent voor gebruik, dus heb even geduld en blijf bij ons. Zodra je de wizard voltooid hebt, heb je -`,
+    greeting: `Welkom bij Parity, de snelste en makkelijkste manier om je eigen node te draaien.`,
+    next: `Klik volgende om door te gaan.`,
+    step: {
+      account: `Je eerste Parity account aangemaakt;`,
+      privacy: `Onze privacybeleid en bedrijfsvoorwaarden begrepen;`,
+      recovery: `De mogelijkheid om je account te herstellen.`
+    }
   }
 };
diff --git a/js/src/i18n/nl/index.js b/js/src/i18n/nl/index.js
index 281e9974c..0d11be8f1 100755
--- a/js/src/i18n/nl/index.js
+++ b/js/src/i18n/nl/index.js
@@ -18,10 +18,13 @@ import account from './account';
 import accounts from './accounts';
 import addAddress from './addAddress';
 import addContract from './addContract';
+import address from './address';
+import addresses from './addresses';
 import addressSelect from './addressSelect';
 import application from './application';
 import connection from './connection';
 import contract from './contract';
+import contracts from './contracts';
 import createAccount from './createAccount';
 import createWallet from './createWallet';
 import dapp from './dapp';
@@ -32,31 +35,41 @@ import editMeta from './editMeta';
 import errors from './errors';
 import executeContract from './executeContract';
 import extension from './extension';
+import faucet from './faucet';
 import firstRun from './firstRun';
 import home from './home';
 import loadContract from './loadContract';
 import parityBar from './parityBar';
 import passwordChange from './passwordChange';
+import saveContract from './saveContract';
 import settings from './settings';
 import shapeshift from './shapeshift';
+import signer from './signer';
+import status from './status';
 import tabBar from './tabBar';
 import transfer from './transfer';
 import txEditor from './txEditor';
 import ui from './ui';
 import upgradeParity from './upgradeParity';
 import vaults from './vaults';
+import verification from './verification';
+import wallet from './wallet';
 import walletSettings from './walletSettings';
 import web from './web';
+import writeContract from './writeContract';
 
 export default {
   account,
   accounts,
   addAddress,
   addContract,
+  address,
+  addresses,
   addressSelect,
   application,
   connection,
   contract,
+  contracts,
   createAccount,
   createWallet,
   dapp,
@@ -67,19 +80,26 @@ export default {
   errors,
   executeContract,
   extension,
+  faucet,
   firstRun,
   home,
   loadContract,
   parityBar,
   passwordChange,
+  saveContract,
   settings,
   shapeshift,
+  signer,
+  status,
   tabBar,
   transfer,
   txEditor,
   ui,
   upgradeParity,
   vaults,
+  verification,
+  wallet,
   walletSettings,
-  web
+  web,
+  writeContract
 };
diff --git a/js/src/i18n/nl/passwordChange.js b/js/src/i18n/nl/passwordChange.js
index c59e50eed..eca3fd919 100644
--- a/js/src/i18n/nl/passwordChange.js
+++ b/js/src/i18n/nl/passwordChange.js
@@ -30,6 +30,7 @@ export default {
     label: `nieuw wachtwoord`
   },
   passwordHint: {
+    display: `Hint {hint}`,
     hint: `hint voor het nieuwe wachtwoord`,
     label: `(optioneel) nieuwe wachtwoord hint`
   },
diff --git a/js/src/i18n/nl/saveContract.js b/js/src/i18n/nl/saveContract.js
new file mode 100644
index 000000000..e51a3be3d
--- /dev/null
+++ b/js/src/i18n/nl/saveContract.js
@@ -0,0 +1,27 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  buttons: {
+    cancel: `Annuleer`,
+    save: `Opslaan`
+  },
+  name: {
+    hint: `kies een naam voor dit contract`,
+    label: `contract naam`
+  },
+  title: `contract opslaan`
+};
diff --git a/js/src/i18n/nl/settings.js b/js/src/i18n/nl/settings.js
index 81f485696..f6705df78 100644
--- a/js/src/i18n/nl/settings.js
+++ b/js/src/i18n/nl/settings.js
@@ -22,6 +22,18 @@ export default {
     label: `achtergrond`
   },
   parity: {
+    chains: {
+      chain_classic: `Parity synchroniseert met het Ethereum Classic netwerk`,
+      chain_dev: `Parity gebruikt een lokale ontwikkelaars chain`,
+      chain_expanse: `Parity synchroniseert met het Expanse netwerk`,
+      chain_foundation: `Parity synchroniseert met het Ethereum netwerk wat door de Ethereum Foundation is uitgebracht`,
+      chain_kovan: `Parity synchroniseert met het Kovan test netwerk`,
+      chain_olympic: `Parity synchroniseert met het Olympic test netwerk`,
+      chain_ropsten: `Parity synchroniseert met het Ropsten test netwerk`,
+      cmorden_kovan: `Parity synchroniseert met het Morden (Classic) test netwerk`,
+      hint: `de chain waarmee de Parity node synchroniseert`,
+      label: `te synchroniseren chain/netwerk`
+    },
     languages: {
       hint: `de taal waarin deze interface wordt weergegeven`,
       label: `Weergave taal`
@@ -35,7 +47,7 @@ export default {
       mode_offline: `Parity synchroniseert niet`,
       mode_passive: `Parity synchroniseert in het begin. Daarna slaapt Parity en wordt regelmatig wakker voor synchronisatie`
     },
-    overview_0: `Pas de Parity node instellingen aan en kies de synchronisatie modus in dit menu.`,
+    overview_0: `Pas de Parity node instellingen aan en kies de manier van synchroniseren in dit menu.`,
     label: `parity`
   },
   proxy: {
@@ -53,7 +65,7 @@ export default {
       label: `Accounts`
     },
     addresses: {
-      description: `Een overzicht van alle contacten en adresboek items die door deze Parity installatie worden beheerd. Monitor en volg accounts waarbij je transactie details met slechts een muisklik kunt weergeven.`,
+      description: `Een overzicht van alle door deze Parity installatie beheerde contacten en adresboek items. Monitor en volg accounts waarbij je transactie details met slechts een muisklik kunt weergeven.`,
       label: `Adresboek`
     },
     apps: {
@@ -64,10 +76,10 @@ export default {
       description: `Monitor, volg en maak gebruik van specifieke contracten die op het netwerk zijn gezet. Dit is een meer technisch gerichte omgeving, voornamelijk bedoeld voor geavanceerde gebruikers die de werking van bepaalde contracten goed begrijpen.`,
       label: `Contracten`
     },
-    overview_0: `Beheer de beschikbare weergaven van deze interface en selecteer enkel de delen van de applicatie die voor jou van belang zijn.`,
+    overview_0: `Beheer de beschikbare weergaven van deze interface, en selecteer enkel de delen van de applicatie die voor jou van belang zijn.`,
     overview_1: `Ben je een eind gebruiker? De standaard instellingen zijn geschikt voor zowel beginners als gevorderde gebruikers.`,
     overview_2: `Ben je een ontwikkelaar? Voeg enkele functies toe om je contracten te beheren en gebruik te maken van gedecentraliseerde applicaties.`,
-    overview_3: `Ben je een miner of run je een grootschalige node? Voeg enkele functies toe om je alle informatie te geven die je nodig hebt om je node te monitoren.`,
+    overview_3: `Ben je een miner of draai je een grootschalige node? Voeg enkele functies toe om je alle informatie te geven die je nodig hebt om je node te monitoren.`,
     settings: {
       description: `Deze weergave. Hiermee kun je Parity aan passen in termen van opties, bediening en look en feel.`,
       label: `Instellingen`
diff --git a/js/src/i18n/nl/signer.js b/js/src/i18n/nl/signer.js
new file mode 100644
index 000000000..ec7ee96f8
--- /dev/null
+++ b/js/src/i18n/nl/signer.js
@@ -0,0 +1,103 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  embedded: {
+    noPending: `Er zijn momenteel geen lopende verzoeken die op je goedkeuring wachten`
+  },
+  mainDetails: {
+    editTx: `Bewerk condities/gas/gasprijs`,
+    tooltips: {
+      total1: `De waarde van de transactie inclusief de miningskosten is {total} {type}.`,
+      total2: `(Dit is inclusief een miners vergoeding van {fee} {token})`,
+      value1: `De waarde van de transactie.`
+    }
+  },
+  requestOrigin: {
+    dapp: `door een dapp op {url}`,
+    ipc: `via IPC sessie`,
+    rpc: `via RPC {rpc}`,
+    signerCurrent: `via huidige tab`,
+    signerUI: `via UI sessie`,
+    unknownInterface: `via onbekende interface`,
+    unknownRpc: `niet geïdentificeerd`,
+    unknownUrl: `onbekende URL`
+  },
+  requestsPage: {
+    noPending: `Er zijn geen verzoeken die je goedkeuring vereisen.`,
+    pendingTitle: `Openstaande Verzoeken`,
+    queueTitle: `Lokale Transacties`
+  },
+  sending: {
+    hardware: {
+      confirm: `Bevestig de transactie op je aangesloten hardware wallet`,
+      connect: `Sluit je hardware wallet aan voordat je de transactie bevestigd`
+    }
+  },
+  signRequest: {
+    request: `Een verzoek om data te ondertekenen met jouw account:`,
+    state: {
+      confirmed: `Bevestigd`,
+      rejected: `Afgewezen`
+    },
+    unknownBinary: `(Onbekende binary data)`,
+    warning: `WAARSCHUWING: Deze gevolgen hiervan kunnen ernstig zijn. Bevestig het verzoek alleen als je het zeker weet.`
+  },
+  title: `Trusted Signer`,
+  txPending: {
+    buttons: {
+      viewToggle: `bekijk transactie`
+    }
+  },
+  txPendingConfirm: {
+    buttons: {
+      confirmBusy: `Bevestigen...`,
+      confirmRequest: `Bevestig Verzoek`
+    },
+    errors: {
+      invalidWallet: `Opgegeven wallet bestand is ongeldig.`
+    },
+    password: {
+      decrypt: {
+        hint: `open (decrypt) de sleutel met je wachtwoord`,
+        label: `Sleutel Wachtwoord`
+      },
+      unlock: {
+        hint: `ontgrendel het account`,
+        label: `Account Wachtwoord`
+      }
+    },
+    passwordHint: `(hint) {passwordHint}`,
+    selectKey: {
+      hint: `De sleutelbestand (keyfile) die je voor dit account wilt gebruiken`,
+      label: `Selecteer Lokale Sleutel (key)`
+    },
+    tooltips: {
+      password: `Geef een wachtwoord voor dit account`
+    }
+  },
+  txPendingForm: {
+    changedMind: `Ik heb me bedacht`,
+    reject: `wijs verzoek af`
+  },
+  txPendingReject: {
+    buttons: {
+      reject: `Wijs Verzoek Af`
+    },
+    info: `Weet je zeker dat je dit verzoek wilt afwijzen?`,
+    undone: `Dit kan niet ongedaan gemaakt worden`
+  }
+};
diff --git a/js/src/i18n/nl/status.js b/js/src/i18n/nl/status.js
new file mode 100644
index 000000000..9c0294ab0
--- /dev/null
+++ b/js/src/i18n/nl/status.js
@@ -0,0 +1,66 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  debug: {
+    reverse: `Omgekeerde volgorde`,
+    stopped: `De live weergave van de Parity logboeken is momenteel gestopt via de UI, start de live weergave om de laatste updates te zien.`,
+    title: `Node Logboeken`
+  },
+  miningSettings: {
+    input: {
+      author: {
+        hint: `de mining auteur`,
+        label: `auteur`
+      },
+      extradata: {
+        hint: `extra data voor mined blokken`,
+        label: `extra data`
+      },
+      gasFloor: {
+        hint: `het gas-floor doel voor mining`,
+        label: `gas-floor doel`
+      },
+      gasPrice: {
+        hint: `de minimale gas prijs voor mining`,
+        label: `minimale gas prijs`
+      }
+    },
+    title: `mining instellingen`
+  },
+  status: {
+    hashrate: `{hashrate} H/s`,
+    input: {
+      chain: `chain`,
+      enode: `enode`,
+      no: `nee`,
+      peers: `peers`,
+      port: `netwerk poort`,
+      rpcEnabled: `rpc ingeschakeld`,
+      rpcInterface: `rpc interface`,
+      rpcPort: `rpc poort`,
+      yes: `ja`
+    },
+    title: {
+      bestBlock: `beste block`,
+      hashRate: `hash rate`,
+      network: `netwerk instellingen`,
+      node: `Node`,
+      peers: `peers`
+    }
+  },
+  title: `Status`
+};
diff --git a/js/src/i18n/nl/transfer.js b/js/src/i18n/nl/transfer.js
index 1370711b4..29866470b 100644
--- a/js/src/i18n/nl/transfer.js
+++ b/js/src/i18n/nl/transfer.js
@@ -21,7 +21,41 @@ export default {
       label: `transactie data`
     }
   },
+  buttons: {
+    back: `Terug`,
+    cancel: `Annuleer`,
+    close: `Sluit`,
+    next: `Volgende`,
+    send: `Verzend`
+  },
+  details: {
+    advanced: {
+      label: `geavanceerde verzend opties`
+    },
+    amount: {
+      hint: `de naar de ontvanger te verzenden hoeveelheid`,
+      label: `te verzenden hoeveelheid (in {tag})`
+    },
+    fullBalance: {
+      label: `volledige account balans`
+    },
+    recipient: {
+      hint: `het ontvangende adres`,
+      label: `ontvanger adres`
+    },
+    sender: {
+      hint: `het verzendende adres`,
+      label: `Verzender adres`
+    },
+    total: {
+      label: `totale transactie hoeveelheid`
+    }
+  },
+  wallet: {
+    confirmation: `Deze transactie vereist bevestiging van andere eigenaren.`,
+    operationHash: `hash van deze bewerking`
+  },
   warning: {
-    wallet_spent_limit: `Deze transactie waarde is boven de toegestane dag limiet en zal moeten worden bevestigd door andere eigenaren.`
+    wallet_spent_limit: `De waarde van deze transactie is hoger dan de toegestane dag limiet en zal moeten worden bevestigd door andere eigenaren.`
   }
 };
diff --git a/js/src/i18n/nl/ui.js b/js/src/i18n/nl/ui.js
index c0454e9f6..1b7a9163b 100644
--- a/js/src/i18n/nl/ui.js
+++ b/js/src/i18n/nl/ui.js
@@ -15,8 +15,40 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 export default {
+  actionbar: {
+    export: {
+      button: {
+        export: `exporteer`
+      }
+    },
+    import: {
+      button: {
+        cancel: `Annuleer`,
+        confirm: `Bevestig`,
+        import: `importeer`
+      },
+      confirm: `Bevestig dat dit is wat je wilt importeren.`,
+      error: `Er is een fout opgetreden: {errorText}`,
+      step: {
+        error: `fout`,
+        select: `selecteer een bestand`,
+        validate: `valideer`
+      },
+      title: `Importeer vanuit een bestand`
+    },
+    search: {
+      hint: `Voer zoekopdracht in...`
+    },
+    sort: {
+      sortBy: `Sorteer op {label}`,
+      typeDefault: `Standaard`,
+      typeEth: `Sorteer op ETH`,
+      typeName: `Sorteer op naam`,
+      typeTags: `Sorteer op tags`
+    }
+  },
   balance: {
-    none: `Er zijn geen tegoeden gekoppeld aan dit account`
+    none: `Geen tegoeden gekoppeld aan dit account`
   },
   blockStatus: {
     bestBlock: `{blockNumber} beste blok`,
@@ -28,10 +60,61 @@ export default {
     no: `nee`,
     yes: `ja`
   },
+  copyToClipboard: {
+    copied: `{data} is naar het klembord gekopierd`
+  },
+  errors: {
+    close: `sluit`
+  },
+  fileSelect: {
+    defaultLabel: `Sleep hier een bestand naartoe, of klik om een bestand te selecteren voor uploaden`
+  },
+  gasPriceSelector: {
+    customTooltip: {
+      transactions: `{number} {number, plural, one {transaction} other {transactions}} met een ingestelde gasprijs tussen de {minPrice} en {maxPrice}`
+    }
+  },
   identityName: {
     null: `NUL`,
     unnamed: `NAAMLOOS`
   },
+  methodDecoding: {
+    condition: {
+      block: `, {historic, select, true {Submitted} false {Submission}} in blok {blockNumber}`,
+      time: `, {historic, select, true {Submitted} false {Submission}} op {timestamp}`
+    },
+    deploy: {
+      address: `Een contract aangemaakt op adres`,
+      params: `met de volgende parameters:`,
+      willDeploy: `Zal een contract aanmaken`,
+      withValue: `, verzenden van {value}`
+    },
+    gasUsed: `({gas} gas gebruikt)`,
+    gasValues: `{gas} gas ({gasPrice}M/{tag})`,
+    input: {
+      data: `data`,
+      input: `input`,
+      withInput: `met de {inputDesc} {inputValue}`
+    },
+    receive: {
+      contract: `het contract`,
+      info: `{historic, select, true {Received} false {Will receive}} {valueEth} van {aContract}{address}`
+    },
+    signature: {
+      info: `{historic, select, true {Executed} false {Will execute}} the {method} function on the contract {address} transferring {ethValue}{inputLength, plural, zero {,} other {passing the following {inputLength, plural, one {parameter} other {parameters}}}}`
+    },
+    token: {
+      transfer: `{historic, select, true {Transferred} false {Will transfer}} {value} naar {address}`
+    },
+    transfer: {
+      contract: `het contract`,
+      info: `{historic, select, true {Transferred} false {Will transfer}} {valueEth} naar {aContract}{address}`
+    },
+    txValues: `{historic, select, true {Provided} false {Provides}} {gasProvided}{gasUsed} voor een totale transactie waarde van {totalEthValue}`,
+    unknown: {
+      info: `{historic, select, true {Executed} false {Will execute}} the {method} on the contract {address} transferring {ethValue}.`
+    }
+  },
   passwordStrength: {
     label: `wachtwoord sterkte`
   },
@@ -48,6 +131,10 @@ export default {
     posted: `De transactie is op het netwerk geplaatst met hash {hashLink}`,
     waiting: `wachten op bevestigingen`
   },
+  vaultSelect: {
+    hint: `de kluis waaraan dit account gekoppeld is`,
+    label: `gekoppelde kluis`
+  },
   verification: {
     gatherData: {
       accountHasRequested: {
@@ -60,10 +147,6 @@ export default {
         pending: `Aan het controleren of je account is geverifieerd…`,
         true: `Je account is al geverifieerd.`
       },
-      email: {
-        hint: `de code zal naar dit adres worden verzonden`,
-        label: `e-mail adres`
-      },
       fee: `De extra vergoeding is {amount} ETH.`,
       isAbleToRequest: {
         pending: `Valideren van je invoer…`
@@ -74,10 +157,6 @@ export default {
         true: `De verificatie server is actief.`
       },
       nofee: `Er zijn geen extra kosten.`,
-      phoneNumber: {
-        hint: `De SMS zal naar dit nummer worden verstuurd`,
-        label: `telefoonnummer in internationaal formaat`
-      },
       termsOfService: `Ik ga akkoord met de voorwaarden en condities hieronder.`
     }
   }
diff --git a/js/src/i18n/nl/upgradeParity.js b/js/src/i18n/nl/upgradeParity.js
index c057c9e7d..732a7b267 100644
--- a/js/src/i18n/nl/upgradeParity.js
+++ b/js/src/i18n/nl/upgradeParity.js
@@ -15,13 +15,13 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 export default {
-  busy: `Parity wordt momenteel bijgewerkt naar versie {newversion}`,
+  busy: `Parity wordt momenteel bijgewerkt naar versie {newversion}. Wacht tot het proces is voltooid.`,
   button: {
     close: `sluiten`,
     done: `klaar`,
     upgrade: `werk nu bij`
   },
-  completed: `Het bijwerken naar Parity {newversion} is succesvol voltooid.`,
+  completed: `Het bijwerken naar Parity {newversion} is succesvol voltooid. Klik op "klaar" om het programma automatisch opnieuw op te starten.`,
   consensus: {
     capable: `Je huidige versie van Parity voldoet aan de netwerk vereisten.`,
     capableUntil: `Je huidige versie van Parity voldoet aan de netwerk vereisten tot aan blok {blockNumber}`,
@@ -30,7 +30,10 @@ export default {
   },
   failed: `Het bijwerken naar Parity {newversion} gaf een fout en is mislukt.`,
   info: {
-    upgrade: `Een nieuwe versie van Parity, version {newversion} is beschikbaar als upgrade vanaf je huidige versie {currentversion}`
+    currentVersion: `Je huidige versie is {currentversion}`,
+    next: `Klik op "werk nu bij" om het bijwerken van je Parity te starten.`,
+    upgrade: `Een nieuwe versie {newversion} is beschikbaar`,
+    welcome: `Welkom bij de Parity upgrade wizard, deze stelt je in staat om Parity op zeer eenvoudige wijze bij te werken naar de nieuwste versie.`
   },
   step: {
     completed: `bijwerken voltooid`,
diff --git a/js/src/i18n/nl/vaults.js b/js/src/i18n/nl/vaults.js
index b16c6807e..3659fb7d7 100644
--- a/js/src/i18n/nl/vaults.js
+++ b/js/src/i18n/nl/vaults.js
@@ -26,8 +26,9 @@ export default {
   button: {
     accounts: `accounts`,
     add: `Maak kluis`,
-    close: `sluit kluis`,
-    open: `open kluis`
+    close: `sluit`,
+    edit: `bewerk`,
+    open: `open`
   },
   confirmClose: {
     info: `Je staat op het punt op een kluis te sluiten. Alle aan deze kluis verbonden accounts zullen niet meer zichtbaar zijn na het voltooien van deze actie. Om deze accounts weer zichtbaar te maken dien je de kluis weer te openen.`,
@@ -70,6 +71,38 @@ export default {
     },
     title: `Maak een nieuwe kluis aan`
   },
+  editMeta: {
+    allowPassword: `Wijzig kluis wachtwoord`,
+    button: {
+      close: `sluit`,
+      save: `opslaan`
+    },
+    currentPassword: {
+      hint: `je huidige kluis wachtwoord`,
+      label: `huidige wachtwoord`
+    },
+    description: {
+      hint: `de  omschrijving van deze kluis`,
+      label: `kluis omschrijving`
+    },
+    password: {
+      hint: `een sterk, uniek wachtwoord`,
+      label: `nieuw wachtwoord`
+    },
+    password2: {
+      hint: `verifieer je nieuwe wachtwoord`,
+      label: `nieuw wachtwoord (herhaal)`
+    },
+    passwordHint: {
+      hint: `je wachtwoord hint voor deze kluis`,
+      label: `wachtwoord hint`
+    },
+    title: `Bewerk Kluis Metadata`
+  },
   empty: `Er zijn momenteel geen kluizen om weer tegeven.`,
+  selector: {
+    noneAvailable: `Er zijn momenteel geen kluizen geopend en beschikbaar voor selectie. Maak eerst een kluis aan en open deze, voordat je een kluis selecteert voor het verplaatsen van een account.`,
+    title: `Selecteer Account Kluis`
+  },
   title: `Kluis Beheer`
 };
diff --git a/js/src/i18n/nl/verification.js b/js/src/i18n/nl/verification.js
new file mode 100644
index 000000000..bd0ba1c28
--- /dev/null
+++ b/js/src/i18n/nl/verification.js
@@ -0,0 +1,85 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  button: {
+    cancel: `Annuleer`,
+    done: `Klaar`,
+    next: `Volgende`
+  },
+  code: {
+    error: `ongeldige code`,
+    hint: `Voer de ontvangen code in.`,
+    label: `verificatie code`,
+    sent: `De verificatie code is verstuurd naar {receiver}.`
+  },
+  confirmation: {
+    authorise: `De verificatie code zal naar het contract worden verzonden. Gebruik de Parity Signer om dit goed te keuren.`,
+    windowOpen: `Houd dit scherm open.`
+  },
+  done: {
+    message: `Gefeliciteerd, je account is geverifieerd!`
+  },
+  email: {
+    enterCode: `Voer de code in die je per e-email hebt ontvangen.`
+  },
+  gatherData: {
+    email: {
+      hint: `de code zal naar dit adres worden verstuurd`,
+      label: `e-mail adres`
+    },
+    phoneNumber: {
+      hint: `De SMS zal naar dit nummer worden verstuurd`,
+      label: `telefoon nummer in internationaal formaat`
+    }
+  },
+  gatherDate: {
+    email: {
+      error: `ongeldig e-mail adres`
+    },
+    phoneNumber: {
+      error: `ongeldig telefoon nummer`
+    }
+  },
+  loading: `Laden van verificatie data.`,
+  request: {
+    authorise: `Een verificatie verzoek zal naar het contract worden verzonden. Gebruik de Parity Signer om dit goed te keuren.`,
+    requesting: `Een code aanvragen bij de Parity-server en wachten tot de puzzel in het contract opgenomen wordt.`,
+    windowOpen: `Houd dit scherm open.`
+  },
+  sms: {
+    enterCode: `Voer de code in die je per SMS hebt ontvangen.`
+  },
+  steps: {
+    code: `Voer Code in`,
+    completed: `Voltooi`,
+    confirm: `Bevestig`,
+    data: `Voer Data in`,
+    method: `Methode`,
+    request: `Verzoek`
+  },
+  title: `verifieer je account`,
+  types: {
+    email: {
+      description: `De hash van het e-mail adres waarvan je bewijst dat het van jou is, zal worden opgeslagen in de blockchain.`,
+      label: `E-mail Verificatie`
+    },
+    sms: {
+      description: `Het zal in de blockchain worden vast gelegd dat jij in het bezit bent van een telefoon nummer (not <em>which</em>).`,
+      label: `SMS Verificatie`
+    }
+  }
+};
diff --git a/js/src/i18n/nl/wallet.js b/js/src/i18n/nl/wallet.js
new file mode 100644
index 000000000..d0460e58f
--- /dev/null
+++ b/js/src/i18n/nl/wallet.js
@@ -0,0 +1,45 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  buttons: {
+    edit: `bewerk`,
+    forget: `vergeet`,
+    settings: `instellingen`,
+    transfer: `verzend`
+  },
+  confirmations: {
+    buttons: {
+      confirmAs: `Bevestig als...`,
+      revokeAs: `Herroep als...`
+    },
+    none: `Er zijn momenteel geen transacties die op bevestiging wachten.`,
+    tooltip: {
+      confirmed: `Bevestigd door {number}/{required} eigenaren`
+    }
+  },
+  details: {
+    requiredOwners: `Dit wallet vereist ten minste {owners} voor de goedkeuring van elke actie (transactions, modifications).`,
+    requiredOwnersNumber: `{number} {numberValue, plural, one {owner} other {owners}}`,
+    spent: `{spent} is vandaag besteed, van de {limit} ingestelde daglimiet. De daglimiet is op {date} opnieuw ingesteld`,
+    title: `Details`
+  },
+  title: `Wallet Beheer`,
+  transactions: {
+    none: `Er zijn geen verzonden transacties.`,
+    title: `Transacties`
+  }
+};
diff --git a/js/src/i18n/nl/walletSettings.js b/js/src/i18n/nl/walletSettings.js
index ca0842944..66fd70001 100644
--- a/js/src/i18n/nl/walletSettings.js
+++ b/js/src/i18n/nl/walletSettings.js
@@ -15,6 +15,16 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 export default {
+  addOwner: {
+    title: `Eigenaar toevoegen`
+  },
+  buttons: {
+    cancel: `Annuleer`,
+    close: `Sluit`,
+    next: `Volgende`,
+    send: `Verzend`,
+    sending: `Verzenden...`
+  },
   changes: {
     modificationString: `Om je wijzigingen door te voeren zullen
               andere eigenaren deze zelfde wijzigingen moeten verzenden. Om het
@@ -25,7 +35,8 @@ export default {
   edit: {
     message: `Om de instellingen van dit contract de wijzigen zullen
                   minimaal {owners, number} {owners, plural, one {owner } other {owners }} precies dezelfde
-                  wijzigingen moeten verzenden. Je kunt hier de wijzigingen in string-vorm plakken.`
+                  wijzigingen moeten verzenden. Je kunt de wijzigingen hier
+                  in string-vorm plakken.`
   },
   modifications: {
     daylimit: {
@@ -47,11 +58,12 @@ export default {
       label: `van account (wallet eigenaar)`
     }
   },
-  rejected: {
-    busyStep: {
-      state: `De wallet instellingen zullen niet worden gewijzigd. Je kunt dit venster veilig sluiten.`,
-      title: `De wijzigingen zijn afgewezen.`
-    },
-    title: `afgewezen`
+  ownersChange: {
+    details: `van {from} naar {to}`,
+    title: `Wijzig Vereiste Eigenaren`
+  },
+  rejected: `De transactie #{txid} is afgewezen`,
+  removeOwner: {
+    title: `Verwijder Eigenaar`
   }
 };
diff --git a/js/src/i18n/nl/writeContract.js b/js/src/i18n/nl/writeContract.js
new file mode 100644
index 000000000..e264ac83a
--- /dev/null
+++ b/js/src/i18n/nl/writeContract.js
@@ -0,0 +1,62 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  buttons: {
+    autoCompile: `Auto-Compile`,
+    compile: `Compileer`,
+    deploy: `Maak Aan`,
+    import: `Importeer Solidity`,
+    load: `Laad`,
+    new: `Nieuw`,
+    optimise: `Optimaliseer`,
+    save: `Opslaan`
+  },
+  compiling: {
+    action: `Compileer de bron code.`,
+    busy: `Compileren...`
+  },
+  details: {
+    saved: `(opgeslagen {timestamp})`
+  },
+  error: {
+    noContract: `Er is geen contract gevonden.`,
+    params: `Een fout is opgetreden met de volgende omschrijving`
+  },
+  input: {
+    abi: `ABI Interface`,
+    code: `Bytecode`,
+    metadata: `Metadata`,
+    swarm: `Swarm Metadata Hash`
+  },
+  title: {
+    contract: `Selecteer een contract`,
+    loading: `Laden...`,
+    main: `Schrijf een Contract`,
+    messages: `Compiler berichten`,
+    new: `Nieuw Solidity Contract`,
+    parameters: `Parameters`,
+    saved: `opgeslagen @ {timestamp}`,
+    selectSolidity: `Selecteer een Solidity versie`,
+    solidity: `Solidity {version} laden`
+  },
+  type: {
+    humanErc20: `Implementatie van het Human Token Contract`,
+    implementErc20: `Implementatie van ERC20 Token Contract`,
+    multisig: `Implementatie van een multisig Wallet`,
+    standardErc20: `Standaard ERC20 Token Contract`
+  }
+};

From 4d3f137e1e12d3788040c51260d2dcf03d6715b3 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Wed, 19 Apr 2017 16:27:45 +0200
Subject: [PATCH 033/117] iterate over all epochs

---
 ethcore/src/blockchain/blockchain.rs | 102 +++++++++++++++++++++++++++
 ethcore/src/blockchain/extras.rs     |  20 +++---
 ethcore/src/client/client.rs         |   1 +
 3 files changed, 113 insertions(+), 10 deletions(-)

diff --git a/ethcore/src/blockchain/blockchain.rs b/ethcore/src/blockchain/blockchain.rs
index 79169fd82..0824bd351 100644
--- a/ethcore/src/blockchain/blockchain.rs
+++ b/ethcore/src/blockchain/blockchain.rs
@@ -419,6 +419,45 @@ impl<'a> Iterator for AncestryIter<'a> {
 	}
 }
 
+/// An iterator which walks all epoch transitions.
+/// Returns epoch transitions.
+pub struct EpochTransitionIter<'a> {
+	chain: &'a BlockChain,
+	prefix_iter: Box<Iterator<Item=(Box<[u8]>, Box<[u8]>)> + 'a>,
+}
+
+impl<'a> Iterator for EpochTransitionIter<'a> {
+	type Item = (u64, EpochTransition);
+
+	fn next(&mut self) -> Option<Self::Item> {
+		loop {
+			match self.prefix_iter.next() {
+				Some((key, val)) => {
+					// iterator may continue beyond values beginning with this
+					// prefix.
+					if !key.starts_with(&EPOCH_KEY_PREFIX[..]) { return None }
+
+					let transitions: EpochTransitions = ::rlp::decode(&val[..]);
+
+					// if there are multiple candidates, at most one will be on the
+					// canon chain.
+					for transition in transitions.candidates.into_iter() {
+						let is_in_canon_chain = self.chain.block_hash(transition.block_number)
+							.map_or(false, |hash| hash == transition.block_hash);
+
+						if is_in_canon_chain {
+							return Some((transitions.number, transition))
+						}
+					}
+
+					// some epochs never occurred on the main chain.
+				}
+				None => return None,
+			}
+		}
+	}
+}
+
 impl BlockChain {
 	/// Create new instance of blockchain from given Genesis.
 	pub fn new(config: Config, genesis: &[u8], db: Arc<KeyValueDB>) -> BlockChain {
@@ -817,6 +856,15 @@ impl BlockChain {
 		}
 	}
 
+	/// Iterate over all epoch transitions.
+	pub fn epoch_transitions(&self) -> EpochTransitionIter {
+		let iter = self.db.iter_from_prefix(db::COL_EXTRA, &EPOCH_KEY_PREFIX[..]);
+		EpochTransitionIter {
+			chain: self,
+			prefix_iter: iter,
+		}
+	}
+
 	/// Add a child to a given block. Assumes that the block hash is in
 	/// the chain and the child's parent is this block.
 	///
@@ -2130,4 +2178,58 @@ mod tests {
 		assert_eq!(bc.rewind(), Some(genesis_hash.clone()));
 		assert_eq!(bc.rewind(), None);
 	}
+
+	#[test]
+	fn epoch_transitions_iter() {
+		use blockchain::extras::EpochTransition;
+
+		let mut canon_chain = ChainGenerator::default();
+		let mut finalizer = BlockFinalizer::default();
+		let genesis = canon_chain.generate(&mut finalizer).unwrap();
+
+		let db = new_db();
+		{
+			let bc = new_chain(&genesis, db.clone());
+			let uncle = canon_chain.fork(1).generate(&mut finalizer.fork()).unwrap();
+
+			let mut batch = db.transaction();
+			// create a longer fork
+			for i in 0..5 {
+				let canon_block = canon_chain.generate(&mut finalizer).unwrap();
+				let hash = BlockView::new(&canon_block).header_view().sha3();
+
+				bc.insert_block(&mut batch, &canon_block, vec![]);
+				bc.insert_epoch_transition(&mut batch, i, EpochTransition {
+					block_hash: hash,
+					block_number: i + 1,
+					proof: vec![],
+					state_proof: vec![],
+				});
+				bc.commit();
+			}
+
+			assert_eq!(bc.best_block_number(), 5);
+
+			let hash = BlockView::new(&uncle).header_view().sha3();
+			bc.insert_block(&mut batch, &uncle, vec![]);
+			bc.insert_epoch_transition(&mut batch, 999, EpochTransition {
+				block_hash: hash,
+				block_number: 1,
+				proof: vec![],
+				state_proof: vec![]
+			});
+
+			db.write(batch).unwrap();
+			bc.commit();
+
+			// epoch 999 not in canonical chain.
+			assert_eq!(bc.epoch_transitions().map(|(i, _)| i).collect::<Vec<_>>(), vec![0, 1, 2, 3, 4]);
+		}
+
+		// re-loading the blockchain should load the correct best block.
+		let bc = new_chain(&genesis, db);
+
+		assert_eq!(bc.best_block_number(), 5);
+		assert_eq!(bc.epoch_transitions().map(|(i, _)| i).collect::<Vec<_>>(), vec![0, 1, 2, 3, 4]);
+	}
 }
diff --git a/ethcore/src/blockchain/extras.rs b/ethcore/src/blockchain/extras.rs
index b9fd5d3bd..7de49f3bf 100644
--- a/ethcore/src/blockchain/extras.rs
+++ b/ethcore/src/blockchain/extras.rs
@@ -142,12 +142,9 @@ pub const EPOCH_KEY_LEN: usize = DB_PREFIX_LEN + 16;
 
 /// epoch key prefix.
 /// used to iterate over all epoch transitions in order from genesis.
-pub fn epoch_key_prefix() -> [u8; DB_PREFIX_LEN] {
-	let mut arr = [0u8; DB_PREFIX_LEN];
-	arr[0] = ExtrasIndex::EpochTransitions as u8;
-
-	arr
-}
+pub const EPOCH_KEY_PREFIX: &'static [u8; DB_PREFIX_LEN] = &[
+	ExtrasIndex::EpochTransitions as u8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+];
 
 pub struct EpochTransitionsKey([u8; EPOCH_KEY_LEN]);
 impl Deref for EpochTransitionsKey {
@@ -161,7 +158,7 @@ impl Key<EpochTransitions> for u64 {
 
 	fn key(&self) -> Self::Target {
 		let mut arr = [0u8; EPOCH_KEY_LEN];
-		arr[..DB_PREFIX_LEN].copy_from_slice(&epoch_key_prefix()[..]);
+		arr[..DB_PREFIX_LEN].copy_from_slice(&EPOCH_KEY_PREFIX[..]);
 
 		write!(&mut arr[DB_PREFIX_LEN..], "{:016x}", self)
 			.expect("format arg is valid; no more than 16 chars will be written; qed");
@@ -302,14 +299,16 @@ impl Decodable for EpochTransitions {
 #[derive(Debug, Clone)]
 pub struct EpochTransition {
 	pub block_hash: H256, // block hash at which the transition occurred.
+	pub block_number: BlockNumber, // block number at which the tranition occurred.
 	pub proof: Vec<u8>, // "transition/epoch" proof from the engine.
 	pub state_proof: Vec<DBValue>, // state items necessary to regenerate proof.
 }
 
 impl Encodable for EpochTransition {
 	fn rlp_append(&self, s: &mut RlpStream) {
-		s.begin_list(3)
+		s.begin_list(4)
 			.append(&self.block_hash)
+			.append(&self.block_number)
 			.append(&self.proof)
 			.begin_list(self.state_proof.len());
 
@@ -323,8 +322,9 @@ impl Decodable for EpochTransition {
 	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
 		Ok(EpochTransition {
 			block_hash: rlp.val_at(0)?,
-			proof: rlp.val_at(1)?,
-			state_proof: rlp.at(2)?.iter().map(|x| {
+			block_number: rlp.val_at(1)?,
+			proof: rlp.val_at(2)?,
+			state_proof: rlp.at(3)?.iter().map(|x| {
 				Ok(DBValue::from_slice(x.data()?))
 			}).collect::<Result<Vec<_>, _>>()?,
 		})
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 26d823dce..88fd181bb 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -667,6 +667,7 @@ impl Client {
 			Ok(proof) =>
 				chain.insert_epoch_transition(batch, epoch_number, EpochTransition {
 					block_hash: hash.clone(),
+					block_number: header.number(),
 					proof: proof,
 					state_proof: read_values.into_inner().into_iter().collect(),
 				}),

From 770c7e5878cdb2b4e1783da116875022e71641a5 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Wed, 19 Apr 2017 14:32:38 +0000
Subject: [PATCH 034/117] [ci skip] js-precompiled 20170419-142847

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dccc2f8df..f3109228a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1773,7 +1773,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#7b0c9ffdfa680f7792751f03d3490fc2a9fea23f"
+source = "git+https://github.com/paritytech/js-precompiled.git#b4927eeaa876ff4daffda80ec85382fbd95f313c"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index da567a458..ac1731b91 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.54",
+  "version": "1.7.55",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From fc18299869f087ed212256faaef638f0d96a8636 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Wed, 19 Apr 2017 17:47:30 +0200
Subject: [PATCH 035/117] Background-repeat round (#5475)

---
 js/src/index.ejs                               | 1 +
 js/src/ui/ParityBackground/parityBackground.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/src/index.ejs b/js/src/index.ejs
index ec8592b88..305568f5b 100644
--- a/js/src/index.ejs
+++ b/js/src/index.ejs
@@ -8,6 +8,7 @@
     <style>
       html {
         background: white;
+        background-repeat: round;
       }
 
       html, body, #container {
diff --git a/js/src/ui/ParityBackground/parityBackground.js b/js/src/ui/ParityBackground/parityBackground.js
index 5e6bf8e75..69fc77320 100644
--- a/js/src/ui/ParityBackground/parityBackground.js
+++ b/js/src/ui/ParityBackground/parityBackground.js
@@ -79,7 +79,7 @@ class ParityBackground extends Component {
     };
 
     if (attachDocument) {
-      document.documentElement.style.background = style.background;
+      document.documentElement.style.backgroundImage = style.background;
     }
 
     return (

From 37690cfde206656aed42110b4063b0128146a5f2 Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Wed, 19 Apr 2017 18:00:05 +0200
Subject: [PATCH 036/117] Refactoring of Tokens & Balances (#5372)

* Remove ETH filter

* Remove unused Blockchain reducer+actions

* Simpler Token updates and fetching

* Cleanup use of balances

* Cleanup of balances

* Cleanup of Balances

* Linting

* Update List Component

* Separate tokens from balances

* Refactoring balance fetchin and storing - Part I

* Linting

* Better ETH token description and use

* Working Transfer with new logic

* Add debugging

* Querying the tokens filter on new block

* Fixing the tests - PART I

* Fix txCount
---
 js/src/api/api.js                             |   3 +-
 js/src/contracts/tokenreg.js                  |   2 +-
 .../modals/CreateAccount/GethCard/gethCard.js |  11 +-
 .../modals/DappPermissions/dappPermissions.js |  21 +-
 .../DappPermissions/dappPermissions.spec.js   |  27 +-
 .../DeployContract/DetailsStep/detailsStep.js |   3 -
 .../modals/DeployContract/deployContract.js   |  22 +-
 .../DetailsStep/detailsStep.js                |   4 +-
 .../modals/ExecuteContract/executeContract.js |  19 +-
 js/src/modals/Transfer/Details/details.js     |  18 +-
 js/src/modals/Transfer/Details/tokenSelect.js |  53 ++-
 js/src/modals/Transfer/store.js               | 105 ++---
 js/src/modals/Transfer/transfer.js            |  24 +-
 js/src/modals/VaultAccounts/vaultAccounts.js  |   9 +-
 js/src/redux/providers/balances.js            |   5 +-
 js/src/redux/providers/balancesActions.js     | 398 +++++-------------
 js/src/redux/providers/balancesReducer.js     |  64 +--
 js/src/redux/providers/blockchainActions.js   | 128 ------
 js/src/redux/providers/blockchainReducer.js   |  66 ---
 js/src/redux/providers/index.js               |   2 +-
 js/src/redux/providers/personal.js            |   6 +
 js/src/redux/providers/tokensActions.js       |  88 ++++
 js/src/redux/providers/tokensReducer.js       |  34 ++
 js/src/redux/reducers.js                      |   6 +-
 js/src/ui/AccountCard/accountCard.js          |   1 +
 js/src/ui/AccountCard/accountCard.spec.js     |  28 +-
 js/src/ui/Balance/balance.js                  |  78 ++--
 js/src/ui/Balance/balance.spec.js             |  21 +-
 js/src/ui/Container/container.css             |   2 +
 js/src/ui/Form/AddressSelect/addressSelect.js |   7 +-
 js/src/ui/Form/InputAddress/inputAddress.js   |  10 +-
 js/src/ui/IdentityName/identityName.js        |  19 +-
 js/src/ui/IdentityName/identityName.spec.js   |  25 +-
 js/src/ui/MethodDecoding/methodDecoding.js    |   4 +-
 js/src/util/notifications.js                  |  12 +-
 js/src/util/tokens.js                         | 133 ++++++
 js/src/views/Account/Header/header.js         |  62 ++-
 js/src/views/Account/Header/header.spec.js    |  77 +++-
 js/src/views/Account/account.js               |  34 +-
 js/src/views/Accounts/List/list.js            |  25 +-
 js/src/views/Accounts/Summary/summary.js      |  23 +-
 js/src/views/Accounts/accounts.js             |  12 +-
 js/src/views/Address/address.js               |   9 +-
 js/src/views/Addresses/addresses.js           |  14 +-
 js/src/views/Contract/contract.js             |   7 +-
 js/src/views/Contracts/contracts.js           |   8 +-
 js/src/views/ParityBar/parityBar.js           |   7 -
 js/src/views/Wallet/wallet.js                 |  14 +-
 js/src/views/WriteContract/writeContract.js   |   2 +-
 49 files changed, 725 insertions(+), 1027 deletions(-)
 delete mode 100644 js/src/redux/providers/blockchainActions.js
 delete mode 100644 js/src/redux/providers/blockchainReducer.js
 create mode 100644 js/src/redux/providers/tokensActions.js
 create mode 100644 js/src/redux/providers/tokensReducer.js
 create mode 100644 js/src/util/tokens.js

diff --git a/js/src/api/api.js b/js/src/api/api.js
index 2c102086f..526ecbf1b 100644
--- a/js/src/api/api.js
+++ b/js/src/api/api.js
@@ -59,7 +59,8 @@ export default class Api extends EventEmitter {
           }
 
           return null;
-        });
+        })
+        .catch(() => null);
 
       transport.addMiddleware(middleware);
     }
diff --git a/js/src/contracts/tokenreg.js b/js/src/contracts/tokenreg.js
index 22e3c834d..2bbf639bf 100644
--- a/js/src/contracts/tokenreg.js
+++ b/js/src/contracts/tokenreg.js
@@ -27,7 +27,7 @@ export default class TokenReg {
   }
 
   getInstance () {
-    return this.getContract().instance;
+    return this.getContract().then((contract) => contract.instance);
   }
 
   tokenCount () {
diff --git a/js/src/modals/CreateAccount/GethCard/gethCard.js b/js/src/modals/CreateAccount/GethCard/gethCard.js
index 17250bcb3..fb95b7515 100644
--- a/js/src/modals/CreateAccount/GethCard/gethCard.js
+++ b/js/src/modals/CreateAccount/GethCard/gethCard.js
@@ -16,8 +16,8 @@
 
 import React, { Component, PropTypes } from 'react';
 
-import imagesEthereum from '~/../assets/images/contracts/ethereum-black-64x64.png';
 import { AccountCard } from '~/ui';
+import { ETH_TOKEN } from '~/util/tokens';
 
 export default class GethCard extends Component {
   static propTypes = {
@@ -36,14 +36,7 @@ export default class GethCard extends Component {
           name
         } }
         balance={ {
-          tokens: [ {
-            value: balance,
-            token: {
-              image: imagesEthereum,
-              native: true,
-              tag: 'ETH'
-            }
-          } ]
+          [ETH_TOKEN.id]: balance
         } }
       />
     );
diff --git a/js/src/modals/DappPermissions/dappPermissions.js b/js/src/modals/DappPermissions/dappPermissions.js
index 903e31fd9..81821cb8e 100644
--- a/js/src/modals/DappPermissions/dappPermissions.js
+++ b/js/src/modals/DappPermissions/dappPermissions.js
@@ -17,14 +17,12 @@
 import { observer } from 'mobx-react';
 import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
 
 import { AccountCard, Portal, SelectionList } from '~/ui';
 
 @observer
-class DappPermissions extends Component {
+export default class DappPermissions extends Component {
   static propTypes = {
-    balances: PropTypes.object,
     permissionStore: PropTypes.object.isRequired
   };
 
@@ -66,27 +64,10 @@ class DappPermissions extends Component {
   }
 
   renderAccount = (account) => {
-    const { balances } = this.props;
-    const balance = balances[account.address];
-
     return (
       <AccountCard
         account={ account }
-        balance={ balance }
       />
     );
   }
 }
-
-function mapStateToProps (state) {
-  const { balances } = state.balances;
-
-  return {
-    balances
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(DappPermissions);
diff --git a/js/src/modals/DappPermissions/dappPermissions.spec.js b/js/src/modals/DappPermissions/dappPermissions.spec.js
index 717ec3b20..81af509b7 100644
--- a/js/src/modals/DappPermissions/dappPermissions.spec.js
+++ b/js/src/modals/DappPermissions/dappPermissions.spec.js
@@ -16,38 +16,15 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
-import sinon from 'sinon';
 
 import DappPermissions from './';
 
 let component;
-let store;
-
-function createRedux () {
-  store = {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        balances: {
-          balances: {}
-        }
-      };
-    }
-  };
-
-  return store;
-}
 
 function renderShallow (permissionStore = {}) {
   component = shallow(
-    <DappPermissions permissionStore={ permissionStore } />,
-    {
-      context: {
-        store: createRedux()
-      }
-    }
-  ).find('DappPermissions').shallow();
+    <DappPermissions permissionStore={ permissionStore } />
+  );
 
   return component;
 }
diff --git a/js/src/modals/DeployContract/DetailsStep/detailsStep.js b/js/src/modals/DeployContract/DetailsStep/detailsStep.js
index 4086b08a3..7f5f9bdbc 100644
--- a/js/src/modals/DeployContract/DetailsStep/detailsStep.js
+++ b/js/src/modals/DeployContract/DetailsStep/detailsStep.js
@@ -47,7 +47,6 @@ export default class DetailsStep extends Component {
     abiError: PropTypes.string,
     amount: PropTypes.string,
     amountError: PropTypes.string,
-    balances: PropTypes.object,
     code: PropTypes.string,
     codeError: PropTypes.string,
     description: PropTypes.string,
@@ -87,7 +86,6 @@ export default class DetailsStep extends Component {
   render () {
     const {
       accounts,
-      balances,
       readOnly,
 
       fromAddress, fromAddressError,
@@ -141,7 +139,6 @@ export default class DetailsStep extends Component {
 
         <AddressSelect
           accounts={ accounts }
-          balances={ balances }
           error={ fromAddressError }
           hint={
             <FormattedMessage
diff --git a/js/src/modals/DeployContract/deployContract.js b/js/src/modals/DeployContract/deployContract.js
index 63d99e894..0f5b4e1d8 100644
--- a/js/src/modals/DeployContract/deployContract.js
+++ b/js/src/modals/DeployContract/deployContract.js
@@ -15,7 +15,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import BigNumber from 'bignumber.js';
-import { pick } from 'lodash';
 import { observer } from 'mobx-react';
 import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
@@ -69,7 +68,6 @@ class DeployContract extends Component {
   static propTypes = {
     accounts: PropTypes.object.isRequired,
     abi: PropTypes.string,
-    balances: PropTypes.object,
     code: PropTypes.string,
     gasLimit: PropTypes.object.isRequired,
     onClose: PropTypes.func.isRequired,
@@ -282,7 +280,7 @@ class DeployContract extends Component {
   }
 
   renderStep () {
-    const { accounts, readOnly, balances } = this.props;
+    const { accounts, readOnly } = this.props;
     const { step } = this.state;
 
     switch (step) {
@@ -291,7 +289,6 @@ class DeployContract extends Component {
           <DetailsStep
             { ...this.state }
             accounts={ accounts }
-            balances={ balances }
             onAmountChange={ this.onAmountChange }
             onExtrasChange={ this.onExtrasChange }
             onFromAddressChange={ this.onFromAddressChange }
@@ -484,20 +481,11 @@ class DeployContract extends Component {
   }
 }
 
-function mapStateToProps (initState, initProps) {
-  const { accounts } = initProps;
+function mapStateToProps (state) {
+  const { gasLimit } = state.nodeStatus;
 
-  const fromAddresses = Object.keys(accounts);
-
-  return (state) => {
-    const balances = pick(state.balances.balances, fromAddresses);
-    const { gasLimit } = state.nodeStatus;
-
-    return {
-      accounts,
-      balances,
-      gasLimit
-    };
+  return {
+    gasLimit
   };
 }
 
diff --git a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
index 44d2d1aef..913def0ee 100644
--- a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
+++ b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
@@ -34,7 +34,6 @@ export default class DetailsStep extends Component {
     accounts: PropTypes.object.isRequired,
     amount: PropTypes.string,
     amountError: PropTypes.string,
-    balances: PropTypes.object,
     contract: PropTypes.object.isRequired,
     fromAddress: PropTypes.string,
     fromAddressError: PropTypes.string,
@@ -51,13 +50,12 @@ export default class DetailsStep extends Component {
   }
 
   render () {
-    const { accounts, advancedOptions, amount, amountError, balances, fromAddress, fromAddressError, onAdvancedClick, onAmountChange, onFromAddressChange } = this.props;
+    const { accounts, advancedOptions, amount, amountError, fromAddress, fromAddressError, onAdvancedClick, onAmountChange, onFromAddressChange } = this.props;
 
     return (
       <Form>
         <AddressSelect
           accounts={ accounts }
-          balances={ balances }
           error={ fromAddressError }
           hint={
             <FormattedMessage
diff --git a/js/src/modals/ExecuteContract/executeContract.js b/js/src/modals/ExecuteContract/executeContract.js
index 65ef8a743..e0566f7df 100644
--- a/js/src/modals/ExecuteContract/executeContract.js
+++ b/js/src/modals/ExecuteContract/executeContract.js
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import { pick } from 'lodash';
 import { observer } from 'mobx-react';
 import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
@@ -58,7 +57,6 @@ class ExecuteContract extends Component {
 
   static propTypes = {
     accounts: PropTypes.object,
-    balances: PropTypes.object,
     contract: PropTypes.object.isRequired,
     fromAddress: PropTypes.string,
     gasLimit: PropTypes.object.isRequired,
@@ -199,14 +197,16 @@ class ExecuteContract extends Component {
   }
 
   renderStep () {
-    const { onFromAddressChange } = this.props;
+    const { accounts, contract, fromAddress, onFromAddressChange } = this.props;
     const { step } = this.state;
 
     if (step === STEP_DETAILS) {
       return (
         <DetailsStep
-          { ...this.props }
           { ...this.state }
+          accounts={ accounts }
+          contract={ contract }
+          fromAddress={ fromAddress }
           onAmountChange={ this.onAmountChange }
           onFromAddressChange={ onFromAddressChange }
           onFuncChange={ this.onFuncChange }
@@ -334,15 +334,10 @@ class ExecuteContract extends Component {
   }
 }
 
-function mapStateToProps (initState, initProps) {
-  const fromAddresses = Object.keys(initProps.accounts);
+function mapStateToProps (state) {
+  const { gasLimit } = state.nodeStatus;
 
-  return (state) => {
-    const balances = pick(state.balances.balances, fromAddresses);
-    const { gasLimit } = state.nodeStatus;
-
-    return { gasLimit, balances };
-  };
+  return { gasLimit };
 }
 
 export default connect(
diff --git a/js/src/modals/Transfer/Details/details.js b/js/src/modals/Transfer/Details/details.js
index c4bc6a2d8..9b5182cea 100644
--- a/js/src/modals/Transfer/Details/details.js
+++ b/js/src/modals/Transfer/Details/details.js
@@ -38,10 +38,9 @@ export default class Details extends Component {
     extras: PropTypes.bool,
     sender: PropTypes.string,
     senderError: PropTypes.string,
-    sendersBalances: PropTypes.object,
     recipient: PropTypes.string,
     recipientError: PropTypes.string,
-    tag: PropTypes.string,
+    token: PropTypes.object,
     total: PropTypes.string,
     totalError: PropTypes.string,
     value: PropTypes.string,
@@ -57,13 +56,13 @@ export default class Details extends Component {
   };
 
   render () {
-    const { all, extras, tag, total, totalError, value, valueError } = this.props;
+    const { all, extras, token, total, totalError, value, valueError } = this.props;
     const label = (
       <FormattedMessage
         id='transfer.details.amount.label'
         defaultMessage='amount to transfer (in {tag})'
         values={ {
-          tag
+          tag: token.tag
         } }
       />
     );
@@ -140,7 +139,7 @@ export default class Details extends Component {
   }
 
   renderFromAddress () {
-    const { sender, senderError, senders, sendersBalances } = this.props;
+    const { sender, senderError, senders } = this.props;
 
     if (!senders) {
       return null;
@@ -165,7 +164,6 @@ export default class Details extends Component {
           }
           value={ sender }
           onChange={ this.onEditSender }
-          balances={ sendersBalances }
         />
       </div>
     );
@@ -198,19 +196,19 @@ export default class Details extends Component {
   }
 
   renderTokenSelect () {
-    const { balance, tag } = this.props;
+    const { balance, token } = this.props;
 
     return (
       <TokenSelect
         balance={ balance }
-        tag={ tag }
         onChange={ this.onChangeToken }
+        value={ token.id }
       />
     );
   }
 
-  onChangeToken = (event, index, tag) => {
-    this.props.onChange('tag', tag);
+  onChangeToken = (event, index, tokenId) => {
+    this.props.onChange('token', tokenId);
   }
 
   onEditSender = (event, sender) => {
diff --git a/js/src/modals/Transfer/Details/tokenSelect.js b/js/src/modals/Transfer/Details/tokenSelect.js
index 47f42edaa..7f18e304b 100644
--- a/js/src/modals/Transfer/Details/tokenSelect.js
+++ b/js/src/modals/Transfer/Details/tokenSelect.js
@@ -16,6 +16,7 @@
 
 import BigNumber from 'bignumber.js';
 import React, { Component, PropTypes } from 'react';
+import { connect } from 'react-redux';
 import { MenuItem } from 'material-ui';
 import { isEqual } from 'lodash';
 
@@ -24,7 +25,7 @@ import TokenImage from '~/ui/TokenImage';
 
 import styles from '../transfer.css';
 
-export default class TokenSelect extends Component {
+class TokenSelect extends Component {
   static contextTypes = {
     api: PropTypes.object
   };
@@ -32,7 +33,8 @@ export default class TokenSelect extends Component {
   static propTypes = {
     onChange: PropTypes.func.isRequired,
     balance: PropTypes.object.isRequired,
-    tag: PropTypes.string.isRequired
+    tokens: PropTypes.object.isRequired,
+    value: PropTypes.string.isRequired
   };
 
   componentWillMount () {
@@ -40,8 +42,10 @@ export default class TokenSelect extends Component {
   }
 
   componentWillReceiveProps (nextProps) {
-    const prevTokens = this.props.balance.tokens.map((t) => `${t.token.tag}_${t.value.toNumber()}`);
-    const nextTokens = nextProps.balance.tokens.map((t) => `${t.token.tag}_${t.value.toNumber()}`);
+    const prevTokens = Object.keys(this.props.balance)
+      .map((tokenId) => `${tokenId}_${this.props.balance[tokenId].toNumber()}`);
+    const nextTokens = Object.keys(nextProps.balance)
+      .map((tokenId) => `${tokenId}_${nextProps.balance[tokenId].toNumber()}`);
 
     if (!isEqual(prevTokens, nextTokens)) {
       this.computeTokens(nextProps);
@@ -50,23 +54,27 @@ export default class TokenSelect extends Component {
 
   computeTokens (props = this.props) {
     const { api } = this.context;
-    const { balance } = this.props;
+    const { balance, tokens } = this.props;
 
-    const items = balance.tokens
-      .filter((token, index) => !index || token.value.gt(0))
-      .map((balance, index) => {
-        const token = balance.token;
-        const isEth = index === 0;
+    const items = Object.keys(balance)
+      .map((tokenId) => {
+        const token = tokens[tokenId];
+        const tokenValue = balance[tokenId];
+        const isEth = token.native;
+
+        if (!isEth && tokenValue.eq(0)) {
+          return null;
+        }
 
         let value = 0;
 
         if (isEth) {
-          value = api.util.fromWei(balance.value).toFormat(3);
+          value = api.util.fromWei(tokenValue).toFormat(3);
         } else {
-          const format = balance.token.format || 1;
+          const format = token.format || 1;
           const decimals = format === 1 ? 0 : Math.min(3, Math.floor(format / 10));
 
-          value = new BigNumber(balance.value).div(format).toFormat(decimals);
+          value = new BigNumber(tokenValue).div(format).toFormat(decimals);
         }
 
         const label = (
@@ -83,20 +91,21 @@ export default class TokenSelect extends Component {
 
         return (
           <MenuItem
-            key={ `${index}_${token.tag}` }
-            value={ token.tag }
+            key={ tokenId }
+            value={ token.id }
             label={ label }
           >
             { label }
           </MenuItem>
         );
-      });
+      })
+      .filter((node) => node);
 
     this.setState({ items });
   }
 
   render () {
-    const { tag, onChange } = this.props;
+    const { onChange, value } = this.props;
     const { items } = this.state;
 
     return (
@@ -104,7 +113,7 @@ export default class TokenSelect extends Component {
         className={ styles.tokenSelect }
         label='type of token transfer'
         hint='type of token to transfer'
-        value={ tag }
+        value={ value }
         onChange={ onChange }
       >
         { items }
@@ -112,3 +121,11 @@ export default class TokenSelect extends Component {
     );
   }
 }
+
+function mapStateToProps (state) {
+  const { tokens } = state;
+
+  return { tokens };
+}
+
+export default connect(mapStateToProps)(TokenSelect);
diff --git a/js/src/modals/Transfer/store.js b/js/src/modals/Transfer/store.js
index c36d5029b..a0f99503c 100644
--- a/js/src/modals/Transfer/store.js
+++ b/js/src/modals/Transfer/store.js
@@ -18,11 +18,12 @@ import { noop } from 'lodash';
 import { observable, computed, action, transaction } from 'mobx';
 import BigNumber from 'bignumber.js';
 
-import { wallet as walletAbi } from '~/contracts/abi';
+import { eip20 as tokenAbi, wallet as walletAbi } from '~/contracts/abi';
 import { fromWei } from '~/api/util/wei';
 import Contract from '~/api/contract';
 import ERRORS from './errors';
 import { DEFAULT_GAS, DEFAULT_GASPRICE, MAX_GAS_ESTIMATION } from '~/util/constants';
+import { ETH_TOKEN } from '~/util/tokens';
 import GasPriceStore from '~/ui/GasPriceEditor/store';
 import { getLogger, LOG_KEYS } from '~/config';
 
@@ -40,10 +41,10 @@ export const WALLET_WARNING_SPENT_TODAY_LIMIT = 'WALLET_WARNING_SPENT_TODAY_LIMI
 export default class TransferStore {
   @observable stage = 0;
   @observable extras = false;
+  @observable isEth = true;
   @observable valueAll = false;
   @observable sending = false;
-  @observable tag = 'ETH';
-  @observable isEth = true;
+  @observable token = ETH_TOKEN;
 
   @observable data = '';
   @observable dataError = null;
@@ -69,6 +70,8 @@ export default class TransferStore {
   onClose = noop;
   senders = null;
   isWallet = false;
+  tokenContract = null;
+  tokens = {};
   wallet = null;
 
   gasStore = null;
@@ -76,14 +79,16 @@ export default class TransferStore {
   constructor (api, props) {
     this.api = api;
 
-    const { account, balance, gasLimit, onClose, senders, newError, sendersBalances } = props;
+    const { account, balance, gasLimit, onClose, senders, newError, sendersBalances, tokens } = props;
 
     this.account = account;
     this.balance = balance;
     this.isWallet = account && account.wallet;
     this.newError = newError;
+    this.tokens = tokens;
 
     this.gasStore = new GasPriceStore(api, { gasLimit });
+    this.tokenContract = api.newContract(tokenAbi, '');
 
     if (this.isWallet) {
       this.wallet = props.wallet;
@@ -126,10 +131,6 @@ export default class TransferStore {
     }
   }
 
-  get token () {
-    return this.balance.tokens.find((balance) => balance.token.tag === this.tag).token;
-  }
-
   @action onNext = () => {
     this.stage += 1;
   }
@@ -166,8 +167,8 @@ export default class TransferStore {
       case 'sender':
         return this._onUpdateSender(value);
 
-      case 'tag':
-        return this._onUpdateTag(value);
+      case 'token':
+        return this._onUpdateToken(value);
 
       case 'value':
         return this._onUpdateValue(value);
@@ -244,10 +245,10 @@ export default class TransferStore {
     });
   }
 
-  @action _onUpdateTag = (tag) => {
+  @action _onUpdateToken = (tokenId) => {
     transaction(() => {
-      this.tag = tag;
-      this.isEth = tag.toLowerCase().trim() === 'eth';
+      this.token = { ...this.tokens[tokenId] };
+      this.isEth = this.token.native;
 
       this.recalculateGas();
     });
@@ -323,46 +324,15 @@ export default class TransferStore {
     return balance;
   }
 
-  getToken (tag = this.tag, forceSender = false) {
-    const balance = this.getBalance(forceSender);
-
-    if (!balance) {
-      return null;
-    }
-
-    const _tag = tag.toLowerCase();
-    const token = balance.tokens.find((b) => b.token.tag.toLowerCase() === _tag);
-
-    return token;
-  }
-
   /**
    * Return the balance of the selected token
    * (in WEI for ETH, without formating for other tokens)
    */
-  getTokenBalance (tag = this.tag, forceSender = false) {
-    const token = this.getToken(tag, forceSender);
-
-    if (!token) {
-      return new BigNumber(0);
-    }
-
-    const value = new BigNumber(token.value || 0);
-
-    return value;
+  getTokenBalance (token = this.token, forceSender = false) {
+    return new BigNumber(this.balance[token.id] || 0);
   }
 
-  getTokenValue (tag = this.tag, value = this.value, inverse = false) {
-    const token = this.getToken(tag);
-
-    if (!token) {
-      return new BigNumber(0);
-    }
-
-    const format = token.token
-      ? new BigNumber(token.token.format || 1)
-      : new BigNumber(1);
-
+  getTokenValue (token = this.token, value = this.value, inverse = false) {
     let _value;
 
     try {
@@ -371,19 +341,11 @@ export default class TransferStore {
       _value = new BigNumber(0);
     }
 
-    if (token.token && token.token.tag.toLowerCase() === 'eth') {
-      if (inverse) {
-        return this.api.util.fromWei(_value);
-      }
-
-      return this.api.util.toWei(_value);
-    }
-
     if (inverse) {
-      return _value.div(format);
+      return _value.div(token.format);
     }
 
-    return _value.mul(format);
+    return _value.mul(token.format);
   }
 
   getValues (_gasTotal) {
@@ -425,7 +387,7 @@ export default class TransferStore {
     }
 
     // Otherwise, substract the gas estimate
-    const availableEth = this.getTokenBalance('ETH');
+    const availableEth = this.getTokenBalance(ETH_TOKEN);
     const totalEthValue = availableEth.gt(gasTotal)
       ? availableEth.minus(gasTotal)
       : new BigNumber(0);
@@ -437,15 +399,7 @@ export default class TransferStore {
   }
 
   getFormattedTokenValue (tokenValue) {
-    const token = this.getToken();
-
-    if (!token) {
-      return new BigNumber(0);
-    }
-
-    const tag = token.token && token.token.tag || '';
-
-    return this.getTokenValue(tag, tokenValue, true);
+    return this.getTokenValue(this.token, tokenValue, true);
   }
 
   @action recalculate = (redo = false) => {
@@ -463,7 +417,7 @@ export default class TransferStore {
 
     const gasTotal = new BigNumber(this.gasStore.price || 0).mul(new BigNumber(this.gasStore.gas || 0));
 
-    const ethBalance = this.getTokenBalance('ETH', true);
+    const ethBalance = this.getTokenBalance(ETH_TOKEN, true);
     const tokenBalance = this.getTokenBalance();
     const { eth, token } = this.getValues(gasTotal);
 
@@ -545,7 +499,7 @@ export default class TransferStore {
       return this.wallet.instance.execute;
     }
 
-    return this.token.contract.instance.transfer;
+    return this.tokenContract.at(this.token.address).instance.transfer;
   }
 
   _getData (gas = false) {
@@ -558,7 +512,7 @@ export default class TransferStore {
     const func = this._getTransferMethod(gas, true);
     const { options, values } = this._getTransferParams(gas, true);
 
-    return this.token.contract.getCallData(func, options, values);
+    return this.tokenContract.at(this.token.address).getCallData(func, options, values);
   }
 
   _getTransferParams (gas = false, forceToken = false) {
@@ -587,7 +541,7 @@ export default class TransferStore {
     }
 
     if (isWallet && !forceToken) {
-      const to = isEth ? this.recipient : this.token.contract.address;
+      const to = isEth ? this.recipient : this.token.address;
       const value = isEth ? token : new BigNumber(0);
 
       const values = [
@@ -621,14 +575,7 @@ export default class TransferStore {
   }
 
   _validateDecimals (num) {
-    const { balance } = this;
-
-    if (this.tag === 'ETH') {
-      return null;
-    }
-
-    const token = balance.tokens.find((balance) => balance.token.tag === this.tag).token;
-    const s = new BigNumber(num).mul(token.format || 1).toFixed();
+    const s = new BigNumber(num).mul(this.token.format || 1).toFixed();
 
     if (s.indexOf('.') !== -1) {
       return ERRORS.invalidDecimals;
diff --git a/js/src/modals/Transfer/transfer.js b/js/src/modals/Transfer/transfer.js
index 8488a2035..ab769ff02 100644
--- a/js/src/modals/Transfer/transfer.js
+++ b/js/src/modals/Transfer/transfer.js
@@ -45,12 +45,13 @@ class Transfer extends Component {
     newError: PropTypes.func.isRequired,
     gasLimit: PropTypes.object.isRequired,
 
-    senders: nullableProptype(PropTypes.object),
-    sendersBalances: nullableProptype(PropTypes.object),
     account: PropTypes.object,
     balance: PropTypes.object,
-    wallet: PropTypes.object,
-    onClose: PropTypes.func
+    onClose: PropTypes.func,
+    senders: nullableProptype(PropTypes.object),
+    sendersBalances: nullableProptype(PropTypes.object),
+    tokens: PropTypes.object,
+    wallet: PropTypes.object
   }
 
   store = new TransferStore(this.context.api, this.props);
@@ -144,8 +145,8 @@ class Transfer extends Component {
 
   renderDetailsPage () {
     const { account, balance, senders } = this.props;
-    const { recipient, recipientError, sender, senderError, sendersBalances } = this.store;
-    const { valueAll, extras, tag, total, totalError, value, valueError } = this.store;
+    const { recipient, recipientError, sender, senderError } = this.store;
+    const { valueAll, extras, token, total, totalError, value, valueError } = this.store;
 
     return (
       <Details
@@ -159,8 +160,7 @@ class Transfer extends Component {
         sender={ sender }
         senderError={ senderError }
         senders={ senders }
-        sendersBalances={ sendersBalances }
-        tag={ tag }
+        token={ token }
         total={ total }
         totalError={ totalError }
         value={ value }
@@ -272,6 +272,7 @@ class Transfer extends Component {
 }
 
 function mapStateToProps (initState, initProps) {
+  const { tokens } = initState;
   const { address } = initProps.account;
 
   const isWallet = initProps.account && initProps.account.wallet;
@@ -291,9 +292,12 @@ function mapStateToProps (initState, initProps) {
 
   return (state) => {
     const { gasLimit } = state.nodeStatus;
-    const sendersBalances = senders ? pick(state.balances.balances, Object.keys(senders)) : null;
+    const { balances } = state;
 
-    return { gasLimit, wallet, senders, sendersBalances };
+    const balance = balances[address];
+    const sendersBalances = senders ? pick(balances, Object.keys(senders)) : null;
+
+    return { balance, gasLimit, senders, sendersBalances, tokens, wallet };
   };
 }
 
diff --git a/js/src/modals/VaultAccounts/vaultAccounts.js b/js/src/modals/VaultAccounts/vaultAccounts.js
index 748969ffb..daf2d7c51 100644
--- a/js/src/modals/VaultAccounts/vaultAccounts.js
+++ b/js/src/modals/VaultAccounts/vaultAccounts.js
@@ -33,7 +33,6 @@ class VaultAccounts extends Component {
 
   static propTypes = {
     accounts: PropTypes.object.isRequired,
-    balances: PropTypes.object.isRequired,
     newError: PropTypes.func.isRequired,
     personalAccountsInfo: PropTypes.func.isRequired,
     vaultStore: PropTypes.object.isRequired
@@ -108,13 +107,9 @@ class VaultAccounts extends Component {
   }
 
   renderAccount = (account) => {
-    const { balances } = this.props;
-    const balance = balances[account.address];
-
     return (
       <AccountCard
         account={ account }
-        balance={ balance }
       />
     );
   }
@@ -171,12 +166,10 @@ class VaultAccounts extends Component {
 }
 
 function mapStateToProps (state) {
-  const { balances } = state.balances;
   const { accounts } = state.personal;
 
   return {
-    accounts,
-    balances
+    accounts
   };
 }
 
diff --git a/js/src/redux/providers/balances.js b/js/src/redux/providers/balances.js
index e438f6f1a..cc7df73dd 100644
--- a/js/src/redux/providers/balances.js
+++ b/js/src/redux/providers/balances.js
@@ -16,7 +16,8 @@
 
 import { throttle } from 'lodash';
 
-import { loadTokens, setTokenReg, fetchBalances, fetchTokens, fetchTokensBalances } from './balancesActions';
+import { fetchBalances, fetchTokensBalances, queryTokensFilter } from './balancesActions';
+import { loadTokens, fetchTokens } from './tokensActions';
 import { padRight } from '~/api/util/format';
 
 import Contracts from '~/contracts';
@@ -193,6 +194,7 @@ export default class Balances {
           return console.warn('_subscribeBlockNumber', error);
         }
 
+        this._store.dispatch(queryTokensFilter());
         return this.fetchAllBalances();
       })
       .then((blockNumberSID) => {
@@ -276,7 +278,6 @@ export default class Balances {
       .then((tokenreg) => {
         this._tokenreg = tokenreg;
 
-        this._store.dispatch(setTokenReg(tokenreg));
         this._store.dispatch(loadTokens(options));
 
         return this.attachToTokens(tokenreg);
diff --git a/js/src/redux/providers/balancesActions.js b/js/src/redux/providers/balancesActions.js
index 2a357c916..73726e825 100644
--- a/js/src/redux/providers/balancesActions.js
+++ b/js/src/redux/providers/balancesActions.js
@@ -14,119 +14,19 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import { range, uniq, isEqual } from 'lodash';
-import BigNumber from 'bignumber.js';
+import { uniq, isEqual } from 'lodash';
 import { push } from 'react-router-redux';
 
-import { hashToImageUrl } from './imagesReducer';
-import { setAddressImage } from './imagesActions';
-
-import * as ABIS from '~/contracts/abi';
 import { notifyTransaction } from '~/util/notifications';
+import { ETH_TOKEN, fetchAccountsBalances } from '~/util/tokens';
 import { LOG_KEYS, getLogger } from '~/config';
-import imagesEthereum from '~/../assets/images/contracts/ethereum-black-64x64.png';
+import { sha3 } from '~/api/util/sha3';
+
+const TRANSFER_SIGNATURE = sha3('Transfer(address,address,uint256)');
 
 const log = getLogger(LOG_KEYS.Balances);
 
-const ETH = {
-  name: 'Ethereum',
-  tag: 'ETH',
-  image: imagesEthereum,
-  native: true
-};
-
-function setBalances (_balances, skipNotifications = false) {
-  return (dispatch, getState) => {
-    const state = getState();
-
-    const currentTokens = Object.values(state.balances.tokens || {});
-    const tokensAddresses = currentTokens
-      .map((token) => token.address)
-      .filter((address) => address);
-
-    const accounts = state.personal.accounts;
-    const nextBalances = _balances;
-    const prevBalances = state.balances.balances;
-    const balances = { ...prevBalances };
-
-    Object.keys(nextBalances).forEach((address) => {
-      if (!balances[address]) {
-        balances[address] = Object.assign({}, nextBalances[address]);
-        return;
-      }
-
-      const balance = Object.assign({}, balances[address]);
-      const { tokens, txCount = balance.txCount } = nextBalances[address];
-
-      const prevTokens = balance.tokens.slice();
-      const nextTokens = [];
-
-      const handleToken = (prevToken, nextToken) => {
-        // If the given token is not in the current tokens, skip
-        if (!nextToken && !prevToken) {
-          return false;
-        }
-
-        // No updates
-        if (!nextToken) {
-          return nextTokens.push(prevToken);
-        }
-
-        const { token, value } = nextToken;
-
-        // If it's a new token, push it
-        if (!prevToken) {
-          return nextTokens.push({
-            token, value
-          });
-        }
-
-        // Otherwise, update the value
-        const prevValue = prevToken.value;
-
-        // If received a token/eth (old value < new value), notify
-        if (prevValue.lt(value) && accounts[address] && !skipNotifications) {
-          const account = accounts[address];
-          const txValue = value.minus(prevValue);
-
-          const redirectToAccount = () => {
-            const basePath = account.wallet
-              ? 'wallet'
-              : 'accounts';
-
-            const route = `/${basePath}/${account.address}`;
-
-            dispatch(push(route));
-          };
-
-          notifyTransaction(account, token, txValue, redirectToAccount);
-        }
-
-        return nextTokens.push({
-          ...prevToken,
-          value
-        });
-      };
-
-      const prevEthToken = prevTokens.find((tok) => tok.token.native);
-      const nextEthToken = tokens.find((tok) => tok.token.native);
-
-      handleToken(prevEthToken, nextEthToken);
-
-      tokensAddresses
-        .forEach((address) => {
-          const prevToken = prevTokens.find((tok) => tok.token.address === address);
-          const nextToken = tokens.find((tok) => tok.token.address === address);
-
-          handleToken(prevToken, nextToken);
-        });
-
-      balances[address] = { txCount: txCount || new BigNumber(0), tokens: nextTokens };
-    });
-
-    dispatch(_setBalances(balances));
-  };
-}
+let tokensFilter = {};
 
 function _setBalances (balances) {
   return {
@@ -135,129 +35,88 @@ function _setBalances (balances) {
   };
 }
 
-export function setTokens (tokens) {
-  return {
-    type: 'setTokens',
-    tokens
-  };
-}
-
-export function setTokenReg (tokenreg) {
-  return {
-    type: 'setTokenReg',
-    tokenreg
-  };
-}
-
-export function setTokensFilter (tokensFilter) {
-  return {
-    type: 'setTokensFilter',
-    tokensFilter
-  };
-}
-
-export function setTokenImage (tokenAddress, image) {
-  return {
-    type: 'setTokenImage',
-    tokenAddress, image
-  };
-}
-
-export function loadTokens (options = {}) {
-  log.debug('loading tokens', Object.keys(options).length ? options : '');
-
+/**
+ * @param {Object}  _balances         - In the shape:
+ *   {
+ *     [ who ]: { [ tokenId ]: BigNumber } // The balances of `who`
+ *   }
+ * @param {Boolean} skipNotifications [description]
+ */
+function setBalances (updates, skipNotifications = false) {
   return (dispatch, getState) => {
-    const { tokenreg } = getState().balances;
+    const { tokens, balances } = getState();
 
-    return tokenreg.instance.tokenCount
-      .call()
-      .then((numTokens) => {
-        const tokenIds = range(numTokens.toNumber());
+    const prevBalances = balances;
+    const nextBalances = { ...prevBalances };
 
-        dispatch(fetchTokens(tokenIds, options));
-      })
-      .catch((error) => {
-        console.warn('balances::loadTokens', error);
-      });
-  };
-}
+    Object.keys(updates)
+      .forEach((who) => {
+        const accountUpdates = updates[who];
 
-export function fetchTokens (_tokenIds, options = {}) {
-  const tokenIds = uniq(_tokenIds || []);
+        Object.keys(accountUpdates)
+          .forEach((tokenId) => {
+            const token = tokens[tokenId];
+            const prevTokenValue = (prevBalances[who] || {})[tokenId];
+            const nextTokenValue = accountUpdates[tokenId];
 
-  return (dispatch, getState) => {
-    const { api, images, balances } = getState();
-    const { tokenreg } = balances;
-
-    return Promise
-      .all(tokenIds.map((id) => fetchTokenInfo(tokenreg, id, api)))
-      // FIXME ; shouldn't have to filter out tokens...
-      .then((tokens) => tokens.filter((token) => token.tag && token.tag.toLowerCase() !== 'eth'))
-      .then((tokens) => {
-        // dispatch only the changed images
-        tokens
-          .forEach((token) => {
-            const { image, address } = token;
-
-            if (images[address] === image) {
-              return;
+            if (prevTokenValue && prevTokenValue.lt(nextTokenValue)) {
+              dispatch(notifyBalanceChange(who, prevTokenValue, nextTokenValue, token));
             }
 
-            dispatch(setTokenImage(address, image));
-            dispatch(setAddressImage(address, image, true));
+            // Add the token if it's native ETH or if it has a value
+            if (token.native || nextTokenValue.gt(0)) {
+              nextBalances[who] = {
+                ...(nextBalances[who] || {}),
+                [tokenId]: nextTokenValue
+              };
+            }
           });
-
-        log.debug('fetched token', tokens);
-        dispatch(setTokens(tokens));
-        dispatch(updateTokensFilter(null, null, options));
-      })
-      .catch((error) => {
-        console.warn('balances::fetchTokens', error);
       });
+
+    return dispatch(_setBalances(nextBalances));
   };
 }
 
-export function fetchBalances (_addresses, skipNotifications = false) {
+function notifyBalanceChange (who, fromValue, toValue, token) {
   return (dispatch, getState) => {
-    const { api, personal } = getState();
-    const { visibleAccounts, accounts } = personal;
+    const account = getState().personal.accounts[who];
 
-    const addresses = uniq(_addresses || visibleAccounts || []);
+    if (account) {
+      const txValue = toValue.minus(fromValue);
 
-    // With only a single account, more info will be displayed.
-    const fullFetch = addresses.length === 1;
+      const redirectToAccount = () => {
+        const basePath = account.wallet
+          ? 'wallet'
+          : 'accounts';
 
-    // Add accounts addresses (for notifications, accounts selection, etc.)
-    const addressesToFetch = uniq(addresses.concat(Object.keys(accounts)));
+        const route = `/${basePath}/${account.address}`;
 
-    return Promise
-      .all(addressesToFetch.map((addr) => fetchAccount(addr, api, fullFetch)))
-      .then((accountsBalances) => {
-        const balances = {};
+        dispatch(push(route));
+      };
 
-        addressesToFetch.forEach((addr, idx) => {
-          balances[addr] = accountsBalances[idx];
-        });
-
-        dispatch(setBalances(balances, skipNotifications));
-      })
-      .catch((error) => {
-        console.warn('balances::fetchBalances', error);
-      });
+      notifyTransaction(account, token, txValue, redirectToAccount);
+    }
   };
 }
 
+// TODO: fetch txCount when needed
+export function fetchBalances (_addresses, skipNotifications = false) {
+  return fetchTokensBalances(_addresses, [ ETH_TOKEN ], skipNotifications);
+}
+
 export function updateTokensFilter (_addresses, _tokens, options = {}) {
   return (dispatch, getState) => {
-    const { api, balances, personal } = getState();
+    const { api, personal, tokens } = getState();
     const { visibleAccounts, accounts } = personal;
-    const { tokensFilter } = balances;
 
     const addressesToFetch = uniq(visibleAccounts.concat(Object.keys(accounts)));
     const addresses = uniq(_addresses || addressesToFetch || []).sort();
 
-    const tokens = _tokens || Object.values(balances.tokens) || [];
-    const tokenAddresses = tokens.map((t) => t.address).sort();
+    const tokensToUpdate = _tokens || Object.values(tokens);
+    const tokenAddresses = tokensToUpdate
+      .map((t) => t.address)
+      .filter((address) => address)
+      .sort();
 
     if (tokensFilter.filterFromId || tokensFilter.filterToId) {
       // Has the tokens addresses changed (eg. a network change)
@@ -287,23 +146,22 @@ export function updateTokensFilter (_addresses, _tokens, options = {}) {
 
     const promise = Promise.all(promises);
 
-    const TRANSFER_SIGNATURE = api.util.sha3('Transfer(address,address,uint256)');
     const topicsFrom = [ TRANSFER_SIGNATURE, addresses, null ];
     const topicsTo = [ TRANSFER_SIGNATURE, null, addresses ];
 
-    const options = {
+    const filterOptions = {
       fromBlock: 0,
       toBlock: 'pending',
       address: tokenAddresses
     };
 
     const optionsFrom = {
-      ...options,
+      ...filterOptions,
       topics: topicsFrom
     };
 
     const optionsTo = {
-      ...options,
+      ...filterOptions,
       topics: topicsTo
     };
 
@@ -322,8 +180,8 @@ export function updateTokensFilter (_addresses, _tokens, options = {}) {
 
         const { skipNotifications } = options;
 
-        dispatch(setTokensFilter(nextTokensFilter));
-        fetchTokensBalances(addresses, tokens, skipNotifications)(dispatch, getState);
+        tokensFilter = nextTokensFilter;
+        fetchTokensBalances(addresses, tokensToUpdate, skipNotifications)(dispatch, getState);
       })
       .catch((error) => {
         console.warn('balances::updateTokensFilter', error);
@@ -331,13 +189,14 @@ export function updateTokensFilter (_addresses, _tokens, options = {}) {
   };
 }
 
-export function queryTokensFilter (tokensFilter) {
+export function queryTokensFilter () {
   return (dispatch, getState) => {
-    const { api, personal, balances } = getState();
+    const { api, personal, tokens } = getState();
     const { visibleAccounts, accounts } = personal;
 
-    const visibleAddresses = visibleAccounts.map((a) => a.toLowerCase());
-    const addressesToFetch = uniq(visibleAddresses.concat(Object.keys(accounts)));
+    const allAddresses = visibleAccounts.concat(Object.keys(accounts));
+    const addressesToFetch = uniq(allAddresses);
+    const lcAddresses = addressesToFetch.map((a) => a.toLowerCase());
 
     Promise
       .all([
@@ -347,21 +206,28 @@ export function queryTokensFilter (tokensFilter) {
       .then(([ logsFrom, logsTo ]) => {
         const addresses = [];
         const tokenAddresses = [];
+        const logs = logsFrom.concat(logsTo);
 
-        logsFrom
-          .concat(logsTo)
+        if (logs.length > 0) {
+          log.debug('got tokens filter logs', logs);
+        }
+
+        logs
           .forEach((log) => {
             const tokenAddress = log.address;
 
             const fromAddress = '0x' + log.topics[1].slice(-40);
             const toAddress = '0x' + log.topics[2].slice(-40);
 
-            if (addressesToFetch.includes(fromAddress)) {
-              addresses.push(fromAddress);
+            const fromAddressIndex = lcAddresses.indexOf(fromAddress);
+            const toAddressIndex = lcAddresses.indexOf(toAddress);
+
+            if (fromAddressIndex > -1) {
+              addresses.push(addressesToFetch[fromAddressIndex]);
             }
 
-            if (addressesToFetch.includes(toAddress)) {
-              addresses.push(toAddress);
+            if (toAddressIndex > -1) {
+              addresses.push(addressesToFetch[toAddressIndex]);
             }
 
             tokenAddresses.push(tokenAddress);
@@ -371,36 +237,35 @@ export function queryTokensFilter (tokensFilter) {
           return;
         }
 
-        const tokens = Object.values(balances.tokens)
+        const tokensToUpdate = Object.values(tokens)
           .filter((t) => tokenAddresses.includes(t.address));
 
-        fetchTokensBalances(uniq(addresses), tokens)(dispatch, getState);
+        fetchTokensBalances(uniq(addresses), tokensToUpdate)(dispatch, getState);
       });
   };
 }
 
 export function fetchTokensBalances (_addresses = null, _tokens = null, skipNotifications = false) {
   return (dispatch, getState) => {
-    const { api, personal, balances } = getState();
+    const { api, personal, tokens } = getState();
     const { visibleAccounts, accounts } = personal;
+    const allTokens = Object.values(tokens);
 
     const addressesToFetch = uniq(visibleAccounts.concat(Object.keys(accounts)));
     const addresses = _addresses || addressesToFetch;
-    const tokens = _tokens || Object.values(balances.tokens);
+    const tokensToUpdate = _tokens || allTokens;
 
     if (addresses.length === 0) {
       return Promise.resolve();
     }
 
-    return Promise
-      .all(addresses.map((addr) => fetchTokensBalance(addr, tokens, api)))
-      .then((tokensBalances) => {
-        const balances = {};
-
-        addresses.forEach((addr, idx) => {
-          balances[addr] = tokensBalances[idx];
-        });
+    const updates = addresses.reduce((updates, who) => {
+      updates[who] = tokensToUpdate.map((token) => token.id);
+      return updates;
+    }, {});
 
+    return fetchAccountsBalances(api, allTokens, updates)
+      .then((balances) => {
         dispatch(setBalances(balances, skipNotifications));
       })
       .catch((error) => {
@@ -408,78 +273,3 @@ export function fetchTokensBalances (_addresses = null, _tokens = null, skipNoti
       });
   };
 }
-
-function fetchAccount (address, api, full = false) {
-  const promises = [ api.eth.getBalance(address) ];
-
-  if (full) {
-    promises.push(api.eth.getTransactionCount(address));
-  }
-
-  return Promise
-    .all(promises)
-    .then(([ ethBalance, txCount ]) => {
-      const tokens = [ { token: ETH, value: ethBalance } ];
-      const balance = { tokens };
-
-      if (full) {
-        balance.txCount = txCount;
-      }
-
-      return balance;
-    })
-    .catch((error) => {
-      console.warn('balances::fetchAccountBalance', `couldn't fetch balance for account #${address}`, error);
-    });
-}
-
-function fetchTokensBalance (address, _tokens, api) {
-  const tokensPromises = _tokens
-    .map((token) => {
-      return token.contract.instance.balanceOf.call({}, [ address ]);
-    });
-
-  return Promise
-    .all(tokensPromises)
-    .then((tokensBalance) => {
-      const tokens = _tokens
-        .map((token, index) => ({
-          token,
-          value: tokensBalance[index]
-        }));
-
-      const balance = { tokens };
-
-      return balance;
-    })
-    .catch((error) => {
-      console.warn('balances::fetchTokensBalance', `couldn't fetch tokens balance for account #${address}`, error);
-    });
-}
-
-function fetchTokenInfo (tokenreg, tokenId, api, dispatch) {
-  return Promise
-    .all([
-      tokenreg.instance.token.call({}, [tokenId]),
-      tokenreg.instance.meta.call({}, [tokenId, 'IMG'])
-    ])
-    .then(([ tokenData, image ]) => {
-      const [ address, tag, format, name ] = tokenData;
-      const contract = api.newContract(ABIS.eip20, address);
-
-      const token = {
-        format: format.toString(),
-        id: tokenId,
-        image: hashToImageUrl(image),
-        address,
-        tag,
-        name,
-        contract
-      };
-
-      return token;
-    })
-    .catch((error) => {
-      console.warn('balances::fetchTokenInfo', `couldn't fetch token #${tokenId}`, error);
-    });
-}
diff --git a/js/src/redux/providers/balancesReducer.js b/js/src/redux/providers/balancesReducer.js
index 90bbd83d9..1b6f34391 100644
--- a/js/src/redux/providers/balancesReducer.js
+++ b/js/src/redux/providers/balancesReducer.js
@@ -16,72 +16,12 @@
 
 import { handleActions } from 'redux-actions';
 
-const initialState = {
-  balances: {},
-  tokens: {},
-  tokenreg: null,
-  tokensFilter: {}
-};
+const initialState = {};
 
 export default handleActions({
   setBalances (state, action) {
     const { balances } = action;
 
-    return Object.assign({}, state, { balances });
-  },
-
-  setTokens (state, action) {
-    const { tokens } = action;
-
-    if (Array.isArray(tokens)) {
-      const objTokens = tokens.reduce((_tokens, token) => {
-        _tokens[token.address] = token;
-        return _tokens;
-      }, {});
-
-      return Object.assign({}, state, { tokens: objTokens });
-    }
-
-    return Object.assign({}, state, { tokens });
-  },
-
-  setTokenImage (state, action) {
-    const { tokenAddress, image } = action;
-    const { balances } = state;
-    const nextBalances = {};
-
-    Object.keys(balances).forEach((address) => {
-      const tokenIndex = balances[address].tokens.findIndex((t) => t.token.address === tokenAddress);
-
-      if (tokenIndex === -1 || balances[address].tokens[tokenIndex].value.equals(0)) {
-        return;
-      }
-
-      const tokens = [].concat(balances[address].tokens);
-
-      tokens[tokenIndex].token = {
-        ...tokens[tokenIndex].token,
-        image
-      };
-
-      nextBalances[address] = {
-        ...balances[address],
-        tokens
-      };
-    });
-
-    return Object.assign({}, state, { balance: { ...balances, nextBalances } });
-  },
-
-  setTokenReg (state, action) {
-    const { tokenreg } = action;
-
-    return Object.assign({}, state, { tokenreg });
-  },
-
-  setTokensFilter (state, action) {
-    const { tokensFilter } = action;
-
-    return Object.assign({}, state, { tokensFilter });
+    return Object.assign({}, state, balances);
   }
 }, initialState);
diff --git a/js/src/redux/providers/blockchainActions.js b/js/src/redux/providers/blockchainActions.js
deleted file mode 100644
index 4c97f7ab3..000000000
--- a/js/src/redux/providers/blockchainActions.js
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Contracts from '~/contracts';
-
-export function setBlock (blockNumber, block) {
-  return {
-    type: 'setBlock',
-    blockNumber, block
-  };
-}
-
-export function setTransaction (txHash, info) {
-  return {
-    type: 'setTransaction',
-    txHash, info
-  };
-}
-
-export function setBytecode (address, bytecode) {
-  return {
-    type: 'setBytecode',
-    address, bytecode
-  };
-}
-
-export function setMethod (signature, method) {
-  return {
-    type: 'setMethod',
-    signature, method
-  };
-}
-
-export function fetchBlock (blockNumber) {
-  return (dispatch, getState) => {
-    const { blocks } = getState().blockchain;
-
-    if (blocks[blockNumber.toString()]) {
-      return;
-    }
-
-    const { api } = getState();
-
-    api.eth
-      .getBlockByNumber(blockNumber)
-      .then(block => {
-        dispatch(setBlock(blockNumber, block));
-      })
-      .catch(e => {
-        console.error('blockchain::fetchBlock', e);
-      });
-  };
-}
-
-export function fetchTransaction (txHash) {
-  return (dispatch, getState) => {
-    const { transactions } = getState().blockchain;
-
-    if (transactions[txHash]) {
-      return;
-    }
-
-    const { api } = getState();
-
-    api.eth
-      .getTransactionByHash(txHash)
-      .then(info => {
-        dispatch(setTransaction(txHash, info));
-      })
-      .catch(e => {
-        console.error('blockchain::fetchTransaction', e);
-      });
-  };
-}
-
-export function fetchBytecode (address) {
-  return (dispatch, getState) => {
-    const { bytecodes } = getState().blockchain;
-
-    if (bytecodes[address]) {
-      return;
-    }
-
-    const { api } = getState();
-
-    api.eth
-      .getCode(address)
-      .then(code => {
-        dispatch(setBytecode(address, code));
-      })
-      .catch(e => {
-        console.error('blockchain::fetchBytecode', e);
-      });
-  };
-}
-
-export function fetchMethod (signature) {
-  return (dispatch, getState) => {
-    const { methods } = getState().blockchain;
-
-    if (methods[signature]) {
-      return;
-    }
-
-    Contracts
-      .get()
-      .signatureReg.lookup(signature)
-      .then(method => {
-        dispatch(setMethod(signature, method));
-      })
-      .catch(e => {
-        console.error('blockchain::fetchMethod', e);
-      });
-  };
-}
diff --git a/js/src/redux/providers/blockchainReducer.js b/js/src/redux/providers/blockchainReducer.js
deleted file mode 100644
index 04081457f..000000000
--- a/js/src/redux/providers/blockchainReducer.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { handleActions } from 'redux-actions';
-
-const initialState = {
-  blocks: {},
-  transactions: {},
-  bytecodes: {},
-  methods: {}
-};
-
-export default handleActions({
-  setBlock (state, action) {
-    const { blockNumber, block } = action;
-
-    const blocks = Object.assign({}, state.blocks, {
-      [blockNumber.toString()]: block
-    });
-
-    return Object.assign({}, state, { blocks });
-  },
-
-  setTransaction (state, action) {
-    const { txHash, info } = action;
-
-    const transactions = Object.assign({}, state.transactions, {
-      [txHash]: info
-    });
-
-    return Object.assign({}, state, { transactions });
-  },
-
-  setBytecode (state, action) {
-    const { address, bytecode } = action;
-
-    const bytecodes = Object.assign({}, state.bytecodes, {
-      [address]: bytecode
-    });
-
-    return Object.assign({}, state, { bytecodes });
-  },
-
-  setMethod (state, action) {
-    const { signature, method } = action;
-
-    const methods = Object.assign({}, state.methods, {
-      [signature]: method
-    });
-
-    return Object.assign({}, state, { methods });
-  }
-}, initialState);
diff --git a/js/src/redux/providers/index.js b/js/src/redux/providers/index.js
index 04231d6b3..967820cc7 100644
--- a/js/src/redux/providers/index.js
+++ b/js/src/redux/providers/index.js
@@ -21,7 +21,6 @@ export Status from './status';
 
 export apiReducer from './apiReducer';
 export balancesReducer from './balancesReducer';
-export blockchainReducer from './blockchainReducer';
 export workerReducer from './workerReducer';
 export imagesReducer from './imagesReducer';
 export personalReducer from './personalReducer';
@@ -29,4 +28,5 @@ export requestsReducer from './requestsReducer';
 export signerReducer from './signerReducer';
 export snackbarReducer from './snackbarReducer';
 export statusReducer from './statusReducer';
+export tokensReducer from './tokensReducer';
 export walletReducer from './walletReducer';
diff --git a/js/src/redux/providers/personal.js b/js/src/redux/providers/personal.js
index ffc331495..4c9d3e23a 100644
--- a/js/src/redux/providers/personal.js
+++ b/js/src/redux/providers/personal.js
@@ -35,6 +35,12 @@ export default class Personal {
           return;
         }
 
+        // Add the address to each accounts
+        Object.keys(accountsInfo)
+          .forEach((address) => {
+            accountsInfo[address].address = address;
+          });
+
         this._store.dispatch(personalAccountsInfo(accountsInfo));
       });
   }
diff --git a/js/src/redux/providers/tokensActions.js b/js/src/redux/providers/tokensActions.js
new file mode 100644
index 000000000..6f902882d
--- /dev/null
+++ b/js/src/redux/providers/tokensActions.js
@@ -0,0 +1,88 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { uniq } from 'lodash';
+
+import Contracts from '~/contracts';
+import { LOG_KEYS, getLogger } from '~/config';
+import { fetchTokenIds, fetchTokenInfo } from '~/util/tokens';
+
+import { updateTokensFilter } from './balancesActions';
+import { setAddressImage } from './imagesActions';
+
+const log = getLogger(LOG_KEYS.Balances);
+
+export function setTokens (tokens) {
+  return {
+    type: 'setTokens',
+    tokens
+  };
+}
+
+export function loadTokens (options = {}) {
+  log.debug('loading tokens', Object.keys(options).length ? options : '');
+
+  return (dispatch, getState) => {
+    const { tokenReg } = Contracts.get();
+
+    tokenReg.getInstance()
+      .then((tokenRegInstance) => {
+        return fetchTokenIds(tokenRegInstance);
+      })
+      .then((tokenIndexes) => dispatch(fetchTokens(tokenIndexes, options)))
+      .catch((error) => {
+        console.warn('tokens::loadTokens', error);
+      });
+  };
+}
+
+export function fetchTokens (_tokenIndexes, options = {}) {
+  const tokenIndexes = uniq(_tokenIndexes || []);
+
+  return (dispatch, getState) => {
+    const { api, images } = getState();
+    const { tokenReg } = Contracts.get();
+
+    return tokenReg.getInstance()
+      .then((tokenRegInstance) => {
+        const promises = tokenIndexes.map((id) => fetchTokenInfo(api, tokenRegInstance, id));
+
+        return Promise.all(promises);
+      })
+      .then((results) => {
+        const tokens = results
+          .reduce((tokens, token) => {
+            const { id, image, address } = token;
+
+            // dispatch only the changed images
+            if (images[address] !== image) {
+              dispatch(setAddressImage(address, image, true));
+            }
+
+            tokens[id] = token;
+            return tokens;
+          }, {});
+
+        log.debug('fetched token', tokens);
+
+        dispatch(setTokens(tokens));
+        dispatch(updateTokensFilter(null, null, options));
+      })
+      .catch((error) => {
+        console.warn('tokens::fetchTokens', error);
+      });
+  };
+}
diff --git a/js/src/redux/providers/tokensReducer.js b/js/src/redux/providers/tokensReducer.js
new file mode 100644
index 000000000..e11fb41a3
--- /dev/null
+++ b/js/src/redux/providers/tokensReducer.js
@@ -0,0 +1,34 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { handleActions } from 'redux-actions';
+
+import { ETH_TOKEN } from '~/util/tokens';
+
+const initialState = {
+  [ ETH_TOKEN.id ]: ETH_TOKEN
+};
+
+export default handleActions({
+  setTokens (state, action) {
+    const { tokens } = action;
+
+    return {
+      ...state,
+      ...tokens
+    };
+  }
+}, initialState);
diff --git a/js/src/redux/reducers.js b/js/src/redux/reducers.js
index ed1f7ef57..fb5384d6c 100644
--- a/js/src/redux/reducers.js
+++ b/js/src/redux/reducers.js
@@ -18,10 +18,10 @@ import { combineReducers } from 'redux';
 import { routerReducer } from 'react-router-redux';
 
 import {
-  apiReducer, balancesReducer, blockchainReducer,
+  apiReducer, balancesReducer,
   workerReducer, imagesReducer, personalReducer, requestsReducer,
   signerReducer, statusReducer as nodeStatusReducer,
-  snackbarReducer, walletReducer
+  snackbarReducer, tokensReducer, walletReducer
 } from './providers';
 import certificationsReducer from './providers/certifications/reducer';
 import registryReducer from './providers/registry/reducer';
@@ -40,7 +40,6 @@ export default function () {
 
     balances: balancesReducer,
     certifications: certificationsReducer,
-    blockchain: blockchainReducer,
     images: imagesReducer,
     nodeStatus: nodeStatusReducer,
     personal: personalReducer,
@@ -48,6 +47,7 @@ export default function () {
     requests: requestsReducer,
     signer: signerReducer,
     snackbar: snackbarReducer,
+    tokens: tokensReducer,
     wallet: walletReducer,
     worker: workerReducer
   });
diff --git a/js/src/ui/AccountCard/accountCard.js b/js/src/ui/AccountCard/accountCard.js
index 107fc39d2..da59f0e69 100644
--- a/js/src/ui/AccountCard/accountCard.js
+++ b/js/src/ui/AccountCard/accountCard.js
@@ -84,6 +84,7 @@ export default class AccountCard extends Component {
           </div>
 
           <Balance
+            address={ address }
             balance={ balance }
             className={ styles.balance }
             showOnlyEth
diff --git a/js/src/ui/AccountCard/accountCard.spec.js b/js/src/ui/AccountCard/accountCard.spec.js
index 6d7e921fd..318434605 100644
--- a/js/src/ui/AccountCard/accountCard.spec.js
+++ b/js/src/ui/AccountCard/accountCard.spec.js
@@ -14,10 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import BigNumber from 'bignumber.js';
 import { shallow } from 'enzyme';
 import React from 'react';
 import sinon from 'sinon';
 
+import { ETH_TOKEN } from '~/util/tokens';
+
 import AccountCard from './';
 
 const TEST_ADDRESS = '0x1234567890123456789012345678901234567890';
@@ -27,6 +30,21 @@ let component;
 let onClick;
 let onFocus;
 
+function reduxStore () {
+  const getState = () => ({
+    balances: {},
+    tokens: {
+      [ETH_TOKEN.id]: ETH_TOKEN
+    }
+  });
+
+  return {
+    getState,
+    dispatch: () => null,
+    subscribe: () => null
+  };
+}
+
 function render (props = {}) {
   if (!props.account) {
     props.account = {
@@ -39,6 +57,12 @@ function render (props = {}) {
     };
   }
 
+  if (!props.balance) {
+    props.balance = {
+      [ETH_TOKEN.id]: new BigNumber(10)
+    };
+  }
+
   onClick = sinon.stub();
   onFocus = sinon.stub();
 
@@ -67,7 +91,9 @@ describe('ui/AccountCard', () => {
       let balance;
 
       beforeEach(() => {
-        balance = component.find('Balance');
+        balance = component.find('Connect(Balance)').shallow({
+          context: { store: reduxStore() }
+        });
       });
 
       it('renders the balance', () => {
diff --git a/js/src/ui/Balance/balance.js b/js/src/ui/Balance/balance.js
index d00e1f01c..8bb552daa 100644
--- a/js/src/ui/Balance/balance.js
+++ b/js/src/ui/Balance/balance.js
@@ -17,18 +17,21 @@
 import BigNumber from 'bignumber.js';
 import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
+import { connect } from 'react-redux';
 
 import TokenImage from '~/ui/TokenImage';
 
 import styles from './balance.css';
 
-export default class Balance extends Component {
+export class Balance extends Component {
   static contextTypes = {
     api: PropTypes.object
   };
 
   static propTypes = {
-    balance: PropTypes.object,
+    balance: PropTypes.object.isRequired,
+    tokens: PropTypes.object.isRequired,
+    address: PropTypes.string,
     className: PropTypes.string,
     showOnlyEth: PropTypes.bool,
     showZeroValues: PropTypes.bool
@@ -40,44 +43,38 @@ export default class Balance extends Component {
   };
 
   render () {
-    const { api } = this.context;
-    const { balance, className, showOnlyEth } = this.props;
+    const { balance, className, showOnlyEth, tokens } = this.props;
 
-    if (!balance || !balance.tokens) {
+    if (Object.keys(balance).length === 0) {
       return null;
     }
 
-    let body = balance.tokens
-      .filter((balance) => {
-        const isEthToken = (balance.token.tag || '').toLowerCase() === 'eth';
-        const hasBalance = new BigNumber(balance.value).gt(0);
+    let body = Object.keys(balance)
+      .map((tokenId) => {
+        const token = tokens[tokenId];
+        const balanceValue = balance[tokenId];
 
-        return hasBalance || isEthToken;
-      })
-      .map((balance, index) => {
-        const isFullToken = !showOnlyEth || (balance.token.tag || '').toLowerCase() === 'eth';
-        const token = balance.token;
+        const isEthToken = token.native;
+        const isFullToken = !showOnlyEth || isEthToken;
+        const hasBalance = balanceValue.gt(0);
 
-        let value;
-
-        if (token.format) {
-          const bnf = new BigNumber(token.format);
-
-          let decimals = 0;
-
-          if (bnf.gte(1000)) {
-            decimals = 3;
-          } else if (bnf.gte(100)) {
-            decimals = 2;
-          } else if (bnf.gte(10)) {
-            decimals = 1;
-          }
-
-          value = new BigNumber(balance.value).div(bnf).toFormat(decimals);
-        } else {
-          value = api.util.fromWei(balance.value).toFormat(3);
+        if (!hasBalance && !isEthToken) {
+          return null;
         }
 
+        const bnf = new BigNumber(token.format || 1);
+        let decimals = 0;
+
+        if (bnf.gte(1000)) {
+          decimals = 3;
+        } else if (bnf.gte(100)) {
+          decimals = 2;
+        } else if (bnf.gte(10)) {
+          decimals = 1;
+        }
+
+        const value = new BigNumber(balanceValue).div(bnf).toFormat(decimals);
+
         const classNames = [styles.balance];
         let details = null;
 
@@ -104,13 +101,14 @@ export default class Balance extends Component {
         return (
           <div
             className={ classNames.join(' ') }
-            key={ `${index}_${token.tag}` }
+            key={ tokenId }
           >
             <TokenImage token={ token } />
             { details }
           </div>
         );
-      });
+      })
+      .filter((node) => node);
 
     if (!body.length) {
       body = (
@@ -140,3 +138,15 @@ export default class Balance extends Component {
     );
   }
 }
+
+function mapStateToProps (state, props) {
+  const { balances, tokens } = state;
+  const { address } = props;
+
+  return {
+    balance: balances[address] || props.balance || {},
+    tokens
+  };
+}
+
+export default connect(mapStateToProps)(Balance);
diff --git a/js/src/ui/Balance/balance.spec.js b/js/src/ui/Balance/balance.spec.js
index ffc25243a..d5601a489 100644
--- a/js/src/ui/Balance/balance.spec.js
+++ b/js/src/ui/Balance/balance.spec.js
@@ -14,19 +14,24 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import BigNumber from 'bignumber.js';
 import { shallow } from 'enzyme';
 import React from 'react';
 
 import apiutil from '~/api/util';
 
-import Balance from './';
+import { Balance } from './balance';
+
+const TOKENS = {
+  'eth': { tag: 'ETH' },
+  'gav': { tag: 'GAV', format: 1 },
+  'tst': { tag: 'TST', format: 1 }
+};
 
 const BALANCE = {
-  tokens: [
-    { value: '122', token: { tag: 'ETH' } },
-    { value: '345', token: { tag: 'GAV', format: 1 } },
-    { value: '0', token: { tag: 'TST', format: 1 } }
-  ]
+  'eth': new BigNumber(122),
+  'gav': new BigNumber(345),
+  'tst': new BigNumber(0)
 };
 
 let api;
@@ -46,6 +51,10 @@ function render (props = {}) {
     props.balance = BALANCE;
   }
 
+  if (!props.tokens) {
+    props.tokens = TOKENS;
+  }
+
   const api = createApi();
 
   component = shallow(
diff --git a/js/src/ui/Container/container.css b/js/src/ui/Container/container.css
index 3d66d2655..e01387406 100644
--- a/js/src/ui/Container/container.css
+++ b/js/src/ui/Container/container.css
@@ -32,6 +32,7 @@ $transitionAll: all 0.75s cubic-bezier(0.23, 1, 0.32, 1);
 
   .hoverOverlay {
     background: $background;
+    display: none;
     left: 0;
     margin-top: -1.5em;
     margin-bottom: 3em;
@@ -52,6 +53,7 @@ $transitionAll: all 0.75s cubic-bezier(0.23, 1, 0.32, 1);
 
     .hoverOverlay {
       background: $backgroundHover;
+      display: block;
       /*transform: scale(1, 1);*/
       opacity: 1;
     }
diff --git a/js/src/ui/Form/AddressSelect/addressSelect.js b/js/src/ui/Form/AddressSelect/addressSelect.js
index e7c210eba..c42442465 100644
--- a/js/src/ui/Form/AddressSelect/addressSelect.js
+++ b/js/src/ui/Form/AddressSelect/addressSelect.js
@@ -55,7 +55,6 @@ class AddressSelect extends Component {
     // Redux props
     accountsInfo: PropTypes.object,
     accounts: PropTypes.object,
-    balances: PropTypes.object,
     contacts: PropTypes.object,
     contracts: PropTypes.object,
     tokens: PropTypes.object,
@@ -356,10 +355,9 @@ class AddressSelect extends Component {
   }
 
   renderAccountCard (_account) {
-    const { balances, accountsInfo } = this.props;
+    const { accountsInfo } = this.props;
     const { address, index = null } = _account;
 
-    const balance = balances[address];
     const account = {
       ...accountsInfo[address],
       ..._account
@@ -368,7 +366,6 @@ class AddressSelect extends Component {
     return (
       <AccountCard
         account={ account }
-        balance={ balance }
         className={ styles.account }
         key={ `account_${index}` }
         onClick={ this.handleClick }
@@ -650,12 +647,10 @@ class AddressSelect extends Component {
 
 function mapStateToProps (state) {
   const { accountsInfo } = state.personal;
-  const { balances } = state.balances;
   const { reverse } = state.registry;
 
   return {
     accountsInfo,
-    balances,
     reverse
   };
 }
diff --git a/js/src/ui/Form/InputAddress/inputAddress.js b/js/src/ui/Form/InputAddress/inputAddress.js
index 4a9179753..f17d7b4cf 100644
--- a/js/src/ui/Form/InputAddress/inputAddress.js
+++ b/js/src/ui/Form/InputAddress/inputAddress.js
@@ -175,14 +175,12 @@ function mapStateToProps (state, props) {
 
   const lcValue = value.toLowerCase();
   const { accountsInfo } = state.personal;
-  const { tokens } = state.balances;
+  const { tokens } = state;
 
-  const accountsInfoAddress = Object.keys(accountsInfo).find((address) => address.toLowerCase() === lcValue);
-  const tokensAddress = Object.keys(tokens).find((address) => address.toLowerCase() === lcValue);
+  const accountInfo = Object.values(accountsInfo).find((account) => account.address.toLowerCase() === lcValue);
+  const token = Object.values(tokens).find((token) => token.address.toLowerCase() === lcValue);
 
-  const account = (accountsInfoAddress && accountsInfo[accountsInfoAddress]) ||
-    (tokensAddress && tokens[tokensAddress]) ||
-    null;
+  const account = accountInfo || token || null;
 
   return {
     account
diff --git a/js/src/ui/IdentityName/identityName.js b/js/src/ui/IdentityName/identityName.js
index 0e814d2db..b9a0ba045 100644
--- a/js/src/ui/IdentityName/identityName.js
+++ b/js/src/ui/IdentityName/identityName.js
@@ -34,21 +34,19 @@ const defaultNameNull = (
   />
 );
 
-class IdentityName extends Component {
+export class IdentityName extends Component {
   static propTypes = {
-    accountsInfo: PropTypes.object,
+    account: PropTypes.object,
     address: PropTypes.string,
     className: PropTypes.string,
     empty: PropTypes.bool,
     name: PropTypes.string,
     shorten: PropTypes.bool,
-    tokens: PropTypes.object,
     unknown: PropTypes.bool
   }
 
   render () {
-    const { address, accountsInfo, className, empty, name, shorten, tokens, unknown } = this.props;
-    const account = accountsInfo[address] || tokens[address];
+    const { account, address, className, empty, name, shorten, unknown } = this.props;
 
     if (!account && empty) {
       return null;
@@ -76,13 +74,14 @@ class IdentityName extends Component {
   }
 }
 
-function mapStateToProps (state) {
-  const { accountsInfo } = state.personal;
-  const { tokens } = state.balances;
+function mapStateToProps (state, props) {
+  const { address } = props;
+  const { personal, tokens } = state;
+
+  const account = personal.accountsInfo[address] || Object.values(tokens).find((token) => token.address === address);
 
   return {
-    accountsInfo,
-    tokens
+    account
   };
 }
 
diff --git a/js/src/ui/IdentityName/identityName.spec.js b/js/src/ui/IdentityName/identityName.spec.js
index 07be20120..cfabfbefd 100644
--- a/js/src/ui/IdentityName/identityName.spec.js
+++ b/js/src/ui/IdentityName/identityName.spec.js
@@ -17,40 +17,19 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import sinon from 'sinon';
-
-import IdentityName from './identityName';
+import { IdentityName } from './identityName';
 
 const ADDR_A = '0x123456789abcdef0123456789A';
-const ADDR_B = '0x123456789abcdef0123456789B';
 const ADDR_C = '0x123456789abcdef0123456789C';
 const ADDR_NULL = '0x0000000000000000000000000000000000000000';
 const NAME_JIMMY = 'Jimmy Test';
-const STORE = {
-  dispatch: sinon.stub(),
-  subscribe: sinon.stub(),
-  getState: () => {
-    return {
-      balances: {
-        tokens: {}
-      },
-      personal: {
-        accountsInfo: {
-          [ADDR_A]: { name: 'testing' },
-          [ADDR_B]: {}
-        }
-      }
-    };
-  }
-};
 
 function render (props) {
   return shallow(
     <IdentityName
-      store={ STORE }
       { ...props }
     />
-  ).find('IdentityName').shallow();
+  );
 }
 
 describe('ui/IdentityName', () => {
diff --git a/js/src/ui/MethodDecoding/methodDecoding.js b/js/src/ui/MethodDecoding/methodDecoding.js
index 8203aa5fd..1d2810c54 100644
--- a/js/src/ui/MethodDecoding/methodDecoding.js
+++ b/js/src/ui/MethodDecoding/methodDecoding.js
@@ -653,10 +653,10 @@ class MethodDecoding extends Component {
 }
 
 function mapStateToProps (initState, initProps) {
-  const { tokens } = initState.balances;
+  const { tokens } = initState;
   const { transaction } = initProps;
 
-  const token = (tokens || {})[transaction.to];
+  const token = Object.values(tokens).find((token) => token.address === transaction.to);
 
   return () => {
     return { token };
diff --git a/js/src/util/notifications.js b/js/src/util/notifications.js
index b44ed481d..74732cac2 100644
--- a/js/src/util/notifications.js
+++ b/js/src/util/notifications.js
@@ -17,20 +17,12 @@
 import Push from 'push.js';
 import BigNumber from 'bignumber.js';
 
-import { fromWei } from '~/api/util/wei';
-
-import ethereumIcon from '~/../assets/images/contracts/ethereum-black-64x64.png';
 import unkownIcon from '~/../assets/images/contracts/unknown-64x64.png';
 
 export function notifyTransaction (account, token, _value, onClick) {
   const name = account.name || account.address;
-  const value = token.tag.toLowerCase() === 'eth'
-    ? fromWei(_value)
-    : _value.div(new BigNumber(token.format || 1));
-
-  const icon = token.tag.toLowerCase() === 'eth'
-    ? ethereumIcon
-    : (token.image || unkownIcon);
+  const value = _value.div(new BigNumber(token.format || 1));
+  const icon = token.image || unkownIcon;
 
   let _notification = null;
 
diff --git a/js/src/util/tokens.js b/js/src/util/tokens.js
new file mode 100644
index 000000000..63e6e9f02
--- /dev/null
+++ b/js/src/util/tokens.js
@@ -0,0 +1,133 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { range } from 'lodash';
+import BigNumber from 'bignumber.js';
+
+import { hashToImageUrl } from '~/redux/util';
+import { sha3 } from '~/api/util/sha3';
+import imagesEthereum from '~/../assets/images/contracts/ethereum-black-64x64.png';
+
+const BALANCEOF_SIGNATURE = sha3('balanceOf(address)');
+const ADDRESS_PADDING = range(24).map(() => '0').join('');
+
+export const ETH_TOKEN = {
+  address: '',
+  format: new BigNumber(10).pow(18),
+  id: sha3('eth_native_token').slice(0, 10),
+  image: imagesEthereum,
+  name: 'Ethereum',
+  native: true,
+  tag: 'ETH'
+};
+
+export function fetchTokenIds (tokenregInstance) {
+  return tokenregInstance.tokenCount
+    .call()
+    .then((numTokens) => {
+      const tokenIndexes = range(numTokens.toNumber());
+
+      return tokenIndexes;
+    });
+}
+
+export function fetchTokenInfo (api, tokenregInstace, tokenIndex) {
+  return Promise
+    .all([
+      tokenregInstace.token.call({}, [tokenIndex]),
+      tokenregInstace.meta.call({}, [tokenIndex, 'IMG'])
+    ])
+    .then(([ tokenData, image ]) => {
+      const [ address, tag, format, name ] = tokenData;
+
+      const token = {
+        format: format.toString(),
+        index: tokenIndex,
+        image: hashToImageUrl(image),
+        id: sha3(address + tokenIndex).slice(0, 10),
+        address,
+        name,
+        tag
+      };
+
+      return token;
+    });
+}
+
+/**
+ * `updates` should be in the shape:
+ *   {
+ *     [ who ]: [ tokenId ]  // Array of tokens to updates
+ *   }
+ *
+ * Returns a Promise resolved witht the balances in the shape:
+ *   {
+ *     [ who ]: { [ tokenId ]: BigNumber } // The balances of `who`
+ *   }
+ */
+export function fetchAccountsBalances (api, tokens, updates) {
+  const addresses = Object.keys(updates);
+  const promises = addresses
+    .map((who) => {
+      const tokensIds = updates[who];
+      const tokensToUpdate = tokensIds.map((tokenId) => tokens.find((t) => t.id === tokenId));
+
+      return fetchAccountBalances(api, tokensToUpdate, who);
+    });
+
+  return Promise.all(promises)
+    .then((results) => {
+      return results.reduce((balances, accountBalances, index) => {
+        balances[addresses[index]] = accountBalances;
+        return balances;
+      }, {});
+    });
+}
+
+/**
+ * Returns a Promise resolved with the balances in the shape:
+ *   {
+ *     [ tokenId ]: BigNumber  // Token balance value
+ *   }
+ */
+export function fetchAccountBalances (api, tokens, who) {
+  const calldata = '0x' + BALANCEOF_SIGNATURE.slice(2, 10) + ADDRESS_PADDING + who.slice(2);
+  const promises = tokens.map((token) => fetchTokenBalance(api, token, { who, calldata }));
+
+  return Promise.all(promises)
+    .then((results) => {
+      return results.reduce((balances, value, index) => {
+        const token = tokens[index];
+
+        balances[token.id] = value;
+        return balances;
+      }, {});
+    });
+}
+
+export function fetchTokenBalance (api, token, { who, calldata }) {
+  if (token.native) {
+    return api.eth.getBalance(who);
+  }
+
+  return api.eth
+    .call({ data: calldata, to: token.address })
+    .then((result) => {
+      const cleanResult = result.replace(/^0x/, '');
+
+      return new BigNumber(`0x${cleanResult || 0}`);
+    });
+}
diff --git a/js/src/views/Account/Header/header.js b/js/src/views/Account/Header/header.js
index d3c4a9c69..f02d5bd3a 100644
--- a/js/src/views/Account/Header/header.js
+++ b/js/src/views/Account/Header/header.js
@@ -22,9 +22,12 @@ import { Balance, Certifications, Container, CopyToClipboard, ContainerTitle, Id
 import styles from './header.css';
 
 export default class Header extends Component {
+  static contextTypes = {
+    api: PropTypes.object.isRequired
+  };
+
   static propTypes = {
     account: PropTypes.object,
-    balance: PropTypes.object,
     children: PropTypes.node,
     className: PropTypes.string,
     disabled: PropTypes.bool,
@@ -39,8 +42,49 @@ export default class Header extends Component {
     isContract: false
   };
 
+  state = {
+    txCount: null
+  };
+
+  txCountSubId = null;
+
+  componentWillMount () {
+    if (this.props.account && !this.props.isContract) {
+      this.subscribeTxCount();
+    }
+  }
+
+  componentWillUnmount () {
+    this.unsubscribeTxCount();
+  }
+
+  subscribeTxCount () {
+    const { api } = this.context;
+
+    api
+      .subscribe('eth_blockNumber', (error) => {
+        if (error) {
+          return console.error(error);
+        }
+
+        api.eth.getTransactionCount(this.props.account.address)
+          .then((txCount) => this.setState({ txCount }));
+      })
+      .then((subscriptionId) => {
+        this.txCountSubId = subscriptionId;
+      });
+  }
+
+  unsubscribeTxCount () {
+    if (!this.txCountSubId) {
+      return;
+    }
+
+    this.context.api.unsubscribe(this.txCountSubId);
+  }
+
   render () {
-    const { account, balance, children, className, disabled, hideName } = this.props;
+    const { account, children, className, disabled, hideName } = this.props;
 
     if (!account) {
       return null;
@@ -76,8 +120,7 @@ export default class Header extends Component {
             { this.renderTxCount() }
             <div className={ styles.balances }>
               <Balance
-                account={ account }
-                balance={ balance }
+                address={ address }
               />
               <Certifications address={ address } />
               { this.renderVault() }
@@ -115,15 +158,10 @@ export default class Header extends Component {
   }
 
   renderTxCount () {
-    const { balance, isContract } = this.props;
+    const { isContract } = this.props;
+    const { txCount } = this.state;
 
-    if (!balance || isContract) {
-      return null;
-    }
-
-    const { txCount } = balance;
-
-    if (!txCount) {
+    if (!txCount || isContract) {
       return null;
     }
 
diff --git a/js/src/views/Account/Header/header.spec.js b/js/src/views/Account/Header/header.spec.js
index 4f56044f0..48c0b1a99 100644
--- a/js/src/views/Account/Header/header.spec.js
+++ b/js/src/views/Account/Header/header.spec.js
@@ -18,6 +18,8 @@ import BigNumber from 'bignumber.js';
 import { shallow } from 'enzyme';
 import React from 'react';
 
+import { ETH_TOKEN } from '~/util/tokens';
+
 import Header from './';
 
 const ACCOUNT = {
@@ -28,17 +30,44 @@ const ACCOUNT = {
   },
   uuid: '0xabcdef'
 };
+const subscriptions = {};
 
 let component;
 let instance;
 
+const api = {
+  subscribe: (method, callback) => {
+    subscriptions[method] = (subscriptions[method] || []).concat(callback);
+    return Promise.resolve(0);
+  },
+  eth: {
+    getTransactionCount: () => Promise.resolve(new BigNumber(1))
+  }
+};
+
+function reduxStore () {
+  const getState = () => ({
+    balances: {},
+    tokens: {
+      [ETH_TOKEN.id]: ETH_TOKEN
+    }
+  });
+
+  return {
+    getState,
+    dispatch: () => null,
+    subscribe: () => null
+  };
+}
+
 function render (props = {}) {
   if (props && !props.account) {
     props.account = ACCOUNT;
   }
 
   component = shallow(
-    <Header { ...props } />
+    <Header { ...props } />,
+    { context: { api } }
   );
   instance = component.instance();
 
@@ -72,8 +101,9 @@ describe('views/Account/Header', () => {
         let balance;
 
         beforeEach(() => {
-          render({ balance: { balance: 'testing' } });
-          balance = component.find('Balance');
+          render();
+          balance = component.find('Connect(Balance)')
+            .shallow({ context: { store: reduxStore() } });
         });
 
         it('renders', () => {
@@ -81,11 +111,7 @@ describe('views/Account/Header', () => {
         });
 
         it('passes the account', () => {
-          expect(balance.props().account).to.deep.equal(ACCOUNT);
-        });
-
-        it('passes the balance', () => {
-
+          expect(balance.props().address).to.deep.equal(ACCOUNT.address);
         });
       });
 
@@ -177,24 +203,33 @@ describe('views/Account/Header', () => {
   });
 
   describe('renderTxCount', () => {
-    it('renders null when contract', () => {
-      render({ balance: { txCount: new BigNumber(1) }, isContract: true });
-      expect(instance.renderTxCount()).to.be.null;
-    });
-
-    it('renders null when no balance', () => {
-      render({ balance: null, isContract: false });
-      expect(instance.renderTxCount()).to.be.null;
-    });
-
     it('renders null when txCount is null', () => {
-      render({ balance: { txCount: null }, isContract: false });
+      render();
       expect(instance.renderTxCount()).to.be.null;
     });
 
+    it('renders null when contract', () => {
+      render({ isContract: true });
+
+      subscriptions['eth_blockNumber'].forEach((callback) => {
+        callback();
+
+        setTimeout(() => {
+          expect(instance.renderTxCount()).to.be.null;
+        });
+      });
+    });
+
     it('renders the tx count', () => {
-      render({ balance: { txCount: new BigNumber(1) }, isContract: false });
-      expect(instance.renderTxCount()).not.to.be.null;
+      render();
+
+      subscriptions['eth_blockNumber'].forEach((callback) => {
+        callback();
+
+        setTimeout(() => {
+          expect(instance.renderTxCount()).not.to.be.null;
+        });
+      });
     });
   });
 
diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js
index 98f02afe3..6f38cdf72 100644
--- a/js/src/views/Account/account.js
+++ b/js/src/views/Account/account.js
@@ -46,8 +46,7 @@ class Account extends Component {
     fetchCertifications: PropTypes.func.isRequired,
     setVisibleAccounts: PropTypes.func.isRequired,
 
-    accounts: PropTypes.object,
-    balances: PropTypes.object,
+    account: PropTypes.object,
     certifications: PropTypes.object,
     netVersion: PropTypes.string.isRequired,
     params: PropTypes.object
@@ -83,12 +82,9 @@ class Account extends Component {
   }
 
   render () {
-    const { accounts, balances } = this.props;
+    const { account } = this.props;
     const { address } = this.props.params;
 
-    const account = (accounts || {})[address];
-    const balance = (balances || {})[address];
-
     if (!account) {
       return null;
     }
@@ -102,17 +98,15 @@ class Account extends Component {
         { this.renderFaucetDialog() }
         { this.renderFundDialog() }
         { this.renderPasswordDialog(account) }
-        { this.renderTransferDialog(account, balance) }
+        { this.renderTransferDialog(account) }
         { this.renderVerificationDialog() }
-        { this.renderActionbar(account, balance) }
+        { this.renderActionbar(account) }
         <Page padded>
           <Header
             account={ account }
-            balance={ balance }
             disabled={ !isAvailable }
           />
           <Transactions
-            accounts={ accounts }
             address={ address }
           />
         </Page>
@@ -143,16 +137,14 @@ class Account extends Component {
     return certifications.length !== 0;
   }
 
-  renderActionbar (account, balance) {
+  renderActionbar (account) {
     const { certifications, netVersion } = this.props;
     const { address } = this.props.params;
-    const showTransferButton = !!(balance && balance.tokens);
     const isVerifiable = this.isMainnet(netVersion);
     const isFaucettable = this.isFaucettable(netVersion, certifications, address);
 
     const buttons = [
       <Button
-        disabled={ !showTransferButton }
         icon={ <SendIcon /> }
         key='transferFunds'
         label={
@@ -374,18 +366,14 @@ class Account extends Component {
     );
   }
 
-  renderTransferDialog (account, balance) {
+  renderTransferDialog (account) {
     if (!this.store.isTransferVisible) {
       return null;
     }
 
-    const { balances } = this.props;
-
     return (
       <Transfer
         account={ account }
-        balance={ balance }
-        balances={ balances }
         onClose={ this.store.toggleTransferDialog }
       />
     );
@@ -407,15 +395,17 @@ class Account extends Component {
   }
 }
 
-function mapStateToProps (state) {
+function mapStateToProps (state, props) {
+  const { address } = props.params;
+
   const { accounts } = state.personal;
-  const { balances } = state.balances;
   const certifications = state.certifications;
   const { netVersion } = state.nodeStatus;
 
+  const account = (accounts || {})[address];
+
   return {
-    accounts,
-    balances,
+    account,
     certifications,
     netVersion
   };
diff --git a/js/src/views/Accounts/List/list.js b/js/src/views/Accounts/List/list.js
index edd90db7b..2fa3be70b 100644
--- a/js/src/views/Accounts/List/list.js
+++ b/js/src/views/Accounts/List/list.js
@@ -14,21 +14,23 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import { pick } from 'lodash';
 import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
 import { Container, SectionList } from '~/ui';
 import { fetchCertifiers, fetchCertifications } from '~/redux/providers/certifications/actions';
+import { ETH_TOKEN } from '~/util/tokens';
 
 import Summary from '../Summary';
 import styles from './list.css';
 
 class List extends Component {
   static propTypes = {
-    accounts: PropTypes.object,
-    balances: PropTypes.object,
+    balances: PropTypes.object.isRequired,
     certifications: PropTypes.object.isRequired,
+    accounts: PropTypes.object,
     disabled: PropTypes.object,
     empty: PropTypes.bool,
     link: PropTypes.string,
@@ -51,7 +53,7 @@ class List extends Component {
   }
 
   render () {
-    const { accounts, balances, disabled, empty } = this.props;
+    const { accounts, disabled, empty } = this.props;
 
     if (empty) {
       return (
@@ -67,13 +69,11 @@ class List extends Component {
       .getAddresses()
       .map((address) => {
         const account = accounts[address] || {};
-        const balance = balances[address] || {};
         const isDisabled = disabled ? disabled[address] : false;
         const owners = account.owners || null;
 
         return {
           account,
-          balance,
           isDisabled,
           owners
         };
@@ -88,13 +88,12 @@ class List extends Component {
   }
 
   renderSummary = (item) => {
-    const { account, balance, isDisabled, owners } = item;
+    const { account, isDisabled, owners } = item;
     const { handleAddSearchToken, link } = this.props;
 
     return (
       <Summary
         account={ account }
-        balance={ balance }
         disabled={ isDisabled }
         handleAddSearchToken={ handleAddSearchToken }
         link={ link }
@@ -160,8 +159,8 @@ class List extends Component {
         return 1;
       }
 
-      const ethA = balanceA.tokens.find(token => token.token.tag.toLowerCase() === 'eth');
-      const ethB = balanceB.tokens.find(token => token.token.tag.toLowerCase() === 'eth');
+      const ethA = balanceA[ETH_TOKEN.id];
+      const ethB = balanceB[ETH_TOKEN.id];
 
       if (!ethA && !ethB) {
         return 0;
@@ -171,7 +170,7 @@ class List extends Component {
         return 1;
       }
 
-      return -1 * ethA.value.comparedTo(ethB.value);
+      return -1 * ethA.comparedTo(ethB);
     }
 
     if (key === 'tags') {
@@ -257,10 +256,12 @@ class List extends Component {
   }
 }
 
-function mapStateToProps (state) {
+function mapStateToProps (state, props) {
+  const addresses = Object.keys(props.accounts);
+  const balances = pick(state.balances, addresses);
   const { certifications } = state;
 
-  return { certifications };
+  return { balances, certifications };
 }
 
 function mapDispatchToProps (dispatch) {
diff --git a/js/src/views/Accounts/Summary/summary.js b/js/src/views/Accounts/Summary/summary.js
index 601f9d8c2..ded53ab7c 100644
--- a/js/src/views/Accounts/Summary/summary.js
+++ b/js/src/views/Accounts/Summary/summary.js
@@ -36,7 +36,6 @@ class Summary extends Component {
   static propTypes = {
     account: PropTypes.object.isRequired,
     accountsInfo: PropTypes.object.isRequired,
-    balance: PropTypes.object,
     disabled: PropTypes.bool,
     link: PropTypes.string,
     name: PropTypes.string,
@@ -74,20 +73,6 @@ class Summary extends Component {
       return true;
     }
 
-    const prevTokens = this.props.balance.tokens || [];
-    const nextTokens = nextProps.balance.tokens || [];
-
-    if (prevTokens.length !== nextTokens.length) {
-      return true;
-    }
-
-    const prevValues = prevTokens.map((t) => ({ value: t.value.toNumber(), image: t.token.image }));
-    const nextValues = nextTokens.map((t) => ({ value: t.value.toNumber(), image: t.token.image }));
-
-    if (!isEqual(prevValues, nextValues)) {
-      return true;
-    }
-
     const prevOwners = this.props.owners;
     const nextOwners = nextProps.owners;
 
@@ -249,15 +234,11 @@ class Summary extends Component {
   }
 
   renderBalance (onlyEth) {
-    const { balance } = this.props;
-
-    if (!balance) {
-      return null;
-    }
+    const { account } = this.props;
 
     return (
       <Balance
-        balance={ balance }
+        address={ account.address }
         className={
           onlyEth
             ? styles.ethBalances
diff --git a/js/src/views/Accounts/accounts.js b/js/src/views/Accounts/accounts.js
index 668db1e47..40bd31bf5 100644
--- a/js/src/views/Accounts/accounts.js
+++ b/js/src/views/Accounts/accounts.js
@@ -41,7 +41,6 @@ class Accounts extends Component {
   static propTypes = {
     accounts: PropTypes.object.isRequired,
     accountsInfo: PropTypes.object.isRequired,
-    balances: PropTypes.object,
     hasAccounts: PropTypes.bool.isRequired,
     setVisibleAccounts: PropTypes.func.isRequired
   }
@@ -133,7 +132,7 @@ class Accounts extends Component {
   }
 
   renderAccounts () {
-    const { accounts, balances } = this.props;
+    const { accounts } = this.props;
     const _accounts = pickBy(accounts, (account) => account.uuid);
     const _hasAccounts = Object.keys(_accounts).length > 0;
 
@@ -147,7 +146,6 @@ class Accounts extends Component {
       <List
         search={ searchValues }
         accounts={ _accounts }
-        balances={ balances }
         empty={ !_hasAccounts }
         order={ sortOrder }
         handleAddSearchToken={ this.onAddSearchToken }
@@ -156,7 +154,7 @@ class Accounts extends Component {
   }
 
   renderWallets () {
-    const { accounts, balances } = this.props;
+    const { accounts } = this.props;
     const wallets = pickBy(accounts, (account) => account.wallet);
     const hasWallets = Object.keys(wallets).length > 0;
 
@@ -175,7 +173,6 @@ class Accounts extends Component {
         link='wallet'
         search={ searchValues }
         accounts={ wallets }
-        balances={ balances }
         order={ sortOrder }
         handleAddSearchToken={ this.onAddSearchToken }
       />
@@ -183,7 +180,7 @@ class Accounts extends Component {
   }
 
   renderExternalAccounts () {
-    const { accounts, balances } = this.props;
+    const { accounts } = this.props;
     const { wallets } = this.hwstore;
     const hardware = pickBy(accounts, (account) => account.hardware);
     const external = pickBy(accounts, (account) => account.external);
@@ -210,7 +207,6 @@ class Accounts extends Component {
       <List
         search={ searchValues }
         accounts={ all }
-        balances={ balances }
         disabled={ disabled }
         order={ sortOrder }
         handleAddSearchToken={ this.onAddSearchToken }
@@ -408,12 +404,10 @@ class Accounts extends Component {
 
 function mapStateToProps (state) {
   const { accounts, accountsInfo, hasAccounts } = state.personal;
-  const { balances } = state.balances;
 
   return {
     accounts,
     accountsInfo,
-    balances,
     hasAccounts
   };
 }
diff --git a/js/src/views/Address/address.js b/js/src/views/Address/address.js
index eb0a9bc4b..a8c1dc2d4 100644
--- a/js/src/views/Address/address.js
+++ b/js/src/views/Address/address.js
@@ -38,7 +38,6 @@ class Address extends Component {
     setVisibleAccounts: PropTypes.func.isRequired,
 
     contacts: PropTypes.object,
-    balances: PropTypes.object,
     params: PropTypes.object
   };
 
@@ -73,7 +72,7 @@ class Address extends Component {
   }
 
   render () {
-    const { contacts, balances } = this.props;
+    const { contacts } = this.props;
     const { address } = this.props.params;
 
     if (Object.keys(contacts).length === 0) {
@@ -81,7 +80,6 @@ class Address extends Component {
     }
 
     const contact = (contacts || {})[address];
-    const balance = (balances || {})[address];
 
     return (
       <div>
@@ -92,7 +90,6 @@ class Address extends Component {
         <Page padded>
           <Header
             account={ contact || { address, meta: {} } }
-            balance={ balance }
             hideName={ !contact }
           />
           <Transactions
@@ -240,11 +237,9 @@ class Address extends Component {
 
 function mapStateToProps (state) {
   const { contacts } = state.personal;
-  const { balances } = state.balances;
 
   return {
-    contacts,
-    balances
+    contacts
   };
 }
 
diff --git a/js/src/views/Addresses/addresses.js b/js/src/views/Addresses/addresses.js
index f61bcb3bb..c02a760f1 100644
--- a/js/src/views/Addresses/addresses.js
+++ b/js/src/views/Addresses/addresses.js
@@ -24,7 +24,7 @@ import { uniq, isEqual } from 'lodash';
 import List from '../Accounts/List';
 import Summary from '../Accounts/Summary';
 import { AddAddress } from '~/modals';
-import { Actionbar, ActionbarExport, ActionbarImport, ActionbarSearch, ActionbarSort, Button, Page, Loading } from '~/ui';
+import { Actionbar, ActionbarExport, ActionbarImport, ActionbarSearch, ActionbarSort, Button, Page } from '~/ui';
 import { setVisibleAccounts } from '~/redux/providers/personalActions';
 
 import styles from './addresses.css';
@@ -37,7 +37,6 @@ class Addresses extends Component {
   static propTypes = {
     setVisibleAccounts: PropTypes.func.isRequired,
 
-    balances: PropTypes.object,
     contacts: PropTypes.object,
     hasContacts: PropTypes.bool
   }
@@ -86,21 +85,14 @@ class Addresses extends Component {
   }
 
   renderAccountsList () {
-    const { balances, contacts, hasContacts } = this.props;
+    const { contacts, hasContacts } = this.props;
     const { searchValues, sortOrder } = this.state;
 
-    if (hasContacts && Object.keys(balances).length === 0) {
-      return (
-        <Loading />
-      );
-    }
-
     return (
       <List
         link='addresses'
         search={ searchValues }
         accounts={ contacts }
-        balances={ balances }
         empty={ !hasContacts }
         order={ sortOrder }
         handleAddSearchToken={ this.onAddSearchToken }
@@ -282,11 +274,9 @@ class Addresses extends Component {
 }
 
 function mapStateToProps (state) {
-  const { balances } = state.balances;
   const { contacts, hasContacts } = state.personal;
 
   return {
-    balances,
     contacts,
     hasContacts
   };
diff --git a/js/src/views/Contract/contract.js b/js/src/views/Contract/contract.js
index 9f75bcbe8..4af775cef 100644
--- a/js/src/views/Contract/contract.js
+++ b/js/src/views/Contract/contract.js
@@ -45,7 +45,6 @@ class Contract extends Component {
 
     accounts: PropTypes.object,
     accountsInfo: PropTypes.object,
-    balances: PropTypes.object,
     contracts: PropTypes.object,
     netVersion: PropTypes.string.isRequired,
     params: PropTypes.object
@@ -115,10 +114,9 @@ class Contract extends Component {
   }
 
   render () {
-    const { accountsInfo, balances, contracts, netVersion, params } = this.props;
+    const { accountsInfo, contracts, netVersion, params } = this.props;
     const { allEvents, contract, queryValues, loadingEvents } = this.state;
     const account = contracts[params.address];
-    const balance = balances[params.address];
 
     if (!account) {
       return null;
@@ -133,7 +131,6 @@ class Contract extends Component {
         <Page padded>
           <Header
             account={ account }
-            balance={ balance }
             isContract
           >
             { this.renderBlockNumber(account.meta) }
@@ -520,13 +517,11 @@ class Contract extends Component {
 
 function mapStateToProps (state) {
   const { accounts, accountsInfo, contracts } = state.personal;
-  const { balances } = state.balances;
   const { netVersion } = state.nodeStatus;
 
   return {
     accounts,
     accountsInfo,
-    balances,
     contracts,
     netVersion
   };
diff --git a/js/src/views/Contracts/contracts.js b/js/src/views/Contracts/contracts.js
index 33b475c5f..52ed7cdae 100644
--- a/js/src/views/Contracts/contracts.js
+++ b/js/src/views/Contracts/contracts.js
@@ -57,7 +57,6 @@ class Contracts extends Component {
   static propTypes = {
     setVisibleAccounts: PropTypes.func.isRequired,
 
-    balances: PropTypes.object,
     accounts: PropTypes.object,
     contracts: PropTypes.object,
     hasContracts: PropTypes.bool
@@ -96,7 +95,7 @@ class Contracts extends Component {
   }
 
   render () {
-    const { contracts, hasContracts, balances } = this.props;
+    const { contracts, hasContracts } = this.props;
     const { searchValues, sortOrder } = this.state;
 
     return (
@@ -109,7 +108,6 @@ class Contracts extends Component {
             link='contracts'
             search={ searchValues }
             accounts={ contracts }
-            balances={ balances }
             empty={ !hasContracts }
             order={ sortOrder }
             orderFallback='name'
@@ -267,13 +265,11 @@ class Contracts extends Component {
 
 function mapStateToProps (state) {
   const { accounts, contracts, hasContracts } = state.personal;
-  const { balances } = state.balances;
 
   return {
     accounts,
     contracts,
-    hasContracts,
-    balances
+    hasContracts
   };
 }
 
diff --git a/js/src/views/ParityBar/parityBar.js b/js/src/views/ParityBar/parityBar.js
index 9d5027acf..b8dd669d5 100644
--- a/js/src/views/ParityBar/parityBar.js
+++ b/js/src/views/ParityBar/parityBar.js
@@ -48,7 +48,6 @@ class ParityBar extends Component {
   };
 
   static propTypes = {
-    balances: PropTypes.object,
     dapp: PropTypes.bool,
     externalLink: PropTypes.string,
     pending: PropTypes.array
@@ -370,13 +369,9 @@ class ParityBar extends Component {
   }
 
   renderAccount = (account) => {
-    const { balances } = this.props;
-    const balance = balances[account.address];
-
     return (
       <AccountCard
         account={ account }
-        balance={ balance }
       />
     );
   }
@@ -700,11 +695,9 @@ class ParityBar extends Component {
 }
 
 function mapStateToProps (state) {
-  const { balances } = state.balances;
   const { pending } = state.signer;
 
   return {
-    balances,
     pending
   };
 }
diff --git a/js/src/views/Wallet/wallet.js b/js/src/views/Wallet/wallet.js
index 84d4dbe5b..e996e5fdc 100644
--- a/js/src/views/Wallet/wallet.js
+++ b/js/src/views/Wallet/wallet.js
@@ -65,7 +65,6 @@ class Wallet extends Component {
 
   static propTypes = {
     address: PropTypes.string.isRequired,
-    balance: nullableProptype(PropTypes.object.isRequired),
     netVersion: PropTypes.string.isRequired,
     owned: PropTypes.bool.isRequired,
     setVisibleAccounts: PropTypes.func.isRequired,
@@ -105,7 +104,7 @@ class Wallet extends Component {
   }
 
   render () {
-    const { walletAccount, balance, wallet } = this.props;
+    const { walletAccount, wallet } = this.props;
 
     if (!walletAccount) {
       return null;
@@ -125,7 +124,6 @@ class Wallet extends Component {
             <Header
               className={ styles.header }
               account={ walletAccount }
-              balance={ balance }
               isContract
             >
               { this.renderInfos() }
@@ -212,15 +210,13 @@ class Wallet extends Component {
   }
 
   renderActionbar () {
-    const { balance, owned } = this.props;
-    const showTransferButton = !!(balance && balance.tokens);
+    const { owned } = this.props;
 
     const buttons = [];
 
     if (owned) {
       buttons.push(
         <Button
-          disabled={ !showTransferButton }
           icon={ <SendIcon /> }
           key='transferFunds'
           label={
@@ -343,12 +339,11 @@ class Wallet extends Component {
       return null;
     }
 
-    const { walletAccount, balance } = this.props;
+    const { walletAccount } = this.props;
 
     return (
       <Transfer
         account={ walletAccount }
-        balance={ balance }
         onClose={ this.onTransferClose }
       />
     );
@@ -391,7 +386,6 @@ function mapStateToProps (_, initProps) {
   return (state) => {
     const { netVersion } = state.nodeStatus;
     const { accountsInfo = {}, accounts = {} } = state.personal;
-    const { balances } = state.balances;
     const walletAccount = accounts[address] || accountsInfo[address] || null;
 
     if (walletAccount) {
@@ -399,12 +393,10 @@ function mapStateToProps (_, initProps) {
     }
 
     const wallet = state.wallet.wallets[address] || {};
-    const balance = balances[address] || null;
     const owned = !!accounts[address];
 
     return {
       address,
-      balance,
       netVersion,
       owned,
       wallet,
diff --git a/js/src/views/WriteContract/writeContract.js b/js/src/views/WriteContract/writeContract.js
index 170c0d7c1..77e039bb4 100644
--- a/js/src/views/WriteContract/writeContract.js
+++ b/js/src/views/WriteContract/writeContract.js
@@ -446,9 +446,9 @@ class WriteContract extends Component {
     return (
       <DeployContract
         abi={ contract.interface }
+        accounts={ this.props.accounts }
         code={ `0x${contract.bytecode}` }
         source={ sourcecode }
-        accounts={ this.props.accounts }
         onClose={ this.store.handleCloseDeployModal }
         readOnly
       />

From 7d07c550ba4c02f9df268208b271eee8fc1d0ba6 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Wed, 19 Apr 2017 16:16:20 +0000
Subject: [PATCH 037/117] [ci skip] js-precompiled 20170419-161237

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f3109228a..570447e50 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1773,7 +1773,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#b4927eeaa876ff4daffda80ec85382fbd95f313c"
+source = "git+https://github.com/paritytech/js-precompiled.git#f898151b42480197517bd0b1d39904b9b79602ca"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index ac1731b91..569c78a3c 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.55",
+  "version": "1.7.56",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 0d40df937bbe700daf7709034542cbd566440b51 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Wed, 19 Apr 2017 16:24:42 +0000
Subject: [PATCH 038/117] [ci skip] js-precompiled 20170419-162101

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 570447e50..cf6d3bb6d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1773,7 +1773,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#f898151b42480197517bd0b1d39904b9b79602ca"
+source = "git+https://github.com/paritytech/js-precompiled.git#bceb0caa1eae7d78ad3386338a76b7ca92bf033a"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 569c78a3c..07314f84d 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.56",
+  "version": "1.7.57",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 97052f391288bf96a70e462bed01fef4ac0b636a Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Wed, 19 Apr 2017 19:10:12 +0200
Subject: [PATCH 039/117] null_sign with network id

---
 ethcore/src/types/transaction.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ethcore/src/types/transaction.rs b/ethcore/src/types/transaction.rs
index f9e9f2c47..2c35400a8 100644
--- a/ethcore/src/types/transaction.rs
+++ b/ethcore/src/types/transaction.rs
@@ -127,7 +127,7 @@ impl From<ethjson::state::Transaction> for SignedTransaction {
 		};
 		match secret {
 			Some(s) => tx.sign(&s, None),
-			None => tx.null_sign(),
+			None => tx.null_sign(1),
 		}
 	}
 }
@@ -210,13 +210,13 @@ impl Transaction {
 	}
 
 	/// Add EIP-86 compatible empty signature.
-	pub fn null_sign(self) -> SignedTransaction {
+	pub fn null_sign(self, network_id: u64) -> SignedTransaction {
 		SignedTransaction {
 			transaction: UnverifiedTransaction {
 				unsigned: self,
 				r: U256::zero(),
 				s: U256::zero(),
-				v: 0,
+				v: network_id,
 				hash: 0.into(),
 			}.compute_hash(),
 			sender: UNSIGNED_SENDER,

From 2ec3397b7ddc1aa6690cc02dd2a7210204132283 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Wed, 19 Apr 2017 20:31:53 +0200
Subject: [PATCH 040/117] snapshot chunk and restore traits

---
 ethcore/src/client/client.rs                  |   2 +-
 ethcore/src/engines/mod.rs                    |   7 +
 ethcore/src/engines/null_engine.rs            |   4 +
 ethcore/src/ethereum/ethash.rs                |   4 +
 ethcore/src/snapshot/consensus/mod.rs         | 349 ++++++++++++++++++
 ethcore/src/snapshot/error.rs                 |   3 +
 ethcore/src/snapshot/mod.rs                   | 318 +++-------------
 ethcore/src/snapshot/service.rs               |  36 +-
 .../src/snapshot/snapshot_service_trait.rs    |   4 -
 ethcore/src/snapshot/tests/blocks.rs          |  36 +-
 rpc/src/v1/tests/helpers/snapshot_service.rs  |   3 +-
 sync/src/tests/snapshot.rs                    |   7 -
 12 files changed, 446 insertions(+), 327 deletions(-)
 create mode 100644 ethcore/src/snapshot/consensus/mod.rs

diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 88fd181bb..e63b97dfb 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -894,7 +894,7 @@ impl Client {
 			},
 		};
 
-		snapshot::take_snapshot(&self.chain.read(), start_hash, db.as_hashdb(), writer, p)?;
+		snapshot::take_snapshot(&*self.engine, &self.chain.read(), start_hash, db.as_hashdb(), writer, p)?;
 
 		Ok(())
 	}
diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
index badac3cf2..ad573637c 100644
--- a/ethcore/src/engines/mod.rs
+++ b/ethcore/src/engines/mod.rs
@@ -45,6 +45,7 @@ use error::{Error, TransactionError};
 use evm::Schedule;
 use header::Header;
 use spec::CommonParams;
+use snapshot::SnapshotComponents;
 use transaction::{UnverifiedTransaction, SignedTransaction};
 use receipt::Receipt;
 
@@ -294,4 +295,10 @@ pub trait Engine : Sync + Send {
 
 	/// Stops any services that the may hold the Engine and makes it safe to drop.
 	fn stop(&self) {}
+
+	/// Create a factory for building snapshot chunks and restoring from them.
+	/// Returning `None` indicates that this engine doesn't support snapshot creation.
+	fn snapshot_components(&self) -> Option<Box<SnapshotComponents>> {
+		None
+	}
 }
diff --git a/ethcore/src/engines/null_engine.rs b/ethcore/src/engines/null_engine.rs
index 0611fc08e..9b9fb9469 100644
--- a/ethcore/src/engines/null_engine.rs
+++ b/ethcore/src/engines/null_engine.rs
@@ -60,4 +60,8 @@ impl Engine for NullEngine {
 	fn schedule(&self, _env_info: &EnvInfo) -> Schedule {
 		Schedule::new_homestead()
 	}
+
+	fn snapshot_components(&self) -> Option<Box<::snapshot::SnapshotComponents>> {
+		Some(Box::new(::snapshot::PowSnapshot))
+	}
 }
diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs
index 548d0dbaa..0acea6f50 100644
--- a/ethcore/src/ethereum/ethash.rs
+++ b/ethcore/src/ethereum/ethash.rs
@@ -405,6 +405,10 @@ impl Engine for Arc<Ethash> {
 	fn epoch_verifier(&self, _header: &Header, _proof: &[u8]) -> Result<Box<::engines::EpochVerifier>, Error> {
 		Ok(Box::new(self.clone()))
 	}
+
+	fn snapshot_components(&self) -> Option<Box<::snapshot::SnapshotComponents>> {
+		Some(Box::new(::snapshot::PowSnapshot))
+	}
 }
 
 // Try to round gas_limit a bit so that:
diff --git a/ethcore/src/snapshot/consensus/mod.rs b/ethcore/src/snapshot/consensus/mod.rs
new file mode 100644
index 000000000..2e6b6b736
--- /dev/null
+++ b/ethcore/src/snapshot/consensus/mod.rs
@@ -0,0 +1,349 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Secondary chunk creation and restoration, implementations for different consensus
+//! engines.
+
+use std::collections::VecDeque;
+use std::io;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
+
+use blockchain::{BlockChain, BlockProvider};
+use engines::Engine;
+use snapshot::{Error, ManifestData};
+use snapshot::block::AbridgedBlock;
+
+use util::{Bytes, H256};
+use util::kvdb::KeyValueDB;
+use rand::OsRng;
+use rlp::{RlpStream, UntrustedRlp};
+
+
+/// A sink for produced chunks.
+pub type ChunkSink<'a> = FnMut(&[u8]) -> io::Result<()> + 'a;
+
+// How many blocks to include in a snapshot, starting from the head of the chain.
+const SNAPSHOT_BLOCKS: u64 = 30000;
+
+/// Components necessary for snapshot creation and restoration.
+pub trait SnapshotComponents: Send {
+	/// Create secondary snapshot chunks; these corroborate the state data
+	/// in the state chunks.
+	///
+	/// Chunks shouldn't exceed the given preferred size, and should be fed
+	/// uncompressed into the sink.
+	///
+	/// This will vary by consensus engine, so it's exposed as a trait.
+	fn chunk_all(
+		&mut self,
+		chain: &BlockChain,
+		block_at: H256,
+		chunk_sink: &mut ChunkSink,
+		preferred_size: usize,
+	) -> Result<(), Error>;
+
+	/// Create a rebuilder, which will have chunks fed into it in aribtrary
+	/// order and then be finalized.
+	///
+	/// The manifest, a database, and fresh `BlockChain` are supplied.
+	// TODO: supply anything for state?
+	fn rebuilder(
+		&self,
+		chain: BlockChain,
+		db: Arc<KeyValueDB>,
+		manifest: &ManifestData,
+	) -> Result<Box<Rebuilder>, ::error::Error>;
+}
+
+
+/// Restore from secondary snapshot chunks.
+pub trait Rebuilder: Send {
+	/// Feed a chunk, potentially out of order.
+	///
+	/// Check `abort_flag` periodically while doing heavy work. If set to `false`, should bail with
+	/// `Error::RestorationAborted`.
+	fn feed(
+		&mut self,
+		chunk: &[u8],
+		engine: &Engine,
+		abort_flag: &AtomicBool,
+	) -> Result<(), ::error::Error>;
+
+	/// Finalize the restoration. Will be done after all chunks have been
+	/// fed successfully.
+	/// This will apply the necessary "glue" between chunks.
+	fn finalize(&mut self) -> Result<(), Error>;
+}
+
+/// Snapshot creation and restoration for PoW chains.
+/// This includes blocks from the head of the chain as a
+/// loose assurance that the chain is valid.
+pub struct PowSnapshot;
+
+impl SnapshotComponents for PowSnapshot {
+	fn chunk_all(
+		&mut self,
+		chain: &BlockChain,
+		block_at: H256,
+		chunk_sink: &mut ChunkSink,
+		preferred_size: usize,
+	) -> Result<(), Error> {
+		PowWorker {
+			chain: chain,
+			rlps: VecDeque::new(),
+			current_hash: block_at,
+			writer: chunk_sink,
+			preferred_size: preferred_size,
+		}.chunk_all()
+	}
+
+	fn rebuilder(
+		&self,
+		chain: BlockChain,
+		db: Arc<KeyValueDB>,
+		manifest: &ManifestData,
+	) -> Result<Box<Rebuilder>, ::error::Error> {
+		PowRebuilder::new(chain, db, manifest).map(|r| Box::new(r) as Box<_>)
+	}
+}
+
+/// Used to build block chunks.
+struct PowWorker<'a> {
+	chain: &'a BlockChain,
+	// block, receipt rlp pairs.
+	rlps: VecDeque<Bytes>,
+	current_hash: H256,
+	writer: &'a mut ChunkSink<'a>,
+	preferred_size: usize,
+}
+
+impl<'a> PowWorker<'a> {
+	// Repeatedly fill the buffers and writes out chunks, moving backwards from starting block hash.
+	// Loops until we reach the first desired block, and writes out the remainder.
+	fn chunk_all(&mut self) -> Result<(), Error> {
+		let mut loaded_size = 0;
+		let mut last = self.current_hash;
+
+		let genesis_hash = self.chain.genesis_hash();
+
+		for _ in 0..SNAPSHOT_BLOCKS {
+			if self.current_hash == genesis_hash { break }
+
+			let (block, receipts) = self.chain.block(&self.current_hash)
+				.and_then(|b| self.chain.block_receipts(&self.current_hash).map(|r| (b, r)))
+				.ok_or(Error::BlockNotFound(self.current_hash))?;
+
+			let abridged_rlp = AbridgedBlock::from_block_view(&block.view()).into_inner();
+
+			let pair = {
+				let mut pair_stream = RlpStream::new_list(2);
+				pair_stream.append_raw(&abridged_rlp, 1).append(&receipts);
+				pair_stream.out()
+			};
+
+			let new_loaded_size = loaded_size + pair.len();
+
+			// cut off the chunk if too large.
+
+			if new_loaded_size > self.preferred_size && !self.rlps.is_empty() {
+				self.write_chunk(last)?;
+				loaded_size = pair.len();
+			} else {
+				loaded_size = new_loaded_size;
+			}
+
+			self.rlps.push_front(pair);
+
+			last = self.current_hash;
+			self.current_hash = block.header_view().parent_hash();
+		}
+
+		if loaded_size != 0 {
+			self.write_chunk(last)?;
+		}
+
+		Ok(())
+	}
+
+	// write out the data in the buffers to a chunk on disk
+	//
+	// we preface each chunk with the parent of the first block's details,
+	// obtained from the details of the last block written.
+	fn write_chunk(&mut self, last: H256) -> Result<(), Error> {
+		trace!(target: "snapshot", "prepared block chunk with {} blocks", self.rlps.len());
+
+		let (last_header, last_details) = self.chain.block_header(&last)
+			.and_then(|n| self.chain.block_details(&last).map(|d| (n, d)))
+			.ok_or(Error::BlockNotFound(last))?;
+
+		let parent_number = last_header.number() - 1;
+		let parent_hash = last_header.parent_hash();
+		let parent_total_difficulty = last_details.total_difficulty - *last_header.difficulty();
+
+		trace!(target: "snapshot", "parent last written block: {}", parent_hash);
+
+		let num_entries = self.rlps.len();
+		let mut rlp_stream = RlpStream::new_list(3 + num_entries);
+		rlp_stream.append(&parent_number).append(parent_hash).append(&parent_total_difficulty);
+
+		for pair in self.rlps.drain(..) {
+			rlp_stream.append_raw(&pair, 1);
+		}
+
+		let raw_data = rlp_stream.out();
+
+		(self.writer)(&raw_data)?;
+
+		Ok(())
+	}
+}
+
+/// Rebuilder for proof-of-work chains.
+/// Does basic verification for all blocks, but `PoW` verification for some.
+/// Blocks must be fed in-order.
+///
+/// The first block in every chunk is disconnected from the last block in the
+/// chunk before it, as chunks may be submitted out-of-order.
+///
+/// After all chunks have been submitted, we "glue" the chunks together.
+pub struct PowRebuilder {
+	chain: BlockChain,
+	db: Arc<KeyValueDB>,
+	rng: OsRng,
+	disconnected: Vec<(u64, H256)>,
+	best_number: u64,
+	best_hash: H256,
+	best_root: H256,
+	fed_blocks: u64,
+}
+
+impl PowRebuilder {
+	/// Create a new PowRebuilder.
+	fn new(chain: BlockChain, db: Arc<KeyValueDB>, manifest: &ManifestData) -> Result<Self, ::error::Error> {
+		Ok(PowRebuilder {
+			chain: chain,
+			db: db,
+			rng: OsRng::new()?,
+			disconnected: Vec::new(),
+			best_number: manifest.block_number,
+			best_hash: manifest.block_hash,
+			best_root: manifest.state_root,
+			fed_blocks: 0,
+		})
+	}
+}
+
+impl Rebuilder for PowRebuilder {
+	/// Feed the rebuilder an uncompressed block chunk.
+	/// Returns the number of blocks fed or any errors.
+	fn feed(&mut self, chunk: &[u8], engine: &Engine, abort_flag: &AtomicBool) -> Result<(), ::error::Error> {
+		use basic_types::Seal::With;
+		use views::BlockView;
+		use snapshot::verify_old_block;
+		use util::U256;
+		use util::triehash::ordered_trie_root;
+
+		let rlp = UntrustedRlp::new(chunk);
+		let item_count = rlp.item_count()?;
+		let num_blocks = (item_count - 3) as u64;
+
+		trace!(target: "snapshot", "restoring block chunk with {} blocks.", item_count - 3);
+
+		if self.fed_blocks + num_blocks > SNAPSHOT_BLOCKS {
+			return Err(Error::TooManyBlocks(SNAPSHOT_BLOCKS, self.fed_blocks).into())
+		}
+
+		// todo: assert here that these values are consistent with chunks being in order.
+		let mut cur_number = rlp.val_at::<u64>(0)? + 1;
+		let mut parent_hash = rlp.val_at::<H256>(1)?;
+		let parent_total_difficulty = rlp.val_at::<U256>(2)?;
+
+		for idx in 3..item_count {
+			if !abort_flag.load(Ordering::SeqCst) { return Err(Error::RestorationAborted.into()) }
+
+			let pair = rlp.at(idx)?;
+			let abridged_rlp = pair.at(0)?.as_raw().to_owned();
+			let abridged_block = AbridgedBlock::from_raw(abridged_rlp);
+			let receipts: Vec<::receipt::Receipt> = pair.list_at(1)?;
+			let receipts_root = ordered_trie_root(
+				pair.at(1)?.iter().map(|r| r.as_raw().to_owned())
+			);
+
+			let block = abridged_block.to_block(parent_hash, cur_number, receipts_root)?;
+			let block_bytes = block.rlp_bytes(With);
+			let is_best = cur_number == self.best_number;
+
+			if is_best {
+				if block.header.hash() != self.best_hash {
+					return Err(Error::WrongBlockHash(cur_number, self.best_hash, block.header.hash()).into())
+				}
+
+				if block.header.state_root() != &self.best_root {
+					return Err(Error::WrongStateRoot(self.best_root, *block.header.state_root()).into())
+				}
+			}
+
+			verify_old_block(
+				&mut self.rng,
+				&block.header,
+				engine,
+				&self.chain,
+				Some(&block_bytes),
+				is_best
+			)?;
+
+			let mut batch = self.db.transaction();
+
+			// special-case the first block in each chunk.
+			if idx == 3 {
+				if self.chain.insert_unordered_block(&mut batch, &block_bytes, receipts, Some(parent_total_difficulty), is_best, false) {
+					self.disconnected.push((cur_number, block.header.hash()));
+				}
+			} else {
+				self.chain.insert_unordered_block(&mut batch, &block_bytes, receipts, None, is_best, false);
+			}
+			self.db.write_buffered(batch);
+			self.chain.commit();
+
+			parent_hash = BlockView::new(&block_bytes).hash();
+			cur_number += 1;
+		}
+
+		self.fed_blocks += num_blocks;
+
+		Ok(())
+	}
+
+	/// Glue together any disconnected chunks and check that the chain is complete.
+	fn finalize(&mut self) -> Result<(), Error> {
+		let mut batch = self.db.transaction();
+
+		for (first_num, first_hash) in self.disconnected.drain(..) {
+			let parent_num = first_num - 1;
+
+			// check if the parent is even in the chain.
+			// since we don't restore every single block in the chain,
+			// the first block of the first chunks has nothing to connect to.
+			if let Some(parent_hash) = self.chain.block_hash(parent_num) {
+				// if so, add the child to it.
+				self.chain.add_child(&mut batch, parent_hash, first_hash);
+			}
+		}
+		self.db.write_buffered(batch);
+		Ok(())
+	}
+}
diff --git a/ethcore/src/snapshot/error.rs b/ethcore/src/snapshot/error.rs
index c1391b300..7a3ffdca2 100644
--- a/ethcore/src/snapshot/error.rs
+++ b/ethcore/src/snapshot/error.rs
@@ -57,6 +57,8 @@ pub enum Error {
 	VersionNotSupported(u64),
 	/// Max chunk size is to small to fit basic account data.
 	ChunkTooSmall,
+	/// Snapshots not supported by the consensus engine.
+	SnapshotsUnsupported,
 }
 
 impl fmt::Display for Error {
@@ -79,6 +81,7 @@ impl fmt::Display for Error {
 			Error::Trie(ref err) => err.fmt(f),
 			Error::VersionNotSupported(ref ver) => write!(f, "Snapshot version {} is not supprted.", ver),
 			Error::ChunkTooSmall => write!(f, "Chunk size is too small."),
+			Error::SnapshotsUnsupported => write!(f, "Snapshots unsupported by consensus engine."),
 		}
 	}
 }
diff --git a/ethcore/src/snapshot/mod.rs b/ethcore/src/snapshot/mod.rs
index 1c3b4366b..db3bebde9 100644
--- a/ethcore/src/snapshot/mod.rs
+++ b/ethcore/src/snapshot/mod.rs
@@ -17,9 +17,9 @@
 //! Snapshot creation, restoration, and network service.
 //!
 //! Documentation of the format can be found at
-//! https://github.com/paritytech/parity/wiki/%22PV64%22-Snapshot-Format
+//! https://github.com/paritytech/parity/wiki/Warp-Sync-Snapshot-Format
 
-use std::collections::{HashMap, HashSet, VecDeque};
+use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 
@@ -28,7 +28,6 @@ use blockchain::{BlockChain, BlockProvider};
 use engines::Engine;
 use header::Header;
 use ids::BlockId;
-use views::BlockView;
 
 use util::{Bytes, Hashable, HashDB, DBValue, snappy, U256, Uint};
 use util::Mutex;
@@ -40,7 +39,6 @@ use util::sha3::SHA3_NULL_RLP;
 use rlp::{RlpStream, UntrustedRlp};
 use bloom_journal::Bloom;
 
-use self::block::AbridgedBlock;
 use self::io::SnapshotWriter;
 
 use super::state_db::StateDB;
@@ -51,6 +49,7 @@ use rand::{Rng, OsRng};
 
 pub use self::error::Error;
 
+pub use self::consensus::*;
 pub use self::service::{Service, DatabaseRestore};
 pub use self::traits::SnapshotService;
 pub use self::watcher::Watcher;
@@ -63,6 +62,7 @@ pub mod service;
 
 mod account;
 mod block;
+mod consensus;
 mod error;
 mod watcher;
 
@@ -83,9 +83,6 @@ mod traits {
 // Try to have chunks be around 4MB (before compression)
 const PREFERRED_CHUNK_SIZE: usize = 4 * 1024 * 1024;
 
-// How many blocks to include in a snapshot, starting from the head of the chain.
-const SNAPSHOT_BLOCKS: u64 = 30000;
-
 /// A progress indicator for snapshots.
 #[derive(Debug, Default)]
 pub struct Progress {
@@ -122,6 +119,7 @@ impl Progress {
 }
 /// Take a snapshot using the given blockchain, starting block hash, and database, writing into the given writer.
 pub fn take_snapshot<W: SnapshotWriter + Send>(
+	engine: &Engine,
 	chain: &BlockChain,
 	block_at: H256,
 	state_db: &HashDB,
@@ -136,9 +134,11 @@ pub fn take_snapshot<W: SnapshotWriter + Send>(
 	info!("Taking snapshot starting at block {}", number);
 
 	let writer = Mutex::new(writer);
+	let chunker = engine.snapshot_components().ok_or(Error::SnapshotsUnsupported)?;
 	let (state_hashes, block_hashes) = scope(|scope| {
-		let block_guard = scope.spawn(|| chunk_blocks(chain, block_at, &writer, p));
-		let state_res = chunk_state(state_db, state_root, &writer, p);
+		let writer = &writer;
+		let block_guard = scope.spawn(move || chunk_secondary(chunker, chain, block_at, writer, p));
+		let state_res = chunk_state(state_db, state_root, writer, p);
 
 		state_res.and_then(|state_hashes| {
 			block_guard.join().map(|block_hashes| (state_hashes, block_hashes))
@@ -163,128 +163,41 @@ pub fn take_snapshot<W: SnapshotWriter + Send>(
 	Ok(())
 }
 
-/// Used to build block chunks.
-struct BlockChunker<'a> {
-	chain: &'a BlockChain,
-	// block, receipt rlp pairs.
-	rlps: VecDeque<Bytes>,
-	current_hash: H256,
-	hashes: Vec<H256>,
-	snappy_buffer: Vec<u8>,
-	writer: &'a Mutex<SnapshotWriter + 'a>,
-	progress: &'a Progress,
-}
-
-impl<'a> BlockChunker<'a> {
-	// Repeatedly fill the buffers and writes out chunks, moving backwards from starting block hash.
-	// Loops until we reach the first desired block, and writes out the remainder.
-	fn chunk_all(&mut self) -> Result<(), Error> {
-		let mut loaded_size = 0;
-		let mut last = self.current_hash;
-
-		let genesis_hash = self.chain.genesis_hash();
-
-		for _ in 0..SNAPSHOT_BLOCKS {
-			if self.current_hash == genesis_hash { break }
-
-			let (block, receipts) = self.chain.block(&self.current_hash)
-				.and_then(|b| self.chain.block_receipts(&self.current_hash).map(|r| (b, r)))
-				.ok_or(Error::BlockNotFound(self.current_hash))?;
-
-			let abridged_rlp = AbridgedBlock::from_block_view(&block.view()).into_inner();
-
-			let pair = {
-				let mut pair_stream = RlpStream::new_list(2);
-				pair_stream.append_raw(&abridged_rlp, 1).append(&receipts);
-				pair_stream.out()
-			};
-
-			let new_loaded_size = loaded_size + pair.len();
-
-			// cut off the chunk if too large.
-
-			if new_loaded_size > PREFERRED_CHUNK_SIZE && !self.rlps.is_empty() {
-				self.write_chunk(last)?;
-				loaded_size = pair.len();
-			} else {
-				loaded_size = new_loaded_size;
-			}
-
-			self.rlps.push_front(pair);
-
-			last = self.current_hash;
-			self.current_hash = block.header_view().parent_hash();
-		}
-
-		if loaded_size != 0 {
-			self.write_chunk(last)?;
-		}
-
-		Ok(())
-	}
-
-	// write out the data in the buffers to a chunk on disk
-	//
-	// we preface each chunk with the parent of the first block's details,
-	// obtained from the details of the last block written.
-	fn write_chunk(&mut self, last: H256) -> Result<(), Error> {
-		trace!(target: "snapshot", "prepared block chunk with {} blocks", self.rlps.len());
-
-		let (last_header, last_details) = self.chain.block_header(&last)
-			.and_then(|n| self.chain.block_details(&last).map(|d| (n, d)))
-			.ok_or(Error::BlockNotFound(last))?;
-
-		let parent_number = last_header.number() - 1;
-		let parent_hash = last_header.parent_hash();
-		let parent_total_difficulty = last_details.total_difficulty - *last_header.difficulty();
-
-		trace!(target: "snapshot", "parent last written block: {}", parent_hash);
-
-		let num_entries = self.rlps.len();
-		let mut rlp_stream = RlpStream::new_list(3 + num_entries);
-		rlp_stream.append(&parent_number).append(parent_hash).append(&parent_total_difficulty);
-
-		for pair in self.rlps.drain(..) {
-			rlp_stream.append_raw(&pair, 1);
-		}
-
-		let raw_data = rlp_stream.out();
-
-		let size = snappy::compress_into(&raw_data, &mut self.snappy_buffer);
-		let compressed = &self.snappy_buffer[..size];
-		let hash = compressed.sha3();
-
-		self.writer.lock().write_block_chunk(hash, compressed)?;
-		trace!(target: "snapshot", "wrote block chunk. hash: {}, size: {}, uncompressed size: {}", hash.hex(), size, raw_data.len());
-
-		self.progress.size.fetch_add(size, Ordering::SeqCst);
-		self.progress.blocks.fetch_add(num_entries, Ordering::SeqCst);
-
-		self.hashes.push(hash);
-		Ok(())
-	}
-}
-
-/// Create and write out all block chunks to disk, returning a vector of all
-/// the hashes of block chunks created.
+/// Create and write out all secondary chunks to disk, returning a vector of all
+/// the hashes of secondary chunks created.
 ///
-/// The path parameter is the directory to store the block chunks in.
-/// This function assumes the directory exists already.
+/// Secondary chunks are engine-specific, but they intend to corroborate the state data
+/// in the state chunks.
 /// Returns a list of chunk hashes, with the first having the blocks furthest from the genesis.
-pub fn chunk_blocks<'a>(chain: &'a BlockChain, start_hash: H256, writer: &Mutex<SnapshotWriter + 'a>, progress: &'a Progress) -> Result<Vec<H256>, Error> {
-	let mut chunker = BlockChunker {
-		chain: chain,
-		rlps: VecDeque::new(),
-		current_hash: start_hash,
-		hashes: Vec::new(),
-		snappy_buffer: vec![0; snappy::max_compressed_len(PREFERRED_CHUNK_SIZE)],
-		writer: writer,
-		progress: progress,
-	};
+pub fn chunk_secondary<'a>(mut chunker: Box<SnapshotComponents>, chain: &'a BlockChain, start_hash: H256, writer: &Mutex<SnapshotWriter + 'a>, progress: &'a Progress) -> Result<Vec<H256>, Error> {
+	let mut chunk_hashes = Vec::new();
+	let mut snappy_buffer = vec![0; snappy::max_compressed_len(PREFERRED_CHUNK_SIZE)];
 
-	chunker.chunk_all()?;
+	{
+		let mut chunk_sink = |raw_data: &[u8]| {
+			let compressed_size = snappy::compress_into(raw_data, &mut snappy_buffer);
+			let compressed = &snappy_buffer[..compressed_size];
+			let hash = compressed.sha3();
+			let size = compressed.len();
 
-	Ok(chunker.hashes)
+			writer.lock().write_block_chunk(hash, compressed)?;
+			trace!(target: "snapshot", "wrote secondary chunk. hash: {}, size: {}, uncompressed size: {}",
+				hash.hex(), size, raw_data.len());
+
+			progress.size.fetch_add(size, Ordering::SeqCst);
+			chunk_hashes.push(hash);
+			Ok(())
+		};
+
+		chunker.chunk_all(
+			chain,
+			start_hash,
+			&mut chunk_sink,
+			PREFERRED_CHUNK_SIZE,
+		)?;
+	}
+
+	Ok(chunk_hashes)
 }
 
 /// State trie chunker.
@@ -564,158 +477,15 @@ const POW_VERIFY_RATE: f32 = 0.02;
 /// the fullest verification possible. If not, it will take a random sample to determine whether it will
 /// do heavy or light verification.
 pub fn verify_old_block(rng: &mut OsRng, header: &Header, engine: &Engine, chain: &BlockChain, body: Option<&[u8]>, always: bool) -> Result<(), ::error::Error> {
+	engine.verify_block_basic(header, body)?;
+
 	if always || rng.gen::<f32>() <= POW_VERIFY_RATE {
+		engine.verify_block_unordered(header, body)?;
 		match chain.block_header(header.parent_hash()) {
 			Some(parent) => engine.verify_block_family(header, &parent, body),
-			None => engine.verify_block_seal(header), // TODO: fetch validation proof as necessary.
+			None => Ok(()),
 		}
 	} else {
-		engine.verify_block_basic(header, body)
-	}
-}
-
-/// Rebuilds the blockchain from chunks.
-///
-/// Does basic verification for all blocks, but `PoW` verification for some.
-/// Blocks must be fed in-order.
-///
-/// The first block in every chunk is disconnected from the last block in the
-/// chunk before it, as chunks may be submitted out-of-order.
-///
-/// After all chunks have been submitted, we "glue" the chunks together.
-pub struct BlockRebuilder {
-	chain: BlockChain,
-	db: Arc<Database>,
-	rng: OsRng,
-	disconnected: Vec<(u64, H256)>,
-	best_number: u64,
-	best_hash: H256,
-	best_root: H256,
-	fed_blocks: u64,
-}
-
-impl BlockRebuilder {
-	/// Create a new BlockRebuilder.
-	pub fn new(chain: BlockChain, db: Arc<Database>, manifest: &ManifestData) -> Result<Self, ::error::Error> {
-		Ok(BlockRebuilder {
-			chain: chain,
-			db: db,
-			rng: OsRng::new()?,
-			disconnected: Vec::new(),
-			best_number: manifest.block_number,
-			best_hash: manifest.block_hash,
-			best_root: manifest.state_root,
-			fed_blocks: 0,
-		})
-	}
-
-	/// Feed the rebuilder an uncompressed block chunk.
-	/// Returns the number of blocks fed or any errors.
-	pub fn feed(&mut self, chunk: &[u8], engine: &Engine, abort_flag: &AtomicBool) -> Result<u64, ::error::Error> {
-		use basic_types::Seal::With;
-		use util::U256;
-		use util::triehash::ordered_trie_root;
-
-		let rlp = UntrustedRlp::new(chunk);
-		let item_count = rlp.item_count()?;
-		let num_blocks = (item_count - 3) as u64;
-
-		trace!(target: "snapshot", "restoring block chunk with {} blocks.", item_count - 3);
-
-		if self.fed_blocks + num_blocks > SNAPSHOT_BLOCKS {
-			return Err(Error::TooManyBlocks(SNAPSHOT_BLOCKS, self.fed_blocks).into())
-		}
-
-		// todo: assert here that these values are consistent with chunks being in order.
-		let mut cur_number = rlp.val_at::<u64>(0)? + 1;
-		let mut parent_hash = rlp.val_at::<H256>(1)?;
-		let parent_total_difficulty = rlp.val_at::<U256>(2)?;
-
-		for idx in 3..item_count {
-			if !abort_flag.load(Ordering::SeqCst) { return Err(Error::RestorationAborted.into()) }
-
-			let pair = rlp.at(idx)?;
-			let abridged_rlp = pair.at(0)?.as_raw().to_owned();
-			let abridged_block = AbridgedBlock::from_raw(abridged_rlp);
-			let receipts: Vec<::receipt::Receipt> = pair.list_at(1)?;
-			let receipts_root = ordered_trie_root(
-				pair.at(1)?.iter().map(|r| r.as_raw().to_owned())
-			);
-
-			let block = abridged_block.to_block(parent_hash, cur_number, receipts_root)?;
-			let block_bytes = block.rlp_bytes(With);
-			let is_best = cur_number == self.best_number;
-
-			if is_best {
-				if block.header.hash() != self.best_hash {
-					return Err(Error::WrongBlockHash(cur_number, self.best_hash, block.header.hash()).into())
-				}
-
-				if block.header.state_root() != &self.best_root {
-					return Err(Error::WrongStateRoot(self.best_root, *block.header.state_root()).into())
-				}
-			}
-
-			verify_old_block(
-				&mut self.rng,
-				&block.header,
-				engine,
-				&self.chain,
-				Some(&block_bytes),
-				is_best
-			)?;
-
-			let mut batch = self.db.transaction();
-
-			// special-case the first block in each chunk.
-			if idx == 3 {
-				if self.chain.insert_unordered_block(&mut batch, &block_bytes, receipts, Some(parent_total_difficulty), is_best, false) {
-					self.disconnected.push((cur_number, block.header.hash()));
-				}
-			} else {
-				self.chain.insert_unordered_block(&mut batch, &block_bytes, receipts, None, is_best, false);
-			}
-			self.db.write_buffered(batch);
-			self.chain.commit();
-
-			parent_hash = BlockView::new(&block_bytes).hash();
-			cur_number += 1;
-		}
-
-		self.fed_blocks += num_blocks;
-
-		Ok(num_blocks)
-	}
-
-	/// Glue together any disconnected chunks and check that the chain is complete.
-	pub fn finalize(self, canonical: HashMap<u64, H256>) -> Result<(), Error> {
-		let mut batch = self.db.transaction();
-
-		for (first_num, first_hash) in self.disconnected {
-			let parent_num = first_num - 1;
-
-			// check if the parent is even in the chain.
-			// since we don't restore every single block in the chain,
-			// the first block of the first chunks has nothing to connect to.
-			if let Some(parent_hash) = self.chain.block_hash(parent_num) {
-				// if so, add the child to it.
-				self.chain.add_child(&mut batch, parent_hash, first_hash);
-			}
-		}
-		self.db.write_buffered(batch);
-
-		let best_number = self.best_number;
-		for num in (0..self.fed_blocks).map(|x| best_number - x) {
-
-			let hash = self.chain.block_hash(num).ok_or(Error::IncompleteChain)?;
-
-			if let Some(canon_hash) = canonical.get(&num).cloned() {
-				if canon_hash != hash {
-					return Err(Error::WrongBlockHash(num, canon_hash, hash));
-				}
-			}
-		}
-
 		Ok(())
 	}
 }
diff --git a/ethcore/src/snapshot/service.rs b/ethcore/src/snapshot/service.rs
index 06e659bc1..dc92b5427 100644
--- a/ethcore/src/snapshot/service.rs
+++ b/ethcore/src/snapshot/service.rs
@@ -16,14 +16,14 @@
 
 //! Snapshot network service implementation.
 
-use std::collections::{HashMap, HashSet};
+use std::collections::HashSet;
 use std::io::ErrorKind;
 use std::fs;
 use std::path::PathBuf;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 
-use super::{ManifestData, StateRebuilder, BlockRebuilder, RestorationStatus, SnapshotService};
+use super::{ManifestData, StateRebuilder, Rebuilder, RestorationStatus, SnapshotService};
 use super::io::{SnapshotReader, LooseReader, SnapshotWriter, LooseWriter};
 
 use blockchain::BlockChain;
@@ -69,12 +69,11 @@ struct Restoration {
 	state_chunks_left: HashSet<H256>,
 	block_chunks_left: HashSet<H256>,
 	state: StateRebuilder,
-	blocks: BlockRebuilder,
+	secondary: Box<Rebuilder>,
 	writer: Option<LooseWriter>,
 	snappy_buffer: Bytes,
 	final_state_root: H256,
 	guard: Guard,
-	canonical_hashes: HashMap<u64, H256>,
 	db: Arc<Database>,
 }
 
@@ -86,6 +85,7 @@ struct RestorationParams<'a> {
 	writer: Option<LooseWriter>, // writer for recovered snapshot.
 	genesis: &'a [u8], // genesis block of the chain.
 	guard: Guard, // guard for the restoration directory.
+	engine: &'a Engine,
 }
 
 impl Restoration {
@@ -100,7 +100,10 @@ impl Restoration {
 			.map_err(UtilError::SimpleString)?);
 
 		let chain = BlockChain::new(Default::default(), params.genesis, raw_db.clone());
-		let blocks = BlockRebuilder::new(chain, raw_db.clone(), &manifest)?;
+		let components = params.engine.snapshot_components()
+			.ok_or_else(|| ::snapshot::Error::SnapshotsUnsupported)?;
+
+		let secondary = components.rebuilder(chain, raw_db.clone(), &manifest)?;
 
 		let root = manifest.state_root.clone();
 		Ok(Restoration {
@@ -108,12 +111,11 @@ impl Restoration {
 			state_chunks_left: state_chunks,
 			block_chunks_left: block_chunks,
 			state: StateRebuilder::new(raw_db.clone(), params.pruning),
-			blocks: blocks,
+			secondary: secondary,
 			writer: params.writer,
 			snappy_buffer: Vec::new(),
 			final_state_root: root,
 			guard: params.guard,
-			canonical_hashes: HashMap::new(),
 			db: raw_db,
 		})
 	}
@@ -138,7 +140,7 @@ impl Restoration {
 		if self.block_chunks_left.remove(&hash) {
 			let len = snappy::decompress_into(chunk, &mut self.snappy_buffer)?;
 
-			self.blocks.feed(&self.snappy_buffer[..len], engine, flag)?;
+			self.secondary.feed(&self.snappy_buffer[..len], engine, flag)?;
 			if let Some(ref mut writer) = self.writer.as_mut() {
 				 writer.write_block_chunk(hash, chunk)?;
 			}
@@ -147,13 +149,8 @@ impl Restoration {
 		Ok(())
 	}
 
-	// note canonical hashes.
-	fn note_canonical(&mut self, hashes: &[(u64, H256)]) {
-		self.canonical_hashes.extend(hashes.iter().cloned());
-	}
-
 	// finish up restoration.
-	fn finalize(self) -> Result<(), Error> {
+	fn finalize(mut self) -> Result<(), Error> {
 		use util::trie::TrieError;
 
 		if !self.is_done() { return Ok(()) }
@@ -169,7 +166,7 @@ impl Restoration {
 		self.state.finalize(self.manifest.block_number, self.manifest.block_hash)?;
 
 		// connect out-of-order chunks and verify chain integrity.
-		self.blocks.finalize(self.canonical_hashes)?;
+		self.secondary.finalize()?;
 
 		if let Some(writer) = self.writer {
 			writer.finish(self.manifest)?;
@@ -425,6 +422,7 @@ impl Service {
 			writer: writer,
 			genesis: &self.genesis_block,
 			guard: Guard::new(rest_dir),
+			engine: &*self.engine,
 		};
 
 		let state_chunks = params.manifest.state_hashes.len();
@@ -593,14 +591,6 @@ impl SnapshotService for Service {
 			trace!("Error sending snapshot service message: {:?}", e);
 		}
 	}
-
-	fn provide_canon_hashes(&self, canonical: &[(u64, H256)]) {
-		let mut rest = self.restoration.lock();
-
-		if let Some(ref mut rest) = rest.as_mut() {
-			rest.note_canonical(canonical);
-		}
-	}
 }
 
 impl Drop for Service {
diff --git a/ethcore/src/snapshot/snapshot_service_trait.rs b/ethcore/src/snapshot/snapshot_service_trait.rs
index 7b53ee9b9..67e96398e 100644
--- a/ethcore/src/snapshot/snapshot_service_trait.rs
+++ b/ethcore/src/snapshot/snapshot_service_trait.rs
@@ -48,10 +48,6 @@ pub trait SnapshotService : Sync + Send {
 	/// Feed a raw block chunk to the service to be processed asynchronously.
 	/// no-op if currently restoring.
 	fn restore_block_chunk(&self, hash: H256, chunk: Bytes);
-
-	/// Give the restoration in-progress some canonical block hashes for
-	/// extra verification (performed at the end)
-	fn provide_canon_hashes(&self, canonical: &[(u64, H256)]);
 }
 
 impl IpcConfig for SnapshotService { }
diff --git a/ethcore/src/snapshot/tests/blocks.rs b/ethcore/src/snapshot/tests/blocks.rs
index ff63afdfc..fae9ae75e 100644
--- a/ethcore/src/snapshot/tests/blocks.rs
+++ b/ethcore/src/snapshot/tests/blocks.rs
@@ -21,13 +21,12 @@ use error::Error;
 
 use blockchain::generator::{ChainGenerator, ChainIterator, BlockFinalizer};
 use blockchain::BlockChain;
-use snapshot::{chunk_blocks, BlockRebuilder, Error as SnapshotError, Progress};
+use snapshot::{chunk_secondary, Error as SnapshotError, Progress, SnapshotComponents};
 use snapshot::io::{PackedReader, PackedWriter, SnapshotReader, SnapshotWriter};
 
 use util::{Mutex, snappy};
-use util::kvdb::{Database, DatabaseConfig};
+use util::kvdb::{self, KeyValueDB, DBTransaction};
 
-use std::collections::HashMap;
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 
@@ -35,19 +34,18 @@ fn chunk_and_restore(amount: u64) {
 	let mut canon_chain = ChainGenerator::default();
 	let mut finalizer = BlockFinalizer::default();
 	let genesis = canon_chain.generate(&mut finalizer).unwrap();
-	let db_cfg = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
+	let components = ::snapshot::PowSnapshot;
 
 	let engine = Arc::new(::engines::NullEngine::default());
-	let orig_path = RandomTempPath::create_dir();
 	let new_path = RandomTempPath::create_dir();
 	let mut snapshot_path = new_path.as_path().to_owned();
 	snapshot_path.push("SNAP");
 
-	let old_db = Arc::new(Database::open(&db_cfg, orig_path.as_str()).unwrap());
+	let old_db = Arc::new(kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)));
 	let bc = BlockChain::new(Default::default(), &genesis, old_db.clone());
 
 	// build the blockchain.
-	let mut batch = old_db.transaction();
+	let mut batch = DBTransaction::new();
 	for _ in 0..amount {
 		let block = canon_chain.generate(&mut finalizer).unwrap();
 		bc.insert_block(&mut batch, &block, vec![]);
@@ -56,12 +54,18 @@ fn chunk_and_restore(amount: u64) {
 
 	old_db.write(batch).unwrap();
 
-
 	let best_hash = bc.best_block_hash();
 
 	// snapshot it.
 	let writer = Mutex::new(PackedWriter::new(&snapshot_path).unwrap());
-	let block_hashes = chunk_blocks(&bc, best_hash, &writer, &Progress::default()).unwrap();
+	let block_hashes = chunk_secondary(
+		Box::new(::snapshot::PowSnapshot),
+		&bc,
+		best_hash,
+		&writer,
+		&Progress::default()
+	).unwrap();
+
 	let manifest = ::snapshot::ManifestData {
 		version: 2,
 		state_hashes: Vec::new(),
@@ -74,9 +78,10 @@ fn chunk_and_restore(amount: u64) {
 	writer.into_inner().finish(manifest.clone()).unwrap();
 
 	// restore it.
-	let new_db = Arc::new(Database::open(&db_cfg, new_path.as_str()).unwrap());
+	let new_db = Arc::new(kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)));
 	let new_chain = BlockChain::new(Default::default(), &genesis, new_db.clone());
-	let mut rebuilder = BlockRebuilder::new(new_chain, new_db.clone(), &manifest).unwrap();
+	let mut rebuilder = components.rebuilder(new_chain, new_db.clone(), &manifest).unwrap();
+
 	let reader = PackedReader::new(&snapshot_path).unwrap().unwrap();
 	let flag = AtomicBool::new(true);
 	for chunk_hash in &reader.manifest().block_hashes {
@@ -85,7 +90,8 @@ fn chunk_and_restore(amount: u64) {
 		rebuilder.feed(&chunk, engine.as_ref(), &flag).unwrap();
 	}
 
-	rebuilder.finalize(HashMap::new()).unwrap();
+	rebuilder.finalize().unwrap();
+	drop(rebuilder);
 
 	// and test it.
 	let new_chain = BlockChain::new(Default::default(), &genesis, new_db);
@@ -118,10 +124,8 @@ fn checks_flag() {
 	};
 
 	let chunk = stream.out();
-	let path = RandomTempPath::create_dir();
 
-	let db_cfg = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
-	let db = Arc::new(Database::open(&db_cfg, path.as_str()).unwrap());
+	let db = Arc::new(kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)));
 	let engine = Arc::new(::engines::NullEngine::default());
 	let chain = BlockChain::new(Default::default(), &genesis, db.clone());
 
@@ -134,7 +138,7 @@ fn checks_flag() {
 		block_hash: H256::default(),
 	};
 
-	let mut rebuilder = BlockRebuilder::new(chain, db.clone(), &manifest).unwrap();
+	let mut rebuilder = ::snapshot::PowSnapshot.rebuilder(chain, db.clone(), &manifest).unwrap();
 
 	match rebuilder.feed(&chunk, engine.as_ref(), &AtomicBool::new(false)) {
 		Err(Error::Snapshot(SnapshotError::RestorationAborted)) => {}
diff --git a/rpc/src/v1/tests/helpers/snapshot_service.rs b/rpc/src/v1/tests/helpers/snapshot_service.rs
index 2314cea10..f03eb3bc3 100644
--- a/rpc/src/v1/tests/helpers/snapshot_service.rs
+++ b/rpc/src/v1/tests/helpers/snapshot_service.rs
@@ -47,5 +47,4 @@ impl SnapshotService for TestSnapshotService {
 	fn abort_restore(&self) { }
 	fn restore_state_chunk(&self, _hash: H256, _chunk: Bytes) { }
 	fn restore_block_chunk(&self, _hash: H256, _chunk: Bytes) { }
-	fn provide_canon_hashes(&self, _hashes: &[(u64, H256)]) { }
-}
\ No newline at end of file
+}
diff --git a/sync/src/tests/snapshot.rs b/sync/src/tests/snapshot.rs
index 16114e216..0f97ec913 100644
--- a/sync/src/tests/snapshot.rs
+++ b/sync/src/tests/snapshot.rs
@@ -24,7 +24,6 @@ use SyncConfig;
 pub struct TestSnapshotService {
 	manifest: Option<ManifestData>,
 	chunks: HashMap<H256, Bytes>,
-	canon_hashes: Mutex<HashMap<u64, H256>>,
 
 	restoration_manifest: Mutex<Option<ManifestData>>,
 	state_restoration_chunks: Mutex<HashMap<H256, Bytes>>,
@@ -36,7 +35,6 @@ impl TestSnapshotService {
 		TestSnapshotService {
 			manifest: None,
 			chunks: HashMap::new(),
-			canon_hashes: Mutex::new(HashMap::new()),
 			restoration_manifest: Mutex::new(None),
 			state_restoration_chunks: Mutex::new(HashMap::new()),
 			block_restoration_chunks: Mutex::new(HashMap::new()),
@@ -61,7 +59,6 @@ impl TestSnapshotService {
 		TestSnapshotService {
 			manifest: Some(manifest),
 			chunks: chunks,
-			canon_hashes: Mutex::new(HashMap::new()),
 			restoration_manifest: Mutex::new(None),
 			state_restoration_chunks: Mutex::new(HashMap::new()),
 			block_restoration_chunks: Mutex::new(HashMap::new()),
@@ -115,10 +112,6 @@ impl SnapshotService for TestSnapshotService {
 			self.block_restoration_chunks.lock().insert(hash, chunk);
 		}
 	}
-
-	fn provide_canon_hashes(&self, hashes: &[(u64, H256)]) {
-		self.canon_hashes.lock().extend(hashes.iter().cloned());
-	}
 }
 
 #[test]

From 240c111ebbfdf7870a949881fd55c84667c4f8ba Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Wed, 19 Apr 2017 20:44:11 +0200
Subject: [PATCH 041/117] fix indent

---
 ethcore/src/engines/authority_round.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ethcore/src/engines/authority_round.rs b/ethcore/src/engines/authority_round.rs
index 2d158fcdb..937d6ccc4 100644
--- a/ethcore/src/engines/authority_round.rs
+++ b/ethcore/src/engines/authority_round.rs
@@ -585,7 +585,7 @@ mod tests {
 
 	#[test]
 	fn rejects_step_backwards() {
-				let tap = AccountProvider::transient_provider();
+		let tap = AccountProvider::transient_provider();
 		let addr = tap.insert_account(Secret::from_slice(&"0".sha3()).unwrap(), "0").unwrap();
 
 		let mut parent_header: Header = Header::default();

From a16fb042807ac4c1a2fca1e462e5add8a268e23b Mon Sep 17 00:00:00 2001
From: Afri <afri@parity.io>
Date: Wed, 19 Apr 2017 22:59:02 +0200
Subject: [PATCH 042/117] Force two decimals for USD conversion rate (#5471)

---
 ethcore/src/miner/miner.rs | 2 +-
 parity/configuration.rs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
index 286a89bc1..ed551e2f3 100644
--- a/ethcore/src/miner/miner.rs
+++ b/ethcore/src/miner/miner.rs
@@ -163,7 +163,7 @@ impl GasPriceCalibrator {
 				let wei_per_usd: f32 = 1.0e18 / usd_per_eth;
 				let gas_per_tx: f32 = 21000.0;
 				let wei_per_gas: f32 = wei_per_usd * usd_per_tx / gas_per_tx;
-				info!(target: "miner", "Updated conversion rate to Ξ1 = {} ({} wei/gas)", Colour::White.bold().paint(format!("US${}", usd_per_eth)), Colour::Yellow.bold().paint(format!("{}", wei_per_gas)));
+				info!(target: "miner", "Updated conversion rate to Ξ1 = {} ({} wei/gas)", Colour::White.bold().paint(format!("US${:.2}", usd_per_eth)), Colour::Yellow.bold().paint(format!("{}", wei_per_gas)));
 				set_price(U256::from(wei_per_gas as u64));
 			});
 
diff --git a/parity/configuration.rs b/parity/configuration.rs
index 724633c28..61748018d 100644
--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@@ -640,7 +640,7 @@ impl Configuration {
 
 		info!(
 			"Using a fixed conversion rate of Ξ1 = {} ({} wei/gas)",
-			Colour::White.bold().paint(format!("US${}", usd_per_eth)),
+			Colour::White.bold().paint(format!("US${:.2}", usd_per_eth)),
 			Colour::Yellow.bold().paint(format!("{}", wei_per_gas))
 		);
 

From a33b4cc73b4c8199c3992ca731216a3424deec99 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Thu, 20 Apr 2017 15:04:07 +0200
Subject: [PATCH 043/117] fix tests

---
 util/src/kvdb.rs            | 2 +-
 util/src/migration/tests.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/src/kvdb.rs b/util/src/kvdb.rs
index 8006c4ccb..084969f30 100644
--- a/util/src/kvdb.rs
+++ b/util/src/kvdb.rs
@@ -910,7 +910,7 @@ mod tests {
 
 		assert_eq!(&*db.get(None, &key1).unwrap().unwrap(), b"cat");
 
-		let contents: Vec<_> = db.iter(None).collect();
+		let contents: Vec<_> = db.iter(None).into_iter().flat_map(|inner| inner).collect();
 		assert_eq!(contents.len(), 2);
 		assert_eq!(&*contents[0].0, &*key1);
 		assert_eq!(&*contents[0].1, b"cat");
diff --git a/util/src/migration/tests.rs b/util/src/migration/tests.rs
index 31226ec49..a246f65c8 100644
--- a/util/src/migration/tests.rs
+++ b/util/src/migration/tests.rs
@@ -94,7 +94,7 @@ impl Migration for AddsColumn {
 	fn migrate(&mut self, source: Arc<Database>, config: &Config, dest: &mut Database, col: Option<u32>) -> Result<(), Error> {
 		let mut batch = Batch::new(config, col);
 
-		for (key, value) in source.iter(col) {
+		for (key, value) in source.iter(col).into_iter().flat_map(|inner| inner) {
 			batch.insert(key.to_vec(), value.to_vec(), dest)?;
 		}
 

From 468a7a4a778490394b7494bd41b2ab599a49bfcf Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Thu, 20 Apr 2017 16:09:43 +0200
Subject: [PATCH 044/117] bloom check test

---
 .../engines/validator_set/safe_contract.rs    | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/ethcore/src/engines/validator_set/safe_contract.rs b/ethcore/src/engines/validator_set/safe_contract.rs
index 39cd4f511..3f075330f 100644
--- a/ethcore/src/engines/validator_set/safe_contract.rs
+++ b/ethcore/src/engines/validator_set/safe_contract.rs
@@ -280,7 +280,7 @@ mod tests {
 	use miner::MinerService;
 	use tests::helpers::{generate_dummy_client_with_spec_and_accounts, generate_dummy_client_with_spec_and_data};
 	use super::super::ValidatorSet;
-	use super::ValidatorSafeContract;
+	use super::{ValidatorSafeContract, EVENT_NAME_HASH};
 
 	#[test]
 	fn fetches_validators() {
@@ -358,4 +358,35 @@ mod tests {
 		sync_client.flush_queue();
 		assert_eq!(sync_client.chain_info().best_block_number, 3);
 	}
+
+	#[test]
+	fn detects_bloom() {
+		use header::Header;
+		use engines::{EpochChange, Unsure};
+		use log_entry::LogEntry;
+
+		let client = generate_dummy_client_with_spec_and_accounts(Spec::new_validator_safe_contract, None);
+		let engine = client.engine().clone();
+		let validator_contract = Address::from_str("0000000000000000000000000000000000000005").unwrap();
+
+		let last_hash = client.best_block_header().hash();
+		let mut new_header = Header::default();
+		new_header.set_parent_hash(last_hash);
+
+		// first, try without the parent hash.
+		let mut event = LogEntry {
+			address: validator_contract,
+			topics: vec![*EVENT_NAME_HASH],
+			data: Vec::new(),
+		};
+
+		new_header.set_log_bloom(event.bloom());
+		assert_eq!(engine.is_epoch_end(&new_header, None, None), EpochChange::No);
+
+		// with the last hash, it should need the receipts.
+		event.topics.push(last_hash);
+		new_header.set_log_bloom(event.bloom());
+		assert_eq!(engine.is_epoch_end(&new_header, None, None),
+			EpochChange::Unsure(Unsure::NeedsReceipts));
+	}
 }

From 167d06d727079450c5812924091eb955a350a251 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Thu, 20 Apr 2017 16:21:53 +0200
Subject: [PATCH 045/117] fix panickers in tree-route

---
 ethcore/src/blockchain/blockchain.rs | 48 ++++++++++++++++------------
 ethcore/src/client/client.rs         |  2 +-
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/ethcore/src/blockchain/blockchain.rs b/ethcore/src/blockchain/blockchain.rs
index 39c1039ca..feaf52a03 100644
--- a/ethcore/src/blockchain/blockchain.rs
+++ b/ethcore/src/blockchain/blockchain.rs
@@ -650,12 +650,19 @@ impl BlockChain {
 	///   ```json
 	///   { blocks: [B4, B3, A3, A4], ancestor: A2, index: 2 }
 	///   ```
-	pub fn tree_route(&self, from: H256, to: H256) -> TreeRoute {
+	///
+	/// If the tree route verges into pruned or unknown blocks,
+	/// `None` is returned.
+	pub fn tree_route(&self, from: H256, to: H256) -> Option<TreeRoute> {
+		macro_rules! otry {
+			($e:expr) => { match $e { Some(x) => x, None => return None } }
+		}
+
 		let mut from_branch = vec![];
 		let mut to_branch = vec![];
 
-		let mut from_details = self.block_details(&from).unwrap_or_else(|| panic!("0. Expected to find details for block {:?}", from));
-		let mut to_details = self.block_details(&to).unwrap_or_else(|| panic!("1. Expected to find details for block {:?}", to));
+		let mut from_details = otry!(self.block_details(&from));
+		let mut to_details = otry!(self.block_details(&to));
 		let mut current_from = from;
 		let mut current_to = to;
 
@@ -663,13 +670,13 @@ impl BlockChain {
 		while from_details.number > to_details.number {
 			from_branch.push(current_from);
 			current_from = from_details.parent.clone();
-			from_details = self.block_details(&from_details.parent).unwrap_or_else(|| panic!("2. Expected to find details for block {:?}", from_details.parent));
+			from_details = otry!(self.block_details(&from_details.parent));
 		}
 
 		while to_details.number > from_details.number {
 			to_branch.push(current_to);
 			current_to = to_details.parent.clone();
-			to_details = self.block_details(&to_details.parent).unwrap_or_else(|| panic!("3. Expected to find details for block {:?}", to_details.parent));
+			to_details = otry!(self.block_details(&to_details.parent));
 		}
 
 		assert_eq!(from_details.number, to_details.number);
@@ -678,22 +685,22 @@ impl BlockChain {
 		while current_from != current_to {
 			from_branch.push(current_from);
 			current_from = from_details.parent.clone();
-			from_details = self.block_details(&from_details.parent).unwrap_or_else(|| panic!("4. Expected to find details for block {:?}", from_details.parent));
+			from_details = otry!(self.block_details(&from_details.parent));
 
 			to_branch.push(current_to);
 			current_to = to_details.parent.clone();
-			to_details = self.block_details(&to_details.parent).unwrap_or_else(|| panic!("5. Expected to find details for block {:?}", from_details.parent));
+			to_details = otry!(self.block_details(&to_details.parent));
 		}
 
 		let index = from_branch.len();
 
 		from_branch.extend(to_branch.into_iter().rev());
 
-		TreeRoute {
+		Some(TreeRoute {
 			blocks: from_branch,
 			ancestor: current_from,
 			index: index
-		}
+		})
 	}
 
 	/// Inserts a verified, known block from the canonical chain.
@@ -879,7 +886,8 @@ impl BlockChain {
 				// are moved to "canon chain"
 				// find the route between old best block and the new one
 				let best_hash = self.best_block_hash();
-				let route = self.tree_route(best_hash, parent_hash);
+				let route = self.tree_route(best_hash, parent_hash)
+					.expect("blocks being imported always within recent history; qed");
 
 				assert_eq!(number, parent_details.number + 1);
 
@@ -1711,52 +1719,52 @@ mod tests {
 		assert_eq!(bc.block_hash(3).unwrap(), b3a_hash);
 
 		// test trie route
-		let r0_1 = bc.tree_route(genesis_hash.clone(), b1_hash.clone());
+		let r0_1 = bc.tree_route(genesis_hash.clone(), b1_hash.clone()).unwrap();
 		assert_eq!(r0_1.ancestor, genesis_hash);
 		assert_eq!(r0_1.blocks, [b1_hash.clone()]);
 		assert_eq!(r0_1.index, 0);
 
-		let r0_2 = bc.tree_route(genesis_hash.clone(), b2_hash.clone());
+		let r0_2 = bc.tree_route(genesis_hash.clone(), b2_hash.clone()).unwrap();
 		assert_eq!(r0_2.ancestor, genesis_hash);
 		assert_eq!(r0_2.blocks, [b1_hash.clone(), b2_hash.clone()]);
 		assert_eq!(r0_2.index, 0);
 
-		let r1_3a = bc.tree_route(b1_hash.clone(), b3a_hash.clone());
+		let r1_3a = bc.tree_route(b1_hash.clone(), b3a_hash.clone()).unwrap();
 		assert_eq!(r1_3a.ancestor, b1_hash);
 		assert_eq!(r1_3a.blocks, [b2_hash.clone(), b3a_hash.clone()]);
 		assert_eq!(r1_3a.index, 0);
 
-		let r1_3b = bc.tree_route(b1_hash.clone(), b3b_hash.clone());
+		let r1_3b = bc.tree_route(b1_hash.clone(), b3b_hash.clone()).unwrap();
 		assert_eq!(r1_3b.ancestor, b1_hash);
 		assert_eq!(r1_3b.blocks, [b2_hash.clone(), b3b_hash.clone()]);
 		assert_eq!(r1_3b.index, 0);
 
-		let r3a_3b = bc.tree_route(b3a_hash.clone(), b3b_hash.clone());
+		let r3a_3b = bc.tree_route(b3a_hash.clone(), b3b_hash.clone()).unwrap();
 		assert_eq!(r3a_3b.ancestor, b2_hash);
 		assert_eq!(r3a_3b.blocks, [b3a_hash.clone(), b3b_hash.clone()]);
 		assert_eq!(r3a_3b.index, 1);
 
-		let r1_0 = bc.tree_route(b1_hash.clone(), genesis_hash.clone());
+		let r1_0 = bc.tree_route(b1_hash.clone(), genesis_hash.clone()).unwrap();
 		assert_eq!(r1_0.ancestor, genesis_hash);
 		assert_eq!(r1_0.blocks, [b1_hash.clone()]);
 		assert_eq!(r1_0.index, 1);
 
-		let r2_0 = bc.tree_route(b2_hash.clone(), genesis_hash.clone());
+		let r2_0 = bc.tree_route(b2_hash.clone(), genesis_hash.clone()).unwrap();
 		assert_eq!(r2_0.ancestor, genesis_hash);
 		assert_eq!(r2_0.blocks, [b2_hash.clone(), b1_hash.clone()]);
 		assert_eq!(r2_0.index, 2);
 
-		let r3a_1 = bc.tree_route(b3a_hash.clone(), b1_hash.clone());
+		let r3a_1 = bc.tree_route(b3a_hash.clone(), b1_hash.clone()).unwrap();
 		assert_eq!(r3a_1.ancestor, b1_hash);
 		assert_eq!(r3a_1.blocks, [b3a_hash.clone(), b2_hash.clone()]);
 		assert_eq!(r3a_1.index, 2);
 
-		let r3b_1 = bc.tree_route(b3b_hash.clone(), b1_hash.clone());
+		let r3b_1 = bc.tree_route(b3b_hash.clone(), b1_hash.clone()).unwrap();
 		assert_eq!(r3b_1.ancestor, b1_hash);
 		assert_eq!(r3b_1.blocks, [b3b_hash.clone(), b2_hash.clone()]);
 		assert_eq!(r3b_1.index, 2);
 
-		let r3b_3a = bc.tree_route(b3b_hash.clone(), b3a_hash.clone());
+		let r3b_3a = bc.tree_route(b3b_hash.clone(), b3a_hash.clone()).unwrap();
 		assert_eq!(r3b_3a.ancestor, b2_hash);
 		assert_eq!(r3b_3a.blocks, [b3b_hash.clone(), b3a_hash.clone()]);
 		assert_eq!(r3b_3a.index, 1);
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index e7755e4d0..0656480f6 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -1270,7 +1270,7 @@ impl BlockChainClient for Client {
 	fn tree_route(&self, from: &H256, to: &H256) -> Option<TreeRoute> {
 		let chain = self.chain.read();
 		match chain.is_known(from) && chain.is_known(to) {
-			true => Some(chain.tree_route(from.clone(), to.clone())),
+			true => chain.tree_route(from.clone(), to.clone()),
 			false => None
 		}
 	}

From ba03ed4eeabd7644033a233241d66b9788183b72 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Thu, 20 Apr 2017 17:31:15 +0200
Subject: [PATCH 046/117] Refresh UI on nodeKind changes, e.g. personal ->
 public (#5312)

* Poll details based on nodeKind

* Delay long polling when public/light

* Reload UI when nodeKind changed

* Fix tests (not using dispatch, reload instead)

* PR grumbles/cleanups
---
 js/src/redux/providers/chainMiddleware.js     | 34 +++++++++-----
 .../redux/providers/chainMiddleware.spec.js   | 37 ++++++++++++---
 js/src/redux/providers/status.js              | 47 ++++++++++++-------
 js/src/redux/providers/statusReducer.js       |  2 +
 4 files changed, 86 insertions(+), 34 deletions(-)

diff --git a/js/src/redux/providers/chainMiddleware.js b/js/src/redux/providers/chainMiddleware.js
index 2df40ed86..398e604be 100644
--- a/js/src/redux/providers/chainMiddleware.js
+++ b/js/src/redux/providers/chainMiddleware.js
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import BalancesProvider from './balances';
-import { showSnackbar } from './snackbarActions';
 import { DEFAULT_NETCHAIN } from './statusReducer';
 
 export default class ChainMiddleware {
@@ -24,20 +22,34 @@ export default class ChainMiddleware {
       if (action.type === 'statusCollection') {
         const { collection } = action;
 
-        if (collection && collection.netChain) {
-          const newChain = collection.netChain;
+        if (collection) {
           const { nodeStatus } = store.getState();
+          const { netChain, nodeKind } = nodeStatus;
+          const newChain = collection.netChain;
+          const newNodeKind = collection.nodeKind;
+          let reloadChain = false;
+          let reloadType = false;
 
-          if (newChain !== nodeStatus.netChain && nodeStatus.netChain !== DEFAULT_NETCHAIN) {
-            store.dispatch(showSnackbar(`Switched to ${newChain}. The UI will reload now...`));
+          // force reload when chain has changed and is not initial value
+          if (newChain) {
+            const hasChainChanged = newChain !== netChain;
+            const isInitialChain = netChain === DEFAULT_NETCHAIN;
+
+            reloadChain = !isInitialChain && hasChainChanged;
+          }
+
+          // force reload when nodeKind (availability or capability) has changed
+          if (newNodeKind && nodeKind) {
+            const hasAvailabilityChanged = nodeKind.availability !== newNodeKind.availability;
+            const hasCapabilityChanged = nodeKind.capability !== newNodeKind.capability;
+
+            reloadType = hasAvailabilityChanged || hasCapabilityChanged;
+          }
+
+          if (reloadChain || reloadType) {
             setTimeout(() => {
               window.location.reload();
             }, 0);
-
-            // Fetch the new balances without notifying the user of any change
-            BalancesProvider.get(store).fetchAllBalances({
-              changedNetwork: true
-            });
           }
         }
       }
diff --git a/js/src/redux/providers/chainMiddleware.spec.js b/js/src/redux/providers/chainMiddleware.spec.js
index 50a25caf6..837031c29 100644
--- a/js/src/redux/providers/chainMiddleware.spec.js
+++ b/js/src/redux/providers/chainMiddleware.spec.js
@@ -24,11 +24,22 @@ import { createWsApi } from '~/../test/e2e/ethapi';
 let middleware;
 let next;
 let store;
+let clock;
 
 const api = createWsApi();
 
 Contracts.create(api);
 
+function stubGlobals () {
+  clock = sinon.useFakeTimers();
+  sinon.spy(window.location, 'reload');
+}
+
+function restoreGlobals () {
+  window.location.reload.restore();
+  clock.restore();
+}
+
 function createMiddleware (collection = {}) {
   middleware = new ChainMiddleware().toMiddleware();
   next = sinon.stub();
@@ -46,10 +57,22 @@ function createMiddleware (collection = {}) {
 }
 
 function callMiddleware (action) {
-  return middleware(store)(next)(action);
+  const result = middleware(store)(next)(action);
+
+  clock.tick(100);
+
+  return result;
 }
 
 describe('reduxs/providers/ChainMiddleware', () => {
+  beforeEach(() => {
+    stubGlobals();
+  });
+
+  afterEach(() => {
+    restoreGlobals();
+  });
+
   describe('next action', () => {
     beforeEach(() => {
       createMiddleware();
@@ -69,25 +92,25 @@ describe('reduxs/providers/ChainMiddleware', () => {
   });
 
   describe('chain switching', () => {
-    it('does not dispatch when moving from the initial/unknown chain', () => {
+    it('does not reload when moving from the initial/unknown chain', () => {
       createMiddleware();
       callMiddleware({ type: 'statusCollection', collection: { netChain: 'homestead' } });
 
-      expect(store.dispatch).not.to.have.been.called;
+      expect(window.location.reload).not.to.have.been.called;
     });
 
-    it('does not dispatch when moving to the same chain', () => {
+    it('does not reload when moving to the same chain', () => {
       createMiddleware({ netChain: 'homestead' });
       callMiddleware({ type: 'statusCollection', collection: { netChain: 'homestead' } });
 
-      expect(store.dispatch).not.to.have.been.called;
+      expect(window.location.reload).not.to.have.been.called;
     });
 
-    it('does dispatch when moving between chains', () => {
+    it('does reload when moving between chains', () => {
       createMiddleware({ netChain: 'homestead' });
       callMiddleware({ type: 'statusCollection', collection: { netChain: 'ropsten' } });
 
-      expect(store.dispatch).to.have.been.called;
+      expect(window.location.reload).to.have.been.called;
     });
   });
 });
diff --git a/js/src/redux/providers/status.js b/js/src/redux/providers/status.js
index 0fa354d1a..19bec2c0a 100644
--- a/js/src/redux/providers/status.js
+++ b/js/src/redux/providers/status.js
@@ -156,7 +156,8 @@ export default class Status {
   }
 
   _pollTraceMode = () => {
-    return this._api.trace.block()
+    return this._api.trace
+      .block()
       .then(blockTraces => {
         // Assumes not in Trace Mode if no transactions
         // in latest block...
@@ -168,14 +169,12 @@ export default class Status {
   getApiStatus = () => {
     const { isConnected, isConnecting, needsToken, secureToken } = this._api;
 
-    const apiStatus = {
+    return {
       isConnected,
       isConnecting,
       needsToken,
       secureToken
     };
-
-    return apiStatus;
   }
 
   _pollStatus = () => {
@@ -194,7 +193,10 @@ export default class Status {
       return Promise.resolve();
     }
 
-    const statusPromises = [ this._api.eth.syncing(), this._api.parity.netPeers() ];
+    const statusPromises = [
+      this._api.eth.syncing(),
+      this._api.parity.netPeers()
+    ];
 
     return Promise
       .all(statusPromises)
@@ -225,7 +227,10 @@ export default class Status {
       return Promise.resolve();
     }
 
-    const nextTimeout = (timeout = 30000) => {
+    const { nodeKindFull } = this._store.getState().nodeStatus;
+    const defaultTimeout = (nodeKindFull === false ? 240 : 30) * 1000;
+
+    const nextTimeout = (timeout = defaultTimeout) => {
       if (this._timeoutIds.longStatus) {
         clearTimeout(this._timeoutIds.longStatus);
       }
@@ -233,24 +238,34 @@ export default class Status {
       this._timeoutIds.longStatus = setTimeout(() => this._pollLongStatus(), timeout);
     };
 
+    const statusPromises = [
+      this._api.parity.nodeKind(),
+      this._api.parity.netPeers(),
+      this._api.web3.clientVersion(),
+      this._api.net.version(),
+      this._api.parity.netChain()
+    ];
+
+    if (nodeKindFull) {
+      statusPromises.push(this._upgradeStore.checkUpgrade());
+    }
+
     return Promise
-      .all([
-        this._api.parity.netPeers(),
-        this._api.web3.clientVersion(),
-        this._api.net.version(),
-        this._api.parity.netChain(),
-        this._upgradeStore.checkUpgrade()
-      ])
-      .then(([
-        netPeers, clientVersion, netVersion, netChain, upgradeStatus
-      ]) => {
+      .all(statusPromises)
+      .then(([nodeKind, netPeers, clientVersion, netVersion, netChain]) => {
         const isTest = [
           '2', // morden
           '3', // ropsten
           '42' // kovan
         ].includes(netVersion);
 
+        const nodeKindFull = nodeKind &&
+          nodeKind.availability === 'personal' &&
+          nodeKind.capability === 'full';
+
         const longStatus = {
+          nodeKind,
+          nodeKindFull,
           netPeers,
           clientVersion,
           netChain,
diff --git a/js/src/redux/providers/statusReducer.js b/js/src/redux/providers/statusReducer.js
index 6f509735e..12fe9654d 100644
--- a/js/src/redux/providers/statusReducer.js
+++ b/js/src/redux/providers/statusReducer.js
@@ -31,6 +31,8 @@ const initialState = {
     peers: []
   },
   netVersion: '0',
+  nodeKind: null,
+  nodeKindFull: null,
   syncing: true,
   isConnected: false,
   isConnecting: false,

From 023c45f302c0bccd78b18f5ca7cab0af406a32e7 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Thu, 20 Apr 2017 17:34:04 +0200
Subject: [PATCH 047/117] checkout correct tests submodule

---
 ethcore/res/ethereum/tests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ethcore/res/ethereum/tests b/ethcore/res/ethereum/tests
index d52059307..ef191fdc6 160000
--- a/ethcore/res/ethereum/tests
+++ b/ethcore/res/ethereum/tests
@@ -1 +1 @@
-Subproject commit d520593078fa0849dcd1f907e44ed0a616892e33
+Subproject commit ef191fdc61cf76cdb9cdc147465fb447304b0ed2

From 6c33b781c349f81dc83d8da06a1295c4a3a07b08 Mon Sep 17 00:00:00 2001
From: Dmitriy Startsev <starcev.da@gmail.com>
Date: Thu, 20 Apr 2017 19:03:43 +0300
Subject: [PATCH 048/117] Update links to etherscan.io (#5455)

---
 js/src/3rdparty/etherscan/call.js       | 23 +---------
 js/src/3rdparty/etherscan/links.js      | 47 +++++++++++---------
 js/src/3rdparty/etherscan/links.spec.js | 57 +++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 41 deletions(-)
 create mode 100644 js/src/3rdparty/etherscan/links.spec.js

diff --git a/js/src/3rdparty/etherscan/call.js b/js/src/3rdparty/etherscan/call.js
index 6b72e1bea..069627d78 100644
--- a/js/src/3rdparty/etherscan/call.js
+++ b/js/src/3rdparty/etherscan/call.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import { stringify } from 'qs';
+import { apiLink } from './links';
 
 const options = {
   method: 'GET',
@@ -24,31 +25,11 @@ const options = {
 };
 
 export function call (module, action, _params, test, netVersion) {
-  let prefix = 'api.';
-
-  switch (netVersion) {
-    case '2':
-    case '3':
-      prefix = 'testnet.';
-      break;
-
-    case '42':
-      prefix = 'kovan.';
-      break;
-
-    case '0':
-    default:
-      if (test) {
-        prefix = 'testnet.';
-      }
-      break;
-  }
-
   const query = stringify(Object.assign({
     module, action
   }, _params || {}));
 
-  return fetch(`https://${prefix}etherscan.io/api?${query}`, options)
+  return fetch(apiLink(query, test, netVersion), options)
     .then((response) => {
       if (!response.ok) {
         throw { code: response.status, message: response.statusText }; // eslint-disable-line
diff --git a/js/src/3rdparty/etherscan/links.js b/js/src/3rdparty/etherscan/links.js
index 8c9101268..3b08d60e8 100644
--- a/js/src/3rdparty/etherscan/links.js
+++ b/js/src/3rdparty/etherscan/links.js
@@ -15,28 +15,31 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 // NOTE: Keep 'isTestnet' for backwards library compatibility
-export const url = (isTestnet = false, netVersion = '0') => {
-  let prefix = '';
-
-  switch (netVersion) {
-    case '2':
-    case '3':
-      prefix = 'testnet.';
-      break;
-
-    case '42':
-      prefix = 'kovan.';
-      break;
-
-    case '0':
-    default:
-      if (isTestnet) {
-        prefix = 'testnet.';
-      }
-      break;
+const getUrlPrefix = (isTestnet = false, netVersion = '0', defaultPrefix = '') => {
+  if (isTestnet) {
+    return 'ropsten.';
   }
 
-  return `https://${prefix}etherscan.io`;
+  switch (netVersion) {
+    case '1':
+      return defaultPrefix;
+
+    case '3':
+      return 'ropsten.';
+
+    case '4':
+      return 'rinkeby.';
+
+    case '42':
+      return 'kovan.';
+
+    default:
+      return 'testnet.';
+  }
+};
+
+export const url = (isTestnet = false, netVersion = '0', defaultPrefix = '') => {
+  return `https://${getUrlPrefix(isTestnet, netVersion, defaultPrefix)}etherscan.io`;
 };
 
 export const txLink = (hash, isTestnet = false, netVersion = '0') => {
@@ -46,3 +49,7 @@ export const txLink = (hash, isTestnet = false, netVersion = '0') => {
 export const addressLink = (address, isTestnet = false, netVersion = '0') => {
   return `${url(isTestnet, netVersion)}/address/${address}`;
 };
+
+export const apiLink = (query, isTestnet = false, netVersion = '0') => {
+  return `${url(isTestnet, netVersion, 'api.')}/api?${query}`;
+};
diff --git a/js/src/3rdparty/etherscan/links.spec.js b/js/src/3rdparty/etherscan/links.spec.js
new file mode 100644
index 000000000..c906940cb
--- /dev/null
+++ b/js/src/3rdparty/etherscan/links.spec.js
@@ -0,0 +1,57 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+const { url, txLink, addressLink, apiLink } = require('./links');
+
+describe('etherscan/links', function () {
+  it('builds link with a prefix', () => {
+    expect(url(false, '1', 'api.')).to.be.equal('https://api.etherscan.io');
+  });
+
+  it('builds link to main network', () => {
+    expect(url(false, '1')).to.be.equal('https://etherscan.io');
+  });
+
+  it('builds link to ropsten', () => {
+    expect(url(false, '3')).to.be.equal('https://ropsten.etherscan.io');
+    expect(url(true)).to.be.equal('https://ropsten.etherscan.io');
+  });
+
+  it('builds link to kovan', () => {
+    expect(url(false, '42')).to.be.equal('https://kovan.etherscan.io');
+  });
+
+  it('builds link to rinkeby', () => {
+    expect(url(false, '4')).to.be.equal('https://rinkeby.etherscan.io');
+  });
+
+  it('builds link to the testnet selector for unknown networks', () => {
+    expect(url(false, '10042')).to.be.equal('https://testnet.etherscan.io');
+    expect(url(false, '51224')).to.be.equal('https://testnet.etherscan.io');
+  });
+
+  it('builds transaction link', () => {
+    expect(txLink('aTxHash', false, '1')).to.be.equal('https://etherscan.io/tx/aTxHash');
+  });
+
+  it('builds address link', () => {
+    expect(addressLink('anAddress', false, '1')).to.be.equal('https://etherscan.io/address/anAddress');
+  });
+
+  it('builds api link', () => {
+    expect(apiLink('answer=42', false, '1')).to.be.equal('https://api.etherscan.io/api?answer=42');
+  });
+});

From 70c82c0f61c6f4215fd8a83727ceb420f3b30330 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Thu, 20 Apr 2017 19:28:34 +0000
Subject: [PATCH 049/117] [ci skip] js-precompiled 20170420-192450

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cf6d3bb6d..bb457df59 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1773,7 +1773,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#bceb0caa1eae7d78ad3386338a76b7ca92bf033a"
+source = "git+https://github.com/paritytech/js-precompiled.git#8645ef0d41c9c325556fad8241f2cedaf4ce2d79"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 07314f84d..d6c83f075 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.57",
+  "version": "1.7.58",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 7a1db0852b78d724c06acab535ced70beb5ad762 Mon Sep 17 00:00:00 2001
From: NikVolf <nikvolf@gmail.com>
Date: Fri, 21 Apr 2017 12:10:41 +0300
Subject: [PATCH 050/117] fix typo

---
 ethcore/src/builtin.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ethcore/src/builtin.rs b/ethcore/src/builtin.rs
index 32087be96..12d4d9ac1 100644
--- a/ethcore/src/builtin.rs
+++ b/ethcore/src/builtin.rs
@@ -816,7 +816,7 @@ mod tests {
 		}		
 	}
 
-	fn builitin_pairing() -> Builtin {
+	fn builtin_pairing() -> Builtin {
 		Builtin {
 			pricer: Box::new(Linear { base: 0, word: 0 }),
 			native: ethereum_builtin("bn128_pairing"),
@@ -856,7 +856,7 @@ mod tests {
 	fn bn128_pairing_empty() {
 		// should not fail, because empty input is a valid input of 0 elements
 		empty_test(
-			builitin_pairing(), 
+			builtin_pairing(), 
 			bytes("0000000000000000000000000000000000000000000000000000000000000001"),
 		);
 	}
@@ -865,7 +865,7 @@ mod tests {
 	fn bn128_pairing_notcurve() {
 		// should fail - point not on curve
 		error_test(
-			builitin_pairing(),
+			builtin_pairing(),
 			&bytes("\
 				1111111111111111111111111111111111111111111111111111111111111111\
 				1111111111111111111111111111111111111111111111111111111111111111\
@@ -882,7 +882,7 @@ mod tests {
 	fn bn128_pairing_fragmented() {
 		// should fail - input length is invalid
 		error_test(
-			builitin_pairing(),
+			builtin_pairing(),
 			&bytes("\
 				1111111111111111111111111111111111111111111111111111111111111111\
 				1111111111111111111111111111111111111111111111111111111111111111\

From 7ab92f0807a7de6cf3e841111421ab1c0d3c507b Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Sat, 22 Apr 2017 18:56:01 +0200
Subject: [PATCH 051/117] epoch generation proof fixes

---
 ethcore/src/client/client.rs                  | 24 ++++++++++---------
 .../engines/validator_set/safe_contract.rs    |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 44d7238b9..866742230 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -256,10 +256,8 @@ impl Client {
 
 		// ensure genesis epoch proof in the DB.
 		{
-			let mut batch = DBTransaction::new();
 			let chain = client.chain.read();
-			client.generate_epoch_proof(&mut batch, &spec.genesis_header(), 0, &*chain);
-			client.db.read().write_buffered(batch);
+			client.generate_epoch_proof(&spec.genesis_header(), 0, &*chain);
 		}
 
 		if let Some(reg_addr) = client.additional_params().get("registrar").and_then(|s| Address::from_str(s).ok()) {
@@ -611,10 +609,6 @@ impl Client {
 		state.journal_under(&mut batch, number, hash).expect("DB commit failed");
 		let route = chain.insert_block(&mut batch, block_data, receipts);
 
-		if let Some((header, epoch)) = entering_new_epoch {
-			self.generate_epoch_proof(&mut batch, &header, epoch, &chain);
-		}
-
 		self.tracedb.read().import(&mut batch, TraceImportRequest {
 			traces: traces.into(),
 			block_hash: hash.clone(),
@@ -634,14 +628,19 @@ impl Client {
 			warn!("Failed to prune ancient state data: {}", e);
 		}
 
+		if let Some((header, epoch)) = entering_new_epoch {
+			self.generate_epoch_proof(&header, epoch, &chain);
+		}
+
 		route
 	}
 
 	// generate an epoch transition proof at the given block, and write it into the given blockchain.
-	fn generate_epoch_proof(&self, batch: &mut DBTransaction, header: &Header, epoch_number: u64, chain: &BlockChain) {
+	fn generate_epoch_proof(&self, header: &Header, epoch_number: u64, chain: &BlockChain) {
 		use std::cell::RefCell;
 		use std::collections::BTreeSet;
 
+		let mut batch = DBTransaction::new();
 		let hash = header.hash();
 		debug!(target: "client", "Generating validation proof for block {}", hash);
 
@@ -664,13 +663,16 @@ impl Client {
 
 		// insert into database, using the generated proof.
 		match proof {
-			Ok(proof) =>
-				chain.insert_epoch_transition(batch, epoch_number, EpochTransition {
+			Ok(proof) => {
+				chain.insert_epoch_transition(&mut batch, epoch_number, EpochTransition {
 					block_hash: hash.clone(),
 					block_number: header.number(),
 					proof: proof,
 					state_proof: read_values.into_inner().into_iter().collect(),
-				}),
+				});
+
+				self.db.read().write_buffered(batch);
+			}
 			Err(e) => {
 				warn!(target: "client", "Error generating epoch change proof for block {}: {}", hash, e);
 				warn!(target: "client", "Snapshots generated by this node will be incomplete.");
diff --git a/ethcore/src/engines/validator_set/safe_contract.rs b/ethcore/src/engines/validator_set/safe_contract.rs
index 3f075330f..bfdab65b0 100644
--- a/ethcore/src/engines/validator_set/safe_contract.rs
+++ b/ethcore/src/engines/validator_set/safe_contract.rs
@@ -170,8 +170,8 @@ impl ValidatorSet for ValidatorSafeContract {
 					Some(matched_event) => {
 						// decode log manually until the native contract generator is
 						// good enough to do it for us.
-						let &(_, _, ref nonce_token) = &matched_event.params[2];
-						let &(_, _, ref validators_token) = &matched_event.params[3];
+						let &(_, _, ref nonce_token) = &matched_event.params[1];
+						let &(_, _, ref validators_token) = &matched_event.params[2];
 
 						let nonce: Option<U256> = nonce_token.clone().to_uint()
 							.map(H256).map(Into::into);

From 6a5702f27c64fc2cfbe46989df32df10b12fd707 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Mon, 24 Apr 2017 13:14:50 +0200
Subject: [PATCH 052/117] address grumbles

---
 ethcore/src/client/client.rs          |  2 +-
 ethcore/src/engines/epoch_verifier.rs |  2 +-
 ethcore/src/engines/null_engine.rs    |  2 +-
 ethcore/src/ethereum/ethash.rs        |  6 +++++-
 ethcore/src/snapshot/consensus/mod.rs | 25 ++++++++++++++-----------
 ethcore/src/snapshot/tests/blocks.rs  |  9 +++++----
 6 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 866742230..cc8520cb7 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -414,7 +414,7 @@ impl Client {
 
 			// Final Verification
 			if let Err(e) = self.verifier.verify_block_final(header, locked_block.block().header()) {
-				warn!(target: "client", "Stage 4 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
+				warn!(target: "client", "Stage 5 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
 				return Err(());
 			}
 
diff --git a/ethcore/src/engines/epoch_verifier.rs b/ethcore/src/engines/epoch_verifier.rs
index 62740fbd4..0d9c87e53 100644
--- a/ethcore/src/engines/epoch_verifier.rs
+++ b/ethcore/src/engines/epoch_verifier.rs
@@ -19,7 +19,7 @@
 use error::Error;
 use header::Header;
 
-/// Verifier for all blocks within an epoch without accessing
+/// Verifier for all blocks within an epoch with self-contained state.
 ///
 /// See docs on `Engine` relating to proving functions for more details.
 pub trait EpochVerifier: Sync {
diff --git a/ethcore/src/engines/null_engine.rs b/ethcore/src/engines/null_engine.rs
index 09bd07607..3bdef480c 100644
--- a/ethcore/src/engines/null_engine.rs
+++ b/ethcore/src/engines/null_engine.rs
@@ -62,6 +62,6 @@ impl Engine for NullEngine {
 	}
 
 	fn snapshot_components(&self) -> Option<Box<::snapshot::SnapshotComponents>> {
-		Some(Box::new(::snapshot::PowSnapshot))
+		Some(Box::new(::snapshot::PowSnapshot(10000)))
 	}
 }
diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs
index c7174e197..de53227de 100644
--- a/ethcore/src/ethereum/ethash.rs
+++ b/ethcore/src/ethereum/ethash.rs
@@ -32,6 +32,10 @@ use rlp::{self, UntrustedRlp};
 /// Parity tries to round block.gas_limit to multiple of this constant
 pub const PARITY_GAS_LIMIT_DETERMINANT: U256 = U256([37, 0, 0, 0]);
 
+/// Number of blocks in an ethash snapshot.
+// make dependent on difficulty incrment divisor?
+const SNAPSHOT_BLOCKS: u64 = 30000;
+
 /// Ethash params.
 #[derive(Debug, PartialEq)]
 pub struct EthashParams {
@@ -401,7 +405,7 @@ impl Engine for Arc<Ethash> {
 	}
 
 	fn snapshot_components(&self) -> Option<Box<::snapshot::SnapshotComponents>> {
-		Some(Box::new(::snapshot::PowSnapshot))
+		Some(Box::new(::snapshot::PowSnapshot(SNAPSHOT_BLOCKS)))
 	}
 }
 
diff --git a/ethcore/src/snapshot/consensus/mod.rs b/ethcore/src/snapshot/consensus/mod.rs
index 2e6b6b736..4d853ca27 100644
--- a/ethcore/src/snapshot/consensus/mod.rs
+++ b/ethcore/src/snapshot/consensus/mod.rs
@@ -36,9 +36,6 @@ use rlp::{RlpStream, UntrustedRlp};
 /// A sink for produced chunks.
 pub type ChunkSink<'a> = FnMut(&[u8]) -> io::Result<()> + 'a;
 
-// How many blocks to include in a snapshot, starting from the head of the chain.
-const SNAPSHOT_BLOCKS: u64 = 30000;
-
 /// Components necessary for snapshot creation and restoration.
 pub trait SnapshotComponents: Send {
 	/// Create secondary snapshot chunks; these corroborate the state data
@@ -92,7 +89,11 @@ pub trait Rebuilder: Send {
 /// Snapshot creation and restoration for PoW chains.
 /// This includes blocks from the head of the chain as a
 /// loose assurance that the chain is valid.
-pub struct PowSnapshot;
+///
+/// The field is the number of blocks from the head of the chain
+/// to include in the snapshot.
+#[derive(Clone, Copy, PartialEq)]
+pub struct PowSnapshot(pub u64);
 
 impl SnapshotComponents for PowSnapshot {
 	fn chunk_all(
@@ -108,7 +109,7 @@ impl SnapshotComponents for PowSnapshot {
 			current_hash: block_at,
 			writer: chunk_sink,
 			preferred_size: preferred_size,
-		}.chunk_all()
+		}.chunk_all(self.0)
 	}
 
 	fn rebuilder(
@@ -117,7 +118,7 @@ impl SnapshotComponents for PowSnapshot {
 		db: Arc<KeyValueDB>,
 		manifest: &ManifestData,
 	) -> Result<Box<Rebuilder>, ::error::Error> {
-		PowRebuilder::new(chain, db, manifest).map(|r| Box::new(r) as Box<_>)
+		PowRebuilder::new(chain, db, manifest, self.0).map(|r| Box::new(r) as Box<_>)
 	}
 }
 
@@ -134,13 +135,13 @@ struct PowWorker<'a> {
 impl<'a> PowWorker<'a> {
 	// Repeatedly fill the buffers and writes out chunks, moving backwards from starting block hash.
 	// Loops until we reach the first desired block, and writes out the remainder.
-	fn chunk_all(&mut self) -> Result<(), Error> {
+	fn chunk_all(&mut self, snapshot_blocks: u64) -> Result<(), Error> {
 		let mut loaded_size = 0;
 		let mut last = self.current_hash;
 
 		let genesis_hash = self.chain.genesis_hash();
 
-		for _ in 0..SNAPSHOT_BLOCKS {
+		for _ in 0..snapshot_blocks {
 			if self.current_hash == genesis_hash { break }
 
 			let (block, receipts) = self.chain.block(&self.current_hash)
@@ -229,11 +230,12 @@ pub struct PowRebuilder {
 	best_hash: H256,
 	best_root: H256,
 	fed_blocks: u64,
+	snapshot_blocks: u64,
 }
 
 impl PowRebuilder {
 	/// Create a new PowRebuilder.
-	fn new(chain: BlockChain, db: Arc<KeyValueDB>, manifest: &ManifestData) -> Result<Self, ::error::Error> {
+	fn new(chain: BlockChain, db: Arc<KeyValueDB>, manifest: &ManifestData, snapshot_blocks: u64) -> Result<Self, ::error::Error> {
 		Ok(PowRebuilder {
 			chain: chain,
 			db: db,
@@ -243,6 +245,7 @@ impl PowRebuilder {
 			best_hash: manifest.block_hash,
 			best_root: manifest.state_root,
 			fed_blocks: 0,
+			snapshot_blocks: snapshot_blocks,
 		})
 	}
 }
@@ -263,8 +266,8 @@ impl Rebuilder for PowRebuilder {
 
 		trace!(target: "snapshot", "restoring block chunk with {} blocks.", item_count - 3);
 
-		if self.fed_blocks + num_blocks > SNAPSHOT_BLOCKS {
-			return Err(Error::TooManyBlocks(SNAPSHOT_BLOCKS, self.fed_blocks).into())
+		if self.fed_blocks + num_blocks > self.snapshot_blocks {
+			return Err(Error::TooManyBlocks(self.snapshot_blocks, self.fed_blocks).into())
 		}
 
 		// todo: assert here that these values are consistent with chunks being in order.
diff --git a/ethcore/src/snapshot/tests/blocks.rs b/ethcore/src/snapshot/tests/blocks.rs
index fae9ae75e..2769644e8 100644
--- a/ethcore/src/snapshot/tests/blocks.rs
+++ b/ethcore/src/snapshot/tests/blocks.rs
@@ -30,11 +30,12 @@ use util::kvdb::{self, KeyValueDB, DBTransaction};
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 
+const SNAPSHOT_MODE: ::snapshot::PowSnapshot = ::snapshot::PowSnapshot(30000);
+
 fn chunk_and_restore(amount: u64) {
 	let mut canon_chain = ChainGenerator::default();
 	let mut finalizer = BlockFinalizer::default();
 	let genesis = canon_chain.generate(&mut finalizer).unwrap();
-	let components = ::snapshot::PowSnapshot;
 
 	let engine = Arc::new(::engines::NullEngine::default());
 	let new_path = RandomTempPath::create_dir();
@@ -59,7 +60,7 @@ fn chunk_and_restore(amount: u64) {
 	// snapshot it.
 	let writer = Mutex::new(PackedWriter::new(&snapshot_path).unwrap());
 	let block_hashes = chunk_secondary(
-		Box::new(::snapshot::PowSnapshot),
+		Box::new(SNAPSHOT_MODE),
 		&bc,
 		best_hash,
 		&writer,
@@ -80,7 +81,7 @@ fn chunk_and_restore(amount: u64) {
 	// restore it.
 	let new_db = Arc::new(kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)));
 	let new_chain = BlockChain::new(Default::default(), &genesis, new_db.clone());
-	let mut rebuilder = components.rebuilder(new_chain, new_db.clone(), &manifest).unwrap();
+	let mut rebuilder = SNAPSHOT_MODE.rebuilder(new_chain, new_db.clone(), &manifest).unwrap();
 
 	let reader = PackedReader::new(&snapshot_path).unwrap().unwrap();
 	let flag = AtomicBool::new(true);
@@ -138,7 +139,7 @@ fn checks_flag() {
 		block_hash: H256::default(),
 	};
 
-	let mut rebuilder = ::snapshot::PowSnapshot.rebuilder(chain, db.clone(), &manifest).unwrap();
+	let mut rebuilder = SNAPSHOT_MODE.rebuilder(chain, db.clone(), &manifest).unwrap();
 
 	match rebuilder.feed(&chunk, engine.as_ref(), &AtomicBool::new(false)) {
 		Err(Error::Snapshot(SnapshotError::RestorationAborted)) => {}

From f7d5d6c0cd4c53397bb8c49389a0ebcf9aebdf3c Mon Sep 17 00:00:00 2001
From: Craig O'Connor <oconnorct1@gmail.com>
Date: Tue, 25 Apr 2017 04:08:09 -0400
Subject: [PATCH 053/117] Cancel tx JS (#4958)

* Remove transaction RPC

* Bumping multihash and libc

* Updating nanomsg

* bump nanomsg

* cancel tx

* cancel-tx-js

* cancel-tx-js

* cancel-tx-js

* cancel-tx-hs

* cancel-tx-js

* cancel-tx-js

* cancel-tx-js

* small fixes

* edit & time till submit

* edit & time till submit

* updates

* updates

* udpates

* udpates

* grumbles

* step 1

* Wonderful updates

* ready

* small refact

* small refact

* grumbles 1

* ffx2

* good ol' fashioned updates

* latest and greatest

* removeHash

* removeHash

* spec

* fix 1

* fix 1

* fix 2

* fix 2

* ff

* ff

* ff

* updates
---
 .gitignore                                    |   3 +
 js/package.json                               |   1 +
 js/src/jsonrpc/interfaces/parity.js           |   9 +-
 js/src/ui/MethodDecoding/methodDecoding.js    |  36 +--
 js/src/ui/TxList/TxRow/txRow.js               | 188 +++++++++++++++-
 js/src/ui/TxList/store.js                     | 209 ++++++++----------
 js/src/ui/TxList/store.spec.js                |  23 +-
 js/src/ui/TxList/txList.css                   |  19 +-
 js/src/ui/TxList/txList.js                    |  22 +-
 .../containers/RequestsPage/requestsPage.js   |  37 ++--
 js/src/views/Signer/store.js                  |   6 +-
 11 files changed, 381 insertions(+), 172 deletions(-)

diff --git a/.gitignore b/.gitignore
index f31145039..c36ae1c90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,9 @@
 # mac stuff
 .DS_Store
 
+# npm stuff
+npm-debug.log
+
 # gdb files
 .gdb_history
 
diff --git a/js/package.json b/js/package.json
index d6c83f075..f2e1f1770 100644
--- a/js/package.json
+++ b/js/package.json
@@ -164,6 +164,7 @@
     "blockies": "0.0.2",
     "brace": "0.9.0",
     "bytes": "2.4.0",
+    "date-difference": "1.0.0",
     "debounce": "1.0.0",
     "es6-error": "4.0.0",
     "es6-promise": "4.0.5",
diff --git a/js/src/jsonrpc/interfaces/parity.js b/js/src/jsonrpc/interfaces/parity.js
index e7a5f46c9..5d71c54df 100644
--- a/js/src/jsonrpc/interfaces/parity.js
+++ b/js/src/jsonrpc/interfaces/parity.js
@@ -1833,7 +1833,14 @@ export default {
         example: {
           from: '0xb60e8dd61c5d32be8058bb8eb970870f07233155',
           to: '0xd46e8dd67c5d32be8058bb8eb970870f07244567',
-          value: fromDecimal(2441406250)
+          gas: fromDecimal(30400),
+          gasPrice: fromDecimal(10000000000000),
+          value: fromDecimal(2441406250),
+          data: '0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675',
+          condition: {
+            block: 354221,
+            time: new Date()
+          }
         }
       }
     ],
diff --git a/js/src/ui/MethodDecoding/methodDecoding.js b/js/src/ui/MethodDecoding/methodDecoding.js
index 1d2810c54..d143cd267 100644
--- a/js/src/ui/MethodDecoding/methodDecoding.js
+++ b/js/src/ui/MethodDecoding/methodDecoding.js
@@ -185,14 +185,16 @@ class MethodDecoding extends Component {
       );
 
       return (
-        <FormattedMessage
-          id='ui.methodDecoding.condition.block'
-          defaultMessage=', {historic, select, true {Submitted} false {Submission}} at block {blockNumber}'
-          values={ {
-            historic,
-            blockNumber
-          } }
-        />
+        <div>
+          <FormattedMessage
+            id='ui.methodDecoding.condition.block'
+            defaultMessage='{historic, select, true {Will be submitted} false {To be submitted}} at block {blockNumber}'
+            values={ {
+              historic,
+              blockNumber
+            } }
+          />
+        </div>
       );
     }
 
@@ -204,14 +206,16 @@ class MethodDecoding extends Component {
       );
 
       return (
-        <FormattedMessage
-          id='ui.methodDecoding.condition.time'
-          defaultMessage=', {historic, select, true {Submitted} false {Submission}} at {timestamp}'
-          values={ {
-            historic,
-            timestamp
-          } }
-        />
+        <div>
+          <FormattedMessage
+            id='ui.methodDecoding.condition.time'
+            defaultMessage='{historic, select, true {Will be submitted} false {To be submitted}} {timestamp}'
+            values={ {
+              historic,
+              timestamp
+            } }
+          />
+        </div>
       );
     }
 
diff --git a/js/src/ui/TxList/TxRow/txRow.js b/js/src/ui/TxList/TxRow/txRow.js
index 1fcf54396..c839a04b1 100644
--- a/js/src/ui/TxList/TxRow/txRow.js
+++ b/js/src/ui/TxList/TxRow/txRow.js
@@ -15,6 +15,8 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import moment from 'moment';
+import dateDifference from 'date-difference';
+import { FormattedMessage } from 'react-intl';
 import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
 import { Link } from 'react-router';
@@ -36,12 +38,15 @@ class TxRow extends Component {
   static propTypes = {
     accountAddresses: PropTypes.array.isRequired,
     address: PropTypes.string.isRequired,
+    blockNumber: PropTypes.object,
     contractAddresses: PropTypes.array.isRequired,
     netVersion: PropTypes.string.isRequired,
     tx: PropTypes.object.isRequired,
 
     block: PropTypes.object,
     className: PropTypes.string,
+    cancelTransaction: PropTypes.func,
+    editTransaction: PropTypes.func,
     historic: PropTypes.bool
   };
 
@@ -50,6 +55,10 @@ class TxRow extends Component {
   };
 
   state = {
+    isCancelOpen: false,
+    isEditOpen: false,
+    canceled: false,
+    editing: false,
     isContract: false,
     isDeploy: false
   };
@@ -166,11 +175,124 @@ class TxRow extends Component {
     return (
       <td className={ styles.timestamp }>
         <div>{ blockNumber && block ? moment(block.timestamp).fromNow() : null }</div>
-        <div>{ blockNumber ? _blockNumber.toFormat() : 'Pending' }</div>
+        <div>{ blockNumber ? _blockNumber.toFormat() : this.renderCancelToggle() }</div>
       </td>
     );
   }
 
+  renderCancelToggle () {
+    const { canceled, editing, isCancelOpen, isEditOpen } = this.state;
+
+    if (canceled) {
+      return (
+        <div className={ styles.pending }>
+          <FormattedMessage
+            lassName={ styles.uppercase }
+            id='ui.txList.txRow.canceled'
+            defaultMessage='Canceled'
+          />
+        </div>
+      );
+    }
+
+    if (editing) {
+      return (
+        <div className={ styles.pending }>
+          <div className={ styles.uppercase }>
+            <FormattedMessage
+              id='ui.txList.txRow.editing'
+              defaultMessage='Editing'
+            />
+          </div>
+        </div>
+      );
+    }
+
+    if (!isCancelOpen && !isEditOpen) {
+      const pendingStatus = this.getCondition();
+
+      if (pendingStatus === 'submitting') {
+        return (
+          <div className={ styles.pending }>
+            <div />
+            <div className={ styles.uppercase }>
+              <FormattedMessage
+                id='ui.txList.txRow.submitting'
+                defaultMessage='Submitting'
+              />
+            </div>
+          </div>
+        );
+      }
+      return (
+        <div className={ styles.pending }>
+          <span>
+            { pendingStatus }
+          </span>
+          <div className={ styles.uppercase }>
+            <FormattedMessage
+              id='ui.txList.txRow.scheduled'
+              defaultMessage='Scheduled'
+            />
+          </div>
+          <a onClick={ this.setEdit } className={ styles.uppercase }>
+            <FormattedMessage
+              id='ui.txList.txRow.edit'
+              defaultMessage='Edit'
+            />
+          </a>
+          <span>{' | '}</span>
+          <a onClick={ this.setCancel } className={ styles.uppercase }>
+            <FormattedMessage
+              id='ui.txList.txRow.cancel'
+              defaultMessage='Cancel'
+            />
+          </a>
+        </div>
+      );
+    }
+
+    let which;
+
+    if (isCancelOpen) {
+      which = (
+        <FormattedMessage
+          id='ui.txList.txRow.verify.cancelEditCancel'
+          defaultMessage='Cancel'
+        />
+      );
+    } else {
+      which = (
+        <FormattedMessage
+          id='ui.txList.txRow.verify.cancelEditEdit'
+          defaultMessage='Edit'
+        />
+      );
+    }
+
+    return (
+      <div className={ styles.pending }>
+        <div />
+        <div className={ styles.uppercase }>
+          <FormattedMessage
+            id='ui.txList.txRow.verify'
+            defaultMessage='Are you sure?'
+          />
+        </div>
+        <a onClick={ (isCancelOpen) ? this.cancelTx : this.editTx }>
+          { which }
+        </a>
+        <span>{' | '}</span>
+        <a onClick={ this.revertEditCancel }>
+          <FormattedMessage
+            id='ui.txList.txRow.verify.nevermind'
+            defaultMessage='Nevermind'
+          />
+        </a>
+      </div>
+    );
+  }
+
   getIsKnownContract (address) {
     const { contractAddresses } = this.props;
 
@@ -194,6 +316,70 @@ class TxRow extends Component {
 
     return `/addresses/${address}`;
   }
+
+  getCondition = () => {
+    const { blockNumber, tx } = this.props;
+    let { time, block } = tx.condition;
+
+    if (time) {
+      if ((time.getTime() - Date.now()) >= 0) {
+        // return `${dateDifference(new Date(), time, { compact: true })} left`;
+        return (
+          <FormattedMessage
+            id='ui.txList.txRow.pendingStatus.time'
+            defaultMessage='{time} left'
+            values={ {
+              time: dateDifference(new Date(), time, { compact: true })
+            } }
+          />
+        );
+      } else {
+        return 'submitting';
+      }
+    } else if (blockNumber) {
+      block = blockNumber.minus(block);
+      // return (block.toNumber() < 0)
+      //   ? block.abs().toFormat(0) + ' blocks left'
+      //   : 'submitting';
+      if (block.toNumber() < 0) {
+        return (
+          <FormattedMessage
+            id='ui.txList.txRow.pendingStatus.blocksLeft'
+            defaultMessage='{blockNumber} blocks left'
+            values={ {
+              blockNumber: block.abs().toFormat(0)
+            } }
+          />
+        );
+      } else {
+        return 'submitting';
+      }
+    }
+  }
+
+  cancelTx = () => {
+    const { cancelTransaction, tx } = this.props;
+
+    cancelTransaction(this, tx);
+  }
+
+  editTx = () => {
+    const { editTransaction, tx } = this.props;
+
+    editTransaction(this, tx);
+  }
+
+  setCancel = () => {
+    this.setState({ isCancelOpen: true });
+  }
+
+  setEdit = () => {
+    this.setState({ isEditOpen: true });
+  }
+
+  revertEditCancel = () => {
+    this.setState({ isCancelOpen: false, isEditOpen: false });
+  }
 }
 
 function mapStateToProps (initState) {
diff --git a/js/src/ui/TxList/store.js b/js/src/ui/TxList/store.js
index 1e670e31d..99a081d57 100644
--- a/js/src/ui/TxList/store.js
+++ b/js/src/ui/TxList/store.js
@@ -14,150 +14,135 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import { action, observable, transaction } from 'mobx';
-import { uniq } from 'lodash';
+import { action, observable } from 'mobx';
 
 export default class Store {
   @observable blocks = {};
   @observable sortedHashes = [];
   @observable transactions = {};
 
-  constructor (api) {
+  constructor (api, onNewError, hashes) {
     this._api = api;
-    this._subscriptionId = 0;
-    this._pendingHashes = [];
-
-    this.subscribe();
+    this._onNewError = onNewError;
+    this.loadTransactions(hashes);
   }
 
-  @action addBlocks = (blocks) => {
-    this.blocks = Object.assign({}, this.blocks, blocks);
+  @action addHash = (hash) => {
+    if (!this.sortedHashes.includes(hash)) {
+      this.sortedHashes.push(hash);
+      this.sortHashes();
+    }
   }
 
-  @action addTransactions = (transactions) => {
-    transaction(() => {
-      this.transactions = Object.assign({}, this.transactions, transactions);
-      this.sortedHashes = Object
-        .keys(this.transactions)
-        .sort((ahash, bhash) => {
-          const bnA = this.transactions[ahash].blockNumber;
-          const bnB = this.transactions[bhash].blockNumber;
+  @action removeHash = (hash) => {
+    this.sortedHashes.remove(hash);
+    let tx = this.transactions[hash];
 
-          if (bnB.eq(0)) {
-            return bnB.eq(bnA) ? 0 : 1;
-          } else if (bnA.eq(0)) {
-            return -1;
-          }
+    if (tx) {
+      delete this.transactions[hash];
+      delete this.blocks[tx.blockNumber];
+    }
+    this.sortHashes();
+  }
 
-          return bnB.comparedTo(bnA);
-        });
+  containsAll = (arr1, arr2) => {
+    return arr2.every((arr2Item) => arr1.includes(arr2Item));
+  }
 
-      this._pendingHashes = this.sortedHashes.filter((hash) => this.transactions[hash].blockNumber.eq(0));
+  sameHashList = (transactions) => {
+    return this.containsAll(transactions, this.sortedHashes) && this.containsAll(this.sortedHashes, transactions);
+  }
+
+  sortHashes = () => {
+    this.sortedHashes = this.sortedHashes.sort((hashA, hashB) => {
+      const bnA = this.transactions[hashA].blockNumber;
+      const bnB = this.transactions[hashB].blockNumber;
+
+      // 0 is a special case (has not been added to the blockchain yet)
+      if (bnB.eq(0)) {
+        return bnB.eq(bnA) ? 0 : 1;
+      } else if (bnA.eq(0)) {
+        return -1;
+      }
+
+      return bnB.comparedTo(bnA);
     });
   }
 
-  @action clearPending () {
-    this._pendingHashes = [];
-  }
+  loadTransactions (_txhashes) {
+    const { eth } = this._api;
 
-  subscribe () {
-    this._api
-      .subscribe('eth_blockNumber', (error, blockNumber) => {
-        if (error) {
-          return;
-        }
-
-        if (this._pendingHashes.length) {
-          this.loadTransactions(this._pendingHashes);
-          this.clearPending();
-        }
-      })
-      .then((subscriptionId) => {
-        this._subscriptionId = subscriptionId;
-      });
-  }
-
-  unsubscribe () {
-    if (!this._subscriptionId) {
+    // Ignore special cases and if the contents of _txhashes && this.sortedHashes are the same
+    if (Array.isArray(_txhashes) || this.sameHashList(_txhashes)) {
       return;
     }
 
-    this._api.unsubscribe(this._subscriptionId);
-    this._subscriptionId = 0;
-  }
+    // Remove any tx that are edited/cancelled
+    this.sortedHashes
+      .forEach((hash) => {
+        if (!_txhashes.includes(hash)) {
+          this.removeHash(hash);
+        }
+      });
 
-  loadTransactions (_txhashes = []) {
-    const promises = _txhashes
-      .filter((txhash) => !this.transactions[txhash] || this._pendingHashes.includes(txhash))
-      .map((txhash) => {
-        return Promise
-          .all([
-            this._api.eth.getTransactionByHash(txhash),
-            this._api.eth.getTransactionReceipt(txhash)
-          ])
-          .then(([
-            transaction = {},
-            transactionReceipt = {}
-          ]) => {
-            return {
-              ...transactionReceipt,
-              ...transaction
-            };
+    // Add any new tx
+    _txhashes
+      .forEach((txhash) => {
+        if (this.sortedHashes.includes(txhash)) { return; }
+        eth.getTransactionByHash(txhash)
+          .then((tx) => {
+            if (!tx) { return; }
+            this.transactions[txhash] = tx;
+            // If the tx has a blockHash, let's get the blockNumber, otherwise it's ready to be added
+            if (tx.blockHash) {
+              eth.getBlockByNumber(tx.blockNumber)
+                .then((block) => {
+                  this.blocks[tx.blockNumber] = block;
+                  this.addHash(txhash);
+                });
+            } else {
+              this.addHash(txhash);
+            }
           });
       });
+  }
 
-    if (!promises.length) {
-      return;
-    }
+  cancelTransaction = (txComponent, tx) => {
+    const { parity } = this._api;
+    const { hash } = tx;
 
-    Promise
-      .all(promises)
-      .then((_transactions) => {
-        const blockNumbers = [];
-        const transactions = _transactions
-          .filter((tx) => tx && tx.hash)
-          .reduce((txs, tx) => {
-            txs[tx.hash] = tx;
-
-            if (tx.blockNumber && tx.blockNumber.gt(0)) {
-              blockNumbers.push(tx.blockNumber.toNumber());
-            }
-
-            return txs;
-          }, {});
-
-        // No need to add transactions if there are none
-        if (Object.keys(transactions).length === 0) {
-          return false;
-        }
-
-        this.addTransactions(transactions);
-        this.loadBlocks(blockNumbers);
+    parity
+      .removeTransaction(hash)
+      .then(() => {
+        txComponent.setState({ canceled: true });
       })
-      .catch((error) => {
-        console.warn('loadTransactions', error);
+      .catch((err) => {
+        this._onNewError({ message: err });
       });
   }
 
-  loadBlocks (_blockNumbers) {
-    const blockNumbers = uniq(_blockNumbers).filter((bn) => !this.blocks[bn]);
+  editTransaction = (txComponent, tx) => {
+    const { parity } = this._api;
+    const { hash, gas, gasPrice, to, from, value, input, condition } = tx;
 
-    if (!blockNumbers || !blockNumbers.length) {
-      return;
-    }
-
-    Promise
-      .all(blockNumbers.map((blockNumber) => this._api.eth.getBlockByNumber(blockNumber)))
-      .then((blocks) => {
-        this.addBlocks(
-          blocks.reduce((blocks, block, index) => {
-            blocks[blockNumbers[index]] = block;
-            return blocks;
-          }, {})
-        );
+    parity
+      .removeTransaction(hash)
+      .then(() => {
+        parity.postTransaction({
+          from,
+          to,
+          gas,
+          gasPrice,
+          value,
+          condition,
+          data: input
+        });
       })
-      .catch((error) => {
-        console.warn('loadBlocks', error);
+      .then(() => {
+        txComponent.setState({ editing: true });
+      })
+      .catch((err) => {
+        this._onNewError({ message: err });
       });
   }
 }
diff --git a/js/src/ui/TxList/store.spec.js b/js/src/ui/TxList/store.spec.js
index 44685b3ba..501065b95 100644
--- a/js/src/ui/TxList/store.spec.js
+++ b/js/src/ui/TxList/store.spec.js
@@ -44,7 +44,7 @@ describe('ui/TxList/store', () => {
         }
       }
     };
-    store = new Store(api);
+    store = new Store(api, null, []);
   });
 
   describe('create', () => {
@@ -53,16 +53,14 @@ describe('ui/TxList/store', () => {
       expect(store.sortedHashes.peek()).to.deep.equal([]);
       expect(store.transactions).to.deep.equal({});
     });
-
-    it('subscribes to eth_blockNumber', () => {
-      expect(api.subscribe).to.have.been.calledWith('eth_blockNumber');
-      expect(store._subscriptionId).to.equal(SUBID);
-    });
   });
 
   describe('addBlocks', () => {
     beforeEach(() => {
-      store.addBlocks(BLOCKS);
+      Object.keys(BLOCKS)
+        .forEach((blockNumber) => {
+          store.blocks[blockNumber] = BLOCKS[blockNumber];
+        });
     });
 
     it('adds the blocks to the list', () => {
@@ -72,7 +70,12 @@ describe('ui/TxList/store', () => {
 
   describe('addTransactions', () => {
     beforeEach(() => {
-      store.addTransactions(TRANSACTIONS);
+      Object.keys(TRANSACTIONS)
+        .forEach((hash) => {
+          store.transactions[hash] = TRANSACTIONS[hash];
+          store.addHash(hash);
+        });
+      store.sortHashes();
     });
 
     it('adds all transactions to the list', () => {
@@ -82,9 +85,5 @@ describe('ui/TxList/store', () => {
     it('sorts transactions based on blockNumber', () => {
       expect(store.sortedHashes.peek()).to.deep.equal(['0x234', '0x456', '0x345', '0x123']);
     });
-
-    it('adds pending transactions to the pending queue', () => {
-      expect(store._pendingHashes).to.deep.equal(['0x234', '0x456']);
-    });
   });
 });
diff --git a/js/src/ui/TxList/txList.css b/js/src/ui/TxList/txList.css
index a38ba14fd..0bfd898d2 100644
--- a/js/src/ui/TxList/txList.css
+++ b/js/src/ui/TxList/txList.css
@@ -42,10 +42,11 @@
     }
 
     &.timestamp {
-      padding-top: 1.5em;
-      text-align: right;
+      max-width: 5em;
+      padding-top: 0.75em;
+      text-align: center;
       line-height: 1.5em;
-      opacity: 0.5;
+      color: grey;
     }
 
     &.transaction {
@@ -83,4 +84,16 @@
   .left {
     text-align: left;
   }
+
+  .pending {
+    padding: 0em;
+  }
+
+  .pending div {
+    padding-bottom: 1.25em;
+  }
+
+  .uppercase {
+    text-transform: uppercase;
+  }
 }
diff --git a/js/src/ui/TxList/txList.js b/js/src/ui/TxList/txList.js
index c2224903f..140217a23 100644
--- a/js/src/ui/TxList/txList.js
+++ b/js/src/ui/TxList/txList.js
@@ -35,17 +35,13 @@ class TxList extends Component {
       PropTypes.array,
       PropTypes.object
     ]).isRequired,
-    netVersion: PropTypes.string.isRequired
+    blockNumber: PropTypes.object,
+    netVersion: PropTypes.string.isRequired,
+    onNewError: PropTypes.func
   };
 
-  store = new Store(this.context.api);
-
   componentWillMount () {
-    this.store.loadTransactions(this.props.hashes);
-  }
-
-  componentWillUnmount () {
-    this.store.unsubscribe();
+    this.store = new Store(this.context.api, this.props.onNewError, this.props.hashes);
   }
 
   componentWillReceiveProps (newProps) {
@@ -63,20 +59,24 @@ class TxList extends Component {
   }
 
   renderRows () {
-    const { address, netVersion } = this.props;
+    const { address, netVersion, blockNumber } = this.props;
+    const { editTransaction, cancelTransaction } = this.store;
 
     return this.store.sortedHashes.map((txhash) => {
       const tx = this.store.transactions[txhash];
-      const blockNumber = tx.blockNumber.toNumber();
-      const block = this.store.blocks[blockNumber];
+      const txBlockNumber = tx.blockNumber.toNumber();
+      const block = this.store.blocks[txBlockNumber];
 
       return (
         <TxRow
           key={ tx.hash }
           tx={ tx }
           block={ block }
+          blockNumber={ blockNumber }
           address={ address }
           netVersion={ netVersion }
+          editTransaction={ editTransaction }
+          cancelTransaction={ cancelTransaction }
         />
       );
     });
diff --git a/js/src/views/Signer/containers/RequestsPage/requestsPage.js b/js/src/views/Signer/containers/RequestsPage/requestsPage.js
index 327670a9d..8c2bf580f 100644
--- a/js/src/views/Signer/containers/RequestsPage/requestsPage.js
+++ b/js/src/views/Signer/containers/RequestsPage/requestsPage.js
@@ -22,7 +22,8 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
 import Store from '../../store';
-import * as RequestsActions from '~/redux/providers/signerActions';
+import { newError } from '~/redux/actions';
+import { startConfirmRequest, startRejectRequest } from '~/redux/providers/signerActions';
 import { Container, Page, TxList } from '~/ui';
 
 import RequestPending from '../../components/RequestPending';
@@ -36,12 +37,13 @@ class RequestsPage extends Component {
   };
 
   static propTypes = {
-    actions: PropTypes.shape({
-      startConfirmRequest: PropTypes.func.isRequired,
-      startRejectRequest: PropTypes.func.isRequired
-    }).isRequired,
     gasLimit: PropTypes.object.isRequired,
     netVersion: PropTypes.string.isRequired,
+    startConfirmRequest: PropTypes.func.isRequired,
+    startRejectRequest: PropTypes.func.isRequired,
+
+    blockNumber: PropTypes.object,
+    newError: PropTypes.func,
     signer: PropTypes.shape({
       pending: PropTypes.array.isRequired,
       finished: PropTypes.array.isRequired
@@ -69,6 +71,7 @@ class RequestsPage extends Component {
 
   renderLocalQueue () {
     const { localHashes } = this.store;
+    const { blockNumber, newError } = this.props;
 
     if (!localHashes.length) {
       return null;
@@ -85,7 +88,9 @@ class RequestsPage extends Component {
       >
         <TxList
           address=''
+          blockNumber={ blockNumber }
           hashes={ localHashes }
+          onNewError={ newError }
         />
       </Container>
     );
@@ -114,7 +119,7 @@ class RequestsPage extends Component {
         title={
           <FormattedMessage
             id='signer.requestsPage.pendingTitle'
-            defaultMessage='Pending Requests'
+            defaultMessage='Pending Signature Authorization'
           />
         }
       >
@@ -124,7 +129,7 @@ class RequestsPage extends Component {
   }
 
   renderPending = (data, index) => {
-    const { actions, gasLimit, netVersion } = this.props;
+    const { startConfirmRequest, startRejectRequest, gasLimit, netVersion } = this.props;
     const { date, id, isSending, payload, origin } = data;
 
     return (
@@ -137,8 +142,8 @@ class RequestsPage extends Component {
         isSending={ isSending }
         netVersion={ netVersion }
         key={ id }
-        onConfirm={ actions.startConfirmRequest }
-        onReject={ actions.startRejectRequest }
+        onConfirm={ startConfirmRequest }
+        onReject={ startRejectRequest }
         origin={ origin }
         payload={ payload }
         signerStore={ this.store }
@@ -148,11 +153,11 @@ class RequestsPage extends Component {
 }
 
 function mapStateToProps (state) {
-  const { gasLimit, netVersion } = state.nodeStatus;
-  const { actions, signer } = state;
+  const { gasLimit, netVersion, blockNumber } = state.nodeStatus;
+  const { signer } = state;
 
   return {
-    actions,
+    blockNumber,
     gasLimit,
     netVersion,
     signer
@@ -160,9 +165,11 @@ function mapStateToProps (state) {
 }
 
 function mapDispatchToProps (dispatch) {
-  return {
-    actions: bindActionCreators(RequestsActions, dispatch)
-  };
+  return bindActionCreators({
+    newError,
+    startConfirmRequest,
+    startRejectRequest
+  }, dispatch);
 }
 
 export default connect(
diff --git a/js/src/views/Signer/store.js b/js/src/views/Signer/store.js
index 76e3522f8..e99333159 100644
--- a/js/src/views/Signer/store.js
+++ b/js/src/views/Signer/store.js
@@ -95,7 +95,11 @@ export default class SignerStore {
     this._api.parity
       .localTransactions()
       .then((localTransactions) => {
-        this.setLocalHashes(Object.keys(localTransactions));
+        const keys = Object
+          .keys(localTransactions)
+          .filter((key) => localTransactions[key].status !== 'canceled');
+
+        this.setLocalHashes(keys);
       })
       .then(nextTimeout)
       .catch(nextTimeout);

From c9b2a7a980aee19d860e75c09058d98ab920800d Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Tue, 25 Apr 2017 08:31:15 +0000
Subject: [PATCH 054/117] [ci skip] js-precompiled 20170425-082717

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b012470da..fbcb579d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1773,7 +1773,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#8645ef0d41c9c325556fad8241f2cedaf4ce2d79"
+source = "git+https://github.com/paritytech/js-precompiled.git#ec0b7ad836a553142ab6e833bb3480f7fc570db7"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index f2e1f1770..b75ee9c5b 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.58",
+  "version": "1.7.59",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 80a58eea7b090b3d47597e50891441fcccd4c927 Mon Sep 17 00:00:00 2001
From: Leo Arias <leo.arias@canonical.com>
Date: Tue, 25 Apr 2017 08:20:57 -0600
Subject: [PATCH 055/117] Add the packaging metadata to build the parity snap
 (#5496)

* Add the packaging metadata to build the parity snap

* Move the snapcraft.yaml to scripts
---
 scripts/snapcraft.yaml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 scripts/snapcraft.yaml

diff --git a/scripts/snapcraft.yaml b/scripts/snapcraft.yaml
new file mode 100644
index 000000000..bd71df3de
--- /dev/null
+++ b/scripts/snapcraft.yaml
@@ -0,0 +1,22 @@
+name: parity
+version: master
+summary: Fast, light, robust Ethereum implementation
+description: |
+  Parity's goal is to be the fastest, lightest, and most secure Ethereum
+  client. We are developing Parity using the sophisticated and cutting-edge
+  Rust programming language. Parity is licensed under the GPLv3, and can be
+  used for all your Ethereum needs.
+
+grade: devel
+confinement: strict
+
+apps:
+  parity:
+    command: parity
+    plugs: [network, network-bind]
+
+parts:
+  parity:
+    source: ..
+    plugin: rust
+    build-packages: [g++, libudev-dev, libssl-dev, make, pkg-config]
\ No newline at end of file

From 9d6c50ea2fd625cacb7d645559abcb30b1e9c90a Mon Sep 17 00:00:00 2001
From: Nikolay Volf <nikvolf@gmail.com>
Date: Tue, 25 Apr 2017 19:48:31 +0300
Subject: [PATCH 056/117] Bump jsonrpc version (#5489)

* bump jsonrpc version

* also dependant crates

* tokio_uds also
---
 Cargo.lock | 71 ++++++++++++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 37 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d63eb49d8..93ccf8cc4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -617,7 +617,7 @@ dependencies = [
  "serde_derive 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-proto 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1037,7 +1037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "jsonrpc-core"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
 dependencies = [
  "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1049,7 +1049,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-http-server"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
 dependencies = [
  "hyper 0.10.0-a.0 (git+https://github.com/paritytech/hyper)",
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@@ -1062,19 +1062,20 @@ dependencies = [
 [[package]]
 name = "jsonrpc-ipc-server"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
 dependencies = [
+ "bytes 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-tokio-ipc 0.1.0 (git+https://github.com/nikvolf/parity-tokio-ipc)",
+ "parity-tokio-ipc 0.1.5 (git+https://github.com/nikvolf/parity-tokio-ipc)",
  "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "jsonrpc-macros"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
 dependencies = [
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-pubsub 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@@ -1084,7 +1085,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-minihttp-server"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
 dependencies = [
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@@ -1098,7 +1099,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-pubsub"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
 dependencies = [
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1108,19 +1109,20 @@ dependencies = [
 [[package]]
 name = "jsonrpc-server-utils"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
 dependencies = [
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "jsonrpc-tcp-server"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
 dependencies = [
+ "bytes 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1132,7 +1134,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-ws-server"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#ad0682785a693eba3069e48b57ec89abb62c3b60"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
 dependencies = [
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@@ -1740,18 +1742,19 @@ dependencies = [
 
 [[package]]
 name = "parity-tokio-ipc"
-version = "0.1.0"
-source = "git+https://github.com/nikvolf/parity-tokio-ipc#3d4234de6bdc78688ef803935111003080fd5375"
+version = "0.1.5"
+source = "git+https://github.com/nikvolf/parity-tokio-ipc#d6c5b3cfcc913a1b9cf0f0562a10b083ceb9fb7c"
 dependencies = [
+ "bytes 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-named-pipes 0.1.4 (git+https://github.com/alexcrichton/mio-named-pipes)",
  "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-line 0.1.0 (git+https://github.com/tokio-rs/tokio-line)",
- "tokio-named-pipes 0.1.0 (git+https://github.com/alexcrichton/tokio-named-pipes)",
- "tokio-uds 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-named-pipes 0.1.0 (git+https://github.com/nikvolf/tokio-named-pipes)",
+ "tokio-uds 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2468,12 +2471,12 @@ dependencies = [
  "mio 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-io"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2481,17 +2484,6 @@ dependencies = [
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "tokio-line"
-version = "0.1.0"
-source = "git+https://github.com/tokio-rs/tokio-line#482614ae0c82daf584727ae65a80d854fe861f81"
-dependencies = [
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-proto 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "tokio-minihttp"
 version = "0.1.0"
@@ -2510,11 +2502,13 @@ dependencies = [
 [[package]]
 name = "tokio-named-pipes"
 version = "0.1.0"
-source = "git+https://github.com/alexcrichton/tokio-named-pipes#3a22f8fc9a441b548aec25bd5df3b1e0ab99fabe"
+source = "git+https://github.com/nikvolf/tokio-named-pipes#0b9b728eaeb0a6673c287ac7692be398fd651752"
 dependencies = [
+ "bytes 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-named-pipes 0.1.4 (git+https://github.com/alexcrichton/mio-named-pipes)",
  "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2559,14 +2553,18 @@ dependencies = [
 
 [[package]]
 name = "tokio-uds"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "bytes 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-uds 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2901,7 +2899,7 @@ dependencies = [
 "checksum order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "efa535d5117d3661134dbf1719b6f0ffe06f2375843b13935db186cd094105eb"
 "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
 "checksum parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1d06f6ee0fda786df3784a96ee3f0629f529b91cbfb7d142f6410e6bcd1ce2c"
-"checksum parity-tokio-ipc 0.1.0 (git+https://github.com/nikvolf/parity-tokio-ipc)" = "<none>"
+"checksum parity-tokio-ipc 0.1.5 (git+https://github.com/nikvolf/parity-tokio-ipc)" = "<none>"
 "checksum parity-ui-precompiled 1.4.0 (git+https://github.com/paritytech/js-precompiled.git)" = "<none>"
 "checksum parity-wordlist 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07779ab11d958acbee30fcf644c99d3fae132d8fcb41282a25e1ee284097bdd2"
 "checksum parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aebb68eebde2c99f89592d925288600fde220177e46b5c9a91ca218d245aeedf"
@@ -2980,14 +2978,13 @@ dependencies = [
 "checksum time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "3c7ec6d62a20df54e07ab3b78b9a3932972f4b7981de295563686849eb3989af"
 "checksum tiny-keccak 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f7aef43048292ca0bae4ab32180e85f6202cf2816c2a210c396a84b99dab9270"
 "checksum tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "99e958104a67877907c1454386d5482fe8e965a55d60be834a15a44328e7dc76"
-"checksum tokio-io 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6a278fde45f1be68e44995227d426aaa4841e0980bb0a21b981092f28c3c8473"
-"checksum tokio-line 0.1.0 (git+https://github.com/tokio-rs/tokio-line)" = "<none>"
+"checksum tokio-io 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "48f55df1341bb92281f229a6030bc2abffde2c7a44c6d6b802b7687dd8be0775"
 "checksum tokio-minihttp 0.1.0 (git+https://github.com/tomusdrw/tokio-minihttp)" = "<none>"
-"checksum tokio-named-pipes 0.1.0 (git+https://github.com/alexcrichton/tokio-named-pipes)" = "<none>"
+"checksum tokio-named-pipes 0.1.0 (git+https://github.com/nikvolf/tokio-named-pipes)" = "<none>"
 "checksum tokio-proto 0.1.0 (git+https://github.com/tomusdrw/tokio-proto)" = "<none>"
 "checksum tokio-proto 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c0d6031f94d78d7b4d509d4a7c5e1cdf524a17e7b08d1c188a83cf720e69808"
 "checksum tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
-"checksum tokio-uds 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc7b5fc8e19e220b29566d1750949224a518478eab9cebc8df60583242ca30a"
+"checksum tokio-uds 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bd209039933255ea77c6d7a1d18abc20b997d161acb900acca6eb74cdd049f31"
 "checksum toml 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "fcd27a04ca509aff336ba5eb2abc58d456f52c4ff64d9724d88acb85ead560b6"
 "checksum toml 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a442dfc13508e603c3f763274361db7f79d7469a0e95c411cde53662ab30fc72"
 "checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"

From 87ce264926ff85c0aa452a2b9580d18a9132edd2 Mon Sep 17 00:00:00 2001
From: cdetrio <cdetrio@gmail.com>
Date: Tue, 25 Apr 2017 19:08:28 +0200
Subject: [PATCH 057/117] fix json format of state snapshot (#5504)

---
 parity/blockchain.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/parity/blockchain.rs b/parity/blockchain.rs
index 2796e71e3..757f303dd 100644
--- a/parity/blockchain.rs
+++ b/parity/blockchain.rs
@@ -461,7 +461,7 @@ fn execute_export_state(cmd: ExportState) -> Result<(), String> {
 	let at = cmd.at;
 	let mut i = 0usize;
 
-	out.write_fmt(format_args!("{{ \"state\": [", )).expect("Couldn't write to stream.");
+	out.write_fmt(format_args!("{{ \"state\": {{", )).expect("Couldn't write to stream.");
 	loop {
 		let accounts = client.list_accounts(at, last.as_ref(), 1000).ok_or("Specified block not found")?;
 		if accounts.is_empty() {
@@ -498,13 +498,11 @@ fn execute_export_state(cmd: ExportState) -> Result<(), String> {
 							break;
 						}
 
-						let mut si = 0;
 						for key in keys.into_iter() {
-							if si != 0 {
+							if last_storage.is_some() {
 								out.write(b",").expect("Write error");
 							}
 							out.write_fmt(format_args!("\n\t\"0x{}\": \"0x{}\"", key.hex(), client.storage_at(&account, &key, at).unwrap_or_else(Default::default).hex())).expect("Write error");
-							si += 1;
 							last_storage = Some(key);
 						}
 					}
@@ -519,7 +517,7 @@ fn execute_export_state(cmd: ExportState) -> Result<(), String> {
 			last = Some(account);
 		}
 	}
-	out.write_fmt(format_args!("\n]}}")).expect("Write error");
+	out.write_fmt(format_args!("\n}}}}")).expect("Write error");
 	info!("Export completed.");
 	Ok(())
 }

From 1a262048a69d35330bba91951c5f5aca0748e24e Mon Sep 17 00:00:00 2001
From: Svyatoslav Nikolsky <svyatonik@gmail.com>
Date: Tue, 25 Apr 2017 22:34:03 +0300
Subject: [PATCH 058/117] Fixing secretstore TODOs - part 2 (#5416)

* ECDKG protocol prototype

* added test for enc/dec math

* get rid of decryption_session

* added licenses

* fix after merge

* get rid of unused serde dependency

* doc

* decryption session [without commutative enc]

* failed_dec_session

* fixed tests

* added commen

* added more decryption session tests

* helper to localize an issue

* more computations to localize error

* decryption_session::SessionParams

* added tests for EC math to localize problem

* secretstore network transport

* encryption_session_works_over_network

* network errors processing

* connecting to KeyServer

* licenses

* get rid of debug println-s

* fixed secretstore args

* encryption results are stored in KS database

* decryption protocol works over network

* enc/dec Session traits

* fixing warnings

* fix after merge

* on-chain ACL checker proto

* fixed compilation

* fixed compilation

* finally fixed <odd>-of-N-scheme

* temporary commented test

* 1-of-N works in math

* scheme 1-of-N works

* updated AclStorage with real contract ABI

* remove unnecessary unsafety

* fixed grumbles

* wakeup on access denied

* encrypt secretstore messages

* 'shadow' decryption

* fix grumbles

* lost files

* secretstore cli-options

* decryption seccion when ACL check failed on master

* disallow regenerating key for existing document

* removed obsolete TODO

* fix after merge

* switched to tokio_io

* fix after merge

* fix after merge

* fix after merge

* fix after merge

* fix after merge

* fixed test

* fix after merge

* encryption session errors are now fatal

* session timeouts

* autorestart decryption session

* remove sessions on completion

* exclude disconnected nodes from decryption session

* test for enc/dec session over network with 1 node

* remove debug printlns

* fixed 1-of-1 scheme

* drop for KeyServerHttpListener

* added some tests

* fixed typo
---
 Cargo.lock                                    |   1 +
 parity/secretstore.rs                         |   3 -
 secret_store/Cargo.toml                       |   1 +
 secret_store/src/http_listener.rs             |  25 +-
 secret_store/src/key_server.rs                |  85 ++-
 .../src/key_server_cluster/cluster.rs         | 586 ++++++++++-----
 .../key_server_cluster/decryption_session.rs  | 357 +++++++--
 .../key_server_cluster/encryption_session.rs  | 685 ++++++------------
 .../src/key_server_cluster/io/message.rs      |  18 +-
 .../src/key_server_cluster/message.rs         |  42 +-
 secret_store/src/key_server_cluster/mod.rs    |   2 +-
 secret_store/src/key_storage.rs               |   6 +-
 secret_store/src/lib.rs                       |   5 +-
 secret_store/src/types/all.rs                 |  10 -
 14 files changed, 1051 insertions(+), 775 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 93ccf8cc4..10df3d472 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -603,6 +603,7 @@ dependencies = [
  "ethcore-ipc 1.7.0",
  "ethcore-ipc-codegen 1.7.0",
  "ethcore-ipc-nano 1.7.0",
+ "ethcore-logger 1.7.0",
  "ethcore-util 1.7.0",
  "ethcrypto 0.1.0",
  "ethkey 0.2.0",
diff --git a/parity/secretstore.rs b/parity/secretstore.rs
index 5a787b224..f215c937c 100644
--- a/parity/secretstore.rs
+++ b/parity/secretstore.rs
@@ -96,9 +96,6 @@ mod server {
 						port: port,
 					})).collect(),
 					allow_connecting_to_higher_nodes: true,
-					encryption_config: ethcore_secretstore::EncryptionConfiguration {
-						key_check_timeout_ms: 1000,
-					},
 				},
 			};
 
diff --git a/secret_store/Cargo.toml b/secret_store/Cargo.toml
index 062195737..b087358be 100644
--- a/secret_store/Cargo.toml
+++ b/secret_store/Cargo.toml
@@ -31,6 +31,7 @@ ethcore-devtools = { path = "../devtools" }
 ethcore-util = { path = "../util" }
 ethcore-ipc = { path = "../ipc/rpc" }
 ethcore-ipc-nano = { path = "../ipc/nano" }
+ethcore-logger = { path = "../logger" }
 ethcrypto = { path = "../ethcrypto" }
 ethkey = { path = "../ethkey" }
 native-contracts = { path = "../ethcore/native_contracts" }
diff --git a/secret_store/src/http_listener.rs b/secret_store/src/http_listener.rs
index e7737f160..482fa92f6 100644
--- a/secret_store/src/http_listener.rs
+++ b/secret_store/src/http_listener.rs
@@ -27,7 +27,7 @@ use url::percent_encoding::percent_decode;
 use util::ToPretty;
 use traits::KeyServer;
 use serialization::SerializableDocumentEncryptedKeyShadow;
-use types::all::{Error, ServiceConfiguration, RequestSignature, DocumentAddress, DocumentEncryptedKey, DocumentEncryptedKeyShadow};
+use types::all::{Error, NodeAddress, RequestSignature, DocumentAddress, DocumentEncryptedKey, DocumentEncryptedKeyShadow};
 
 /// Key server http-requests listener
 pub struct KeyServerHttpListener<T: KeyServer + 'static> {
@@ -60,7 +60,7 @@ struct KeyServerSharedHttpHandler<T: KeyServer + 'static> {
 
 impl<T> KeyServerHttpListener<T> where T: KeyServer + 'static {
 	/// Start KeyServer http listener
-	pub fn start(config: ServiceConfiguration, key_server: T) -> Result<Self, Error> {
+	pub fn start(listener_address: &NodeAddress, key_server: T) -> Result<Self, Error> {
 		let shared_handler = Arc::new(KeyServerSharedHttpHandler {
 			key_server: key_server,
 		});
@@ -68,7 +68,7 @@ impl<T> KeyServerHttpListener<T> where T: KeyServer + 'static {
 			handler: shared_handler.clone(),
 		};
 
-		let listener_addr: &str = &format!("{}:{}", config.listener_address.address, config.listener_address.port);
+		let listener_addr: &str = &format!("{}:{}", listener_address.address, listener_address.port);
 		let http_server = HttpServer::http(&listener_addr).expect("cannot start HttpServer");
 		let http_server = http_server.handle(handler).expect("cannot start HttpServer");
 		let listener = KeyServerHttpListener {
@@ -93,6 +93,13 @@ impl<T> KeyServer for KeyServerHttpListener<T> where T: KeyServer + 'static {
 	}
 }
 
+impl<T> Drop for KeyServerHttpListener<T> where T: KeyServer + 'static {
+	fn drop(&mut self) {
+		// ignore error as we are dropping anyway
+		let _ = self._http_server.close();
+	}
+}
+
 impl<T> HttpHandler for KeyServerHttpHandler<T> where T: KeyServer + 'static {
 	fn handle(&self, req: HttpRequest, mut res: HttpResponse) {
 		if req.headers.has::<header::Origin>() {
@@ -219,7 +226,17 @@ fn parse_request(method: &HttpMethod, uri_path: &str) -> Request {
 #[cfg(test)]
 mod tests {
 	use hyper::method::Method as HttpMethod;
-	use super::{parse_request, Request};
+	use key_server::tests::DummyKeyServer;
+	use types::all::NodeAddress;
+	use super::{parse_request, Request, KeyServerHttpListener};
+
+	#[test]
+	fn http_listener_successfully_drops() {
+		let key_server = DummyKeyServer;
+		let address = NodeAddress { address: "127.0.0.1".into(), port: 9000 };
+		let listener = KeyServerHttpListener::start(&address, key_server).unwrap();
+		drop(listener);
+	}
 
 	#[test]
 	fn parse_request_successful() {
diff --git a/secret_store/src/key_server.rs b/secret_store/src/key_server.rs
index 64dc47a50..49016ac8e 100644
--- a/secret_store/src/key_server.rs
+++ b/secret_store/src/key_server.rs
@@ -64,7 +64,7 @@ impl KeyServer for KeyServerImpl {
 
 		// generate document key
 		let encryption_session = self.data.lock().cluster.new_encryption_session(document.clone(), threshold)?;
-		let document_key = encryption_session.wait()?;
+		let document_key = encryption_session.wait(None)?;
 
 		// encrypt document key with requestor public key
 		let document_key = ethcrypto::ecies::encrypt_single_message(&public, &document_key)
@@ -104,7 +104,6 @@ impl KeyServerCore {
 				.map(|(node_id, node_address)| (node_id.clone(), (node_address.address.clone(), node_address.port)))
 				.collect(),
 			allow_connecting_to_higher_nodes: config.allow_connecting_to_higher_nodes,
-			encryption_config: config.encryption_config.clone(),
 			acl_storage: acl_storage,
 			key_storage: key_storage,
 		};
@@ -143,54 +142,108 @@ impl Drop for KeyServerCore {
 }
 
 #[cfg(test)]
-mod tests {
+pub mod tests {
 	use std::time;
 	use std::sync::Arc;
 	use ethcrypto;
 	use ethkey::{self, Random, Generator};
 	use acl_storage::tests::DummyAclStorage;
 	use key_storage::tests::DummyKeyStorage;
-	use types::all::{ClusterConfiguration, NodeAddress, EncryptionConfiguration};
+	use types::all::{Error, ClusterConfiguration, NodeAddress, RequestSignature, DocumentAddress, DocumentEncryptedKey, DocumentEncryptedKeyShadow};
 	use super::{KeyServer, KeyServerImpl};
 
-	#[test]
-	fn document_key_generation_and_retrievement_works_over_network() {
-		//::util::log::init_log();
+	pub struct DummyKeyServer;
 
-		let num_nodes = 3;
+	impl KeyServer for DummyKeyServer {
+		fn generate_document_key(&self, _signature: &RequestSignature, _document: &DocumentAddress, _threshold: usize) -> Result<DocumentEncryptedKey, Error> {
+			unimplemented!()
+		}
+
+		fn document_key(&self, _signature: &RequestSignature, _document: &DocumentAddress) -> Result<DocumentEncryptedKey, Error> {
+			unimplemented!()
+		}
+
+		fn document_key_shadow(&self, _signature: &RequestSignature, _document: &DocumentAddress) -> Result<DocumentEncryptedKeyShadow, Error> {
+			unimplemented!()
+		}
+	}
+
+	fn make_key_servers(start_port: u16, num_nodes: usize) -> Vec<KeyServerImpl> {
 		let key_pairs: Vec<_> = (0..num_nodes).map(|_| Random.generate().unwrap()).collect();
 		let configs: Vec<_> = (0..num_nodes).map(|i| ClusterConfiguration {
 				threads: 1,
 				self_private: (***key_pairs[i].secret()).into(),
 				listener_address: NodeAddress {
 					address: "127.0.0.1".into(),
-					port: 6060 + (i as u16),
+					port: start_port + (i as u16),
 				},
 				nodes: key_pairs.iter().enumerate().map(|(j, kp)| (kp.public().clone(),
 					NodeAddress {
 						address: "127.0.0.1".into(),
-						port: 6060 + (j as u16),
+						port: start_port + (j as u16),
 					})).collect(),
 				allow_connecting_to_higher_nodes: false,
-				encryption_config: EncryptionConfiguration {
-					key_check_timeout_ms: 10,
-				},
 			}).collect();
 		let key_servers: Vec<_> = configs.into_iter().map(|cfg|
 			KeyServerImpl::new(&cfg, Arc::new(DummyAclStorage::default()), Arc::new(DummyKeyStorage::default())).unwrap()
 		).collect();
 
-		// wait until connections are established
+		// wait until connections are established. It is fast => do not bother with events here
 		let start = time::Instant::now();
+		let mut tried_reconnections = false;
 		loop {
 			if key_servers.iter().all(|ks| ks.cluster().cluster_state().connected.len() == num_nodes - 1) {
 				break;
 			}
-			if time::Instant::now() - start > time::Duration::from_millis(30000) {
-				panic!("connections are not established in 30000ms");
+
+			let old_tried_reconnections = tried_reconnections;
+			let mut fully_connected = true;
+			for key_server in &key_servers {
+				if key_server.cluster().cluster_state().connected.len() != num_nodes - 1 {
+					fully_connected = false;
+					if !old_tried_reconnections {
+						tried_reconnections = true;
+						key_server.cluster().connect();
+					}
+				}
+			}
+			if fully_connected {
+				break;
+			}
+			if time::Instant::now() - start > time::Duration::from_millis(1000) {
+				panic!("connections are not established in 1000ms");
 			}
 		}
 
+		key_servers
+	}
+
+	#[test]
+	fn document_key_generation_and_retrievement_works_over_network_with_single_node() {
+		//::logger::init_log();
+		let key_servers = make_key_servers(6070, 1);
+
+		// generate document key
+		let threshold = 0;
+		let document = Random.generate().unwrap().secret().clone();
+		let secret = Random.generate().unwrap().secret().clone();
+		let signature = ethkey::sign(&secret, &document).unwrap();
+		let generated_key = key_servers[0].generate_document_key(&signature, &document, threshold).unwrap();
+		let generated_key = ethcrypto::ecies::decrypt_single_message(&secret, &generated_key).unwrap();
+
+		// now let's try to retrieve key back
+		for key_server in key_servers.iter() {
+			let retrieved_key = key_server.document_key(&signature, &document).unwrap();
+			let retrieved_key = ethcrypto::ecies::decrypt_single_message(&secret, &retrieved_key).unwrap();
+			assert_eq!(retrieved_key, generated_key);
+		}
+	}
+
+	#[test]
+	fn document_key_generation_and_retrievement_works_over_network_with_3_nodes() {
+		//::logger::init_log();
+		let key_servers = make_key_servers(6080, 3);
+
 		let test_cases = [0, 1, 2];
 		for threshold in &test_cases {
 			// generate document key
diff --git a/secret_store/src/key_server_cluster/cluster.rs b/secret_store/src/key_server_cluster/cluster.rs
index 55b302757..bd857bda8 100644
--- a/secret_store/src/key_server_cluster/cluster.rs
+++ b/secret_store/src/key_server_cluster/cluster.rs
@@ -17,6 +17,7 @@
 use std::io;
 use std::time;
 use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::collections::{BTreeMap, BTreeSet, VecDeque};
 use std::collections::btree_map::Entry;
 use std::net::{SocketAddr, IpAddr};
@@ -24,19 +25,46 @@ use futures::{finished, failed, Future, Stream, BoxFuture};
 use futures_cpupool::CpuPool;
 use parking_lot::{RwLock, Mutex};
 use tokio_io::IoFuture;
-use tokio_core::reactor::{Handle, Remote, Timeout, Interval};
+use tokio_core::reactor::{Handle, Remote, Interval};
 use tokio_core::net::{TcpListener, TcpStream};
 use ethkey::{Secret, KeyPair, Signature, Random, Generator};
-use key_server_cluster::{Error, NodeId, SessionId, EncryptionConfiguration, AclStorage, KeyStorage};
+use key_server_cluster::{Error, NodeId, SessionId, AclStorage, KeyStorage};
 use key_server_cluster::message::{self, Message, ClusterMessage, EncryptionMessage, DecryptionMessage};
-use key_server_cluster::decryption_session::{SessionImpl as DecryptionSessionImpl, DecryptionSessionId,
-	SessionParams as DecryptionSessionParams, Session as DecryptionSession};
+use key_server_cluster::decryption_session::{SessionImpl as DecryptionSessionImpl, SessionState as DecryptionSessionState,
+	SessionParams as DecryptionSessionParams, Session as DecryptionSession, DecryptionSessionId};
 use key_server_cluster::encryption_session::{SessionImpl as EncryptionSessionImpl, SessionState as EncryptionSessionState,
 	SessionParams as EncryptionSessionParams, Session as EncryptionSession};
 use key_server_cluster::io::{DeadlineStatus, ReadMessage, SharedTcpStream, read_encrypted_message, WriteMessage, write_encrypted_message};
 use key_server_cluster::net::{accept_connection as net_accept_connection, connect as net_connect, Connection as NetConnection};
 
-pub type BoxedEmptyFuture = BoxFuture<(), ()>;
+/// Maintain interval (seconds). Every MAINTAIN_INTERVAL seconds node:
+/// 1) checks if connected nodes are responding to KeepAlive messages
+/// 2) tries to connect to disconnected nodes
+/// 3) checks if enc/dec sessions are time-outed
+const MAINTAIN_INTERVAL: u64 = 10;
+
+/// When no messages have been received from node within KEEP_ALIVE_SEND_INTERVAL seconds,
+/// we must send KeepAlive message to the node to check if it still responds to messages.
+const KEEP_ALIVE_SEND_INTERVAL: u64 = 30;
+/// When no messages have been received from node within KEEP_ALIVE_DISCONNECT_INTERVAL seconds,
+/// we must treat this node as non-responding && disconnect from it.
+const KEEP_ALIVE_DISCONNECT_INTERVAL: u64 = 60;
+
+/// When there are no encryption session-related messages for ENCRYPTION_SESSION_TIMEOUT_INTERVAL seconds,
+/// we must treat this session as stalled && finish it with an error.
+/// This timeout is for cases when node is responding to KeepAlive messages, but intentionally ignores
+/// session messages.
+const ENCRYPTION_SESSION_TIMEOUT_INTERVAL: u64 = 60;
+
+/// When there are no decryption session-related messages for DECRYPTION_SESSION_TIMEOUT_INTERVAL seconds,
+/// we must treat this session as stalled && finish it with an error.
+/// This timeout is for cases when node is responding to KeepAlive messages, but intentionally ignores
+/// session messages.
+const DECRYPTION_SESSION_TIMEOUT_INTERVAL: u64 = 60;
+
+/// Encryption sesion timeout interval. It works
+/// Empty future.
+type BoxedEmptyFuture = BoxFuture<(), ()>;
 
 /// Cluster interface for external clients.
 pub trait ClusterClient: Send + Sync {
@@ -46,6 +74,16 @@ pub trait ClusterClient: Send + Sync {
 	fn new_encryption_session(&self, session_id: SessionId, threshold: usize) -> Result<Arc<EncryptionSession>, Error>;
 	/// Start new decryption session.
 	fn new_decryption_session(&self, session_id: SessionId, requestor_signature: Signature, is_shadow_decryption: bool) -> Result<Arc<DecryptionSession>, Error>;
+
+	#[cfg(test)]
+	/// Ask node to make 'faulty' encryption sessions.
+	fn make_faulty_encryption_sessions(&self);
+	#[cfg(test)]
+	/// Get active encryption session with given id.
+	fn encryption_session(&self, session_id: &SessionId) -> Option<Arc<EncryptionSessionImpl>>;
+	#[cfg(test)]
+	/// Try connect to disconnected nodes.
+	fn connect(&self);
 }
 
 /// Cluster access for single encryption/decryption participant.
@@ -54,8 +92,6 @@ pub trait Cluster: Send + Sync {
 	fn broadcast(&self, message: Message) -> Result<(), Error>;
 	/// Send message to given node.
 	fn send(&self, to: &NodeId, message: Message) -> Result<(), Error>;
-	/// Blacklist node, close connection and remove all pending messages.
-	fn blacklist(&self, node: &NodeId);
 }
 
 #[derive(Clone)]
@@ -71,8 +107,6 @@ pub struct ClusterConfiguration {
 	pub listen_address: (String, u16),
 	/// Cluster nodes.
 	pub nodes: BTreeMap<NodeId, (String, u16)>,
-	/// Encryption session configuration.
-	pub encryption_config: EncryptionConfiguration,
 	/// Reference to key storage
 	pub key_storage: Arc<KeyStorage>,
 	/// Reference to ACL storage
@@ -136,6 +170,8 @@ pub struct ClusterConnections {
 pub struct ClusterSessions {
 	/// Self node id.
 	pub self_node_id: NodeId,
+	/// All nodes ids.
+	pub nodes: BTreeSet<NodeId>,
 	/// Reference to key storage
 	pub key_storage: Arc<KeyStorage>,
 	/// Reference to ACL storage
@@ -144,10 +180,18 @@ pub struct ClusterSessions {
 	pub encryption_sessions: RwLock<BTreeMap<SessionId, QueuedEncryptionSession>>,
 	/// Active decryption sessions.
 	pub decryption_sessions: RwLock<BTreeMap<DecryptionSessionId, QueuedDecryptionSession>>,
+	/// Make faulty encryption sessions.
+	pub make_faulty_encryption_sessions: AtomicBool,
 }
 
 /// Encryption session and its message queue.
 pub struct QueuedEncryptionSession {
+	/// Session master.
+	pub master: NodeId,
+	/// Cluster view.
+	pub cluster_view: Arc<ClusterView>,
+	/// Last received message time.
+	pub last_message_time: time::Instant,
 	/// Encryption session.
 	pub session: Arc<EncryptionSessionImpl>,
 	/// Messages queue.
@@ -156,6 +200,12 @@ pub struct QueuedEncryptionSession {
 
 /// Decryption session and its message queue.
 pub struct QueuedDecryptionSession {
+	/// Session master.
+	pub master: NodeId,
+	/// Cluster view.
+	pub cluster_view: Arc<ClusterView>,
+	/// Last received message time.
+	pub last_message_time: time::Instant,
 	/// Decryption session.
 	pub session: Arc<DecryptionSessionImpl>,
 	/// Messages queue.
@@ -217,17 +267,28 @@ impl ClusterCore {
 		self.data.connection(node)
 	}
 
-	/// Run cluster
+	/// Run cluster.
 	pub fn run(&self) -> Result<(), Error> {
-		// try to connect to every other peer
-		ClusterCore::connect_disconnected_nodes(self.data.clone());
+		self.run_listener()
+			.and_then(|_| self.run_connections())?;
 
 		// schedule maintain procedures
 		ClusterCore::schedule_maintain(&self.handle, self.data.clone());
 
-		// start listening for incoming connections
-		self.handle.spawn(ClusterCore::listen(&self.handle, self.data.clone(), self.listen_address.clone())?);
+		Ok(())
+	}
 
+	/// Start listening for incoming connections.
+	pub fn run_listener(&self) -> Result<(), Error> {
+		// start listeining for incoming connections
+		self.handle.spawn(ClusterCore::listen(&self.handle, self.data.clone(), self.listen_address.clone())?);
+		Ok(())
+	}
+
+	/// Start connecting to other nodes.
+	pub fn run_connections(&self) -> Result<(), Error> {
+		// try to connect to every other peer
+		ClusterCore::connect_disconnected_nodes(self.data.clone());
 		Ok(())
 	}
 
@@ -278,18 +339,24 @@ impl ClusterCore {
 
 	/// Schedule mainatain procedures.
 	fn schedule_maintain(handle: &Handle, data: Arc<ClusterData>) {
-		// TODO: per-session timeouts (node can respond to messages, but ignore sessions messages)
-		let (d1, d2, d3) = (data.clone(), data.clone(), data.clone());
-		let interval: BoxedEmptyFuture = Interval::new(time::Duration::new(10, 0), handle)
+		let d = data.clone();
+		let interval: BoxedEmptyFuture = Interval::new(time::Duration::new(MAINTAIN_INTERVAL, 0), handle)
 			.expect("failed to create interval")
-			.and_then(move |_| Ok(trace!(target: "secretstore_net", "{}: executing maintain procedures", d1.self_key_pair.public())))
-			.and_then(move |_| Ok(ClusterCore::keep_alive(d2.clone())))
-			.and_then(move |_| Ok(ClusterCore::connect_disconnected_nodes(d3.clone())))
+			.and_then(move |_| Ok(ClusterCore::maintain(data.clone())))
 			.for_each(|_| Ok(()))
 			.then(|_| finished(()))
 			.boxed();
 
-		data.spawn(interval);
+		d.spawn(interval);
+	}
+
+	/// Execute maintain procedures.
+	fn maintain(data: Arc<ClusterData>) {
+		trace!(target: "secretstore_net", "{}: executing maintain procedures", data.self_key_pair.public());
+
+		ClusterCore::keep_alive(data.clone());
+		ClusterCore::connect_disconnected_nodes(data.clone());
+		data.sessions.stop_stalled_sessions();
 	}
 
 	/// Called for every incomming mesage.
@@ -324,11 +391,11 @@ impl ClusterCore {
 	fn keep_alive(data: Arc<ClusterData>) {
 		for connection in data.connections.active_connections() {
 			let last_message_diff = time::Instant::now() - connection.last_message_time();
-			if last_message_diff > time::Duration::from_secs(60) {
+			if last_message_diff > time::Duration::from_secs(KEEP_ALIVE_DISCONNECT_INTERVAL) {
 				data.connections.remove(connection.node_id(), connection.is_inbound());
 				data.sessions.on_connection_timeout(connection.node_id());
 			}
-			else if last_message_diff > time::Duration::from_secs(30) {
+			else if last_message_diff > time::Duration::from_secs(KEEP_ALIVE_SEND_INTERVAL) {
 				data.spawn(connection.send_message(Message::Cluster(ClusterMessage::KeepAlive(message::KeepAlive {}))));
 			}
 		}
@@ -370,7 +437,7 @@ impl ClusterCore {
 	/// Process single message from the connection.
 	fn process_connection_message(data: Arc<ClusterData>, connection: Arc<Connection>, message: Message) {
 		connection.set_last_message_time(time::Instant::now());
-		trace!(target: "secretstore_net", "{}: processing message {} from {}", data.self_key_pair.public(), message, connection.node_id());
+		trace!(target: "secretstore_net", "{}: received message {} from {}", data.self_key_pair.public(), message, connection.node_id());
 		match message {
 			Message::Encryption(message) => ClusterCore::process_encryption_message(data, connection, message),
 			Message::Decryption(message) => ClusterCore::process_decryption_message(data, connection, message),
@@ -380,102 +447,53 @@ impl ClusterCore {
 
 	/// Process single encryption message from the connection.
 	fn process_encryption_message(data: Arc<ClusterData>, connection: Arc<Connection>, mut message: EncryptionMessage) {
-		let mut sender = connection.node_id().clone();
-		let mut is_queued_message = false;
 		let session_id = message.session_id().clone();
-		let key_check_timeout_ms = data.config.encryption_config.key_check_timeout_ms;
+		let mut sender = connection.node_id().clone();
+		let session = match message {
+			EncryptionMessage::InitializeSession(_) => {
+				let mut connected_nodes = data.connections.connected_nodes();
+				connected_nodes.insert(data.self_key_pair.public().clone());
+
+				let cluster = Arc::new(ClusterView::new(data.clone(), connected_nodes));
+				data.sessions.new_encryption_session(sender.clone(), session_id.clone(), cluster)
+			},
+			_ => {
+				data.sessions.encryption_session(&session_id)
+					.ok_or(Error::InvalidSessionId)
+			},
+		};
+
+		let mut is_queued_message = false;
 		loop {
-			let result = match message {
-				EncryptionMessage::InitializeSession(ref message) => {
-					let mut connected_nodes = data.connections.connected_nodes();
-					connected_nodes.insert(data.self_key_pair.public().clone());
-
-					let cluster = Arc::new(ClusterView::new(data.clone(), connected_nodes));
-					let session_id: SessionId = message.session.clone().into();
-					data.sessions.new_encryption_session(sender.clone(), session_id.clone(), cluster)
-						.and_then(|s| s.on_initialize_session(sender.clone(), message))
-				},
-				EncryptionMessage::ConfirmInitialization(ref message) => data.sessions.encryption_session(&*message.session)
-					.ok_or(Error::InvalidSessionId)
-					.and_then(|s| s.on_confirm_initialization(sender.clone(), message)),
-				EncryptionMessage::CompleteInitialization(ref message) => data.sessions.encryption_session(&*message.session)
-					.ok_or(Error::InvalidSessionId)
-					.and_then(|s| s.on_complete_initialization(sender.clone(), message)),
-				EncryptionMessage::KeysDissemination(ref message) => data.sessions.encryption_session(&*message.session)
-					.ok_or(Error::InvalidSessionId)
-					.and_then(|s| {
-						// TODO: move this logic to session (or session connector)
-						let is_in_key_check_state = s.state() == EncryptionSessionState::KeyCheck;
-						let result = s.on_keys_dissemination(sender.clone(), message);
-						if !is_in_key_check_state && s.state() == EncryptionSessionState::KeyCheck {
-							let session = s.clone();
-							let d = data.clone();
-							data.handle.spawn(move |handle|
-								Timeout::new(time::Duration::new(key_check_timeout_ms / 1000, 0), handle)
-									.expect("failed to create timeout")
-									.and_then(move |_| {
-										if let Err(error) = session.start_key_generation_phase() {
-											session.on_session_error(d.self_key_pair.public().clone(), &message::SessionError {
-												session: session.id().clone().into(),
-												error: error.into(),
-											});
-										}
-										Ok(())
-									})
-									.then(|_| finished(()))
-							);
-						}
-
-						result
-					}),
-				EncryptionMessage::Complaint(ref message) => data.sessions.encryption_session(&*message.session)
-					.ok_or(Error::InvalidSessionId)
-					.and_then(|s| s.on_complaint(sender.clone(), message)),
-				EncryptionMessage::ComplaintResponse(ref message) => data.sessions.encryption_session(&*message.session)
-					.ok_or(Error::InvalidSessionId)
-					.and_then(|s| s.on_complaint_response(sender.clone(), message)),
-				EncryptionMessage::PublicKeyShare(ref message) => data.sessions.encryption_session(&*message.session)
-					.ok_or(Error::InvalidSessionId)
-					.and_then(|s| s.on_public_key_share(sender.clone(), message)),
-				EncryptionMessage::SessionError(ref message) => {
-						if let Some(s) = data.sessions.encryption_session(&*message.session) {
-							data.sessions.remove_encryption_session(s.id());
-							s.on_session_error(sender.clone(), message);
-						}
-						Ok(())
-					},
-				EncryptionMessage::SessionCompleted(ref message) => data.sessions.encryption_session(&*message.session)
-					.ok_or(Error::InvalidSessionId)
-					.and_then(|s| {
-						let result = s.on_session_completed(sender.clone(), message);
-						if result.is_ok() && s.state() == EncryptionSessionState::Finished {
-							data.sessions.remove_encryption_session(s.id());
-						}
-
-						result
-					}),
-			};
-
-			match result {
-				Err(Error::TooEarlyForRequest) => {
-					data.sessions.enqueue_encryption_message(&session_id, sender, message, is_queued_message);
-					break;
-				},
-				Err(err) => {
-					warn!(target: "secretstore_net", "{}: error {} when processing message {} from node {}", data.self_key_pair.public(), err, message, sender);
-					if let Some(connection) = data.connections.get(&sender) {
-						data.spawn(connection.send_message(Message::Encryption(EncryptionMessage::SessionError(message::SessionError {
-							session: session_id.clone().into(),
-							error: format!("{:?}", err),
-						}))));
+			match session.clone().and_then(|session| match message {
+				EncryptionMessage::InitializeSession(ref message) =>
+					session.on_initialize_session(sender.clone(), message),
+				EncryptionMessage::ConfirmInitialization(ref message) =>
+					session.on_confirm_initialization(sender.clone(), message),
+				EncryptionMessage::CompleteInitialization(ref message) =>
+					session.on_complete_initialization(sender.clone(), message),
+				EncryptionMessage::KeysDissemination(ref message) =>
+					session.on_keys_dissemination(sender.clone(), message),
+				EncryptionMessage::PublicKeyShare(ref message) =>
+					session.on_public_key_share(sender.clone(), message),
+				EncryptionMessage::SessionError(ref message) =>
+					session.on_session_error(sender.clone(), message),
+				EncryptionMessage::SessionCompleted(ref message) => 
+					session.on_session_completed(sender.clone(), message),
+			}) {
+				Ok(_) => {
+					// if session is completed => stop
+					let session = session.clone().expect("session.method() call finished with success; session exists; qed");
+					let session_state = session.state();
+					if session_state == EncryptionSessionState::Finished {
+						info!(target: "secretstore_net", "{}: encryption session completed", data.self_key_pair.public());
 					}
-
-					if err != Error::InvalidSessionId {
+					if session_state == EncryptionSessionState::Finished || session_state == EncryptionSessionState::Failed {
 						data.sessions.remove_encryption_session(&session_id);
+						break;
 					}
-					break;
-				},
-				_ => {
+
+					// try to dequeue message
 					match data.sessions.dequeue_encryption_message(&session_id) {
 						Some((msg_sender, msg)) => {
 							is_queued_message = true;
@@ -485,64 +503,73 @@ impl ClusterCore {
 						None => break,
 					}
 				},
+				Err(Error::TooEarlyForRequest) => {
+					data.sessions.enqueue_encryption_message(&session_id, sender, message, is_queued_message);
+					break;
+				},
+				Err(err) => {
+					warn!(target: "secretstore_net", "{}: encryption session error {} when processing message {} from node {}", data.self_key_pair.public(), err, message, sender);
+					data.sessions.respond_with_encryption_error(&session_id, message::SessionError {
+						session: session_id.clone().into(),
+						error: format!("{:?}", err),
+					});
+					if err != Error::InvalidSessionId {
+						data.sessions.remove_encryption_session(&session_id);
+					}
+					break;
+				},
 			}
 		}
 	}
 
 	/// Process single decryption message from the connection.
 	fn process_decryption_message(data: Arc<ClusterData>, connection: Arc<Connection>, mut message: DecryptionMessage) {
-		let mut sender = connection.node_id().clone();
-		let mut is_queued_message = false;
 		let session_id = message.session_id().clone();
 		let sub_session_id = message.sub_session_id().clone();
+		let mut sender = connection.node_id().clone();
+		let session = match message {
+			DecryptionMessage::InitializeDecryptionSession(_) => {
+				let mut connected_nodes = data.connections.connected_nodes();
+				connected_nodes.insert(data.self_key_pair.public().clone());
+
+				let cluster = Arc::new(ClusterView::new(data.clone(), connected_nodes));
+				data.sessions.new_decryption_session(sender.clone(), session_id.clone(), sub_session_id.clone(), cluster)
+			},
+			_ => {
+				data.sessions.decryption_session(&session_id, &sub_session_id)
+					.ok_or(Error::InvalidSessionId)
+			},
+		};
+
+		let mut is_queued_message = false;
 		loop {
-			let result = match message {
-				DecryptionMessage::InitializeDecryptionSession(ref message) => {
-					let mut connected_nodes = data.connections.connected_nodes();
-					connected_nodes.insert(data.self_key_pair.public().clone());
-
-					let cluster = Arc::new(ClusterView::new(data.clone(), connected_nodes));
-					data.sessions.new_decryption_session(sender.clone(), session_id.clone(), sub_session_id.clone(), cluster)
-						.and_then(|s| s.on_initialize_session(sender.clone(), message))
-				},
-				DecryptionMessage::ConfirmDecryptionInitialization(ref message) => data.sessions.decryption_session(&*message.session, &*message.sub_session)
-					.ok_or(Error::InvalidSessionId)
-					.and_then(|s| s.on_confirm_initialization(sender.clone(), message)),
-				DecryptionMessage::RequestPartialDecryption(ref message) => data.sessions.decryption_session(&*message.session, &*message.sub_session)
-					.ok_or(Error::InvalidSessionId)
-					.and_then(|s| s.on_partial_decryption_requested(sender.clone(), message)),
-				DecryptionMessage::PartialDecryption(ref message) => data.sessions.decryption_session(&*message.session, &*message.sub_session)
-					.ok_or(Error::InvalidSessionId)
-					.and_then(|s| s.on_partial_decryption(sender.clone(), message)),
-				DecryptionMessage::DecryptionSessionError(ref message) => {
-						if let Some(s) = data.sessions.decryption_session(&*message.session, &*message.sub_session) {
-							data.sessions.remove_decryption_session(&session_id, &sub_session_id);
-							s.on_session_error(sender.clone(), message);
-						}
-						Ok(())
-					},
-			};
-
-			match result {
-				Err(Error::TooEarlyForRequest) => {
-					data.sessions.enqueue_decryption_message(&session_id, &sub_session_id, sender, message, is_queued_message);
-					break;
-				},
-				Err(err) => {
-					if let Some(connection) = data.connections.get(&sender) {
-						data.spawn(connection.send_message(Message::Decryption(DecryptionMessage::DecryptionSessionError(message::DecryptionSessionError {
-							session: session_id.clone().into(),
-							sub_session: sub_session_id.clone().into(),
-							error: format!("{:?}", err),
-						}))));
+			match session.clone().and_then(|session| match message {
+				DecryptionMessage::InitializeDecryptionSession(ref message) =>
+					session.on_initialize_session(sender.clone(), message),
+				DecryptionMessage::ConfirmDecryptionInitialization(ref message) =>
+					session.on_confirm_initialization(sender.clone(), message),
+				DecryptionMessage::RequestPartialDecryption(ref message) => 
+					session.on_partial_decryption_requested(sender.clone(), message),
+				DecryptionMessage::PartialDecryption(ref message) => 
+					session.on_partial_decryption(sender.clone(), message),
+				DecryptionMessage::DecryptionSessionError(ref message) => 
+					session.on_session_error(sender.clone(), message),
+				DecryptionMessage::DecryptionSessionCompleted(ref message) => 
+					session.on_session_completed(sender.clone(), message),
+			}) {
+				Ok(_) => {
+					// if session is completed => stop
+					let session = session.clone().expect("session.method() call finished with success; session exists; qed");
+					let session_state = session.state();
+					if session_state == DecryptionSessionState::Finished {
+						info!(target: "secretstore_net", "{}: decryption session completed", data.self_key_pair.public());
 					}
-
-					if err != Error::InvalidSessionId {
+					if session_state == DecryptionSessionState::Finished || session_state == DecryptionSessionState::Failed {
 						data.sessions.remove_decryption_session(&session_id, &sub_session_id);
+						break;
 					}
-					break;
-				},
-				_ => {
+
+					// try to dequeue message
 					match data.sessions.dequeue_decryption_message(&session_id, &sub_session_id) {
 						Some((msg_sender, msg)) => {
 							is_queued_message = true;
@@ -552,6 +579,22 @@ impl ClusterCore {
 						None => break,
 					}
 				},
+				Err(Error::TooEarlyForRequest) => {
+					data.sessions.enqueue_decryption_message(&session_id, &sub_session_id, sender, message, is_queued_message);
+					break;
+				},
+				Err(err) => {
+					warn!(target: "secretstore_net", "{}: decryption session error {} when processing message {} from node {}", data.self_key_pair.public(), err, message, sender);
+					data.sessions.respond_with_decryption_error(&session_id, &sub_session_id, &sender, message::DecryptionSessionError {
+						session: session_id.clone().into(),
+						sub_session: sub_session_id.clone().into(),
+						error: format!("{:?}", err),
+					});
+					if err != Error::InvalidSessionId {
+						data.sessions.remove_decryption_session(&session_id, &sub_session_id);
+					}
+					break;
+				},
 			}
 		}
 	}
@@ -602,6 +645,7 @@ impl ClusterConnections {
 				return false;
 			}
 		}
+
 		trace!(target: "secretstore_net", "{}: inserting connection to {} at {}", self.self_node_id, connection.node_id(), connection.node_address());
 		connections.insert(connection.node_id().clone(), connection);
 		true
@@ -640,14 +684,16 @@ impl ClusterSessions {
 	pub fn new(config: &ClusterConfiguration) -> Self {
 		ClusterSessions {
 			self_node_id: config.self_key_pair.public().clone(),
+			nodes: config.nodes.keys().cloned().collect(),
 			acl_storage: config.acl_storage.clone(),
 			key_storage: config.key_storage.clone(),
 			encryption_sessions: RwLock::new(BTreeMap::new()),
 			decryption_sessions: RwLock::new(BTreeMap::new()),
+			make_faulty_encryption_sessions: AtomicBool::new(false),
 		}
 	}
 
-	pub fn new_encryption_session(&self, _master: NodeId, session_id: SessionId, cluster: Arc<Cluster>) -> Result<Arc<EncryptionSessionImpl>, Error> {
+	pub fn new_encryption_session(&self, master: NodeId, session_id: SessionId, cluster: Arc<ClusterView>) -> Result<Arc<EncryptionSessionImpl>, Error> {
 		let mut encryption_sessions = self.encryption_sessions.write();
 		// check that there's no active encryption session with the same id
 		if encryption_sessions.contains_key(&session_id) {
@@ -658,16 +704,28 @@ impl ClusterSessions {
 			return Err(Error::DuplicateSessionId);
 		}
 
+		// communicating to all other nodes is crucial for encryption session
+		// => check that we have connections to all cluster nodes
+		if self.nodes.iter().any(|n| !cluster.is_connected(n)) {
+			return Err(Error::NodeDisconnected);
+		}
+
 		let session = Arc::new(EncryptionSessionImpl::new(EncryptionSessionParams {
 			id: session_id.clone(),
 			self_node_id: self.self_node_id.clone(),
 			key_storage: self.key_storage.clone(),
-			cluster: cluster,
+			cluster: cluster.clone(),
 		}));
 		let encryption_session = QueuedEncryptionSession {
+			master: master,
+			cluster_view: cluster,
+			last_message_time: time::Instant::now(),
 			session: session.clone(),
 			queue: VecDeque::new()
 		};
+		if self.make_faulty_encryption_sessions.load(Ordering::Relaxed) {
+			encryption_session.session.simulate_faulty_behaviour();
+		}
 		encryption_sessions.insert(session_id, encryption_session);
 		Ok(session)
 	}
@@ -691,22 +749,50 @@ impl ClusterSessions {
 			.and_then(|session| session.queue.pop_front())
 	}
 
-	pub fn new_decryption_session(&self, _master: NodeId, session_id: SessionId, sub_session_id: Secret, cluster: Arc<Cluster>) -> Result<Arc<DecryptionSessionImpl>, Error> {
+	pub fn respond_with_encryption_error(&self, session_id: &SessionId, error: message::SessionError) {
+		self.encryption_sessions.read().get(session_id)
+			.map(|s| {
+				// error in encryption session is considered fatal
+				// => broadcast error
+
+				// do not bother processing send error, as we already processing error
+				let _ = s.cluster_view.broadcast(Message::Encryption(EncryptionMessage::SessionError(error)));
+			});
+	}
+
+	#[cfg(test)]
+	pub fn make_faulty_encryption_sessions(&self) {
+		self.make_faulty_encryption_sessions.store(true, Ordering::Relaxed);
+	}
+
+	pub fn new_decryption_session(&self, master: NodeId, session_id: SessionId, sub_session_id: Secret, cluster: Arc<ClusterView>) -> Result<Arc<DecryptionSessionImpl>, Error> {
 		let mut decryption_sessions = self.decryption_sessions.write();
 		let session_id = DecryptionSessionId::new(session_id, sub_session_id);
 		if decryption_sessions.contains_key(&session_id) {
 			return Err(Error::DuplicateSessionId);
 		}
 
+		// some of nodes, which were encrypting secret may be down
+		// => do not use these in decryption session
+		let mut encrypted_data = self.key_storage.get(&session_id.id).map_err(|e| Error::KeyStorage(e.into()))?;
+		let disconnected_nodes: BTreeSet<_> = encrypted_data.id_numbers.keys().cloned().collect();
+		let disconnected_nodes: BTreeSet<_> = disconnected_nodes.difference(&cluster.nodes()).cloned().collect();
+		for disconnected_node in disconnected_nodes {
+			encrypted_data.id_numbers.remove(&disconnected_node);
+		}
+
 		let session = Arc::new(DecryptionSessionImpl::new(DecryptionSessionParams {
 			id: session_id.id.clone(),
 			access_key: session_id.access_key.clone(),
 			self_node_id: self.self_node_id.clone(),
-			encrypted_data: self.key_storage.get(&session_id.id).map_err(|e| Error::KeyStorage(e.into()))?,
+			encrypted_data: encrypted_data,
 			acl_storage: self.acl_storage.clone(),
-			cluster: cluster,
+			cluster: cluster.clone(),
 		})?);
 		let decryption_session = QueuedDecryptionSession {
+			master: master,
+			cluster_view: cluster,
+			last_message_time: time::Instant::now(),
 			session: session.clone(),
 			queue: VecDeque::new()
 		};
@@ -737,12 +823,66 @@ impl ClusterSessions {
 			.and_then(|session| session.queue.pop_front())
 	}
 
-	pub fn on_connection_timeout(&self, node_id: &NodeId) {
-		for encryption_session in self.encryption_sessions.read().values() {
-			encryption_session.session.on_session_timeout(node_id);
+	pub fn respond_with_decryption_error(&self, session_id: &SessionId, sub_session_id: &Secret, to: &NodeId, error: message::DecryptionSessionError) {
+		let session_id = DecryptionSessionId::new(session_id.clone(), sub_session_id.clone());
+		self.decryption_sessions.read().get(&session_id)
+			.map(|s| {
+				// error in decryption session is non-fatal, if occurs on slave node
+				// => either respond with error
+				// => or broadcast error
+
+				// do not bother processing send error, as we already processing error
+				if &s.master == s.session.node() {
+					let _ = s.cluster_view.broadcast(Message::Decryption(DecryptionMessage::DecryptionSessionError(error)));
+				} else {
+					let _ = s.cluster_view.send(to, Message::Decryption(DecryptionMessage::DecryptionSessionError(error)));
+				}
+			});
+	}
+
+	fn stop_stalled_sessions(&self) {
+		{
+			let sessions = self.encryption_sessions.write();
+			for sid in sessions.keys().collect::<Vec<_>>() {
+				let session = sessions.get(&sid).expect("enumerating only existing sessions; qed");
+				if time::Instant::now() - session.last_message_time > time::Duration::from_secs(ENCRYPTION_SESSION_TIMEOUT_INTERVAL) {
+					session.session.on_session_timeout();
+					if session.session.state() == EncryptionSessionState::Finished
+						|| session.session.state() == EncryptionSessionState::Failed {
+						self.remove_encryption_session(&sid);
+					}
+				}
+			}
 		}
-		for decryption_session in self.decryption_sessions.read().values() {
-			decryption_session.session.on_session_timeout(node_id);
+		{
+			let sessions = self.decryption_sessions.write();
+			for sid in sessions.keys().collect::<Vec<_>>() {
+				let session = sessions.get(&sid).expect("enumerating only existing sessions; qed");
+				if time::Instant::now() - session.last_message_time > time::Duration::from_secs(DECRYPTION_SESSION_TIMEOUT_INTERVAL) {
+					session.session.on_session_timeout();
+					if session.session.state() == DecryptionSessionState::Finished
+						|| session.session.state() == DecryptionSessionState::Failed {
+						self.remove_decryption_session(&sid.id, &sid.access_key);
+					}
+				}
+			}
+		}
+	}
+
+	pub fn on_connection_timeout(&self, node_id: &NodeId) {
+		for (sid, session) in self.encryption_sessions.read().iter() {
+			session.session.on_node_timeout(node_id);
+			if session.session.state() == EncryptionSessionState::Finished
+				|| session.session.state() == EncryptionSessionState::Failed {
+				self.remove_encryption_session(sid);
+			}
+		}
+		for (sid, session) in self.decryption_sessions.read().iter() {
+			session.session.on_node_timeout(node_id);
+			if session.session.state() == DecryptionSessionState::Finished
+				|| session.session.state() == DecryptionSessionState::Failed {
+				self.remove_decryption_session(&sid.id, &sid.access_key);
+			}
 		}
 	}
 }
@@ -823,12 +963,21 @@ impl ClusterView {
 			})),
 		}
 	}
+
+	pub fn is_connected(&self, node: &NodeId) -> bool {
+		self.core.lock().nodes.contains(node)
+	}
+
+	pub fn nodes(&self) -> BTreeSet<NodeId> {
+		self.core.lock().nodes.clone()
+	}
 }
 
 impl Cluster for ClusterView {
 	fn broadcast(&self, message: Message) -> Result<(), Error> {
 		let core = self.core.lock();
 		for node in core.nodes.iter().filter(|n| *n != core.cluster.self_key_pair.public()) {
+			trace!(target: "secretstore_net", "{}: sent message {} to {}", core.cluster.self_key_pair.public(), message, node);
 			let connection = core.cluster.connection(node).ok_or(Error::NodeDisconnected)?;
 			core.cluster.spawn(connection.send_message(message.clone()))
 		}
@@ -837,14 +986,11 @@ impl Cluster for ClusterView {
 
 	fn send(&self, to: &NodeId, message: Message) -> Result<(), Error> {
 		let core = self.core.lock();
+		trace!(target: "secretstore_net", "{}: sent message {} to {}", core.cluster.self_key_pair.public(), message, to);
 		let connection = core.cluster.connection(to).ok_or(Error::NodeDisconnected)?;
 		core.cluster.spawn(connection.send_message(message));
 		Ok(())
 	}
-
-	fn blacklist(&self, _node: &NodeId) {
-		// TODO: unimplemented!()
-	}
 }
 
 impl ClusterClientImpl {
@@ -880,6 +1026,21 @@ impl ClusterClient for ClusterClientImpl {
 		session.initialize(requestor_signature, is_shadow_decryption)?;
 		Ok(session)
 	}
+
+	#[cfg(test)]
+	fn connect(&self) {
+		ClusterCore::connect_disconnected_nodes(self.data.clone());
+	}
+
+	#[cfg(test)]
+	fn make_faulty_encryption_sessions(&self) {
+		self.data.sessions.make_faulty_encryption_sessions();
+	}
+
+	#[cfg(test)]
+	fn encryption_session(&self, session_id: &SessionId) -> Option<Arc<EncryptionSessionImpl>> {
+		self.data.sessions.encryption_session(session_id)
+	}
 }
 
 fn make_socket_address(address: &str, port: u16) -> Result<SocketAddr, Error> {
@@ -895,9 +1056,10 @@ pub mod tests {
 	use parking_lot::Mutex;
 	use tokio_core::reactor::Core;
 	use ethkey::{Random, Generator};
-	use key_server_cluster::{NodeId, Error, EncryptionConfiguration, DummyAclStorage, DummyKeyStorage};
+	use key_server_cluster::{NodeId, SessionId, Error, DummyAclStorage, DummyKeyStorage};
 	use key_server_cluster::message::Message;
 	use key_server_cluster::cluster::{Cluster, ClusterCore, ClusterConfiguration};
+	use key_server_cluster::encryption_session::{Session as EncryptionSession, SessionState as EncryptionSessionState};
 
 	#[derive(Debug)]
 	pub struct DummyCluster {
@@ -947,9 +1109,6 @@ pub mod tests {
 			self.data.lock().messages.push_back((to.clone(), message));
 			Ok(())
 		}
-
-		fn blacklist(&self, _node: &NodeId) {
-		}
 	}
 
 	pub fn loop_until<F>(core: &mut Core, timeout: time::Duration, predicate: F) where F: Fn() -> bool {
@@ -982,9 +1141,6 @@ pub mod tests {
 				.map(|(j, kp)| (kp.public().clone(), ("127.0.0.1".into(), ports_begin + j as u16)))
 				.collect(),
 			allow_connecting_to_higher_nodes: false,
-			encryption_config: EncryptionConfiguration {
-				key_check_timeout_ms: 10,
-			},
 			key_storage: Arc::new(DummyKeyStorage::default()),
 			acl_storage: Arc::new(DummyAclStorage::default()),
 		}).collect();
@@ -997,7 +1153,10 @@ pub mod tests {
 
 	pub fn run_clusters(clusters: &[Arc<ClusterCore>]) {
 		for cluster in clusters {
-			cluster.run().unwrap();
+			cluster.run_listener().unwrap();
+		}
+		for cluster in clusters {
+			cluster.run_connections().unwrap();
 		}
 	}
 
@@ -1008,4 +1167,65 @@ pub mod tests {
 		run_clusters(&clusters);
 		loop_until(&mut core, time::Duration::from_millis(300), || clusters.iter().all(all_connections_established));
 	}
+
+	#[test]
+	fn cluster_wont_start_encryption_session_if_not_fully_connected() {
+		let core = Core::new().unwrap();
+		let clusters = make_clusters(&core, 6013, 3);
+		clusters[0].run().unwrap();
+		match clusters[0].client().new_encryption_session(SessionId::default(), 1) {
+			Err(Error::NodeDisconnected) => (),
+			Err(e) => panic!("unexpected error {:?}", e),
+			_ => panic!("unexpected success"),
+		}
+	}
+
+	#[test]
+	fn error_in_encryption_session_broadcasted_to_all_other_nodes() {
+		let mut core = Core::new().unwrap();
+		let clusters = make_clusters(&core, 6016, 3);
+		run_clusters(&clusters);
+		loop_until(&mut core, time::Duration::from_millis(300), || clusters.iter().all(all_connections_established));
+
+		// ask one of nodes to produce faulty encryption sessions
+		clusters[1].client().make_faulty_encryption_sessions();
+
+		// start && wait for encryption session to fail
+		let session = clusters[0].client().new_encryption_session(SessionId::default(), 1).unwrap();
+		loop_until(&mut core, time::Duration::from_millis(300), || session.joint_public_key().is_some());
+		assert!(session.joint_public_key().unwrap().is_err());
+
+		// check that faulty session is either removed from all nodes, or nonexistent (already removed)
+		assert!(clusters[0].client().encryption_session(&SessionId::default()).is_none());
+		for i in 1..3 {
+			if let Some(session) = clusters[i].client().encryption_session(&SessionId::default()) {
+				loop_until(&mut core, time::Duration::from_millis(300), || session.joint_public_key().is_some());
+				assert!(session.joint_public_key().unwrap().is_err());
+				assert!(clusters[i].client().encryption_session(&SessionId::default()).is_none());
+			}
+		}
+	}
+
+	#[test]
+	fn encryption_session_is_removed_when_succeeded() {
+		let mut core = Core::new().unwrap();
+		let clusters = make_clusters(&core, 6019, 3);
+		run_clusters(&clusters);
+		loop_until(&mut core, time::Duration::from_millis(300), || clusters.iter().all(all_connections_established));
+
+		// start && wait for encryption session to complete
+		let session = clusters[0].client().new_encryption_session(SessionId::default(), 1).unwrap();
+		loop_until(&mut core, time::Duration::from_millis(300), || session.state() == EncryptionSessionState::Finished);
+		assert!(session.joint_public_key().unwrap().is_ok());
+
+		// check that session is either removed from all nodes, or nonexistent (already removed)
+		assert!(clusters[0].client().encryption_session(&SessionId::default()).is_none());
+		for i in 1..3 {
+			if let Some(session) = clusters[i].client().encryption_session(&SessionId::default()) {
+				loop_until(&mut core, time::Duration::from_millis(300), || session.state() == EncryptionSessionState::Finished);
+				assert!(session.joint_public_key().unwrap().is_err());
+				assert!(clusters[i].client().encryption_session(&SessionId::default()).is_none());
+			}
+		}
+	}
 }
diff --git a/secret_store/src/key_server_cluster/decryption_session.rs b/secret_store/src/key_server_cluster/decryption_session.rs
index 5a8c136c6..f4d64c246 100644
--- a/secret_store/src/key_server_cluster/decryption_session.rs
+++ b/secret_store/src/key_server_cluster/decryption_session.rs
@@ -24,7 +24,7 @@ use key_server_cluster::{Error, AclStorage, DocumentKeyShare, NodeId, SessionId,
 use key_server_cluster::cluster::Cluster;
 use key_server_cluster::math;
 use key_server_cluster::message::{Message, DecryptionMessage, InitializeDecryptionSession, ConfirmDecryptionInitialization,
-	RequestPartialDecryption, PartialDecryption, DecryptionSessionError};
+	RequestPartialDecryption, PartialDecryption, DecryptionSessionError, DecryptionSessionCompleted};
 
 /// Decryption session API.
 pub trait Session: Send + Sync + 'static {
@@ -114,8 +114,10 @@ struct SessionData {
 	rejected_nodes: BTreeSet<NodeId>,
 	/// Nodes, which have responded with confirm to initialization request.
 	confirmed_nodes: BTreeSet<NodeId>,
-	
+
 	// === Values, filled during partial decryption ===
+	/// Nodes, which have been asked for partial decryption.
+	shadow_requests: BTreeSet<NodeId>,
 	/// Shadow points, received from nodes as a response to partial decryption request.
 	shadow_points: BTreeMap<NodeId, PartialDecryptionResult>,
 
@@ -162,6 +164,7 @@ impl SessionImpl {
 				requested_nodes: BTreeSet::new(),
 				rejected_nodes: BTreeSet::new(),
 				confirmed_nodes: BTreeSet::new(),
+				shadow_requests: BTreeSet::new(),
 				shadow_points: BTreeMap::new(),
 				decrypted_secret: None,
 			})
@@ -173,22 +176,21 @@ impl SessionImpl {
 		&self.self_node_id
 	}
 
+	/// Get current session state.
+	pub fn state(&self) -> SessionState {
+		self.data.lock().state.clone()
+	}
+
 	#[cfg(test)]
 	/// Get this session access key.
 	pub fn access_key(&self) -> &Secret {
 		&self.access_key
 	}
 
-	#[cfg(test)]
-	/// Get current session state.
-	pub fn state(&self) -> SessionState {
-		self.data.lock().state.clone()
-	}
-
 	#[cfg(test)]
 	/// Get decrypted secret
-	pub fn decrypted_secret(&self) -> Option<DocumentEncryptedKeyShadow> {
-		self.data.lock().decrypted_secret.clone().and_then(|r| r.ok())
+	pub fn decrypted_secret(&self) -> Option<Result<DocumentEncryptedKeyShadow, Error>> {
+		self.data.lock().decrypted_secret.clone()
 	}
 
 	/// Initialize decryption session.
@@ -284,9 +286,17 @@ impl SessionImpl {
 		let mut data = self.data.lock();
 
 		// check state
-		if data.state != SessionState::WaitingForInitializationConfirm {
+		if data.state == SessionState::WaitingForPartialDecryption {
 			// if there were enough confirmations/rejections before this message
 			// we have already moved to the next state
+			if !data.requested_nodes.remove(&sender) {
+				return Err(Error::InvalidMessage);
+			}
+
+			data.confirmed_nodes.insert(sender);
+			return Ok(());
+		}
+		if data.state != SessionState::WaitingForInitializationConfirm {
 			return Ok(());
 		}
 
@@ -321,7 +331,7 @@ impl SessionImpl {
 			return Err(Error::InvalidMessage);
 		}
 
-		let mut data = self.data.lock();
+		let data = self.data.lock();
 
 		// check state
 		if data.master != Some(sender) {
@@ -345,8 +355,8 @@ impl SessionImpl {
 			decrypt_shadow: decryption_result.decrypt_shadow,
 		})))?;
 
-		// update sate
-		data.state = SessionState::Finished;
+		// master could ask us for another partial decryption in case of restart
+		// => no state change is required
 
 		Ok(())
 	}
@@ -364,7 +374,7 @@ impl SessionImpl {
 			return Err(Error::InvalidStateForRequest);
 		}
 
-		if !data.confirmed_nodes.remove(&sender) {
+		if !data.shadow_requests.remove(&sender) {
 			return Err(Error::InvalidStateForRequest);
 		}
 		data.shadow_points.insert(sender, PartialDecryptionResult {
@@ -377,34 +387,169 @@ impl SessionImpl {
 			return Ok(());
 		}
 
+		// notify all other nodes about session completion
+		self.cluster.broadcast(Message::Decryption(DecryptionMessage::DecryptionSessionCompleted(DecryptionSessionCompleted {
+			session: self.id.clone().into(),
+			sub_session: self.access_key.clone().into(),
+		})))?;
+
+		// do decryption
 		SessionImpl::do_decryption(self.access_key.clone(), &self.encrypted_data, &mut *data)?;
 		self.completed.notify_all();
 
 		Ok(())
 	}
 
-	/// When error has occured on another node.
-	pub fn on_session_error(&self, sender: NodeId, message: &DecryptionSessionError) {
-		warn!("{}: decryption session error: {:?} from {}", self.node(), message, sender);
+	/// When session is completed.
+	pub fn on_session_completed(&self, sender: NodeId, message: &DecryptionSessionCompleted) -> Result<(), Error> {
+		debug_assert!(self.id == *message.session);
+		debug_assert!(self.access_key == *message.sub_session);
+		debug_assert!(&sender != self.node());
+
 		let mut data = self.data.lock();
+
+		// check state
+		if data.state != SessionState::WaitingForPartialDecryptionRequest {
+			return Err(Error::InvalidStateForRequest);
+		}
+		if data.master != Some(sender) {
+			return Err(Error::InvalidMessage);
+		}
+
+		// update state
+		data.state = SessionState::Finished;
+
+		Ok(())
+	}
+
+	/// When error has occured on another node.
+	pub fn on_session_error(&self, sender: NodeId, message: &DecryptionSessionError) -> Result<(), Error> {
+		let mut data = self.data.lock();
+
+		warn!("{}: decryption session failed with error: {:?} from {}", self.node(), message.error, sender);
+
 		data.state = SessionState::Failed;
 		data.decrypted_secret = Some(Err(Error::Io(message.error.clone())));
 		self.completed.notify_all();
+
+		Ok(())
+	}
+
+	/// When connection to one of cluster nodes has timeouted.
+	pub fn on_node_timeout(&self, node: &NodeId) {
+		let mut data = self.data.lock();
+
+		let is_self_master = data.master.as_ref() == Some(self.node());
+		let is_other_master = data.master.as_ref() == Some(node);
+		// if this is master node, we might have to restart
+		if is_self_master {
+			match data.state {
+				SessionState::WaitingForInitializationConfirm => {
+					// we will never receive confirmation from this node => treat as reject
+					if data.requested_nodes.remove(node) || data.confirmed_nodes.remove(node) {
+						data.rejected_nodes.insert(node.clone());
+					}
+					// check if we still have enough nodes for decryption
+					if self.encrypted_data.id_numbers.len() - data.rejected_nodes.len() >= self.encrypted_data.threshold + 1 {
+						return;
+					}
+				}
+				SessionState::WaitingForPartialDecryption => {
+					if data.rejected_nodes.contains(node) {
+						// already rejected => does not affect session
+						return;
+					}
+					if data.requested_nodes.remove(node) {
+						// we have tried to initialize this node, but it has failed
+						// => no restart required, just mark as rejected
+						data.rejected_nodes.insert(node.clone());
+						return;
+					}
+					if data.confirmed_nodes.contains(node) {
+						if data.shadow_points.contains_key(node) {
+							// we have already received partial decryption from this node
+							// => just ignore this connection drop
+							return;
+						}
+
+						// the worst case: we have sent partial decryption request to other nodes
+						// => we have to restart the session
+						data.confirmed_nodes.remove(node);
+						data.rejected_nodes.insert(node.clone());
+						// check if we still have enough nodes for decryption
+						if self.encrypted_data.id_numbers.len() - data.rejected_nodes.len() >= self.encrypted_data.threshold + 1 {
+							// we are going to stop session anyway => ignore error
+							let _ = SessionImpl::start_waiting_for_partial_decryption(self.node().clone(), self.id.clone(), self.access_key.clone(), &self.cluster, &self.encrypted_data, &mut *data);
+							return;
+						}
+						// not enough nodes
+					}
+				}
+				_ => (), // all other states lead to failures
+			}
+		} else if !is_other_master {
+			// disconnected from non-master node on non-master node
+			// => this does not affect this session
+			return;
+		}
+		// else: disconnecting from master node means failure
+
+		// no more nodes left for decryption => fail
+		warn!("{}: decryption session failed because {} connection has timeouted", self.node(), node);
+
+		data.state = SessionState::Failed;
+		data.decrypted_secret = Some(Err(Error::NodeDisconnected));
+		self.completed.notify_all();
 	}
 
 	/// When session timeout has occured.
-	pub fn on_session_timeout(&self, _node: &NodeId) {
-		warn!("{}: decryption session timeout", self.node());
+	pub fn on_session_timeout(&self) {
 		let mut data = self.data.lock();
-		// TODO: check that node is a part of decryption process
+
+		let is_self_master = data.master.as_ref() == Some(self.node());
+		// if this is master node, we might have to restart
+		if is_self_master {
+			match data.state {
+				SessionState::WaitingForInitializationConfirm =>
+					// we have sent initialization requests to all nodes, but haven't received confirmation
+					// => nodes will never respond => fail
+					(),
+				SessionState::WaitingForPartialDecryption => {
+					// we have requested partial decryption, but some nodes have failed to respond
+					// => mark these nodes as rejected && restart
+					for timeouted_node in data.shadow_requests.iter().cloned().collect::<Vec<_>>() {
+						data.confirmed_nodes.remove(&timeouted_node);
+						data.rejected_nodes.insert(timeouted_node);
+					}
+
+					// check if we still have enough nodes for decryption
+					if self.encrypted_data.id_numbers.len() - data.rejected_nodes.len() >= self.encrypted_data.threshold + 1 {
+						// we are going to stop session anyway => ignore error
+						let _ = SessionImpl::start_waiting_for_partial_decryption(self.node().clone(), self.id.clone(), self.access_key.clone(), &self.cluster, &self.encrypted_data, &mut *data);
+						return;
+					}
+				},
+				// no nodes has responded to our requests => session is failed
+				_ => return,
+			}
+		}
+
+		// no more nodes left for decryption => fail
+		warn!("{}: decryption session failed with timeout", self.node());
+
 		data.state = SessionState::Failed;
-		data.decrypted_secret = Some(Err(Error::Io("session expired".into())));
+		data.decrypted_secret = Some(Err(Error::NodeDisconnected));
 		self.completed.notify_all();
 	}
 
 	fn start_waiting_for_partial_decryption(self_node_id: NodeId, session_id: SessionId, access_key: Secret, cluster: &Arc<Cluster>, encrypted_data: &DocumentKeyShare, data: &mut SessionData) -> Result<(), Error> {
 		let confirmed_nodes: BTreeSet<_> = data.confirmed_nodes.clone();
-		for node in data.confirmed_nodes.iter().filter(|n| n != &&self_node_id) {
+		let confirmed_nodes: BTreeSet<_> = confirmed_nodes.difference(&data.rejected_nodes).cloned().collect();
+
+		data.shadow_requests.clear();
+		data.shadow_points.clear();
+		for node in confirmed_nodes.iter().filter(|n| n != &&self_node_id) {
+			data.shadow_requests.insert(node.clone());
 			cluster.send(node, Message::Decryption(DecryptionMessage::RequestPartialDecryption(RequestPartialDecryption {
 				session: session_id.clone().into(),
 				sub_session: access_key.clone().into(),
@@ -595,7 +740,13 @@ mod tests {
 			encrypted_point: encrypted_point.clone(),
 		}).collect();
 		let acl_storages: Vec<_> = (0..5).map(|_| Arc::new(DummyAclStorage::default())).collect();
-		let clusters: Vec<_> = (0..5).map(|i| Arc::new(DummyCluster::new(id_numbers.iter().nth(i).clone().unwrap().0))).collect();
+		let clusters: Vec<_> = (0..5).map(|i| {
+			let cluster = Arc::new(DummyCluster::new(id_numbers.iter().nth(i).clone().unwrap().0));
+			for id_number in &id_numbers {
+				cluster.add_node(id_number.0.clone());
+			}
+			cluster
+		}).collect();
 		let sessions: Vec<_> = (0..5).map(|i| SessionImpl::new(SessionParams {
 			id: session_id.clone(),
 			access_key: access_key.clone(),
@@ -624,13 +775,14 @@ mod tests {
 				Message::Decryption(DecryptionMessage::ConfirmDecryptionInitialization(message)) => session.on_confirm_initialization(from, &message).unwrap(),
 				Message::Decryption(DecryptionMessage::RequestPartialDecryption(message)) => session.on_partial_decryption_requested(from, &message).unwrap(),
 				Message::Decryption(DecryptionMessage::PartialDecryption(message)) => session.on_partial_decryption(from, &message).unwrap(),
+				Message::Decryption(DecryptionMessage::DecryptionSessionCompleted(message)) => session.on_session_completed(from, &message).unwrap(),
 				_ => panic!("unexpected"),
 			}
 		}
 	}
 
 	#[test]
-	fn fails_to_construct_in_cluster_of_single_node() {
+	fn constructs_in_cluster_of_single_node() {
 		let mut nodes = BTreeMap::new();
 		let self_node_id = Random.generate().unwrap().public().clone();
 		nodes.insert(self_node_id, Random.generate().unwrap().secret().clone());
@@ -648,7 +800,7 @@ mod tests {
 			acl_storage: Arc::new(DummyAclStorage::default()),
 			cluster: Arc::new(DummyCluster::new(self_node_id.clone())),
 		}) {
-			Err(Error::InvalidNodesCount) => (),
+			Ok(_) => (),
 			_ => panic!("unexpected"),
 		}
 	}
@@ -722,27 +874,6 @@ mod tests {
 		}).unwrap_err(), Error::InvalidStateForRequest);
 	}
 
-	#[test]
-	fn fails_to_partial_decrypt_if_not_waiting() {
-		let (_, _, sessions) = prepare_decryption_sessions();
-		assert_eq!(sessions[1].on_initialize_session(sessions[0].node().clone(), &message::InitializeDecryptionSession {
-			session: SessionId::default().into(),
-			sub_session: sessions[0].access_key().clone().into(),
-			requestor_signature: ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap().into(),
-			is_shadow_decryption: false,
-		}).unwrap(), ());
-		assert_eq!(sessions[1].on_partial_decryption_requested(sessions[0].node().clone(), &message::RequestPartialDecryption {
-			session: SessionId::default().into(),
-			sub_session: sessions[0].access_key().clone().into(),
-			nodes: sessions.iter().map(|s| s.node().clone().into()).take(4).collect(),
-		}).unwrap(), ());
-		assert_eq!(sessions[1].on_partial_decryption_requested(sessions[0].node().clone(), &message::RequestPartialDecryption {
-			session: SessionId::default().into(),
-			sub_session: sessions[0].access_key().clone().into(),
-			nodes: sessions.iter().map(|s| s.node().clone().into()).take(4).collect(),
-		}).unwrap_err(), Error::InvalidStateForRequest);
-	}
-
 	#[test]
 	fn fails_to_partial_decrypt_if_requested_by_slave() {
 		let (_, _, sessions) = prepare_decryption_sessions();
@@ -806,6 +937,106 @@ mod tests {
 		assert_eq!(sessions[0].on_partial_decryption(pd_from.unwrap(), &pd_msg.unwrap()).unwrap_err(), Error::InvalidStateForRequest);
 	}
 
+	#[test]
+	fn decryption_fails_on_session_timeout() {
+		let (_, _, sessions) = prepare_decryption_sessions();
+		assert!(sessions[0].decrypted_secret().is_none());
+		sessions[0].on_session_timeout();
+		assert!(sessions[0].decrypted_secret().unwrap().unwrap_err() == Error::NodeDisconnected);
+	}
+
+	#[test]
+	fn node_is_marked_rejected_when_timed_out_during_initialization_confirmation() {
+		let (_, _, sessions) = prepare_decryption_sessions();
+		sessions[0].initialize(ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap(), false).unwrap();
+
+		// 1 node disconnects => we still can recover secret
+		sessions[0].on_node_timeout(sessions[1].node());
+		assert!(sessions[0].data.lock().rejected_nodes.contains(sessions[1].node()));
+		assert!(sessions[0].data.lock().state == SessionState::WaitingForInitializationConfirm);
+
+		// 2 node are disconnected => we can not recover secret
+		sessions[0].on_node_timeout(sessions[2].node());
+		assert!(sessions[0].data.lock().rejected_nodes.contains(sessions[2].node()));
+		assert!(sessions[0].data.lock().state == SessionState::Failed);
+	}
+
+	#[test]
+	fn session_does_not_fail_if_rejected_node_disconnects() {
+		let (clusters, acl_storages, sessions) = prepare_decryption_sessions();
+		let key_pair = Random.generate().unwrap();
+
+		acl_storages[1].prohibit(key_pair.public().clone(), SessionId::default());
+		sessions[0].initialize(ethkey::sign(key_pair.secret(), &SessionId::default()).unwrap(), false).unwrap();
+
+		do_messages_exchange_until(&clusters, &sessions, |_, _, _| sessions[0].state() == SessionState::WaitingForPartialDecryption);
+
+		// 1st node disconnects => ignore this
+		sessions[0].on_node_timeout(sessions[1].node());
+		assert!(sessions[0].data.lock().state == SessionState::WaitingForPartialDecryption);
+	}
+
+	#[test]
+	fn session_does_not_fail_if_requested_node_disconnects() {
+		let (clusters, _, sessions) = prepare_decryption_sessions();
+		sessions[0].initialize(ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap(), false).unwrap();
+
+		do_messages_exchange_until(&clusters, &sessions, |_, _, _| sessions[0].state() == SessionState::WaitingForPartialDecryption);
+
+		// 1 node disconnects => we still can recover secret
+		sessions[0].on_node_timeout(sessions[1].node());
+		assert!(sessions[0].data.lock().state == SessionState::WaitingForPartialDecryption);
+
+		// 2 node are disconnected => we can not recover secret
+		sessions[0].on_node_timeout(sessions[2].node());
+		assert!(sessions[0].data.lock().state == SessionState::Failed);
+	}
+
+	#[test]
+	fn session_does_not_fail_if_node_with_shadow_point_disconnects() {
+		let (clusters, _, sessions) = prepare_decryption_sessions();
+		sessions[0].initialize(ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap(), false).unwrap();
+
+		do_messages_exchange_until(&clusters, &sessions, |_, _, _| sessions[0].state() == SessionState::WaitingForPartialDecryption
+			&& sessions[0].data.lock().shadow_points.len() == 2);
+
+		// disconnects from the node which has already sent us its own shadow point
+		let disconnected = sessions[0].data.lock().
+			shadow_points.keys()
+			.filter(|n| *n != sessions[0].node())
+			.cloned().nth(0).unwrap();
+		sessions[0].on_node_timeout(&disconnected);
+		assert!(sessions[0].data.lock().state == SessionState::WaitingForPartialDecryption);
+	}
+
+	#[test]
+	fn session_restarts_if_confirmed_node_disconnects() {
+		let (clusters, _, sessions) = prepare_decryption_sessions();
+		sessions[0].initialize(ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap(), false).unwrap();
+
+		do_messages_exchange_until(&clusters, &sessions, |_, _, _| sessions[0].state() == SessionState::WaitingForPartialDecryption);
+
+		// disconnects from the node which has already confirmed its participation
+		let disconnected = sessions[0].data.lock().shadow_requests.iter().cloned().nth(0).unwrap();
+		sessions[0].on_node_timeout(&disconnected);
+		assert!(sessions[0].data.lock().state == SessionState::WaitingForPartialDecryption);
+		assert!(sessions[0].data.lock().rejected_nodes.contains(&disconnected));
+		assert!(!sessions[0].data.lock().shadow_requests.contains(&disconnected));
+	}
+
+	#[test]
+	fn session_does_not_fail_if_non_master_node_disconnects_from_non_master_node() {
+		let (clusters, _, sessions) = prepare_decryption_sessions();
+		sessions[0].initialize(ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap(), false).unwrap();
+
+		do_messages_exchange_until(&clusters, &sessions, |_, _, _| sessions[0].state() == SessionState::WaitingForPartialDecryption);
+
+		// disconnects from the node which has already confirmed its participation
+		sessions[1].on_node_timeout(sessions[2].node());
+		assert!(sessions[0].data.lock().state == SessionState::WaitingForPartialDecryption);
+		assert!(sessions[1].data.lock().state == SessionState::WaitingForPartialDecryptionRequest);
+	}
+
 	#[test]
 	fn complete_dec_session() {
 		let (clusters, _, sessions) = prepare_decryption_sessions();
@@ -818,17 +1049,16 @@ mod tests {
 		do_messages_exchange(&clusters, &sessions);
 
 		// now check that:
-		// 1) 4 of 5 sessions are in Finished state
-		assert_eq!(sessions.iter().filter(|s| s.state() == SessionState::Finished).count(), 4);
-		// 2) 1 session is in WaitingForPartialDecryptionRequest state
-		assert_eq!(sessions.iter().filter(|s| s.state() == SessionState::WaitingForPartialDecryptionRequest).count(), 1);
-		// 3) 1 session has decrypted key value
+		// 1) 5 of 5 sessions are in Finished state
+		assert_eq!(sessions.iter().filter(|s| s.state() == SessionState::Finished).count(), 5);
+		// 2) 1 session has decrypted key value
 		assert!(sessions.iter().skip(1).all(|s| s.decrypted_secret().is_none()));
-		assert_eq!(sessions[0].decrypted_secret(), Some(DocumentEncryptedKeyShadow {
+
+		assert_eq!(sessions[0].decrypted_secret().unwrap().unwrap(), DocumentEncryptedKeyShadow {
 			decrypted_secret: SECRET_PLAIN.into(),
 			common_point: None,
 			decrypt_shadows: None,
-		}));
+		});
 	}
 
 	#[test]
@@ -843,14 +1073,12 @@ mod tests {
 		do_messages_exchange(&clusters, &sessions);
 
 		// now check that:
-		// 1) 4 of 5 sessions are in Finished state
-		assert_eq!(sessions.iter().filter(|s| s.state() == SessionState::Finished).count(), 4);
-		// 2) 1 session is in WaitingForPartialDecryptionRequest state
-		assert_eq!(sessions.iter().filter(|s| s.state() == SessionState::WaitingForPartialDecryptionRequest).count(), 1);
-		// 3) 1 session has decrypted key value
+		// 1) 5 of 5 sessions are in Finished state
+		assert_eq!(sessions.iter().filter(|s| s.state() == SessionState::Finished).count(), 5);
+		// 2) 1 session has decrypted key value
 		assert!(sessions.iter().skip(1).all(|s| s.decrypted_secret().is_none()));
 
-		let decrypted_secret = sessions[0].decrypted_secret().unwrap();
+		let decrypted_secret = sessions[0].decrypted_secret().unwrap().unwrap();
 		// check that decrypted_secret != SECRET_PLAIN
 		assert!(decrypted_secret.decrypted_secret != SECRET_PLAIN.into());
 		// check that common point && shadow coefficients are returned
@@ -879,7 +1107,8 @@ mod tests {
 		acl_storages[1].prohibit(key_pair.public().clone(), SessionId::default());
 		acl_storages[2].prohibit(key_pair.public().clone(), SessionId::default());
 
-		do_messages_exchange(&clusters, &sessions);
+		let node3 = sessions[3].node().clone();
+		do_messages_exchange_until(&clusters, &sessions, |from, _, _msg| from == &node3);
 
 		// now check that:
 		// 1) 3 of 5 sessions are in Failed state
@@ -887,7 +1116,7 @@ mod tests {
 		// 2) 2 of 5 sessions are in WaitingForPartialDecryptionRequest state
 		assert_eq!(sessions.iter().filter(|s| s.state() == SessionState::WaitingForPartialDecryptionRequest).count(), 2);
 		// 3) 0 sessions have decrypted key value
-		assert!(sessions.iter().all(|s| s.decrypted_secret().is_none()));
+		assert!(sessions.iter().all(|s| s.decrypted_secret().is_none() || s.decrypted_secret().unwrap().is_err()));
 	}
 
 	#[test]
@@ -910,11 +1139,11 @@ mod tests {
 		assert_eq!(sessions.iter().filter(|s| s.state() == SessionState::Finished).count(), 5);
 		// 2) 1 session has decrypted key value
 		assert!(sessions.iter().skip(1).all(|s| s.decrypted_secret().is_none()));
-		assert_eq!(sessions[0].decrypted_secret(), Some(DocumentEncryptedKeyShadow {
+		assert_eq!(sessions[0].decrypted_secret().unwrap().unwrap(), DocumentEncryptedKeyShadow {
 			decrypted_secret: SECRET_PLAIN.into(),
 			common_point: None,
 			decrypt_shadows: None,
-		}));
+		});
 	}
 
 	#[test]
diff --git a/secret_store/src/key_server_cluster/encryption_session.rs b/secret_store/src/key_server_cluster/encryption_session.rs
index beca00443..0268bf596 100644
--- a/secret_store/src/key_server_cluster/encryption_session.rs
+++ b/secret_store/src/key_server_cluster/encryption_session.rs
@@ -16,6 +16,7 @@
 
 use std::collections::{BTreeSet, BTreeMap, VecDeque};
 use std::fmt::{Debug, Formatter, Error as FmtError};
+use std::time;
 use std::sync::Arc;
 use parking_lot::{Condvar, Mutex};
 use ethkey::{Public, Secret};
@@ -23,15 +24,18 @@ use key_server_cluster::{Error, NodeId, SessionId, KeyStorage, DocumentKeyShare}
 use key_server_cluster::math;
 use key_server_cluster::cluster::Cluster;
 use key_server_cluster::message::{Message, EncryptionMessage, InitializeSession, ConfirmInitialization, CompleteInitialization,
-	KeysDissemination, Complaint, ComplaintResponse, PublicKeyShare, SessionError, SessionCompleted};
+	KeysDissemination, PublicKeyShare, SessionError, SessionCompleted};
 
 /// Encryption session API.
 pub trait Session: Send + Sync + 'static {
+	/// Get encryption session state.
+	fn state(&self) -> SessionState;
+	/// Wait until session is completed. Returns distributely generated secret key.
+	fn wait(&self, timeout: Option<time::Duration>) -> Result<Public, Error>;
+
 	#[cfg(test)]
 	/// Get joint public key (if it is known).
-	fn joint_public_key(&self) -> Option<Public>;
-	/// Wait until session is completed. Returns distributely generated secret key.
-	fn wait(&self) -> Result<Public, Error>;
+	fn joint_public_key(&self) -> Option<Result<Public, Error>>;
 }
 
 /// Encryption (distributed key generation) session.
@@ -40,10 +44,9 @@ pub trait Session: Send + Sync + 'static {
 /// Brief overview:
 /// 1) initialization: master node (which has received request for generating joint public + secret) initializes the session on all other nodes
 /// 2) key dissemination (KD): all nodes are generating secret + public values and send these to appropriate nodes
-/// 3) key verification (KV): all nodes are checking values, received for other nodes and complaining if keys are wrong
-/// 4) key check phase (KC): nodes are processing complaints, received from another nodes
-/// 5) key generation phase (KG): nodes are exchanging with information, enough to generate joint public key
-/// 6) encryption phase: master node generates secret key, encrypts it using joint public && broadcasts encryption result
+/// 3) key verification (KV): all nodes are checking values, received for other nodes
+/// 4) key generation phase (KG): nodes are exchanging with information, enough to generate joint public key
+/// 5) encryption phase: master node generates secret key, encrypts it using joint public && broadcasts encryption result
 pub struct SessionImpl {
 	/// Unique session id.
 	id: SessionId,
@@ -76,6 +79,8 @@ pub struct SessionParams {
 struct SessionData {
 	/// Current state of the session.
 	state: SessionState,
+	/// Simulate faulty behaviour?
+	simulate_faulty_behaviour: bool,
 
 	// === Values, filled when session initialization just starts ===
 	/// Reference to the node, which has started this session.
@@ -123,10 +128,6 @@ struct NodeData {
 	/// Public values, which have been received from this node.
 	pub publics: Option<Vec<Public>>,
 
-	// === Values, filled during KC phase ===
-	/// Nodes, complaining against this node.
-	pub complaints: BTreeSet<NodeId>,
-
 	// === Values, filled during KG phase ===
 	/// Public share, which has been received from this node.
 	pub public_share: Option<Public>,
@@ -163,10 +164,6 @@ pub enum SessionState {
 	/// Node is waiting for generated keys from every other node.
 	WaitingForKeysDissemination,
 
-	// === KC phase states ===
-	/// Keys check currently occurs.
-	KeyCheck,
-
 	// === KG phase states ===
 	/// Node is waiting for joint public key share to be received from every other node.
 	WaitingForPublicKeyShare,
@@ -193,6 +190,7 @@ impl SessionImpl {
 			completed: Condvar::new(),
 			data: Mutex::new(SessionData {
 				state: SessionState::WaitingForInitialization,
+				simulate_faulty_behaviour: false,
 				master: None,
 				threshold: None,
 				derived_point: None,
@@ -205,31 +203,20 @@ impl SessionImpl {
 		}
 	}
 
-	/// Get this session Id.
-	pub fn id(&self) -> &SessionId {
-		&self.id
-	}
-
 	/// Get this node Id.
 	pub fn node(&self) -> &NodeId {
 		&self.self_node_id
 	}
 
-	/// Get current session state.
-	pub fn state(&self) -> SessionState {
-		self.data.lock().state.clone()
-	}
-
 	#[cfg(test)]
 	/// Get derived point.
 	pub fn derived_point(&self) -> Option<Public> {
 		self.data.lock().derived_point.clone()
 	}
 
-	#[cfg(test)]
-	/// Get qualified nodes.
-	pub fn qualified_nodes(&self) -> BTreeSet<NodeId> {
-		self.data.lock().nodes.keys().cloned().collect()
+	/// Simulate faulty encryption session behaviour.
+	pub fn simulate_faulty_behaviour(&self) {
+		self.data.lock().simulate_faulty_behaviour = true;
 	}
 
 	/// Start new session initialization. This must be called on master node.
@@ -254,15 +241,25 @@ impl SessionImpl {
 		}
 
 		let mut visit_policy = EveryOtherNodeVisitor::new(self.node(), data.nodes.keys().cloned());
-		let next_node = visit_policy.next_node().expect("at least two nodes are in cluster");
-		data.state = SessionState::WaitingForInitializationConfirm(visit_policy);
-
-		// start initialization
 		let derived_point = math::generate_random_point()?;
-		self.cluster.send(&next_node, Message::Encryption(EncryptionMessage::InitializeSession(InitializeSession {
-				session: self.id.clone().into(),
-				derived_point: derived_point.into(),
-			})))
+		match visit_policy.next_node() {
+			Some(next_node) => {
+				data.state = SessionState::WaitingForInitializationConfirm(visit_policy);
+
+				// start initialization
+				self.cluster.send(&next_node, Message::Encryption(EncryptionMessage::InitializeSession(InitializeSession {
+						session: self.id.clone().into(),
+						derived_point: derived_point.into(),
+					})))
+			},
+			None => {
+				drop(data);
+				self.complete_initialization(derived_point)?;
+				self.disseminate_keys()?;
+				self.verify_keys()?;
+				self.complete_encryption()
+			}
+		}
 	}
 
 	/// When session initialization message is received.
@@ -315,33 +312,16 @@ impl SessionImpl {
 		};
 
 		// proceed message
-		match next_receiver {
-			Some(next_receiver) => {
-				return self.cluster.send(&next_receiver, Message::Encryption(EncryptionMessage::InitializeSession(InitializeSession {
-						session: self.id.clone().into(),
-						derived_point: message.derived_point.clone().into(),
-					})));
-			},
-			None => {
-				// update point once again to make sure that derived point is not generated by last node
-				let mut derived_point = message.derived_point.clone().into();
-				math::update_random_point(&mut derived_point)?;
-
-				// remember derived point
-				data.derived_point = Some(derived_point.clone().into());
-
-				// broadcast derived point && other session paraeters to every other node
-				self.cluster.broadcast(Message::Encryption(EncryptionMessage::CompleteInitialization(CompleteInitialization {
+		if let Some(next_receiver) = next_receiver {
+			return self.cluster.send(&next_receiver, Message::Encryption(EncryptionMessage::InitializeSession(InitializeSession {
 					session: self.id.clone().into(),
-					nodes: data.nodes.iter().map(|(id, data)| (id.clone().into(), data.id_number.clone().into())).collect(),
-					threshold: data.threshold.expect("threshold is filled in initialization phase; KD phase follows initialization phase; qed"),
-					derived_point: derived_point.into(),
-				})))?;
-			},
+					derived_point: message.derived_point.clone().into(),
+				})));
 		}
 
 		// now it is time for keys dissemination (KD) phase
 		drop(data);
+		self.complete_initialization(message.derived_point.clone().into())?;
 		self.disseminate_keys()
 	}
 
@@ -382,6 +362,11 @@ impl SessionImpl {
 
 		let mut data = self.data.lock();
 
+		// simulate failure, if required
+		if data.simulate_faulty_behaviour {
+			return Err(Error::Io("simulated error".into()));
+		}
+
 		// check state
 		if data.state != SessionState::WaitingForKeysDissemination {
 			match data.state {
@@ -414,150 +399,8 @@ impl SessionImpl {
 			return Ok(())
 		}
 
-		// key verification (KV) phase: check that other nodes have passed correct secrets
-		let derived_point = data.derived_point.clone().expect("derived point generated on initialization phase; KV phase follows initialization phase; qed");
-		let number_id = data.nodes[self.node()].id_number.clone();
-		for (node_id, node_data) in data.nodes.iter_mut().filter(|&(node_id, _)| node_id != self.node()) {
-			let secret1 = node_data.secret1.as_ref().expect("keys received on KD phase; KV phase follows KD phase; qed");
-			let secret2 = node_data.secret2.as_ref().expect("keys received on KD phase; KV phase follows KD phase; qed");
-			let publics = node_data.publics.as_ref().expect("keys received on KD phase; KV phase follows KD phase; qed");
-			let is_key_verification_ok = math::keys_verification(threshold, &derived_point, &number_id,
-				secret1, secret2, publics)?;
-
-			if !is_key_verification_ok {
-				node_data.complaints.insert(self.node().clone());
-				self.cluster.broadcast(Message::Encryption(EncryptionMessage::Complaint(Complaint {
-					session: self.id.clone().into(),
-					against: node_id.clone().into(),
-				})))?;
-			}
-		}
-
-		// update state
-		data.state = SessionState::KeyCheck;
-
-		Ok(())
-	}
-
-	/// When complaint is received.
-	pub fn on_complaint(&self, sender: NodeId, message: &Complaint) -> Result<(), Error> {
-		debug_assert!(self.id == *message.session);
-		debug_assert!(&sender != self.node());
-
-		let mut data = self.data.lock();
-		debug_assert!(data.nodes.contains_key(&sender));
-
-		// check state
-		if data.state != SessionState::KeyCheck && data.state != SessionState::WaitingForKeysDissemination {
-			// message can be received after timeout is passed
-			// => encryption is already in progress
-			// => we can not treat it as an error
-			return Ok(());
-		}
-
-		// respond to complaint
-		if &*message.against == self.node() {
-			let secret1_sent = data.nodes[&sender].secret1_sent.clone().expect("secrets were sent on KD phase; KC phase follows KD phase; qed");
-			let secret2_sent = data.nodes[&sender].secret2_sent.clone().expect("secrets were sent on KD phase; KC phase follows KD phase; qed");
-
-			// someone is complaining against us => let's respond
-			return self.cluster.broadcast(Message::Encryption(EncryptionMessage::ComplaintResponse(ComplaintResponse {
-				session: self.id.clone().into(),
-				secret1: secret1_sent.into(),
-				secret2: secret2_sent.into(),
-			})));
-		}
-
-		// someone is complaining against someone else => let's remember this
-		let threshold = data.threshold.expect("threshold is filled in initialization phase; KD phase follows initialization phase; qed");
-		let is_critical_complaints_num = {
-			let node = data.nodes.get_mut(&message.against).ok_or(Error::InvalidMessage)?;
-			node.complaints.insert(sender);
-			node.complaints.len() >= threshold + 1
-		};
-
-		if is_critical_complaints_num {
-			// too many complaints => exclude from session
-			SessionImpl::disqualify_node(&message.against, &*self.cluster, &mut *data);
-		}
-
-		Ok(())
-	}
-
-	/// When complaint response is received
-	pub fn on_complaint_response(&self, sender: NodeId, message: &ComplaintResponse) -> Result<(), Error> {
-		debug_assert!(self.id == *message.session);
-		debug_assert!(&sender != self.node());
-
-		let mut data = self.data.lock();
-		debug_assert!(data.nodes.contains_key(&sender));
-
-		// check state
-		if data.state != SessionState::KeyCheck {
-			// in theory this message can be received before KeyCheck (in WaitingForKeysDissemination state)
-			// => but the fact that someone is complaining about keys means that sender has already sent its keys
-			// => complaint response can't reach us before keys, as the cluster guarantees that messages are received in FIFO order
-
-			// message can be received after timeout is passed
-			// => encryption is already in progress
-			// => we can not treat it as an error
-			return Ok(());
-		}
-
-		// check keys again
-		let is_key_verification_ok = {
-			let threshold = data.threshold.expect("threshold is filled in initialization phase; KD phase follows initialization phase; qed");
-			let derived_point = data.derived_point.as_ref().expect("derived point generated on initialization phase; KV phase follows initialization phase; qed");
-			let number_id = &data.nodes[self.node()].id_number;
-			let node_data = data.nodes.get(&sender).expect("cluster guarantees to deliver messages from qualified nodes only; qed");
-			let publics = node_data.publics.as_ref().expect("keys received on KD phase; KV phase follows KD phase; qed");
-			math::keys_verification(threshold, derived_point, number_id, &message.secret1, &message.secret2, publics)?
-		};
-
-		if !is_key_verification_ok {
-			SessionImpl::disqualify_node(&sender, &*self.cluster, &mut *data);
-		} else {
-			let node_data = data.nodes.get_mut(&sender).expect("cluster guarantees to deliver messages from qualified nodes only; qed");
-			node_data.secret1 = Some(message.secret1.clone().into());
-			node_data.secret2 = Some(message.secret2.clone().into());
-			node_data.complaints.remove(self.node());
-		}
-
-		Ok(())
-	}
-
-	/// When KC-phase timeout is expired, it is time to start KG phase.
-	pub fn start_key_generation_phase(&self) -> Result<(), Error> {
-		let mut data = self.data.lock();
-
-		if data.state != SessionState::KeyCheck {
-			return Err(Error::InvalidStateForRequest);
-		}
-
-		// calculate public share
-		let self_public_share = {
-			let self_secret_coeff = data.secret_coeff.as_ref().expect("secret_coeff is generated on KD phase; KG phase follows KD phase; qed");
-			math::compute_public_share(self_secret_coeff)?
-		};
-
-		// calculate self secret + public shares
-		let self_secret_share = {
-			let secret_values_iter = data.nodes.values()
-				.map(|n| n.secret1.as_ref().expect("keys received on KD phase; KG phase follows KD phase; qed"));
-			math::compute_secret_share(secret_values_iter)?
-		};
-
-		// update state
-		data.state = SessionState::WaitingForPublicKeyShare;
-		data.secret_share = Some(self_secret_share);
-		let self_node = data.nodes.get_mut(self.node()).expect("node is always qualified by himself; qed");
-		self_node.public_share = Some(self_public_share.clone());
-
-		// broadcast self public key share
-		self.cluster.broadcast(Message::Encryption(EncryptionMessage::PublicKeyShare(PublicKeyShare {
-			session: self.id.clone().into(),
-			public_share: self_public_share.into(),
-		})))
+		drop(data);
+		self.verify_keys()
 	}
 
 	/// When public key share is received.
@@ -568,8 +411,7 @@ impl SessionImpl {
 		if data.state != SessionState::WaitingForPublicKeyShare {
 			match data.state {
 				SessionState::WaitingForInitializationComplete |
-					SessionState::WaitingForKeysDissemination |
-					SessionState::KeyCheck => return Err(Error::TooEarlyForRequest),
+					SessionState::WaitingForKeysDissemination => return Err(Error::TooEarlyForRequest),
 				_ => return Err(Error::InvalidStateForRequest),
 			}
 		}
@@ -589,52 +431,8 @@ impl SessionImpl {
 			return Ok(());
 		}
 
-		// else - calculate joint public key
-		let joint_public = {
-			let public_shares = data.nodes.values().map(|n| n.public_share.as_ref().expect("keys received on KD phase; KG phase follows KD phase; qed"));
-			math::compute_joint_public(public_shares)?
-		};
-
-		// if we are at the slave node - wait for session completion
-		if data.master.as_ref() != Some(self.node()) {
-			data.joint_public = Some(Ok(joint_public));
-			data.state = SessionState::WaitingForEncryptionConfirmation;
-			return Ok(());
-		}
-
-		// then generate secret point
-		// then encrypt secret point with joint public key
-		let secret_point = math::generate_random_point()?;
-		let encrypted_secret_point = math::encrypt_secret(&secret_point, &joint_public)?;
-
-		// then save encrypted data to the key storage
-		let encrypted_data = DocumentKeyShare {
-			threshold: data.threshold.expect("threshold is filled in initialization phase; KG phase follows initialization phase; qed"),
-			id_numbers: data.nodes.iter().map(|(node_id, node_data)| (node_id.clone(), node_data.id_number.clone())).collect(),
-			secret_share: data.secret_share.as_ref().expect("secret_share is filled in KG phase; we are at the end of KG phase; qed").clone(),
-			common_point: encrypted_secret_point.common_point,
-			encrypted_point: encrypted_secret_point.encrypted_point,
-		};
-		self.key_storage.insert(self.id.clone(), encrypted_data.clone())
-			.map_err(|e| Error::KeyStorage(e.into()))?;
-
-		// then distribute encrypted data to every other node
-		self.cluster.broadcast(Message::Encryption(EncryptionMessage::SessionCompleted(SessionCompleted {
-			session: self.id.clone().into(),
-			common_point: encrypted_data.common_point.clone().into(),
-			encrypted_point: encrypted_data.encrypted_point.clone().into(),
-		})))?;
-
-		// then wait for confirmation from all other nodes
-		{
-			let self_node = data.nodes.get_mut(self.node()).expect("node is always qualified by himself; qed");
-			self_node.completion_confirmed = true;
-		}
-		data.joint_public = Some(Ok(joint_public));
-		data.secret_point = Some(Ok(secret_point));
-		data.state = SessionState::WaitingForEncryptionConfirmation;
-
-		Ok(())
+		drop(data);
+		self.complete_encryption()
 	}
 
 	/// When session completion message is received.
@@ -703,35 +501,63 @@ impl SessionImpl {
 	}
 
 	/// When error has occured on another node.
-	pub fn on_session_error(&self, sender: NodeId, message: &SessionError) {
-		warn!("{}: encryption session error: {:?} from {}", self.node(), message, sender);
+	pub fn on_session_error(&self, sender: NodeId, message: &SessionError) -> Result<(), Error> {
 		let mut data = self.data.lock();
+
+		warn!("{}: encryption session failed with error: {} from {}", self.node(), message.error, sender);
+
 		data.state = SessionState::Failed;
 		data.joint_public = Some(Err(Error::Io(message.error.clone())));
 		data.secret_point = Some(Err(Error::Io(message.error.clone())));
 		self.completed.notify_all();
+
+		Ok(())
+	}
+
+	/// When connection to one of cluster nodes has timeouted.
+	pub fn on_node_timeout(&self, node: &NodeId) {
+		let mut data = self.data.lock();
+
+		// all nodes are required for encryption session
+		// => fail without check
+		warn!("{}: encryption session failed because {} connection has timeouted", self.node(), node);
+
+		data.state = SessionState::Failed;
+		data.joint_public = Some(Err(Error::NodeDisconnected));
+		data.secret_point = Some(Err(Error::NodeDisconnected));
+		self.completed.notify_all();
 	}
 
 	/// When session timeout has occured.
-	pub fn on_session_timeout(&self, node: &NodeId) {
-		warn!("{}: encryption session timeout", self.node());
+	pub fn on_session_timeout(&self) {
 		let mut data = self.data.lock();
 
-		match data.state {
-			SessionState::WaitingForInitialization |
-				SessionState::WaitingForInitializationConfirm(_) |
-				SessionState::WaitingForInitializationComplete => (),
-			_ => if !data.nodes.contains_key(node) {
-				return;
-			},
-		}
+		warn!("{}: encryption session failed with timeout", self.node());
 
 		data.state = SessionState::Failed;
-		data.joint_public = Some(Err(Error::Io("session expired".into())));
-		data.secret_point = Some(Err(Error::Io("session expired".into())));
+		data.joint_public = Some(Err(Error::NodeDisconnected));
+		data.secret_point = Some(Err(Error::NodeDisconnected));
 		self.completed.notify_all();
 	}
 
+	/// Complete initialization (when all other nodex has responded with confirmation)
+	fn complete_initialization(&self, mut derived_point: Public) -> Result<(), Error> {
+		// update point once again to make sure that derived point is not generated by last node
+		math::update_random_point(&mut derived_point)?;
+
+		// remember derived point
+		let mut data = self.data.lock();
+		data.derived_point = Some(derived_point.clone().into());
+
+		// broadcast derived point && other session paraeters to every other node
+		self.cluster.broadcast(Message::Encryption(EncryptionMessage::CompleteInitialization(CompleteInitialization {
+			session: self.id.clone().into(),
+			nodes: data.nodes.iter().map(|(id, data)| (id.clone().into(), data.id_number.clone().into())).collect(),
+			threshold: data.threshold.expect("threshold is filled in initialization phase; KD phase follows initialization phase; qed"),
+			derived_point: derived_point.into(),
+		})))
+	}
+
 	/// Keys dissemination (KD) phase
 	fn disseminate_keys(&self) -> Result<(), Error> {
 		let mut data = self.data.lock();
@@ -777,34 +603,124 @@ impl SessionImpl {
 		Ok(())
 	}
 
-	/// Disqualify node
-	fn disqualify_node(node: &NodeId, cluster: &Cluster, data: &mut SessionData) {
-		let threshold = data.threshold
-			.expect("threshold is filled on initialization phase; node can only be disqualified during KC phase; KC phase follows initialization phase; qed");
+	/// Keys verification (KV) phase
+	fn verify_keys(&self) -> Result<(), Error> {
+		let mut data = self.data.lock();
+		
+		// key verification (KV) phase: check that other nodes have passed correct secrets
+		let threshold = data.threshold.expect("threshold is filled in initialization phase; KV phase follows initialization phase; qed");
+		let derived_point = data.derived_point.clone().expect("derived point generated on initialization phase; KV phase follows initialization phase; qed");
+		let number_id = data.nodes[self.node()].id_number.clone();
+		for (_	, node_data) in data.nodes.iter_mut().filter(|&(node_id, _)| node_id != self.node()) {
+			let secret1 = node_data.secret1.as_ref().expect("keys received on KD phase; KV phase follows KD phase; qed");
+			let secret2 = node_data.secret2.as_ref().expect("keys received on KD phase; KV phase follows KD phase; qed");
+			let publics = node_data.publics.as_ref().expect("keys received on KD phase; KV phase follows KD phase; qed");
+			let is_key_verification_ok = math::keys_verification(threshold, &derived_point, &number_id,
+				secret1, secret2, publics)?;
 
-		// blacklist node
-		cluster.blacklist(&node);
-		// too many complaints => exclude from session
-		data.nodes.remove(&node);
-		// check if secret still can be reconstructed
-		if data.nodes.len() < threshold + 1 {
-			// not enough nodes => session is failed
-			data.state = SessionState::Failed;
+			if !is_key_verification_ok {
+				// node has sent us incorrect values. In original ECDKG protocol we should have sent complaint here.
+				return Err(Error::InvalidMessage);
+			}
 		}
+
+		// calculate public share
+		let self_public_share = {
+			let self_secret_coeff = data.secret_coeff.as_ref().expect("secret_coeff is generated on KD phase; KG phase follows KD phase; qed");
+			math::compute_public_share(self_secret_coeff)?
+		};
+
+		// calculate self secret + public shares
+		let self_secret_share = {
+			let secret_values_iter = data.nodes.values()
+				.map(|n| n.secret1.as_ref().expect("keys received on KD phase; KG phase follows KD phase; qed"));
+			math::compute_secret_share(secret_values_iter)?
+		};
+
+		// update state
+		data.state = SessionState::WaitingForPublicKeyShare;
+		data.secret_share = Some(self_secret_share);
+		let self_node = data.nodes.get_mut(self.node()).expect("node is always qualified by himself; qed");
+		self_node.public_share = Some(self_public_share.clone());
+
+		// broadcast self public key share
+		self.cluster.broadcast(Message::Encryption(EncryptionMessage::PublicKeyShare(PublicKeyShare {
+			session: self.id.clone().into(),
+			public_share: self_public_share.into(),
+		})))
+	}
+
+	/// Complete encryption
+	fn complete_encryption(&self) -> Result<(), Error> {
+		let mut data = self.data.lock();
+		
+		// else - calculate joint public key
+		let joint_public = {
+			let public_shares = data.nodes.values().map(|n| n.public_share.as_ref().expect("keys received on KD phase; KG phase follows KD phase; qed"));
+			math::compute_joint_public(public_shares)?
+		};
+
+		// if we are at the slave node - wait for session completion
+		if data.master.as_ref() != Some(self.node()) {
+			data.joint_public = Some(Ok(joint_public));
+			data.state = SessionState::WaitingForEncryptionConfirmation;
+			return Ok(());
+		}
+
+		// then generate secret point
+		// then encrypt secret point with joint public key
+		// TODO: secret is revealed to KeyServer here
+		let secret_point = math::generate_random_point()?;
+		let encrypted_secret_point = math::encrypt_secret(&secret_point, &joint_public)?;
+
+		// then save encrypted data to the key storage
+		let encrypted_data = DocumentKeyShare {
+			threshold: data.threshold.expect("threshold is filled in initialization phase; KG phase follows initialization phase; qed"),
+			id_numbers: data.nodes.iter().map(|(node_id, node_data)| (node_id.clone(), node_data.id_number.clone())).collect(),
+			secret_share: data.secret_share.as_ref().expect("secret_share is filled in KG phase; we are at the end of KG phase; qed").clone(),
+			common_point: encrypted_secret_point.common_point,
+			encrypted_point: encrypted_secret_point.encrypted_point,
+		};
+		self.key_storage.insert(self.id.clone(), encrypted_data.clone())
+			.map_err(|e| Error::KeyStorage(e.into()))?;
+
+		// then distribute encrypted data to every other node
+		self.cluster.broadcast(Message::Encryption(EncryptionMessage::SessionCompleted(SessionCompleted {
+			session: self.id.clone().into(),
+			common_point: encrypted_data.common_point.clone().into(),
+			encrypted_point: encrypted_data.encrypted_point.clone().into(),
+		})))?;
+
+		// then wait for confirmation from all other nodes
+		{
+			let self_node = data.nodes.get_mut(self.node()).expect("node is always qualified by himself; qed");
+			self_node.completion_confirmed = true;
+		}
+		data.joint_public = Some(Ok(joint_public));
+		data.secret_point = Some(Ok(secret_point));
+		data.state = SessionState::WaitingForEncryptionConfirmation;
+
+		Ok(())
 	}
 }
 
 impl Session for SessionImpl {
 	#[cfg(test)]
-	fn joint_public_key(&self) -> Option<Public> {
-		self.data.lock().joint_public.clone().and_then(|r| r.ok())
+	fn joint_public_key(&self) -> Option<Result<Public, Error>> {
+		self.data.lock().joint_public.clone()
 	}
 
+	fn state(&self) -> SessionState {
+		self.data.lock().state.clone()
+	}
 
-	fn wait(&self) -> Result<Public, Error> {
+	fn wait(&self, timeout: Option<time::Duration>) -> Result<Public, Error> {
 		let mut data = self.data.lock();
 		if !data.secret_point.is_some() {
-			self.completed.wait(&mut data);
+			match timeout {
+				None => self.completed.wait(&mut data),
+				Some(timeout) => { self.completed.wait_for(&mut data, timeout); },
+			}
 		}
 
 		data.secret_point.as_ref()
@@ -842,7 +758,6 @@ impl NodeData {
 	fn with_id_number(node_id_number: Secret) -> Self {
 		NodeData {
 			id_number: node_id_number,
-			complaints: BTreeSet::new(),
 			secret1_sent: None,
 			secret2_sent: None,
 			secret1: None,
@@ -862,7 +777,7 @@ impl Debug for SessionImpl {
 
 pub fn check_cluster_nodes(self_node_id: &NodeId, nodes: &BTreeSet<NodeId>) -> Result<(), Error> {
 	// at least two nodes must be in cluster
-	if nodes.len() < 2 {
+	if nodes.len() < 1 {
 		return Err(Error::InvalidNodesCount);
 	}
 	// this node must be a part of cluster
@@ -952,10 +867,6 @@ mod tests {
 			&self.nodes.values().nth(2).unwrap().session
 		}
 
-		pub fn third_slave(&self) -> &SessionImpl {
-			&self.nodes.values().nth(3).unwrap().session
-		}
-
 		pub fn take_message(&mut self) -> Option<(NodeId, NodeId, Message)> {
 			self.nodes.values()
 				.filter_map(|n| n.cluster.take_message().map(|m| (n.session.node().clone(), m.0, m.1)))
@@ -970,8 +881,6 @@ mod tests {
 					Message::Encryption(EncryptionMessage::ConfirmInitialization(ref message)) => self.nodes[&msg.1].session.on_confirm_initialization(msg.0.clone(), &message),
 					Message::Encryption(EncryptionMessage::CompleteInitialization(ref message)) => self.nodes[&msg.1].session.on_complete_initialization(msg.0.clone(), &message),
 					Message::Encryption(EncryptionMessage::KeysDissemination(ref message)) => self.nodes[&msg.1].session.on_keys_dissemination(msg.0.clone(), &message),
-					Message::Encryption(EncryptionMessage::Complaint(ref message)) => self.nodes[&msg.1].session.on_complaint(msg.0.clone(), &message),
-					Message::Encryption(EncryptionMessage::ComplaintResponse(ref message)) => self.nodes[&msg.1].session.on_complaint_response(msg.0.clone(), &message),
 					Message::Encryption(EncryptionMessage::PublicKeyShare(ref message)) => self.nodes[&msg.1].session.on_public_key_share(msg.0.clone(), &message),
 					Message::Encryption(EncryptionMessage::SessionCompleted(ref message)) => self.nodes[&msg.1].session.on_session_completed(msg.0.clone(), &message),
 					_ => panic!("unexpected"),
@@ -990,13 +899,6 @@ mod tests {
 			let msg = self.take_message().unwrap();
 			self.process_message(msg)
 		}
-
-		pub fn take_and_process_all_messages(&mut self) -> Result<(), Error> {
-			while let Some(msg) = self.take_message() {
-				self.process_message(msg)?;
-			}
-			Ok(())
-		}
 	}
 
 	fn make_simple_cluster(threshold: usize, num_nodes: usize) -> Result<(SessionId, NodeId, NodeId, MessageLoop), Error> {
@@ -1010,8 +912,9 @@ mod tests {
 	}
 
 	#[test]
-	fn fails_to_initialize_in_cluster_of_single_node() {
-		assert_eq!(make_simple_cluster(0, 1).unwrap_err(), Error::InvalidNodesCount);
+	fn initializes_in_cluster_of_single_node() {
+		let l = MessageLoop::new(1);
+		assert!(l.master().initialize(0, l.nodes.keys().cloned().collect()).is_ok());
 	}
 
 	#[test]
@@ -1106,19 +1009,6 @@ mod tests {
 		assert!(l.master().derived_point().unwrap() != passed_point.into());
 	}
 
-	#[test]
-	fn fails_to_complete_initialization_in_cluster_of_single_node() {
-		let (sid, m, s, l) = make_simple_cluster(0, 2).unwrap();
-		let mut nodes = BTreeMap::new();
-		nodes.insert(s, math::generate_random_scalar().unwrap());
-		assert_eq!(l.first_slave().on_complete_initialization(m, &message::CompleteInitialization {
-			session: sid.into(),
-			nodes: nodes.into_iter().map(|(k, v)| (k.into(), v.into())).collect(),
-			threshold: 0,
-			derived_point: math::generate_random_point().unwrap().into(),
-		}).unwrap_err(), Error::InvalidNodesCount);
-	}
-
 	#[test]
 	fn fails_to_complete_initialization_if_not_a_part_of_cluster() {
 		let (sid, m, _, l) = make_simple_cluster(0, 2).unwrap();
@@ -1227,119 +1117,6 @@ mod tests {
 		}).unwrap_err(), Error::InvalidStateForRequest);
 	}
 
-	#[test]
-	fn defends_if_receives_complain_on_himself() {
-		let (sid, m, s, mut l) = make_simple_cluster(1, 3).unwrap();
-		l.take_and_process_all_messages().unwrap();
-		l.master().on_complaint(s, &message::Complaint {
-			session: sid.into(),
-			against: m.into(),
-		}).unwrap();
-		match l.take_message().unwrap() {
-			(_, _, Message::Encryption(EncryptionMessage::ComplaintResponse(_))) => (),
-			_ => panic!("unexpected"),
-		}
-	}
-
-	#[test]
-	fn node_is_disqualified_if_enough_complaints_received() {
-		let (sid, _, s, mut l) = make_simple_cluster(1, 4).unwrap();
-		l.take_and_process_all_messages().unwrap();
-		l.master().on_complaint(l.second_slave().node().clone(), &message::Complaint {
-			session: sid.into(),
-			against: s.clone().into(),
-		}).unwrap();
-		l.master().on_complaint(l.third_slave().node().clone(), &message::Complaint {
-			session: sid.into(),
-			against: s.into(),
-		}).unwrap();
-		assert_eq!(l.master().qualified_nodes().len(), 3);
-	}
-
-	#[test]
-	fn node_is_not_disqualified_if_enough_complaints_received_from_the_same_node() {
-		let (sid, _, s, mut l) = make_simple_cluster(1, 4).unwrap();
-		l.take_and_process_all_messages().unwrap();
-		l.master().on_complaint(l.second_slave().node().clone(), &message::Complaint {
-			session: sid.into(),
-			against: s.clone().into(),
-		}).unwrap();
-		l.master().on_complaint(l.second_slave().node().clone(), &message::Complaint {
-			session: sid.into(),
-			against: s.into(),
-		}).unwrap();
-		assert_eq!(l.master().qualified_nodes().len(), 4);
-	}
-
-	#[test]
-	fn node_is_disqualified_if_responds_to_complain_with_invalid_data() {
-		let (sid, _, _, mut l) = make_simple_cluster(1, 3).unwrap();
-		l.take_and_process_message().unwrap(); // m -> s1: InitializeSession
-		l.take_and_process_message().unwrap(); // m -> s2: InitializeSession
-		l.take_and_process_message().unwrap(); // s1 -> m: ConfirmInitialization
-		l.take_and_process_message().unwrap(); // s2 -> m: ConfirmInitialization
-		l.take_and_process_message().unwrap(); // m -> s1: CompleteInitialization
-		l.take_and_process_message().unwrap(); // m -> s2: CompleteInitialization
-		l.take_and_process_message().unwrap(); // m -> s1: KeysDissemination
-		l.take_and_process_message().unwrap(); // m -> s2: KeysDissemination
-		l.take_and_process_message().unwrap(); // s1 -> m: KeysDissemination
-		l.take_and_process_message().unwrap(); // s1 -> s2: KeysDissemination
-		let s2 = l.second_slave().node().clone();
-		l.master().on_keys_dissemination(s2.clone(), &message::KeysDissemination {
-			session: sid.clone().into(),
-			secret1: math::generate_random_scalar().unwrap().into(),
-			secret2: math::generate_random_scalar().unwrap().into(),
-			publics: vec![math::generate_random_point().unwrap().into(), math::generate_random_point().unwrap().into()],
-		}).unwrap();
-		assert_eq!(l.master().qualified_nodes().len(), 3);
-		l.master().on_complaint_response(s2, &message::ComplaintResponse {
-			session: sid.into(),
-			secret1: math::generate_random_scalar().unwrap().into(),
-			secret2: math::generate_random_scalar().unwrap().into(),
-		}).unwrap();
-		assert_eq!(l.master().qualified_nodes().len(), 2);
-	}
-
-	#[test]
-	fn node_is_not_disqualified_if_responds_to_complain_with_valid_data() {
-		let (sid, _, _, mut l) = make_simple_cluster(1, 3).unwrap();
-		l.take_and_process_message().unwrap(); // m -> s1: InitializeSession
-		l.take_and_process_message().unwrap(); // m -> s2: InitializeSession
-		l.take_and_process_message().unwrap(); // s1 -> m: ConfirmInitialization
-		l.take_and_process_message().unwrap(); // s2 -> m: ConfirmInitialization
-		l.take_and_process_message().unwrap(); // m -> s1: CompleteInitialization
-		l.take_and_process_message().unwrap(); // m -> s2: CompleteInitialization
-		l.take_and_process_message().unwrap(); // m -> s1: KeysDissemination
-		l.take_and_process_message().unwrap(); // m -> s2: KeysDissemination
-		l.take_and_process_message().unwrap(); // s1 -> m: KeysDissemination
-		l.take_and_process_message().unwrap(); // s1 -> s2: KeysDissemination
-		let (f, t, msg) = match l.take_message() {
-			Some((f, t, Message::Encryption(EncryptionMessage::KeysDissemination(msg)))) => (f, t, msg),
-			_ => panic!("unexpected"),
-		};
-		assert_eq!(&f, l.second_slave().node());
-		assert_eq!(&t, l.master().node());
-		l.master().on_keys_dissemination(f.clone(), &message::KeysDissemination {
-			session: sid.clone().into(),
-			secret1: math::generate_random_scalar().unwrap().into(),
-			secret2: math::generate_random_scalar().unwrap().into(),
-			publics: msg.publics.clone().into(),
-		}).unwrap();
-		assert_eq!(l.master().qualified_nodes().len(), 3);
-		l.master().on_complaint_response(f, &message::ComplaintResponse {
-			session: sid.into(),
-			secret1: msg.secret1.into(),
-			secret2: msg.secret2.into(),
-		}).unwrap();
-		assert_eq!(l.master().qualified_nodes().len(), 3);
-	}
-
-	#[test]
-	fn should_not_start_key_generation_when_not_in_key_check_state() {
-		let (_, _, _, l) = make_simple_cluster(1, 3).unwrap();
-		assert_eq!(l.master().start_key_generation_phase().unwrap_err(), Error::InvalidStateForRequest);
-	}
-
 	#[test]
 	fn should_not_accept_public_key_share_when_is_not_waiting_for_it() {
 		let (sid, _, s, l) = make_simple_cluster(1, 3).unwrap();
@@ -1352,22 +1129,48 @@ mod tests {
 	#[test]
 	fn should_not_accept_public_key_share_when_receiving_twice() {
 		let (sid, m, _, mut l) = make_simple_cluster(0, 3).unwrap();
-		l.take_and_process_all_messages().unwrap();
-		l.master().start_key_generation_phase().unwrap();
-		l.first_slave().start_key_generation_phase().unwrap();
+		l.take_and_process_message().unwrap(); // m -> s1: InitializeSession
+		l.take_and_process_message().unwrap(); // m -> s2: InitializeSession
+		l.take_and_process_message().unwrap(); // s1 -> m: ConfirmInitialization
+		l.take_and_process_message().unwrap(); // s2 -> m: ConfirmInitialization
+		l.take_and_process_message().unwrap(); // m -> s1: CompleteInitialization
+		l.take_and_process_message().unwrap(); // m -> s2: CompleteInitialization
+		l.take_and_process_message().unwrap(); // m -> s1: KeysDissemination
+		l.take_and_process_message().unwrap(); // m -> s2: KeysDissemination
+		l.take_and_process_message().unwrap(); // s1 -> m: KeysDissemination
+		l.take_and_process_message().unwrap(); // s1 -> s2: KeysDissemination
+		l.take_and_process_message().unwrap(); // s2 -> m: KeysDissemination
+		l.take_and_process_message().unwrap(); // s2 -> s1: KeysDissemination
 		let (f, t, msg) = match l.take_message() {
 			Some((f, t, Message::Encryption(EncryptionMessage::PublicKeyShare(msg)))) => (f, t, msg),
 			_ => panic!("unexpected"),
 		};
 		assert_eq!(&f, l.master().node());
-		assert_eq!(&t, l.first_slave().node());
+		assert_eq!(&t, l.second_slave().node());
 		l.process_message((f, t, Message::Encryption(EncryptionMessage::PublicKeyShare(msg.clone())))).unwrap();
-		assert_eq!(l.first_slave().on_public_key_share(m, &message::PublicKeyShare {
+		assert_eq!(l.second_slave().on_public_key_share(m, &message::PublicKeyShare {
 			session: sid.into(),
 			public_share: math::generate_random_point().unwrap().into(),
 		}).unwrap_err(), Error::InvalidMessage);
 	}
 
+
+	#[test]
+	fn encryption_fails_on_session_timeout() {
+		let (_, _, _, l) = make_simple_cluster(0, 2).unwrap();
+		assert!(l.master().joint_public_key().is_none());
+		l.master().on_session_timeout();
+		assert!(l.master().joint_public_key().unwrap().unwrap_err() == Error::NodeDisconnected);
+	}
+
+	#[test]
+	fn encryption_fails_on_node_timeout() {
+		let (_, _, _, l) = make_simple_cluster(0, 2).unwrap();
+		assert!(l.master().joint_public_key().is_none());
+		l.master().on_node_timeout(l.first_slave().node());
+		assert!(l.master().joint_public_key().unwrap().unwrap_err() == Error::NodeDisconnected);
+	}
+
 	#[test]
 	fn complete_enc_dec_session() {
 		let test_cases = [(0, 5), (2, 5), (3, 5)];
@@ -1381,26 +1184,12 @@ mod tests {
 				l.process_message((from, to, message)).unwrap();
 			}
 
-			// check that all nodes are waiting for complaint timeout is passed
-			for node in l.nodes.values() {
-				let state = node.session.state();
-				assert_eq!(state, SessionState::KeyCheck);
-
-				// simulate timeout pass
-				node.session.start_key_generation_phase().unwrap();
-			}
-
-			// let nodes do joint public generation
-			while let Some((from, to, message)) = l.take_message() {
-				l.process_message((from, to, message)).unwrap();
-			}
-
 			// check that all nodes has finished joint public generation
-			let joint_public_key = l.master().joint_public_key().unwrap();
+			let joint_public_key = l.master().joint_public_key().unwrap().unwrap();
 			for node in l.nodes.values() {
 				let state = node.session.state();
 				assert_eq!(state, SessionState::Finished);
-				assert_eq!(node.session.joint_public_key().as_ref(), Some(&joint_public_key));
+				assert_eq!(node.session.joint_public_key().as_ref(), Some(&Ok(joint_public_key)));
 			}
 
 			// now let's encrypt some secret (which is a point on EC)
@@ -1417,8 +1206,6 @@ mod tests {
 		}
 	}
 
-	// TODO: add test where some nodes are disqualified from session
-
 	#[test]
 	fn encryption_session_works_over_network() {
 		//::util::log::init_log();
@@ -1428,7 +1215,7 @@ mod tests {
 			let mut core = Core::new().unwrap();
 
 			// prepare cluster objects for each node
-			let clusters = make_clusters(&core, 6020, num_nodes);
+			let clusters = make_clusters(&core, 6022, num_nodes);
 			run_clusters(&clusters);
 
 			// establish connections
diff --git a/secret_store/src/key_server_cluster/io/message.rs b/secret_store/src/key_server_cluster/io/message.rs
index fcc605a8e..95d3a54cb 100644
--- a/secret_store/src/key_server_cluster/io/message.rs
+++ b/secret_store/src/key_server_cluster/io/message.rs
@@ -71,17 +71,16 @@ pub fn serialize_message(message: Message) -> Result<SerializedMessage, Error> {
 		Message::Encryption(EncryptionMessage::ConfirmInitialization(payload))				=> (51, serde_json::to_vec(&payload)),
 		Message::Encryption(EncryptionMessage::CompleteInitialization(payload))				=> (52, serde_json::to_vec(&payload)),
 		Message::Encryption(EncryptionMessage::KeysDissemination(payload))					=> (53, serde_json::to_vec(&payload)),
-		Message::Encryption(EncryptionMessage::Complaint(payload))							=> (54, serde_json::to_vec(&payload)),
-		Message::Encryption(EncryptionMessage::ComplaintResponse(payload))					=> (55, serde_json::to_vec(&payload)),
-		Message::Encryption(EncryptionMessage::PublicKeyShare(payload))						=> (56, serde_json::to_vec(&payload)),
-		Message::Encryption(EncryptionMessage::SessionError(payload))						=> (57, serde_json::to_vec(&payload)),
-		Message::Encryption(EncryptionMessage::SessionCompleted(payload))					=> (58, serde_json::to_vec(&payload)),
+		Message::Encryption(EncryptionMessage::PublicKeyShare(payload))						=> (54, serde_json::to_vec(&payload)),
+		Message::Encryption(EncryptionMessage::SessionError(payload))						=> (55, serde_json::to_vec(&payload)),
+		Message::Encryption(EncryptionMessage::SessionCompleted(payload))					=> (56, serde_json::to_vec(&payload)),
 
 		Message::Decryption(DecryptionMessage::InitializeDecryptionSession(payload))		=> (100, serde_json::to_vec(&payload)),
 		Message::Decryption(DecryptionMessage::ConfirmDecryptionInitialization(payload))	=> (101, serde_json::to_vec(&payload)),
 		Message::Decryption(DecryptionMessage::RequestPartialDecryption(payload))			=> (102, serde_json::to_vec(&payload)),
 		Message::Decryption(DecryptionMessage::PartialDecryption(payload))					=> (103, serde_json::to_vec(&payload)),
 		Message::Decryption(DecryptionMessage::DecryptionSessionError(payload))				=> (104, serde_json::to_vec(&payload)),
+		Message::Decryption(DecryptionMessage::DecryptionSessionCompleted(payload))			=> (105, serde_json::to_vec(&payload)),
 	};
 
 	let payload = payload.map_err(|err| Error::Serde(err.to_string()))?;
@@ -104,17 +103,16 @@ pub fn deserialize_message(header: &MessageHeader, payload: Vec<u8>) -> Result<M
 		51	=> Message::Encryption(EncryptionMessage::ConfirmInitialization(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
 		52	=> Message::Encryption(EncryptionMessage::CompleteInitialization(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
 		53	=> Message::Encryption(EncryptionMessage::KeysDissemination(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
-		54	=> Message::Encryption(EncryptionMessage::Complaint(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
-		55	=> Message::Encryption(EncryptionMessage::ComplaintResponse(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
-		56	=> Message::Encryption(EncryptionMessage::PublicKeyShare(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
-		57	=> Message::Encryption(EncryptionMessage::SessionError(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
-		58	=> Message::Encryption(EncryptionMessage::SessionCompleted(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		54	=> Message::Encryption(EncryptionMessage::PublicKeyShare(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		55	=> Message::Encryption(EncryptionMessage::SessionError(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		56	=> Message::Encryption(EncryptionMessage::SessionCompleted(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
 
 		100	=> Message::Decryption(DecryptionMessage::InitializeDecryptionSession(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
 		101	=> Message::Decryption(DecryptionMessage::ConfirmDecryptionInitialization(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
 		102	=> Message::Decryption(DecryptionMessage::RequestPartialDecryption(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
 		103	=> Message::Decryption(DecryptionMessage::PartialDecryption(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
 		104	=> Message::Decryption(DecryptionMessage::DecryptionSessionError(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		105	=> Message::Decryption(DecryptionMessage::DecryptionSessionCompleted(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
 
 		_ => return Err(Error::Serde(format!("unknown message type {}", header.kind))),
 	})
diff --git a/secret_store/src/key_server_cluster/message.rs b/secret_store/src/key_server_cluster/message.rs
index d817c88a4..af3a113fe 100644
--- a/secret_store/src/key_server_cluster/message.rs
+++ b/secret_store/src/key_server_cluster/message.rs
@@ -58,10 +58,6 @@ pub enum EncryptionMessage {
 	CompleteInitialization(CompleteInitialization),
 	/// Generated keys are sent to every node.
 	KeysDissemination(KeysDissemination),
-	/// Complaint against another node is broadcasted.
-	Complaint(Complaint),
-	/// Complaint response is broadcasted.
-	ComplaintResponse(ComplaintResponse),
 	/// Broadcast self public key portion.
 	PublicKeyShare(PublicKeyShare),
 	/// When session error has occured.
@@ -83,6 +79,8 @@ pub enum DecryptionMessage {
 	PartialDecryption(PartialDecryption),
 	/// When decryption session error has occured.
 	DecryptionSessionError(DecryptionSessionError),
+	/// When decryption session is completed.
+	DecryptionSessionCompleted(DecryptionSessionCompleted),
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -160,26 +158,6 @@ pub struct KeysDissemination {
 	pub publics: Vec<SerializablePublic>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
-/// Complaint against node is broadcasted.
-pub struct Complaint {
-	/// Session Id.
-	pub session: MessageSessionId,
-	/// Public values.
-	pub against: MessageNodeId,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-/// Node is responding to complaint.
-pub struct ComplaintResponse {
-	/// Session Id.
-	pub session: MessageSessionId,
-	/// Secret 1.
-	pub secret1: SerializableSecret,
-	/// Secret 2.
-	pub secret2: SerializableSecret,
-}
-
 #[derive(Clone, Debug, Serialize, Deserialize)]
 /// Node is sharing its public key share.
 pub struct PublicKeyShare {
@@ -269,6 +247,15 @@ pub struct DecryptionSessionError {
 	pub error: String,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize)]
+/// When decryption session is completed.
+pub struct DecryptionSessionCompleted {
+	/// Encryption session Id.
+	pub session: MessageSessionId,
+	/// Decryption session Id.
+	pub sub_session: SerializableSecret,
+}
+
 impl EncryptionMessage {
 	pub fn session_id(&self) -> &SessionId {
 		match *self {
@@ -276,8 +263,6 @@ impl EncryptionMessage {
 			EncryptionMessage::ConfirmInitialization(ref msg) => &msg.session,
 			EncryptionMessage::CompleteInitialization(ref msg) => &msg.session,
 			EncryptionMessage::KeysDissemination(ref msg) => &msg.session,
-			EncryptionMessage::Complaint(ref msg) => &msg.session,
-			EncryptionMessage::ComplaintResponse(ref msg) => &msg.session,
 			EncryptionMessage::PublicKeyShare(ref msg) => &msg.session,
 			EncryptionMessage::SessionError(ref msg) => &msg.session,
 			EncryptionMessage::SessionCompleted(ref msg) => &msg.session,
@@ -293,6 +278,7 @@ impl DecryptionMessage {
 			DecryptionMessage::RequestPartialDecryption(ref msg) => &msg.session,
 			DecryptionMessage::PartialDecryption(ref msg) => &msg.session,
 			DecryptionMessage::DecryptionSessionError(ref msg) => &msg.session,
+			DecryptionMessage::DecryptionSessionCompleted(ref msg) => &msg.session,
 		}
 	}
 
@@ -303,6 +289,7 @@ impl DecryptionMessage {
 			DecryptionMessage::RequestPartialDecryption(ref msg) => &msg.sub_session,
 			DecryptionMessage::PartialDecryption(ref msg) => &msg.sub_session,
 			DecryptionMessage::DecryptionSessionError(ref msg) => &msg.sub_session,
+			DecryptionMessage::DecryptionSessionCompleted(ref msg) => &msg.sub_session,
 		}
 	}
 }
@@ -335,8 +322,6 @@ impl fmt::Display for EncryptionMessage {
 			EncryptionMessage::ConfirmInitialization(_) => write!(f, "ConfirmInitialization"),
 			EncryptionMessage::CompleteInitialization(_) => write!(f, "CompleteInitialization"),
 			EncryptionMessage::KeysDissemination(_) => write!(f, "KeysDissemination"),
-			EncryptionMessage::Complaint(_) => write!(f, "Complaint"),
-			EncryptionMessage::ComplaintResponse(_) => write!(f, "ComplaintResponse"),
 			EncryptionMessage::PublicKeyShare(_) => write!(f, "PublicKeyShare"),
 			EncryptionMessage::SessionError(ref msg) => write!(f, "SessionError({})", msg.error),
 			EncryptionMessage::SessionCompleted(_) => write!(f, "SessionCompleted"),
@@ -352,6 +337,7 @@ impl fmt::Display for DecryptionMessage {
 			DecryptionMessage::RequestPartialDecryption(_) => write!(f, "RequestPartialDecryption"),
 			DecryptionMessage::PartialDecryption(_) => write!(f, "PartialDecryption"),
 			DecryptionMessage::DecryptionSessionError(_) => write!(f, "DecryptionSessionError"),
+			DecryptionMessage::DecryptionSessionCompleted(_) => write!(f, "DecryptionSessionCompleted"),
 		}
 	}
 }
diff --git a/secret_store/src/key_server_cluster/mod.rs b/secret_store/src/key_server_cluster/mod.rs
index 5c7bc0d2f..bdaa868ee 100644
--- a/secret_store/src/key_server_cluster/mod.rs
+++ b/secret_store/src/key_server_cluster/mod.rs
@@ -20,7 +20,7 @@ use ethkey;
 use ethcrypto;
 use super::types::all::DocumentAddress;
 
-pub use super::types::all::{NodeId, EncryptionConfiguration, DocumentEncryptedKeyShadow};
+pub use super::types::all::{NodeId, DocumentEncryptedKeyShadow};
 pub use super::acl_storage::AclStorage;
 pub use super::key_storage::{KeyStorage, DocumentKeyShare};
 pub use super::serialization::{SerializableSignature, SerializableH256, SerializableSecret, SerializablePublic};
diff --git a/secret_store/src/key_storage.rs b/secret_store/src/key_storage.rs
index ac5e3bf8f..b324dd90a 100644
--- a/secret_store/src/key_storage.rs
+++ b/secret_store/src/key_storage.rs
@@ -135,8 +135,7 @@ pub mod tests {
 	use parking_lot::RwLock;
 	use devtools::RandomTempPath;
 	use ethkey::{Random, Generator};
-	use super::super::types::all::{Error, NodeAddress, ServiceConfiguration, ClusterConfiguration,
-		DocumentAddress, EncryptionConfiguration};
+	use super::super::types::all::{Error, NodeAddress, ServiceConfiguration, ClusterConfiguration, DocumentAddress};
 	use super::{KeyStorage, PersistentKeyStorage, DocumentKeyShare};
 
 	#[derive(Default)]
@@ -178,9 +177,6 @@ pub mod tests {
 				},
 				nodes: BTreeMap::new(),
 				allow_connecting_to_higher_nodes: false,
-				encryption_config: EncryptionConfiguration {
-					key_check_timeout_ms: 10,
-				},
 			},
 		};
 		
diff --git a/secret_store/src/lib.rs b/secret_store/src/lib.rs
index cd6116848..209a32cc2 100644
--- a/secret_store/src/lib.rs
+++ b/secret_store/src/lib.rs
@@ -38,6 +38,7 @@ extern crate ethcore;
 extern crate ethcore_devtools as devtools;
 extern crate ethcore_util as util;
 extern crate ethcore_ipc as ipc;
+extern crate ethcore_logger as logger;
 extern crate ethcrypto;
 extern crate ethkey;
 extern crate native_contracts;
@@ -60,7 +61,7 @@ use std::sync::Arc;
 use ethcore::client::Client;
 
 pub use types::all::{DocumentAddress, DocumentKey, DocumentEncryptedKey, RequestSignature, Public,
-	Error, NodeAddress, ServiceConfiguration, ClusterConfiguration, EncryptionConfiguration};
+	Error, NodeAddress, ServiceConfiguration, ClusterConfiguration};
 pub use traits::{KeyServer};
 
 /// Start new key server instance
@@ -70,6 +71,6 @@ pub fn start(client: Arc<Client>, config: ServiceConfiguration) -> Result<Box<Ke
 	let acl_storage = Arc::new(acl_storage::OnChainAclStorage::new(client));
 	let key_storage = Arc::new(key_storage::PersistentKeyStorage::new(&config)?);
 	let key_server = key_server::KeyServerImpl::new(&config.cluster_config, acl_storage, key_storage)?;
-	let listener = http_listener::KeyServerHttpListener::start(config, key_server)?;
+	let listener = http_listener::KeyServerHttpListener::start(&config.listener_address, key_server)?;
 	Ok(Box::new(listener))
 }
diff --git a/secret_store/src/types/all.rs b/secret_store/src/types/all.rs
index 746b07c83..e3302a699 100644
--- a/secret_store/src/types/all.rs
+++ b/secret_store/src/types/all.rs
@@ -87,16 +87,6 @@ pub struct ClusterConfiguration {
 	/// Allow outbound connections to 'higher' nodes.
 	/// This is useful for tests, but slower a bit for production.
 	pub allow_connecting_to_higher_nodes: bool,
-	/// Encryption session configuration.
-	pub encryption_config: EncryptionConfiguration,
-}
-
-#[derive(Clone, Debug)]
-#[binary]
-/// Encryption parameters.
-pub struct EncryptionConfiguration {
-	/// Key check timeout.
-	pub key_check_timeout_ms: u64,
 }
 
 #[derive(Clone, Debug, PartialEq)]

From 3344d96329153415aa7ae9efdbe40651aac25ecd Mon Sep 17 00:00:00 2001
From: Shaoping <shaopingzhang4310@gmail.com>
Date: Wed, 26 Apr 2017 16:57:19 +0800
Subject: [PATCH 059/117] Chinese Translation (#5460)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update account.js

* Update accounts.js

* finished writeContract.js translate

* translated web, walletSetting

* 添加注释

* 添加注释

* 翻译1

* 翻译1，存疑1

* 翻译1，没毛病

* 翻译1，存疑1

* Translated addAddress & addContract

* 翻译1

* Translated connection.js

* Translated contract.js

* Translated contracts.js

* translated dapps.js

* translated deleteAccount

* Translated createWallet.js

* Translated editMeta.js

* Translated errors.js

* Translated extension.js

* translated deployContract

* Translated executeContract.js

* Update home.js

* Translated home.js

* Translated loadContract.js

* Translated parityBar.js

* translated faucet

* Translated passwordChange.js

* Translated saveContract.js

* translated firstRun

* translated tabBar

* Commented out all ENG

* translated transfer.js

* translated txEditor.js

* Translated settings.js

* translated ui.js

* Translated shapeshift.js

* translated wallet.js

* Translated signer.js

* translated upgradParity.js

* Translated status.js

* translated verification.js

* Translated vaults.js

* translated ui.js

* zh-tw translation

* translated account.js

* translated accounts.js

* translated accounts.js

* translated address.js

* translated addressSelect.js

* translated addresses.js

* translated application.js

* translated dapp.js

* translated ui.js

* translated txEditor.js

* update zh-Hant-TW translation

* enable zh-Hant-TW
---
 js/src/i18n/constants.js                  |   2 +-
 js/src/i18n/languages.js                  |   3 +-
 js/src/i18n/store.js                      |   4 +-
 js/src/i18n/zh-Hant-TW/account.js         |  39 +++++
 js/src/i18n/zh-Hant-TW/accounts.js        |  36 +++++
 js/src/i18n/zh-Hant-TW/addAddress.js      |  41 ++++++
 js/src/i18n/zh-Hant-TW/addContract.js     |  60 ++++++++
 js/src/i18n/zh-Hant-TW/address.js         |  28 ++++
 js/src/i18n/zh-Hant-TW/addressSelect.js   |  26 ++++
 js/src/i18n/zh-Hant-TW/addresses.js       |  25 ++++
 js/src/i18n/zh-Hant-TW/application.js     |  30 ++++
 js/src/i18n/zh-Hant-TW/connection.js      |  30 ++++
 js/src/i18n/zh-Hant-TW/contract.js        |  41 ++++++
 js/src/i18n/zh-Hant-TW/contracts.js       |  28 ++++
 js/src/i18n/zh-Hant-TW/createAccount.js   | 165 ++++++++++++++++++++++
 js/src/i18n/zh-Hant-TW/createWallet.js    | 106 ++++++++++++++
 js/src/i18n/zh-Hant-TW/dapp.js            |  20 +++
 js/src/i18n/zh-Hant-TW/dapps.js           |  48 +++++++
 js/src/i18n/zh-Hant-TW/deleteAccount.js   |  24 ++++
 js/src/i18n/zh-Hant-TW/deployContract.js  |  90 ++++++++++++
 js/src/i18n/zh-Hant-TW/details_windows.js |  17 +++
 js/src/i18n/zh-Hant-TW/editMeta.js        |  34 +++++
 js/src/i18n/zh-Hant-TW/errors.js          |  24 ++++
 js/src/i18n/zh-Hant-TW/executeContract.js |  58 ++++++++
 js/src/i18n/zh-Hant-TW/extension.js       |  22 +++
 js/src/i18n/zh-Hant-TW/faucet.js          |  29 ++++
 js/src/i18n/zh-Hant-TW/firstRun.js        |  52 +++++++
 js/src/i18n/zh-Hant-TW/home.js            |  38 +++++
 js/src/i18n/zh-Hant-TW/index.js           | 105 ++++++++++++++
 js/src/i18n/zh-Hant-TW/loadContract.js    |  43 ++++++
 js/src/i18n/zh-Hant-TW/parityBar.js       |  29 ++++
 js/src/i18n/zh-Hant-TW/passwordChange.js  |  54 +++++++
 js/src/i18n/zh-Hant-TW/saveContract.js    |  27 ++++
 js/src/i18n/zh-Hant-TW/settings.js        | 126 +++++++++++++++++
 js/src/i18n/zh-Hant-TW/shapeshift.js      |  76 ++++++++++
 js/src/i18n/zh-Hant-TW/signer.js          | 107 ++++++++++++++
 js/src/i18n/zh-Hant-TW/status.js          |  67 +++++++++
 js/src/i18n/zh-Hant-TW/tabBar.js          |  22 +++
 js/src/i18n/zh-Hant-TW/transfer.js        |  62 ++++++++
 js/src/i18n/zh-Hant-TW/txEditor.js        |  40 ++++++
 js/src/i18n/zh-Hant-TW/ui.js              | 163 +++++++++++++++++++++
 js/src/i18n/zh-Hant-TW/upgradeParity.js   |  55 ++++++++
 js/src/i18n/zh-Hant-TW/vaults.js          | 114 +++++++++++++++
 js/src/i18n/zh-Hant-TW/verification.js    |  85 +++++++++++
 js/src/i18n/zh-Hant-TW/wallet.js          |  46 ++++++
 js/src/i18n/zh-Hant-TW/walletSettings.js  |  75 ++++++++++
 js/src/i18n/zh-Hant-TW/web.js             |  19 +++
 js/src/i18n/zh-Hant-TW/writeContract.js   |  62 ++++++++
 js/src/i18n/zh/account.js                 |  24 ++--
 js/src/i18n/zh/accounts.js                |  18 +--
 js/src/i18n/zh/addAddress.js              |  23 +--
 js/src/i18n/zh/addContract.js             |  44 +++---
 js/src/i18n/zh/address.js                 |  12 +-
 js/src/i18n/zh/addressSelect.js           |  12 +-
 js/src/i18n/zh/addresses.js               |   6 +-
 js/src/i18n/zh/application.js             |  12 +-
 js/src/i18n/zh/connection.js              |  18 ++-
 js/src/i18n/zh/contract.js                |  26 ++--
 js/src/i18n/zh/contracts.js               |  12 +-
 js/src/i18n/zh/createWallet.js            | 100 ++++++-------
 js/src/i18n/zh/dapp.js                    |   4 +-
 js/src/i18n/zh/dapps.js                   |  27 ++--
 js/src/i18n/zh/deleteAccount.js           |   8 +-
 js/src/i18n/zh/deployContract.js          |  76 +++++-----
 js/src/i18n/zh/editMeta.js                |  16 +--
 js/src/i18n/zh/errors.js                  |  12 +-
 js/src/i18n/zh/executeContract.js         |  44 +++---
 js/src/i18n/zh/extension.js               |   6 +-
 js/src/i18n/zh/faucet.js                  |  13 +-
 js/src/i18n/zh/firstRun.js                |  41 +++---
 js/src/i18n/zh/home.js                    |  20 +--
 js/src/i18n/zh/loadContract.js            |  26 ++--
 js/src/i18n/zh/parityBar.js               |  10 +-
 js/src/i18n/zh/passwordChange.js          |  40 +++---
 js/src/i18n/zh/saveContract.js            |  10 +-
 js/src/i18n/zh/settings.js                | 131 ++++++++++-------
 js/src/i18n/zh/shapeshift.js              |  58 ++++----
 js/src/i18n/zh/signer.js                  |  86 +++++------
 js/src/i18n/zh/status.js                  |  57 ++++----
 js/src/i18n/zh/tabBar.js                  |   3 +-
 js/src/i18n/zh/transfer.js                |  39 ++---
 js/src/i18n/zh/txEditor.js                |  23 +--
 js/src/i18n/zh/ui.js                      | 116 +++++++--------
 js/src/i18n/zh/upgradeParity.js           |  46 +++---
 js/src/i18n/zh/vaults.js                  |  98 +++++++------
 js/src/i18n/zh/verification.js            |  66 ++++-----
 js/src/i18n/zh/wallet.js                  |  25 ++--
 js/src/i18n/zh/walletSettings.js          |  60 ++++----
 js/src/i18n/zh/web.js                     |   2 +-
 js/src/i18n/zh/writeContract.js           |  60 ++++----
 90 files changed, 3300 insertions(+), 727 deletions(-)
 create mode 100644 js/src/i18n/zh-Hant-TW/account.js
 create mode 100644 js/src/i18n/zh-Hant-TW/accounts.js
 create mode 100644 js/src/i18n/zh-Hant-TW/addAddress.js
 create mode 100644 js/src/i18n/zh-Hant-TW/addContract.js
 create mode 100644 js/src/i18n/zh-Hant-TW/address.js
 create mode 100644 js/src/i18n/zh-Hant-TW/addressSelect.js
 create mode 100644 js/src/i18n/zh-Hant-TW/addresses.js
 create mode 100644 js/src/i18n/zh-Hant-TW/application.js
 create mode 100644 js/src/i18n/zh-Hant-TW/connection.js
 create mode 100644 js/src/i18n/zh-Hant-TW/contract.js
 create mode 100644 js/src/i18n/zh-Hant-TW/contracts.js
 create mode 100644 js/src/i18n/zh-Hant-TW/createAccount.js
 create mode 100644 js/src/i18n/zh-Hant-TW/createWallet.js
 create mode 100644 js/src/i18n/zh-Hant-TW/dapp.js
 create mode 100644 js/src/i18n/zh-Hant-TW/dapps.js
 create mode 100644 js/src/i18n/zh-Hant-TW/deleteAccount.js
 create mode 100644 js/src/i18n/zh-Hant-TW/deployContract.js
 create mode 100644 js/src/i18n/zh-Hant-TW/details_windows.js
 create mode 100644 js/src/i18n/zh-Hant-TW/editMeta.js
 create mode 100644 js/src/i18n/zh-Hant-TW/errors.js
 create mode 100644 js/src/i18n/zh-Hant-TW/executeContract.js
 create mode 100644 js/src/i18n/zh-Hant-TW/extension.js
 create mode 100644 js/src/i18n/zh-Hant-TW/faucet.js
 create mode 100644 js/src/i18n/zh-Hant-TW/firstRun.js
 create mode 100644 js/src/i18n/zh-Hant-TW/home.js
 create mode 100644 js/src/i18n/zh-Hant-TW/index.js
 create mode 100644 js/src/i18n/zh-Hant-TW/loadContract.js
 create mode 100644 js/src/i18n/zh-Hant-TW/parityBar.js
 create mode 100644 js/src/i18n/zh-Hant-TW/passwordChange.js
 create mode 100644 js/src/i18n/zh-Hant-TW/saveContract.js
 create mode 100644 js/src/i18n/zh-Hant-TW/settings.js
 create mode 100644 js/src/i18n/zh-Hant-TW/shapeshift.js
 create mode 100644 js/src/i18n/zh-Hant-TW/signer.js
 create mode 100644 js/src/i18n/zh-Hant-TW/status.js
 create mode 100644 js/src/i18n/zh-Hant-TW/tabBar.js
 create mode 100644 js/src/i18n/zh-Hant-TW/transfer.js
 create mode 100644 js/src/i18n/zh-Hant-TW/txEditor.js
 create mode 100644 js/src/i18n/zh-Hant-TW/ui.js
 create mode 100644 js/src/i18n/zh-Hant-TW/upgradeParity.js
 create mode 100644 js/src/i18n/zh-Hant-TW/vaults.js
 create mode 100644 js/src/i18n/zh-Hant-TW/verification.js
 create mode 100644 js/src/i18n/zh-Hant-TW/wallet.js
 create mode 100644 js/src/i18n/zh-Hant-TW/walletSettings.js
 create mode 100644 js/src/i18n/zh-Hant-TW/web.js
 create mode 100644 js/src/i18n/zh-Hant-TW/writeContract.js

diff --git a/js/src/i18n/constants.js b/js/src/i18n/constants.js
index 6b4d7dafd..54693f81b 100644
--- a/js/src/i18n/constants.js
+++ b/js/src/i18n/constants.js
@@ -17,7 +17,7 @@
 const DEFAULT_LOCALE = 'en';
 const DEFAULT_LOCALES = process.env.NODE_ENV === 'production'
   ? ['en']
-  : ['en', 'de', 'nl', 'zh'];
+  : ['en', 'de', 'nl', 'zh', 'zh-Hant-TW'];
 const LS_STORE_KEY = '_parity::locale';
 
 export {
diff --git a/js/src/i18n/languages.js b/js/src/i18n/languages.js
index b178fe4c2..65265b690 100644
--- a/js/src/i18n/languages.js
+++ b/js/src/i18n/languages.js
@@ -18,5 +18,6 @@ export default {
   de: 'Deutsch',
   en: 'English',
   nl: 'Nederlands',
-  zh: '简体中文'
+  zh: '简体中文',
+  'zh-Hant-TW': '繁體中文'
 };
diff --git a/js/src/i18n/store.js b/js/src/i18n/store.js
index fdceb6beb..f2506950e 100644
--- a/js/src/i18n/store.js
+++ b/js/src/i18n/store.js
@@ -29,6 +29,7 @@ import deMessages from './de';
 import enMessages from './en';
 import nlMessages from './nl';
 import zhMessages from './zh';
+import zhHantTWMessages from './zh-Hant-TW';
 
 let instance = null;
 
@@ -37,7 +38,8 @@ const MESSAGES = {
   de: Object.assign(flatten(deMessages), LANGUAGES),
   en: Object.assign(flatten(enMessages), LANGUAGES),
   nl: Object.assign(flatten(nlMessages), LANGUAGES),
-  zh: Object.assign(flatten(zhMessages), LANGUAGES)
+  zh: Object.assign(flatten(zhMessages), LANGUAGES),
+  'zh-Hant-TW': Object.assign(flatten(zhHantTWMessages), LANGUAGES)
 };
 
 addLocaleData([...de, ...en, ...nl, ...zh]);
diff --git a/js/src/i18n/zh-Hant-TW/account.js b/js/src/i18n/zh-Hant-TW/account.js
new file mode 100644
index 000000000..ba8a34b5f
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/account.js
@@ -0,0 +1,39 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  button: {
+    delete: `刪除`,//delete
+    edit: `編輯`,//edit
+    faucet: `Kovan測試網路以太幣`,//Kovan ETH 
+    password: `密碼`,//password
+    shapeshift: `shapeshift`,
+    transfer: `轉帳`,//transfer
+    verify: `確認`//verify
+  },
+  hardware: {
+    confirmDelete: `你確定從你的帳戶列表中移除下面的硬體地址嗎？`
+  },//Are you sure you want to remove the following hardware address from your account list?
+  header: {
+    outgoingTransactions: `{count}筆正在發生的轉帳`,//{count} outgoing transactions
+    uuid: `uuid: {uuid}`
+  },
+  title: `帳戶管理`,//Account Management
+  transactions: {
+    poweredBy: `Transaction list powered by {etherscan}提供的交易列表`,
+    title: `交易`//transactions
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/accounts.js b/js/src/i18n/zh-Hant-TW/accounts.js
new file mode 100644
index 000000000..079123400
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/accounts.js
@@ -0,0 +1,36 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  button: {
+    newAccount: `帳戶`,//account
+    newWallet: `錢包`,//wallet
+    vaults: `保險庫`//vaults
+  },
+  summary: {
+    minedBlock: `在第#{blockNumber}個區塊被挖出`//Mined at block #{blockNumber}
+  },
+  title: `帳戶總覽`,//Accounts Overview
+  tooltip: {
+    actions: `與當前視窗有關的操作可以在工具欄中快速被找到，不論是執行操作還是建立新項`,
+    //actions relating to the current view are available on the toolbar for quick access, be it for performing actions or creating a new item
+    overview: `你的帳戶很容易使用，使你可以編輯元資訊、轉帳、檢視交易和向帳戶充值`
+    //your accounts are visible for easy access, allowing you to edit the meta information, make transfers, view transactions and fund the account
+  },
+  tooltips: {
+    owner: `{name}持有者`//{name} (owner)
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/addAddress.js b/js/src/i18n/zh-Hant-TW/addAddress.js
new file mode 100644
index 000000000..72a027042
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/addAddress.js
@@ -0,0 +1,41 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  button: {
+    add: `儲存地址`, // Save Address
+    close: `取消` // Cancel
+  },
+  header: `如果想在地址簿中新增一條新的記錄，你需要擁有帳戶的網路地址並提供一個的描述（可選）。一旦新增，記錄就可以體現在你的地址簿中。`,
+  // To add a new entry to your addressbook, you need the network 
+  // address of the account and can supply an optional description. 
+  // Once added it will reflect in your address book.
+  input: {
+    address: {
+      hint: `記錄的網路地址`, // the network address for the entry
+      label: `網路地址` // network address
+    },
+    description: {
+      hint: `記錄的詳細描述`, // an expanded description for the entry
+      label: `（可選）地址描述` // (optional) address description
+    },
+    name: {
+      hint: `記錄的名字`, // a descriptive name for the entry
+      label: `地址名` // address name
+    }
+  },
+  label: `新增已儲存的地址` // add saved address
+};
diff --git a/js/src/i18n/zh-Hant-TW/addContract.js b/js/src/i18n/zh-Hant-TW/addContract.js
new file mode 100644
index 000000000..314779896
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/addContract.js
@@ -0,0 +1,60 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  abi: {
+    hint: `合約的ABI`, // the abi for the contract
+    label: `合約ABI` // contract abi
+  },
+  abiType: {
+    custom: {
+      description: `通過自定義ABI創造的合約`, // Contract created from custom ABI
+      label: `自定義合約` // Custom Contract
+    },
+    multisigWallet: {
+      description: `以太坊多重簽名合約{link}`, // Ethereum Multisig contract {link}
+      label: `多重簽名錢包`, // Multisig Wallet
+      link: `參考合約程式碼` // see contract code
+    },
+    token: {
+      description: `一個標準的{erc20}代幣`, // A standard {erc20} token
+      erc20: `ERC 20`, // ERC 20
+      label: `代幣` // Token
+    }
+  },
+  address: {
+    hint: `合約的網路地址`, // the network address for the contract
+    label: `網路地址` // network address
+  },
+  button: {
+    add: `新增合約`, // Add Contract
+    cancel: `取消`, // Cancel
+    next: `下一步`, // Next
+    prev: `上一步` // Back
+  },
+  description: {
+    hint: `記錄的詳細描述`, // an expanded description for the entry
+    label: `（可選）合約描述` // (optional) contract description
+  },
+  name: {
+    hint: `合約的描述性名稱`, // a descriptive name for the contract
+    label: `合約名` // contract name
+  },
+  title: {
+    details: `輸入合約細節`, // enter contract details
+    type: `選擇合約種類` // choose a contract type
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/address.js b/js/src/i18n/zh-Hant-TW/address.js
new file mode 100644
index 000000000..7fda05357
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/address.js
@@ -0,0 +1,28 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  buttons: {
+    edit: `編輯`,//edit
+    forget: `忘記`,//forget
+    save: `儲存`//save
+  },
+  delete: {
+    confirmInfo: `你確定你想把下面的地址從你的地址簿中移除嗎？`,//Are you sure you want to remove the following address from your addressbook?
+    title: `確認移除`//confirm removal
+  },
+  title: `地址資訊`//Address Information
+};
diff --git a/js/src/i18n/zh-Hant-TW/addressSelect.js b/js/src/i18n/zh-Hant-TW/addressSelect.js
new file mode 100644
index 000000000..864335601
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/addressSelect.js
@@ -0,0 +1,26 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  fromEmail: `使用郵箱{email}進行確認`,//Verified using email {email}
+  fromRegistry: `{name}（來自注冊）`,//{name} (from registry)
+  labels: {
+    accounts: `帳戶`,//accounts
+    contacts: `合約`,//contacts
+    contracts: `合約`//contracts
+  },
+  noAccount: `查不到這個帳戶`//No account matches this query...
+};
diff --git a/js/src/i18n/zh-Hant-TW/addresses.js b/js/src/i18n/zh-Hant-TW/addresses.js
new file mode 100644
index 000000000..a839720aa
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/addresses.js
@@ -0,0 +1,25 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  buttons: {
+    add: `地址` //address
+  },
+  errors: {
+    invalidFile: `提供的檔案是無效的`//The provided file is invalid...
+  },
+  title: `儲存的地址`//Saved Addresses
+};
diff --git a/js/src/i18n/zh-Hant-TW/application.js b/js/src/i18n/zh-Hant-TW/application.js
new file mode 100644
index 000000000..5ae1f2353
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/application.js
@@ -0,0 +1,30 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  frame: {
+    error: `錯誤：這個應用不能也不應該載入到內建框架中`//ERROR: This application cannot and should not be loaded in an embedded iFrame
+  },
+  status: {
+    consensus: {
+      capable: `可行`,//Capable
+      capableUntil: `到第 #{blockNumber} 區塊前可行`,//Capable until #{blockNumber}
+      incapableSince: `自第 #{blockNumber} 區塊後不可行`,//Incapable since #{blockNumber}
+      unknown: `未知能力`//Unknown capability
+    },
+    upgrade: `升級`//Upgrade
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/connection.js b/js/src/i18n/zh-Hant-TW/connection.js
new file mode 100644
index 000000000..8386aef94
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/connection.js
@@ -0,0 +1,30 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+export default {
+  connectingAPI: `正在連線至Parity Secure API`, // Connecting to the Parity Secure API.
+  connectingNode: `正在連線Parity節點。如果彈出任何資訊，請確認你的Parity節點正在執行並連線至網際網路。`, 
+  // Connecting to the Parity Node. If this informational message persists, 
+  // please ensure that your Parity node is running and reachable on the network.
+  invalidToken: `無效的簽名令牌`, // invalid signer token
+  noConnection: `無法連線至Parity Secure API。請升級的你的安全令牌或者生成一個新的，執行{newToken}並貼上生成的令牌到下方。`,
+  // Unable to make a connection to the Parity Secure API. To update your secure 
+  // token or to generate a new one, run {newToken} and paste the generated token 
+  // into the space below.
+  token: {
+    hint: `一個Parity生成的令牌`, // a generated token from Parity
+    label: `安全令牌` // secure token
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/contract.js b/js/src/i18n/zh-Hant-TW/contract.js
new file mode 100644
index 000000000..9f5b40f0a
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/contract.js
@@ -0,0 +1,41 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  buttons: {
+    close: `關閉`, // close
+    details: `詳細資料`, // details
+    edit: `編輯`, // edit
+    execute: `執行`, // execute
+    forget: `forget` // forget
+  },
+  details: {
+    title: `合約細節` // contract details
+  },
+  events: {
+    eventPending: `待定中`, // pending
+    noEvents: `此合約沒有傳送過任何事件`, // No events has been sent from this contract.
+    title: `事件`  // events
+  },
+  minedBlock: `挖到了第{blockNumber}個區塊`, // Mined at block #{blockNumber}
+  queries: {
+    buttons: {
+      query: `查詢` // Query
+    },
+    title: `查詢` // queries
+  },
+  title: `合約資訊` // Contract Information
+};
diff --git a/js/src/i18n/zh-Hant-TW/contracts.js b/js/src/i18n/zh-Hant-TW/contracts.js
new file mode 100644
index 000000000..a81387f28
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/contracts.js
@@ -0,0 +1,28 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  buttons: {
+    deploy: `部署`, // deploy
+    develop: `開發`, // develop
+    watch: `觀察` // watch
+  },
+  sortOrder: {
+    date: `日期`, // date
+    minedBlock: `挖到的區塊` // mined block
+  },
+  title: `合約` // Contracts
+};
diff --git a/js/src/i18n/zh-Hant-TW/createAccount.js b/js/src/i18n/zh-Hant-TW/createAccount.js
new file mode 100644
index 000000000..81e7b81b5
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/createAccount.js
@@ -0,0 +1,165 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  accountDetails: {
+    address: {
+      hint: `帳戶地址`,
+      label: `地址`
+    },
+    name: {
+      hint: `描述帳戶的名字`,
+      label: `帳戶名`
+    },
+    phrase: {
+      hint: `帳戶恢復詞`,
+      label: `帳戶恢復詞（安全儲存，別人擁有它就可以完全控制你的帳戶）`
+    }
+  },
+  accountDetailsGeth: {
+    imported: `你已經從Geth keystore匯入了{number}個地址`
+  },
+  button: {
+    back: `返回`,
+    cancel: `取消`,
+    close: `關閉`,
+    create: `建立`,
+    done: `Done`,
+    import: `匯入`,
+    next: `下一步`,
+    print: `列印恢復詞`
+  },
+  creationType: {
+    fromGeth: {
+      description: `Import accounts from the Geth keystore with the original password`,
+      label: `從Geth keystore匯入帳戶`
+    },
+    fromJSON: {
+      description: `Import an industry-standard JSON keyfile with the original password`,
+      label: `從JSON檔案匯入帳戶`
+    },
+    fromNew: {
+      description: `Selecting your identity icon and specifying the password`,
+      label: `手動建立新帳戶`
+    },
+    fromPhrase: {
+      description: `Recover using a previously stored recovery phrase and new password`,
+      label: `通過恢復詞恢復帳戶`
+    },
+    fromPresale: {
+      description: `Import an Ethereum presale wallet file with the original password`,
+      label: `從以太坊預售錢包匯入帳戶`
+    },
+    fromRaw: {
+      description: `Enter a previously created raw private key with a new password`,
+      label: `匯入私鑰`
+    },
+    info: `Please select the type of account you want to create. Either create an account via name & password, or import it from a variety of existing sources. From here the wizard will guide you through the process of completing your account creation.`
+  },
+  newAccount: {
+    hint: {
+      hint: `（可選）幫助你記住密碼的提示`,
+      label: `密碼提示`
+    },
+    name: {
+      hint: `描述帳戶的名字`,
+      label: `帳戶名`
+    },
+    password: {
+      hint: `足夠強的密碼`,
+      label: `密碼`
+    },
+    password2: {
+      hint: `確認你的密碼`,
+      label: `再次輸入密碼`
+    }
+  },
+  newGeth: {
+    available: `There are currently {count} importable keys available from the Geth keystore which are not already available on your Parity instance. Select the accounts you wish to import and move to the next step to complete the import.`,
+    noKeys: `現在Geth keystore中沒有可匯入的私鑰`
+  },
+  newImport: {
+    file: {
+      hint: `要匯入的錢包檔案`,
+      label: `錢包檔案`
+    },
+    hint: {
+      hint: `（可選）幫助你記住密碼的提示`,
+      label: `密碼提示`
+    },
+    name: {
+      hint: `描述帳戶的名字`,
+      label: `帳戶名`
+    },
+    password: {
+      hint: `輸入密碼，解鎖錢包`,
+      label: `密碼`
+    }
+  },
+  rawKey: {
+    hint: {
+      hint: `（可選）幫助你記住密碼的提示`,
+      label: `密碼提示`
+    },
+    name: {
+      hint: `描述帳戶的名字`,
+      label: `帳戶名`
+    },
+    password: {
+      hint: `足夠強的密碼`,
+      label: `密碼`
+    },
+    password2: {
+      hint: `確認密碼`,
+      label: `再次輸入密碼`
+    },
+    private: {
+      hint: `原始的十六進位制編碼私鑰`,
+      label: `私鑰`
+    }
+  },
+  recoveryPhrase: {
+    hint: {
+      hint: `（可選）幫助你記住密碼的提示`,
+      label: `密碼提示`
+    },
+    name: {
+      hint: `描述帳戶的名字`,
+      label: `帳戶名`
+    },
+    password: {
+      hint: `足夠強的密碼`,
+      label: `密碼`
+    },
+    password2: {
+      hint: `確認密碼`,
+      label: `再次輸入密碼`
+    },
+    phrase: {
+      hint: `帳戶恢復詞`,
+      label: `帳戶恢復詞`
+    },
+    windowsKey: {
+      label: `在Windows系統上由Parity 1.4.5以前的版本建立的私鑰`
+    }
+  },
+  title: {
+    accountInfo: `帳戶資訊`,
+    createAccount: `建立帳戶`,
+    createType: `建立型別`,
+    importWallet: `匯入錢包`
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/createWallet.js b/js/src/i18n/zh-Hant-TW/createWallet.js
new file mode 100644
index 000000000..c241b8792
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/createWallet.js
@@ -0,0 +1,106 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  button: {
+    add: `新增`, // Add
+    cancel: `取消`, // Cancel
+    close: `關閉`, // Close
+    create: `建立`, // Create
+    done: `完成`, // Done
+    next: `下一步`, // Next
+    sending: `傳送中...` // Sending...
+  },
+  deployment: {
+    message: `部署正在進行中` // The deployment is currently in progress
+  },
+  details: {
+    address: {
+      hint: `錢包的合約地址`, // the wallet contract address
+      label: `錢包地址` // wallet address
+    },
+    dayLimitMulti: {
+      hint: `無需確認即可使用的ETH數量`, // amount of ETH spendable without confirmations
+      label: `錢包每日限額` // wallet day limit
+    },
+    description: {
+      hint: `本地錢包描述`, // the local description for this wallet
+      label: `錢包描述（可選）` // wallet description (optional)
+    },
+    descriptionMulti: {
+      hint: `本地錢包描述`, // the local description for this wallet
+      label: `錢包描述（可選）` // wallet description (optional)
+    },
+    name: {
+      hint: `錢包本地名稱`,  // the local name for this wallet
+      label: `錢包名稱` // wallet name 
+    },
+    nameMulti: {
+      hint: `錢包本地名稱`, // the local name for this wallet
+      label: `錢包名稱` // wallet name
+    },
+    ownerMulti: {
+      hint: `合約的持有者帳戶`, // the owner account for this contract
+      label: `從帳戶 (contract owner)` // from account (contract owner)
+    },
+    ownersMulti: {
+      label: `其他錢包持有者` // other wallet owners
+    },
+    ownersMultiReq: {
+      hint: `接受交易所需的持有者人數`, // number of required owners to accept a transaction
+      label: `所需持有者` // required owners
+    }
+  },
+  info: {
+    added: `已新增`, // added
+    copyAddress: `複製地址至貼上板`, // copy address to clipboard
+    created: `{name}已被{deployedOrAdded}至`, // {name} has been {deployedOrAdded} at
+    dayLimit: `每日限額已被設定為{dayLimit}ETH`, // The daily limit is set to {dayLimit} ETH.
+    deployed: `已部署`, // deployed
+    numOwners: `需要{numOwners}個持有者才能確認一個交易`, // {numOwners} owners are required to confirm a transaction.
+    owners: `以下為錢包持有者` // The following are wallet owners
+  },
+  rejected: {
+    message: `部署被拒絕`, // The deployment has been rejected
+    state: `錢包不會被建立。你可以安全地關閉本視窗`, // The wallet will not be created. You can safely close this window.
+    title: `失敗` // rejected
+  },
+  states: {
+    completed: `合約部署已完成`, // The contract deployment has been completed
+    confirmationNeeded: `合約部署需要來自本錢包的其他持有者的確認`, // The contract deployment needs confirmations from other owners of the Wallet
+    preparing: `交易正在準備被網路廣播`, // Preparing transaction for network transmission
+    validatingCode: `正在驗證已部署的程式碼`, // Validating the deployed contract code
+    waitingConfirm: `正在等待Parity Secure Signer確認本交易`, // Waiting for confirmation of the transaction in the Parity Secure Signer
+    waitingReceipt: `正在等待合約部署交易收據` // Waiting for the contract deployment transaction receipt
+  },
+  steps: {
+    deployment: `錢包部署`, // wallet deployment
+    details: `錢包詳情`, // wallet details
+    info: `錢包資訊`, // wallet informaton
+    type: `錢包類別` // wallet type
+  },
+  type: {
+    multisig: {
+      description: `建立/部署一個{link}錢包`, // Create/Deploy a {link} Wallet
+      label: `多重簽名錢包`, // Multi-Sig Wallet
+      link: `標準多重簽名` // standard multi-signature
+    },
+    watch: {
+      description: `新增一個已有錢包到你的帳戶`, // Add an existing wallet to your accounts
+      label: `觀察錢包` // Watch a wallet
+    }
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/dapp.js b/js/src/i18n/zh-Hant-TW/dapp.js
new file mode 100644
index 000000000..a10433252
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/dapp.js
@@ -0,0 +1,20 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  loading: `正在載入`,//Loading
+  unavailable: `不能獲取這個dapp`//The dapp cannot be reached
+};
diff --git a/js/src/i18n/zh-Hant-TW/dapps.js b/js/src/i18n/zh-Hant-TW/dapps.js
new file mode 100644
index 000000000..e3c6395e1
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/dapps.js
@@ -0,0 +1,48 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  add: {
+    builtin: {
+      desc: `Parity團隊開發的實驗性的，用以展示dapp的效能、整合、實驗性特性和控制特定網路的的客戶端行為`,
+      //Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.
+      label: `與Parity繫結的應用`//Applications bundled with Parity
+    },
+    label: `visible applications可見的應用`,//visible applications
+    local: {
+      desc: `All applications installed locally on the machine by the user for access by the Parity client.`,
+      label: `本地可用的應用`//Applications locally available
+    },
+    network: {
+      desc: `這些應用與Parity沒有關聯，也不是Parity釋出的。 它們是由各自的作者控制的。 在使用以前，請確保你理解每個應用的目標。`,
+      //These applications are not affiliated with Parity nor are they published by Parity.Each remain under the control of their respective authors.Please ensure that you understand the goals for each application before interacting.
+      label: `全球網路上的應用`//Applications on the global network
+    }
+  },
+  button: {
+    edit: `編輯`,//edit
+    permissions: `許可`//permissions
+  },
+  external: {
+    accept: `我理解這些應用和Parity沒有關聯`,//I understand that these applications are not affiliated with Parity
+    warning: `第三方開發者開發的應用與Parity沒有關聯，也不是Parity釋出的。 它們是由各自的作者控制的。 在使用以前，請確保你理解每個應用的目標。`
+    //Applications made available on the network by 3rd-party authors are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each before interacting.
+  },
+  label: `去中心化應用`,//Decentralized Applications
+  permissions: {
+    label: `可見的dapp帳戶`//visible dapp accounts
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/deleteAccount.js b/js/src/i18n/zh-Hant-TW/deleteAccount.js
new file mode 100644
index 000000000..ae18cdbc3
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/deleteAccount.js
@@ -0,0 +1,24 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  password: {
+    hint: `提供帳戶密碼，確認刪除帳戶`,//provide the account password to confirm the account deletion
+    label: `帳戶密碼`//account password
+  },
+  question: `你確定你想永久地刪除下面的帳戶？`,//Are you sure you want to permanently delete the following account?
+  title: `確認刪除`//confirm removal
+};
diff --git a/js/src/i18n/zh-Hant-TW/deployContract.js b/js/src/i18n/zh-Hant-TW/deployContract.js
new file mode 100644
index 000000000..a7c0a0a0e
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/deployContract.js
@@ -0,0 +1,90 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  busy: {
+    title: `部署正在進行中`//The deployment is currently in progress
+  },
+  button: {
+    cancel: `取消`,//Cancel
+    close: `關閉`,//Close
+    create: `建立`,//Create
+    done: `完成`,//Done
+    next: `下一個`//Next
+  },
+  completed: {
+    description: `你的合約已經被部署在`//Your contract has been deployed at
+  },
+  details: {
+    abi: {
+      hint: `合約的abi或者solc 組合輸出`,//the abi of the contract to deploy or solc combined-output
+      label: `abi / solc 組合輸出 `//abi / solc combined-output
+    },
+    address: {
+      hint: `這個合約所有者的帳戶`,//the owner account for this contract
+      label: `來自帳戶（合約所有者）`//from account (contract owner)
+    },
+    advanced: {
+      label: `高階的傳送選項`//advanced sending options
+    },
+    amount: {
+      hint: `轉到這個合約中的數額`,//the amount to transfer to the contract
+      label: `傳送數額{tag}`//amount to transfer (in {tag})
+    },
+    code: {
+      hint: `編譯好的合約程式碼`,//the compiled code of the contract to deploy
+      label: `程式碼`//code
+    },
+    contract: {
+      label: `選擇一個合約`//select a contract
+    },
+    description: {
+      hint: `對這個合約的描述`,//a description for the contract
+      label: `合約描述（可選）`//contract description (optional)
+    },
+    name: {
+      hint: `已經部署合約的名字`,//a name for the deployed contract
+      label: `合約名字`//contract name
+    }
+  },
+  owner: {
+    noneSelected: `選擇一個有效的地址作為合約的所有者`//a valid account as the contract owner needs to be selected
+  },
+  parameters: {
+    choose: `選擇合約引數`//Choose the contract parameters
+  },
+  rejected: {
+    description: `你可以安全地關閉視窗，合約部署不會發生。`,//You can safely close this window, the contract deployment will not occur.
+    title: `部署已經被拒絕`//The deployment has been rejected
+  },
+  state: {
+    completed: `合約部署已經完成`,//The contract deployment has been completed
+    confirmationNeeded: `這一操作需要這個合約其他所有人的確認。`,//The operation needs confirmations from the other owners of the contract
+    preparing: `為網路傳輸準備交易`,//Preparing transaction for network transmission
+    validatingCode: `驗證已經部署的合約的程式碼`,//Validating the deployed contract code
+    waitReceipt: `等待合約部署交易收據`,//Waiting for the contract deployment transaction receipt
+    waitSigner: `等待Parity Secure Signer中的交易被確認 `//Waiting for confirmation of the transaction in the Parity Secure Signer
+  },
+  title: {
+    completed: `完成`,//completed
+    deployment: `部署`,//deployment
+    details: `合約細節`,//contract details
+    extras: `額外資訊`,//extra information
+    failed: `部署失敗`,//deployment failed
+    parameters: `s合約引數`,//contract parameter
+    rejected: `拒絕`//rejected
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/details_windows.js b/js/src/i18n/zh-Hant-TW/details_windows.js
new file mode 100644
index 000000000..fcc570066
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/details_windows.js
@@ -0,0 +1,17 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default `Windows`;
diff --git a/js/src/i18n/zh-Hant-TW/editMeta.js b/js/src/i18n/zh-Hant-TW/editMeta.js
new file mode 100644
index 000000000..6da3683fb
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/editMeta.js
@@ -0,0 +1,34 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  description: {
+    hint: `此地址的描述`, // description for this address
+    label: `地址描述` // address description
+  },
+  name: {
+    label: `名稱` // name
+  },
+  passwordHint: {
+    hint: `密碼恢復提示`, // a hint to allow password recovery
+    label: `（可選）密碼提示` // (optional) password hint
+  },
+  tags: {
+    hint: `按<Enter>來新增一個標籤`, // press <Enter> to add a tag
+    label: `（可選）標籤` // (optional) tags
+  },
+  title: `編輯元資料` // edit metadata
+};
diff --git a/js/src/i18n/zh-Hant-TW/errors.js b/js/src/i18n/zh-Hant-TW/errors.js
new file mode 100644
index 000000000..82c41218f
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/errors.js
@@ -0,0 +1,24 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  duplicateName: `名稱已存在`, // the name already exists
+  invalidKey: `原始私鑰需要被16進位制，64個字元長度並以"0x"開頭`, // the raw key needs to be hex, 64 characters in length and contain the prefix "0x"
+  noFile: `選擇一個可用的錢包檔案來輸入`, // select a valid wallet file to import
+  noKey: `你需要提供原始私鑰`, // you need to provide the raw private key
+  noMatchPassword: `所提供的密碼不正確`, // the supplied passwords does not match
+  noName: `你需要明確一個可用的名稱` // you need to specify a valid name
+};
diff --git a/js/src/i18n/zh-Hant-TW/executeContract.js b/js/src/i18n/zh-Hant-TW/executeContract.js
new file mode 100644
index 000000000..1c84414ef
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/executeContract.js
@@ -0,0 +1,58 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  busy: {
+    posted: `你的交易已被公佈至網路`, // Your transaction has been posted to the network
+    title: `函式執行正在進行中`, // The function execution is in progress
+    waitAuth: `正在等待Parity Signer授權` // Waiting for authorization in the Parity Signer
+  },
+  button: {
+    cancel: `取消`, // cancel
+    done: `完成`, // done
+    next: `下一步`, // next
+    post: `公佈交易`, // post transaction
+    prev: `上一步` // prev
+  },
+  details: {
+    address: {
+      hint: `來自帳戶`, // from account
+      label: `將要交易的帳戶` // the account to transact with
+    },
+    advancedCheck: {
+      label: `高階傳送選項` // advanced sending options
+    },
+    amount: {
+      hint: `此交易將會發送的數量`, // the amount to send to with the transaction
+      label: `交易價值（ETH）` // transaction value (in ETH)
+    },
+    function: {
+      hint: `此合約將會呼叫的函式`, // the function to call on the contract
+      label: `將執行的函式` // function to execute
+    }
+  },
+  rejected: {
+    state: `你可以安全的關閉此視窗，函式將不會被執行。`, // You can safely close this window, the function execution will not occur.
+    title: `執行失敗` // The execution has been rejected
+  },
+  steps: {
+    advanced: `高階選項`, // advanced options
+    complete: `完成`, // complete
+    rejected: `失敗`, // rejected
+    sending: `傳送中`, // sending
+    transfer: `函式詳情` // function details
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/extension.js b/js/src/i18n/zh-Hant-TW/extension.js
new file mode 100644
index 000000000..71a3830a5
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/extension.js
@@ -0,0 +1,22 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  install: `現在就安裝這個擴充套件`, // Install the extension now
+  intro: `Parity現在有一個Chrome的擴充套件，可以安全的瀏覽以太坊所支援的分散式應用。我們強烈推薦你安裝這個擴充套件來進一步提升你的Parity使用體驗。` 
+  // Parity now has an extension available for Chrome that allows safe browsing of Ethereum-enabled distributed applications. 
+  // It is highly recommended that you install this extension to further enhance your Parity experience.
+};
diff --git a/js/src/i18n/zh-Hant-TW/faucet.js b/js/src/i18n/zh-Hant-TW/faucet.js
new file mode 100644
index 000000000..497498232
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/faucet.js
@@ -0,0 +1,29 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  buttons: {
+    close: `關閉`,//close
+    done: `關閉`,//close
+    request: `請求`//request
+  },
+  summary: {
+    done: `你已經向水龍頭請求Kovan ETH測試幣`,//Your Kovan ETH has been requested from the faucet which responded with -
+    info: `如果請求將Kovan ETH測試幣存入這個地址，你需要確定這個地址在主網路上已經用簡訊驗證過了。 一旦執行水龍頭將向當前帳戶存入Kovan ETH測試幣。`
+    //To request a deposit of Kovan ETH to this address, you need to ensure that the address is sms-verified on the mainnet.Once executed the faucet will deposit Kovan ETH into the current account.
+  },
+  title: `Kovan ETH測試幣水龍頭`//Kovan ETH Faucet Kovan
+};
diff --git a/js/src/i18n/zh-Hant-TW/firstRun.js b/js/src/i18n/zh-Hant-TW/firstRun.js
new file mode 100644
index 000000000..86a28c560
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/firstRun.js
@@ -0,0 +1,52 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  button: {
+    close: `關閉`,//Close
+    create: `建立`,//Create
+    next: `下一步`,//Next
+    print: `列印片語`,//Print Phrase
+    skip: `跳過`//Skip
+  },
+  completed: {
+    congrats: `恭喜！你的節點設定已經完成，你現在可以使用應用了。`,
+    //Congratulations! Your node setup has been completed successfully and you are ready to use the application.
+    next: `下面你將瀏覽可用的功能和通用的應用介面，讓你最快速地使用Parity。`
+    //Next you will receive a walk-through of the available functions and the general application interface to get you up and running in record time.
+  },
+  title: {
+    completed: `完成`,//completed
+    newAccount: `新帳戶`,//new account
+    recovery: `恢復`,//recovery
+    terms: `條款`,//terms
+    welcome: `歡迎`//welcome
+  },
+  tnc: {
+    accept: `我接受這些條款和條件`//I accept these terms and conditions
+  },
+  welcome: {
+    description: `作為初次安裝的一部分，下面的幾個步驟將指導你如何設定你的Parity和相關帳戶。我們的目標是使得使用Parity變得儘可能的簡單，讓你成功執行，所以請有點耐心。 一旦完成，你將擁有`,
+    //As part of a new installation, the next few steps will guide you through the process of setting up you Parity instance and your associated accounts.Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us.Once completed you will have -
+    greeting: `歡迎使用Parity，這是執行以太坊節點的最快和最簡單的方式。`,//Welcome to Parity, the fastest and simplest way to run your node.
+    next: `點選下一步繼續`,//Click Next to continue your journey.
+    step: {
+      account: `建立你的第一個Parity帳戶`,//Created your first Parity account
+      privacy: `理解你的隱私政策和運作條款`,//Understood our privacy policy & terms of operation
+      recovery: `有能力可以恢復你的帳戶`//Have the ability to recover your account
+    }
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/home.js b/js/src/i18n/zh-Hant-TW/home.js
new file mode 100644
index 000000000..7e5592c15
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/home.js
@@ -0,0 +1,38 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  account: {
+    visited: `已訪問{when}` // accessed {when}
+  },
+  accounts: {
+    none: `沒有可用的近期帳戶歷史`, // No recent accounts history available
+    title: `近期帳戶` // Recent Accounts
+  },
+  dapp: {
+    visited: `已訪問{when}` // accessed {when}
+  },
+  dapps: {
+    none: `沒有可用的近期應用歷史`, // No recent Applications history available
+    title: `近期Dapps` // Recent Dapps
+  },
+  title: `Parity首頁`, // Parity Home
+  url: {
+    none: `沒有可用的近期URL歷史`, // No recent URL history available
+    title: `網頁應用`, // Web Applications
+    visited: `已訪問{when}` //  visited {when}
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/index.js b/js/src/i18n/zh-Hant-TW/index.js
new file mode 100644
index 000000000..7b20b6249
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/index.js
@@ -0,0 +1,105 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import account from './account';
+import accounts from './accounts';
+import addAddress from './addAddress';
+import addContract from './addContract';
+import address from './address';
+import addressSelect from './addressSelect';
+import addresses from './addresses';
+import application from './application';
+import connection from './connection';
+import contract from './contract';
+import contracts from './contracts';
+import createAccount from './createAccount';
+import createWallet from './createWallet';
+import dapp from './dapp';
+import dapps from './dapps';
+import deleteAccount from './deleteAccount';
+import deployContract from './deployContract';
+import editMeta from './editMeta';
+import errors from './errors';
+import executeContract from './executeContract';
+import extension from './extension';
+import faucet from './faucet';
+import firstRun from './firstRun';
+import home from './home';
+import loadContract from './loadContract';
+import parityBar from './parityBar';
+import passwordChange from './passwordChange';
+import saveContract from './saveContract';
+import settings from './settings';
+import shapeshift from './shapeshift';
+import signer from './signer';
+import status from './status';
+import tabBar from './tabBar';
+import transfer from './transfer';
+import txEditor from './txEditor';
+import ui from './ui';
+import upgradeParity from './upgradeParity';
+import vaults from './vaults';
+import verification from './verification';
+import wallet from './wallet';
+import walletSettings from './walletSettings';
+import web from './web';
+import writeContract from './writeContract';
+
+export default {
+  account,
+  accounts,
+  addAddress,
+  addContract,
+  address,
+  addresses,
+  addressSelect,
+  application,
+  connection,
+  contract,
+  contracts,
+  createAccount,
+  createWallet,
+  dapp,
+  dapps,
+  deleteAccount,
+  deployContract,
+  editMeta,
+  errors,
+  executeContract,
+  extension,
+  faucet,
+  firstRun,
+  home,
+  loadContract,
+  parityBar,
+  passwordChange,
+  saveContract,
+  settings,
+  signer,
+  shapeshift,
+  status,
+  tabBar,
+  transfer,
+  txEditor,
+  ui,
+  upgradeParity,
+  vaults,
+  verification,
+  wallet,
+  walletSettings,
+  web,
+  writeContract
+};
diff --git a/js/src/i18n/zh-Hant-TW/loadContract.js b/js/src/i18n/zh-Hant-TW/loadContract.js
new file mode 100644
index 000000000..b99054349
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/loadContract.js
@@ -0,0 +1,43 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  button: {
+    cancel: `取消`, // Cancel
+    load: `載入`, // Load
+    no: `否`, // No
+    yes: `是` // Yes
+  },
+  contract: {
+    savedAt: `已儲存{when}` // Saved {when}
+  },
+  header: {
+    saved: `已儲存的合約`, // Saved Contracts
+    snippets: `合約片段` // Contract Snippets
+  },
+  removal: {
+    confirm: `你確定要將以下合約從已儲存的合約中刪除嗎？`, // Are you sure you want to remove the following contract from your saved contracts?
+    savedAt: `已儲存{when}` // Saved {when}
+  },
+  tab: {
+    local: `本地`, // Local
+    snippets: `片段` // Snippets
+  },
+  title: {
+    remove: `確認刪除`, // confirm removal
+    view: `檢視合約` // view contracts
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/parityBar.js b/js/src/i18n/zh-Hant-TW/parityBar.js
new file mode 100644
index 000000000..e68b27a54
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/parityBar.js
@@ -0,0 +1,29 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  button: {
+    close: `關閉` // Close
+  },
+  label: {
+    parity: `Parity`, // Parity
+    signer: `Signer` // Singer
+  },
+  title: {
+    accounts: `預設帳戶`, // Default Account
+    signer: `Parity Signer：待處理` // Parity Signer: Pending
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/passwordChange.js b/js/src/i18n/zh-Hant-TW/passwordChange.js
new file mode 100644
index 000000000..e6e54b9b4
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/passwordChange.js
@@ -0,0 +1,54 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  button: {
+    cancel: `取消`, // Cancel
+    change: `更改`, // Change
+    test: `測試`, // Test
+    wait: `請等待...` // Wait...
+  },
+  currentPassword: {
+    hint: `此帳戶的原密碼`, // your current password for this account
+    label: `原密碼` // current password
+  },
+  newPassword: {
+    hint: `此帳戶的新密碼`, // the new password for this account
+    label: `新密碼` // new password
+  },
+  passwordHint: {
+    display: `提示{hint}`, // Hint {hint}
+    hint: `新密碼的提示`, // hint for the new password
+    label: `（可選）新的密碼提示` // (optional) new password hint
+  },
+  repeatPassword: {
+    error: `所提供的密碼不正確`, // the supplied passwords do not match
+    hint: `請重複此帳戶的新密碼`, // repeat the new password for this account
+    label: `重複新密碼` // repeat new password
+  },
+  success: `你的密碼已經成功更改`, // Your password has been successfully changed
+  tabChange: {
+    label: `更改密碼` // Change Password
+  },
+  tabTest: {
+    label: `測試密碼` // Test Password
+  },
+  testPassword: {
+    hint: `你的帳戶密碼`, // your account password
+    label: `密碼` // password
+  },
+  title: `密碼管理器` // Password Manager
+};
diff --git a/js/src/i18n/zh-Hant-TW/saveContract.js b/js/src/i18n/zh-Hant-TW/saveContract.js
new file mode 100644
index 000000000..10075e62d
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/saveContract.js
@@ -0,0 +1,27 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  buttons: {
+    cancel: `取消`, // Cancel
+    save: `儲存` // Save
+  },
+  name: {
+    hint: `為此合約選擇一個名稱`, // choose a name for this contract
+    label: `合約名稱` // contract name
+  },
+  title: `儲存合約` // save contract
+};
diff --git a/js/src/i18n/zh-Hant-TW/settings.js b/js/src/i18n/zh-Hant-TW/settings.js
new file mode 100644
index 000000000..2516b51df
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/settings.js
@@ -0,0 +1,126 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  background: {
+    button_more: `生成更多`, // generate more
+    overview_0: `你現在所看到的背景圖案在你的Parity安裝中是獨一無二的。每次創造一個新的Signer令牌都會改變一次圖案。這也保證了去中性化應用不能偽裝成可信的樣子。`,
+    // The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new 
+    // Signer token. This is so that decentralized applications cannot pretend to be trustworthy.
+    overview_1: `選擇一個你喜歡的圖案並記住它的樣子。這個圖案從現在開始會經常出現，除非你清空了瀏覽器的快取或者使用了新的Signer令牌。`, 
+    // Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or 
+    // use a new Signer token.
+    label: `背景` // background
+  },
+  parity: {
+    chains: {
+      chain_classic: `將Parity同步至以太坊經典網路`, // Parity syncs to the Ethereum Classic network
+      chain_dev: `將Parity使用一條本地開發用區塊鏈`, // Parity uses a local development chain
+      chain_expanse: `將Parity同步至Expanse網路`, // Parity syncs to the Expanse network
+      chain_foundation: `將Parity同步至以太坊基金會發起的以太坊網路`, // Parity syncs to the Ethereum network launched by the Ethereum Foundation
+      chain_kovan: `將Parity同步至Kovan測試網路`, // Parity syncs to the Kovan test network
+      chain_olympic: `將Parity同步至Olympic測試網路`, // Parity syncs to the Olympic test network
+      chain_ropsten: `將Parity同步至Ropsten測試網路`, // Parity syncs to the Ropsten test network
+      cmorden_kovan: `將Parity同步至Morden（經典）測試網路`, // Parity syncs to Morden (Classic) test network
+      hint: `Parity節點同步的區塊鏈`, // the chain for the Parity node to sync to
+      label: `將同步的區塊鏈/網路` // chain/network to sync
+    },
+    languages: {
+      hint: `此介面顯示的語言`, // the language this interface is displayed with
+      label: `介面語言` // UI language
+    },
+    loglevels: `選擇一個不同的logs層次`, // Choose the different logs level.
+    modes: {
+      hint: `Parity節點的同步模式`, // the syncing mode for the Parity node
+      label: `執行模式`, // mode of operation
+      mode_active: `Parity持續地同步區塊鏈`, // Parity continuously syncs the chain
+      mode_dark: `Parity只有在RPC啟用時才同步`, // Parity syncs only when the RPC is active
+      mode_offline: `Parity不同步`, // Parity doesn't sync
+      mode_passive: `Parity初始同步，然後進入休眠並有規律地再同步` // Parity syncs initially, then sleeps and wakes regularly to resync
+    },
+    overview_0: `通過此介面控制Parity節點設定和同步設定`, // Control the Parity node settings and nature of syncing via this interface.
+    label: `parity` // parity
+  },
+  proxy: {
+    details_0: `除了通過IP地址和埠來訪問Parity，你也能通過.parity子域名來使用Parity，訪問 {homeProxy}。為了設定基於子域名的路由，你需要新增相關的代理記錄至你的瀏覽器。`,
+    // Instead of accessing Parity via the IP address and port, you will be able to access it via the .parity subdomain, by visiting 
+    // {homeProxy}. To setup subdomain-based routing, you need to add the relevant proxy entries to your browser,
+    details_1: `如果想了解如何配置代理，教程已提供在{windowsLink}，{macOSLink}和{ubuntuLink}。`, 
+    // To learn how to configure the proxy, instructions are provided for {windowsLink}, {macOSLink} or {ubuntuLink}.
+    details_macos: `macOS`, // macOS
+    details_ubuntu: `Ubuntu`, // Ubuntu
+    details_windows: `Windows`, // Windows
+    overview_0: `代理設定使你可以通過一個可記憶的地址來訪問Parity和所有相關的去中性化應用。`,
+    // The proxy setup allows you to access Parity and all associated decentralized applications via memorable addresses.
+    label: `代理` // proxy
+  },
+  views: {
+    accounts: {
+      description: `一個此Parity例項所關聯和匯入的所有帳戶的列表。傳送交易、接收流入價值、管理你的帳目和資助你的帳戶。`,
+      // A list of all the accounts associated with and imported into this Parity instance. Send transactions, receive incoming values, 
+      // manage your balances and fund your accounts.
+      label: `帳戶` // Accounts
+    },
+    addresses: {
+      description: `一個此Parity例項管理的所有聯絡人和地址簿記錄的列表。只需點選一個按鈕就可以觀察帳戶並獲得所有交易相關的資訊。`,
+      // A list of all contacts and address book entries managed by this Parity instance. Watch accounts and have the details available 
+      // at the click of a button when transacting.
+      label: `地址簿` // Addressbook
+    },
+    apps: {
+      description: `與整個底層網路交流的分散式應用。新增應用，管理你的應用庫和與網路上的其他應用進行互動。`,
+      // Distributed applications that interact with the underlying network. Add applications, manage you application portfolio and 
+      // interact with application from around the network.
+      label: `應用` // Applications
+    },
+    contracts: {
+      description: `觀察和互動已經被部署在網路上的特定合約。這是一個更注重技術的環境，特別為可以理解合約內部執行機制的高階使用者所設立。`,
+      // Watch and interact with specific contracts that have been deployed on the network. This is a more technically-focused environment,
+      // specifically for advanced users that understand the inner working of certain contracts.
+      label: `合約` // Contracts
+    },
+    overview_0: `僅可視部分對你可用的應用來管理應用介面`,
+    // Manage the available application views using only the parts of the application applicable to you.
+    overview_1: `你是終端使用者？預設設定為初學者和高階使用者進行了相同的設定。`,
+    // Are you an end-user? The defaults are setup for both beginner and advanced users alike.
+    overview_2: `你是開發者？新增一些功能來管理合約和與應用部署互動。`,
+    // Are you a developer? Add some features to manage contracts and interact with application deployments.
+    overview_3: `你是礦工或者運營一個大型節點？新增一些功能來讓你獲得更多有關節點執行的資訊。`,
+    // Are you a miner or run a large-scale node? Add the features to give you all the information needed to watch the node operation.
+    settings: {
+      description: `此介面。允許你自定義應用的選項、執行、視覺化和感官。`,
+      // This view. Allows you to customize the application in term of options, operation and look and feel.
+      label: `設定` // Settings
+    },
+    signer: {
+      description: `這個應用安全交易管理區域，你可以通過任何從本應用和其他分散式應用發起的即將傳送的交易`, 
+      // The secure transaction management area of the application where you can approve any outgoing transactions made 
+      // from the application as well as those placed into the queue by distributed applications.
+      label: `Signer` // Signer
+    },
+    status: {
+      description: `觀察Parity節點現在的執行情況：網路連線數、實際執行例項的Logs和具體挖礦資訊（如果已開啟並設定）`,
+      // See how the Parity node is performing in terms of connections to the network, logs from the actual running instance 
+      // and details of mining (if enabled and configured).
+      label: `狀態` // Status
+    },
+    label: `視窗`, // views
+    home: {
+      label: `首頁` // Home
+    }
+  },
+  label: `設定` // settings
+};
diff --git a/js/src/i18n/zh-Hant-TW/shapeshift.js b/js/src/i18n/zh-Hant-TW/shapeshift.js
new file mode 100644
index 000000000..6cd2065f7
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/shapeshift.js
@@ -0,0 +1,76 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  awaitingDepositStep: {
+    awaitingConfirmation: `正在等待你的{typeSymbol}資金交易的存款地址的確認資訊`,
+    // Awaiting confirmation of the deposit address for your {typeSymbol} funds exchange
+    awaitingDeposit: `{shapeshiftLink}正在等待{typeSymbol}的存入.從你的{typeSymbol}網路客戶端傳送資金至-`,
+    // {shapeshiftLink} is awaiting a {typeSymbol} deposit. Send the funds from your {typeSymbol} network client to -
+    minimumMaximum: `{minimum}至少, {maximum}至多` // {minimum} minimum, {maximum} maximum
+  },
+  awaitingExchangeStep: {
+    awaitingCompletion: `正在完成資金交易併發送資金至你的Parity帳戶`,
+    // Awaiting the completion of the funds exchange and transfer of funds to your Parity account.
+    receivedInfo: `{shapeshiftLink}已經收到存款-`
+    // {shapeshiftLink} has received a deposit of -
+  },
+  button: {
+    cancel: `取消`, // Cancel
+    done: `關閉`, // Close
+    shift: `轉換資金` // Shift Funds
+  },
+  completedStep: {
+    completed: `{shapeshiftLink}已經完成了資金交易。`, // {shapeshiftLink} has completed the funds exchange.
+    parityFunds: `資金的改變會馬上在你的Parity帳戶裡體現。`
+    // The change in funds will be reflected in your Parity account shortly.
+  },
+  errorStep: {
+    info: `通過{shapeshiftLink}進行的資金轉換因為一個交易的致命錯誤失敗了。交易提供的錯誤資訊如下：`
+    // The funds shifting via {shapeshiftLink} failed with a fatal error on the exchange. The error message received from the exchange 
+    // is as follow:
+  },
+  optionsStep: {
+    noPairs: `目前沒有可匹配的交易/貨幣可用來進行轉換`,
+    // There are currently no exchange pairs/coins available to fund with.
+    returnAddr: {
+      hint: `轉換錯誤後的發回地址`, // the return address for send failures
+      label: `（可選）{coinSymbol}發回地址` // (optional) {coinSymbol} return address
+    },
+    terms: {
+      label: `我理解ShapeShift.io是一個第三方服務，使用此服務發生的任何資訊/資金髮送是完全不受Parity控制的`
+      // I understand that ShapeShift.io is a 3rd-party service and by using the service any transfer of information and/or funds is 
+      // completely out of the control of Parity
+    },
+    typeSelect: {
+      hint: `數字貨幣轉換的種類`, // the type of crypto conversion to do
+      label: `來自資金帳戶` // fund account from
+    }
+  },
+  price: {
+    minMax: `({minimum}至小, {maximum}至大)` // ({minimum} minimum, {maximum} maximum)
+  },
+  title: {
+    completed: `完成`, // completed
+    deposit: `等待存款`, // awaiting deposit
+    details: `詳情`, // details
+    error: `交易失敗`, // exchange failed
+    exchange: `等待交易` // awaiting exchange
+  },
+  warning: {
+    noPrice: `所選擇的型別沒有匹配的價格` // No price match was found for the selected type
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/signer.js b/js/src/i18n/zh-Hant-TW/signer.js
new file mode 100644
index 000000000..77705df4e
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/signer.js
@@ -0,0 +1,107 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  embedded: {
+    noPending: `目前沒有待處理的確認等待你的處理`
+    // There are currently no pending requests awaiting your confirmation
+  },
+  mainDetails: {
+    editTx: `編輯條款/gas/gasPrice`, // Edit conditions/gas/gasPrice
+    tooltips: {
+      total1: `包括交易費的交易的總價值是{total} {type}`,
+      // The value of the transaction including the mining fee is {total} {type}.
+      total2: `(包括了交易費 {fee} {token})`,
+      // (This includes a mining fee of {fee} {token})
+      value1: `交易價值` // The value of the transaction.
+    }
+  },
+  requestOrigin: {
+    dapp: `來自dapp {url}`, // by a dapp at {url}
+    ipc: `通過IPC會話`, // via IPC session
+    rpc: `通過RPC{rpc}`, // via RPC {rpc}
+    signerCurrent: `通過當前標籤頁`, // via current tab
+    signerUI: `通過互動會話`, // via UI session
+    unknownInterface: `通過未知互動`, // via unknown interface
+    unknownRpc: `未明確的`, // unidentified
+    unknownUrl: `未知URL` // unknown URL
+  },
+  requestsPage: {
+    noPending: `沒有請求需要你的確認`, // There are no requests requiring your confirmation.
+    pendingTitle: `待處理請求`, //Pending Requests
+    queueTitle: `本地交易` // Local Transactions
+  },
+  sending: {
+    hardware: {
+      confirm: `請在你連線的硬體裝置上確認交易`, // Please confirm the transaction on your attached hardware device
+      connect: `請在確認交易前連線你的硬體裝置` // Please attach your hardware device before confirming the transaction
+    }
+  },
+  signRequest: {
+    request: `一個簽名資料在請求你的帳號：`, // A request to sign data using your account:
+    state: {
+      confirmed: `通過`, // Confirmed
+      rejected: `拒絕` // Rejected
+    },
+    unknownBinary: `（未知二進位制資料）`, // (Unknown binary data)
+    warning: `警告：此操作的結果是不可逆的。請在確認資訊後再通過請求。`
+    // WARNING: This consequences of doing this may be grave. Confirm the request only if you are sure.
+  },
+  title: `可信的Signer`, // Trusted Signer
+  txPending: {
+    buttons: {
+      viewToggle: `檢視交易` // view transaction
+    }
+  },
+  txPendingConfirm: {
+    buttons: {
+      confirmBusy: `通過中...`, // Confirming...
+      confirmRequest: `通過請求` // Confirm Request
+    },
+    errors: {
+      invalidWallet: `所提供的錢包檔案不可用` // Given wallet file is invalid.
+    },
+    password: {
+      decrypt: {
+        hint: `解金鑰匙`, // decrypt the key
+        label: `鑰匙密碼` // Key Password
+      },
+      unlock: {
+        hint: `解鎖帳戶`, // unlock the account
+        label: `帳戶密碼` // Account Password
+      }
+    },
+    passwordHint: `（提示）{passwordHint}`, // (hint) {passwordHint}
+    selectKey: {
+      hint: `此帳戶的鑰匙檔案`, // The keyfile to use for this account
+      label: `選擇本地鑰匙` // Select Local Key
+    },
+    tooltips: {
+      password: `請為此帳戶提供密碼` // Please provide a password for this account
+    }
+  },
+  txPendingForm: {
+    changedMind: `我改主意了`, // I've changed my mind
+    reject: `拒絕請求` // reject request
+  },
+  txPendingReject: {
+    buttons: {
+      reject: `拒絕請求` // Reject Request
+    },
+    info: `你確定要拒絕請求嗎？`, // Are you sure you want to reject request?
+    undone: `此操作是不可逆的`  // This cannot be undone
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/status.js b/js/src/i18n/zh-Hant-TW/status.js
new file mode 100644
index 000000000..1c98f8a0b
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/status.js
@@ -0,0 +1,67 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  debug: {
+    reverse: `翻轉訂單`, // Reverse Order
+    stopped: `Parity的互動目前停止了重新整理和顯示Logs，請啟動它來檢視最新的更新。`,
+    // Refresh and display of logs from Parity is currently stopped via the UI, start it to see the latest updates.
+    title: `節點Logs` // Node Logs
+  },
+  miningSettings: {
+    input: {
+      author: {
+        hint: `礦工名字`, // the mining author
+        label: `礦工` // author
+      },
+      extradata: {
+        hint: `提取挖到區塊的資料`, // extra data for mined blocks
+        label: `提取資料` // extradata
+      },
+      gasFloor: {
+        hint: `挖礦的gas下限目標`, // the gas floor target for mining
+        label: `gas下限目標` // gas floor target
+      },
+      gasPrice: {
+        hint: `挖礦的最低gas價格`, // the minimum gas price for mining
+        label: `最低gas價格` // minimal gas price
+      }
+    },
+    title: `挖礦設定` // mining settings
+  },
+  status: {
+    hashrate: `{hashrate} H/s`, // {hashrate} H/s
+    input: {
+      chain: `鏈`, // chain
+      enode: `enode`, // enode
+      no: `否`, // no
+      peers: `同步節點`, // peers
+      port: `網路埠`, // network port
+      rpcEnabled: `rpc開啟`, // rpc enabled
+      rpcInterface: `rpc互動`, // rpc interface
+      rpcPort: `rpc埠`, // rpc port
+      yes: `是` // yes
+    },
+    title: {
+      bestBlock: `最新區塊`, // best block
+      hashRate: `雜湊率`, // hash rate
+      network: `網路設定`, // network settings
+      node: `節點`, // Node
+      peers: `同步節點` // peers
+    }
+  },
+  title: `狀態` // Status
+};
diff --git a/js/src/i18n/zh-Hant-TW/tabBar.js b/js/src/i18n/zh-Hant-TW/tabBar.js
new file mode 100644
index 000000000..72b2e9ce7
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/tabBar.js
@@ -0,0 +1,22 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  tooltip: {
+    overview: `在應用的不同部分和不同介面進行導航，在帳戶介面、代幣介面和分散式應用介面之間切換。`
+    //navigate between the different parts and views of the application, switching between an account view, token view and distributed application view
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/transfer.js b/js/src/i18n/zh-Hant-TW/transfer.js
new file mode 100644
index 000000000..9bf61e917
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/transfer.js
@@ -0,0 +1,62 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  advanced: {
+    data: {
+      hint: `交易附帶資料`,//the data to pass through with the transaction
+      label: `交易資料`//transaction data
+    }
+  },
+  buttons: {
+    back: `返回`,//Back
+    cancel: `取消`,//Cancel
+    close: `關閉`,//Close
+    next: `下一步`,//Next
+    send: `傳送`//Send
+  },
+  details: {
+    advanced: {
+      label: `高階傳送選項`//advanced sending options
+    },
+    amount: {
+      hint: `傳送數額`,//the amount to transfer to the recipient
+      label: `傳送數額{tag}`//amount to transfer (in {tag})
+    },
+    fullBalance: {
+      label: `所有的餘額`//full account balance
+    },
+    recipient: {
+      hint: `收款人地址`,//the recipient address
+      label: `收款人地址`//recipient address
+    },
+    sender: {
+      hint: `傳送人地址`,//the sender address
+      label: `傳送人地址`//sender address
+    },
+    total: {
+      label: `傳送數額`//total transaction amount
+    }
+  },
+  wallet: {
+    confirmation: `這筆交易需要其他人的確認。`,//This transaction needs confirmation from other owners.
+    operationHash: `操作雜湊`//operation hash
+  },
+  warning: {
+    wallet_spent_limit: `這筆轉帳的數額超過了每日轉帳數額上限。此交易需要其他人的確認才可以傳送成功。`
+    //This transaction value is above the remaining daily limit. It will need to be confirmed by other owners.
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/txEditor.js b/js/src/i18n/zh-Hant-TW/txEditor.js
new file mode 100644
index 000000000..206311316
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/txEditor.js
@@ -0,0 +1,40 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  condition: {
+    block: {
+      hint: `在某個區塊高度後傳送`,//The minimum block to send from
+      label: `交易傳送區塊`//Transaction send block
+    },
+    blocknumber: `在某個區塊後傳送`,//Send after BlockNumber
+    date: {
+      hint: `在某日後傳送`,//The minimum date to send from
+      label: `交易傳送日期`//Transaction send date
+    },
+    datetime: `在某日某時後傳送`,//Send after Date & Tim
+    label: `交易啟用的條件`,//Condition where transaction activates
+    none: `無條件`,//No conditions
+    time: {
+      hint: `在某時間後傳送`,//The minimum time to send from
+      label: `交易傳送時間`//Transaction send time
+    }
+  },
+  gas: {
+    info: `你可以基於最近的交易gas價格的分佈選擇gas價格。 gas價格越低，交易費用越便宜。 gas 價格越高，交易被網路打包的速度越快。`
+    //You can choose the gas price based on the distribution of recent included transaction gas prices.The lower the gas price is, the cheaper the transaction will be.The higher the gas price is, the faster it should get mined by the network.
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/ui.js b/js/src/i18n/zh-Hant-TW/ui.js
new file mode 100644
index 000000000..a60685413
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/ui.js
@@ -0,0 +1,163 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  actionbar: {
+    export: {
+      button: {
+        export: `匯出`//export
+      }
+    },
+    import: {
+      button: {
+        cancel: `取消`,//Cancel
+        confirm: `確認`,//Confirm
+        import: `匯入`//import
+      },
+      confirm: `確認這是你想匯入的`,//Confirm that this is what was intended to import.
+      error: `發生錯誤：{errorText}`,//An error occured: {errorText}
+      step: {
+        error: `錯誤`,//error
+        select: `選擇一個檔案`,//select a file
+        validate: `確認`//validate
+      },
+      title: `從一個檔案匯入`//Import from a file
+    },
+    search: {
+      hint: `輸入搜尋內容……`//Enter search input...
+    },
+    sort: {
+      sortBy: `根據{label}排序`,//Sort by {label}
+      typeDefault: `預設`,//Default
+      typeEth: `根據以太幣數額排序`,//Sort by ETH
+      typeName: `根據帳戶名字排序`,//Sort by name
+      typeTags: `根據標籤排序`//Sort by tags
+    }
+  },
+  balance: {
+    none: `這個帳戶沒有餘額`//No balances associated with this account
+  },
+  blockStatus: {
+    bestBlock: `最新區塊{blockNumber}`,//{blockNumber} best block
+    syncStatus: `currentBlock}/{highestBlock}區塊同步`,//{currentBlock}/{highestBlock} syncing{
+    warpRestore: `{percentage}%恢復`,//{percentage}% warp restore
+    warpStatus: `, {percentage}%歷史`//{percentage}% historic
+  },
+  confirmDialog: {
+    no: `不是`,//no
+    yes: `是`//yes
+  },
+  copyToClipboard: {
+    copied: `複製{data}到貼上板`//copied {data} to clipboard
+  },
+  errors: {
+    close: `關閉`//close
+  },
+  fileSelect: {
+    defaultLabel: `拉一個檔案到這裡，或者選擇一個檔案上傳`//Drop a file here, or click to select a file to upload
+  },
+  gasPriceSelector: {
+    customTooltip: {
+      transactions: `{number} {number, plural, one {transaction} other {transactions}} with gas price set from {minPrice} to {maxPrice}`
+    }
+  },
+  identityName: {
+    null: `空`,//NULL
+    unnamed: `未命名`//UNNAMED
+  },
+  methodDecoding: {
+    condition: {
+      block: `, {historic, select, true {Submitted} false {Submission}} at block {blockNumber}`,
+      time: `, {historic, select, true {Submitted} false {Submission}} at {timestamp}`
+    },
+    deploy: {
+      address: `在地址上部署一個合約`,//Deployed a contract at address
+      params: `附帶下面的引數：`,//with the following parameters:
+      willDeploy: `將要部署一個合約`,//Will deploy a contract
+      withValue: `, 傳送{value}`//sending {value}
+    },
+    gasUsed: `({gas}gas消耗)`,//{gas} gas used
+    gasValues: `{gas} gas ({gasPrice}M/{tag})`,
+    input: {
+      data: `資料`,//data
+      input: `輸入`,//input
+      withInput: `with the {inputDesc} {inputValue}`
+    },
+    receive: {
+      contract: `合約`,//the contract
+      info: `{historic, select, true {Received} false {Will receive}} {valueEth} from {aContract}{address}`
+    },
+    signature: {
+      info: `{historic, select, true {Executed} false {Will execute}} the {method} function on the contract {address} trsansferring {ethValue}{inputLength, plural, zero {,} other {passing the following {inputLength, plural, one {parameter} other {parameters}}}}`
+    },
+    token: {
+      transfer: `{historic, select, true {Transferred} false {Will transfer}} {value} to {address}`
+    },
+    transfer: {
+      contract: `the contract`,
+      info: `{historic, select, true {Transferred} false {Will transfer}} {valueEth} to {aContract}{address}`
+    },
+    txValues: `{historic, select, true {Provided} false {Provides}} {gasProvided}{gasUsed} for a total transaction value of {totalEthValue}`,
+    unknown: {
+      info: `{historic, select, true {Executed} false {Will execute}} the {method} on the contract {address} transferring {ethValue}.`
+    }
+  },
+  passwordStrength: {
+    label: `密碼強度`//password strength
+  },
+  tooltips: {
+    button: {
+      done: `完成`,//Done
+      next: `下一步`,//Next
+      skip: `跳過`//Skip
+    }
+  },
+  txHash: {
+    confirmations: `{count} {value, plural, one {confirmation} other {confirmations}}`,
+    oog: `這筆交易已經耗光了gas。請用更多的gas嘗試。`,//The transaction might have gone out of gas. Try again with more gas.
+    posted: `這筆交易已經被髮送到網路，附帶雜湊是{hashLink}`,//The transaction has been posted to the network with a hash of {hashLink}
+    waiting: `等待確認`//waiting for confirmations
+  },
+  vaultSelect: {
+    hint: `這個帳戶繫結的保險庫是`,//the vault this account is attached to
+    label: `相關保險庫`//associated vault
+  },
+  verification: {
+    gatherData: {
+      accountHasRequested: {
+        false: `.你還沒有從這個帳戶請求確認。`,//You did not request verification from this account yet
+        pending: `檢查一下你是否請求了驗證……`,//Checking if you requested verification…
+        true: `你已經從這個帳戶請求到驗證。`//You already requested verification from this account.
+      },
+      accountIsVerified: {
+        false: `你的帳戶還沒有被驗證。`,//Your account is not verified yet.
+        pending: `檢查一下你的帳戶是否已經被驗證……`,//Checking if your account is verified…
+        true: `你的帳戶已經被驗證。`//Your account is already verified.
+      },
+      fee: `額外的費用是{amount}ETH`,//The additional fee is {amount} ETH.
+      isAbleToRequest: {
+        pending: `驗證你的輸入……`//Validating your input…
+      },
+      isServerRunning: {
+        false: `驗證伺服器沒有在執行。`,//The verification server is not running.
+        pending: `檢查一下驗證伺服器是否在執行……`,//Checking if the verification server is running…
+        true: `驗證伺服器正在執行。`//The verification server is running.
+      },
+      nofee: `沒有額外的費用。`,//There is no additional fee.
+      termsOfService: `我同意下面的條款和條件。`//I agree to the terms and conditions below.
+    }
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/upgradeParity.js b/js/src/i18n/zh-Hant-TW/upgradeParity.js
new file mode 100644
index 000000000..0bd1a0cae
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/upgradeParity.js
@@ -0,0 +1,55 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  busy: `你正在升級到Parity最新版本{newversion}。請等待升級過程完成。`,
+  //Your upgrade to Parity {newversion} is currently in progress. Please wait until the process completes.
+  button: {
+    close: `關閉`,//close
+    done: `完成`,//done
+    upgrade: `現在升級`//upgrade now
+  },
+  completed: `你升級到Parity最新版本{newversion}的操作已經完成。點選“完成”將自動重新載入這個應用。`,
+  //Your upgrade to Parity {newversion} has been successfully completed. Click "done" to automatically reload the application.
+  consensus: {
+    capable: `你當前的Parity版本能夠處理網路請求。`,
+    //Your current Parity version is capable of handling the network requirements.
+    capableUntil: `你當前的Parity版本能夠處理直到第{blockNumber}個區塊的網路請求。`,
+    //Your current Parity version is capable of handling the network requirements until block {blockNumber}
+    incapableSince: `你當前的Parity版本能夠處理第{blockNumber}個區塊以後的網路請求。`,
+    //Your current Parity version is incapable of handling the network requirements since block {blockNumber}
+    unknown: `你當前的Parity版本能夠處理網路請求。`
+    //Your current Parity version is capable of handling the network requirements.
+  },
+  failed: `升級到Parity最新版本{newversion}遇到錯誤，升級失敗。`,
+  //Your upgrade to Parity {newversion} has failed with an error.
+  info: {
+    currentVersion: `你現在正在執行{currentversion}版本。`,//You are currently running {currentversion}
+    next: `點選“現在升級”，開始Parity升級。`,//Proceed with "upgrade now" to start your Parity upgrade.
+    upgrade: `可以升級到最新版本{newversion}`,//An upgrade to version {newversion} is available
+    welcome: `迎來到Parity升級指南，讓你享受無縫升級到Parity最新版本的體驗。`
+    //Welcome to the Parity upgrade wizard, allowing you a completely seamless upgrade experience to the next version of Parity.歡
+  },
+  step: {
+    completed: `升級完成`,//upgrade completed
+    error: `錯誤`,//error
+    info: `可以升級`,//upgrade available
+    updating: `升級Parity`//upgrading parity
+  },
+  version: {
+    unknown: `未知`//unknown
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/vaults.js b/js/src/i18n/zh-Hant-TW/vaults.js
new file mode 100644
index 000000000..2967132da
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/vaults.js
@@ -0,0 +1,114 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  accounts: {
+    button: {
+      cancel: `取消`, // Cancel
+      execute: `設定` // Set
+    },
+    empty: `此保險庫中沒有帳戶`, // There are no accounts in this vault
+    title: `管理保險庫帳戶` // Manage Vault Accounts
+  },
+  button: {
+    accounts: `帳戶`, // accounts
+    add: `建立保險庫`, // create vault
+    close: `關閉`, // close
+    edit: `編輯`, // edit
+    open: `開啟` // open
+  },
+  confirmClose: {
+    info: `你即將關閉一個保險庫。所有與這個保險庫相關的帳戶在這個操作完成後都不再可見。如果想再見到關聯帳戶，請重新開啟保險庫。`,
+    // You are about to close a vault. Any accounts associated with the vault won't be visible after this operation concludes. To view 
+    // the associated accounts, open the vault again.
+    title: `關閉保險庫` // Close Vault
+  },
+  confirmOpen: {
+    info: `你即將開啟一個保險庫。在確認了你的密碼之後，所有與這個保險庫關聯的帳戶都會可見。關閉保險庫會在介面中移除所有帳戶，直到保險庫被再次開啟。`,
+    // You are about to open a vault. After confirming your password, all accounts associated with this vault will be visible. Closing 
+    // the vault will remove the accounts from view until the vault is opened again.
+    password: {
+      hint: `建立保險庫時設定的密碼`, // the password specified when creating the vault
+      label: `保險庫密碼` // vault password
+    },
+    title: `開啟保險庫` // Open Vault
+  },
+  create: {
+    button: {
+      close: `關閉`, // close
+      vault: `建立保險庫` // create valut
+    },
+    description: {
+      hint: `該保險庫更詳細的描述` // an extended description for the vault
+    },
+    descriptions: {
+      label: `（可選）描述` // (optional) description
+    },
+    hint: {
+      hint: `（可選）一個幫助記憶密碼的提示`, // (optional) a hint to help with remembering the password
+      label: `密碼提示` // password hint
+    },
+    name: {
+      hint: `一個保險庫的名字`, // a name for the vault
+      label: `保險庫名稱` // vault name
+    },
+    password: {
+      hint: `一個高強度且獨一無二的密碼`, // a strong, unique password
+      label: `密碼` // password
+    },
+    password2: {
+      hint: `驗證你的密碼`, // verify your password
+      label: `密碼（重複）` // password (repeat)
+    },
+    title: `建立一個新的保險庫` // Create a new vault
+  },
+  editMeta: {
+    allowPassword: `更改保險庫密碼`, // Change vault password
+    button: {
+      close: `關閉`, // close
+      save: `儲存` // save
+    },
+    currentPassword: {
+      hint: `保險庫的原密碼`, // your current vault password
+      label: `原密碼` // current password
+    },
+    description: {
+      hint: `此保險庫的描述`, // the description for this vault
+      label: `保險庫描述` // vault description
+    },
+    password: {
+      hint: `一個高強度且獨一無二的密碼`, // a strong, unique password
+      label: `新密碼` // new password
+    },
+    password2: {
+      hint: `驗證你的新密碼`, // verify your new password
+      label: `新密碼（重複）` // new password (repeat)
+    },
+    passwordHint: {
+      hint: `此保險庫的密碼提示`, // your password hint for this vault
+      label: `密碼提示` // password hint
+    },
+    title: `編輯保險庫元資料` // Edit Vault Metadata
+  },
+  empty: `目前沒有任何可顯示的保險庫`, // There are currently no vaults to display.
+  selector: {
+    noneAvailable: `目前沒有任何開啟、可選的保險庫。請在移動帳戶之前建立並開啟一個保險庫。`,
+    // There are currently no vaults opened and available for selection. Create and open some first before attempting to select 
+    // a vault for an account move.
+    title: `選擇帳戶保險庫` // Select Account Vault
+  },
+  title: `保險庫管理` // Vault Management
+};
diff --git a/js/src/i18n/zh-Hant-TW/verification.js b/js/src/i18n/zh-Hant-TW/verification.js
new file mode 100644
index 000000000..b82b1a3c6
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/verification.js
@@ -0,0 +1,85 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  button: {
+    cancel: `取消`,//Cancel
+    done: `完成`,//Done
+    next: `下一步`//Next
+  },
+  code: {
+    error: `無效驗證碼`,//invalid code
+    hint: `輸入你收到的驗證碼。`,//Enter the code you received.
+    label: `驗證碼`,//verification code
+    sent: `驗證碼被髮送到接收者{receiver}.`//The verification code has been sent to {receiver}
+  },
+  confirmation: {
+    authorise: `驗證碼將被髮送到合約。請使用Parity Signer進行授權。`,//The verification code will be sent to the contract. Please authorize this using the Parity Signer.
+    windowOpen: `請保持這個視窗開啟狀態。`//Please keep this window open.
+  },
+  done: {
+    message: `恭喜，你的帳戶已經被認證。`//Congratulations, your account is verified!
+  },
+  email: {
+    enterCode: `輸入你從郵箱獲得驗證碼。`//Enter the code you received via e-mail.
+  },
+  gatherData: {
+    email: {
+      hint: `驗證碼將被髮送到這個地址`,//the code will be sent to this address
+      label: `郵箱地址`//e-mail address
+    },
+    phoneNumber: {
+      hint: `簡訊將被髮送到這個號碼`,//the SMS will be sent to this number
+      label: `國際格式的手機號碼`//phone number in international format
+    }
+  },
+  gatherDate: {
+    email: {
+      error: `無效郵箱`//invalid e-mail
+    },
+    phoneNumber: {
+      error: `無效數字`//invalid number
+    }
+  },
+  loading: `載入驗證資料`,//Loading verification data.
+  request: {
+    authorise: `驗證請求將被髮送到這個合約。請使用Parity Signer進行授權。`,//A verification request will be sent to the contract. Please authorize this using the Parity Signer.
+    requesting: `正在從Parity伺服器請求一個驗證碼，等待它被輸入到合約。`,//Requesting a code from the Parity server and waiting for the puzzle to be put into the contract.
+    windowOpen: `請保持視窗為開啟狀態。`//Please keep this window open.
+  },
+  sms: {
+    enterCode: `輸入你從簡訊收到的驗證碼。`//Enter the code you received via SMS.
+  },
+  steps: {
+    code: `輸入驗證碼`,//Enter Code
+    completed: `完成`,//Completed
+    confirm: `確認`,//Confirm
+    data: `輸入資料`,//Enter Data
+    method: `方式`,//Method
+    request: `請求`//Request
+  },
+  title: `t驗證你的帳戶`,//verify your accoun
+  types: {
+    email: {
+      description: `你所控制的郵箱地址的雜湊值將被儲存在區塊鏈。`,//The hash of the e-mail address you prove control over will be stored on the blockchain.
+      label: `郵箱驗證`//E-mail Verification
+    },
+    sms: {
+      description: `你所控制的手機號碼將被儲存在區塊鏈。`,//It will be stored on the blockchain that you control a phone number (not <em>which</em>).
+      label: `簡訊驗證`//SMS Verification
+    }
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/wallet.js b/js/src/i18n/zh-Hant-TW/wallet.js
new file mode 100644
index 000000000..74481e624
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/wallet.js
@@ -0,0 +1,46 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  buttons: {
+    edit: `編輯`,//edit
+    forget: `forget`,
+    settings: `設定`,//settings
+    transfer: `轉帳`//transfer
+  },
+  confirmations: {
+    buttons: {
+      confirmAs: `確定為……`,//Confirm As...
+      revokeAs: `撤回為……`//Revoke As...
+    },
+    none: `現在沒有交易需要確認。`,//No transactions needs confirmation right now.
+    tooltip: {
+      confirmed: `被{number}/{required}所有人確認`//Confirmed by {number}/{required} owners
+    }
+  },
+  details: {
+    requiredOwners: `這個錢包需要至少{owners}所有人驗證所有的操作（交易，修改）`,
+    //This wallet requires at least {owners} to validate any action (transactions, modifications).
+    requiredOwnersNumber: `{number} {numberValue, plural, one {owner} other {owners}}`,
+    spent: `{spent} has been spent today, out of {limit} set as the daily limit, which has been reset on {date}`,
+    title: `細節`//Details
+  },
+  title: `錢包管理`,//Wallet Management
+  transactions: {
+    none: `沒有交易被髮送。`,//No transactions has been sent.
+    title: `交易`//Transactions
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/walletSettings.js b/js/src/i18n/zh-Hant-TW/walletSettings.js
new file mode 100644
index 000000000..dc1159520
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/walletSettings.js
@@ -0,0 +1,75 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  addOwner: {
+    title: `新增持有人` // Add Owner
+  },
+  buttons: {
+    cancel: `取消`, // Cancel
+    close: `關閉`, // Close
+    next: `下一個`, // Next
+    send: `傳送`, // Send
+    sending: `正在傳送...` // Sending...
+  },
+  changes: {
+    modificationString: `為了保證你做的修改會被執行，
+                        其他的帳戶持有人也需要傳送相同的修改。
+                        他們可以通過貼上以下字串來簡單的完成更改：`, 
+                        // For your modifications to be taken into account,
+              // other owners have to send the same modifications. They can paste
+              // this string to make it easier:
+    none: `錢包設定沒有發生任何更改。`, // No modifications have been made to the Wallet settings.
+    overview: `你將會造成以下更改` // You are about to make the following modifications
+  },
+  edit: {
+    message: `為了編輯這個合約的設定，至少{owners, number} 
+              {owners, plural, one {owner } other {owners }}必須傳送完全相同的修改
+              你可以將字串化的修改貼上在這裡。` 
+                  // In order to edit this contract's settings, at
+                  // least {owners, number} {owners, plural, one {owner } other {owners }} have to
+                  // send the very same modifications. You can paste a stringified version
+                  // of the modifications here.
+  },
+  modifications: {
+    daylimit: {
+      hint: `不需要確認即可傳送的ETH數量`, // amount of ETH spendable without confirmations
+      label: `錢包每日限額` //wallet day limit
+    },
+    fromString: {
+      label: `修改` // modifications
+    },
+    owners: {
+      label: `其他錢包持有人` // other wallet owners
+    },
+    required: {
+      hint: `確認交易所需的通過持有人人數`, // number of required owners to accept a transaction
+      label: `所需持有人` // required owners
+    },
+    sender: {
+      hint: `作為此持有人傳送修改`, // send modifications as this owner
+      label: `來自帳戶 (wallet owner)` // from account (wallet owner)
+    }
+  },
+  ownersChange: {
+    details: `從 {from} 至 {to}`, // from {from} to {to}
+    title: `改變所需持有人`
+  },
+  rejected: `交易#{txid}已經被拒絕`, // The transaction #{txid} has been rejected
+  removeOwner: {
+    title: `移除持有人` // Remove Owner
+  }
+};
diff --git a/js/src/i18n/zh-Hant-TW/web.js b/js/src/i18n/zh-Hant-TW/web.js
new file mode 100644
index 000000000..290b3e0a3
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/web.js
@@ -0,0 +1,19 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  requestToken: `正在請求使用代幣` // Requesting access token...
+};
diff --git a/js/src/i18n/zh-Hant-TW/writeContract.js b/js/src/i18n/zh-Hant-TW/writeContract.js
new file mode 100644
index 000000000..8601dda49
--- /dev/null
+++ b/js/src/i18n/zh-Hant-TW/writeContract.js
@@ -0,0 +1,62 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default {
+  buttons: {
+    autoCompile: `自動編譯`, // Auto-Compile
+    compile: `編譯`, // Compile
+    deploy: `部署`, // Deploy
+    import: `載入Solidity`, // Import Solidity
+    load: `載入`, // Load
+    new: `新建`, // New
+    optimise: `優化`, // Optimise
+    save: `儲存` // Save
+  },
+  compiling: {
+    action: `請編譯原始碼`, // Please compile the source code.
+    busy: `編譯中...` // Compiling...
+  },
+  details: {
+    saved: `(已儲存 {timestamp})` // (saved {timestamp})
+  },
+  error: {
+    noContract: `沒有找到合約`, // No contract has been found.
+    params: `發生瞭如下描述的一個錯誤` // An error occurred with the following description
+  },
+  input: {
+    abi: `ABI介面`, // ABI Interface
+    code: `位元組碼`, // Bytecode
+    metadata: `元資料`, // Metadata
+    swarm: `Swarm元資料雜湊` // Sarm Metadata Hash
+  },
+  title: {
+    contract: `選擇一個合約`, // Select a contract
+    loading: `載入中...`, // Loading...
+    main: `寫一個合約`, // Write a Contract
+    messages: `編譯器訊息`, // Compiler messages
+    new: `新建Solidity合約`, // New Solidity Contract
+    parameters: `變數`, // Parameters
+    saved: `已儲存 @ {timestamp}`, // saved @ {timestamp}
+    selectSolidity: `選擇Solidity版本`, //Select a Solidity version
+    solidity: `正在載入Solidity {version}` // Loading Solidity {version}
+  },
+  type: {
+    humanErc20: `Human代幣合約編碼`, // Implementation of the Human Token Contract
+    implementErc20: `ERC20代幣合約編碼`, // Implementation of the ERC20 Token Contract
+    multisig: `多籤錢包編碼`, // Implementation of a multisig Wallet
+    standardErc20: `標準ERC20代幣合約` // Standard ERC20 Token Contract
+  }
+};
diff --git a/js/src/i18n/zh/account.js b/js/src/i18n/zh/account.js
index 7c9d25520..37adb3f7d 100644
--- a/js/src/i18n/zh/account.js
+++ b/js/src/i18n/zh/account.js
@@ -16,24 +16,24 @@
 
 export default {
   button: {
-    delete: `delete`,
-    edit: `edit`,
-    faucet: `Kovan ETH`,
-    password: `password`,
+    delete: `删除`,//delete
+    edit: `编辑`,//edit
+    faucet: `Kovan测试网络以太币`,//Kovan ETH 
+    password: `密码`,//password
     shapeshift: `shapeshift`,
-    transfer: `transfer`,
-    verify: `verify`
+    transfer: `转账`,//transfer
+    verify: `确认`//verify
   },
   hardware: {
-    confirmDelete: `Are you sure you want to remove the following hardware address from your account list?`
-  },
+    confirmDelete: `你确定从你的账户列表中移除下面的硬件地址吗？`
+  },//Are you sure you want to remove the following hardware address from your account list?
   header: {
-    outgoingTransactions: `{count} outgoing transactions`,
+    outgoingTransactions: `{count}笔正在发生的转账`,//{count} outgoing transactions
     uuid: `uuid: {uuid}`
   },
-  title: `Account Management`,
+  title: `账户管理`,//Account Management
   transactions: {
-    poweredBy: `Transaction list powered by {etherscan}`,
-    title: `transactions`
+    poweredBy: `Transaction list powered by {etherscan}提供的交易列表`,
+    title: `交易`//transactions
   }
 };
diff --git a/js/src/i18n/zh/accounts.js b/js/src/i18n/zh/accounts.js
index 2db3d5fd9..2db3e9b97 100644
--- a/js/src/i18n/zh/accounts.js
+++ b/js/src/i18n/zh/accounts.js
@@ -16,19 +16,21 @@
 
 export default {
   button: {
-    newAccount: `account`,
-    newWallet: `wallet`,
-    vaults: `vaults`
+    newAccount: `账户`,//account
+    newWallet: `钱包`,//wallet
+    vaults: `保险库`//vaults
   },
   summary: {
-    minedBlock: `Mined at block #{blockNumber}`
+    minedBlock: `在第#{blockNumber}个区块被挖出`//Mined at block #{blockNumber}
   },
-  title: `Accounts Overview`,
+  title: `账户总览`,//Accounts Overview
   tooltip: {
-    actions: `actions relating to the current view are available on the toolbar for quick access, be it for performing actions or creating a new item`,
-    overview: `your accounts are visible for easy access, allowing you to edit the meta information, make transfers, view transactions and fund the account`
+    actions: `与当前视窗有关的操作可以在工具栏中快速被找到，不论是执行操作还是创建新项`,
+    //actions relating to the current view are available on the toolbar for quick access, be it for performing actions or creating a new item
+    overview: `你的账户很容易使用，使你可以编辑元信息、转账、查看交易和向账户充值`
+    //your accounts are visible for easy access, allowing you to edit the meta information, make transfers, view transactions and fund the account
   },
   tooltips: {
-    owner: `{name} (owner)`
+    owner: `{name}持有者`//{name} (owner)
   }
 };
diff --git a/js/src/i18n/zh/addAddress.js b/js/src/i18n/zh/addAddress.js
index 59ae71518..a22dd31aa 100644
--- a/js/src/i18n/zh/addAddress.js
+++ b/js/src/i18n/zh/addAddress.js
@@ -16,23 +16,26 @@
 
 export default {
   button: {
-    add: `Save Address`,
-    close: `Cancel`
+    add: `保存地址`, // Save Address
+    close: `取消` // Cancel
   },
-  header: `To add a new entry to your addressbook, you need the network address of the account and can supply an optional description. Once added it will reflect in your address book.`,
+  header: `如果想在地址簿中添加一条新的记录，你需要拥有账户的网络地址并提供一个的描述（可选）。一旦添加，记录就可以体现在你的地址簿中。`,
+  // To add a new entry to your addressbook, you need the network 
+  // address of the account and can supply an optional description. 
+  // Once added it will reflect in your address book.
   input: {
     address: {
-      hint: `the network address for the entry`,
-      label: `network address`
+      hint: `记录的网络地址`, // the network address for the entry
+      label: `网络地址` // network address
     },
     description: {
-      hint: `an expanded description for the entry`,
-      label: `(optional) address description`
+      hint: `记录的详细描述`, // an expanded description for the entry
+      label: `（可选）地址描述` // (optional) address description
     },
     name: {
-      hint: `a descriptive name for the entry`,
-      label: `address name`
+      hint: `记录的名字`, // a descriptive name for the entry
+      label: `地址名` // address name
     }
   },
-  label: `add saved address`
+  label: `添加已保存的地址` // add saved address
 };
diff --git a/js/src/i18n/zh/addContract.js b/js/src/i18n/zh/addContract.js
index edbecf118..c45a37b3a 100644
--- a/js/src/i18n/zh/addContract.js
+++ b/js/src/i18n/zh/addContract.js
@@ -16,45 +16,45 @@
 
 export default {
   abi: {
-    hint: `the abi for the contract`,
-    label: `contract abi`
+    hint: `合约的ABI`, // the abi for the contract
+    label: `合约ABI` // contract abi
   },
   abiType: {
     custom: {
-      description: `Contract created from custom ABI`,
-      label: `Custom Contract`
+      description: `通过自定义ABI创造的合约`, // Contract created from custom ABI
+      label: `自定义合约` // Custom Contract
     },
     multisigWallet: {
-      description: `Ethereum Multisig contract {link}`,
-      label: `Multisig Wallet`,
-      link: `see contract code`
+      description: `以太坊多重签名合约{link}`, // Ethereum Multisig contract {link}
+      label: `多重签名钱包`, // Multisig Wallet
+      link: `参考合约代码` // see contract code
     },
     token: {
-      description: `A standard {erc20} token`,
-      erc20: `ERC 20`,
-      label: `Token`
+      description: `一个标准的{erc20}代币`, // A standard {erc20} token
+      erc20: `ERC 20`, // ERC 20
+      label: `代币` // Token
     }
   },
   address: {
-    hint: `the network address for the contract`,
-    label: `network address`
+    hint: `合约的网络地址`, // the network address for the contract
+    label: `网络地址` // network address
   },
   button: {
-    add: `Add Contract`,
-    cancel: `Cancel`,
-    next: `Next`,
-    prev: `Back`
+    add: `添加合约`, // Add Contract
+    cancel: `取消`, // Cancel
+    next: `下一步`, // Next
+    prev: `上一步` // Back
   },
   description: {
-    hint: `an expanded description for the entry`,
-    label: `(optional) contract description`
+    hint: `记录的详细描述`, // an expanded description for the entry
+    label: `（可选）合约描述` // (optional) contract description
   },
   name: {
-    hint: `a descriptive name for the contract`,
-    label: `contract name`
+    hint: `合约的描述性名称`, // a descriptive name for the contract
+    label: `合约名` // contract name
   },
   title: {
-    details: `enter contract details`,
-    type: `choose a contract type`
+    details: `输入合约细节`, // enter contract details
+    type: `选择合约种类` // choose a contract type
   }
 };
diff --git a/js/src/i18n/zh/address.js b/js/src/i18n/zh/address.js
index ec06d4237..ed1653b61 100644
--- a/js/src/i18n/zh/address.js
+++ b/js/src/i18n/zh/address.js
@@ -16,13 +16,13 @@
 
 export default {
   buttons: {
-    edit: `edit`,
-    forget: `forget`,
-    save: `save`
+    edit: `编辑`,//edit
+    forget: `忘记`,//forget
+    save: `保存`//save
   },
   delete: {
-    confirmInfo: `Are you sure you want to remove the following address from your addressbook?`,
-    title: `confirm removal`
+    confirmInfo: `你确定你想把下面的地址从你的地址簿中移除吗？`,//Are you sure you want to remove the following address from your addressbook?
+    title: `确认移除`//confirm removal
   },
-  title: `Address Information`
+  title: `地址信息`//Address Information
 };
diff --git a/js/src/i18n/zh/addressSelect.js b/js/src/i18n/zh/addressSelect.js
index 108ac80f5..ad96528c9 100644
--- a/js/src/i18n/zh/addressSelect.js
+++ b/js/src/i18n/zh/addressSelect.js
@@ -15,12 +15,12 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 export default {
-  fromEmail: `Verified using email {email}`,
-  fromRegistry: `{name} (from registry)`,
+  fromEmail: `使用邮箱{email}进行确认`,//Verified using email {email}
+  fromRegistry: `{name}（来自注册）`,//{name} (from registry)
   labels: {
-    accounts: `accounts`,
-    contacts: `contacts`,
-    contracts: `contracts`
+    accounts: `账户`,//accounts
+    contacts: `合约`,//contacts
+    contracts: `合约`//contracts
   },
-  noAccount: `No account matches this query...`
+  noAccount: `查不到这个账户`//No account matches this query...
 };
diff --git a/js/src/i18n/zh/addresses.js b/js/src/i18n/zh/addresses.js
index 00bb28272..9702032ff 100644
--- a/js/src/i18n/zh/addresses.js
+++ b/js/src/i18n/zh/addresses.js
@@ -16,10 +16,10 @@
 
 export default {
   buttons: {
-    add: `address`
+    add: `地址` //address
   },
   errors: {
-    invalidFile: `The provided file is invalid...`
+    invalidFile: `提供的文件是无效的`//The provided file is invalid...
   },
-  title: `Saved Addresses`
+  title: `保存的地址`//Saved Addresses
 };
diff --git a/js/src/i18n/zh/application.js b/js/src/i18n/zh/application.js
index 4469d83b2..0d76f1bb8 100644
--- a/js/src/i18n/zh/application.js
+++ b/js/src/i18n/zh/application.js
@@ -16,15 +16,15 @@
 
 export default {
   frame: {
-    error: `ERROR: This application cannot and should not be loaded in an embedded iFrame`
+    error: `错误：这个应用不能也不应该载入到内置框架中`//ERROR: This application cannot and should not be loaded in an embedded iFrame
   },
   status: {
     consensus: {
-      capable: `Capable`,
-      capableUntil: `Capable until #{blockNumber}`,
-      incapableSince: `Incapable since #{blockNumber}`,
-      unknown: `Unknown capability`
+      capable: `可行`,//Capable
+      capableUntil: `到第 #{blockNumber} 区块前可行`,//Capable until #{blockNumber}
+      incapableSince: `自第 #{blockNumber} 区块后不可行`,//Incapable since #{blockNumber}
+      unknown: `未知能力`//Unknown capability
     },
-    upgrade: `Upgrade`
+    upgrade: `升级`//Upgrade
   }
 };
diff --git a/js/src/i18n/zh/connection.js b/js/src/i18n/zh/connection.js
index e51943178..8ed9840d7 100644
--- a/js/src/i18n/zh/connection.js
+++ b/js/src/i18n/zh/connection.js
@@ -13,14 +13,18 @@
 
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
 export default {
-  connectingAPI: `Connecting to the Parity Secure API.`,
-  connectingNode: `Connecting to the Parity Node. If this informational message persists, please ensure that your Parity node is running and reachable on the network.`,
-  invalidToken: `invalid signer token`,
-  noConnection: `Unable to make a connection to the Parity Secure API. To update your secure token or to generate a new one, run {newToken} and paste the generated token into the space below.`,
+  connectingAPI: `正在连接至Parity Secure API`, // Connecting to the Parity Secure API.
+  connectingNode: `正在连接Parity节点。如果弹出任何信息，请确认你的Parity节点正在运行并连接至互联网。`, 
+  // Connecting to the Parity Node. If this informational message persists, 
+  // please ensure that your Parity node is running and reachable on the network.
+  invalidToken: `无效的签名令牌`, // invalid signer token
+  noConnection: `无法连接至Parity Secure API。请升级的你的安全令牌或者生成一个新的，运行{newToken}并粘贴生成的令牌到下方。`,
+  // Unable to make a connection to the Parity Secure API. To update your secure 
+  // token or to generate a new one, run {newToken} and paste the generated token 
+  // into the space below.
   token: {
-    hint: `a generated token from Parity`,
-    label: `secure token`
+    hint: `一个Parity生成的令牌`, // a generated token from Parity
+    label: `安全令牌` // secure token
   }
 };
diff --git a/js/src/i18n/zh/contract.js b/js/src/i18n/zh/contract.js
index bf7f00298..ad97a85fb 100644
--- a/js/src/i18n/zh/contract.js
+++ b/js/src/i18n/zh/contract.js
@@ -16,26 +16,26 @@
 
 export default {
   buttons: {
-    close: `Close`,
-    details: `details`,
-    edit: `edit`,
-    execute: `execute`,
-    forget: `forget`
+    close: `关闭`, // close
+    details: `详细资料`, // details
+    edit: `编辑`, // edit
+    execute: `运行`, // execute
+    forget: `forget` // forget
   },
   details: {
-    title: `contract details`
+    title: `合约细节` // contract details
   },
   events: {
-    eventPending: `pending`,
-    noEvents: `No events has been sent from this contract.`,
-    title: `events`
+    eventPending: `待定中`, // pending
+    noEvents: `此合约没有发送过任何事件`, // No events has been sent from this contract.
+    title: `事件`  // events
   },
-  minedBlock: `Mined at block #{blockNumber}`,
+  minedBlock: `挖到了第{blockNumber}个区块`, // Mined at block #{blockNumber}
   queries: {
     buttons: {
-      query: `Query`
+      query: `查询` // Query
     },
-    title: `queries`
+    title: `查询` // queries
   },
-  title: `Contract Information`
+  title: `合约信息` // Contract Information
 };
diff --git a/js/src/i18n/zh/contracts.js b/js/src/i18n/zh/contracts.js
index 4ff840759..a1cdec5af 100644
--- a/js/src/i18n/zh/contracts.js
+++ b/js/src/i18n/zh/contracts.js
@@ -16,13 +16,13 @@
 
 export default {
   buttons: {
-    deploy: `deploy`,
-    develop: `develop`,
-    watch: `watch`
+    deploy: `部署`, // deploy
+    develop: `开发`, // develop
+    watch: `观察` // watch
   },
   sortOrder: {
-    date: `date`,
-    minedBlock: `mined block`
+    date: `日期`, // date
+    minedBlock: `挖到的区块` // mined block
   },
-  title: `Contracts`
+  title: `合约` // Contracts
 };
diff --git a/js/src/i18n/zh/createWallet.js b/js/src/i18n/zh/createWallet.js
index eeb9e9a98..f14d73439 100644
--- a/js/src/i18n/zh/createWallet.js
+++ b/js/src/i18n/zh/createWallet.js
@@ -16,91 +16,91 @@
 
 export default {
   button: {
-    add: `Add`,
-    cancel: `Cancel`,
-    close: `Close`,
-    create: `Create`,
-    done: `Done`,
-    next: `Next`,
-    sending: `Sending...`
+    add: `添加`, // Add
+    cancel: `取消`, // Cancel
+    close: `关闭`, // Close
+    create: `创建`, // Create
+    done: `完成`, // Done
+    next: `下一步`, // Next
+    sending: `发送中...` // Sending...
   },
   deployment: {
-    message: `The deployment is currently in progress`
+    message: `部署正在进行中` // The deployment is currently in progress
   },
   details: {
     address: {
-      hint: `the wallet contract address`,
-      label: `wallet address`
+      hint: `钱包的合约地址`, // the wallet contract address
+      label: `钱包地址` // wallet address
     },
     dayLimitMulti: {
-      hint: `amount of ETH spendable without confirmations`,
-      label: `wallet day limit`
+      hint: `无需确认即可使用的ETH数量`, // amount of ETH spendable without confirmations
+      label: `钱包每日限额` // wallet day limit
     },
     description: {
-      hint: `the local description for this wallet`,
-      label: `wallet description (optional)`
+      hint: `本地钱包描述`, // the local description for this wallet
+      label: `钱包描述（可选）` // wallet description (optional)
     },
     descriptionMulti: {
-      hint: `the local description for this wallet`,
-      label: `wallet description (optional)`
+      hint: `本地钱包描述`, // the local description for this wallet
+      label: `钱包描述（可选）` // wallet description (optional)
     },
     name: {
-      hint: `the local name for this wallet`,
-      label: `wallet name`
+      hint: `钱包本地名称`,  // the local name for this wallet
+      label: `钱包名称` // wallet name 
     },
     nameMulti: {
-      hint: `the local name for this wallet`,
-      label: `wallet name`
+      hint: `钱包本地名称`, // the local name for this wallet
+      label: `钱包名称` // wallet name
     },
     ownerMulti: {
-      hint: `the owner account for this contract`,
-      label: `from account (contract owner)`
+      hint: `合约的持有者账户`, // the owner account for this contract
+      label: `从账户 (contract owner)` // from account (contract owner)
     },
     ownersMulti: {
-      label: `other wallet owners`
+      label: `其他钱包持有者` // other wallet owners
     },
     ownersMultiReq: {
-      hint: `number of required owners to accept a transaction`,
-      label: `required owners`
+      hint: `接受交易所需的持有者人数`, // number of required owners to accept a transaction
+      label: `所需持有者` // required owners
     }
   },
   info: {
-    added: `added`,
-    copyAddress: `copy address to clipboard`,
-    created: `{name} has been {deployedOrAdded} at`,
-    dayLimit: `The daily limit is set to {dayLimit} ETH.`,
-    deployed: `deployed`,
-    numOwners: `{numOwners} owners are required to confirm a transaction.`,
-    owners: `The following are wallet owners`
+    added: `已添加`, // added
+    copyAddress: `复制地址至粘贴板`, // copy address to clipboard
+    created: `{name}已被{deployedOrAdded}至`, // {name} has been {deployedOrAdded} at
+    dayLimit: `每日限额已被设置为{dayLimit}ETH`, // The daily limit is set to {dayLimit} ETH.
+    deployed: `已部署`, // deployed
+    numOwners: `需要{numOwners}个持有者才能确认一个交易`, // {numOwners} owners are required to confirm a transaction.
+    owners: `以下为钱包持有者` // The following are wallet owners
   },
   rejected: {
-    message: `The deployment has been rejected`,
-    state: `The wallet will not be created. You can safely close this window.`,
-    title: `rejected`
+    message: `部署被拒绝`, // The deployment has been rejected
+    state: `钱包不会被创建。你可以安全地关闭本窗口`, // The wallet will not be created. You can safely close this window.
+    title: `失败` // rejected
   },
   states: {
-    completed: `The contract deployment has been completed`,
-    confirmationNeeded: `The contract deployment needs confirmations from other owners of the Wallet`,
-    preparing: `Preparing transaction for network transmission`,
-    validatingCode: `Validating the deployed contract code`,
-    waitingConfirm: `Waiting for confirmation of the transaction in the Parity Secure Signer`,
-    waitingReceipt: `Waiting for the contract deployment transaction receipt`
+    completed: `合约部署已完成`, // The contract deployment has been completed
+    confirmationNeeded: `合约部署需要来自本钱包的其他持有者的确认`, // The contract deployment needs confirmations from other owners of the Wallet
+    preparing: `交易正在准备被网络广播`, // Preparing transaction for network transmission
+    validatingCode: `正在验证已部署的代码`, // Validating the deployed contract code
+    waitingConfirm: `正在等待Parity Secure Signer确认本交易`, // Waiting for confirmation of the transaction in the Parity Secure Signer
+    waitingReceipt: `正在等待合约部署交易收据` // Waiting for the contract deployment transaction receipt
   },
   steps: {
-    deployment: `wallet deployment`,
-    details: `wallet details`,
-    info: `wallet informaton`,
-    type: `wallet type`
+    deployment: `钱包部署`, // wallet deployment
+    details: `钱包详情`, // wallet details
+    info: `钱包信息`, // wallet informaton
+    type: `钱包类别` // wallet type
   },
   type: {
     multisig: {
-      description: `Create/Deploy a {link} Wallet`,
-      label: `Multi-Sig wallet`,
-      link: `standard multi-signature`
+      description: `创建/部署一个{link}钱包`, // Create/Deploy a {link} Wallet
+      label: `多重签名钱包`, // Multi-Sig Wallet
+      link: `标准多重签名` // standard multi-signature
     },
     watch: {
-      description: `Add an existing wallet to your accounts`,
-      label: `Watch a wallet`
+      description: `添加一个已有钱包到你的账户`, // Add an existing wallet to your accounts
+      label: `观察钱包` // Watch a wallet
     }
   }
 };
diff --git a/js/src/i18n/zh/dapp.js b/js/src/i18n/zh/dapp.js
index 29dd2fd16..1fb256f1b 100644
--- a/js/src/i18n/zh/dapp.js
+++ b/js/src/i18n/zh/dapp.js
@@ -15,6 +15,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 export default {
-  loading: `Loading`,
-  unavailable: `The dapp cannot be reached`
+  loading: `正在加载`,//Loading
+  unavailable: `不能获取这个dapp`//The dapp cannot be reached
 };
diff --git a/js/src/i18n/zh/dapps.js b/js/src/i18n/zh/dapps.js
index 9ed3415d1..2b45bd2ce 100644
--- a/js/src/i18n/zh/dapps.js
+++ b/js/src/i18n/zh/dapps.js
@@ -17,29 +17,32 @@
 export default {
   add: {
     builtin: {
-      desc: `Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.`,
-      label: `Applications bundled with Parity`
+      desc: `Parity团队开发的实验性的，用以展示dapp的性能、集成、实验性特性和控制特定网络的的客户端行为`,
+      //Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.
+      label: `与Parity绑定的应用`//Applications bundled with Parity
     },
-    label: `visible applications`,
+    label: `visible applications可见的应用`,//visible applications
     local: {
       desc: `All applications installed locally on the machine by the user for access by the Parity client.`,
-      label: `Applications locally available`
+      label: `本地可用的应用`//Applications locally available
     },
     network: {
-      desc: `These applications are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each application before interacting.`,
-      label: `Applications on the global network`
+      desc: `这些应用与Parity没有关联，也不是Parity发布的。 它们是由各自的作者控制的。 在使用以前，请确保你理解每个应用的目标。`,
+      //These applications are not affiliated with Parity nor are they published by Parity.Each remain under the control of their respective authors.Please ensure that you understand the goals for each application before interacting.
+      label: `全球网络上的应用`//Applications on the global network
     }
   },
   button: {
-    edit: `edit`,
-    permissions: `permissions`
+    edit: `编辑`,//edit
+    permissions: `许可`//permissions
   },
   external: {
-    accept: `I understand that these applications are not affiliated with Parity`,
-    warning: `Applications made available on the network by 3rd-party authors are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each before interacting.`
+    accept: `我理解这些应用和Parity没有关联`,//I understand that these applications are not affiliated with Parity
+    warning: `第三方开发者开发的应用与Parity没有关联，也不是Parity发布的。 它们是由各自的作者控制的。 在使用以前，请确保你理解每个应用的目标。`
+    //Applications made available on the network by 3rd-party authors are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each before interacting.
   },
-  label: `Decentralized Applications`,
+  label: `去中心化应用`,//Decentralized Applications
   permissions: {
-    label: `visible dapp accounts`
+    label: `可见的dapp账户`//visible dapp accounts
   }
 };
diff --git a/js/src/i18n/zh/deleteAccount.js b/js/src/i18n/zh/deleteAccount.js
index 4818a785a..86e0f314f 100644
--- a/js/src/i18n/zh/deleteAccount.js
+++ b/js/src/i18n/zh/deleteAccount.js
@@ -16,9 +16,9 @@
 
 export default {
   password: {
-    hint: `provide the account password to confirm the account deletion`,
-    label: `account password`
+    hint: `提供账户密码，确认删除账户`,//provide the account password to confirm the account deletion
+    label: `账户密码`//account password
   },
-  question: `Are you sure you want to permanently delete the following account?`,
-  title: `confirm removal`
+  question: `你确定你想永久地删除下面的账户？`,//Are you sure you want to permanently delete the following account?
+  title: `确认删除`//confirm removal
 };
diff --git a/js/src/i18n/zh/deployContract.js b/js/src/i18n/zh/deployContract.js
index 0b5a05503..21ea737bb 100644
--- a/js/src/i18n/zh/deployContract.js
+++ b/js/src/i18n/zh/deployContract.js
@@ -16,75 +16,75 @@
 
 export default {
   busy: {
-    title: `The deployment is currently in progress`
+    title: `部署正在进行中`//The deployment is currently in progress
   },
   button: {
-    cancel: `Cancel`,
-    close: `Close`,
-    create: `Create`,
-    done: `Done`,
-    next: `Next`
+    cancel: `取消`,//Cancel
+    close: `关闭`,//Close
+    create: `创建`,//Create
+    done: `完成`,//Done
+    next: `下一个`//Next
   },
   completed: {
-    description: `Your contract has been deployed at`
+    description: `你的合约已经被部署在`//Your contract has been deployed at
   },
   details: {
     abi: {
-      hint: `the abi of the contract to deploy or solc combined-output`,
-      label: `abi / solc combined-output`
+      hint: `合约的abi或者solc 组合输出`,//the abi of the contract to deploy or solc combined-output
+      label: `abi / solc 组合输出 `//abi / solc combined-output
     },
     address: {
-      hint: `the owner account for this contract`,
-      label: `from account (contract owner)`
+      hint: `这个合约所有者的账户`,//the owner account for this contract
+      label: `来自账户（合约所有者）`//from account (contract owner)
     },
     advanced: {
-      label: `advanced sending options`
+      label: `高级的发送选项`//advanced sending options
     },
     amount: {
-      hint: `the amount to transfer to the contract`,
-      label: `amount to transfer (in {tag})`
+      hint: `转到这个合约中的数额`,//the amount to transfer to the contract
+      label: `发送数额{tag}`//amount to transfer (in {tag})
     },
     code: {
-      hint: `the compiled code of the contract to deploy`,
-      label: `code`
+      hint: `编译好的合约代码`,//the compiled code of the contract to deploy
+      label: `代码`//code
     },
     contract: {
-      label: `select a contract`
+      label: `选择一个合约`//select a contract
     },
     description: {
-      hint: `a description for the contract`,
-      label: `contract description (optional)`
+      hint: `对这个合约的描述`,//a description for the contract
+      label: `合约描述（可选）`//contract description (optional)
     },
     name: {
-      hint: `a name for the deployed contract`,
-      label: `contract name`
+      hint: `已经部署合约的名字`,//a name for the deployed contract
+      label: `合约名字`//contract name
     }
   },
   owner: {
-    noneSelected: `a valid account as the contract owner needs to be selected`
+    noneSelected: `选择一个有效的地址作为合约的所有者`//a valid account as the contract owner needs to be selected
   },
   parameters: {
-    choose: `Choose the contract parameters`
+    choose: `选择合约参数`//Choose the contract parameters
   },
   rejected: {
-    description: `You can safely close this window, the contract deployment will not occur.`,
-    title: `The deployment has been rejected`
+    description: `你可以安全地关闭窗口，合约部署不会发生。`,//You can safely close this window, the contract deployment will not occur.
+    title: `部署已经被拒绝`//The deployment has been rejected
   },
   state: {
-    completed: `The contract deployment has been completed`,
-    confirmationNeeded: `The operation needs confirmations from the other owners of the contract`,
-    preparing: `Preparing transaction for network transmission`,
-    validatingCode: `Validating the deployed contract code`,
-    waitReceipt: `Waiting for the contract deployment transaction receipt`,
-    waitSigner: `Waiting for confirmation of the transaction in the Parity Secure Signer`
+    completed: `合约部署已经完成`,//The contract deployment has been completed
+    confirmationNeeded: `这一操作需要这个合约其他所有人的确认。`,//The operation needs confirmations from the other owners of the contract
+    preparing: `为网络传输准备交易`,//Preparing transaction for network transmission
+    validatingCode: `验证已经部署的合约的代码`,//Validating the deployed contract code
+    waitReceipt: `等待合约部署交易收据`,//Waiting for the contract deployment transaction receipt
+    waitSigner: `等待Parity Secure Signer中的交易被确认 `//Waiting for confirmation of the transaction in the Parity Secure Signer
   },
   title: {
-    completed: `completed`,
-    deployment: `deployment`,
-    details: `contract details`,
-    extras: `extra information`,
-    failed: `deployment failed`,
-    parameters: `contract parameters`,
-    rejected: `rejected`
+    completed: `完成`,//completed
+    deployment: `部署`,//deployment
+    details: `合约细节`,//contract details
+    extras: `额外信息`,//extra information
+    failed: `部署失败`,//deployment failed
+    parameters: `s合约参数`,//contract parameter
+    rejected: `拒绝`//rejected
   }
 };
diff --git a/js/src/i18n/zh/editMeta.js b/js/src/i18n/zh/editMeta.js
index b5b521341..29efa726e 100644
--- a/js/src/i18n/zh/editMeta.js
+++ b/js/src/i18n/zh/editMeta.js
@@ -16,19 +16,19 @@
 
 export default {
   description: {
-    hint: `description for this address`,
-    label: `address description`
+    hint: `此地址的描述`, // description for this address
+    label: `地址描述` // address description
   },
   name: {
-    label: `name`
+    label: `名称` // name
   },
   passwordHint: {
-    hint: `a hint to allow password recovery`,
-    label: `(optional) password hint`
+    hint: `密码恢复提示`, // a hint to allow password recovery
+    label: `（可选）密码提示` // (optional) password hint
   },
   tags: {
-    hint: `press <Enter> to add a tag`,
-    label: `(optional) tags`
+    hint: `按<Enter>来添加一个标签`, // press <Enter> to add a tag
+    label: `（可选）标签` // (optional) tags
   },
-  title: `edit metadata`
+  title: `编辑元数据` // edit metadata
 };
diff --git a/js/src/i18n/zh/errors.js b/js/src/i18n/zh/errors.js
index 76fed24cd..8d908acd3 100644
--- a/js/src/i18n/zh/errors.js
+++ b/js/src/i18n/zh/errors.js
@@ -15,10 +15,10 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 export default {
-  duplicateName: `the name already exists`,
-  invalidKey: `the raw key needs to be hex, 64 characters in length and contain the prefix "0x"`,
-  noFile: `select a valid wallet file to import`,
-  noKey: `you need to provide the raw private key`,
-  noMatchPassword: `the supplied passwords does not match`,
-  noName: `you need to specify a valid name`
+  duplicateName: `名称已存在`, // the name already exists
+  invalidKey: `原始私钥需要被16进制，64个字符长度并以"0x"开头`, // the raw key needs to be hex, 64 characters in length and contain the prefix "0x"
+  noFile: `选择一个可用的钱包文件来输入`, // select a valid wallet file to import
+  noKey: `你需要提供原始私钥`, // you need to provide the raw private key
+  noMatchPassword: `所提供的密码不正确`, // the supplied passwords does not match
+  noName: `你需要明确一个可用的名称` // you need to specify a valid name
 };
diff --git a/js/src/i18n/zh/executeContract.js b/js/src/i18n/zh/executeContract.js
index 011264d3f..847670edc 100644
--- a/js/src/i18n/zh/executeContract.js
+++ b/js/src/i18n/zh/executeContract.js
@@ -16,43 +16,43 @@
 
 export default {
   busy: {
-    posted: `Your transaction has been posted to the network`,
-    title: `The function execution is in progress`,
-    waitAuth: `Waiting for authorization in the Parity Signer`
+    posted: `你的交易已被公布至网络`, // Your transaction has been posted to the network
+    title: `函数执行正在进行中`, // The function execution is in progress
+    waitAuth: `正在等待Parity Signer授权` // Waiting for authorization in the Parity Signer
   },
   button: {
-    cancel: `cancel`,
-    done: `done`,
-    next: `next`,
-    post: `post transaction`,
-    prev: `prev`
+    cancel: `取消`, // cancel
+    done: `完成`, // done
+    next: `下一步`, // next
+    post: `公布交易`, // post transaction
+    prev: `上一步` // prev
   },
   details: {
     address: {
-      hint: `from account`,
-      label: `the account to transact with`
+      hint: `来自账户`, // from account
+      label: `将要交易的账户` // the account to transact with
     },
     advancedCheck: {
-      label: `advanced sending options`
+      label: `高级发送选项` // advanced sending options
     },
     amount: {
-      hint: `the amount to send to with the transaction`,
-      label: `transaction value (in ETH)`
+      hint: `此交易将会发送的数量`, // the amount to send to with the transaction
+      label: `交易价值（ETH）` // transaction value (in ETH)
     },
     function: {
-      hint: `the function to call on the contract`,
-      label: `function to execute`
+      hint: `此合约将会调用的函数`, // the function to call on the contract
+      label: `将执行的函数` // function to execute
     }
   },
   rejected: {
-    state: `You can safely close this window, the function execution will not occur.`,
-    title: `The execution has been rejected`
+    state: `你可以安全的关闭此视窗，函数将不会被执行。`, // You can safely close this window, the function execution will not occur.
+    title: `执行失败` // The execution has been rejected
   },
   steps: {
-    advanced: `advanced options`,
-    complete: `complete`,
-    rejected: `rejected`,
-    sending: `sending`,
-    transfer: `function details`
+    advanced: `高级选项`, // advanced options
+    complete: `完成`, // complete
+    rejected: `失败`, // rejected
+    sending: `发送中`, // sending
+    transfer: `函数详情` // function details
   }
 };
diff --git a/js/src/i18n/zh/extension.js b/js/src/i18n/zh/extension.js
index 88ba33674..565159ce0 100644
--- a/js/src/i18n/zh/extension.js
+++ b/js/src/i18n/zh/extension.js
@@ -15,6 +15,8 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 export default {
-  install: `Install the extension now`,
-  intro: `Parity now has an extension available for Chrome that allows safe browsing of Ethereum-enabled distributed applications. It is highly recommended that you install this extension to further enhance your Parity experience.`
+  install: `现在就安装这个扩展`, // Install the extension now
+  intro: `Parity现在有一个Chrome的扩展，可以安全的浏览以太坊所支持的分布式应用。我们强烈推荐你安装这个扩展来进一步提升你的Parity使用体验。` 
+  // Parity now has an extension available for Chrome that allows safe browsing of Ethereum-enabled distributed applications. 
+  // It is highly recommended that you install this extension to further enhance your Parity experience.
 };
diff --git a/js/src/i18n/zh/faucet.js b/js/src/i18n/zh/faucet.js
index 11aacef9c..f18464c36 100644
--- a/js/src/i18n/zh/faucet.js
+++ b/js/src/i18n/zh/faucet.js
@@ -16,13 +16,14 @@
 
 export default {
   buttons: {
-    close: `close`,
-    done: `close`,
-    request: `request`
+    close: `关闭`,//close
+    done: `关闭`,//close
+    request: `请求`//request
   },
   summary: {
-    done: `Your Kovan ETH has been requested from the faucet which responded with -`,
-    info: `To request a deposit of Kovan ETH to this address, you need to ensure that the address is sms-verified on the mainnet. Once executed the faucet will deposit Kovan ETH into the current account.`
+    done: `你已经向水龙头请求Kovan ETH测试币`,//Your Kovan ETH has been requested from the faucet which responded with -
+    info: `如果请求将Kovan ETH测试币存入这个地址，你需要确定这个地址在主网络上已经用短信验证过了。 一旦执行水龙头将向当前账户存入Kovan ETH测试币。`
+    //To request a deposit of Kovan ETH to this address, you need to ensure that the address is sms-verified on the mainnet.Once executed the faucet will deposit Kovan ETH into the current account.
   },
-  title: `Kovan ETH Faucet`
+  title: `Kovan ETH测试币水龙头`//Kovan ETH Faucet Kovan
 };
diff --git a/js/src/i18n/zh/firstRun.js b/js/src/i18n/zh/firstRun.js
index 5a3e04a17..17cc1b607 100644
--- a/js/src/i18n/zh/firstRun.js
+++ b/js/src/i18n/zh/firstRun.js
@@ -16,34 +16,37 @@
 
 export default {
   button: {
-    close: `Close`,
-    create: `Create`,
-    next: `Next`,
-    print: `Print Phrase`,
-    skip: `Skip`
+    close: `关闭`,//Close
+    create: `创建`,//Create
+    next: `下一步`,//Next
+    print: `打印词组`,//Print Phrase
+    skip: `跳过`//Skip
   },
   completed: {
-    congrats: `Congratulations! Your node setup has been completed successfully and you are ready to use the application.`,
-    next: `Next you will receive a walk-through of the available functions and the general application interface to get you up and running in record time.`
+    congrats: `恭喜！你的节点设置已经完成，你现在可以使用应用了。`,
+    //Congratulations! Your node setup has been completed successfully and you are ready to use the application.
+    next: `下面你将浏览可用的功能和通用的应用界面，让你最快速地使用Parity。`
+    //Next you will receive a walk-through of the available functions and the general application interface to get you up and running in record time.
   },
   title: {
-    completed: `completed`,
-    newAccount: `new account`,
-    recovery: `recovery`,
-    terms: `terms`,
-    welcome: `welcome`
+    completed: `完成`,//completed
+    newAccount: `新账户`,//new account
+    recovery: `恢复`,//recovery
+    terms: `条款`,//terms
+    welcome: `欢迎`//welcome
   },
   tnc: {
-    accept: `I accept these terms and conditions`
+    accept: `我接受这些条款和条件`//I accept these terms and conditions
   },
   welcome: {
-    description: `As part of a new installation, the next few steps will guide you through the process of setting up you Parity instance and your associated accounts. Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us. Once completed you will have -`,
-    greeting: `Welcome to Parity, the fastest and simplest way to run your node.`,
-    next: `Click Next to continue your journey.`,
+    description: `作为初次安装的一部分，下面的几个步骤将指导你如何设置你的Parity和相关账户。我们的目标是使得使用Parity变得尽可能的简单，让你成功运行，所以请有点耐心。 一旦完成，你将拥有`,
+    //As part of a new installation, the next few steps will guide you through the process of setting up you Parity instance and your associated accounts.Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us.Once completed you will have -
+    greeting: `欢迎使用Parity，这是运行以太坊节点的最快和最简单的方式。`,//Welcome to Parity, the fastest and simplest way to run your node.
+    next: `点击下一步继续`,//Click Next to continue your journey.
     step: {
-      account: `Created your first Parity account`,
-      privacy: `Understood our privacy policy & terms of operation`,
-      recovery: `Have the ability to recover your account`
+      account: `创建你的第一个Parity账户`,//Created your first Parity account
+      privacy: `理解你的隐私政策和运作条款`,//Understood our privacy policy & terms of operation
+      recovery: `有能力可以恢复你的账户`//Have the ability to recover your account
     }
   }
 };
diff --git a/js/src/i18n/zh/home.js b/js/src/i18n/zh/home.js
index 0b5e68c04..a17c06ddc 100644
--- a/js/src/i18n/zh/home.js
+++ b/js/src/i18n/zh/home.js
@@ -16,23 +16,23 @@
 
 export default {
   account: {
-    visited: `accessed {when}`
+    visited: `已访问{when}` // accessed {when}
   },
   accounts: {
-    none: `No recent accounts history available`,
-    title: `Recent Accounts`
+    none: `没有可用的近期账户历史`, // No recent accounts history available
+    title: `近期账户` // Recent Accounts
   },
   dapp: {
-    visited: `accessed {when}`
+    visited: `已访问{when}` // accessed {when}
   },
   dapps: {
-    none: `No recent Applications history available`,
-    title: `Recent Dapps`
+    none: `没有可用的近期应用历史`, // No recent Applications history available
+    title: `近期Dapps` // Recent Dapps
   },
-  title: `Parity Home`,
+  title: `Parity首页`, // Parity Home
   url: {
-    none: `No recent URL history available`,
-    title: `Web Applications`,
-    visited: `visited {when}`
+    none: `没有可用的近期URL历史`, // No recent URL history available
+    title: `网页应用`, // Web Applications
+    visited: `已访问{when}` //  visited {when}
   }
 };
diff --git a/js/src/i18n/zh/loadContract.js b/js/src/i18n/zh/loadContract.js
index d4edb3a81..ab86e5a25 100644
--- a/js/src/i18n/zh/loadContract.js
+++ b/js/src/i18n/zh/loadContract.js
@@ -16,28 +16,28 @@
 
 export default {
   button: {
-    cancel: `Cancel`,
-    load: `Load`,
-    no: `No`,
-    yes: `Yes`
+    cancel: `取消`, // Cancel
+    load: `加载`, // Load
+    no: `否`, // No
+    yes: `是` // Yes
   },
   contract: {
-    savedAt: `Saved {when}`
+    savedAt: `已保存{when}` // Saved {when}
   },
   header: {
-    saved: `Saved Contracts`,
-    snippets: `Contract Snippets`
+    saved: `已保存的合约`, // Saved Contracts
+    snippets: `合约片段` // Contract Snippets
   },
   removal: {
-    confirm: `Are you sure you want to remove the following contract from your saved contracts?`,
-    savedAt: `Saved {when}`
+    confirm: `你确定要将以下合约从已保存的合约中删除吗？`, // Are you sure you want to remove the following contract from your saved contracts?
+    savedAt: `已保存{when}` // Saved {when}
   },
   tab: {
-    local: `Local`,
-    snippets: `Snippets`
+    local: `本地`, // Local
+    snippets: `片段` // Snippets
   },
   title: {
-    remove: `confirm removal`,
-    view: `view contracts`
+    remove: `确认删除`, // confirm removal
+    view: `查看合约` // view contracts
   }
 };
diff --git a/js/src/i18n/zh/parityBar.js b/js/src/i18n/zh/parityBar.js
index 94090a961..fb7c7433c 100644
--- a/js/src/i18n/zh/parityBar.js
+++ b/js/src/i18n/zh/parityBar.js
@@ -16,14 +16,14 @@
 
 export default {
   button: {
-    close: `Close`
+    close: `关闭` // Close
   },
   label: {
-    parity: `Parity`,
-    signer: `Signer`
+    parity: `Parity`, // Parity
+    signer: `Signer` // Singer
   },
   title: {
-    accounts: `Default Account`,
-    signer: `Parity Signer: Pending`
+    accounts: `默认账户`, // Default Account
+    signer: `Parity Signer：待处理` // Parity Signer: Pending
   }
 };
diff --git a/js/src/i18n/zh/passwordChange.js b/js/src/i18n/zh/passwordChange.js
index 714a6e25b..d25ffd5f0 100644
--- a/js/src/i18n/zh/passwordChange.js
+++ b/js/src/i18n/zh/passwordChange.js
@@ -16,39 +16,39 @@
 
 export default {
   button: {
-    cancel: `Cancel`,
-    change: `Change`,
-    test: `Test`,
-    wait: `Wait...`
+    cancel: `取消`, // Cancel
+    change: `更改`, // Change
+    test: `测试`, // Test
+    wait: `请等待...` // Wait...
   },
   currentPassword: {
-    hint: `your current password for this account`,
-    label: `current password`
+    hint: `此账户的原密码`, // your current password for this account
+    label: `原密码` // current password
   },
   newPassword: {
-    hint: `the new password for this account`,
-    label: `new password`
+    hint: `此账户的新密码`, // the new password for this account
+    label: `新密码` // new password
   },
   passwordHint: {
-    display: `Hint {hint}`,
-    hint: `hint for the new password`,
-    label: `(optional) new password hint`
+    display: `提示{hint}`, // Hint {hint}
+    hint: `新密码的提示`, // hint for the new password
+    label: `（可选）新的密码提示` // (optional) new password hint
   },
   repeatPassword: {
-    error: `the supplied passwords do not match`,
-    hint: `repeat the new password for this account`,
-    label: `repeat new password`
+    error: `所提供的密码不正确`, // the supplied passwords do not match
+    hint: `请重复此账户的新密码`, // repeat the new password for this account
+    label: `重复新密码` // repeat new password
   },
-  success: `Your password has been successfully changed`,
+  success: `你的密码已经成功更改`, // Your password has been successfully changed
   tabChange: {
-    label: `Change Password`
+    label: `更改密码` // Change Password
   },
   tabTest: {
-    label: `Test Password`
+    label: `测试密码` // Test Password
   },
   testPassword: {
-    hint: `your account password`,
-    label: `password`
+    hint: `你的账户密码`, // your account password
+    label: `密码` // password
   },
-  title: `Password Manager`
+  title: `密码管理器` // Password Manager
 };
diff --git a/js/src/i18n/zh/saveContract.js b/js/src/i18n/zh/saveContract.js
index 62ce1e33f..b92ecf401 100644
--- a/js/src/i18n/zh/saveContract.js
+++ b/js/src/i18n/zh/saveContract.js
@@ -16,12 +16,12 @@
 
 export default {
   buttons: {
-    cancel: `Cancel`,
-    save: `Save`
+    cancel: `取消`, // Cancel
+    save: `保存` // Save
   },
   name: {
-    hint: `choose a name for this contract`,
-    label: `contract name`
+    hint: `为此合约选择一个名称`, // choose a name for this contract
+    label: `合约名称` // contract name
   },
-  title: `save contract`
+  title: `保存合约` // save contract
 };
diff --git a/js/src/i18n/zh/settings.js b/js/src/i18n/zh/settings.js
index 3e475e087..2df30a0d8 100644
--- a/js/src/i18n/zh/settings.js
+++ b/js/src/i18n/zh/settings.js
@@ -16,86 +16,111 @@
 
 export default {
   background: {
-    button_more: `generate more`,
-    overview_0: `The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new Signer token. This is so that decentralized applications cannot pretend to be trustworthy.`,
-    overview_1: `Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or use a new Signer token.`,
-    label: `background`
+    button_more: `生成更多`, // generate more
+    overview_0: `你现在所看到的背景图案在你的Parity安装中是独一无二的。每次创造一个新的Signer令牌都会改变一次图案。这也保证了去中性化应用不能伪装成可信的样子。`,
+    // The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new 
+    // Signer token. This is so that decentralized applications cannot pretend to be trustworthy.
+    overview_1: `选择一个你喜欢的图案并记住它的样子。这个图案从现在开始会经常出现，除非你清空了浏览器的缓存或者使用了新的Signer令牌。`, 
+    // Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or 
+    // use a new Signer token.
+    label: `背景` // background
   },
   parity: {
     chains: {
-      chain_classic: `Parity syncs to the Ethereum Classic network`,
-      chain_dev: `Parity uses a local development chain`,
-      chain_expanse: `Parity syncs to the Expanse network`,
-      chain_foundation: `Parity syncs to the Ethereum network launched by the Ethereum Foundation`,
-      chain_kovan: `Parity syncs to the Kovan test network`,
-      chain_olympic: `Parity syncs to the Olympic test network`,
-      chain_ropsten: `Parity syncs to the Ropsten test network`,
-      cmorden_kovan: `Parity syncs to Morden (Classic) test network`,
-      hint: `the chain for the Parity node to sync to`,
-      label: `chain/network to sync`
+      chain_classic: `将Parity同步至以太坊经典网络`, // Parity syncs to the Ethereum Classic network
+      chain_dev: `将Parity使用一条本地开发用区块链`, // Parity uses a local development chain
+      chain_expanse: `将Parity同步至Expanse网络`, // Parity syncs to the Expanse network
+      chain_foundation: `将Parity同步至以太坊基金会发起的以太坊网络`, // Parity syncs to the Ethereum network launched by the Ethereum Foundation
+      chain_kovan: `将Parity同步至Kovan测试网络`, // Parity syncs to the Kovan test network
+      chain_olympic: `将Parity同步至Olympic测试网络`, // Parity syncs to the Olympic test network
+      chain_ropsten: `将Parity同步至Ropsten测试网络`, // Parity syncs to the Ropsten test network
+      cmorden_kovan: `将Parity同步至Morden（经典）测试网络`, // Parity syncs to Morden (Classic) test network
+      hint: `Parity节点同步的区块链`, // the chain for the Parity node to sync to
+      label: `将同步的区块链/网络` // chain/network to sync
     },
     languages: {
-      hint: `the language this interface is displayed with`,
-      label: `UI language`
+      hint: `此界面显示的语言`, // the language this interface is displayed with
+      label: `界面语言` // UI language
     },
-    loglevels: `Choose the different logs level.`,
+    loglevels: `选择一个不同的logs层次`, // Choose the different logs level.
     modes: {
-      hint: `the syncing mode for the Parity node`,
-      label: `mode of operation`,
-      mode_active: `Parity continuously syncs the chain`,
-      mode_dark: `Parity syncs only when the RPC is active`,
-      mode_offline: `Parity doesn't sync`,
-      mode_passive: `Parity syncs initially, then sleeps and wakes regularly to resync`
+      hint: `Parity节点的同步模式`, // the syncing mode for the Parity node
+      label: `运行模式`, // mode of operation
+      mode_active: `Parity持续地同步区块链`, // Parity continuously syncs the chain
+      mode_dark: `Parity只有在RPC激活时才同步`, // Parity syncs only when the RPC is active
+      mode_offline: `Parity不同步`, // Parity doesn't sync
+      mode_passive: `Parity初始同步，然后进入休眠并有规律地再同步` // Parity syncs initially, then sleeps and wakes regularly to resync
     },
-    overview_0: `Control the Parity node settings and nature of syncing via this interface.`,
-    label: `parity`
+    overview_0: `通过此界面控制Parity节点设置和同步设置`, // Control the Parity node settings and nature of syncing via this interface.
+    label: `parity` // parity
   },
   proxy: {
-    details_0: `Instead of accessing Parity via the IP address and port, you will be able to access it via the .parity subdomain, by visiting {homeProxy}. To setup subdomain-based routing, you need to add the relevant proxy entries to your browser,`,
-    details_1: `To learn how to configure the proxy, instructions are provided for {windowsLink}, {macOSLink} or {ubuntuLink}.`,
-    details_macos: `macOS`,
-    details_ubuntu: `Ubuntu`,
-    details_windows: `Windows`,
-    overview_0: `The proxy setup allows you to access Parity and all associated decentralized applications via memorable addresses.`,
-    label: `proxy`
+    details_0: `除了通过IP地址和端口来访问Parity，你也能通过.parity子域名来使用Parity，访问 {homeProxy}。为了设置基于子域名的路由，你需要添加相关的代理记录至你的浏览器。`,
+    // Instead of accessing Parity via the IP address and port, you will be able to access it via the .parity subdomain, by visiting 
+    // {homeProxy}. To setup subdomain-based routing, you need to add the relevant proxy entries to your browser,
+    details_1: `如果想了解如何配置代理，教程已提供在{windowsLink}，{macOSLink}和{ubuntuLink}。`, 
+    // To learn how to configure the proxy, instructions are provided for {windowsLink}, {macOSLink} or {ubuntuLink}.
+    details_macos: `macOS`, // macOS
+    details_ubuntu: `Ubuntu`, // Ubuntu
+    details_windows: `Windows`, // Windows
+    overview_0: `代理设置使你可以通过一个可记忆的地址来访问Parity和所有相关的去中性化应用。`,
+    // The proxy setup allows you to access Parity and all associated decentralized applications via memorable addresses.
+    label: `代理` // proxy
   },
   views: {
     accounts: {
-      description: `A list of all the accounts associated with and imported into this Parity instance. Send transactions, receive incoming values, manage your balances and fund your accounts.`,
-      label: `Accounts`
+      description: `一个此Parity实例所关联和导入的所有账户的列表。发送交易、接收流入价值、管理你的账目和资助你的账户。`,
+      // A list of all the accounts associated with and imported into this Parity instance. Send transactions, receive incoming values, 
+      // manage your balances and fund your accounts.
+      label: `账户` // Accounts
     },
     addresses: {
-      description: `A list of all contacts and address book entries managed by this Parity instance. Watch accounts and have the details available at the click of a button when transacting.`,
-      label: `Addressbook`
+      description: `一个此Parity实例管理的所有联系人和地址簿记录的列表。只需点击一个按钮就可以观察账户并获得所有交易相关的信息。`,
+      // A list of all contacts and address book entries managed by this Parity instance. Watch accounts and have the details available 
+      // at the click of a button when transacting.
+      label: `地址簿` // Addressbook
     },
     apps: {
-      description: `Distributed applications that interact with the underlying network. Add applications, manage you application portfolio and interact with application from around the network.`,
-      label: `Applications`
+      description: `与整个底层网络交流的分布式应用。添加应用，管理你的应用库和与网络上的其他应用进行交互。`,
+      // Distributed applications that interact with the underlying network. Add applications, manage you application portfolio and 
+      // interact with application from around the network.
+      label: `应用` // Applications
     },
     contracts: {
-      description: `Watch and interact with specific contracts that have been deployed on the network. This is a more technically-focused environment, specifically for advanced users that understand the inner working of certain contracts.`,
-      label: `Contracts`
+      description: `观察和交互已经被部署在网络上的特定合约。这是一个更注重技术的环境，特别为可以理解合约内部运行机制的高级用户所设立。`,
+      // Watch and interact with specific contracts that have been deployed on the network. This is a more technically-focused environment,
+      // specifically for advanced users that understand the inner working of certain contracts.
+      label: `合约` // Contracts
     },
-    overview_0: `Manage the available application views using only the parts of the application applicable to you.`,
-    overview_1: `Are you an end-user? The defaults are setup for both beginner and advanced users alike.`,
-    overview_2: `Are you a developer? Add some features to manage contracts and interact with application deployments.`,
-    overview_3: `Are you a miner or run a large-scale node? Add the features to give you all the information needed to watch the node operation.`,
+    overview_0: `仅可视部分对你可用的应用来管理应用界面`,
+    // Manage the available application views using only the parts of the application applicable to you.
+    overview_1: `你是终端用户？默认设置为初学者和高级用户进行了相同的设置。`,
+    // Are you an end-user? The defaults are setup for both beginner and advanced users alike.
+    overview_2: `你是开发者？添加一些功能来管理合约和与应用部署交互。`,
+    // Are you a developer? Add some features to manage contracts and interact with application deployments.
+    overview_3: `你是矿工或者运营一个大型节点？添加一些功能来让你获得更多有关节点运行的信息。`,
+    // Are you a miner or run a large-scale node? Add the features to give you all the information needed to watch the node operation.
     settings: {
-      description: `This view. Allows you to customize the application in term of options, operation and look and feel.`,
-      label: `Settings`
+      description: `此界面。允许你自定义应用的选项、运行、可视化和感官。`,
+      // This view. Allows you to customize the application in term of options, operation and look and feel.
+      label: `设置` // Settings
     },
     signer: {
-      description: `The secure transaction management area of the application where you can approve any outgoing transactions made from the application as well as those placed into the queue by distributed applications.`,
-      label: `Signer`
+      description: `这个应用安全交易管理区域，你可以通过任何从本应用和其他分布式应用发起的即将发送的交易`, 
+      // The secure transaction management area of the application where you can approve any outgoing transactions made 
+      // from the application as well as those placed into the queue by distributed applications.
+      label: `Signer` // Signer
     },
     status: {
-      description: `See how the Parity node is performing in terms of connections to the network, logs from the actual running instance and details of mining (if enabled and configured).`,
-      label: `Status`
+      description: `观察Parity节点现在的运行情况：网络连接数、实际运行实例的Logs和具体挖矿信息（如果已开启并设置）`,
+      // See how the Parity node is performing in terms of connections to the network, logs from the actual running instance 
+      // and details of mining (if enabled and configured).
+      label: `状态` // Status
     },
-    label: `views`,
+    label: `视窗`, // views
     home: {
-      label: `Home`
+      label: `首页` // Home
     }
   },
-  label: `settings`
+  label: `设置` // settings
 };
diff --git a/js/src/i18n/zh/shapeshift.js b/js/src/i18n/zh/shapeshift.js
index 247927834..25145c3e3 100644
--- a/js/src/i18n/zh/shapeshift.js
+++ b/js/src/i18n/zh/shapeshift.js
@@ -16,51 +16,61 @@
 
 export default {
   awaitingDepositStep: {
-    awaitingConfirmation: `Awaiting confirmation of the deposit address for your {typeSymbol} funds exchange`,
-    awaitingDeposit: `{shapeshiftLink} is awaiting a {typeSymbol} deposit. Send the funds from your {typeSymbol} network client to -`,
-    minimumMaximum: `{minimum} minimum, {maximum} maximum`
+    awaitingConfirmation: `正在等待你的{typeSymbol}资金交易的存款地址的确认信息`,
+    // Awaiting confirmation of the deposit address for your {typeSymbol} funds exchange
+    awaitingDeposit: `{shapeshiftLink}正在等待{typeSymbol}的存入.从你的{typeSymbol}网络客户端发送资金至-`,
+    // {shapeshiftLink} is awaiting a {typeSymbol} deposit. Send the funds from your {typeSymbol} network client to -
+    minimumMaximum: `{minimum}至少, {maximum}至多` // {minimum} minimum, {maximum} maximum
   },
   awaitingExchangeStep: {
-    awaitingCompletion: `Awaiting the completion of the funds exchange and transfer of funds to your Parity account.`,
-    receivedInfo: `{shapeshiftLink} has received a deposit of -`
+    awaitingCompletion: `正在完成资金交易并发送资金至你的Parity账户`,
+    // Awaiting the completion of the funds exchange and transfer of funds to your Parity account.
+    receivedInfo: `{shapeshiftLink}已经收到存款-`
+    // {shapeshiftLink} has received a deposit of -
   },
   button: {
-    cancel: `Cancel`,
-    done: `Close`,
-    shift: `Shift Funds`
+    cancel: `取消`, // Cancel
+    done: `关闭`, // Close
+    shift: `转换资金` // Shift Funds
   },
   completedStep: {
-    completed: `{shapeshiftLink} has completed the funds exchange.`,
-    parityFunds: `The change in funds will be reflected in your Parity account shortly.`
+    completed: `{shapeshiftLink}已经完成了资金交易。`, // {shapeshiftLink} has completed the funds exchange.
+    parityFunds: `资金的改变会马上在你的Parity账户里体现。`
+    // The change in funds will be reflected in your Parity account shortly.
   },
   errorStep: {
-    info: `The funds shifting via {shapeshiftLink} failed with a fatal error on the exchange. The error message received from the exchange is as follow:`
+    info: `通过{shapeshiftLink}进行的资金转换因为一个交易的致命错误失败了。交易提供的错误信息如下：`
+    // The funds shifting via {shapeshiftLink} failed with a fatal error on the exchange. The error message received from the exchange 
+    // is as follow:
   },
   optionsStep: {
-    noPairs: `There are currently no exchange pairs/coins available to fund with.`,
+    noPairs: `目前没有可匹配的交易/货币可用来进行转换`,
+    // There are currently no exchange pairs/coins available to fund with.
     returnAddr: {
-      hint: `the return address for send failures`,
-      label: `(optional) {coinSymbol} return address`
+      hint: `转换错误后的发回地址`, // the return address for send failures
+      label: `（可选）{coinSymbol}发回地址` // (optional) {coinSymbol} return address
     },
     terms: {
-      label: `I understand that ShapeShift.io is a 3rd-party service and by using the service any transfer of information and/or funds is completely out of the control of Parity`
+      label: `我理解ShapeShift.io是一个第三方服务，使用此服务发生的任何信息/资金发送是完全不受Parity控制的`
+      // I understand that ShapeShift.io is a 3rd-party service and by using the service any transfer of information and/or funds is 
+      // completely out of the control of Parity
     },
     typeSelect: {
-      hint: `the type of crypto conversion to do`,
-      label: `fund account from`
+      hint: `数字货币转换的种类`, // the type of crypto conversion to do
+      label: `来自资金账户` // fund account from
     }
   },
   price: {
-    minMax: `({minimum} minimum, {maximum} maximum)`
+    minMax: `({minimum}至小, {maximum}至大)` // ({minimum} minimum, {maximum} maximum)
   },
   title: {
-    completed: `completed`,
-    deposit: `awaiting deposit`,
-    details: `details`,
-    error: `exchange failed`,
-    exchange: `awaiting exchange`
+    completed: `完成`, // completed
+    deposit: `等待存款`, // awaiting deposit
+    details: `详情`, // details
+    error: `交易失败`, // exchange failed
+    exchange: `等待交易` // awaiting exchange
   },
   warning: {
-    noPrice: `No price match was found for the selected type`
+    noPrice: `所选择的类型没有匹配的价格` // No price match was found for the selected type
   }
 };
diff --git a/js/src/i18n/zh/signer.js b/js/src/i18n/zh/signer.js
index 3f8615c52..4c9afb424 100644
--- a/js/src/i18n/zh/signer.js
+++ b/js/src/i18n/zh/signer.js
@@ -16,88 +16,92 @@
 
 export default {
   embedded: {
-    noPending: `There are currently no pending requests awaiting your confirmation`
+    noPending: `目前没有待处理的确认等待你的处理`
+    // There are currently no pending requests awaiting your confirmation
   },
   mainDetails: {
-    editTx: `Edit conditions/gas/gasPrice`,
+    editTx: `编辑条款/gas/gasPrice`, // Edit conditions/gas/gasPrice
     tooltips: {
-      total1: `The value of the transaction including the mining fee is {total} {type}.`,
-      total2: `(This includes a mining fee of {fee} {token})`,
-      value1: `The value of the transaction.`
+      total1: `包括交易费的交易的总价值是{total} {type}`,
+      // The value of the transaction including the mining fee is {total} {type}.
+      total2: `(包括了交易费 {fee} {token})`,
+      // (This includes a mining fee of {fee} {token})
+      value1: `交易价值` // The value of the transaction.
     }
   },
   requestOrigin: {
-    dapp: `by a dapp at {url}`,
-    ipc: `via IPC session`,
-    rpc: `via RPC {rpc}`,
-    signerCurrent: `via current tab`,
-    signerUI: `via UI session`,
-    unknownInterface: `via unknown interface`,
-    unknownRpc: `unidentified`,
-    unknownUrl: `unknown URL`
+    dapp: `来自dapp {url}`, // by a dapp at {url}
+    ipc: `通过IPC会话`, // via IPC session
+    rpc: `通过RPC{rpc}`, // via RPC {rpc}
+    signerCurrent: `通过当前标签页`, // via current tab
+    signerUI: `通过交互会话`, // via UI session
+    unknownInterface: `通过未知交互`, // via unknown interface
+    unknownRpc: `未明确的`, // unidentified
+    unknownUrl: `未知URL` // unknown URL
   },
   requestsPage: {
-    noPending: `There are no requests requiring your confirmation.`,
-    pendingTitle: `Pending Requests`,
-    queueTitle: `Local Transactions`
+    noPending: `没有请求需要你的确认`, // There are no requests requiring your confirmation.
+    pendingTitle: `待处理请求`, //Pending Requests
+    queueTitle: `本地交易` // Local Transactions
   },
   sending: {
     hardware: {
-      confirm: `Please confirm the transaction on your attached hardware device`,
-      connect: `Please attach your hardware device before confirming the transaction`
+      confirm: `请在你连接的硬件设备上确认交易`, // Please confirm the transaction on your attached hardware device
+      connect: `请在确认交易前连接你的硬件设备` // Please attach your hardware device before confirming the transaction
     }
   },
   signRequest: {
-    request: `A request to sign data using your account:`,
+    request: `一个签名数据在请求你的账号：`, // A request to sign data using your account:
     state: {
-      confirmed: `Confirmed`,
-      rejected: `Rejected`
+      confirmed: `通过`, // Confirmed
+      rejected: `拒绝` // Rejected
     },
-    unknownBinary: `(Unknown binary data)`,
-    warning: `WARNING: This consequences of doing this may be grave. Confirm the request only if you are sure.`
+    unknownBinary: `（未知二进制数据）`, // (Unknown binary data)
+    warning: `警告：此操作的结果是不可逆的。请在确认信息后再通过请求。`
+    // WARNING: This consequences of doing this may be grave. Confirm the request only if you are sure.
   },
-  title: `Trusted Signer`,
+  title: `可信的Signer`, // Trusted Signer
   txPending: {
     buttons: {
-      viewToggle: `view transaction`
+      viewToggle: `查看交易` // view transaction
     }
   },
   txPendingConfirm: {
     buttons: {
-      confirmBusy: `Confirming...`,
-      confirmRequest: `Confirm Request`
+      confirmBusy: `通过中...`, // Confirming...
+      confirmRequest: `通过请求` // Confirm Request
     },
     errors: {
-      invalidWallet: `Given wallet file is invalid.`
+      invalidWallet: `所提供的钱包文件不可用` // Given wallet file is invalid.
     },
     password: {
       decrypt: {
-        hint: `decrypt the key`,
-        label: `Key Password`
+        hint: `解密钥匙`, // decrypt the key
+        label: `钥匙密码` // Key Password
       },
       unlock: {
-        hint: `unlock the account`,
-        label: `Account Password`
+        hint: `解锁账户`, // unlock the account
+        label: `账户密码` // Account Password
       }
     },
-    passwordHint: `(hint) {passwordHint}`,
+    passwordHint: `（提示）{passwordHint}`, // (hint) {passwordHint}
     selectKey: {
-      hint: `The keyfile to use for this account`,
-      label: `Select Local Key`
+      hint: `此账户的钥匙文件`, // The keyfile to use for this account
+      label: `选择本地钥匙` // Select Local Key
     },
     tooltips: {
-      password: `Please provide a password for this account`
+      password: `请为此账户提供密码` // Please provide a password for this account
     }
   },
   txPendingForm: {
-    changedMind: `I've changed my mind`,
-    reject: `reject request`
+    changedMind: `我改主意了`, // I've changed my mind
+    reject: `拒绝请求` // reject request
   },
   txPendingReject: {
     buttons: {
-      reject: `Reject Request`
+      reject: `拒绝请求` // Reject Request
     },
-    info: `Are you sure you want to reject request?`,
-    undone: `This cannot be undone`
+    info: `你确定要拒绝请求吗？`, // Are you sure you want to reject request?
+    undone: `此操作是不可逆的`  // This cannot be undone
   }
 };
diff --git a/js/src/i18n/zh/status.js b/js/src/i18n/zh/status.js
index 536c0ff90..395a2a190 100644
--- a/js/src/i18n/zh/status.js
+++ b/js/src/i18n/zh/status.js
@@ -16,51 +16,52 @@
 
 export default {
   debug: {
-    reverse: `Reverse Order`,
-    stopped: `Refresh and display of logs from Parity is currently stopped via the UI, start it to see the latest updates.`,
-    title: `Node Logs`
+    reverse: `翻转订单`, // Reverse Order
+    stopped: `Parity的交互目前停止了刷新和显示Logs，请启动它来查看最新的更新。`,
+    // Refresh and display of logs from Parity is currently stopped via the UI, start it to see the latest updates.
+    title: `节点Logs` // Node Logs
   },
   miningSettings: {
     input: {
       author: {
-        hint: `the mining author`,
-        label: `author`
+        hint: `矿工名字`, // the mining author
+        label: `矿工` // author
       },
       extradata: {
-        hint: `extra data for mined blocks`,
-        label: `extradata`
+        hint: `提取挖到区块的数据`, // extra data for mined blocks
+        label: `提取数据` // extradata
       },
       gasFloor: {
-        hint: `the gas floor target for mining`,
-        label: `gas floor target`
+        hint: `挖矿的gas下限目标`, // the gas floor target for mining
+        label: `gas下限目标` // gas floor target
       },
       gasPrice: {
-        hint: `the minimum gas price for mining`,
-        label: `minimal gas price`
+        hint: `挖矿的最低gas价格`, // the minimum gas price for mining
+        label: `最低gas价格` // minimal gas price
       }
     },
-    title: `mining settings`
+    title: `挖矿设置` // mining settings
   },
   status: {
-    hashrate: `{hashrate} H/s`,
+    hashrate: `{hashrate} H/s`, // {hashrate} H/s
     input: {
-      chain: `chain`,
-      enode: `enode`,
-      no: `no`,
-      peers: `peers`,
-      port: `network port`,
-      rpcEnabled: `rpc enabled`,
-      rpcInterface: `rpc interface`,
-      rpcPort: `rpc port`,
-      yes: `yes`
+      chain: `链`, // chain
+      enode: `enode`, // enode
+      no: `否`, // no
+      peers: `同步节点`, // peers
+      port: `网络端口`, // network port
+      rpcEnabled: `rpc开启`, // rpc enabled
+      rpcInterface: `rpc交互`, // rpc interface
+      rpcPort: `rpc端口`, // rpc port
+      yes: `是` // yes
     },
     title: {
-      bestBlock: `best block`,
-      hashRate: `hash rate`,
-      network: `network settings`,
-      node: `Node`,
-      peers: `peers`
+      bestBlock: `最新区块`, // best block
+      hashRate: `哈希率`, // hash rate
+      network: `网络设置`, // network settings
+      node: `节点`, // Node
+      peers: `同步节点` // peers
     }
   },
-  title: `Status`
+  title: `状态` // Status
 };
diff --git a/js/src/i18n/zh/tabBar.js b/js/src/i18n/zh/tabBar.js
index 1692a1997..9351cd769 100644
--- a/js/src/i18n/zh/tabBar.js
+++ b/js/src/i18n/zh/tabBar.js
@@ -16,6 +16,7 @@
 
 export default {
   tooltip: {
-    overview: `navigate between the different parts and views of the application, switching between an account view, token view and distributed application view`
+    overview: `在应用的不同部分和不同界面进行导航，在账户界面、代币界面和分布式应用界面之间切换。`
+    //navigate between the different parts and views of the application, switching between an account view, token view and distributed application view
   }
 };
diff --git a/js/src/i18n/zh/transfer.js b/js/src/i18n/zh/transfer.js
index 3207f5b06..b83becca8 100644
--- a/js/src/i18n/zh/transfer.js
+++ b/js/src/i18n/zh/transfer.js
@@ -17,45 +17,46 @@
 export default {
   advanced: {
     data: {
-      hint: `the data to pass through with the transaction`,
-      label: `transaction data`
+      hint: `交易附带数据`,//the data to pass through with the transaction
+      label: `交易数据`//transaction data
     }
   },
   buttons: {
-    back: `Back`,
-    cancel: `Cancel`,
-    close: `Close`,
-    next: `Next`,
-    send: `Send`
+    back: `返回`,//Back
+    cancel: `取消`,//Cancel
+    close: `关闭`,//Close
+    next: `下一步`,//Next
+    send: `发送`//Send
   },
   details: {
     advanced: {
-      label: `advanced sending options`
+      label: `高级发送选项`//advanced sending options
     },
     amount: {
-      hint: `the amount to transfer to the recipient`,
-      label: `amount to transfer (in {tag})`
+      hint: `发送数额`,//the amount to transfer to the recipient
+      label: `发送数额{tag}`//amount to transfer (in {tag})
     },
     fullBalance: {
-      label: `full account balance`
+      label: `所有的余额`//full account balance
     },
     recipient: {
-      hint: `the recipient address`,
-      label: `recipient address`
+      hint: `收款人地址`,//the recipient address
+      label: `收款人地址`//recipient address
     },
     sender: {
-      hint: `the sender address`,
-      label: `sender address`
+      hint: `发送人地址`,//the sender address
+      label: `发送人地址`//sender address
     },
     total: {
-      label: `total transaction amount`
+      label: `发送数额`//total transaction amount
     }
   },
   wallet: {
-    confirmation: `This transaction needs confirmation from other owners.`,
-    operationHash: `operation hash`
+    confirmation: `这笔交易需要其他人的确认。`,//This transaction needs confirmation from other owners.
+    operationHash: `操作哈希`//operation hash
   },
   warning: {
-    wallet_spent_limit: `This transaction value is above the remaining daily limit. It will need to be confirmed by other owners.`
+    wallet_spent_limit: `这笔转账的数额超过了每日转账数额上限。此交易需要其他人的确认才可以发送成功。`
+    //This transaction value is above the remaining daily limit. It will need to be confirmed by other owners.
   }
 };
diff --git a/js/src/i18n/zh/txEditor.js b/js/src/i18n/zh/txEditor.js
index 7dab159a8..762d214f2 100644
--- a/js/src/i18n/zh/txEditor.js
+++ b/js/src/i18n/zh/txEditor.js
@@ -17,23 +17,24 @@
 export default {
   condition: {
     block: {
-      hint: `The minimum block to send from`,
-      label: `Transaction send block`
+      hint: `在某个区块高度后发送`,//The minimum block to send from
+      label: `交易发送区块`//Transaction send block
     },
-    blocknumber: `Send after BlockNumber`,
+    blocknumber: `在某个区块后发送`,//Send after BlockNumber
     date: {
-      hint: `The minimum date to send from`,
-      label: `Transaction send date`
+      hint: `在某日后发送`,//The minimum date to send from
+      label: `交易发送日期`//Transaction send date
     },
-    datetime: `Send after Date & Time`,
-    label: `Condition where transaction activates`,
-    none: `No conditions`,
+    datetime: `在某日某时后发送`,//Send after Date & Tim
+    label: `交易激活的条件`,//Condition where transaction activates
+    none: `无条件`,//No conditions
     time: {
-      hint: `The minimum time to send from`,
-      label: `Transaction send time`
+      hint: `在某时间后发送`,//The minimum time to send from
+      label: `交易发送时间`//Transaction send time
     }
   },
   gas: {
-    info: `You can choose the gas price based on the distribution of recent included transaction gas prices. The lower the gas price is, the cheaper the transaction will be. The higher the gas price is, the faster it should get mined by the network.`
+    info: `你可以基于最近的交易gas价格的分布选择gas价格。 gas价格越低，交易费用越便宜。 gas 价格越高，交易被网络打包的速度越快。`
+    //You can choose the gas price based on the distribution of recent included transaction gas prices.The lower the gas price is, the cheaper the transaction will be.The higher the gas price is, the faster it should get mined by the network.
   }
 };
diff --git a/js/src/i18n/zh/ui.js b/js/src/i18n/zh/ui.js
index d84e7bd13..89b91369d 100644
--- a/js/src/i18n/zh/ui.js
+++ b/js/src/i18n/zh/ui.js
@@ -18,56 +18,56 @@ export default {
   actionbar: {
     export: {
       button: {
-        export: `export`
+        export: `导出`//export
       }
     },
     import: {
       button: {
-        cancel: `Cancel`,
-        confirm: `Confirm`,
-        import: `import`
+        cancel: `取消`,//Cancel
+        confirm: `确认`,//Confirm
+        import: `导入`//import
       },
-      confirm: `Confirm that this is what was intended to import.`,
-      error: `An error occured: {errorText}`,
+      confirm: `确认这是你想导入的`,//Confirm that this is what was intended to import.
+      error: `发生错误：{errorText}`,//An error occured: {errorText}
       step: {
-        error: `error`,
-        select: `select a file`,
-        validate: `validate`
+        error: `错误`,//error
+        select: `选择一个文件`,//select a file
+        validate: `确认`//validate
       },
-      title: `Import from a file`
+      title: `从一个文件导入`//Import from a file
     },
     search: {
-      hint: `Enter search input...`
+      hint: `输入搜索内容……`//Enter search input...
     },
     sort: {
-      sortBy: `Sort by {label}`,
-      typeDefault: `Default`,
-      typeEth: `Sort by ETH`,
-      typeName: `Sort by name`,
-      typeTags: `Sort by tags`
+      sortBy: `根据{label}排序`,//Sort by {label}
+      typeDefault: `默认`,//Default
+      typeEth: `根据以太币数额排序`,//Sort by ETH
+      typeName: `根据账户名字排序`,//Sort by name
+      typeTags: `根据标签排序`//Sort by tags
     }
   },
   balance: {
-    none: `No balances associated with this account`
+    none: `这个账户没有余额`//No balances associated with this account
   },
   blockStatus: {
-    bestBlock: `{blockNumber} best block`,
-    syncStatus: `{currentBlock}/{highestBlock} syncing`,
-    warpRestore: `{percentage}% warp restore`,
-    warpStatus: `, {percentage}% historic`
+    bestBlock: `最新区块{blockNumber}`,//{blockNumber} best block
+    syncStatus: `currentBlock}/{highestBlock}区块同步`,//{currentBlock}/{highestBlock} syncing{
+    warpRestore: `{percentage}%恢复`,//{percentage}% warp restore
+    warpStatus: `, {percentage}%历史`//{percentage}% historic
   },
   confirmDialog: {
-    no: `no`,
-    yes: `yes`
+    no: `不是`,//no
+    yes: `是`//yes
   },
   copyToClipboard: {
-    copied: `copied {data} to clipboard`
+    copied: `复制{data}到粘贴板`//copied {data} to clipboard
   },
   errors: {
-    close: `close`
+    close: `关闭`//close
   },
   fileSelect: {
-    defaultLabel: `Drop a file here, or click to select a file to upload`
+    defaultLabel: `拉一个文件到这里，或者选择一个文件上传`//Drop a file here, or click to select a file to upload
   },
   gasPriceSelector: {
     customTooltip: {
@@ -75,8 +75,8 @@ export default {
     }
   },
   identityName: {
-    null: `NULL`,
-    unnamed: `UNNAMED`
+    null: `空`,//NULL
+    unnamed: `未命名`//UNNAMED
   },
   methodDecoding: {
     condition: {
@@ -84,20 +84,20 @@ export default {
       time: `, {historic, select, true {Submitted} false {Submission}} at {timestamp}`
     },
     deploy: {
-      address: `Deployed a contract at address`,
-      params: `with the following parameters:`,
-      willDeploy: `Will deploy a contract`,
-      withValue: `, sending {value}`
+      address: `在地址上部署一个合约`,//Deployed a contract at address
+      params: `附带下面的参数：`,//with the following parameters:
+      willDeploy: `将要部署一个合约`,//Will deploy a contract
+      withValue: `, 发送{value}`//sending {value}
     },
-    gasUsed: `({gas} gas used)`,
+    gasUsed: `({gas}gas消耗)`,//{gas} gas used
     gasValues: `{gas} gas ({gasPrice}M/{tag})`,
     input: {
-      data: `data`,
-      input: `input`,
+      data: `数据`,//data
+      input: `输入`,//input
       withInput: `with the {inputDesc} {inputValue}`
     },
     receive: {
-      contract: `the contract`,
+      contract: `合约`,//the contract
       info: `{historic, select, true {Received} false {Will receive}} {valueEth} from {aContract}{address}`
     },
     signature: {
@@ -116,48 +116,48 @@ export default {
     }
   },
   passwordStrength: {
-    label: `password strength`
+    label: `密码强度`//password strength
   },
   tooltips: {
     button: {
-      done: `Done`,
-      next: `Next`,
-      skip: `Skip`
+      done: `完成`,//Done
+      next: `下一步`,//Next
+      skip: `跳过`//Skip
     }
   },
   txHash: {
     confirmations: `{count} {value, plural, one {confirmation} other {confirmations}}`,
-    oog: `The transaction might have gone out of gas. Try again with more gas.`,
-    posted: `The transaction has been posted to the network with a hash of {hashLink}`,
-    waiting: `waiting for confirmations`
+    oog: `这笔交易已经耗光了gas。请用更多的gas尝试。`,//The transaction might have gone out of gas. Try again with more gas.
+    posted: `这笔交易已经被发送到网络，附带哈希是{hashLink}`,//The transaction has been posted to the network with a hash of {hashLink}
+    waiting: `等待确认`//waiting for confirmations
   },
   vaultSelect: {
-    hint: `the vault this account is attached to`,
-    label: `associated vault`
+    hint: `这个账户绑定的保险库是`,//the vault this account is attached to
+    label: `相关保险库`//associated vault
   },
   verification: {
     gatherData: {
       accountHasRequested: {
-        false: `You did not request verification from this account yet.`,
-        pending: `Checking if you requested verification…`,
-        true: `You already requested verification from this account.`
+        false: `.你还没有从这个账户请求确认。`,//You did not request verification from this account yet
+        pending: `检查一下你是否请求了验证……`,//Checking if you requested verification…
+        true: `你已经从这个账户请求到验证。`//You already requested verification from this account.
       },
       accountIsVerified: {
-        false: `Your account is not verified yet.`,
-        pending: `Checking if your account is verified…`,
-        true: `Your account is already verified.`
+        false: `你的账户还没有被验证。`,//Your account is not verified yet.
+        pending: `检查一下你的账户是否已经被验证……`,//Checking if your account is verified…
+        true: `你的账户已经被验证。`//Your account is already verified.
       },
-      fee: `The additional fee is {amount} ETH.`,
+      fee: `额外的费用是{amount}ETH`,//The additional fee is {amount} ETH.
       isAbleToRequest: {
-        pending: `Validating your input…`
+        pending: `验证你的输入……`//Validating your input…
       },
       isServerRunning: {
-        false: `The verification server is not running.`,
-        pending: `Checking if the verification server is running…`,
-        true: `The verification server is running.`
+        false: `验证服务器没有在运行。`,//The verification server is not running.
+        pending: `检查一下验证服务器是否在运行……`,//Checking if the verification server is running…
+        true: `验证服务器正在运行。`//The verification server is running.
       },
-      nofee: `There is no additional fee.`,
-      termsOfService: `I agree to the terms and conditions below.`
+      nofee: `没有额外的费用。`,//There is no additional fee.
+      termsOfService: `我同意下面的条款和条件。`//I agree to the terms and conditions below.
     }
   }
 };
diff --git a/js/src/i18n/zh/upgradeParity.js b/js/src/i18n/zh/upgradeParity.js
index b3d871452..531a21c2b 100644
--- a/js/src/i18n/zh/upgradeParity.js
+++ b/js/src/i18n/zh/upgradeParity.js
@@ -15,33 +15,41 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 export default {
-  busy: `Your upgrade to Parity {newversion} is currently in progress. Please wait until the process completes.`,
+  busy: `你正在升级到Parity最新版本{newversion}。请等待升级过程完成。`,
+  //Your upgrade to Parity {newversion} is currently in progress. Please wait until the process completes.
   button: {
-    close: `close`,
-    done: `done`,
-    upgrade: `upgrade now`
+    close: `关闭`,//close
+    done: `完成`,//done
+    upgrade: `现在升级`//upgrade now
   },
-  completed: `Your upgrade to Parity {newversion} has been successfully completed. Click "done" to automatically reload the application.`,
+  completed: `你升级到Parity最新版本{newversion}的操作已经完成。点击“完成”将自动重新加载这个应用。`,
+  //Your upgrade to Parity {newversion} has been successfully completed. Click "done" to automatically reload the application.
   consensus: {
-    capable: `Your current Parity version is capable of handling the network requirements.`,
-    capableUntil: `Your current Parity version is capable of handling the network requirements until block {blockNumber}`,
-    incapableSince: `Your current Parity version is incapable of handling the network requirements since block {blockNumber}`,
-    unknown: `Your current Parity version is capable of handling the network requirements.`
+    capable: `你当前的Parity版本能够处理网络请求。`,
+    //Your current Parity version is capable of handling the network requirements.
+    capableUntil: `你当前的Parity版本能够处理直到第{blockNumber}个区块的网络请求。`,
+    //Your current Parity version is capable of handling the network requirements until block {blockNumber}
+    incapableSince: `你当前的Parity版本能够处理第{blockNumber}个区块以后的网络请求。`,
+    //Your current Parity version is incapable of handling the network requirements since block {blockNumber}
+    unknown: `你当前的Parity版本能够处理网络请求。`
+    //Your current Parity version is capable of handling the network requirements.
   },
-  failed: `Your upgrade to Parity {newversion} has failed with an error.`,
+  failed: `升级到Parity最新版本{newversion}遇到错误，升级失败。`,
+  //Your upgrade to Parity {newversion} has failed with an error.
   info: {
-    currentVersion: `You are currently running {currentversion}`,
-    next: `Proceed with "upgrade now" to start your Parity upgrade.`,
-    upgrade: `An upgrade to version {newversion} is available`,
-    welcome: `Welcome to the Parity upgrade wizard, allowing you a completely seamless upgrade experience to the next version of Parity.`
+    currentVersion: `你现在正在运行{currentversion}版本。`,//You are currently running {currentversion}
+    next: `点击“现在升级”，开始Parity升级。`,//Proceed with "upgrade now" to start your Parity upgrade.
+    upgrade: `可以升级到最新版本{newversion}`,//An upgrade to version {newversion} is available
+    welcome: `迎来到Parity升级指南，让你享受无缝升级到Parity最新版本的体验。`
+    //Welcome to the Parity upgrade wizard, allowing you a completely seamless upgrade experience to the next version of Parity.欢
   },
   step: {
-    completed: `upgrade completed`,
-    error: `error`,
-    info: `upgrade available`,
-    updating: `upgrading parity`
+    completed: `升级完成`,//upgrade completed
+    error: `错误`,//error
+    info: `可以升级`,//upgrade available
+    updating: `升级Parity`//upgrading parity
   },
   version: {
-    unknown: `unknown`
+    unknown: `未知`//unknown
   }
 };
diff --git a/js/src/i18n/zh/vaults.js b/js/src/i18n/zh/vaults.js
index 04ff4d558..43e9ea94c 100644
--- a/js/src/i18n/zh/vaults.js
+++ b/js/src/i18n/zh/vaults.js
@@ -17,92 +17,98 @@
 export default {
   accounts: {
     button: {
-      cancel: `Cancel`,
-      execute: `Set`
+      cancel: `取消`, // Cancel
+      execute: `设定` // Set
     },
-    empty: `There are no accounts in this vault`,
-    title: `Manage Vault Accounts`
+    empty: `此保险库中没有账户`, // There are no accounts in this vault
+    title: `管理保险库账户` // Manage Vault Accounts
   },
   button: {
-    accounts: `accounts`,
-    add: `create vault`,
-    close: `close`,
-    edit: `edit`,
-    open: `open`
+    accounts: `账户`, // accounts
+    add: `创建保险库`, // create vault
+    close: `关闭`, // close
+    edit: `编辑`, // edit
+    open: `打开` // open
   },
   confirmClose: {
-    info: `You are about to close a vault. Any accounts associated with the vault won't be visible after this operation concludes. To view the associated accounts, open the vault again.`,
-    title: `Close Vault`
+    info: `你即将关闭一个保险库。所有与这个保险库相关的账户在这个操作完成后都不再可见。如果想再见到关联账户，请重新打开保险库。`,
+    // You are about to close a vault. Any accounts associated with the vault won't be visible after this operation concludes. To view 
+    // the associated accounts, open the vault again.
+    title: `关闭保险库` // Close Vault
   },
   confirmOpen: {
-    info: `You are about to open a vault. After confirming your password, all accounts associated with this vault will be visible. Closing the vault will remove the accounts from view until the vault is opened again.`,
+    info: `你即将打开一个保险库。在确认了你的密码之后，所有与这个保险库关联的账户都会可见。关闭保险库会在界面中移除所有账户，直到保险库被再次打开。`,
+    // You are about to open a vault. After confirming your password, all accounts associated with this vault will be visible. Closing 
+    // the vault will remove the accounts from view until the vault is opened again.
     password: {
-      hint: `the password specified when creating the vault`,
-      label: `vault password`
+      hint: `创建保险库时设置的密码`, // the password specified when creating the vault
+      label: `保险库密码` // vault password
     },
-    title: `Open Vault`
+    title: `打开保险库` // Open Vault
   },
   create: {
     button: {
-      close: `close`,
-      vault: `create vault`
+      close: `关闭`, // close
+      vault: `创建保险库` // create valut
     },
     description: {
-      hint: `an extended description for the vault`
+      hint: `该保险库更详细的描述` // an extended description for the vault
     },
     descriptions: {
-      label: `(optional) description`
+      label: `（可选）描述` // (optional) description
     },
     hint: {
-      hint: `(optional) a hint to help with remembering the password`,
-      label: `password hint`
+      hint: `（可选）一个帮助记忆密码的提示`, // (optional) a hint to help with remembering the password
+      label: `密码提示` // password hint
     },
     name: {
-      hint: `a name for the vault`,
-      label: `vault name`
+      hint: `一个保险库的名字`, // a name for the vault
+      label: `保险库名称` // vault name
     },
     password: {
-      hint: `a strong, unique password`,
-      label: `password`
+      hint: `一个高强度且独一无二的密码`, // a strong, unique password
+      label: `密码` // password
     },
     password2: {
-      hint: `verify your password`,
-      label: `password (repeat)`
+      hint: `验证你的密码`, // verify your password
+      label: `密码（重复）` // password (repeat)
     },
-    title: `Create a new vault`
+    title: `创建一个新的保险库` // Create a new vault
   },
   editMeta: {
-    allowPassword: `Change vault password`,
+    allowPassword: `更改保险库密码`, // Change vault password
     button: {
-      close: `close`,
-      save: `save`
+      close: `关闭`, // close
+      save: `保存` // save
     },
     currentPassword: {
-      hint: `your current vault password`,
-      label: `current password`
+      hint: `保险库的原密码`, // your current vault password
+      label: `原密码` // current password
     },
     description: {
-      hint: `the description for this vault`,
-      label: `vault description`
+      hint: `此保险库的描述`, // the description for this vault
+      label: `保险库描述` // vault description
     },
     password: {
-      hint: `a strong, unique password`,
-      label: `new password`
+      hint: `一个高强度且独一无二的密码`, // a strong, unique password
+      label: `新密码` // new password
     },
     password2: {
-      hint: `verify your new password`,
-      label: `new password (repeat)`
+      hint: `验证你的新密码`, // verify your new password
+      label: `新密码（重复）` // new password (repeat)
     },
     passwordHint: {
-      hint: `your password hint for this vault`,
-      label: `password hint`
+      hint: `此保险库的密码提示`, // your password hint for this vault
+      label: `密码提示` // password hint
     },
-    title: `Edit Vault Metadata`
+    title: `编辑保险库元数据` // Edit Vault Metadata
   },
-  empty: `There are currently no vaults to display.`,
+  empty: `目前没有任何可显示的保险库`, // There are currently no vaults to display.
   selector: {
-    noneAvailable: `There are currently no vaults opened and available for selection. Create and open some first before attempting to select a vault for an account move.`,
-    title: `Select Account Vault`
+    noneAvailable: `目前没有任何打开、可选的保险库。请在移动账户之前创建并打开一个保险库。`,
+    // There are currently no vaults opened and available for selection. Create and open some first before attempting to select 
+    // a vault for an account move.
+    title: `选择账户保险库` // Select Account Vault
   },
-  title: `Vault Management`
+  title: `保险库管理` // Vault Management
 };
diff --git a/js/src/i18n/zh/verification.js b/js/src/i18n/zh/verification.js
index 2d98ed82a..09e62c37f 100644
--- a/js/src/i18n/zh/verification.js
+++ b/js/src/i18n/zh/verification.js
@@ -16,70 +16,70 @@
 
 export default {
   button: {
-    cancel: `Cancel`,
-    done: `Done`,
-    next: `Next`
+    cancel: `取消`,//Cancel
+    done: `完成`,//Done
+    next: `下一步`//Next
   },
   code: {
-    error: `invalid code`,
-    hint: `Enter the code you received.`,
-    label: `verification code`,
-    sent: `The verification code has been sent to {receiver}.`
+    error: `无效验证码`,//invalid code
+    hint: `输入你收到的验证码。`,//Enter the code you received.
+    label: `验证码`,//verification code
+    sent: `验证码被发送到接收者{receiver}.`//The verification code has been sent to {receiver}
   },
   confirmation: {
-    authorise: `The verification code will be sent to the contract. Please authorize this using the Parity Signer.`,
-    windowOpen: `Please keep this window open.`
+    authorise: `验证码将被发送到合约。请使用Parity Signer进行授权。`,//The verification code will be sent to the contract. Please authorize this using the Parity Signer.
+    windowOpen: `请保持这个窗口打开状态。`//Please keep this window open.
   },
   done: {
-    message: `Congratulations, your account is verified!`
+    message: `恭喜，你的账户已经被认证。`//Congratulations, your account is verified!
   },
   email: {
-    enterCode: `Enter the code you received via e-mail.`
+    enterCode: `输入你从邮箱获得验证码。`//Enter the code you received via e-mail.
   },
   gatherData: {
     email: {
-      hint: `the code will be sent to this address`,
-      label: `e-mail address`
+      hint: `验证码将被发送到这个地址`,//the code will be sent to this address
+      label: `邮箱地址`//e-mail address
     },
     phoneNumber: {
-      hint: `the SMS will be sent to this number`,
-      label: `phone number in international format`
+      hint: `短信将被发送到这个号码`,//the SMS will be sent to this number
+      label: `国际格式的手机号码`//phone number in international format
     }
   },
   gatherDate: {
     email: {
-      error: `invalid e-mail`
+      error: `无效邮箱`//invalid e-mail
     },
     phoneNumber: {
-      error: `invalid number`
+      error: `无效数字`//invalid number
     }
   },
-  loading: `Loading verification data.`,
+  loading: `加载验证数据`,//Loading verification data.
   request: {
-    authorise: `A verification request will be sent to the contract. Please authorize this using the Parity Signer.`,
-    requesting: `Requesting a code from the Parity server and waiting for the puzzle to be put into the contract.`,
-    windowOpen: `Please keep this window open.`
+    authorise: `验证请求将被发送到这个合约。请使用Parity Signer进行授权。`,//A verification request will be sent to the contract. Please authorize this using the Parity Signer.
+    requesting: `正在从Parity服务器请求一个验证码，等待它被输入到合约。`,//Requesting a code from the Parity server and waiting for the puzzle to be put into the contract.
+    windowOpen: `请保持窗口为打开状态。`//Please keep this window open.
   },
   sms: {
-    enterCode: `Enter the code you received via SMS.`
+    enterCode: `输入你从短信收到的验证码。`//Enter the code you received via SMS.
   },
   steps: {
-    code: `Enter Code`,
-    completed: `Completed`,
-    confirm: `Confirm`,
-    data: `Enter Data`,
-    method: `Method`,
-    request: `Request`
+    code: `输入验证码`,//Enter Code
+    completed: `完成`,//Completed
+    confirm: `确认`,//Confirm
+    data: `输入数据`,//Enter Data
+    method: `方式`,//Method
+    request: `请求`//Request
   },
-  title: `verify your account`,
+  title: `t验证你的账户`,//verify your accoun
   types: {
     email: {
-      description: `The hash of the e-mail address you prove control over will be stored on the blockchain.`,
-      label: `E-mail Verification`
+      description: `你所控制的邮箱地址的哈希值将被存储在区块链。`,//The hash of the e-mail address you prove control over will be stored on the blockchain.
+      label: `邮箱验证`//E-mail Verification
     },
     sms: {
-      description: `It will be stored on the blockchain that you control a phone number (not <em>which</em>).`,
-      label: `SMS Verification`
+      description: `你所控制的手机号码将被存储在区块链。`,//It will be stored on the blockchain that you control a phone number (not <em>which</em>).
+      label: `短信验证`//SMS Verification
     }
   }
 };
diff --git a/js/src/i18n/zh/wallet.js b/js/src/i18n/zh/wallet.js
index 92063af8b..27670fd8a 100644
--- a/js/src/i18n/zh/wallet.js
+++ b/js/src/i18n/zh/wallet.js
@@ -16,30 +16,31 @@
 
 export default {
   buttons: {
-    edit: `edit`,
+    edit: `编辑`,//edit
     forget: `forget`,
-    settings: `settings`,
-    transfer: `transfer`
+    settings: `设置`,//settings
+    transfer: `转账`//transfer
   },
   confirmations: {
     buttons: {
-      confirmAs: `Confirm As...`,
-      revokeAs: `Revoke As...`
+      confirmAs: `确定为……`,//Confirm As...
+      revokeAs: `撤回为……`//Revoke As...
     },
-    none: `No transactions needs confirmation right now.`,
+    none: `现在没有交易需要确认。`,//No transactions needs confirmation right now.
     tooltip: {
-      confirmed: `Confirmed by {number}/{required} owners`
+      confirmed: `被{number}/{required}所有人确认`//Confirmed by {number}/{required} owners
     }
   },
   details: {
-    requiredOwners: `This wallet requires at least {owners} to validate any action (transactions, modifications).`,
+    requiredOwners: `这个钱包需要至少{owners}所有人验证所有的操作（交易，修改）`,
+    //This wallet requires at least {owners} to validate any action (transactions, modifications).
     requiredOwnersNumber: `{number} {numberValue, plural, one {owner} other {owners}}`,
     spent: `{spent} has been spent today, out of {limit} set as the daily limit, which has been reset on {date}`,
-    title: `Details`
+    title: `细节`//Details
   },
-  title: `Wallet Management`,
+  title: `钱包管理`,//Wallet Management
   transactions: {
-    none: `No transactions has been sent.`,
-    title: `Transactions`
+    none: `没有交易被发送。`,//No transactions has been sent.
+    title: `交易`//Transactions
   }
 };
diff --git a/js/src/i18n/zh/walletSettings.js b/js/src/i18n/zh/walletSettings.js
index ddeae3798..32f569767 100644
--- a/js/src/i18n/zh/walletSettings.js
+++ b/js/src/i18n/zh/walletSettings.js
@@ -16,54 +16,60 @@
 
 export default {
   addOwner: {
-    title: `Add Owner`
+    title: `添加持有人` // Add Owner
   },
   buttons: {
-    cancel: `Cancel`,
-    close: `Close`,
-    next: `Next`,
-    send: `Send`,
-    sending: `Sending...`
+    cancel: `取消`, // Cancel
+    close: `关闭`, // Close
+    next: `下一个`, // Next
+    send: `发送`, // Send
+    sending: `正在发送...` // Sending...
   },
   changes: {
-    modificationString: `For your modifications to be taken into account,
-              other owners have to send the same modifications. They can paste
-              this string to make it easier:`,
-    none: `No modifications have been made to the Wallet settings.`,
-    overview: `You are about to make the following modifications`
+    modificationString: `为了保证你做的修改会被执行，
+                        其他的账户持有人也需要发送相同的修改。
+                        他们可以通过粘贴以下字符串来简单的完成更改：`, 
+                        // For your modifications to be taken into account,
+              // other owners have to send the same modifications. They can paste
+              // this string to make it easier:
+    none: `钱包设置没有发生任何更改。`, // No modifications have been made to the Wallet settings.
+    overview: `你将会造成以下更改` // You are about to make the following modifications
   },
   edit: {
-    message: `In order to edit this contract's settings, at
-                  least {owners, number} {owners, plural, one {owner } other {owners }} have to
-                  send the very same modifications. You can paste a stringified version
-                  of the modifications here.`
+    message: `为了编辑这个合约的设置，至少{owners, number} 
+              {owners, plural, one {owner } other {owners }}必须发送完全相同的修改
+              你可以将字符串化的修改粘贴在这里。` 
+                  // In order to edit this contract's settings, at
+                  // least {owners, number} {owners, plural, one {owner } other {owners }} have to
+                  // send the very same modifications. You can paste a stringified version
+                  // of the modifications here.
   },
   modifications: {
     daylimit: {
-      hint: `amount of ETH spendable without confirmations`,
-      label: `wallet day limit`
+      hint: `不需要确认即可发送的ETH数量`, // amount of ETH spendable without confirmations
+      label: `钱包每日限额` //wallet day limit
     },
     fromString: {
-      label: `modifications`
+      label: `修改` // modifications
     },
     owners: {
-      label: `other wallet owners`
+      label: `其他钱包持有人` // other wallet owners
     },
     required: {
-      hint: `number of required owners to accept a transaction`,
-      label: `required owners`
+      hint: `确认交易所需的通过持有人人数`, // number of required owners to accept a transaction
+      label: `所需持有人` // required owners
     },
     sender: {
-      hint: `send modifications as this owner`,
-      label: `from account (wallet owner)`
+      hint: `作为此持有人发送修改`, // send modifications as this owner
+      label: `来自账户 (wallet owner)` // from account (wallet owner)
     }
   },
   ownersChange: {
-    details: `from {from} to {to}`,
-    title: `Change Required Owners`
+    details: `从 {from} 至 {to}`, // from {from} to {to}
+    title: `改变所需持有人`
   },
-  rejected: `The transaction #{txid} has been rejected`,
+  rejected: `交易#{txid}已经被拒绝`, // The transaction #{txid} has been rejected
   removeOwner: {
-    title: `Remove Owner`
+    title: `移除持有人` // Remove Owner
   }
 };
diff --git a/js/src/i18n/zh/web.js b/js/src/i18n/zh/web.js
index 6136d387f..55aef547f 100644
--- a/js/src/i18n/zh/web.js
+++ b/js/src/i18n/zh/web.js
@@ -15,5 +15,5 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 export default {
-  requestToken: `Requesting access token...`
+  requestToken: `正在请求使用代币` // Requesting access token...
 };
diff --git a/js/src/i18n/zh/writeContract.js b/js/src/i18n/zh/writeContract.js
index 62f83dd4d..5efc9f58f 100644
--- a/js/src/i18n/zh/writeContract.js
+++ b/js/src/i18n/zh/writeContract.js
@@ -16,47 +16,47 @@
 
 export default {
   buttons: {
-    autoCompile: `Auto-Compile`,
-    compile: `Compile`,
-    deploy: `Deploy`,
-    import: `Import Solidity`,
-    load: `Load`,
-    new: `New`,
-    optimise: `Optimise`,
-    save: `Save`
+    autoCompile: `自动编译`, // Auto-Compile
+    compile: `编译`, // Compile
+    deploy: `部署`, // Deploy
+    import: `载入Solidity`, // Import Solidity
+    load: `加载`, // Load
+    new: `新建`, // New
+    optimise: `优化`, // Optimise
+    save: `保存` // Save
   },
   compiling: {
-    action: `Please compile the source code.`,
-    busy: `Compiling...`
+    action: `请编译源代码`, // Please compile the source code.
+    busy: `编译中...` // Compiling...
   },
   details: {
-    saved: `(saved {timestamp})`
+    saved: `(已保存 {timestamp})` // (saved {timestamp})
   },
   error: {
-    noContract: `No contract has been found.`,
-    params: `An error occurred with the following description`
+    noContract: `没有找到合约`, // No contract has been found.
+    params: `发生了如下描述的一个错误` // An error occurred with the following description
   },
   input: {
-    abi: `ABI Definition`,
-    code: `Bytecode`,
-    metadata: `Metadata`,
-    swarm: `Swarm Metadata Hash`
+    abi: `ABI界面`, // ABI Interface
+    code: `字节码`, // Bytecode
+    metadata: `元数据`, // Metadata
+    swarm: `Swarm元数据哈希` // Sarm Metadata Hash
   },
   title: {
-    contract: `Select a contract`,
-    loading: `Loading...`,
-    main: `Write a Contract`,
-    messages: `Compiler messages`,
-    new: `New Solidity Contract`,
-    parameters: `Parameters`,
-    saved: `saved @ {timestamp}`,
-    selectSolidity: `Select a Solidity version`,
-    solidity: `Loading Solidity {version}`
+    contract: `选择一个合约`, // Select a contract
+    loading: `加载中...`, // Loading...
+    main: `写一个合约`, // Write a Contract
+    messages: `编译器消息`, // Compiler messages
+    new: `新建Solidity合约`, // New Solidity Contract
+    parameters: `变量`, // Parameters
+    saved: `已保存 @ {timestamp}`, // saved @ {timestamp}
+    selectSolidity: `选择Solidity版本`, //Select a Solidity version
+    solidity: `正在加载Solidity {version}` // Loading Solidity {version}
   },
   type: {
-    humanErc20: `Implementation of the Human Token Contract`,
-    implementErc20: `Implementation of ERC20 Token Contract`,
-    multisig: `Implementation of a multisig Wallet`,
-    standardErc20: `Standard ERC20 Token Contract`
+    humanErc20: `Human代币合约编码`, // Implementation of the Human Token Contract
+    implementErc20: `ERC20代币合约编码`, // Implementation of the ERC20 Token Contract
+    multisig: `多签钱包编码`, // Implementation of a multisig Wallet
+    standardErc20: `标准ERC20代币合约` // Standard ERC20 Token Contract
   }
 };

From 8fc453658b1f21f391fd3c88a0fc654a13255041 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Wed, 26 Apr 2017 11:10:36 +0200
Subject: [PATCH 060/117] Fix linting issues (#5511)

---
 js/src/i18n/zh-Hant-TW/account.js        |  20 ++--
 js/src/i18n/zh-Hant-TW/accounts.js       |  16 ++--
 js/src/i18n/zh-Hant-TW/addAddress.js     |   4 +-
 js/src/i18n/zh-Hant-TW/address.js        |  12 +--
 js/src/i18n/zh-Hant-TW/addressSelect.js  |  12 +--
 js/src/i18n/zh-Hant-TW/addresses.js      |   6 +-
 js/src/i18n/zh-Hant-TW/application.js    |  12 +--
 js/src/i18n/zh-Hant-TW/connection.js     |   8 +-
 js/src/i18n/zh-Hant-TW/createWallet.js   |   2 +-
 js/src/i18n/zh-Hant-TW/dapp.js           |   4 +-
 js/src/i18n/zh-Hant-TW/dapps.js          |  24 ++---
 js/src/i18n/zh-Hant-TW/deleteAccount.js  |   8 +-
 js/src/i18n/zh-Hant-TW/deployContract.js |  76 +++++++--------
 js/src/i18n/zh-Hant-TW/extension.js      |   4 +-
 js/src/i18n/zh-Hant-TW/faucet.js         |  12 +--
 js/src/i18n/zh-Hant-TW/firstRun.js       |  38 ++++----
 js/src/i18n/zh-Hant-TW/settings.js       |  22 ++---
 js/src/i18n/zh-Hant-TW/shapeshift.js     |   4 +-
 js/src/i18n/zh-Hant-TW/signer.js         |   2 +-
 js/src/i18n/zh-Hant-TW/tabBar.js         |   2 +-
 js/src/i18n/zh-Hant-TW/transfer.js       |  38 ++++----
 js/src/i18n/zh-Hant-TW/txEditor.js       |  22 ++---
 js/src/i18n/zh-Hant-TW/ui.js             | 116 +++++++++++------------
 js/src/i18n/zh-Hant-TW/upgradeParity.js  |  38 ++++----
 js/src/i18n/zh-Hant-TW/vaults.js         |   6 +-
 js/src/i18n/zh-Hant-TW/verification.js   |  66 ++++++-------
 js/src/i18n/zh-Hant-TW/wallet.js         |  24 ++---
 js/src/i18n/zh-Hant-TW/walletSettings.js |   6 +-
 js/src/i18n/zh-Hant-TW/writeContract.js  |   2 +-
 js/src/i18n/zh/account.js                |  20 ++--
 js/src/i18n/zh/accounts.js               |  16 ++--
 js/src/i18n/zh/addAddress.js             |   4 +-
 js/src/i18n/zh/address.js                |  12 +--
 js/src/i18n/zh/addressSelect.js          |  12 +--
 js/src/i18n/zh/addresses.js              |   6 +-
 js/src/i18n/zh/application.js            |  12 +--
 js/src/i18n/zh/connection.js             |   8 +-
 js/src/i18n/zh/createWallet.js           |   2 +-
 js/src/i18n/zh/dapp.js                   |   4 +-
 js/src/i18n/zh/dapps.js                  |  24 ++---
 js/src/i18n/zh/deleteAccount.js          |   8 +-
 js/src/i18n/zh/deployContract.js         |  76 +++++++--------
 js/src/i18n/zh/extension.js              |   4 +-
 js/src/i18n/zh/faucet.js                 |  12 +--
 js/src/i18n/zh/firstRun.js               |  38 ++++----
 js/src/i18n/zh/settings.js               |  22 ++---
 js/src/i18n/zh/shapeshift.js             |   4 +-
 js/src/i18n/zh/signer.js                 |   2 +-
 js/src/i18n/zh/tabBar.js                 |   2 +-
 js/src/i18n/zh/transfer.js               |  38 ++++----
 js/src/i18n/zh/txEditor.js               |  22 ++---
 js/src/i18n/zh/ui.js                     | 116 +++++++++++------------
 js/src/i18n/zh/upgradeParity.js          |  38 ++++----
 js/src/i18n/zh/vaults.js                 |   6 +-
 js/src/i18n/zh/verification.js           |  66 ++++++-------
 js/src/i18n/zh/wallet.js                 |  24 ++---
 js/src/i18n/zh/walletSettings.js         |   6 +-
 js/src/i18n/zh/writeContract.js          |   2 +-
 58 files changed, 606 insertions(+), 606 deletions(-)

diff --git a/js/src/i18n/zh-Hant-TW/account.js b/js/src/i18n/zh-Hant-TW/account.js
index ba8a34b5f..c1ddb288d 100644
--- a/js/src/i18n/zh-Hant-TW/account.js
+++ b/js/src/i18n/zh-Hant-TW/account.js
@@ -16,24 +16,24 @@
 
 export default {
   button: {
-    delete: `刪除`,//delete
-    edit: `編輯`,//edit
-    faucet: `Kovan測試網路以太幣`,//Kovan ETH 
-    password: `密碼`,//password
+    delete: `刪除`, // delete
+    edit: `編輯`, // edit
+    faucet: `Kovan測試網路以太幣`, // Kovan ETH
+    password: `密碼`, // password
     shapeshift: `shapeshift`,
-    transfer: `轉帳`,//transfer
-    verify: `確認`//verify
+    transfer: `轉帳`, // transfer
+    verify: `確認`// verify
   },
   hardware: {
     confirmDelete: `你確定從你的帳戶列表中移除下面的硬體地址嗎？`
-  },//Are you sure you want to remove the following hardware address from your account list?
+  }, // Are you sure you want to remove the following hardware address from your account list?
   header: {
-    outgoingTransactions: `{count}筆正在發生的轉帳`,//{count} outgoing transactions
+    outgoingTransactions: `{count}筆正在發生的轉帳`, // {count} outgoing transactions
     uuid: `uuid: {uuid}`
   },
-  title: `帳戶管理`,//Account Management
+  title: `帳戶管理`, // Account Management
   transactions: {
     poweredBy: `Transaction list powered by {etherscan}提供的交易列表`,
-    title: `交易`//transactions
+    title: `交易`// transactions
   }
 };
diff --git a/js/src/i18n/zh-Hant-TW/accounts.js b/js/src/i18n/zh-Hant-TW/accounts.js
index 079123400..d717b3583 100644
--- a/js/src/i18n/zh-Hant-TW/accounts.js
+++ b/js/src/i18n/zh-Hant-TW/accounts.js
@@ -16,21 +16,21 @@
 
 export default {
   button: {
-    newAccount: `帳戶`,//account
-    newWallet: `錢包`,//wallet
-    vaults: `保險庫`//vaults
+    newAccount: `帳戶`, // account
+    newWallet: `錢包`, // wallet
+    vaults: `保險庫`// vaults
   },
   summary: {
-    minedBlock: `在第#{blockNumber}個區塊被挖出`//Mined at block #{blockNumber}
+    minedBlock: `在第#{blockNumber}個區塊被挖出`// Mined at block #{blockNumber}
   },
-  title: `帳戶總覽`,//Accounts Overview
+  title: `帳戶總覽`, // Accounts Overview
   tooltip: {
     actions: `與當前視窗有關的操作可以在工具欄中快速被找到，不論是執行操作還是建立新項`,
-    //actions relating to the current view are available on the toolbar for quick access, be it for performing actions or creating a new item
+    // actions relating to the current view are available on the toolbar for quick access, be it for performing actions or creating a new item
     overview: `你的帳戶很容易使用，使你可以編輯元資訊、轉帳、檢視交易和向帳戶充值`
-    //your accounts are visible for easy access, allowing you to edit the meta information, make transfers, view transactions and fund the account
+    // your accounts are visible for easy access, allowing you to edit the meta information, make transfers, view transactions and fund the account
   },
   tooltips: {
-    owner: `{name}持有者`//{name} (owner)
+    owner: `{name}持有者`// {name} (owner)
   }
 };
diff --git a/js/src/i18n/zh-Hant-TW/addAddress.js b/js/src/i18n/zh-Hant-TW/addAddress.js
index 72a027042..5d18e441f 100644
--- a/js/src/i18n/zh-Hant-TW/addAddress.js
+++ b/js/src/i18n/zh-Hant-TW/addAddress.js
@@ -20,8 +20,8 @@ export default {
     close: `取消` // Cancel
   },
   header: `如果想在地址簿中新增一條新的記錄，你需要擁有帳戶的網路地址並提供一個的描述（可選）。一旦新增，記錄就可以體現在你的地址簿中。`,
-  // To add a new entry to your addressbook, you need the network 
-  // address of the account and can supply an optional description. 
+  // To add a new entry to your addressbook, you need the network
+  // address of the account and can supply an optional description.
   // Once added it will reflect in your address book.
   input: {
     address: {
diff --git a/js/src/i18n/zh-Hant-TW/address.js b/js/src/i18n/zh-Hant-TW/address.js
index 7fda05357..11cb4ab07 100644
--- a/js/src/i18n/zh-Hant-TW/address.js
+++ b/js/src/i18n/zh-Hant-TW/address.js
@@ -16,13 +16,13 @@
 
 export default {
   buttons: {
-    edit: `編輯`,//edit
-    forget: `忘記`,//forget
-    save: `儲存`//save
+    edit: `編輯`, // edit
+    forget: `忘記`, // forget
+    save: `儲存`// save
   },
   delete: {
-    confirmInfo: `你確定你想把下面的地址從你的地址簿中移除嗎？`,//Are you sure you want to remove the following address from your addressbook?
-    title: `確認移除`//confirm removal
+    confirmInfo: `你確定你想把下面的地址從你的地址簿中移除嗎？`, // Are you sure you want to remove the following address from your addressbook?
+    title: `確認移除`// confirm removal
   },
-  title: `地址資訊`//Address Information
+  title: `地址資訊`// Address Information
 };
diff --git a/js/src/i18n/zh-Hant-TW/addressSelect.js b/js/src/i18n/zh-Hant-TW/addressSelect.js
index 864335601..bc3194019 100644
--- a/js/src/i18n/zh-Hant-TW/addressSelect.js
+++ b/js/src/i18n/zh-Hant-TW/addressSelect.js
@@ -15,12 +15,12 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 export default {
-  fromEmail: `使用郵箱{email}進行確認`,//Verified using email {email}
-  fromRegistry: `{name}（來自注冊）`,//{name} (from registry)
+  fromEmail: `使用郵箱{email}進行確認`, // Verified using email {email}
+  fromRegistry: `{name}（來自注冊）`, // {name} (from registry)
   labels: {
-    accounts: `帳戶`,//accounts
-    contacts: `合約`,//contacts
-    contracts: `合約`//contracts
+    accounts: `帳戶`, // accounts
+    contacts: `合約`, // contacts
+    contracts: `合約`// contracts
   },
-  noAccount: `查不到這個帳戶`//No account matches this query...
+  noAccount: `查不到這個帳戶`// No account matches this query...
 };
diff --git a/js/src/i18n/zh-Hant-TW/addresses.js b/js/src/i18n/zh-Hant-TW/addresses.js
index a839720aa..bacbb79db 100644
--- a/js/src/i18n/zh-Hant-TW/addresses.js
+++ b/js/src/i18n/zh-Hant-TW/addresses.js
@@ -16,10 +16,10 @@
 
 export default {
   buttons: {
-    add: `地址` //address
+    add: `地址` // address
   },
   errors: {
-    invalidFile: `提供的檔案是無效的`//The provided file is invalid...
+    invalidFile: `提供的檔案是無效的`// The provided file is invalid...
   },
-  title: `儲存的地址`//Saved Addresses
+  title: `儲存的地址`// Saved Addresses
 };
diff --git a/js/src/i18n/zh-Hant-TW/application.js b/js/src/i18n/zh-Hant-TW/application.js
index 5ae1f2353..f5f0e9a23 100644
--- a/js/src/i18n/zh-Hant-TW/application.js
+++ b/js/src/i18n/zh-Hant-TW/application.js
@@ -16,15 +16,15 @@
 
 export default {
   frame: {
-    error: `錯誤：這個應用不能也不應該載入到內建框架中`//ERROR: This application cannot and should not be loaded in an embedded iFrame
+    error: `錯誤：這個應用不能也不應該載入到內建框架中`// ERROR: This application cannot and should not be loaded in an embedded iFrame
   },
   status: {
     consensus: {
-      capable: `可行`,//Capable
-      capableUntil: `到第 #{blockNumber} 區塊前可行`,//Capable until #{blockNumber}
-      incapableSince: `自第 #{blockNumber} 區塊後不可行`,//Incapable since #{blockNumber}
-      unknown: `未知能力`//Unknown capability
+      capable: `可行`, // Capable
+      capableUntil: `到第 #{blockNumber} 區塊前可行`, // Capable until #{blockNumber}
+      incapableSince: `自第 #{blockNumber} 區塊後不可行`, // Incapable since #{blockNumber}
+      unknown: `未知能力`// Unknown capability
     },
-    upgrade: `升級`//Upgrade
+    upgrade: `升級`// Upgrade
   }
 };
diff --git a/js/src/i18n/zh-Hant-TW/connection.js b/js/src/i18n/zh-Hant-TW/connection.js
index 8386aef94..ed48452e5 100644
--- a/js/src/i18n/zh-Hant-TW/connection.js
+++ b/js/src/i18n/zh-Hant-TW/connection.js
@@ -15,13 +15,13 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 export default {
   connectingAPI: `正在連線至Parity Secure API`, // Connecting to the Parity Secure API.
-  connectingNode: `正在連線Parity節點。如果彈出任何資訊，請確認你的Parity節點正在執行並連線至網際網路。`, 
-  // Connecting to the Parity Node. If this informational message persists, 
+  connectingNode: `正在連線Parity節點。如果彈出任何資訊，請確認你的Parity節點正在執行並連線至網際網路。`,
+  // Connecting to the Parity Node. If this informational message persists,
   // please ensure that your Parity node is running and reachable on the network.
   invalidToken: `無效的簽名令牌`, // invalid signer token
   noConnection: `無法連線至Parity Secure API。請升級的你的安全令牌或者生成一個新的，執行{newToken}並貼上生成的令牌到下方。`,
-  // Unable to make a connection to the Parity Secure API. To update your secure 
-  // token or to generate a new one, run {newToken} and paste the generated token 
+  // Unable to make a connection to the Parity Secure API. To update your secure
+  // token or to generate a new one, run {newToken} and paste the generated token
   // into the space below.
   token: {
     hint: `一個Parity生成的令牌`, // a generated token from Parity
diff --git a/js/src/i18n/zh-Hant-TW/createWallet.js b/js/src/i18n/zh-Hant-TW/createWallet.js
index c241b8792..55dbc6da5 100644
--- a/js/src/i18n/zh-Hant-TW/createWallet.js
+++ b/js/src/i18n/zh-Hant-TW/createWallet.js
@@ -46,7 +46,7 @@ export default {
     },
     name: {
       hint: `錢包本地名稱`,  // the local name for this wallet
-      label: `錢包名稱` // wallet name 
+      label: `錢包名稱` // wallet name
     },
     nameMulti: {
       hint: `錢包本地名稱`, // the local name for this wallet
diff --git a/js/src/i18n/zh-Hant-TW/dapp.js b/js/src/i18n/zh-Hant-TW/dapp.js
index a10433252..967ad542b 100644
--- a/js/src/i18n/zh-Hant-TW/dapp.js
+++ b/js/src/i18n/zh-Hant-TW/dapp.js
@@ -15,6 +15,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 export default {
-  loading: `正在載入`,//Loading
-  unavailable: `不能獲取這個dapp`//The dapp cannot be reached
+  loading: `正在載入`, // Loading
+  unavailable: `不能獲取這個dapp`// The dapp cannot be reached
 };
diff --git a/js/src/i18n/zh-Hant-TW/dapps.js b/js/src/i18n/zh-Hant-TW/dapps.js
index e3c6395e1..44e97d55b 100644
--- a/js/src/i18n/zh-Hant-TW/dapps.js
+++ b/js/src/i18n/zh-Hant-TW/dapps.js
@@ -18,31 +18,31 @@ export default {
   add: {
     builtin: {
       desc: `Parity團隊開發的實驗性的，用以展示dapp的效能、整合、實驗性特性和控制特定網路的的客戶端行為`,
-      //Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.
-      label: `與Parity繫結的應用`//Applications bundled with Parity
+      // Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.
+      label: `與Parity繫結的應用`// Applications bundled with Parity
     },
-    label: `visible applications可見的應用`,//visible applications
+    label: `visible applications可見的應用`, // visible applications
     local: {
       desc: `All applications installed locally on the machine by the user for access by the Parity client.`,
-      label: `本地可用的應用`//Applications locally available
+      label: `本地可用的應用`// Applications locally available
     },
     network: {
       desc: `這些應用與Parity沒有關聯，也不是Parity釋出的。 它們是由各自的作者控制的。 在使用以前，請確保你理解每個應用的目標。`,
-      //These applications are not affiliated with Parity nor are they published by Parity.Each remain under the control of their respective authors.Please ensure that you understand the goals for each application before interacting.
-      label: `全球網路上的應用`//Applications on the global network
+      // These applications are not affiliated with Parity nor are they published by Parity.Each remain under the control of their respective authors.Please ensure that you understand the goals for each application before interacting.
+      label: `全球網路上的應用`// Applications on the global network
     }
   },
   button: {
-    edit: `編輯`,//edit
-    permissions: `許可`//permissions
+    edit: `編輯`, // edit
+    permissions: `許可`// permissions
   },
   external: {
-    accept: `我理解這些應用和Parity沒有關聯`,//I understand that these applications are not affiliated with Parity
+    accept: `我理解這些應用和Parity沒有關聯`, // I understand that these applications are not affiliated with Parity
     warning: `第三方開發者開發的應用與Parity沒有關聯，也不是Parity釋出的。 它們是由各自的作者控制的。 在使用以前，請確保你理解每個應用的目標。`
-    //Applications made available on the network by 3rd-party authors are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each before interacting.
+    // Applications made available on the network by 3rd-party authors are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each before interacting.
   },
-  label: `去中心化應用`,//Decentralized Applications
+  label: `去中心化應用`, // Decentralized Applications
   permissions: {
-    label: `可見的dapp帳戶`//visible dapp accounts
+    label: `可見的dapp帳戶`// visible dapp accounts
   }
 };
diff --git a/js/src/i18n/zh-Hant-TW/deleteAccount.js b/js/src/i18n/zh-Hant-TW/deleteAccount.js
index ae18cdbc3..e9f49cd3c 100644
--- a/js/src/i18n/zh-Hant-TW/deleteAccount.js
+++ b/js/src/i18n/zh-Hant-TW/deleteAccount.js
@@ -16,9 +16,9 @@
 
 export default {
   password: {
-    hint: `提供帳戶密碼，確認刪除帳戶`,//provide the account password to confirm the account deletion
-    label: `帳戶密碼`//account password
+    hint: `提供帳戶密碼，確認刪除帳戶`, // provide the account password to confirm the account deletion
+    label: `帳戶密碼`// account password
   },
-  question: `你確定你想永久地刪除下面的帳戶？`,//Are you sure you want to permanently delete the following account?
-  title: `確認刪除`//confirm removal
+  question: `你確定你想永久地刪除下面的帳戶？`, // Are you sure you want to permanently delete the following account?
+  title: `確認刪除`// confirm removal
 };
diff --git a/js/src/i18n/zh-Hant-TW/deployContract.js b/js/src/i18n/zh-Hant-TW/deployContract.js
index a7c0a0a0e..05af22f9f 100644
--- a/js/src/i18n/zh-Hant-TW/deployContract.js
+++ b/js/src/i18n/zh-Hant-TW/deployContract.js
@@ -16,75 +16,75 @@
 
 export default {
   busy: {
-    title: `部署正在進行中`//The deployment is currently in progress
+    title: `部署正在進行中`// The deployment is currently in progress
   },
   button: {
-    cancel: `取消`,//Cancel
-    close: `關閉`,//Close
-    create: `建立`,//Create
-    done: `完成`,//Done
-    next: `下一個`//Next
+    cancel: `取消`, // Cancel
+    close: `關閉`, // Close
+    create: `建立`, // Create
+    done: `完成`, // Done
+    next: `下一個`// Next
   },
   completed: {
-    description: `你的合約已經被部署在`//Your contract has been deployed at
+    description: `你的合約已經被部署在`// Your contract has been deployed at
   },
   details: {
     abi: {
-      hint: `合約的abi或者solc 組合輸出`,//the abi of the contract to deploy or solc combined-output
-      label: `abi / solc 組合輸出 `//abi / solc combined-output
+      hint: `合約的abi或者solc 組合輸出`, // the abi of the contract to deploy or solc combined-output
+      label: `abi / solc 組合輸出 `// abi / solc combined-output
     },
     address: {
-      hint: `這個合約所有者的帳戶`,//the owner account for this contract
-      label: `來自帳戶（合約所有者）`//from account (contract owner)
+      hint: `這個合約所有者的帳戶`, // the owner account for this contract
+      label: `來自帳戶（合約所有者）`// from account (contract owner)
     },
     advanced: {
-      label: `高階的傳送選項`//advanced sending options
+      label: `高階的傳送選項`// advanced sending options
     },
     amount: {
-      hint: `轉到這個合約中的數額`,//the amount to transfer to the contract
-      label: `傳送數額{tag}`//amount to transfer (in {tag})
+      hint: `轉到這個合約中的數額`, // the amount to transfer to the contract
+      label: `傳送數額{tag}`// amount to transfer (in {tag})
     },
     code: {
-      hint: `編譯好的合約程式碼`,//the compiled code of the contract to deploy
-      label: `程式碼`//code
+      hint: `編譯好的合約程式碼`, // the compiled code of the contract to deploy
+      label: `程式碼`// code
     },
     contract: {
-      label: `選擇一個合約`//select a contract
+      label: `選擇一個合約`// select a contract
     },
     description: {
-      hint: `對這個合約的描述`,//a description for the contract
-      label: `合約描述（可選）`//contract description (optional)
+      hint: `對這個合約的描述`, // a description for the contract
+      label: `合約描述（可選）`// contract description (optional)
     },
     name: {
-      hint: `已經部署合約的名字`,//a name for the deployed contract
-      label: `合約名字`//contract name
+      hint: `已經部署合約的名字`, // a name for the deployed contract
+      label: `合約名字`// contract name
     }
   },
   owner: {
-    noneSelected: `選擇一個有效的地址作為合約的所有者`//a valid account as the contract owner needs to be selected
+    noneSelected: `選擇一個有效的地址作為合約的所有者`// a valid account as the contract owner needs to be selected
   },
   parameters: {
-    choose: `選擇合約引數`//Choose the contract parameters
+    choose: `選擇合約引數`// Choose the contract parameters
   },
   rejected: {
-    description: `你可以安全地關閉視窗，合約部署不會發生。`,//You can safely close this window, the contract deployment will not occur.
-    title: `部署已經被拒絕`//The deployment has been rejected
+    description: `你可以安全地關閉視窗，合約部署不會發生。`, // You can safely close this window, the contract deployment will not occur.
+    title: `部署已經被拒絕`// The deployment has been rejected
   },
   state: {
-    completed: `合約部署已經完成`,//The contract deployment has been completed
-    confirmationNeeded: `這一操作需要這個合約其他所有人的確認。`,//The operation needs confirmations from the other owners of the contract
-    preparing: `為網路傳輸準備交易`,//Preparing transaction for network transmission
-    validatingCode: `驗證已經部署的合約的程式碼`,//Validating the deployed contract code
-    waitReceipt: `等待合約部署交易收據`,//Waiting for the contract deployment transaction receipt
-    waitSigner: `等待Parity Secure Signer中的交易被確認 `//Waiting for confirmation of the transaction in the Parity Secure Signer
+    completed: `合約部署已經完成`, // The contract deployment has been completed
+    confirmationNeeded: `這一操作需要這個合約其他所有人的確認。`, // The operation needs confirmations from the other owners of the contract
+    preparing: `為網路傳輸準備交易`, // Preparing transaction for network transmission
+    validatingCode: `驗證已經部署的合約的程式碼`, // Validating the deployed contract code
+    waitReceipt: `等待合約部署交易收據`, // Waiting for the contract deployment transaction receipt
+    waitSigner: `等待Parity Secure Signer中的交易被確認 `// Waiting for confirmation of the transaction in the Parity Secure Signer
   },
   title: {
-    completed: `完成`,//completed
-    deployment: `部署`,//deployment
-    details: `合約細節`,//contract details
-    extras: `額外資訊`,//extra information
-    failed: `部署失敗`,//deployment failed
-    parameters: `s合約引數`,//contract parameter
-    rejected: `拒絕`//rejected
+    completed: `完成`, // completed
+    deployment: `部署`, // deployment
+    details: `合約細節`, // contract details
+    extras: `額外資訊`, // extra information
+    failed: `部署失敗`, // deployment failed
+    parameters: `s合約引數`, // contract parameter
+    rejected: `拒絕`// rejected
   }
 };
diff --git a/js/src/i18n/zh-Hant-TW/extension.js b/js/src/i18n/zh-Hant-TW/extension.js
index 71a3830a5..5c0987038 100644
--- a/js/src/i18n/zh-Hant-TW/extension.js
+++ b/js/src/i18n/zh-Hant-TW/extension.js
@@ -16,7 +16,7 @@
 
 export default {
   install: `現在就安裝這個擴充套件`, // Install the extension now
-  intro: `Parity現在有一個Chrome的擴充套件，可以安全的瀏覽以太坊所支援的分散式應用。我們強烈推薦你安裝這個擴充套件來進一步提升你的Parity使用體驗。` 
-  // Parity now has an extension available for Chrome that allows safe browsing of Ethereum-enabled distributed applications. 
+  intro: `Parity現在有一個Chrome的擴充套件，可以安全的瀏覽以太坊所支援的分散式應用。我們強烈推薦你安裝這個擴充套件來進一步提升你的Parity使用體驗。`
+  // Parity now has an extension available for Chrome that allows safe browsing of Ethereum-enabled distributed applications.
   // It is highly recommended that you install this extension to further enhance your Parity experience.
 };
diff --git a/js/src/i18n/zh-Hant-TW/faucet.js b/js/src/i18n/zh-Hant-TW/faucet.js
index 497498232..46474e13a 100644
--- a/js/src/i18n/zh-Hant-TW/faucet.js
+++ b/js/src/i18n/zh-Hant-TW/faucet.js
@@ -16,14 +16,14 @@
 
 export default {
   buttons: {
-    close: `關閉`,//close
-    done: `關閉`,//close
-    request: `請求`//request
+    close: `關閉`, // close
+    done: `關閉`, // close
+    request: `請求`// request
   },
   summary: {
-    done: `你已經向水龍頭請求Kovan ETH測試幣`,//Your Kovan ETH has been requested from the faucet which responded with -
+    done: `你已經向水龍頭請求Kovan ETH測試幣`, // Your Kovan ETH has been requested from the faucet which responded with -
     info: `如果請求將Kovan ETH測試幣存入這個地址，你需要確定這個地址在主網路上已經用簡訊驗證過了。 一旦執行水龍頭將向當前帳戶存入Kovan ETH測試幣。`
-    //To request a deposit of Kovan ETH to this address, you need to ensure that the address is sms-verified on the mainnet.Once executed the faucet will deposit Kovan ETH into the current account.
+    // To request a deposit of Kovan ETH to this address, you need to ensure that the address is sms-verified on the mainnet.Once executed the faucet will deposit Kovan ETH into the current account.
   },
-  title: `Kovan ETH測試幣水龍頭`//Kovan ETH Faucet Kovan
+  title: `Kovan ETH測試幣水龍頭`// Kovan ETH Faucet Kovan
 };
diff --git a/js/src/i18n/zh-Hant-TW/firstRun.js b/js/src/i18n/zh-Hant-TW/firstRun.js
index 86a28c560..aeca368ea 100644
--- a/js/src/i18n/zh-Hant-TW/firstRun.js
+++ b/js/src/i18n/zh-Hant-TW/firstRun.js
@@ -16,37 +16,37 @@
 
 export default {
   button: {
-    close: `關閉`,//Close
-    create: `建立`,//Create
-    next: `下一步`,//Next
-    print: `列印片語`,//Print Phrase
-    skip: `跳過`//Skip
+    close: `關閉`, // Close
+    create: `建立`, // Create
+    next: `下一步`, // Next
+    print: `列印片語`, // Print Phrase
+    skip: `跳過`// Skip
   },
   completed: {
     congrats: `恭喜！你的節點設定已經完成，你現在可以使用應用了。`,
-    //Congratulations! Your node setup has been completed successfully and you are ready to use the application.
+    // Congratulations! Your node setup has been completed successfully and you are ready to use the application.
     next: `下面你將瀏覽可用的功能和通用的應用介面，讓你最快速地使用Parity。`
-    //Next you will receive a walk-through of the available functions and the general application interface to get you up and running in record time.
+    // Next you will receive a walk-through of the available functions and the general application interface to get you up and running in record time.
   },
   title: {
-    completed: `完成`,//completed
-    newAccount: `新帳戶`,//new account
-    recovery: `恢復`,//recovery
-    terms: `條款`,//terms
-    welcome: `歡迎`//welcome
+    completed: `完成`, // completed
+    newAccount: `新帳戶`, // new account
+    recovery: `恢復`, // recovery
+    terms: `條款`, // terms
+    welcome: `歡迎`// welcome
   },
   tnc: {
-    accept: `我接受這些條款和條件`//I accept these terms and conditions
+    accept: `我接受這些條款和條件`// I accept these terms and conditions
   },
   welcome: {
     description: `作為初次安裝的一部分，下面的幾個步驟將指導你如何設定你的Parity和相關帳戶。我們的目標是使得使用Parity變得儘可能的簡單，讓你成功執行，所以請有點耐心。 一旦完成，你將擁有`,
-    //As part of a new installation, the next few steps will guide you through the process of setting up you Parity instance and your associated accounts.Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us.Once completed you will have -
-    greeting: `歡迎使用Parity，這是執行以太坊節點的最快和最簡單的方式。`,//Welcome to Parity, the fastest and simplest way to run your node.
-    next: `點選下一步繼續`,//Click Next to continue your journey.
+    // As part of a new installation, the next few steps will guide you through the process of setting up you Parity instance and your associated accounts.Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us.Once completed you will have -
+    greeting: `歡迎使用Parity，這是執行以太坊節點的最快和最簡單的方式。`, // Welcome to Parity, the fastest and simplest way to run your node.
+    next: `點選下一步繼續`, // Click Next to continue your journey.
     step: {
-      account: `建立你的第一個Parity帳戶`,//Created your first Parity account
-      privacy: `理解你的隱私政策和運作條款`,//Understood our privacy policy & terms of operation
-      recovery: `有能力可以恢復你的帳戶`//Have the ability to recover your account
+      account: `建立你的第一個Parity帳戶`, // Created your first Parity account
+      privacy: `理解你的隱私政策和運作條款`, // Understood our privacy policy & terms of operation
+      recovery: `有能力可以恢復你的帳戶`// Have the ability to recover your account
     }
   }
 };
diff --git a/js/src/i18n/zh-Hant-TW/settings.js b/js/src/i18n/zh-Hant-TW/settings.js
index 2516b51df..bf026c384 100644
--- a/js/src/i18n/zh-Hant-TW/settings.js
+++ b/js/src/i18n/zh-Hant-TW/settings.js
@@ -18,10 +18,10 @@ export default {
   background: {
     button_more: `生成更多`, // generate more
     overview_0: `你現在所看到的背景圖案在你的Parity安裝中是獨一無二的。每次創造一個新的Signer令牌都會改變一次圖案。這也保證了去中性化應用不能偽裝成可信的樣子。`,
-    // The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new 
+    // The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new
     // Signer token. This is so that decentralized applications cannot pretend to be trustworthy.
-    overview_1: `選擇一個你喜歡的圖案並記住它的樣子。這個圖案從現在開始會經常出現，除非你清空了瀏覽器的快取或者使用了新的Signer令牌。`, 
-    // Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or 
+    overview_1: `選擇一個你喜歡的圖案並記住它的樣子。這個圖案從現在開始會經常出現，除非你清空了瀏覽器的快取或者使用了新的Signer令牌。`,
+    // Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or
     // use a new Signer token.
     label: `背景` // background
   },
@@ -56,9 +56,9 @@ export default {
   },
   proxy: {
     details_0: `除了通過IP地址和埠來訪問Parity，你也能通過.parity子域名來使用Parity，訪問 {homeProxy}。為了設定基於子域名的路由，你需要新增相關的代理記錄至你的瀏覽器。`,
-    // Instead of accessing Parity via the IP address and port, you will be able to access it via the .parity subdomain, by visiting 
+    // Instead of accessing Parity via the IP address and port, you will be able to access it via the .parity subdomain, by visiting
     // {homeProxy}. To setup subdomain-based routing, you need to add the relevant proxy entries to your browser,
-    details_1: `如果想了解如何配置代理，教程已提供在{windowsLink}，{macOSLink}和{ubuntuLink}。`, 
+    details_1: `如果想了解如何配置代理，教程已提供在{windowsLink}，{macOSLink}和{ubuntuLink}。`,
     // To learn how to configure the proxy, instructions are provided for {windowsLink}, {macOSLink} or {ubuntuLink}.
     details_macos: `macOS`, // macOS
     details_ubuntu: `Ubuntu`, // Ubuntu
@@ -70,19 +70,19 @@ export default {
   views: {
     accounts: {
       description: `一個此Parity例項所關聯和匯入的所有帳戶的列表。傳送交易、接收流入價值、管理你的帳目和資助你的帳戶。`,
-      // A list of all the accounts associated with and imported into this Parity instance. Send transactions, receive incoming values, 
+      // A list of all the accounts associated with and imported into this Parity instance. Send transactions, receive incoming values,
       // manage your balances and fund your accounts.
       label: `帳戶` // Accounts
     },
     addresses: {
       description: `一個此Parity例項管理的所有聯絡人和地址簿記錄的列表。只需點選一個按鈕就可以觀察帳戶並獲得所有交易相關的資訊。`,
-      // A list of all contacts and address book entries managed by this Parity instance. Watch accounts and have the details available 
+      // A list of all contacts and address book entries managed by this Parity instance. Watch accounts and have the details available
       // at the click of a button when transacting.
       label: `地址簿` // Addressbook
     },
     apps: {
       description: `與整個底層網路交流的分散式應用。新增應用，管理你的應用庫和與網路上的其他應用進行互動。`,
-      // Distributed applications that interact with the underlying network. Add applications, manage you application portfolio and 
+      // Distributed applications that interact with the underlying network. Add applications, manage you application portfolio and
       // interact with application from around the network.
       label: `應用` // Applications
     },
@@ -106,14 +106,14 @@ export default {
       label: `設定` // Settings
     },
     signer: {
-      description: `這個應用安全交易管理區域，你可以通過任何從本應用和其他分散式應用發起的即將傳送的交易`, 
-      // The secure transaction management area of the application where you can approve any outgoing transactions made 
+      description: `這個應用安全交易管理區域，你可以通過任何從本應用和其他分散式應用發起的即將傳送的交易`,
+      // The secure transaction management area of the application where you can approve any outgoing transactions made
       // from the application as well as those placed into the queue by distributed applications.
       label: `Signer` // Signer
     },
     status: {
       description: `觀察Parity節點現在的執行情況：網路連線數、實際執行例項的Logs和具體挖礦資訊（如果已開啟並設定）`,
-      // See how the Parity node is performing in terms of connections to the network, logs from the actual running instance 
+      // See how the Parity node is performing in terms of connections to the network, logs from the actual running instance
       // and details of mining (if enabled and configured).
       label: `狀態` // Status
     },
diff --git a/js/src/i18n/zh-Hant-TW/shapeshift.js b/js/src/i18n/zh-Hant-TW/shapeshift.js
index 6cd2065f7..bbcf0c94f 100644
--- a/js/src/i18n/zh-Hant-TW/shapeshift.js
+++ b/js/src/i18n/zh-Hant-TW/shapeshift.js
@@ -40,7 +40,7 @@ export default {
   },
   errorStep: {
     info: `通過{shapeshiftLink}進行的資金轉換因為一個交易的致命錯誤失敗了。交易提供的錯誤資訊如下：`
-    // The funds shifting via {shapeshiftLink} failed with a fatal error on the exchange. The error message received from the exchange 
+    // The funds shifting via {shapeshiftLink} failed with a fatal error on the exchange. The error message received from the exchange
     // is as follow:
   },
   optionsStep: {
@@ -52,7 +52,7 @@ export default {
     },
     terms: {
       label: `我理解ShapeShift.io是一個第三方服務，使用此服務發生的任何資訊/資金髮送是完全不受Parity控制的`
-      // I understand that ShapeShift.io is a 3rd-party service and by using the service any transfer of information and/or funds is 
+      // I understand that ShapeShift.io is a 3rd-party service and by using the service any transfer of information and/or funds is
       // completely out of the control of Parity
     },
     typeSelect: {
diff --git a/js/src/i18n/zh-Hant-TW/signer.js b/js/src/i18n/zh-Hant-TW/signer.js
index 77705df4e..df816d734 100644
--- a/js/src/i18n/zh-Hant-TW/signer.js
+++ b/js/src/i18n/zh-Hant-TW/signer.js
@@ -41,7 +41,7 @@ export default {
   },
   requestsPage: {
     noPending: `沒有請求需要你的確認`, // There are no requests requiring your confirmation.
-    pendingTitle: `待處理請求`, //Pending Requests
+    pendingTitle: `待處理請求`, // Pending Requests
     queueTitle: `本地交易` // Local Transactions
   },
   sending: {
diff --git a/js/src/i18n/zh-Hant-TW/tabBar.js b/js/src/i18n/zh-Hant-TW/tabBar.js
index 72b2e9ce7..73ccabf96 100644
--- a/js/src/i18n/zh-Hant-TW/tabBar.js
+++ b/js/src/i18n/zh-Hant-TW/tabBar.js
@@ -17,6 +17,6 @@
 export default {
   tooltip: {
     overview: `在應用的不同部分和不同介面進行導航，在帳戶介面、代幣介面和分散式應用介面之間切換。`
-    //navigate between the different parts and views of the application, switching between an account view, token view and distributed application view
+    // navigate between the different parts and views of the application, switching between an account view, token view and distributed application view
   }
 };
diff --git a/js/src/i18n/zh-Hant-TW/transfer.js b/js/src/i18n/zh-Hant-TW/transfer.js
index 9bf61e917..76bb1f701 100644
--- a/js/src/i18n/zh-Hant-TW/transfer.js
+++ b/js/src/i18n/zh-Hant-TW/transfer.js
@@ -17,46 +17,46 @@
 export default {
   advanced: {
     data: {
-      hint: `交易附帶資料`,//the data to pass through with the transaction
-      label: `交易資料`//transaction data
+      hint: `交易附帶資料`, // the data to pass through with the transaction
+      label: `交易資料`// transaction data
     }
   },
   buttons: {
-    back: `返回`,//Back
-    cancel: `取消`,//Cancel
-    close: `關閉`,//Close
-    next: `下一步`,//Next
-    send: `傳送`//Send
+    back: `返回`, // Back
+    cancel: `取消`, // Cancel
+    close: `關閉`, // Close
+    next: `下一步`, // Next
+    send: `傳送`// Send
   },
   details: {
     advanced: {
-      label: `高階傳送選項`//advanced sending options
+      label: `高階傳送選項`// advanced sending options
     },
     amount: {
-      hint: `傳送數額`,//the amount to transfer to the recipient
-      label: `傳送數額{tag}`//amount to transfer (in {tag})
+      hint: `傳送數額`, // the amount to transfer to the recipient
+      label: `傳送數額{tag}`// amount to transfer (in {tag})
     },
     fullBalance: {
-      label: `所有的餘額`//full account balance
+      label: `所有的餘額`// full account balance
     },
     recipient: {
-      hint: `收款人地址`,//the recipient address
-      label: `收款人地址`//recipient address
+      hint: `收款人地址`, // the recipient address
+      label: `收款人地址`// recipient address
     },
     sender: {
-      hint: `傳送人地址`,//the sender address
-      label: `傳送人地址`//sender address
+      hint: `傳送人地址`, // the sender address
+      label: `傳送人地址`// sender address
     },
     total: {
-      label: `傳送數額`//total transaction amount
+      label: `傳送數額`// total transaction amount
     }
   },
   wallet: {
-    confirmation: `這筆交易需要其他人的確認。`,//This transaction needs confirmation from other owners.
-    operationHash: `操作雜湊`//operation hash
+    confirmation: `這筆交易需要其他人的確認。`, // This transaction needs confirmation from other owners.
+    operationHash: `操作雜湊`// operation hash
   },
   warning: {
     wallet_spent_limit: `這筆轉帳的數額超過了每日轉帳數額上限。此交易需要其他人的確認才可以傳送成功。`
-    //This transaction value is above the remaining daily limit. It will need to be confirmed by other owners.
+    // This transaction value is above the remaining daily limit. It will need to be confirmed by other owners.
   }
 };
diff --git a/js/src/i18n/zh-Hant-TW/txEditor.js b/js/src/i18n/zh-Hant-TW/txEditor.js
index 206311316..812d9be38 100644
--- a/js/src/i18n/zh-Hant-TW/txEditor.js
+++ b/js/src/i18n/zh-Hant-TW/txEditor.js
@@ -17,24 +17,24 @@
 export default {
   condition: {
     block: {
-      hint: `在某個區塊高度後傳送`,//The minimum block to send from
-      label: `交易傳送區塊`//Transaction send block
+      hint: `在某個區塊高度後傳送`, // The minimum block to send from
+      label: `交易傳送區塊`// Transaction send block
     },
-    blocknumber: `在某個區塊後傳送`,//Send after BlockNumber
+    blocknumber: `在某個區塊後傳送`, // Send after BlockNumber
     date: {
-      hint: `在某日後傳送`,//The minimum date to send from
-      label: `交易傳送日期`//Transaction send date
+      hint: `在某日後傳送`, // The minimum date to send from
+      label: `交易傳送日期`// Transaction send date
     },
-    datetime: `在某日某時後傳送`,//Send after Date & Tim
-    label: `交易啟用的條件`,//Condition where transaction activates
-    none: `無條件`,//No conditions
+    datetime: `在某日某時後傳送`, // Send after Date & Tim
+    label: `交易啟用的條件`, // Condition where transaction activates
+    none: `無條件`, // No conditions
     time: {
-      hint: `在某時間後傳送`,//The minimum time to send from
-      label: `交易傳送時間`//Transaction send time
+      hint: `在某時間後傳送`, // The minimum time to send from
+      label: `交易傳送時間`// Transaction send time
     }
   },
   gas: {
     info: `你可以基於最近的交易gas價格的分佈選擇gas價格。 gas價格越低，交易費用越便宜。 gas 價格越高，交易被網路打包的速度越快。`
-    //You can choose the gas price based on the distribution of recent included transaction gas prices.The lower the gas price is, the cheaper the transaction will be.The higher the gas price is, the faster it should get mined by the network.
+    // You can choose the gas price based on the distribution of recent included transaction gas prices.The lower the gas price is, the cheaper the transaction will be.The higher the gas price is, the faster it should get mined by the network.
   }
 };
diff --git a/js/src/i18n/zh-Hant-TW/ui.js b/js/src/i18n/zh-Hant-TW/ui.js
index a60685413..c7e4e3790 100644
--- a/js/src/i18n/zh-Hant-TW/ui.js
+++ b/js/src/i18n/zh-Hant-TW/ui.js
@@ -18,56 +18,56 @@ export default {
   actionbar: {
     export: {
       button: {
-        export: `匯出`//export
+        export: `匯出`// export
       }
     },
     import: {
       button: {
-        cancel: `取消`,//Cancel
-        confirm: `確認`,//Confirm
-        import: `匯入`//import
+        cancel: `取消`, // Cancel
+        confirm: `確認`, // Confirm
+        import: `匯入`// import
       },
-      confirm: `確認這是你想匯入的`,//Confirm that this is what was intended to import.
-      error: `發生錯誤：{errorText}`,//An error occured: {errorText}
+      confirm: `確認這是你想匯入的`, // Confirm that this is what was intended to import.
+      error: `發生錯誤：{errorText}`, // An error occured: {errorText}
       step: {
-        error: `錯誤`,//error
-        select: `選擇一個檔案`,//select a file
-        validate: `確認`//validate
+        error: `錯誤`, // error
+        select: `選擇一個檔案`, // select a file
+        validate: `確認`// validate
       },
-      title: `從一個檔案匯入`//Import from a file
+      title: `從一個檔案匯入`// Import from a file
     },
     search: {
-      hint: `輸入搜尋內容……`//Enter search input...
+      hint: `輸入搜尋內容……`// Enter search input...
     },
     sort: {
-      sortBy: `根據{label}排序`,//Sort by {label}
-      typeDefault: `預設`,//Default
-      typeEth: `根據以太幣數額排序`,//Sort by ETH
-      typeName: `根據帳戶名字排序`,//Sort by name
-      typeTags: `根據標籤排序`//Sort by tags
+      sortBy: `根據{label}排序`, // Sort by {label}
+      typeDefault: `預設`, // Default
+      typeEth: `根據以太幣數額排序`, // Sort by ETH
+      typeName: `根據帳戶名字排序`, // Sort by name
+      typeTags: `根據標籤排序`// Sort by tags
     }
   },
   balance: {
-    none: `這個帳戶沒有餘額`//No balances associated with this account
+    none: `這個帳戶沒有餘額`// No balances associated with this account
   },
   blockStatus: {
-    bestBlock: `最新區塊{blockNumber}`,//{blockNumber} best block
-    syncStatus: `currentBlock}/{highestBlock}區塊同步`,//{currentBlock}/{highestBlock} syncing{
-    warpRestore: `{percentage}%恢復`,//{percentage}% warp restore
-    warpStatus: `, {percentage}%歷史`//{percentage}% historic
+    bestBlock: `最新區塊{blockNumber}`, // {blockNumber} best block
+    syncStatus: `currentBlock}/{highestBlock}區塊同步`, // {currentBlock}/{highestBlock} syncing{
+    warpRestore: `{percentage}%恢復`, // {percentage}% warp restore
+    warpStatus: `, {percentage}%歷史`// {percentage}% historic
   },
   confirmDialog: {
-    no: `不是`,//no
-    yes: `是`//yes
+    no: `不是`, // no
+    yes: `是`// yes
   },
   copyToClipboard: {
-    copied: `複製{data}到貼上板`//copied {data} to clipboard
+    copied: `複製{data}到貼上板`// copied {data} to clipboard
   },
   errors: {
-    close: `關閉`//close
+    close: `關閉`// close
   },
   fileSelect: {
-    defaultLabel: `拉一個檔案到這裡，或者選擇一個檔案上傳`//Drop a file here, or click to select a file to upload
+    defaultLabel: `拉一個檔案到這裡，或者選擇一個檔案上傳`// Drop a file here, or click to select a file to upload
   },
   gasPriceSelector: {
     customTooltip: {
@@ -75,8 +75,8 @@ export default {
     }
   },
   identityName: {
-    null: `空`,//NULL
-    unnamed: `未命名`//UNNAMED
+    null: `空`, // NULL
+    unnamed: `未命名`// UNNAMED
   },
   methodDecoding: {
     condition: {
@@ -84,20 +84,20 @@ export default {
       time: `, {historic, select, true {Submitted} false {Submission}} at {timestamp}`
     },
     deploy: {
-      address: `在地址上部署一個合約`,//Deployed a contract at address
-      params: `附帶下面的引數：`,//with the following parameters:
-      willDeploy: `將要部署一個合約`,//Will deploy a contract
-      withValue: `, 傳送{value}`//sending {value}
+      address: `在地址上部署一個合約`, // Deployed a contract at address
+      params: `附帶下面的引數：`, // with the following parameters:
+      willDeploy: `將要部署一個合約`, // Will deploy a contract
+      withValue: `, 傳送{value}`// sending {value}
     },
-    gasUsed: `({gas}gas消耗)`,//{gas} gas used
+    gasUsed: `({gas}gas消耗)`, // {gas} gas used
     gasValues: `{gas} gas ({gasPrice}M/{tag})`,
     input: {
-      data: `資料`,//data
-      input: `輸入`,//input
+      data: `資料`, // data
+      input: `輸入`, // input
       withInput: `with the {inputDesc} {inputValue}`
     },
     receive: {
-      contract: `合約`,//the contract
+      contract: `合約`, // the contract
       info: `{historic, select, true {Received} false {Will receive}} {valueEth} from {aContract}{address}`
     },
     signature: {
@@ -116,48 +116,48 @@ export default {
     }
   },
   passwordStrength: {
-    label: `密碼強度`//password strength
+    label: `密碼強度`// password strength
   },
   tooltips: {
     button: {
-      done: `完成`,//Done
-      next: `下一步`,//Next
-      skip: `跳過`//Skip
+      done: `完成`, // Done
+      next: `下一步`, // Next
+      skip: `跳過`// Skip
     }
   },
   txHash: {
     confirmations: `{count} {value, plural, one {confirmation} other {confirmations}}`,
-    oog: `這筆交易已經耗光了gas。請用更多的gas嘗試。`,//The transaction might have gone out of gas. Try again with more gas.
-    posted: `這筆交易已經被髮送到網路，附帶雜湊是{hashLink}`,//The transaction has been posted to the network with a hash of {hashLink}
-    waiting: `等待確認`//waiting for confirmations
+    oog: `這筆交易已經耗光了gas。請用更多的gas嘗試。`, // The transaction might have gone out of gas. Try again with more gas.
+    posted: `這筆交易已經被髮送到網路，附帶雜湊是{hashLink}`, // The transaction has been posted to the network with a hash of {hashLink}
+    waiting: `等待確認`// waiting for confirmations
   },
   vaultSelect: {
-    hint: `這個帳戶繫結的保險庫是`,//the vault this account is attached to
-    label: `相關保險庫`//associated vault
+    hint: `這個帳戶繫結的保險庫是`, // the vault this account is attached to
+    label: `相關保險庫`// associated vault
   },
   verification: {
     gatherData: {
       accountHasRequested: {
-        false: `.你還沒有從這個帳戶請求確認。`,//You did not request verification from this account yet
-        pending: `檢查一下你是否請求了驗證……`,//Checking if you requested verification…
-        true: `你已經從這個帳戶請求到驗證。`//You already requested verification from this account.
+        false: `.你還沒有從這個帳戶請求確認。`, // You did not request verification from this account yet
+        pending: `檢查一下你是否請求了驗證……`, // Checking if you requested verification…
+        true: `你已經從這個帳戶請求到驗證。`// You already requested verification from this account.
       },
       accountIsVerified: {
-        false: `你的帳戶還沒有被驗證。`,//Your account is not verified yet.
-        pending: `檢查一下你的帳戶是否已經被驗證……`,//Checking if your account is verified…
-        true: `你的帳戶已經被驗證。`//Your account is already verified.
+        false: `你的帳戶還沒有被驗證。`, // Your account is not verified yet.
+        pending: `檢查一下你的帳戶是否已經被驗證……`, // Checking if your account is verified…
+        true: `你的帳戶已經被驗證。`// Your account is already verified.
       },
-      fee: `額外的費用是{amount}ETH`,//The additional fee is {amount} ETH.
+      fee: `額外的費用是{amount}ETH`, // The additional fee is {amount} ETH.
       isAbleToRequest: {
-        pending: `驗證你的輸入……`//Validating your input…
+        pending: `驗證你的輸入……`// Validating your input…
       },
       isServerRunning: {
-        false: `驗證伺服器沒有在執行。`,//The verification server is not running.
-        pending: `檢查一下驗證伺服器是否在執行……`,//Checking if the verification server is running…
-        true: `驗證伺服器正在執行。`//The verification server is running.
+        false: `驗證伺服器沒有在執行。`, // The verification server is not running.
+        pending: `檢查一下驗證伺服器是否在執行……`, // Checking if the verification server is running…
+        true: `驗證伺服器正在執行。`// The verification server is running.
       },
-      nofee: `沒有額外的費用。`,//There is no additional fee.
-      termsOfService: `我同意下面的條款和條件。`//I agree to the terms and conditions below.
+      nofee: `沒有額外的費用。`, // There is no additional fee.
+      termsOfService: `我同意下面的條款和條件。`// I agree to the terms and conditions below.
     }
   }
 };
diff --git a/js/src/i18n/zh-Hant-TW/upgradeParity.js b/js/src/i18n/zh-Hant-TW/upgradeParity.js
index 0bd1a0cae..fc6a60304 100644
--- a/js/src/i18n/zh-Hant-TW/upgradeParity.js
+++ b/js/src/i18n/zh-Hant-TW/upgradeParity.js
@@ -16,40 +16,40 @@
 
 export default {
   busy: `你正在升級到Parity最新版本{newversion}。請等待升級過程完成。`,
-  //Your upgrade to Parity {newversion} is currently in progress. Please wait until the process completes.
+  // Your upgrade to Parity {newversion} is currently in progress. Please wait until the process completes.
   button: {
-    close: `關閉`,//close
-    done: `完成`,//done
-    upgrade: `現在升級`//upgrade now
+    close: `關閉`, // close
+    done: `完成`, // done
+    upgrade: `現在升級`// upgrade now
   },
   completed: `你升級到Parity最新版本{newversion}的操作已經完成。點選“完成”將自動重新載入這個應用。`,
-  //Your upgrade to Parity {newversion} has been successfully completed. Click "done" to automatically reload the application.
+  // Your upgrade to Parity {newversion} has been successfully completed. Click "done" to automatically reload the application.
   consensus: {
     capable: `你當前的Parity版本能夠處理網路請求。`,
-    //Your current Parity version is capable of handling the network requirements.
+    // Your current Parity version is capable of handling the network requirements.
     capableUntil: `你當前的Parity版本能夠處理直到第{blockNumber}個區塊的網路請求。`,
-    //Your current Parity version is capable of handling the network requirements until block {blockNumber}
+    // Your current Parity version is capable of handling the network requirements until block {blockNumber}
     incapableSince: `你當前的Parity版本能夠處理第{blockNumber}個區塊以後的網路請求。`,
-    //Your current Parity version is incapable of handling the network requirements since block {blockNumber}
+    // Your current Parity version is incapable of handling the network requirements since block {blockNumber}
     unknown: `你當前的Parity版本能夠處理網路請求。`
-    //Your current Parity version is capable of handling the network requirements.
+    // Your current Parity version is capable of handling the network requirements.
   },
   failed: `升級到Parity最新版本{newversion}遇到錯誤，升級失敗。`,
-  //Your upgrade to Parity {newversion} has failed with an error.
+  // Your upgrade to Parity {newversion} has failed with an error.
   info: {
-    currentVersion: `你現在正在執行{currentversion}版本。`,//You are currently running {currentversion}
-    next: `點選“現在升級”，開始Parity升級。`,//Proceed with "upgrade now" to start your Parity upgrade.
-    upgrade: `可以升級到最新版本{newversion}`,//An upgrade to version {newversion} is available
+    currentVersion: `你現在正在執行{currentversion}版本。`, // You are currently running {currentversion}
+    next: `點選“現在升級”，開始Parity升級。`, // Proceed with "upgrade now" to start your Parity upgrade.
+    upgrade: `可以升級到最新版本{newversion}`, // An upgrade to version {newversion} is available
     welcome: `迎來到Parity升級指南，讓你享受無縫升級到Parity最新版本的體驗。`
-    //Welcome to the Parity upgrade wizard, allowing you a completely seamless upgrade experience to the next version of Parity.歡
+    // Welcome to the Parity upgrade wizard, allowing you a completely seamless upgrade experience to the next version of Parity.歡
   },
   step: {
-    completed: `升級完成`,//upgrade completed
-    error: `錯誤`,//error
-    info: `可以升級`,//upgrade available
-    updating: `升級Parity`//upgrading parity
+    completed: `升級完成`, // upgrade completed
+    error: `錯誤`, // error
+    info: `可以升級`, // upgrade available
+    updating: `升級Parity`// upgrading parity
   },
   version: {
-    unknown: `未知`//unknown
+    unknown: `未知`// unknown
   }
 };
diff --git a/js/src/i18n/zh-Hant-TW/vaults.js b/js/src/i18n/zh-Hant-TW/vaults.js
index 2967132da..ffd6c4646 100644
--- a/js/src/i18n/zh-Hant-TW/vaults.js
+++ b/js/src/i18n/zh-Hant-TW/vaults.js
@@ -32,13 +32,13 @@ export default {
   },
   confirmClose: {
     info: `你即將關閉一個保險庫。所有與這個保險庫相關的帳戶在這個操作完成後都不再可見。如果想再見到關聯帳戶，請重新開啟保險庫。`,
-    // You are about to close a vault. Any accounts associated with the vault won't be visible after this operation concludes. To view 
+    // You are about to close a vault. Any accounts associated with the vault won't be visible after this operation concludes. To view
     // the associated accounts, open the vault again.
     title: `關閉保險庫` // Close Vault
   },
   confirmOpen: {
     info: `你即將開啟一個保險庫。在確認了你的密碼之後，所有與這個保險庫關聯的帳戶都會可見。關閉保險庫會在介面中移除所有帳戶，直到保險庫被再次開啟。`,
-    // You are about to open a vault. After confirming your password, all accounts associated with this vault will be visible. Closing 
+    // You are about to open a vault. After confirming your password, all accounts associated with this vault will be visible. Closing
     // the vault will remove the accounts from view until the vault is opened again.
     password: {
       hint: `建立保險庫時設定的密碼`, // the password specified when creating the vault
@@ -106,7 +106,7 @@ export default {
   empty: `目前沒有任何可顯示的保險庫`, // There are currently no vaults to display.
   selector: {
     noneAvailable: `目前沒有任何開啟、可選的保險庫。請在移動帳戶之前建立並開啟一個保險庫。`,
-    // There are currently no vaults opened and available for selection. Create and open some first before attempting to select 
+    // There are currently no vaults opened and available for selection. Create and open some first before attempting to select
     // a vault for an account move.
     title: `選擇帳戶保險庫` // Select Account Vault
   },
diff --git a/js/src/i18n/zh-Hant-TW/verification.js b/js/src/i18n/zh-Hant-TW/verification.js
index b82b1a3c6..d5efa8fac 100644
--- a/js/src/i18n/zh-Hant-TW/verification.js
+++ b/js/src/i18n/zh-Hant-TW/verification.js
@@ -16,70 +16,70 @@
 
 export default {
   button: {
-    cancel: `取消`,//Cancel
-    done: `完成`,//Done
-    next: `下一步`//Next
+    cancel: `取消`, // Cancel
+    done: `完成`, // Done
+    next: `下一步`// Next
   },
   code: {
-    error: `無效驗證碼`,//invalid code
-    hint: `輸入你收到的驗證碼。`,//Enter the code you received.
-    label: `驗證碼`,//verification code
-    sent: `驗證碼被髮送到接收者{receiver}.`//The verification code has been sent to {receiver}
+    error: `無效驗證碼`, // invalid code
+    hint: `輸入你收到的驗證碼。`, // Enter the code you received.
+    label: `驗證碼`, // verification code
+    sent: `驗證碼被髮送到接收者{receiver}.`// The verification code has been sent to {receiver}
   },
   confirmation: {
-    authorise: `驗證碼將被髮送到合約。請使用Parity Signer進行授權。`,//The verification code will be sent to the contract. Please authorize this using the Parity Signer.
-    windowOpen: `請保持這個視窗開啟狀態。`//Please keep this window open.
+    authorise: `驗證碼將被髮送到合約。請使用Parity Signer進行授權。`, // The verification code will be sent to the contract. Please authorize this using the Parity Signer.
+    windowOpen: `請保持這個視窗開啟狀態。`// Please keep this window open.
   },
   done: {
-    message: `恭喜，你的帳戶已經被認證。`//Congratulations, your account is verified!
+    message: `恭喜，你的帳戶已經被認證。`// Congratulations, your account is verified!
   },
   email: {
-    enterCode: `輸入你從郵箱獲得驗證碼。`//Enter the code you received via e-mail.
+    enterCode: `輸入你從郵箱獲得驗證碼。`// Enter the code you received via e-mail.
   },
   gatherData: {
     email: {
-      hint: `驗證碼將被髮送到這個地址`,//the code will be sent to this address
-      label: `郵箱地址`//e-mail address
+      hint: `驗證碼將被髮送到這個地址`, // the code will be sent to this address
+      label: `郵箱地址`// e-mail address
     },
     phoneNumber: {
-      hint: `簡訊將被髮送到這個號碼`,//the SMS will be sent to this number
-      label: `國際格式的手機號碼`//phone number in international format
+      hint: `簡訊將被髮送到這個號碼`, // the SMS will be sent to this number
+      label: `國際格式的手機號碼`// phone number in international format
     }
   },
   gatherDate: {
     email: {
-      error: `無效郵箱`//invalid e-mail
+      error: `無效郵箱`// invalid e-mail
     },
     phoneNumber: {
-      error: `無效數字`//invalid number
+      error: `無效數字`// invalid number
     }
   },
-  loading: `載入驗證資料`,//Loading verification data.
+  loading: `載入驗證資料`, // Loading verification data.
   request: {
-    authorise: `驗證請求將被髮送到這個合約。請使用Parity Signer進行授權。`,//A verification request will be sent to the contract. Please authorize this using the Parity Signer.
-    requesting: `正在從Parity伺服器請求一個驗證碼，等待它被輸入到合約。`,//Requesting a code from the Parity server and waiting for the puzzle to be put into the contract.
-    windowOpen: `請保持視窗為開啟狀態。`//Please keep this window open.
+    authorise: `驗證請求將被髮送到這個合約。請使用Parity Signer進行授權。`, // A verification request will be sent to the contract. Please authorize this using the Parity Signer.
+    requesting: `正在從Parity伺服器請求一個驗證碼，等待它被輸入到合約。`, // Requesting a code from the Parity server and waiting for the puzzle to be put into the contract.
+    windowOpen: `請保持視窗為開啟狀態。`// Please keep this window open.
   },
   sms: {
-    enterCode: `輸入你從簡訊收到的驗證碼。`//Enter the code you received via SMS.
+    enterCode: `輸入你從簡訊收到的驗證碼。`// Enter the code you received via SMS.
   },
   steps: {
-    code: `輸入驗證碼`,//Enter Code
-    completed: `完成`,//Completed
-    confirm: `確認`,//Confirm
-    data: `輸入資料`,//Enter Data
-    method: `方式`,//Method
-    request: `請求`//Request
+    code: `輸入驗證碼`, // Enter Code
+    completed: `完成`, // Completed
+    confirm: `確認`, // Confirm
+    data: `輸入資料`, // Enter Data
+    method: `方式`, // Method
+    request: `請求`// Request
   },
-  title: `t驗證你的帳戶`,//verify your accoun
+  title: `t驗證你的帳戶`, // verify your accoun
   types: {
     email: {
-      description: `你所控制的郵箱地址的雜湊值將被儲存在區塊鏈。`,//The hash of the e-mail address you prove control over will be stored on the blockchain.
-      label: `郵箱驗證`//E-mail Verification
+      description: `你所控制的郵箱地址的雜湊值將被儲存在區塊鏈。`, // The hash of the e-mail address you prove control over will be stored on the blockchain.
+      label: `郵箱驗證`// E-mail Verification
     },
     sms: {
-      description: `你所控制的手機號碼將被儲存在區塊鏈。`,//It will be stored on the blockchain that you control a phone number (not <em>which</em>).
-      label: `簡訊驗證`//SMS Verification
+      description: `你所控制的手機號碼將被儲存在區塊鏈。`, // It will be stored on the blockchain that you control a phone number (not <em>which</em>).
+      label: `簡訊驗證`// SMS Verification
     }
   }
 };
diff --git a/js/src/i18n/zh-Hant-TW/wallet.js b/js/src/i18n/zh-Hant-TW/wallet.js
index 74481e624..4c864e40f 100644
--- a/js/src/i18n/zh-Hant-TW/wallet.js
+++ b/js/src/i18n/zh-Hant-TW/wallet.js
@@ -16,31 +16,31 @@
 
 export default {
   buttons: {
-    edit: `編輯`,//edit
+    edit: `編輯`, // edit
     forget: `forget`,
-    settings: `設定`,//settings
-    transfer: `轉帳`//transfer
+    settings: `設定`, // settings
+    transfer: `轉帳`// transfer
   },
   confirmations: {
     buttons: {
-      confirmAs: `確定為……`,//Confirm As...
-      revokeAs: `撤回為……`//Revoke As...
+      confirmAs: `確定為……`, // Confirm As...
+      revokeAs: `撤回為……`// Revoke As...
     },
-    none: `現在沒有交易需要確認。`,//No transactions needs confirmation right now.
+    none: `現在沒有交易需要確認。`, // No transactions needs confirmation right now.
     tooltip: {
-      confirmed: `被{number}/{required}所有人確認`//Confirmed by {number}/{required} owners
+      confirmed: `被{number}/{required}所有人確認`// Confirmed by {number}/{required} owners
     }
   },
   details: {
     requiredOwners: `這個錢包需要至少{owners}所有人驗證所有的操作（交易，修改）`,
-    //This wallet requires at least {owners} to validate any action (transactions, modifications).
+    // This wallet requires at least {owners} to validate any action (transactions, modifications).
     requiredOwnersNumber: `{number} {numberValue, plural, one {owner} other {owners}}`,
     spent: `{spent} has been spent today, out of {limit} set as the daily limit, which has been reset on {date}`,
-    title: `細節`//Details
+    title: `細節`// Details
   },
-  title: `錢包管理`,//Wallet Management
+  title: `錢包管理`, // Wallet Management
   transactions: {
-    none: `沒有交易被髮送。`,//No transactions has been sent.
-    title: `交易`//Transactions
+    none: `沒有交易被髮送。`, // No transactions has been sent.
+    title: `交易`// Transactions
   }
 };
diff --git a/js/src/i18n/zh-Hant-TW/walletSettings.js b/js/src/i18n/zh-Hant-TW/walletSettings.js
index dc1159520..f59b2bb6a 100644
--- a/js/src/i18n/zh-Hant-TW/walletSettings.js
+++ b/js/src/i18n/zh-Hant-TW/walletSettings.js
@@ -28,7 +28,7 @@ export default {
   changes: {
     modificationString: `為了保證你做的修改會被執行，
                         其他的帳戶持有人也需要傳送相同的修改。
-                        他們可以通過貼上以下字串來簡單的完成更改：`, 
+                        他們可以通過貼上以下字串來簡單的完成更改：`,
                         // For your modifications to be taken into account,
               // other owners have to send the same modifications. They can paste
               // this string to make it easier:
@@ -38,7 +38,7 @@ export default {
   edit: {
     message: `為了編輯這個合約的設定，至少{owners, number} 
               {owners, plural, one {owner } other {owners }}必須傳送完全相同的修改
-              你可以將字串化的修改貼上在這裡。` 
+              你可以將字串化的修改貼上在這裡。`
                   // In order to edit this contract's settings, at
                   // least {owners, number} {owners, plural, one {owner } other {owners }} have to
                   // send the very same modifications. You can paste a stringified version
@@ -47,7 +47,7 @@ export default {
   modifications: {
     daylimit: {
       hint: `不需要確認即可傳送的ETH數量`, // amount of ETH spendable without confirmations
-      label: `錢包每日限額` //wallet day limit
+      label: `錢包每日限額` // wallet day limit
     },
     fromString: {
       label: `修改` // modifications
diff --git a/js/src/i18n/zh-Hant-TW/writeContract.js b/js/src/i18n/zh-Hant-TW/writeContract.js
index 8601dda49..37656b56d 100644
--- a/js/src/i18n/zh-Hant-TW/writeContract.js
+++ b/js/src/i18n/zh-Hant-TW/writeContract.js
@@ -50,7 +50,7 @@ export default {
     new: `新建Solidity合約`, // New Solidity Contract
     parameters: `變數`, // Parameters
     saved: `已儲存 @ {timestamp}`, // saved @ {timestamp}
-    selectSolidity: `選擇Solidity版本`, //Select a Solidity version
+    selectSolidity: `選擇Solidity版本`, // Select a Solidity version
     solidity: `正在載入Solidity {version}` // Loading Solidity {version}
   },
   type: {
diff --git a/js/src/i18n/zh/account.js b/js/src/i18n/zh/account.js
index 37adb3f7d..2a8febc28 100644
--- a/js/src/i18n/zh/account.js
+++ b/js/src/i18n/zh/account.js
@@ -16,24 +16,24 @@
 
 export default {
   button: {
-    delete: `删除`,//delete
-    edit: `编辑`,//edit
-    faucet: `Kovan测试网络以太币`,//Kovan ETH 
-    password: `密码`,//password
+    delete: `删除`, // delete
+    edit: `编辑`, // edit
+    faucet: `Kovan测试网络以太币`, // Kovan ETH
+    password: `密码`, // password
     shapeshift: `shapeshift`,
-    transfer: `转账`,//transfer
-    verify: `确认`//verify
+    transfer: `转账`, // transfer
+    verify: `确认`// verify
   },
   hardware: {
     confirmDelete: `你确定从你的账户列表中移除下面的硬件地址吗？`
-  },//Are you sure you want to remove the following hardware address from your account list?
+  }, // Are you sure you want to remove the following hardware address from your account list?
   header: {
-    outgoingTransactions: `{count}笔正在发生的转账`,//{count} outgoing transactions
+    outgoingTransactions: `{count}笔正在发生的转账`, // {count} outgoing transactions
     uuid: `uuid: {uuid}`
   },
-  title: `账户管理`,//Account Management
+  title: `账户管理`, // Account Management
   transactions: {
     poweredBy: `Transaction list powered by {etherscan}提供的交易列表`,
-    title: `交易`//transactions
+    title: `交易`// transactions
   }
 };
diff --git a/js/src/i18n/zh/accounts.js b/js/src/i18n/zh/accounts.js
index 2db3e9b97..78b18fc4b 100644
--- a/js/src/i18n/zh/accounts.js
+++ b/js/src/i18n/zh/accounts.js
@@ -16,21 +16,21 @@
 
 export default {
   button: {
-    newAccount: `账户`,//account
-    newWallet: `钱包`,//wallet
-    vaults: `保险库`//vaults
+    newAccount: `账户`, // account
+    newWallet: `钱包`, // wallet
+    vaults: `保险库`// vaults
   },
   summary: {
-    minedBlock: `在第#{blockNumber}个区块被挖出`//Mined at block #{blockNumber}
+    minedBlock: `在第#{blockNumber}个区块被挖出`// Mined at block #{blockNumber}
   },
-  title: `账户总览`,//Accounts Overview
+  title: `账户总览`, // Accounts Overview
   tooltip: {
     actions: `与当前视窗有关的操作可以在工具栏中快速被找到，不论是执行操作还是创建新项`,
-    //actions relating to the current view are available on the toolbar for quick access, be it for performing actions or creating a new item
+    // actions relating to the current view are available on the toolbar for quick access, be it for performing actions or creating a new item
     overview: `你的账户很容易使用，使你可以编辑元信息、转账、查看交易和向账户充值`
-    //your accounts are visible for easy access, allowing you to edit the meta information, make transfers, view transactions and fund the account
+    // your accounts are visible for easy access, allowing you to edit the meta information, make transfers, view transactions and fund the account
   },
   tooltips: {
-    owner: `{name}持有者`//{name} (owner)
+    owner: `{name}持有者`// {name} (owner)
   }
 };
diff --git a/js/src/i18n/zh/addAddress.js b/js/src/i18n/zh/addAddress.js
index a22dd31aa..f80042102 100644
--- a/js/src/i18n/zh/addAddress.js
+++ b/js/src/i18n/zh/addAddress.js
@@ -20,8 +20,8 @@ export default {
     close: `取消` // Cancel
   },
   header: `如果想在地址簿中添加一条新的记录，你需要拥有账户的网络地址并提供一个的描述（可选）。一旦添加，记录就可以体现在你的地址簿中。`,
-  // To add a new entry to your addressbook, you need the network 
-  // address of the account and can supply an optional description. 
+  // To add a new entry to your addressbook, you need the network
+  // address of the account and can supply an optional description.
   // Once added it will reflect in your address book.
   input: {
     address: {
diff --git a/js/src/i18n/zh/address.js b/js/src/i18n/zh/address.js
index ed1653b61..f9328afed 100644
--- a/js/src/i18n/zh/address.js
+++ b/js/src/i18n/zh/address.js
@@ -16,13 +16,13 @@
 
 export default {
   buttons: {
-    edit: `编辑`,//edit
-    forget: `忘记`,//forget
-    save: `保存`//save
+    edit: `编辑`, // edit
+    forget: `忘记`, // forget
+    save: `保存`// save
   },
   delete: {
-    confirmInfo: `你确定你想把下面的地址从你的地址簿中移除吗？`,//Are you sure you want to remove the following address from your addressbook?
-    title: `确认移除`//confirm removal
+    confirmInfo: `你确定你想把下面的地址从你的地址簿中移除吗？`, // Are you sure you want to remove the following address from your addressbook?
+    title: `确认移除`// confirm removal
   },
-  title: `地址信息`//Address Information
+  title: `地址信息`// Address Information
 };
diff --git a/js/src/i18n/zh/addressSelect.js b/js/src/i18n/zh/addressSelect.js
index ad96528c9..5c45a49a1 100644
--- a/js/src/i18n/zh/addressSelect.js
+++ b/js/src/i18n/zh/addressSelect.js
@@ -15,12 +15,12 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 export default {
-  fromEmail: `使用邮箱{email}进行确认`,//Verified using email {email}
-  fromRegistry: `{name}（来自注册）`,//{name} (from registry)
+  fromEmail: `使用邮箱{email}进行确认`, // Verified using email {email}
+  fromRegistry: `{name}（来自注册）`, // {name} (from registry)
   labels: {
-    accounts: `账户`,//accounts
-    contacts: `合约`,//contacts
-    contracts: `合约`//contracts
+    accounts: `账户`, // accounts
+    contacts: `合约`, // contacts
+    contracts: `合约`// contracts
   },
-  noAccount: `查不到这个账户`//No account matches this query...
+  noAccount: `查不到这个账户`// No account matches this query...
 };
diff --git a/js/src/i18n/zh/addresses.js b/js/src/i18n/zh/addresses.js
index 9702032ff..5e3bd26f0 100644
--- a/js/src/i18n/zh/addresses.js
+++ b/js/src/i18n/zh/addresses.js
@@ -16,10 +16,10 @@
 
 export default {
   buttons: {
-    add: `地址` //address
+    add: `地址` // address
   },
   errors: {
-    invalidFile: `提供的文件是无效的`//The provided file is invalid...
+    invalidFile: `提供的文件是无效的`// The provided file is invalid...
   },
-  title: `保存的地址`//Saved Addresses
+  title: `保存的地址`// Saved Addresses
 };
diff --git a/js/src/i18n/zh/application.js b/js/src/i18n/zh/application.js
index 0d76f1bb8..62412c2d2 100644
--- a/js/src/i18n/zh/application.js
+++ b/js/src/i18n/zh/application.js
@@ -16,15 +16,15 @@
 
 export default {
   frame: {
-    error: `错误：这个应用不能也不应该载入到内置框架中`//ERROR: This application cannot and should not be loaded in an embedded iFrame
+    error: `错误：这个应用不能也不应该载入到内置框架中`// ERROR: This application cannot and should not be loaded in an embedded iFrame
   },
   status: {
     consensus: {
-      capable: `可行`,//Capable
-      capableUntil: `到第 #{blockNumber} 区块前可行`,//Capable until #{blockNumber}
-      incapableSince: `自第 #{blockNumber} 区块后不可行`,//Incapable since #{blockNumber}
-      unknown: `未知能力`//Unknown capability
+      capable: `可行`, // Capable
+      capableUntil: `到第 #{blockNumber} 区块前可行`, // Capable until #{blockNumber}
+      incapableSince: `自第 #{blockNumber} 区块后不可行`, // Incapable since #{blockNumber}
+      unknown: `未知能力`// Unknown capability
     },
-    upgrade: `升级`//Upgrade
+    upgrade: `升级`// Upgrade
   }
 };
diff --git a/js/src/i18n/zh/connection.js b/js/src/i18n/zh/connection.js
index 8ed9840d7..45cf05cf5 100644
--- a/js/src/i18n/zh/connection.js
+++ b/js/src/i18n/zh/connection.js
@@ -15,13 +15,13 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 export default {
   connectingAPI: `正在连接至Parity Secure API`, // Connecting to the Parity Secure API.
-  connectingNode: `正在连接Parity节点。如果弹出任何信息，请确认你的Parity节点正在运行并连接至互联网。`, 
-  // Connecting to the Parity Node. If this informational message persists, 
+  connectingNode: `正在连接Parity节点。如果弹出任何信息，请确认你的Parity节点正在运行并连接至互联网。`,
+  // Connecting to the Parity Node. If this informational message persists,
   // please ensure that your Parity node is running and reachable on the network.
   invalidToken: `无效的签名令牌`, // invalid signer token
   noConnection: `无法连接至Parity Secure API。请升级的你的安全令牌或者生成一个新的，运行{newToken}并粘贴生成的令牌到下方。`,
-  // Unable to make a connection to the Parity Secure API. To update your secure 
-  // token or to generate a new one, run {newToken} and paste the generated token 
+  // Unable to make a connection to the Parity Secure API. To update your secure
+  // token or to generate a new one, run {newToken} and paste the generated token
   // into the space below.
   token: {
     hint: `一个Parity生成的令牌`, // a generated token from Parity
diff --git a/js/src/i18n/zh/createWallet.js b/js/src/i18n/zh/createWallet.js
index f14d73439..76a0e2797 100644
--- a/js/src/i18n/zh/createWallet.js
+++ b/js/src/i18n/zh/createWallet.js
@@ -46,7 +46,7 @@ export default {
     },
     name: {
       hint: `钱包本地名称`,  // the local name for this wallet
-      label: `钱包名称` // wallet name 
+      label: `钱包名称` // wallet name
     },
     nameMulti: {
       hint: `钱包本地名称`, // the local name for this wallet
diff --git a/js/src/i18n/zh/dapp.js b/js/src/i18n/zh/dapp.js
index 1fb256f1b..c23e47f13 100644
--- a/js/src/i18n/zh/dapp.js
+++ b/js/src/i18n/zh/dapp.js
@@ -15,6 +15,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 export default {
-  loading: `正在加载`,//Loading
-  unavailable: `不能获取这个dapp`//The dapp cannot be reached
+  loading: `正在加载`, // Loading
+  unavailable: `不能获取这个dapp`// The dapp cannot be reached
 };
diff --git a/js/src/i18n/zh/dapps.js b/js/src/i18n/zh/dapps.js
index 2b45bd2ce..74fea9b0d 100644
--- a/js/src/i18n/zh/dapps.js
+++ b/js/src/i18n/zh/dapps.js
@@ -18,31 +18,31 @@ export default {
   add: {
     builtin: {
       desc: `Parity团队开发的实验性的，用以展示dapp的性能、集成、实验性特性和控制特定网络的的客户端行为`,
-      //Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.
-      label: `与Parity绑定的应用`//Applications bundled with Parity
+      // Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.
+      label: `与Parity绑定的应用`// Applications bundled with Parity
     },
-    label: `visible applications可见的应用`,//visible applications
+    label: `visible applications可见的应用`, // visible applications
     local: {
       desc: `All applications installed locally on the machine by the user for access by the Parity client.`,
-      label: `本地可用的应用`//Applications locally available
+      label: `本地可用的应用`// Applications locally available
     },
     network: {
       desc: `这些应用与Parity没有关联，也不是Parity发布的。 它们是由各自的作者控制的。 在使用以前，请确保你理解每个应用的目标。`,
-      //These applications are not affiliated with Parity nor are they published by Parity.Each remain under the control of their respective authors.Please ensure that you understand the goals for each application before interacting.
-      label: `全球网络上的应用`//Applications on the global network
+      // These applications are not affiliated with Parity nor are they published by Parity.Each remain under the control of their respective authors.Please ensure that you understand the goals for each application before interacting.
+      label: `全球网络上的应用`// Applications on the global network
     }
   },
   button: {
-    edit: `编辑`,//edit
-    permissions: `许可`//permissions
+    edit: `编辑`, // edit
+    permissions: `许可`// permissions
   },
   external: {
-    accept: `我理解这些应用和Parity没有关联`,//I understand that these applications are not affiliated with Parity
+    accept: `我理解这些应用和Parity没有关联`, // I understand that these applications are not affiliated with Parity
     warning: `第三方开发者开发的应用与Parity没有关联，也不是Parity发布的。 它们是由各自的作者控制的。 在使用以前，请确保你理解每个应用的目标。`
-    //Applications made available on the network by 3rd-party authors are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each before interacting.
+    // Applications made available on the network by 3rd-party authors are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each before interacting.
   },
-  label: `去中心化应用`,//Decentralized Applications
+  label: `去中心化应用`, // Decentralized Applications
   permissions: {
-    label: `可见的dapp账户`//visible dapp accounts
+    label: `可见的dapp账户`// visible dapp accounts
   }
 };
diff --git a/js/src/i18n/zh/deleteAccount.js b/js/src/i18n/zh/deleteAccount.js
index 86e0f314f..f879c60a1 100644
--- a/js/src/i18n/zh/deleteAccount.js
+++ b/js/src/i18n/zh/deleteAccount.js
@@ -16,9 +16,9 @@
 
 export default {
   password: {
-    hint: `提供账户密码，确认删除账户`,//provide the account password to confirm the account deletion
-    label: `账户密码`//account password
+    hint: `提供账户密码，确认删除账户`, // provide the account password to confirm the account deletion
+    label: `账户密码`// account password
   },
-  question: `你确定你想永久地删除下面的账户？`,//Are you sure you want to permanently delete the following account?
-  title: `确认删除`//confirm removal
+  question: `你确定你想永久地删除下面的账户？`, // Are you sure you want to permanently delete the following account?
+  title: `确认删除`// confirm removal
 };
diff --git a/js/src/i18n/zh/deployContract.js b/js/src/i18n/zh/deployContract.js
index 21ea737bb..a07047d1c 100644
--- a/js/src/i18n/zh/deployContract.js
+++ b/js/src/i18n/zh/deployContract.js
@@ -16,75 +16,75 @@
 
 export default {
   busy: {
-    title: `部署正在进行中`//The deployment is currently in progress
+    title: `部署正在进行中`// The deployment is currently in progress
   },
   button: {
-    cancel: `取消`,//Cancel
-    close: `关闭`,//Close
-    create: `创建`,//Create
-    done: `完成`,//Done
-    next: `下一个`//Next
+    cancel: `取消`, // Cancel
+    close: `关闭`, // Close
+    create: `创建`, // Create
+    done: `完成`, // Done
+    next: `下一个`// Next
   },
   completed: {
-    description: `你的合约已经被部署在`//Your contract has been deployed at
+    description: `你的合约已经被部署在`// Your contract has been deployed at
   },
   details: {
     abi: {
-      hint: `合约的abi或者solc 组合输出`,//the abi of the contract to deploy or solc combined-output
-      label: `abi / solc 组合输出 `//abi / solc combined-output
+      hint: `合约的abi或者solc 组合输出`, // the abi of the contract to deploy or solc combined-output
+      label: `abi / solc 组合输出 `// abi / solc combined-output
     },
     address: {
-      hint: `这个合约所有者的账户`,//the owner account for this contract
-      label: `来自账户（合约所有者）`//from account (contract owner)
+      hint: `这个合约所有者的账户`, // the owner account for this contract
+      label: `来自账户（合约所有者）`// from account (contract owner)
     },
     advanced: {
-      label: `高级的发送选项`//advanced sending options
+      label: `高级的发送选项`// advanced sending options
     },
     amount: {
-      hint: `转到这个合约中的数额`,//the amount to transfer to the contract
-      label: `发送数额{tag}`//amount to transfer (in {tag})
+      hint: `转到这个合约中的数额`, // the amount to transfer to the contract
+      label: `发送数额{tag}`// amount to transfer (in {tag})
     },
     code: {
-      hint: `编译好的合约代码`,//the compiled code of the contract to deploy
-      label: `代码`//code
+      hint: `编译好的合约代码`, // the compiled code of the contract to deploy
+      label: `代码`// code
     },
     contract: {
-      label: `选择一个合约`//select a contract
+      label: `选择一个合约`// select a contract
     },
     description: {
-      hint: `对这个合约的描述`,//a description for the contract
-      label: `合约描述（可选）`//contract description (optional)
+      hint: `对这个合约的描述`, // a description for the contract
+      label: `合约描述（可选）`// contract description (optional)
     },
     name: {
-      hint: `已经部署合约的名字`,//a name for the deployed contract
-      label: `合约名字`//contract name
+      hint: `已经部署合约的名字`, // a name for the deployed contract
+      label: `合约名字`// contract name
     }
   },
   owner: {
-    noneSelected: `选择一个有效的地址作为合约的所有者`//a valid account as the contract owner needs to be selected
+    noneSelected: `选择一个有效的地址作为合约的所有者`// a valid account as the contract owner needs to be selected
   },
   parameters: {
-    choose: `选择合约参数`//Choose the contract parameters
+    choose: `选择合约参数`// Choose the contract parameters
   },
   rejected: {
-    description: `你可以安全地关闭窗口，合约部署不会发生。`,//You can safely close this window, the contract deployment will not occur.
-    title: `部署已经被拒绝`//The deployment has been rejected
+    description: `你可以安全地关闭窗口，合约部署不会发生。`, // You can safely close this window, the contract deployment will not occur.
+    title: `部署已经被拒绝`// The deployment has been rejected
   },
   state: {
-    completed: `合约部署已经完成`,//The contract deployment has been completed
-    confirmationNeeded: `这一操作需要这个合约其他所有人的确认。`,//The operation needs confirmations from the other owners of the contract
-    preparing: `为网络传输准备交易`,//Preparing transaction for network transmission
-    validatingCode: `验证已经部署的合约的代码`,//Validating the deployed contract code
-    waitReceipt: `等待合约部署交易收据`,//Waiting for the contract deployment transaction receipt
-    waitSigner: `等待Parity Secure Signer中的交易被确认 `//Waiting for confirmation of the transaction in the Parity Secure Signer
+    completed: `合约部署已经完成`, // The contract deployment has been completed
+    confirmationNeeded: `这一操作需要这个合约其他所有人的确认。`, // The operation needs confirmations from the other owners of the contract
+    preparing: `为网络传输准备交易`, // Preparing transaction for network transmission
+    validatingCode: `验证已经部署的合约的代码`, // Validating the deployed contract code
+    waitReceipt: `等待合约部署交易收据`, // Waiting for the contract deployment transaction receipt
+    waitSigner: `等待Parity Secure Signer中的交易被确认 `// Waiting for confirmation of the transaction in the Parity Secure Signer
   },
   title: {
-    completed: `完成`,//completed
-    deployment: `部署`,//deployment
-    details: `合约细节`,//contract details
-    extras: `额外信息`,//extra information
-    failed: `部署失败`,//deployment failed
-    parameters: `s合约参数`,//contract parameter
-    rejected: `拒绝`//rejected
+    completed: `完成`, // completed
+    deployment: `部署`, // deployment
+    details: `合约细节`, // contract details
+    extras: `额外信息`, // extra information
+    failed: `部署失败`, // deployment failed
+    parameters: `s合约参数`, // contract parameter
+    rejected: `拒绝`// rejected
   }
 };
diff --git a/js/src/i18n/zh/extension.js b/js/src/i18n/zh/extension.js
index 565159ce0..e79c03667 100644
--- a/js/src/i18n/zh/extension.js
+++ b/js/src/i18n/zh/extension.js
@@ -16,7 +16,7 @@
 
 export default {
   install: `现在就安装这个扩展`, // Install the extension now
-  intro: `Parity现在有一个Chrome的扩展，可以安全的浏览以太坊所支持的分布式应用。我们强烈推荐你安装这个扩展来进一步提升你的Parity使用体验。` 
-  // Parity now has an extension available for Chrome that allows safe browsing of Ethereum-enabled distributed applications. 
+  intro: `Parity现在有一个Chrome的扩展，可以安全的浏览以太坊所支持的分布式应用。我们强烈推荐你安装这个扩展来进一步提升你的Parity使用体验。`
+  // Parity now has an extension available for Chrome that allows safe browsing of Ethereum-enabled distributed applications.
   // It is highly recommended that you install this extension to further enhance your Parity experience.
 };
diff --git a/js/src/i18n/zh/faucet.js b/js/src/i18n/zh/faucet.js
index f18464c36..e371b49a2 100644
--- a/js/src/i18n/zh/faucet.js
+++ b/js/src/i18n/zh/faucet.js
@@ -16,14 +16,14 @@
 
 export default {
   buttons: {
-    close: `关闭`,//close
-    done: `关闭`,//close
-    request: `请求`//request
+    close: `关闭`, // close
+    done: `关闭`, // close
+    request: `请求`// request
   },
   summary: {
-    done: `你已经向水龙头请求Kovan ETH测试币`,//Your Kovan ETH has been requested from the faucet which responded with -
+    done: `你已经向水龙头请求Kovan ETH测试币`, // Your Kovan ETH has been requested from the faucet which responded with -
     info: `如果请求将Kovan ETH测试币存入这个地址，你需要确定这个地址在主网络上已经用短信验证过了。 一旦执行水龙头将向当前账户存入Kovan ETH测试币。`
-    //To request a deposit of Kovan ETH to this address, you need to ensure that the address is sms-verified on the mainnet.Once executed the faucet will deposit Kovan ETH into the current account.
+    // To request a deposit of Kovan ETH to this address, you need to ensure that the address is sms-verified on the mainnet.Once executed the faucet will deposit Kovan ETH into the current account.
   },
-  title: `Kovan ETH测试币水龙头`//Kovan ETH Faucet Kovan
+  title: `Kovan ETH测试币水龙头`// Kovan ETH Faucet Kovan
 };
diff --git a/js/src/i18n/zh/firstRun.js b/js/src/i18n/zh/firstRun.js
index 17cc1b607..92278f2fb 100644
--- a/js/src/i18n/zh/firstRun.js
+++ b/js/src/i18n/zh/firstRun.js
@@ -16,37 +16,37 @@
 
 export default {
   button: {
-    close: `关闭`,//Close
-    create: `创建`,//Create
-    next: `下一步`,//Next
-    print: `打印词组`,//Print Phrase
-    skip: `跳过`//Skip
+    close: `关闭`, // Close
+    create: `创建`, // Create
+    next: `下一步`, // Next
+    print: `打印词组`, // Print Phrase
+    skip: `跳过`// Skip
   },
   completed: {
     congrats: `恭喜！你的节点设置已经完成，你现在可以使用应用了。`,
-    //Congratulations! Your node setup has been completed successfully and you are ready to use the application.
+    // Congratulations! Your node setup has been completed successfully and you are ready to use the application.
     next: `下面你将浏览可用的功能和通用的应用界面，让你最快速地使用Parity。`
-    //Next you will receive a walk-through of the available functions and the general application interface to get you up and running in record time.
+    // Next you will receive a walk-through of the available functions and the general application interface to get you up and running in record time.
   },
   title: {
-    completed: `完成`,//completed
-    newAccount: `新账户`,//new account
-    recovery: `恢复`,//recovery
-    terms: `条款`,//terms
-    welcome: `欢迎`//welcome
+    completed: `完成`, // completed
+    newAccount: `新账户`, // new account
+    recovery: `恢复`, // recovery
+    terms: `条款`, // terms
+    welcome: `欢迎`// welcome
   },
   tnc: {
-    accept: `我接受这些条款和条件`//I accept these terms and conditions
+    accept: `我接受这些条款和条件`// I accept these terms and conditions
   },
   welcome: {
     description: `作为初次安装的一部分，下面的几个步骤将指导你如何设置你的Parity和相关账户。我们的目标是使得使用Parity变得尽可能的简单，让你成功运行，所以请有点耐心。 一旦完成，你将拥有`,
-    //As part of a new installation, the next few steps will guide you through the process of setting up you Parity instance and your associated accounts.Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us.Once completed you will have -
-    greeting: `欢迎使用Parity，这是运行以太坊节点的最快和最简单的方式。`,//Welcome to Parity, the fastest and simplest way to run your node.
-    next: `点击下一步继续`,//Click Next to continue your journey.
+    // As part of a new installation, the next few steps will guide you through the process of setting up you Parity instance and your associated accounts.Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us.Once completed you will have -
+    greeting: `欢迎使用Parity，这是运行以太坊节点的最快和最简单的方式。`, // Welcome to Parity, the fastest and simplest way to run your node.
+    next: `点击下一步继续`, // Click Next to continue your journey.
     step: {
-      account: `创建你的第一个Parity账户`,//Created your first Parity account
-      privacy: `理解你的隐私政策和运作条款`,//Understood our privacy policy & terms of operation
-      recovery: `有能力可以恢复你的账户`//Have the ability to recover your account
+      account: `创建你的第一个Parity账户`, // Created your first Parity account
+      privacy: `理解你的隐私政策和运作条款`, // Understood our privacy policy & terms of operation
+      recovery: `有能力可以恢复你的账户`// Have the ability to recover your account
     }
   }
 };
diff --git a/js/src/i18n/zh/settings.js b/js/src/i18n/zh/settings.js
index 2df30a0d8..3630caa45 100644
--- a/js/src/i18n/zh/settings.js
+++ b/js/src/i18n/zh/settings.js
@@ -18,10 +18,10 @@ export default {
   background: {
     button_more: `生成更多`, // generate more
     overview_0: `你现在所看到的背景图案在你的Parity安装中是独一无二的。每次创造一个新的Signer令牌都会改变一次图案。这也保证了去中性化应用不能伪装成可信的样子。`,
-    // The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new 
+    // The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new
     // Signer token. This is so that decentralized applications cannot pretend to be trustworthy.
-    overview_1: `选择一个你喜欢的图案并记住它的样子。这个图案从现在开始会经常出现，除非你清空了浏览器的缓存或者使用了新的Signer令牌。`, 
-    // Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or 
+    overview_1: `选择一个你喜欢的图案并记住它的样子。这个图案从现在开始会经常出现，除非你清空了浏览器的缓存或者使用了新的Signer令牌。`,
+    // Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or
     // use a new Signer token.
     label: `背景` // background
   },
@@ -56,9 +56,9 @@ export default {
   },
   proxy: {
     details_0: `除了通过IP地址和端口来访问Parity，你也能通过.parity子域名来使用Parity，访问 {homeProxy}。为了设置基于子域名的路由，你需要添加相关的代理记录至你的浏览器。`,
-    // Instead of accessing Parity via the IP address and port, you will be able to access it via the .parity subdomain, by visiting 
+    // Instead of accessing Parity via the IP address and port, you will be able to access it via the .parity subdomain, by visiting
     // {homeProxy}. To setup subdomain-based routing, you need to add the relevant proxy entries to your browser,
-    details_1: `如果想了解如何配置代理，教程已提供在{windowsLink}，{macOSLink}和{ubuntuLink}。`, 
+    details_1: `如果想了解如何配置代理，教程已提供在{windowsLink}，{macOSLink}和{ubuntuLink}。`,
     // To learn how to configure the proxy, instructions are provided for {windowsLink}, {macOSLink} or {ubuntuLink}.
     details_macos: `macOS`, // macOS
     details_ubuntu: `Ubuntu`, // Ubuntu
@@ -70,19 +70,19 @@ export default {
   views: {
     accounts: {
       description: `一个此Parity实例所关联和导入的所有账户的列表。发送交易、接收流入价值、管理你的账目和资助你的账户。`,
-      // A list of all the accounts associated with and imported into this Parity instance. Send transactions, receive incoming values, 
+      // A list of all the accounts associated with and imported into this Parity instance. Send transactions, receive incoming values,
       // manage your balances and fund your accounts.
       label: `账户` // Accounts
     },
     addresses: {
       description: `一个此Parity实例管理的所有联系人和地址簿记录的列表。只需点击一个按钮就可以观察账户并获得所有交易相关的信息。`,
-      // A list of all contacts and address book entries managed by this Parity instance. Watch accounts and have the details available 
+      // A list of all contacts and address book entries managed by this Parity instance. Watch accounts and have the details available
       // at the click of a button when transacting.
       label: `地址簿` // Addressbook
     },
     apps: {
       description: `与整个底层网络交流的分布式应用。添加应用，管理你的应用库和与网络上的其他应用进行交互。`,
-      // Distributed applications that interact with the underlying network. Add applications, manage you application portfolio and 
+      // Distributed applications that interact with the underlying network. Add applications, manage you application portfolio and
       // interact with application from around the network.
       label: `应用` // Applications
     },
@@ -106,14 +106,14 @@ export default {
       label: `设置` // Settings
     },
     signer: {
-      description: `这个应用安全交易管理区域，你可以通过任何从本应用和其他分布式应用发起的即将发送的交易`, 
-      // The secure transaction management area of the application where you can approve any outgoing transactions made 
+      description: `这个应用安全交易管理区域，你可以通过任何从本应用和其他分布式应用发起的即将发送的交易`,
+      // The secure transaction management area of the application where you can approve any outgoing transactions made
       // from the application as well as those placed into the queue by distributed applications.
       label: `Signer` // Signer
     },
     status: {
       description: `观察Parity节点现在的运行情况：网络连接数、实际运行实例的Logs和具体挖矿信息（如果已开启并设置）`,
-      // See how the Parity node is performing in terms of connections to the network, logs from the actual running instance 
+      // See how the Parity node is performing in terms of connections to the network, logs from the actual running instance
       // and details of mining (if enabled and configured).
       label: `状态` // Status
     },
diff --git a/js/src/i18n/zh/shapeshift.js b/js/src/i18n/zh/shapeshift.js
index 25145c3e3..7af706d27 100644
--- a/js/src/i18n/zh/shapeshift.js
+++ b/js/src/i18n/zh/shapeshift.js
@@ -40,7 +40,7 @@ export default {
   },
   errorStep: {
     info: `通过{shapeshiftLink}进行的资金转换因为一个交易的致命错误失败了。交易提供的错误信息如下：`
-    // The funds shifting via {shapeshiftLink} failed with a fatal error on the exchange. The error message received from the exchange 
+    // The funds shifting via {shapeshiftLink} failed with a fatal error on the exchange. The error message received from the exchange
     // is as follow:
   },
   optionsStep: {
@@ -52,7 +52,7 @@ export default {
     },
     terms: {
       label: `我理解ShapeShift.io是一个第三方服务，使用此服务发生的任何信息/资金发送是完全不受Parity控制的`
-      // I understand that ShapeShift.io is a 3rd-party service and by using the service any transfer of information and/or funds is 
+      // I understand that ShapeShift.io is a 3rd-party service and by using the service any transfer of information and/or funds is
       // completely out of the control of Parity
     },
     typeSelect: {
diff --git a/js/src/i18n/zh/signer.js b/js/src/i18n/zh/signer.js
index 4c9afb424..ab3b99e53 100644
--- a/js/src/i18n/zh/signer.js
+++ b/js/src/i18n/zh/signer.js
@@ -41,7 +41,7 @@ export default {
   },
   requestsPage: {
     noPending: `没有请求需要你的确认`, // There are no requests requiring your confirmation.
-    pendingTitle: `待处理请求`, //Pending Requests
+    pendingTitle: `待处理请求`, // Pending Requests
     queueTitle: `本地交易` // Local Transactions
   },
   sending: {
diff --git a/js/src/i18n/zh/tabBar.js b/js/src/i18n/zh/tabBar.js
index 9351cd769..7521c1b33 100644
--- a/js/src/i18n/zh/tabBar.js
+++ b/js/src/i18n/zh/tabBar.js
@@ -17,6 +17,6 @@
 export default {
   tooltip: {
     overview: `在应用的不同部分和不同界面进行导航，在账户界面、代币界面和分布式应用界面之间切换。`
-    //navigate between the different parts and views of the application, switching between an account view, token view and distributed application view
+    // navigate between the different parts and views of the application, switching between an account view, token view and distributed application view
   }
 };
diff --git a/js/src/i18n/zh/transfer.js b/js/src/i18n/zh/transfer.js
index b83becca8..79c886719 100644
--- a/js/src/i18n/zh/transfer.js
+++ b/js/src/i18n/zh/transfer.js
@@ -17,46 +17,46 @@
 export default {
   advanced: {
     data: {
-      hint: `交易附带数据`,//the data to pass through with the transaction
-      label: `交易数据`//transaction data
+      hint: `交易附带数据`, // the data to pass through with the transaction
+      label: `交易数据`// transaction data
     }
   },
   buttons: {
-    back: `返回`,//Back
-    cancel: `取消`,//Cancel
-    close: `关闭`,//Close
-    next: `下一步`,//Next
-    send: `发送`//Send
+    back: `返回`, // Back
+    cancel: `取消`, // Cancel
+    close: `关闭`, // Close
+    next: `下一步`, // Next
+    send: `发送`// Send
   },
   details: {
     advanced: {
-      label: `高级发送选项`//advanced sending options
+      label: `高级发送选项`// advanced sending options
     },
     amount: {
-      hint: `发送数额`,//the amount to transfer to the recipient
-      label: `发送数额{tag}`//amount to transfer (in {tag})
+      hint: `发送数额`, // the amount to transfer to the recipient
+      label: `发送数额{tag}`// amount to transfer (in {tag})
     },
     fullBalance: {
-      label: `所有的余额`//full account balance
+      label: `所有的余额`// full account balance
     },
     recipient: {
-      hint: `收款人地址`,//the recipient address
-      label: `收款人地址`//recipient address
+      hint: `收款人地址`, // the recipient address
+      label: `收款人地址`// recipient address
     },
     sender: {
-      hint: `发送人地址`,//the sender address
-      label: `发送人地址`//sender address
+      hint: `发送人地址`, // the sender address
+      label: `发送人地址`// sender address
     },
     total: {
-      label: `发送数额`//total transaction amount
+      label: `发送数额`// total transaction amount
     }
   },
   wallet: {
-    confirmation: `这笔交易需要其他人的确认。`,//This transaction needs confirmation from other owners.
-    operationHash: `操作哈希`//operation hash
+    confirmation: `这笔交易需要其他人的确认。`, // This transaction needs confirmation from other owners.
+    operationHash: `操作哈希`// operation hash
   },
   warning: {
     wallet_spent_limit: `这笔转账的数额超过了每日转账数额上限。此交易需要其他人的确认才可以发送成功。`
-    //This transaction value is above the remaining daily limit. It will need to be confirmed by other owners.
+    // This transaction value is above the remaining daily limit. It will need to be confirmed by other owners.
   }
 };
diff --git a/js/src/i18n/zh/txEditor.js b/js/src/i18n/zh/txEditor.js
index 762d214f2..da55c7b23 100644
--- a/js/src/i18n/zh/txEditor.js
+++ b/js/src/i18n/zh/txEditor.js
@@ -17,24 +17,24 @@
 export default {
   condition: {
     block: {
-      hint: `在某个区块高度后发送`,//The minimum block to send from
-      label: `交易发送区块`//Transaction send block
+      hint: `在某个区块高度后发送`, // The minimum block to send from
+      label: `交易发送区块`// Transaction send block
     },
-    blocknumber: `在某个区块后发送`,//Send after BlockNumber
+    blocknumber: `在某个区块后发送`, // Send after BlockNumber
     date: {
-      hint: `在某日后发送`,//The minimum date to send from
-      label: `交易发送日期`//Transaction send date
+      hint: `在某日后发送`, // The minimum date to send from
+      label: `交易发送日期`// Transaction send date
     },
-    datetime: `在某日某时后发送`,//Send after Date & Tim
-    label: `交易激活的条件`,//Condition where transaction activates
-    none: `无条件`,//No conditions
+    datetime: `在某日某时后发送`, // Send after Date & Tim
+    label: `交易激活的条件`, // Condition where transaction activates
+    none: `无条件`, // No conditions
     time: {
-      hint: `在某时间后发送`,//The minimum time to send from
-      label: `交易发送时间`//Transaction send time
+      hint: `在某时间后发送`, // The minimum time to send from
+      label: `交易发送时间`// Transaction send time
     }
   },
   gas: {
     info: `你可以基于最近的交易gas价格的分布选择gas价格。 gas价格越低，交易费用越便宜。 gas 价格越高，交易被网络打包的速度越快。`
-    //You can choose the gas price based on the distribution of recent included transaction gas prices.The lower the gas price is, the cheaper the transaction will be.The higher the gas price is, the faster it should get mined by the network.
+    // You can choose the gas price based on the distribution of recent included transaction gas prices.The lower the gas price is, the cheaper the transaction will be.The higher the gas price is, the faster it should get mined by the network.
   }
 };
diff --git a/js/src/i18n/zh/ui.js b/js/src/i18n/zh/ui.js
index 89b91369d..694372f00 100644
--- a/js/src/i18n/zh/ui.js
+++ b/js/src/i18n/zh/ui.js
@@ -18,56 +18,56 @@ export default {
   actionbar: {
     export: {
       button: {
-        export: `导出`//export
+        export: `导出`// export
       }
     },
     import: {
       button: {
-        cancel: `取消`,//Cancel
-        confirm: `确认`,//Confirm
-        import: `导入`//import
+        cancel: `取消`, // Cancel
+        confirm: `确认`, // Confirm
+        import: `导入`// import
       },
-      confirm: `确认这是你想导入的`,//Confirm that this is what was intended to import.
-      error: `发生错误：{errorText}`,//An error occured: {errorText}
+      confirm: `确认这是你想导入的`, // Confirm that this is what was intended to import.
+      error: `发生错误：{errorText}`, // An error occured: {errorText}
       step: {
-        error: `错误`,//error
-        select: `选择一个文件`,//select a file
-        validate: `确认`//validate
+        error: `错误`, // error
+        select: `选择一个文件`, // select a file
+        validate: `确认`// validate
       },
-      title: `从一个文件导入`//Import from a file
+      title: `从一个文件导入`// Import from a file
     },
     search: {
-      hint: `输入搜索内容……`//Enter search input...
+      hint: `输入搜索内容……`// Enter search input...
     },
     sort: {
-      sortBy: `根据{label}排序`,//Sort by {label}
-      typeDefault: `默认`,//Default
-      typeEth: `根据以太币数额排序`,//Sort by ETH
-      typeName: `根据账户名字排序`,//Sort by name
-      typeTags: `根据标签排序`//Sort by tags
+      sortBy: `根据{label}排序`, // Sort by {label}
+      typeDefault: `默认`, // Default
+      typeEth: `根据以太币数额排序`, // Sort by ETH
+      typeName: `根据账户名字排序`, // Sort by name
+      typeTags: `根据标签排序`// Sort by tags
     }
   },
   balance: {
-    none: `这个账户没有余额`//No balances associated with this account
+    none: `这个账户没有余额`// No balances associated with this account
   },
   blockStatus: {
-    bestBlock: `最新区块{blockNumber}`,//{blockNumber} best block
-    syncStatus: `currentBlock}/{highestBlock}区块同步`,//{currentBlock}/{highestBlock} syncing{
-    warpRestore: `{percentage}%恢复`,//{percentage}% warp restore
-    warpStatus: `, {percentage}%历史`//{percentage}% historic
+    bestBlock: `最新区块{blockNumber}`, // {blockNumber} best block
+    syncStatus: `currentBlock}/{highestBlock}区块同步`, // {currentBlock}/{highestBlock} syncing{
+    warpRestore: `{percentage}%恢复`, // {percentage}% warp restore
+    warpStatus: `, {percentage}%历史`// {percentage}% historic
   },
   confirmDialog: {
-    no: `不是`,//no
-    yes: `是`//yes
+    no: `不是`, // no
+    yes: `是`// yes
   },
   copyToClipboard: {
-    copied: `复制{data}到粘贴板`//copied {data} to clipboard
+    copied: `复制{data}到粘贴板`// copied {data} to clipboard
   },
   errors: {
-    close: `关闭`//close
+    close: `关闭`// close
   },
   fileSelect: {
-    defaultLabel: `拉一个文件到这里，或者选择一个文件上传`//Drop a file here, or click to select a file to upload
+    defaultLabel: `拉一个文件到这里，或者选择一个文件上传`// Drop a file here, or click to select a file to upload
   },
   gasPriceSelector: {
     customTooltip: {
@@ -75,8 +75,8 @@ export default {
     }
   },
   identityName: {
-    null: `空`,//NULL
-    unnamed: `未命名`//UNNAMED
+    null: `空`, // NULL
+    unnamed: `未命名`// UNNAMED
   },
   methodDecoding: {
     condition: {
@@ -84,20 +84,20 @@ export default {
       time: `, {historic, select, true {Submitted} false {Submission}} at {timestamp}`
     },
     deploy: {
-      address: `在地址上部署一个合约`,//Deployed a contract at address
-      params: `附带下面的参数：`,//with the following parameters:
-      willDeploy: `将要部署一个合约`,//Will deploy a contract
-      withValue: `, 发送{value}`//sending {value}
+      address: `在地址上部署一个合约`, // Deployed a contract at address
+      params: `附带下面的参数：`, // with the following parameters:
+      willDeploy: `将要部署一个合约`, // Will deploy a contract
+      withValue: `, 发送{value}`// sending {value}
     },
-    gasUsed: `({gas}gas消耗)`,//{gas} gas used
+    gasUsed: `({gas}gas消耗)`, // {gas} gas used
     gasValues: `{gas} gas ({gasPrice}M/{tag})`,
     input: {
-      data: `数据`,//data
-      input: `输入`,//input
+      data: `数据`, // data
+      input: `输入`, // input
       withInput: `with the {inputDesc} {inputValue}`
     },
     receive: {
-      contract: `合约`,//the contract
+      contract: `合约`, // the contract
       info: `{historic, select, true {Received} false {Will receive}} {valueEth} from {aContract}{address}`
     },
     signature: {
@@ -116,48 +116,48 @@ export default {
     }
   },
   passwordStrength: {
-    label: `密码强度`//password strength
+    label: `密码强度`// password strength
   },
   tooltips: {
     button: {
-      done: `完成`,//Done
-      next: `下一步`,//Next
-      skip: `跳过`//Skip
+      done: `完成`, // Done
+      next: `下一步`, // Next
+      skip: `跳过`// Skip
     }
   },
   txHash: {
     confirmations: `{count} {value, plural, one {confirmation} other {confirmations}}`,
-    oog: `这笔交易已经耗光了gas。请用更多的gas尝试。`,//The transaction might have gone out of gas. Try again with more gas.
-    posted: `这笔交易已经被发送到网络，附带哈希是{hashLink}`,//The transaction has been posted to the network with a hash of {hashLink}
-    waiting: `等待确认`//waiting for confirmations
+    oog: `这笔交易已经耗光了gas。请用更多的gas尝试。`, // The transaction might have gone out of gas. Try again with more gas.
+    posted: `这笔交易已经被发送到网络，附带哈希是{hashLink}`, // The transaction has been posted to the network with a hash of {hashLink}
+    waiting: `等待确认`// waiting for confirmations
   },
   vaultSelect: {
-    hint: `这个账户绑定的保险库是`,//the vault this account is attached to
-    label: `相关保险库`//associated vault
+    hint: `这个账户绑定的保险库是`, // the vault this account is attached to
+    label: `相关保险库`// associated vault
   },
   verification: {
     gatherData: {
       accountHasRequested: {
-        false: `.你还没有从这个账户请求确认。`,//You did not request verification from this account yet
-        pending: `检查一下你是否请求了验证……`,//Checking if you requested verification…
-        true: `你已经从这个账户请求到验证。`//You already requested verification from this account.
+        false: `.你还没有从这个账户请求确认。`, // You did not request verification from this account yet
+        pending: `检查一下你是否请求了验证……`, // Checking if you requested verification…
+        true: `你已经从这个账户请求到验证。`// You already requested verification from this account.
       },
       accountIsVerified: {
-        false: `你的账户还没有被验证。`,//Your account is not verified yet.
-        pending: `检查一下你的账户是否已经被验证……`,//Checking if your account is verified…
-        true: `你的账户已经被验证。`//Your account is already verified.
+        false: `你的账户还没有被验证。`, // Your account is not verified yet.
+        pending: `检查一下你的账户是否已经被验证……`, // Checking if your account is verified…
+        true: `你的账户已经被验证。`// Your account is already verified.
       },
-      fee: `额外的费用是{amount}ETH`,//The additional fee is {amount} ETH.
+      fee: `额外的费用是{amount}ETH`, // The additional fee is {amount} ETH.
       isAbleToRequest: {
-        pending: `验证你的输入……`//Validating your input…
+        pending: `验证你的输入……`// Validating your input…
       },
       isServerRunning: {
-        false: `验证服务器没有在运行。`,//The verification server is not running.
-        pending: `检查一下验证服务器是否在运行……`,//Checking if the verification server is running…
-        true: `验证服务器正在运行。`//The verification server is running.
+        false: `验证服务器没有在运行。`, // The verification server is not running.
+        pending: `检查一下验证服务器是否在运行……`, // Checking if the verification server is running…
+        true: `验证服务器正在运行。`// The verification server is running.
       },
-      nofee: `没有额外的费用。`,//There is no additional fee.
-      termsOfService: `我同意下面的条款和条件。`//I agree to the terms and conditions below.
+      nofee: `没有额外的费用。`, // There is no additional fee.
+      termsOfService: `我同意下面的条款和条件。`// I agree to the terms and conditions below.
     }
   }
 };
diff --git a/js/src/i18n/zh/upgradeParity.js b/js/src/i18n/zh/upgradeParity.js
index 531a21c2b..a3ddd27bd 100644
--- a/js/src/i18n/zh/upgradeParity.js
+++ b/js/src/i18n/zh/upgradeParity.js
@@ -16,40 +16,40 @@
 
 export default {
   busy: `你正在升级到Parity最新版本{newversion}。请等待升级过程完成。`,
-  //Your upgrade to Parity {newversion} is currently in progress. Please wait until the process completes.
+  // Your upgrade to Parity {newversion} is currently in progress. Please wait until the process completes.
   button: {
-    close: `关闭`,//close
-    done: `完成`,//done
-    upgrade: `现在升级`//upgrade now
+    close: `关闭`, // close
+    done: `完成`, // done
+    upgrade: `现在升级`// upgrade now
   },
   completed: `你升级到Parity最新版本{newversion}的操作已经完成。点击“完成”将自动重新加载这个应用。`,
-  //Your upgrade to Parity {newversion} has been successfully completed. Click "done" to automatically reload the application.
+  // Your upgrade to Parity {newversion} has been successfully completed. Click "done" to automatically reload the application.
   consensus: {
     capable: `你当前的Parity版本能够处理网络请求。`,
-    //Your current Parity version is capable of handling the network requirements.
+    // Your current Parity version is capable of handling the network requirements.
     capableUntil: `你当前的Parity版本能够处理直到第{blockNumber}个区块的网络请求。`,
-    //Your current Parity version is capable of handling the network requirements until block {blockNumber}
+    // Your current Parity version is capable of handling the network requirements until block {blockNumber}
     incapableSince: `你当前的Parity版本能够处理第{blockNumber}个区块以后的网络请求。`,
-    //Your current Parity version is incapable of handling the network requirements since block {blockNumber}
+    // Your current Parity version is incapable of handling the network requirements since block {blockNumber}
     unknown: `你当前的Parity版本能够处理网络请求。`
-    //Your current Parity version is capable of handling the network requirements.
+    // Your current Parity version is capable of handling the network requirements.
   },
   failed: `升级到Parity最新版本{newversion}遇到错误，升级失败。`,
-  //Your upgrade to Parity {newversion} has failed with an error.
+  // Your upgrade to Parity {newversion} has failed with an error.
   info: {
-    currentVersion: `你现在正在运行{currentversion}版本。`,//You are currently running {currentversion}
-    next: `点击“现在升级”，开始Parity升级。`,//Proceed with "upgrade now" to start your Parity upgrade.
-    upgrade: `可以升级到最新版本{newversion}`,//An upgrade to version {newversion} is available
+    currentVersion: `你现在正在运行{currentversion}版本。`, // You are currently running {currentversion}
+    next: `点击“现在升级”，开始Parity升级。`, // Proceed with "upgrade now" to start your Parity upgrade.
+    upgrade: `可以升级到最新版本{newversion}`, // An upgrade to version {newversion} is available
     welcome: `迎来到Parity升级指南，让你享受无缝升级到Parity最新版本的体验。`
-    //Welcome to the Parity upgrade wizard, allowing you a completely seamless upgrade experience to the next version of Parity.欢
+    // Welcome to the Parity upgrade wizard, allowing you a completely seamless upgrade experience to the next version of Parity.欢
   },
   step: {
-    completed: `升级完成`,//upgrade completed
-    error: `错误`,//error
-    info: `可以升级`,//upgrade available
-    updating: `升级Parity`//upgrading parity
+    completed: `升级完成`, // upgrade completed
+    error: `错误`, // error
+    info: `可以升级`, // upgrade available
+    updating: `升级Parity`// upgrading parity
   },
   version: {
-    unknown: `未知`//unknown
+    unknown: `未知`// unknown
   }
 };
diff --git a/js/src/i18n/zh/vaults.js b/js/src/i18n/zh/vaults.js
index 43e9ea94c..7d31ca64b 100644
--- a/js/src/i18n/zh/vaults.js
+++ b/js/src/i18n/zh/vaults.js
@@ -32,13 +32,13 @@ export default {
   },
   confirmClose: {
     info: `你即将关闭一个保险库。所有与这个保险库相关的账户在这个操作完成后都不再可见。如果想再见到关联账户，请重新打开保险库。`,
-    // You are about to close a vault. Any accounts associated with the vault won't be visible after this operation concludes. To view 
+    // You are about to close a vault. Any accounts associated with the vault won't be visible after this operation concludes. To view
     // the associated accounts, open the vault again.
     title: `关闭保险库` // Close Vault
   },
   confirmOpen: {
     info: `你即将打开一个保险库。在确认了你的密码之后，所有与这个保险库关联的账户都会可见。关闭保险库会在界面中移除所有账户，直到保险库被再次打开。`,
-    // You are about to open a vault. After confirming your password, all accounts associated with this vault will be visible. Closing 
+    // You are about to open a vault. After confirming your password, all accounts associated with this vault will be visible. Closing
     // the vault will remove the accounts from view until the vault is opened again.
     password: {
       hint: `创建保险库时设置的密码`, // the password specified when creating the vault
@@ -106,7 +106,7 @@ export default {
   empty: `目前没有任何可显示的保险库`, // There are currently no vaults to display.
   selector: {
     noneAvailable: `目前没有任何打开、可选的保险库。请在移动账户之前创建并打开一个保险库。`,
-    // There are currently no vaults opened and available for selection. Create and open some first before attempting to select 
+    // There are currently no vaults opened and available for selection. Create and open some first before attempting to select
     // a vault for an account move.
     title: `选择账户保险库` // Select Account Vault
   },
diff --git a/js/src/i18n/zh/verification.js b/js/src/i18n/zh/verification.js
index 09e62c37f..b46d9077a 100644
--- a/js/src/i18n/zh/verification.js
+++ b/js/src/i18n/zh/verification.js
@@ -16,70 +16,70 @@
 
 export default {
   button: {
-    cancel: `取消`,//Cancel
-    done: `完成`,//Done
-    next: `下一步`//Next
+    cancel: `取消`, // Cancel
+    done: `完成`, // Done
+    next: `下一步`// Next
   },
   code: {
-    error: `无效验证码`,//invalid code
-    hint: `输入你收到的验证码。`,//Enter the code you received.
-    label: `验证码`,//verification code
-    sent: `验证码被发送到接收者{receiver}.`//The verification code has been sent to {receiver}
+    error: `无效验证码`, // invalid code
+    hint: `输入你收到的验证码。`, // Enter the code you received.
+    label: `验证码`, // verification code
+    sent: `验证码被发送到接收者{receiver}.`// The verification code has been sent to {receiver}
   },
   confirmation: {
-    authorise: `验证码将被发送到合约。请使用Parity Signer进行授权。`,//The verification code will be sent to the contract. Please authorize this using the Parity Signer.
-    windowOpen: `请保持这个窗口打开状态。`//Please keep this window open.
+    authorise: `验证码将被发送到合约。请使用Parity Signer进行授权。`, // The verification code will be sent to the contract. Please authorize this using the Parity Signer.
+    windowOpen: `请保持这个窗口打开状态。`// Please keep this window open.
   },
   done: {
-    message: `恭喜，你的账户已经被认证。`//Congratulations, your account is verified!
+    message: `恭喜，你的账户已经被认证。`// Congratulations, your account is verified!
   },
   email: {
-    enterCode: `输入你从邮箱获得验证码。`//Enter the code you received via e-mail.
+    enterCode: `输入你从邮箱获得验证码。`// Enter the code you received via e-mail.
   },
   gatherData: {
     email: {
-      hint: `验证码将被发送到这个地址`,//the code will be sent to this address
-      label: `邮箱地址`//e-mail address
+      hint: `验证码将被发送到这个地址`, // the code will be sent to this address
+      label: `邮箱地址`// e-mail address
     },
     phoneNumber: {
-      hint: `短信将被发送到这个号码`,//the SMS will be sent to this number
-      label: `国际格式的手机号码`//phone number in international format
+      hint: `短信将被发送到这个号码`, // the SMS will be sent to this number
+      label: `国际格式的手机号码`// phone number in international format
     }
   },
   gatherDate: {
     email: {
-      error: `无效邮箱`//invalid e-mail
+      error: `无效邮箱`// invalid e-mail
     },
     phoneNumber: {
-      error: `无效数字`//invalid number
+      error: `无效数字`// invalid number
     }
   },
-  loading: `加载验证数据`,//Loading verification data.
+  loading: `加载验证数据`, // Loading verification data.
   request: {
-    authorise: `验证请求将被发送到这个合约。请使用Parity Signer进行授权。`,//A verification request will be sent to the contract. Please authorize this using the Parity Signer.
-    requesting: `正在从Parity服务器请求一个验证码，等待它被输入到合约。`,//Requesting a code from the Parity server and waiting for the puzzle to be put into the contract.
-    windowOpen: `请保持窗口为打开状态。`//Please keep this window open.
+    authorise: `验证请求将被发送到这个合约。请使用Parity Signer进行授权。`, // A verification request will be sent to the contract. Please authorize this using the Parity Signer.
+    requesting: `正在从Parity服务器请求一个验证码，等待它被输入到合约。`, // Requesting a code from the Parity server and waiting for the puzzle to be put into the contract.
+    windowOpen: `请保持窗口为打开状态。`// Please keep this window open.
   },
   sms: {
-    enterCode: `输入你从短信收到的验证码。`//Enter the code you received via SMS.
+    enterCode: `输入你从短信收到的验证码。`// Enter the code you received via SMS.
   },
   steps: {
-    code: `输入验证码`,//Enter Code
-    completed: `完成`,//Completed
-    confirm: `确认`,//Confirm
-    data: `输入数据`,//Enter Data
-    method: `方式`,//Method
-    request: `请求`//Request
+    code: `输入验证码`, // Enter Code
+    completed: `完成`, // Completed
+    confirm: `确认`, // Confirm
+    data: `输入数据`, // Enter Data
+    method: `方式`, // Method
+    request: `请求`// Request
   },
-  title: `t验证你的账户`,//verify your accoun
+  title: `t验证你的账户`, // verify your accoun
   types: {
     email: {
-      description: `你所控制的邮箱地址的哈希值将被存储在区块链。`,//The hash of the e-mail address you prove control over will be stored on the blockchain.
-      label: `邮箱验证`//E-mail Verification
+      description: `你所控制的邮箱地址的哈希值将被存储在区块链。`, // The hash of the e-mail address you prove control over will be stored on the blockchain.
+      label: `邮箱验证`// E-mail Verification
     },
     sms: {
-      description: `你所控制的手机号码将被存储在区块链。`,//It will be stored on the blockchain that you control a phone number (not <em>which</em>).
-      label: `短信验证`//SMS Verification
+      description: `你所控制的手机号码将被存储在区块链。`, // It will be stored on the blockchain that you control a phone number (not <em>which</em>).
+      label: `短信验证`// SMS Verification
     }
   }
 };
diff --git a/js/src/i18n/zh/wallet.js b/js/src/i18n/zh/wallet.js
index 27670fd8a..fd391ad43 100644
--- a/js/src/i18n/zh/wallet.js
+++ b/js/src/i18n/zh/wallet.js
@@ -16,31 +16,31 @@
 
 export default {
   buttons: {
-    edit: `编辑`,//edit
+    edit: `编辑`, // edit
     forget: `forget`,
-    settings: `设置`,//settings
-    transfer: `转账`//transfer
+    settings: `设置`, // settings
+    transfer: `转账`// transfer
   },
   confirmations: {
     buttons: {
-      confirmAs: `确定为……`,//Confirm As...
-      revokeAs: `撤回为……`//Revoke As...
+      confirmAs: `确定为……`, // Confirm As...
+      revokeAs: `撤回为……`// Revoke As...
     },
-    none: `现在没有交易需要确认。`,//No transactions needs confirmation right now.
+    none: `现在没有交易需要确认。`, // No transactions needs confirmation right now.
     tooltip: {
-      confirmed: `被{number}/{required}所有人确认`//Confirmed by {number}/{required} owners
+      confirmed: `被{number}/{required}所有人确认`// Confirmed by {number}/{required} owners
     }
   },
   details: {
     requiredOwners: `这个钱包需要至少{owners}所有人验证所有的操作（交易，修改）`,
-    //This wallet requires at least {owners} to validate any action (transactions, modifications).
+    // This wallet requires at least {owners} to validate any action (transactions, modifications).
     requiredOwnersNumber: `{number} {numberValue, plural, one {owner} other {owners}}`,
     spent: `{spent} has been spent today, out of {limit} set as the daily limit, which has been reset on {date}`,
-    title: `细节`//Details
+    title: `细节`// Details
   },
-  title: `钱包管理`,//Wallet Management
+  title: `钱包管理`, // Wallet Management
   transactions: {
-    none: `没有交易被发送。`,//No transactions has been sent.
-    title: `交易`//Transactions
+    none: `没有交易被发送。`, // No transactions has been sent.
+    title: `交易`// Transactions
   }
 };
diff --git a/js/src/i18n/zh/walletSettings.js b/js/src/i18n/zh/walletSettings.js
index 32f569767..429542a37 100644
--- a/js/src/i18n/zh/walletSettings.js
+++ b/js/src/i18n/zh/walletSettings.js
@@ -28,7 +28,7 @@ export default {
   changes: {
     modificationString: `为了保证你做的修改会被执行，
                         其他的账户持有人也需要发送相同的修改。
-                        他们可以通过粘贴以下字符串来简单的完成更改：`, 
+                        他们可以通过粘贴以下字符串来简单的完成更改：`,
                         // For your modifications to be taken into account,
               // other owners have to send the same modifications. They can paste
               // this string to make it easier:
@@ -38,7 +38,7 @@ export default {
   edit: {
     message: `为了编辑这个合约的设置，至少{owners, number} 
               {owners, plural, one {owner } other {owners }}必须发送完全相同的修改
-              你可以将字符串化的修改粘贴在这里。` 
+              你可以将字符串化的修改粘贴在这里。`
                   // In order to edit this contract's settings, at
                   // least {owners, number} {owners, plural, one {owner } other {owners }} have to
                   // send the very same modifications. You can paste a stringified version
@@ -47,7 +47,7 @@ export default {
   modifications: {
     daylimit: {
       hint: `不需要确认即可发送的ETH数量`, // amount of ETH spendable without confirmations
-      label: `钱包每日限额` //wallet day limit
+      label: `钱包每日限额` // wallet day limit
     },
     fromString: {
       label: `修改` // modifications
diff --git a/js/src/i18n/zh/writeContract.js b/js/src/i18n/zh/writeContract.js
index 5efc9f58f..c258b4680 100644
--- a/js/src/i18n/zh/writeContract.js
+++ b/js/src/i18n/zh/writeContract.js
@@ -50,7 +50,7 @@ export default {
     new: `新建Solidity合约`, // New Solidity Contract
     parameters: `变量`, // Parameters
     saved: `已保存 @ {timestamp}`, // saved @ {timestamp}
-    selectSolidity: `选择Solidity版本`, //Select a Solidity version
+    selectSolidity: `选择Solidity版本`, // Select a Solidity version
     solidity: `正在加载Solidity {version}` // Loading Solidity {version}
   },
   type: {

From 3be3b78c905d53d739993f39bd42aba2d9e366a3 Mon Sep 17 00:00:00 2001
From: Craig O'Connor <oconnorct1@gmail.com>
Date: Wed, 26 Apr 2017 05:33:29 -0400
Subject: [PATCH 061/117] YARN (#5395)

* YARN

* update package.json

* update package.json

* yarn updates

* npm
---
 js/.gitignore                |    1 -
 js/package.json              |    1 +
 js/yarn.lock                 | 8564 ++++++++++++++++++++++++++++++++++
 node_modules/.yarn-integrity |    1 +
 4 files changed, 8566 insertions(+), 1 deletion(-)
 create mode 100644 js/yarn.lock
 create mode 100644 node_modules/.yarn-integrity

diff --git a/js/.gitignore b/js/.gitignore
index 786a10498..555c4b4bb 100644
--- a/js/.gitignore
+++ b/js/.gitignore
@@ -8,4 +8,3 @@ docs
 .happypack
 .npmjs
 .eslintcache
-yarn.lock
diff --git a/js/package.json b/js/package.json
index b75ee9c5b..760a838e4 100644
--- a/js/package.json
+++ b/js/package.json
@@ -229,6 +229,7 @@
     "web3": "0.17.0-beta",
     "whatwg-fetch": "2.0.1",
     "worker-loader": "^0.8.0",
+    "yarn": "^0.21.3",
     "zxcvbn": "4.4.1"
   }
 }
diff --git a/js/yarn.lock b/js/yarn.lock
new file mode 100644
index 000000000..6266e6483
--- /dev/null
+++ b/js/yarn.lock
@@ -0,0 +1,8564 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@parity/wordlist@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@parity/wordlist/-/wordlist-1.0.1.tgz#c27e40e1ab3638a09ed53b4a2e81d531b5eb5a31"
+
+JSONStream@^0.8.4:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.8.4.tgz#91657dfe6ff857483066132b4618b62e8f4887bd"
+  dependencies:
+    jsonparse "0.0.5"
+    through ">=2.2.7 <3"
+
+abab@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
+
+abbrev@1, abbrev@1.0.x:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
+
+accepts@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
+  dependencies:
+    mime-types "~2.1.11"
+    negotiator "0.6.1"
+
+acorn-dynamic-import@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
+  dependencies:
+    acorn "^4.0.3"
+
+acorn-globals@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
+  dependencies:
+    acorn "^4.0.4"
+
+acorn-jsx@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+  dependencies:
+    acorn "^3.0.4"
+
+acorn@^3.0.4:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+
+acorn@^4.0.3, acorn@^4.0.4:
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"
+
+acorn@^5.0.1:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
+
+ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
+
+ajv@^4.7.0, ajv@^4.9.1:
+  version "4.11.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd"
+  dependencies:
+    co "^4.6.0"
+    json-stable-stringify "^1.0.1"
+
+align-text@^0.1.1, align-text@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  dependencies:
+    kind-of "^3.0.2"
+    longest "^1.0.1"
+    repeat-string "^1.5.2"
+
+alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+
+ansi-escapes@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+
+ansi-html@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+ansi@^0.3.0, ansi@~0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
+
+any-promise@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27"
+
+anymatch@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
+  dependencies:
+    arrify "^1.0.0"
+    micromatch "^2.1.5"
+
+append-transform@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+  dependencies:
+    default-require-extensions "^1.0.0"
+
+aproba@^1.0.3:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab"
+
+archive-type@^3.0.0, archive-type@^3.0.1:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/archive-type/-/archive-type-3.2.0.tgz#9cd9c006957ebe95fadad5bd6098942a813737f6"
+  dependencies:
+    file-type "^3.1.0"
+
+are-we-there-yet@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz#80e470e95a084794fe1899262c5667c6e88de1b3"
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.0 || ^1.1.13"
+
+argparse@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+arr-diff@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  dependencies:
+    arr-flatten "^1.0.1"
+
+arr-flatten@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.1.tgz#e5ffe54d45e19f32f216e91eb99c8ce892bb604b"
+
+array-differ@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+
+array-find-index@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.0, array-uniq@^1.0.1, array-uniq@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+
+array.prototype.find@^2.0.1:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.4.tgz#556a5c5362c08648323ddaeb9de9d14bc1864c90"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.7.0"
+
+arrify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
+asap@~2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f"
+
+asn1.js@^4.0.0:
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+asn1@~0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
+assert-plus@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+
+assert@^1.1.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  dependencies:
+    util "0.10.3"
+
+assertion-error@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
+
+ast-types@0.9.6:
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
+
+async-each-series@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-1.1.0.tgz#f42fd8155d38f21a5b8ea07c28e063ed1700b138"
+
+async-each@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+
+async@1.5.0, async@1.x, async@^1.4.0, async@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.0.tgz#2796642723573859565633fc6274444bee2f8ce3"
+
+async@^2.1.2, async@^2.1.4:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9"
+  dependencies:
+    lodash "^4.14.0"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+attr-accept@^1.0.3:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-1.1.0.tgz#b5cd35227f163935a8f1de10ed3eba16941f6be6"
+
+autoprefixer@^6.0.0, autoprefixer@^6.3.1:
+  version "6.7.7"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
+  dependencies:
+    browserslist "^1.7.6"
+    caniuse-db "^1.0.30000634"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^5.2.16"
+    postcss-value-parser "^3.2.3"
+
+aws-sign2@~0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+
+aws4@^1.2.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+
+babel-cli@6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.23.0.tgz#52ff946a2b0f64645c35e7bd5eea267aa0948c0f"
+  dependencies:
+    babel-core "^6.23.0"
+    babel-polyfill "^6.23.0"
+    babel-register "^6.23.0"
+    babel-runtime "^6.22.0"
+    commander "^2.8.1"
+    convert-source-map "^1.1.0"
+    fs-readdir-recursive "^1.0.0"
+    glob "^7.0.0"
+    lodash "^4.2.0"
+    output-file-sync "^1.1.0"
+    path-is-absolute "^1.0.0"
+    slash "^1.0.0"
+    source-map "^0.5.0"
+    v8flags "^2.0.10"
+  optionalDependencies:
+    chokidar "^1.6.1"
+
+babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
+  dependencies:
+    chalk "^1.1.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+babel-core@6.23.1, babel-core@^6.23.0:
+  version "6.23.1"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.23.1.tgz#c143cb621bb2f621710c220c5d579d15b8a442df"
+  dependencies:
+    babel-code-frame "^6.22.0"
+    babel-generator "^6.23.0"
+    babel-helpers "^6.23.0"
+    babel-messages "^6.23.0"
+    babel-register "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.1"
+    babel-types "^6.23.0"
+    babylon "^6.11.0"
+    convert-source-map "^1.1.0"
+    debug "^2.1.1"
+    json5 "^0.5.0"
+    lodash "^4.2.0"
+    minimatch "^3.0.2"
+    path-is-absolute "^1.0.0"
+    private "^0.1.6"
+    slash "^1.0.0"
+    source-map "^0.5.0"
+
+babel-eslint@7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.1.1.tgz#8a6a884f085aa7060af69cfc77341c2f99370fb2"
+  dependencies:
+    babel-code-frame "^6.16.0"
+    babel-traverse "^6.15.0"
+    babel-types "^6.15.0"
+    babylon "^6.13.0"
+    lodash.pickby "^4.6.0"
+
+babel-generator@^6.18.0, babel-generator@^6.23.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.0.tgz#eba270a8cc4ce6e09a61be43465d7c62c1f87c56"
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.23.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+babel-helper-bindify-decorators@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.22.0.tgz#d7f5bc261275941ac62acfc4e20dacfb8a3fe952"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-helper-builder-binary-assignment-operator-visitor@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.22.0.tgz#29df56be144d81bdeac08262bfa41d2c5e91cdcd"
+  dependencies:
+    babel-helper-explode-assignable-expression "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-helper-builder-react-jsx@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.23.0.tgz#d53fc8c996e0bc56d0de0fc4cc55a7138395ea4b"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.23.0"
+    esutils "^2.0.0"
+    lodash "^4.2.0"
+
+babel-helper-call-delegate@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.22.0.tgz#119921b56120f17e9dae3f74b4f5cc7bcc1b37ef"
+  dependencies:
+    babel-helper-hoist-variables "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-helper-define-map@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.23.0.tgz#1444f960c9691d69a2ced6a205315f8fd00804e7"
+  dependencies:
+    babel-helper-function-name "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.23.0"
+    lodash "^4.2.0"
+
+babel-helper-explode-assignable-expression@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.22.0.tgz#c97bf76eed3e0bae4048121f2b9dae1a4e7d0478"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-helper-explode-class@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-class/-/babel-helper-explode-class-6.22.0.tgz#646304924aa6388a516843ba7f1855ef8dfeb69b"
+  dependencies:
+    babel-helper-bindify-decorators "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-helper-function-name@^6.22.0, babel-helper-function-name@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.23.0.tgz#25742d67175c8903dbe4b6cb9d9e1fcb8dcf23a6"
+  dependencies:
+    babel-helper-get-function-arity "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
+
+babel-helper-get-function-arity@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.22.0.tgz#0beb464ad69dc7347410ac6ade9f03a50634f5ce"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-helper-hoist-variables@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.22.0.tgz#3eacbf731d80705845dd2e9718f600cfb9b4ba72"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-helper-optimise-call-expression@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.23.0.tgz#f3ee7eed355b4282138b33d02b78369e470622f5"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.23.0"
+
+babel-helper-regex@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.22.0.tgz#79f532be1647b1f0ee3474b5f5c3da58001d247d"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+    lodash "^4.2.0"
+
+babel-helper-remap-async-to-generator@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.22.0.tgz#2186ae73278ed03b8b15ced089609da981053383"
+  dependencies:
+    babel-helper-function-name "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.22.0"
+    babel-traverse "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-helper-replace-supers@^6.22.0, babel-helper-replace-supers@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.23.0.tgz#eeaf8ad9b58ec4337ca94223bacdca1f8d9b4bfd"
+  dependencies:
+    babel-helper-optimise-call-expression "^6.23.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
+
+babel-helpers@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.23.0.tgz#4f8f2e092d0b6a8808a4bde79c27f1e2ecf0d992"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+
+babel-loader@6.3.2:
+  version "6.3.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.3.2.tgz#18de4566385578c1b4f8ffe6cbc668f5e2a5ef03"
+  dependencies:
+    find-cache-dir "^0.1.1"
+    loader-utils "^0.2.16"
+    mkdirp "^0.5.1"
+    object-assign "^4.0.1"
+
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-check-es2015-constants@^6.22.0, babel-plugin-check-es2015-constants@^6.3.13:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-lodash@3.2.11:
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.2.11.tgz#21c8fdec9fe1835efaa737873e3902bdd66d5701"
+  dependencies:
+    glob "^7.1.1"
+    lodash "^4.17.2"
+
+babel-plugin-react-intl@2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-react-intl/-/babel-plugin-react-intl-2.3.1.tgz#3d43912e824da005e08e8e8239d5ba784374bb00"
+  dependencies:
+    babel-runtime "^6.2.0"
+    intl-messageformat-parser "^1.2.0"
+    mkdirp "^0.5.1"
+
+babel-plugin-recharts@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-recharts/-/babel-plugin-recharts-1.1.0.tgz#812cc84b13eb58dd405b2c63a28ea6f7b26ab4a7"
+  dependencies:
+    babel-traverse "^6.19.0"
+    babel-types "^6.19.0"
+    babylon "^6.14.1"
+
+babel-plugin-syntax-async-functions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+
+babel-plugin-syntax-async-generators@^6.5.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a"
+
+babel-plugin-syntax-class-constructor-call@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz#9cb9d39fe43c8600bec8146456ddcbd4e1a76416"
+
+babel-plugin-syntax-class-properties@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
+
+babel-plugin-syntax-decorators@^6.1.18, babel-plugin-syntax-decorators@^6.13.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"
+
+babel-plugin-syntax-do-expressions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz#5747756139aa26d390d09410b03744ba07e4796d"
+
+babel-plugin-syntax-dynamic-import@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
+
+babel-plugin-syntax-exponentiation-operator@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+
+babel-plugin-syntax-export-extensions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz#70a1484f0f9089a4e84ad44bac353c95b9b12721"
+
+babel-plugin-syntax-flow@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
+
+babel-plugin-syntax-function-bind@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz#48c495f177bdf31a981e732f55adc0bdd2601f46"
+
+babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
+
+babel-plugin-syntax-object-rest-spread@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+
+babel-plugin-syntax-trailing-function-commas@^6.13.0, babel-plugin-syntax-trailing-function-commas@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+
+babel-plugin-transform-async-generator-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.22.0.tgz#a720a98153a7596f204099cd5409f4b3c05bab46"
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.22.0"
+    babel-plugin-syntax-async-generators "^6.5.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-async-to-generator@^6.22.0, babel-plugin-transform-async-to-generator@^6.8.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.22.0.tgz#194b6938ec195ad36efc4c33a971acf00d8cd35e"
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.22.0"
+    babel-plugin-syntax-async-functions "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-class-constructor-call@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.22.0.tgz#11a4d2216abb5b0eef298b493748f4f2f4869120"
+  dependencies:
+    babel-plugin-syntax-class-constructor-call "^6.18.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.22.0"
+
+babel-plugin-transform-class-properties@6.23.0, babel-plugin-transform-class-properties@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.23.0.tgz#187b747ee404399013563c993db038f34754ac3b"
+  dependencies:
+    babel-helper-function-name "^6.23.0"
+    babel-plugin-syntax-class-properties "^6.8.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+
+babel-plugin-transform-decorators-legacy@1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.4.tgz#741b58f6c5bce9e6027e0882d9c994f04f366925"
+  dependencies:
+    babel-plugin-syntax-decorators "^6.1.18"
+    babel-runtime "^6.2.0"
+    babel-template "^6.3.0"
+
+babel-plugin-transform-decorators@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.22.0.tgz#c03635b27a23b23b7224f49232c237a73988d27c"
+  dependencies:
+    babel-helper-explode-class "^6.22.0"
+    babel-plugin-syntax-decorators "^6.13.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-plugin-transform-do-expressions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-do-expressions/-/babel-plugin-transform-do-expressions-6.22.0.tgz#28ccaf92812d949c2cd1281f690c8fdc468ae9bb"
+  dependencies:
+    babel-plugin-syntax-do-expressions "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-arrow-functions@^6.22.0, babel-plugin-transform-es2015-arrow-functions@^6.3.13:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoped-functions@^6.22.0, babel-plugin-transform-es2015-block-scoped-functions@^6.3.13:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoping@^6.22.0, babel-plugin-transform-es2015-block-scoping@^6.6.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.23.0.tgz#e48895cf0b375be148cd7c8879b422707a053b51"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
+    lodash "^4.2.0"
+
+babel-plugin-transform-es2015-classes@^6.22.0, babel-plugin-transform-es2015-classes@^6.6.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.23.0.tgz#49b53f326202a2fd1b3bbaa5e2edd8a4f78643c1"
+  dependencies:
+    babel-helper-define-map "^6.23.0"
+    babel-helper-function-name "^6.23.0"
+    babel-helper-optimise-call-expression "^6.23.0"
+    babel-helper-replace-supers "^6.23.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
+
+babel-plugin-transform-es2015-computed-properties@^6.22.0, babel-plugin-transform-es2015-computed-properties@^6.3.13:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.22.0.tgz#7c383e9629bba4820c11b0425bdd6290f7f057e7"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.22.0"
+
+babel-plugin-transform-es2015-destructuring@^6.22.0, babel-plugin-transform-es2015-destructuring@^6.6.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-duplicate-keys@^6.22.0, babel-plugin-transform-es2015-duplicate-keys@^6.6.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.22.0.tgz#672397031c21610d72dd2bbb0ba9fb6277e1c36b"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-plugin-transform-es2015-for-of@^6.22.0, babel-plugin-transform-es2015-for-of@^6.6.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-function-name@^6.22.0, babel-plugin-transform-es2015-function-name@^6.3.13:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.22.0.tgz#f5fcc8b09093f9a23c76ac3d9e392c3ec4b77104"
+  dependencies:
+    babel-helper-function-name "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-plugin-transform-es2015-literals@^6.22.0, babel-plugin-transform-es2015-literals@^6.3.13:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.0, babel-plugin-transform-es2015-modules-amd@^6.8.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.0.tgz#a1911fb9b7ec7e05a43a63c5995007557bcf6a2e"
+  dependencies:
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.22.0"
+
+babel-plugin-transform-es2015-modules-commonjs@^6.22.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.0, babel-plugin-transform-es2015-modules-commonjs@^6.6.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.0.tgz#e921aefb72c2cc26cb03d107626156413222134f"
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-types "^6.23.0"
+
+babel-plugin-transform-es2015-modules-systemjs@^6.12.0, babel-plugin-transform-es2015-modules-systemjs@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.23.0.tgz#ae3469227ffac39b0310d90fec73bfdc4f6317b0"
+  dependencies:
+    babel-helper-hoist-variables "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+
+babel-plugin-transform-es2015-modules-umd@^6.12.0, babel-plugin-transform-es2015-modules-umd@^6.22.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.0.tgz#fd5fa63521cae8d273927c3958afd7c067733450"
+  dependencies:
+    babel-plugin-transform-es2015-modules-amd "^6.24.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+
+babel-plugin-transform-es2015-object-super@^6.22.0, babel-plugin-transform-es2015-object-super@^6.3.13:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.22.0.tgz#daa60e114a042ea769dd53fe528fc82311eb98fc"
+  dependencies:
+    babel-helper-replace-supers "^6.22.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-parameters@^6.22.0, babel-plugin-transform-es2015-parameters@^6.6.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.23.0.tgz#3a2aabb70c8af945d5ce386f1a4250625a83ae3b"
+  dependencies:
+    babel-helper-call-delegate "^6.22.0"
+    babel-helper-get-function-arity "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
+
+babel-plugin-transform-es2015-shorthand-properties@^6.22.0, babel-plugin-transform-es2015-shorthand-properties@^6.3.13:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.22.0.tgz#8ba776e0affaa60bff21e921403b8a652a2ff723"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-plugin-transform-es2015-spread@^6.22.0, babel-plugin-transform-es2015-spread@^6.3.13:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-sticky-regex@^6.22.0, babel-plugin-transform-es2015-sticky-regex@^6.3.13:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.22.0.tgz#ab316829e866ee3f4b9eb96939757d19a5bc4593"
+  dependencies:
+    babel-helper-regex "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-plugin-transform-es2015-template-literals@^6.22.0, babel-plugin-transform-es2015-template-literals@^6.6.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-typeof-symbol@^6.22.0, babel-plugin-transform-es2015-typeof-symbol@^6.6.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-unicode-regex@^6.22.0, babel-plugin-transform-es2015-unicode-regex@^6.3.13:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.22.0.tgz#8d9cc27e7ee1decfe65454fb986452a04a613d20"
+  dependencies:
+    babel-helper-regex "^6.22.0"
+    babel-runtime "^6.22.0"
+    regexpu-core "^2.0.0"
+
+babel-plugin-transform-exponentiation-operator@^6.22.0, babel-plugin-transform-exponentiation-operator@^6.8.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.22.0.tgz#d57c8335281918e54ef053118ce6eb108468084d"
+  dependencies:
+    babel-helper-builder-binary-assignment-operator-visitor "^6.22.0"
+    babel-plugin-syntax-exponentiation-operator "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-export-extensions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz#53738b47e75e8218589eea946cbbd39109bbe653"
+  dependencies:
+    babel-plugin-syntax-export-extensions "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-flow-strip-types@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
+  dependencies:
+    babel-plugin-syntax-flow "^6.18.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-function-bind@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.22.0.tgz#c6fb8e96ac296a310b8cf8ea401462407ddf6a97"
+  dependencies:
+    babel-plugin-syntax-function-bind "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-object-rest-spread@6.23.0, babel-plugin-transform-object-rest-spread@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921"
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-react-display-name@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.23.0.tgz#4398910c358441dc4cef18787264d0412ed36b37"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-react-jsx-self@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"
+  dependencies:
+    babel-plugin-syntax-jsx "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-react-jsx-source@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6"
+  dependencies:
+    babel-plugin-syntax-jsx "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-react-jsx@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.23.0.tgz#23e892f7f2e759678eb5e4446a8f8e94e81b3470"
+  dependencies:
+    babel-helper-builder-react-jsx "^6.23.0"
+    babel-plugin-syntax-jsx "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-react-remove-prop-types@0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.3.2.tgz#6da8d834c6d7ad8ab02f956509790cfaa01ffe19"
+
+babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^6.6.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.22.0.tgz#65740593a319c44522157538d690b84094617ea6"
+  dependencies:
+    regenerator-transform "0.9.8"
+
+babel-plugin-transform-runtime@6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-strict-mode@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.22.0.tgz#e008df01340fdc87e959da65991b7e05970c8c7c"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-plugin-webpack-alias@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-webpack-alias/-/babel-plugin-webpack-alias-2.1.2.tgz#05a1ba23c28595660fb6ea5736424fc596b4a247"
+  dependencies:
+    babel-types "^6.14.0"
+    find-up "^2.0.0"
+    lodash.some "^4.5.1"
+    lodash.template "^4.3.0"
+
+babel-polyfill@6.23.0, babel-polyfill@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
+  dependencies:
+    babel-runtime "^6.22.0"
+    core-js "^2.4.0"
+    regenerator-runtime "^0.10.0"
+
+babel-preset-env@1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.1.9.tgz#49443dcd6ef52b48b7191ea33869e24590a9eb4a"
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.3.13"
+    babel-plugin-syntax-trailing-function-commas "^6.13.0"
+    babel-plugin-transform-async-to-generator "^6.8.0"
+    babel-plugin-transform-es2015-arrow-functions "^6.3.13"
+    babel-plugin-transform-es2015-block-scoped-functions "^6.3.13"
+    babel-plugin-transform-es2015-block-scoping "^6.6.0"
+    babel-plugin-transform-es2015-classes "^6.6.0"
+    babel-plugin-transform-es2015-computed-properties "^6.3.13"
+    babel-plugin-transform-es2015-destructuring "^6.6.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.6.0"
+    babel-plugin-transform-es2015-for-of "^6.6.0"
+    babel-plugin-transform-es2015-function-name "^6.3.13"
+    babel-plugin-transform-es2015-literals "^6.3.13"
+    babel-plugin-transform-es2015-modules-amd "^6.8.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.6.0"
+    babel-plugin-transform-es2015-modules-systemjs "^6.12.0"
+    babel-plugin-transform-es2015-modules-umd "^6.12.0"
+    babel-plugin-transform-es2015-object-super "^6.3.13"
+    babel-plugin-transform-es2015-parameters "^6.6.0"
+    babel-plugin-transform-es2015-shorthand-properties "^6.3.13"
+    babel-plugin-transform-es2015-spread "^6.3.13"
+    babel-plugin-transform-es2015-sticky-regex "^6.3.13"
+    babel-plugin-transform-es2015-template-literals "^6.6.0"
+    babel-plugin-transform-es2015-typeof-symbol "^6.6.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.3.13"
+    babel-plugin-transform-exponentiation-operator "^6.8.0"
+    babel-plugin-transform-regenerator "^6.6.0"
+    browserslist "^1.4.0"
+    electron-to-chromium "^1.1.0"
+    invariant "^2.2.2"
+
+babel-preset-es2015@6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.22.0.tgz#af5a98ecb35eb8af764ad8a5a05eb36dc4386835"
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoping "^6.22.0"
+    babel-plugin-transform-es2015-classes "^6.22.0"
+    babel-plugin-transform-es2015-computed-properties "^6.22.0"
+    babel-plugin-transform-es2015-destructuring "^6.22.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
+    babel-plugin-transform-es2015-for-of "^6.22.0"
+    babel-plugin-transform-es2015-function-name "^6.22.0"
+    babel-plugin-transform-es2015-literals "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.22.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.22.0"
+    babel-plugin-transform-es2015-modules-systemjs "^6.22.0"
+    babel-plugin-transform-es2015-modules-umd "^6.22.0"
+    babel-plugin-transform-es2015-object-super "^6.22.0"
+    babel-plugin-transform-es2015-parameters "^6.22.0"
+    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
+    babel-plugin-transform-es2015-spread "^6.22.0"
+    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
+    babel-plugin-transform-es2015-template-literals "^6.22.0"
+    babel-plugin-transform-es2015-typeof-symbol "^6.22.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
+    babel-plugin-transform-regenerator "^6.22.0"
+
+babel-preset-es2016@6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-es2016/-/babel-preset-es2016-6.22.0.tgz#b061aaa3983d40c9fbacfa3743b5df37f336156c"
+  dependencies:
+    babel-plugin-transform-exponentiation-operator "^6.22.0"
+
+babel-preset-es2017@6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-es2017/-/babel-preset-es2017-6.22.0.tgz#de2f9da5a30c50d293fb54a0ba15d6ddc573f0f2"
+  dependencies:
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-to-generator "^6.22.0"
+
+babel-preset-flow@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d"
+  dependencies:
+    babel-plugin-transform-flow-strip-types "^6.22.0"
+
+babel-preset-react@6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.23.0.tgz#eb7cee4de98a3f94502c28565332da9819455195"
+  dependencies:
+    babel-plugin-syntax-jsx "^6.3.13"
+    babel-plugin-transform-react-display-name "^6.23.0"
+    babel-plugin-transform-react-jsx "^6.23.0"
+    babel-plugin-transform-react-jsx-self "^6.22.0"
+    babel-plugin-transform-react-jsx-source "^6.22.0"
+    babel-preset-flow "^6.23.0"
+
+babel-preset-stage-0@6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-0/-/babel-preset-stage-0-6.22.0.tgz#707eeb5b415da769eff9c42f4547f644f9296ef9"
+  dependencies:
+    babel-plugin-transform-do-expressions "^6.22.0"
+    babel-plugin-transform-function-bind "^6.22.0"
+    babel-preset-stage-1 "^6.22.0"
+
+babel-preset-stage-1@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-1/-/babel-preset-stage-1-6.22.0.tgz#7da05bffea6ad5a10aef93e320cfc6dd465dbc1a"
+  dependencies:
+    babel-plugin-transform-class-constructor-call "^6.22.0"
+    babel-plugin-transform-export-extensions "^6.22.0"
+    babel-preset-stage-2 "^6.22.0"
+
+babel-preset-stage-2@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.22.0.tgz#ccd565f19c245cade394b21216df704a73b27c07"
+  dependencies:
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    babel-plugin-transform-class-properties "^6.22.0"
+    babel-plugin-transform-decorators "^6.22.0"
+    babel-preset-stage-3 "^6.22.0"
+
+babel-preset-stage-3@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-3/-/babel-preset-stage-3-6.22.0.tgz#a4e92bbace7456fafdf651d7a7657ee0bbca9c2e"
+  dependencies:
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-generator-functions "^6.22.0"
+    babel-plugin-transform-async-to-generator "^6.22.0"
+    babel-plugin-transform-exponentiation-operator "^6.22.0"
+    babel-plugin-transform-object-rest-spread "^6.22.0"
+
+babel-register@6.23.0, babel-register@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.23.0.tgz#c9aa3d4cca94b51da34826c4a0f9e08145d74ff3"
+  dependencies:
+    babel-core "^6.23.0"
+    babel-runtime "^6.22.0"
+    core-js "^2.4.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.2.0"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.2"
+
+babel-runtime@6.23.0, babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.10.0"
+
+babel-template@^6.16.0, babel-template@^6.22.0, babel-template@^6.23.0, babel-template@^6.3.0, babel-template@^6.7.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.23.0.tgz#04d4f270adbb3aa704a8143ae26faa529238e638"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
+    babylon "^6.11.0"
+    lodash "^4.2.0"
+
+babel-traverse@^6.15.0, babel-traverse@^6.18.0, babel-traverse@^6.19.0, babel-traverse@^6.22.0, babel-traverse@^6.23.0, babel-traverse@^6.23.1:
+  version "6.23.1"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.23.1.tgz#d3cb59010ecd06a97d81310065f966b699e14f48"
+  dependencies:
+    babel-code-frame "^6.22.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.23.0"
+    babylon "^6.15.0"
+    debug "^2.2.0"
+    globals "^9.0.0"
+    invariant "^2.2.0"
+    lodash "^4.2.0"
+
+babel-types@^6.14.0, babel-types@^6.15.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.23.0.tgz#bb17179d7538bad38cd0c9e115d340f77e7e9acf"
+  dependencies:
+    babel-runtime "^6.22.0"
+    esutils "^2.0.2"
+    lodash "^4.2.0"
+    to-fast-properties "^1.0.1"
+
+babylon@^6.11.0, babylon@^6.13.0, babylon@^6.14.1, babylon@^6.15.0:
+  version "6.16.1"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3"
+
+balanced-match@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.2.1.tgz#7bc658b4bed61eee424ad74f75f5c3e2c4df3cc7"
+
+balanced-match@^0.4.0, balanced-match@^0.4.1, balanced-match@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+
+base32.js@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/base32.js/-/base32.js-0.1.0.tgz#b582dec693c2f11e893cf064ee6ac5b6131a2202"
+
+base64-js@^1.0.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
+
+batch-processor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/batch-processor/-/batch-processor-1.0.0.tgz#75c95c32b748e0850d10c2b168f6bdbe9891ace8"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  dependencies:
+    tweetnacl "^0.14.3"
+
+beeper@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
+
+big.js@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978"
+
+bignumber.js@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-3.0.1.tgz#807652d10e39de37e9e3497247edc798bb746f76"
+
+"bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2":
+  version "2.0.7"
+  resolved "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2"
+
+bin-build@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/bin-build/-/bin-build-2.2.0.tgz#11f8dd61f70ffcfa2bdcaa5b46f5e8fedd4221cc"
+  dependencies:
+    archive-type "^3.0.1"
+    decompress "^3.0.0"
+    download "^4.1.2"
+    exec-series "^1.0.0"
+    rimraf "^2.2.6"
+    tempfile "^1.0.0"
+    url-regex "^3.0.0"
+
+bin-check@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/bin-check/-/bin-check-2.0.0.tgz#86f8e6f4253893df60dc316957f5af02acb05930"
+  dependencies:
+    executable "^1.0.0"
+
+bin-version-check@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/bin-version-check/-/bin-version-check-2.1.0.tgz#e4e5df290b9069f7d111324031efc13fdd11a5b0"
+  dependencies:
+    bin-version "^1.0.0"
+    minimist "^1.1.0"
+    semver "^4.0.3"
+    semver-truncate "^1.0.0"
+
+bin-version@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/bin-version/-/bin-version-1.0.4.tgz#9eb498ee6fd76f7ab9a7c160436f89579435d78e"
+  dependencies:
+    find-versions "^1.0.0"
+
+bin-wrapper@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/bin-wrapper/-/bin-wrapper-3.0.2.tgz#67d3306262e4b1a5f2f88ee23464f6a655677aeb"
+  dependencies:
+    bin-check "^2.0.0"
+    bin-version-check "^2.1.0"
+    download "^4.0.0"
+    each-async "^1.1.1"
+    lazy-req "^1.0.0"
+    os-filter-obj "^1.0.0"
+
+binary-extensions@^1.0.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
+
+bindings@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11"
+
+bip66@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/bip66/-/bip66-1.1.4.tgz#8a59f8ae16eccb94681c3c2a7b224774605aadfb"
+
+bl@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.0.tgz#1397e7ec42c5f5dc387470c500e34a9f6be9ea98"
+  dependencies:
+    readable-stream "^2.0.5"
+
+block-stream@*:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  dependencies:
+    inherits "~2.0.0"
+
+blockies@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/blockies/-/blockies-0.0.2.tgz#22ad58da4f6b382bc79bf4386c5820c70047e4ed"
+
+bluebird@^2.10.2:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
+
+bluebird@^3.4.7:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.3, bn.js@^4.4.0, bn.js@^4.8.0:
+  version "4.11.6"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
+
+boolbase@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+
+boom@2.x.x:
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  dependencies:
+    hoek "2.x.x"
+
+bowser@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.6.0.tgz#37fc387b616cb6aef370dab4d6bd402b74c5c54d"
+
+brace-expansion@^1.0.0:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9"
+  dependencies:
+    balanced-match "^0.4.1"
+    concat-map "0.0.1"
+
+brace@0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/brace/-/brace-0.9.0.tgz#ad034bae65220eb676d949cb280383fa8e12fa72"
+  dependencies:
+    w3c-blob "0.0.1"
+
+brace@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/brace/-/brace-0.8.0.tgz#e826c6d5054cae5f607ad7b1c81236dd2cf01978"
+  dependencies:
+    w3c-blob "0.0.1"
+
+braces@^1.8.2:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  dependencies:
+    expand-range "^1.8.1"
+    preserve "^0.2.0"
+    repeat-element "^1.1.2"
+
+brorand@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+
+browser-stdout@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
+
+browserify-aes@^1.0.0, browserify-aes@^1.0.4, browserify-aes@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a"
+  dependencies:
+    buffer-xor "^1.0.2"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.0"
+    inherits "^2.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+
+browserify-rsa@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  dependencies:
+    bn.js "^4.1.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  dependencies:
+    bn.js "^4.1.1"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.2"
+    elliptic "^6.0.0"
+    inherits "^2.0.1"
+    parse-asn1 "^5.0.0"
+
+browserify-zlib@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
+  dependencies:
+    pako "~0.2.0"
+
+browserslist@^1.0.0, browserslist@^1.0.1, browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.4.0, browserslist@^1.5.2, browserslist@^1.7.6:
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
+  dependencies:
+    caniuse-db "^1.0.30000639"
+    electron-to-chromium "^1.2.7"
+
+buffer-crc32@~0.2.3:
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+
+buffer-shims@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
+
+buffer-to-vinyl@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz#00f15faee3ab7a1dda2cde6d9121bffdd07b2262"
+  dependencies:
+    file-type "^3.1.0"
+    readable-stream "^2.0.2"
+    uuid "^2.0.1"
+    vinyl "^1.0.0"
+
+buffer-xor@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+
+buffer@^4.3.0:
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
+builtin-modules@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+
+bytes@2.4.0, bytes@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.4.0.tgz#7d97196f9d5baf7f6935e25985549edd2a6c2339"
+
+caller-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+  dependencies:
+    callsites "^0.2.0"
+
+callsites@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+
+camel-case@3.0.x:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
+  dependencies:
+    no-case "^2.2.0"
+    upper-case "^1.1.1"
+
+camelcase-keys@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  dependencies:
+    camelcase "^2.0.0"
+    map-obj "^1.0.0"
+
+camelcase@^1.0.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+
+camelcase@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+
+camelcase@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+
+caniuse-api@^1.5.2:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.5.3.tgz#5018e674b51c393e4d50614275dc017e27c4a2a2"
+  dependencies:
+    browserslist "^1.0.1"
+    caniuse-db "^1.0.30000346"
+    lodash.memoize "^4.1.0"
+    lodash.uniq "^4.3.0"
+
+caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
+  version "1.0.30000649"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000649.tgz#1ee1754a6df235450c8b7cd15e0ebf507221a86a"
+
+capture-stack-trace@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
+
+caseless@~0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+
+caw@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/caw/-/caw-1.2.0.tgz#ffb226fe7efc547288dc62ee3e97073c212d1034"
+  dependencies:
+    get-proxy "^1.0.1"
+    is-obj "^1.0.0"
+    object-assign "^3.0.0"
+    tunnel-agent "^0.4.0"
+
+center-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  dependencies:
+    align-text "^0.1.3"
+    lazy-cache "^1.0.3"
+
+chai-as-promised@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-6.0.0.tgz#1a02a433a6f24dafac63b9c96fa1684db1aa8da6"
+  dependencies:
+    check-error "^1.0.2"
+
+chai-enzyme@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/chai-enzyme/-/chai-enzyme-0.6.1.tgz#585c963c6ea1331446efd12ee8391e807d758620"
+  dependencies:
+    html "^1.0.0"
+    react-element-to-jsx-string "^5.0.0"
+
+chai@3.5.0, "chai@>=1.9.2 <4.0.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
+  dependencies:
+    assertion-error "^1.0.1"
+    deep-eql "^0.1.3"
+    type-detect "^1.0.0"
+
+chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+change-emitter@^0.1.2:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.3.tgz#731c9360913855f613dd256568d50f854a8806ac"
+
+check-error@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
+
+cheerio@^0.22.0:
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e"
+  dependencies:
+    css-select "~1.2.0"
+    dom-serializer "~0.1.0"
+    entities "~1.1.1"
+    htmlparser2 "^3.9.1"
+    lodash.assignin "^4.0.9"
+    lodash.bind "^4.1.4"
+    lodash.defaults "^4.0.1"
+    lodash.filter "^4.4.0"
+    lodash.flatten "^4.2.0"
+    lodash.foreach "^4.3.0"
+    lodash.map "^4.4.0"
+    lodash.merge "^4.4.0"
+    lodash.pick "^4.2.1"
+    lodash.reduce "^4.4.0"
+    lodash.reject "^4.4.0"
+    lodash.some "^4.4.0"
+
+chokidar@^1.4.3, chokidar@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.1.tgz#2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"
+  dependencies:
+    anymatch "^1.3.0"
+    async-each "^1.0.0"
+    glob-parent "^2.0.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^2.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+  optionalDependencies:
+    fsevents "^1.0.0"
+
+chownr@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+
+ci-info@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534"
+
+cipher-base@^1.0.0, cipher-base@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07"
+  dependencies:
+    inherits "^2.0.1"
+
+circular-dependency-plugin@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-2.0.0.tgz#c10796c83390488a9bcdd42f032d6e64e984f660"
+
+circular-json@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
+
+clap@^1.0.9:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/clap/-/clap-1.1.3.tgz#b3bd36e93dd4cbfb395a3c26896352445265c05b"
+  dependencies:
+    chalk "^1.1.3"
+
+classnames@2.2.5, classnames@^2.2.0:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
+
+clean-css@4.0.x:
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.0.11.tgz#a6d88bffb399420b24298db49d99a1ed067534a8"
+  dependencies:
+    source-map "0.5.x"
+
+cli-cursor@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
+  dependencies:
+    restore-cursor "^1.0.1"
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-width@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
+
+cliui@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  dependencies:
+    center-align "^0.1.1"
+    right-align "^0.1.1"
+    wordwrap "0.0.2"
+
+cliui@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
+clone-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.0.tgz#eae0a2413f55c0942f818c229fefce845d7f3b1c"
+  dependencies:
+    is-regexp "^1.0.0"
+    is-supported-regexp-flag "^1.0.0"
+
+clone-stats@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
+
+clone@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
+
+clone@^1.0.0, clone@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
+
+cmd-shim@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
+  dependencies:
+    graceful-fs "^4.1.2"
+    mkdirp "~0.5.0"
+
+co@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-3.1.0.tgz#4ea54ea5a08938153185e15210c68d9092bc1b78"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+
+coa@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.1.tgz#7f959346cfc8719e3f7233cd6852854a7c67d8a3"
+  dependencies:
+    q "^1.1.2"
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+
+collapse-white-space@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.2.tgz#9c463fb9c6d190d2dcae21a356a01bcae9eeef6d"
+
+color-convert@^1.3.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
+  dependencies:
+    color-name "^1.1.1"
+
+color-diff@^0.1.3:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/color-diff/-/color-diff-0.1.7.tgz#6db78cd9482a8e459d40821eaf4b503283dcb8e2"
+
+color-name@^1.0.0, color-name@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
+
+color-string@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
+  dependencies:
+    color-name "^1.0.0"
+
+color@^0.11.0:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
+  dependencies:
+    clone "^1.0.2"
+    color-convert "^1.3.0"
+    color-string "^0.3.0"
+
+colorguard@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/colorguard/-/colorguard-1.2.0.tgz#f3facaf5caaeba4ef54653d9fb25bb73177c0d84"
+  dependencies:
+    chalk "^1.1.1"
+    color-diff "^0.1.3"
+    log-symbols "^1.0.2"
+    object-assign "^4.0.1"
+    pipetteur "^2.0.0"
+    plur "^2.0.0"
+    postcss "^5.0.4"
+    postcss-reporter "^1.2.1"
+    text-table "^0.2.0"
+    yargs "^1.2.6"
+
+colormin@^1.0.5:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
+  dependencies:
+    color "^0.11.0"
+    css-color-names "0.0.4"
+    has "^1.0.1"
+
+colors@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+
+combined-stream@^1.0.5, combined-stream@~1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@2.9.0, commander@2.9.x, commander@^2.7.1, commander@^2.8.1, commander@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
+commander@~2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+
+commonmark-react-renderer@^4.2.4:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/commonmark-react-renderer/-/commonmark-react-renderer-4.3.2.tgz#f30cdebd66141eef45ccd2d82fc00861e1e1f747"
+  dependencies:
+    in-publish "^2.0.0"
+    lodash.assign "^4.2.0"
+    lodash.isplainobject "^4.0.6"
+    pascalcase "^0.1.1"
+    xss-filters "^1.2.6"
+
+commonmark@^0.24.0:
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/commonmark/-/commonmark-0.24.0.tgz#b80de0182c546355643aa15db12bfb282368278f"
+  dependencies:
+    entities "~ 1.1.1"
+    mdurl "~ 1.0.1"
+    string.prototype.repeat "^0.2.0"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+concat-stream@^1.4.6, concat-stream@^1.4.7:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+console-browserify@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  dependencies:
+    date-now "^0.1.4"
+
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+
+console-stream@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/console-stream/-/console-stream-0.1.1.tgz#a095fe07b20465955f2fafd28b5d72bccd949d44"
+
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+
+content-disposition@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+
+content-type-parser@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.1.tgz#c3e56988c53c65127fb46d4032a3a900246fdc94"
+
+content-type@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
+
+convert-source-map@^1.1.0, convert-source-map@^1.1.1:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
+
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+
+cookie@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+
+copy-to-clipboard@^3:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.0.5.tgz#4cd40e7c2ee159bc72d4f06b5bec8f9e0a1a3442"
+  dependencies:
+    toggle-selection "^1.0.3"
+
+copy-webpack-plugin@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.0.1.tgz#9728e383b94316050d0c7463958f2b85c0aa8200"
+  dependencies:
+    bluebird "^2.10.2"
+    fs-extra "^0.26.4"
+    glob "^6.0.4"
+    is-glob "^3.1.0"
+    loader-utils "^0.2.15"
+    lodash "^4.3.0"
+    minimatch "^3.0.0"
+    node-dir "^0.1.10"
+
+core-js@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.0.tgz#df408ab46d01aff91c01c3e7971935d422c54f81"
+
+core-js@2.4.1, core-js@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
+
+core-js@^0.8.3:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-0.8.4.tgz#c22665f1e0d1b9c3c5e1b08dabd1f108695e4fcf"
+
+core-js@^1.0.0:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+
+core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+
+cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.1.1.tgz#817f2c2039347a1e9bf7d090c0923e53f749ca82"
+  dependencies:
+    js-yaml "^3.4.3"
+    minimist "^1.2.0"
+    object-assign "^4.1.0"
+    os-homedir "^1.0.1"
+    parse-json "^2.2.0"
+    require-from-string "^1.1.0"
+
+coveralls@2.11.16:
+  version "2.11.16"
+  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.11.16.tgz#da9061265142ddee954f68379122be97be8ab4b1"
+  dependencies:
+    js-yaml "3.6.1"
+    lcov-parse "0.0.10"
+    log-driver "1.2.5"
+    minimist "1.2.0"
+    request "2.79.0"
+
+create-ecdh@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.0.0"
+
+create-error-class@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
+  dependencies:
+    capture-stack-trace "^1.0.0"
+
+create-hash@^1.1.0, create-hash@^1.1.1, create-hash@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.2.tgz#51210062d7bb7479f6c65bb41a92208b1d61abad"
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    ripemd160 "^1.0.0"
+    sha.js "^2.3.6"
+
+create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.4.tgz#d3fb4ba253eb8b3f56e39ea2fbcb8af747bd3170"
+  dependencies:
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+
+create-thenable@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/create-thenable/-/create-thenable-1.0.2.tgz#e2031720ccc9575d8cfa31f5c146e762a80c0534"
+  dependencies:
+    object.omit "~2.0.0"
+    unique-concat "~0.2.2"
+
+cross-spawn@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
+  dependencies:
+    lru-cache "^4.0.1"
+    which "^1.2.9"
+
+cryptiles@2.x.x:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  dependencies:
+    boom "2.x.x"
+
+crypto-browserify@^3.11.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522"
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+
+crypto-js@^3.1.4:
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.8.tgz#715f070bf6014f2ae992a98b3929258b713f08d5"
+
+css-color-names@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.3.tgz#de0cef16f4d8aa8222a320d5b6d7e9bbada7b9f6"
+
+css-color-names@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
+
+css-loader@0.26.1:
+  version "0.26.1"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.26.1.tgz#2ba7f20131b93597496b3e9bb500785a49cd29ea"
+  dependencies:
+    babel-code-frame "^6.11.0"
+    css-selector-tokenizer "^0.7.0"
+    cssnano ">=2.6.1 <4"
+    loader-utils "~0.2.2"
+    lodash.camelcase "^4.3.0"
+    object-assign "^4.0.1"
+    postcss "^5.0.6"
+    postcss-modules-extract-imports "^1.0.0"
+    postcss-modules-local-by-default "^1.0.1"
+    postcss-modules-scope "^1.0.0"
+    postcss-modules-values "^1.1.0"
+    source-list-map "^0.1.4"
+
+css-rule-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/css-rule-stream/-/css-rule-stream-1.1.0.tgz#3786e7198983d965a26e31957e09078cbb7705a2"
+  dependencies:
+    css-tokenize "^1.0.1"
+    duplexer2 "0.0.2"
+    ldjson-stream "^1.2.1"
+    through2 "^0.6.3"
+
+css-select@^1.1.0, css-select@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  dependencies:
+    boolbase "~1.0.0"
+    css-what "2.1"
+    domutils "1.5.1"
+    nth-check "~1.0.1"
+
+css-selector-tokenizer@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz#6445f582c7930d241dcc5007a43d6fcb8f073152"
+  dependencies:
+    cssesc "^0.1.0"
+    fastparse "^1.1.1"
+    regexpu-core "^1.0.0"
+
+css-selector-tokenizer@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
+  dependencies:
+    cssesc "^0.1.0"
+    fastparse "^1.1.1"
+    regexpu-core "^1.0.0"
+
+css-tokenize@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/css-tokenize/-/css-tokenize-1.0.1.tgz#4625cb1eda21c143858b7f81d6803c1d26fc14be"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^1.0.33"
+
+css-what@2.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
+
+cssesc@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+
+"cssnano@>=2.6.1 <4":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
+  dependencies:
+    autoprefixer "^6.3.1"
+    decamelize "^1.1.2"
+    defined "^1.0.0"
+    has "^1.0.1"
+    object-assign "^4.0.1"
+    postcss "^5.0.14"
+    postcss-calc "^5.2.0"
+    postcss-colormin "^2.1.8"
+    postcss-convert-values "^2.3.4"
+    postcss-discard-comments "^2.0.4"
+    postcss-discard-duplicates "^2.0.1"
+    postcss-discard-empty "^2.0.1"
+    postcss-discard-overridden "^0.1.1"
+    postcss-discard-unused "^2.2.1"
+    postcss-filter-plugins "^2.0.0"
+    postcss-merge-idents "^2.1.5"
+    postcss-merge-longhand "^2.0.1"
+    postcss-merge-rules "^2.0.3"
+    postcss-minify-font-values "^1.0.2"
+    postcss-minify-gradients "^1.0.1"
+    postcss-minify-params "^1.0.4"
+    postcss-minify-selectors "^2.0.4"
+    postcss-normalize-charset "^1.1.0"
+    postcss-normalize-url "^3.0.7"
+    postcss-ordered-values "^2.1.0"
+    postcss-reduce-idents "^2.2.2"
+    postcss-reduce-initial "^1.0.0"
+    postcss-reduce-transforms "^1.0.3"
+    postcss-svgo "^2.1.1"
+    postcss-unique-selectors "^2.0.2"
+    postcss-value-parser "^3.2.3"
+    postcss-zindex "^2.0.1"
+
+csso@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
+  dependencies:
+    clap "^1.0.9"
+    source-map "^0.5.3"
+
+cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
+
+"cssstyle@>= 0.2.37 < 0.3.0":
+  version "0.2.37"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+  dependencies:
+    cssom "0.3.x"
+
+currently-unhandled@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  dependencies:
+    array-find-index "^1.0.1"
+
+d3-array@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.1.1.tgz#a01abe63a25ffb91d3423c3c6d051b4d36bc8a09"
+
+d3-collection@1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.3.tgz#00bdea94fbc1628d435abbae2f4dc2164e37dd34"
+
+d3-color@1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.0.3.tgz#bc7643fca8e53a8347e2fbdaffa236796b58509b"
+
+d3-format@1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.2.0.tgz#6b480baa886885d4651dc248a8f4ac9da16db07a"
+
+d3-interpolate@1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.1.4.tgz#a43ec5b3bee350d8516efdf819a4c08c053db302"
+  dependencies:
+    d3-color "1"
+
+d3-path@1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.5.tgz#241eb1849bd9e9e8021c0d0a799f8a0e8e441764"
+
+d3-scale@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-1.0.0.tgz#0b4175ca31cbe65e254427e4662dfaefc373462d"
+  dependencies:
+    d3-array "1"
+    d3-collection "1"
+    d3-color "1"
+    d3-format "1"
+    d3-interpolate "1"
+    d3-time "1"
+    d3-time-format "2"
+
+d3-shape@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.0.0.tgz#cca332487579e457354c8838a0a283be638459ba"
+  dependencies:
+    d3-path "1"
+
+d3-time-format@2:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.0.5.tgz#9d7780204f7c9119c9170b1a56db4de9a8af972e"
+  dependencies:
+    d3-time "1"
+
+d3-time@1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.6.tgz#a55b13d7d15d3a160ae91708232e0835f1d5e945"
+
+d@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  dependencies:
+    es5-ext "^0.10.9"
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  dependencies:
+    assert-plus "^1.0.0"
+
+date-now@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/date-now/-/date-now-1.0.1.tgz#bb7d086438debe4182a485fb3df3fbfb99d6153c"
+
+date-now@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+
+dateformat@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17"
+
+death@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/death/-/death-1.1.0.tgz#01aa9c401edd92750514470b8266390c66c67318"
+
+debounce@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.0.0.tgz#0948af513d2e4ce407916f8506a423d3f9cf72d8"
+  dependencies:
+    date-now "1.0.1"
+
+debug@2.2.0, debug@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+  dependencies:
+    ms "0.7.1"
+
+debug@^2.1.1, debug@^2.2.0, debug@^2.3.3:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
+  dependencies:
+    ms "0.7.2"
+
+decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+
+decompress-tar@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-3.1.0.tgz#217c789f9b94450efaadc5c5e537978fc333c466"
+  dependencies:
+    is-tar "^1.0.0"
+    object-assign "^2.0.0"
+    strip-dirs "^1.0.0"
+    tar-stream "^1.1.1"
+    through2 "^0.6.1"
+    vinyl "^0.4.3"
+
+decompress-tarbz2@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz#8b23935681355f9f189d87256a0f8bdd96d9666d"
+  dependencies:
+    is-bzip2 "^1.0.0"
+    object-assign "^2.0.0"
+    seek-bzip "^1.0.3"
+    strip-dirs "^1.0.0"
+    tar-stream "^1.1.1"
+    through2 "^0.6.1"
+    vinyl "^0.4.3"
+
+decompress-targz@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-3.1.0.tgz#b2c13df98166268991b715d6447f642e9696f5a0"
+  dependencies:
+    is-gzip "^1.0.0"
+    object-assign "^2.0.0"
+    strip-dirs "^1.0.0"
+    tar-stream "^1.1.1"
+    through2 "^0.6.1"
+    vinyl "^0.4.3"
+
+decompress-unzip@^3.0.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-3.4.0.tgz#61475b4152066bbe3fee12f9d629d15fe6478eeb"
+  dependencies:
+    is-zip "^1.0.0"
+    read-all-stream "^3.0.0"
+    stat-mode "^0.2.0"
+    strip-dirs "^1.0.0"
+    through2 "^2.0.0"
+    vinyl "^1.0.0"
+    yauzl "^2.2.1"
+
+decompress@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/decompress/-/decompress-3.0.0.tgz#af1dd50d06e3bfc432461d37de11b38c0d991bed"
+  dependencies:
+    buffer-to-vinyl "^1.0.0"
+    concat-stream "^1.4.6"
+    decompress-tar "^3.0.0"
+    decompress-tarbz2 "^3.0.0"
+    decompress-targz "^3.0.0"
+    decompress-unzip "^3.0.0"
+    stream-combiner2 "^1.1.1"
+    vinyl-assign "^1.0.1"
+    vinyl-fs "^2.2.0"
+
+deep-eql@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2"
+  dependencies:
+    type-detect "0.1.1"
+
+deep-equal@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+
+deep-extend@~0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.1.tgz#efe4113d08085f4e6f9687759810f807469e2253"
+
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+
+default-require-extensions@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
+  dependencies:
+    strip-bom "^2.0.0"
+
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  dependencies:
+    clone "^1.0.2"
+
+define-properties@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
+  dependencies:
+    foreach "^2.0.5"
+    object-keys "^1.0.8"
+
+defined@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+
+del@^2.0.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  dependencies:
+    globby "^5.0.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    rimraf "^2.2.8"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+
+depd@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
+
+des.js@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+
+detect-indent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  dependencies:
+    repeating "^2.0.0"
+
+detect-indent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
+
+diff@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
+
+diffie-hellman@^5.0.0:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+doctrine@^1.2.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+  dependencies:
+    esutils "^2.0.2"
+    isarray "^1.0.0"
+
+doiuse@^2.4.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/doiuse/-/doiuse-2.6.0.tgz#1892d10b61a9a356addbf2b614933e81f8bb3834"
+  dependencies:
+    browserslist "^1.1.1"
+    caniuse-db "^1.0.30000187"
+    css-rule-stream "^1.1.0"
+    duplexer2 "0.0.2"
+    jsonfilter "^1.1.2"
+    ldjson-stream "^1.2.1"
+    lodash "^4.0.0"
+    multimatch "^2.0.0"
+    postcss "^5.0.8"
+    source-map "^0.4.2"
+    through2 "^0.6.3"
+    yargs "^3.5.4"
+
+dom-converter@~0.1:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
+  dependencies:
+    utila "~0.3"
+
+dom-serializer@0, dom-serializer@~0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+  dependencies:
+    domelementtype "~1.1.1"
+    entities "~1.1.1"
+
+dom-walk@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
+
+domain-browser@^1.1.1:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
+
+domelementtype@1, domelementtype@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+
+domelementtype@~1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+
+domhandler@2.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
+  dependencies:
+    domelementtype "1"
+
+domhandler@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738"
+  dependencies:
+    domelementtype "1"
+
+domutils@1.1:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
+  dependencies:
+    domelementtype "1"
+
+domutils@1.5.1, domutils@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+download@^4.0.0, download@^4.1.2, download@^4.4.1:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/download/-/download-4.4.3.tgz#aa55fdad392d95d4b68e8c2be03e0c2aa21ba9ac"
+  dependencies:
+    caw "^1.0.1"
+    concat-stream "^1.4.7"
+    each-async "^1.0.0"
+    filenamify "^1.0.1"
+    got "^5.0.0"
+    gulp-decompress "^1.2.0"
+    gulp-rename "^1.2.0"
+    is-url "^1.2.0"
+    object-assign "^4.0.1"
+    read-all-stream "^3.0.0"
+    readable-stream "^2.0.2"
+    stream-combiner2 "^1.1.1"
+    vinyl "^1.0.0"
+    vinyl-fs "^2.2.0"
+    ware "^1.2.0"
+
+drbg.js@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/drbg.js/-/drbg.js-1.0.1.tgz#3e36b6c42b37043823cdbc332d58f31e2445480b"
+  dependencies:
+    browserify-aes "^1.0.6"
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+
+duplexer2@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
+  dependencies:
+    readable-stream "~1.1.9"
+
+duplexer2@^0.1.4, duplexer2@~0.1.0:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
+  dependencies:
+    readable-stream "^2.0.2"
+
+duplexer@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+
+duplexify@^3.2.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.0.tgz#1aa773002e1578457e9d9d4a50b0ccaaebcbd604"
+  dependencies:
+    end-of-stream "1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
+each-async@^1.0.0, each-async@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/each-async/-/each-async-1.1.1.tgz#dee5229bdf0ab6ba2012a395e1b869abf8813473"
+  dependencies:
+    onetime "^1.0.0"
+    set-immediate-shim "^1.0.0"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+  dependencies:
+    jsbn "~0.1.0"
+
+editions@^1.1.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.3.tgz#0907101bdda20fac3cbe334c27cbd0688dc99a5b"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+
+ejs-loader@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/ejs-loader/-/ejs-loader-0.3.0.tgz#68736fdc231a490edf919a6446ad9d9055a587be"
+  dependencies:
+    loader-utils "^0.2.7"
+    lodash "^3.6.0"
+
+ejs@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-1.0.0.tgz#c9c60a48a46ee452fb32a71c317b95e5aa1fcb3d"
+
+ejsify@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ejsify/-/ejsify-1.0.0.tgz#37194f5a85c12ae438429395799ec47b43bc453f"
+  dependencies:
+    ejs "~1.0.0"
+    through "~2.3.4"
+
+electron-to-chromium@^1.1.0, electron-to-chromium@^1.2.7:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.2.tgz#b8ce5c93b308db0e92f6d0435c46ddec8f6363ab"
+
+element-resize-detector@^1.1.0:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.1.11.tgz#34dc9aff624239e0ebdba6cdadeeae88a4cf0b1b"
+  dependencies:
+    batch-processor "^1.0.0"
+
+elliptic@6.4.0, elliptic@^6.0.0, elliptic@^6.2.3:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
+  dependencies:
+    bn.js "^4.4.0"
+    brorand "^1.0.1"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.0"
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+
+encodeurl@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
+
+encoding@^0.1.11:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  dependencies:
+    iconv-lite "~0.4.13"
+
+end-of-stream@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.0.0.tgz#d4596e702734a93e40e9af864319eabd99ff2f0e"
+  dependencies:
+    once "~1.3.0"
+
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
+  dependencies:
+    once "^1.4.0"
+
+enhanced-resolve@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.4.0"
+    object-assign "^4.0.1"
+    tapable "^0.2.5"
+
+entities@^1.1.1, "entities@~ 1.1.1", entities@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+
+enzyme@2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-2.7.1.tgz#76370e1d99e91f73091bb8c4314b7c128cc2d621"
+  dependencies:
+    cheerio "^0.22.0"
+    function.prototype.name "^1.0.0"
+    is-subset "^0.1.1"
+    lodash "^4.17.2"
+    object-is "^1.0.1"
+    object.assign "^4.0.4"
+    object.entries "^1.0.3"
+    object.values "^1.0.3"
+    uuid "^2.0.3"
+
+errno@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
+  dependencies:
+    prr "~0.0.0"
+
+error-ex@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+  dependencies:
+    is-arrayish "^0.2.1"
+
+error-stack-parser@^1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-1.3.6.tgz#e0e73b93e417138d1cd7c0b746b1a4a14854c292"
+  dependencies:
+    stackframe "^0.3.1"
+
+es-abstract@^1.6.1, es-abstract@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.7.0.tgz#dfade774e01bfcd97f96180298c449c8623fb94c"
+  dependencies:
+    es-to-primitive "^1.1.1"
+    function-bind "^1.1.0"
+    is-callable "^1.1.3"
+    is-regex "^1.0.3"
+
+es-to-primitive@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
+  dependencies:
+    is-callable "^1.1.1"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.1"
+
+es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
+  version "0.10.15"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.15.tgz#c330a5934c1ee21284a7c081a86e5fd937c91ea6"
+  dependencies:
+    es6-iterator "2"
+    es6-symbol "~3.1"
+
+es6-error@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.0.tgz#f094c7041f662599bb12720da059d6b9c7ff0f40"
+
+es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
+  dependencies:
+    d "1"
+    es5-ext "^0.10.14"
+    es6-symbol "^3.1"
+
+es6-map@^0.1.3:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-set "~0.1.5"
+    es6-symbol "~3.1.1"
+    event-emitter "~0.3.5"
+
+es6-promise@4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.0.5.tgz#7882f30adde5b240ccfa7f7d78c548330951ae42"
+
+es6-set@~0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-symbol "3.1.1"
+    event-emitter "~0.3.5"
+
+es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+es6-templates@^0.2.2:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/es6-templates/-/es6-templates-0.2.3.tgz#5cb9ac9fb1ded6eb1239342b81d792bbb4078ee4"
+  dependencies:
+    recast "~0.11.12"
+    through "~2.3.6"
+
+es6-weak-map@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+  dependencies:
+    d "1"
+    es5-ext "^0.10.14"
+    es6-iterator "^2.0.1"
+    es6-symbol "^3.1.1"
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+escodegen@^1.6.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
+  dependencies:
+    esprima "^2.7.1"
+    estraverse "^1.9.1"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.2.0"
+
+escope@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
+  dependencies:
+    es6-map "^0.1.3"
+    es6-weak-map "^2.0.1"
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-config-semistandard@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-semistandard/-/eslint-config-semistandard-7.0.0.tgz#f803493f56a5172f7f59c35ae648360b41f2ff71"
+
+eslint-config-standard-jsx@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-3.3.0.tgz#cab0801a15a360bf63facb97ab22fbdd88d8a5e0"
+
+eslint-config-standard-react@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-standard-react/-/eslint-config-standard-react-4.2.0.tgz#d15fd25e837e20aff0db32f64fb55d11880eb8d0"
+  dependencies:
+    eslint-config-standard-jsx "^3.0.0"
+
+eslint-config-standard@6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-6.2.1.tgz#d3a68aafc7191639e7ee441e7348739026354292"
+
+eslint-plugin-promise@3.4.2:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.4.2.tgz#1be2793eafe2d18b5b123b8136c269f804fe7122"
+
+eslint-plugin-react@6.10.0:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.10.0.tgz#9c48b48d101554b5355413e7c64238abde6ef1ef"
+  dependencies:
+    array.prototype.find "^2.0.1"
+    doctrine "^1.2.2"
+    has "^1.0.1"
+    jsx-ast-utils "^1.3.4"
+    object.assign "^4.0.4"
+
+eslint-plugin-standard@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz#3589699ff9c917f2c25f76a916687f641c369ff3"
+
+eslint@3.16.1:
+  version "3.16.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.16.1.tgz#9bc31fc7341692cf772e80607508f67d711c5609"
+  dependencies:
+    babel-code-frame "^6.16.0"
+    chalk "^1.1.3"
+    concat-stream "^1.4.6"
+    debug "^2.1.1"
+    doctrine "^1.2.2"
+    escope "^3.6.0"
+    espree "^3.4.0"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    glob "^7.0.3"
+    globals "^9.14.0"
+    ignore "^3.2.0"
+    imurmurhash "^0.1.4"
+    inquirer "^0.12.0"
+    is-my-json-valid "^2.10.0"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.5.1"
+    json-stable-stringify "^1.0.0"
+    levn "^0.3.0"
+    lodash "^4.0.0"
+    mkdirp "^0.5.0"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.1"
+    pluralize "^1.2.1"
+    progress "^1.1.8"
+    require-uncached "^1.0.2"
+    shelljs "^0.7.5"
+    strip-bom "^3.0.0"
+    strip-json-comments "~2.0.1"
+    table "^3.7.8"
+    text-table "~0.2.0"
+    user-home "^2.0.0"
+
+espree@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.1.tgz#28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2"
+  dependencies:
+    acorn "^5.0.1"
+    acorn-jsx "^3.0.0"
+
+esprima@^2.6.0, esprima@^2.7.1:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+
+esprima@^3.1.1, esprima@~3.1.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
+esrecurse@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
+  dependencies:
+    estraverse "~4.1.0"
+    object-assign "^4.0.1"
+
+estraverse@^1.9.1:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
+
+estraverse@^4.1.1, estraverse@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+
+estraverse@~4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
+
+esutils@^2.0.0, esutils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+
+etag@~1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.7.0.tgz#03d30b5f67dd6e632d2945d30d6652731a34d5d8"
+
+ethereum-common@^0.0.18:
+  version "0.0.18"
+  resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f"
+
+ethereumjs-tx@1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/ethereumjs-tx/-/ethereumjs-tx-1.2.5.tgz#ed36d7ffeb97bc889c61eef1ab76f47a613d8286"
+  dependencies:
+    ethereum-common "^0.0.18"
+    ethereumjs-util "^5.0.0"
+
+ethereumjs-util@5.1.1, ethereumjs-util@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.1.1.tgz#122fb38dea747dc62b3aebfc365d1bd48be4b73e"
+  dependencies:
+    bn.js "^4.8.0"
+    create-hash "^1.1.2"
+    ethjs-util "^0.1.3"
+    keccak "^1.0.2"
+    rlp "^2.0.0"
+    secp256k1 "^3.0.1"
+
+ethjs-util@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/ethjs-util/-/ethjs-util-0.1.4.tgz#1c8b6879257444ef4d3f3fbbac2ded12cd997d93"
+  dependencies:
+    is-hex-prefixed "1.0.0"
+    strip-hex-prefix "1.0.0"
+
+event-emitter@~0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+eventemitter3@1.x.x:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
+
+eventemitter3@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-2.0.2.tgz#20ce4891909ce9f35b088c94fab40e2c96f473ac"
+
+events@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+
+evp_bytestokey@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz#497b66ad9fef65cd7c08a6180824ba1476b66e53"
+  dependencies:
+    create-hash "^1.1.1"
+
+exec-buffer@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/exec-buffer/-/exec-buffer-3.1.0.tgz#851b46d062fca9bcbc6ff8781693e28e8da80402"
+  dependencies:
+    execa "^0.5.0"
+    p-finally "^1.0.0"
+    pify "^2.3.0"
+    rimraf "^2.5.4"
+    tempfile "^1.0.0"
+
+exec-series@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/exec-series/-/exec-series-1.0.3.tgz#6d257a9beac482a872c7783bc8615839fc77143a"
+  dependencies:
+    async-each-series "^1.1.0"
+    object-assign "^4.1.0"
+
+execa@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.5.1.tgz#de3fb85cb8d6e91c85bcbceb164581785cb57b36"
+  dependencies:
+    cross-spawn "^4.0.0"
+    get-stream "^2.2.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+execall@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execall/-/execall-1.0.0.tgz#73d0904e395b3cab0658b08d09ec25307f29bb73"
+  dependencies:
+    clone-regexp "^1.0.0"
+
+executable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/executable/-/executable-1.1.0.tgz#877980e9112f3391066da37265de7ad8434ab4d9"
+  dependencies:
+    meow "^3.1.0"
+
+exit-hook@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
+
+expand-brackets@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  dependencies:
+    is-posix-bracket "^0.1.0"
+
+expand-range@^1.8.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  dependencies:
+    fill-range "^2.1.0"
+
+expand-template@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-1.0.3.tgz#6c303323177a62b1b22c070279f7861287b69b1a"
+
+express@4.14.1:
+  version "4.14.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.14.1.tgz#646c237f766f148c2120aff073817b9e4d7e0d33"
+  dependencies:
+    accepts "~1.3.3"
+    array-flatten "1.1.1"
+    content-disposition "0.5.2"
+    content-type "~1.0.2"
+    cookie "0.3.1"
+    cookie-signature "1.0.6"
+    debug "~2.2.0"
+    depd "~1.1.0"
+    encodeurl "~1.0.1"
+    escape-html "~1.0.3"
+    etag "~1.7.0"
+    finalhandler "0.5.1"
+    fresh "0.3.0"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.1"
+    path-to-regexp "0.1.7"
+    proxy-addr "~1.1.3"
+    qs "6.2.0"
+    range-parser "~1.2.0"
+    send "0.14.2"
+    serve-static "~1.11.2"
+    type-is "~1.6.14"
+    utils-merge "1.0.0"
+    vary "~1.1.0"
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend@^3.0.0, extend@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
+
+extend@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-1.2.1.tgz#a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"
+
+external-editor@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.1.tgz#4c597c6c88fa6410e41dbbaa7b1be2336aa31095"
+  dependencies:
+    tmp "^0.0.31"
+
+extglob@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  dependencies:
+    is-extglob "^1.0.0"
+
+extract-loader@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/extract-loader/-/extract-loader-0.1.0.tgz#a1c146915241cc486d5292263c7555d5aa19766e"
+  dependencies:
+    loader-utils "^0.2.16"
+
+extract-text-webpack-plugin@2.0.0-beta.4:
+  version "2.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.0.0-beta.4.tgz#d32393069e7d90c8318d48392302618b56bc1ba9"
+  dependencies:
+    async "^1.5.0"
+    loader-utils "^0.2.3"
+    webpack-sources "^0.1.0"
+
+extsprintf@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
+
+fancy-log@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948"
+  dependencies:
+    chalk "^1.1.1"
+    time-stamp "^1.0.0"
+
+fast-levenshtein@~2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+
+fastparse@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
+
+fbjs@^0.8.1, fbjs@^0.8.4, fbjs@^0.8.6:
+  version "0.8.12"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04"
+  dependencies:
+    core-js "^1.0.0"
+    isomorphic-fetch "^2.1.1"
+    loose-envify "^1.0.0"
+    object-assign "^4.1.0"
+    promise "^7.1.1"
+    setimmediate "^1.0.5"
+    ua-parser-js "^0.7.9"
+
+fd-slicer@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
+  dependencies:
+    pend "~1.2.0"
+
+figures@^1.3.5:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+  dependencies:
+    escape-string-regexp "^1.0.5"
+    object-assign "^4.1.0"
+
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-entry-cache@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+  dependencies:
+    flat-cache "^1.2.1"
+    object-assign "^4.0.1"
+
+file-loader@0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.10.0.tgz#bbe6db7474ac92c7f54fdc197cf547e98b6b8e12"
+  dependencies:
+    loader-utils "~0.2.5"
+
+file-loader@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.9.0.tgz#1d2daddd424ce6d1b07cfe3f79731bed3617ab42"
+  dependencies:
+    loader-utils "~0.2.5"
+
+file-saver@1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.3.tgz#cdd4c44d3aa264eac2f68ec165bc791c34af1232"
+
+file-type@^3.1.0, file-type@^3.8.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
+
+filename-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
+
+filename-reserved-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz#e61cf805f0de1c984567d0386dc5df50ee5af7e4"
+
+filenamify@^1.0.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-1.2.1.tgz#a9f2ffd11c503bed300015029272378f1f1365a5"
+  dependencies:
+    filename-reserved-regex "^1.0.0"
+    strip-outer "^1.0.0"
+    trim-repeated "^1.0.0"
+
+fileset@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  dependencies:
+    glob "^7.0.3"
+    minimatch "^3.0.3"
+
+filesize@^3.1.2:
+  version "3.5.6"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.6.tgz#5fd98f3eac94ec9516ef8ed5782fad84a01a0a1a"
+
+fill-range@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  dependencies:
+    is-number "^2.1.0"
+    isobject "^2.0.0"
+    randomatic "^1.1.3"
+    repeat-element "^1.1.2"
+    repeat-string "^1.5.2"
+
+finalhandler@0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.5.1.tgz#2c400d8d4530935bc232549c5fa385ec07de6fcd"
+  dependencies:
+    debug "~2.2.0"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    statuses "~1.3.1"
+    unpipe "~1.0.0"
+
+find-cache-dir@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
+  dependencies:
+    commondir "^1.0.1"
+    mkdirp "^0.5.1"
+    pkg-dir "^1.0.0"
+
+find-parent-dir@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
+
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+find-up@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  dependencies:
+    locate-path "^2.0.0"
+
+find-versions@^1.0.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-1.2.1.tgz#cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62"
+  dependencies:
+    array-uniq "^1.0.0"
+    get-stdin "^4.0.1"
+    meow "^3.5.0"
+    semver-regex "^1.0.0"
+
+first-chunk-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
+
+flat-cache@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
+  dependencies:
+    circular-json "^0.3.1"
+    del "^2.0.2"
+    graceful-fs "^4.1.2"
+    write "^0.2.1"
+
+flat@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-2.0.1.tgz#70e29188a74be0c3c89409eed1fa9577907ae32f"
+  dependencies:
+    is-buffer "~1.1.2"
+
+flatten@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
+
+for-in@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+
+for-own@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  dependencies:
+    for-in "^1.0.1"
+
+foreach@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+
+form-data@~2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.2.tgz#89c3534008b97eada4cbb157d58f6f5df025eae4"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
+format-json@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/format-json/-/format-json-1.0.3.tgz#268e3d3e169792ff49bb5b030f22c87ca1c2cd9f"
+
+format-number@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/format-number/-/format-number-2.0.1.tgz#e9231a8743ca64b47d09555dce40296343be66eb"
+
+formatio@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.1.1.tgz#5ed3ccd636551097383465d996199100e86161e9"
+  dependencies:
+    samsam "~1.1"
+
+forwarded@~0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
+
+fresh@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f"
+
+fs-extra@^0.26.4:
+  version "0.26.7"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+    klaw "^1.0.0"
+    path-is-absolute "^1.0.0"
+    rimraf "^2.2.8"
+
+fs-readdir-recursive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz#8cd1745c8b4f8a29c8caec392476921ba195f560"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+fsevents@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff"
+  dependencies:
+    nan "^2.3.0"
+    node-pre-gyp "^0.6.29"
+
+fstream-ignore@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
+  dependencies:
+    fstream "^1.0.0"
+    inherits "2"
+    minimatch "^3.0.0"
+
+fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
+function-bind@^1.0.2, function-bind@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
+
+function.prototype.name@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.0.0.tgz#5f523ca64e491a5f95aba80cc1e391080a14482e"
+  dependencies:
+    define-properties "^1.1.2"
+    function-bind "^1.1.0"
+    is-callable "^1.1.2"
+
+gather-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/gather-stream/-/gather-stream-1.0.0.tgz#b33994af457a8115700d410f317733cbe7a0904b"
+
+gauge@~1.2.5:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"
+  dependencies:
+    ansi "^0.3.0"
+    has-unicode "^2.0.0"
+    lodash.pad "^4.1.0"
+    lodash.padend "^4.1.0"
+    lodash.padstart "^4.1.0"
+
+gauge@~2.7.1:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.3.tgz#1c23855f962f17b3ad3d0dc7443f304542edfe09"
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+generate-function@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
+
+generate-object-property@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+  dependencies:
+    is-property "^1.0.0"
+
+geopattern@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/geopattern/-/geopattern-1.2.3.tgz#de96602e46dba9095ca5774bfb3b36308f7e63fe"
+  dependencies:
+    extend "~1.2.1"
+
+get-caller-file@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+
+get-own-enumerable-property-symbols@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-1.0.1.tgz#f1d4e3ad1402e039898e56d1e9b9aa924c26e484"
+
+get-proxy@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-1.1.0.tgz#894854491bc591b0f147d7ae570f5c678b7256eb"
+  dependencies:
+    rc "^1.1.2"
+
+get-stdin@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+
+get-stdin@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
+
+get-stream@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
+  dependencies:
+    object-assign "^4.0.1"
+    pinkie-promise "^2.0.0"
+
+getpass@^0.1.1:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6"
+  dependencies:
+    assert-plus "^1.0.0"
+
+gifsicle@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/gifsicle/-/gifsicle-3.0.4.tgz#f45cb5ed10165b665dc929e0e9328b6c821dfa3b"
+  dependencies:
+    bin-build "^2.0.0"
+    bin-wrapper "^3.0.0"
+    logalot "^2.0.0"
+
+github-from-package@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
+
+glob-base@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  dependencies:
+    glob-parent "^2.0.0"
+    is-glob "^2.0.0"
+
+glob-parent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  dependencies:
+    is-glob "^2.0.0"
+
+glob-parent@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
+glob-stream@^5.3.2:
+  version "5.3.5"
+  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22"
+  dependencies:
+    extend "^3.0.0"
+    glob "^5.0.3"
+    glob-parent "^3.0.0"
+    micromatch "^2.3.7"
+    ordered-read-streams "^0.3.0"
+    through2 "^0.6.0"
+    to-absolute-glob "^0.1.1"
+    unique-stream "^2.0.2"
+
+glob@7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^5.0.3:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+global@^4.3.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/global/-/global-4.3.1.tgz#5f757908c7cbabce54f386ae440e11e26b7916df"
+  dependencies:
+    min-document "^2.19.0"
+    process "~0.5.1"
+
+globals@^9.0.0, globals@^9.14.0:
+  version "9.17.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
+
+globby@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  dependencies:
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+globby@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+globjoin@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
+
+glogg@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5"
+  dependencies:
+    sparkles "^1.0.0"
+
+got@^5.0.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/got/-/got-5.7.1.tgz#5f81635a61e4a6589f180569ea4e381680a51f35"
+  dependencies:
+    create-error-class "^3.0.1"
+    duplexer2 "^0.1.4"
+    is-redirect "^1.0.0"
+    is-retry-allowed "^1.0.0"
+    is-stream "^1.0.0"
+    lowercase-keys "^1.0.0"
+    node-status-codes "^1.0.0"
+    object-assign "^4.0.1"
+    parse-json "^2.1.0"
+    pinkie-promise "^2.0.0"
+    read-all-stream "^3.0.0"
+    readable-stream "^2.0.5"
+    timed-out "^3.0.0"
+    unzip-response "^1.0.2"
+    url-parse-lax "^1.0.0"
+
+graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+
+growl@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
+
+gulp-decompress@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/gulp-decompress/-/gulp-decompress-1.2.0.tgz#8eeb65a5e015f8ed8532cafe28454960626f0dc7"
+  dependencies:
+    archive-type "^3.0.0"
+    decompress "^3.0.0"
+    gulp-util "^3.0.1"
+    readable-stream "^2.0.2"
+
+gulp-rename@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.2.2.tgz#3ad4428763f05e2764dec1c67d868db275687817"
+
+gulp-sourcemaps@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz#b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"
+  dependencies:
+    convert-source-map "^1.1.1"
+    graceful-fs "^4.1.2"
+    strip-bom "^2.0.0"
+    through2 "^2.0.0"
+    vinyl "^1.0.0"
+
+gulp-util@^3.0.1:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
+  dependencies:
+    array-differ "^1.0.0"
+    array-uniq "^1.0.2"
+    beeper "^1.0.0"
+    chalk "^1.0.0"
+    dateformat "^2.0.0"
+    fancy-log "^1.1.0"
+    gulplog "^1.0.0"
+    has-gulplog "^0.1.0"
+    lodash._reescape "^3.0.0"
+    lodash._reevaluate "^3.0.0"
+    lodash._reinterpolate "^3.0.0"
+    lodash.template "^3.0.0"
+    minimist "^1.1.0"
+    multipipe "^0.1.2"
+    object-assign "^3.0.0"
+    replace-ext "0.0.1"
+    through2 "^2.0.0"
+    vinyl "^0.5.0"
+
+gulplog@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
+  dependencies:
+    glogg "^1.0.0"
+
+handlebars@^4.0.3:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.6.tgz#2ce4484850537f9c97a8026d5399b935c4ed4ed7"
+  dependencies:
+    async "^1.4.0"
+    optimist "^0.6.1"
+    source-map "^0.4.4"
+  optionalDependencies:
+    uglify-js "^2.6"
+
+happypack@3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/happypack/-/happypack-3.0.3.tgz#22f78c87a325cdb798c958cf4ec383fcd4d6fdc7"
+  dependencies:
+    async "1.5.0"
+    json-stringify-safe "5.0.1"
+    loader-utils "0.2.16"
+    mkdirp "0.5.1"
+
+har-schema@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+
+har-validator@~2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
+  dependencies:
+    chalk "^1.1.1"
+    commander "^2.9.0"
+    is-my-json-valid "^2.12.4"
+    pinkie-promise "^2.0.0"
+
+har-validator@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  dependencies:
+    ajv "^4.9.1"
+    har-schema "^1.0.5"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+
+has-gulplog@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
+  dependencies:
+    sparkles "^1.0.0"
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+
+has@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+  dependencies:
+    function-bind "^1.0.2"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573"
+  dependencies:
+    inherits "^2.0.1"
+
+hawk@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  dependencies:
+    boom "2.x.x"
+    cryptiles "2.x.x"
+    hoek "2.x.x"
+    sntp "1.x.x"
+
+he@1.1.x:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
+
+history@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/history/-/history-3.3.0.tgz#fcedcce8f12975371545d735461033579a6dae9c"
+  dependencies:
+    invariant "^2.2.1"
+    loose-envify "^1.2.0"
+    query-string "^4.2.2"
+    warning "^3.0.0"
+
+hmac-drbg@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.0.tgz#3db471f45aae4a994a0688322171f51b8b91bee5"
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
+hoek@2.x.x:
+  version "2.16.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+
+hoist-non-react-statics@^1.0.0, hoist-non-react-statics@^1.0.3, hoist-non-react-statics@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
+
+home-or-tmp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.1"
+
+hosted-git-info@^2.1.4:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.1.tgz#4b0445e41c004a8bd1337773a4ff790ca40318c8"
+
+html-comment-regex@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
+
+html-encoding-sniffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz#79bf7a785ea495fe66165e734153f363ff5437da"
+  dependencies:
+    whatwg-encoding "^1.0.1"
+
+html-entities@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.0.tgz#41948caf85ce82fed36e4e6a0ed371a6664379e2"
+
+html-loader@0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-0.4.4.tgz#f2b5b9acd5e035ff3ab5fd369c13c97a7bb014da"
+  dependencies:
+    es6-templates "^0.2.2"
+    fastparse "^1.1.1"
+    html-minifier "^3.0.1"
+    loader-utils "^0.2.15"
+    object-assign "^4.1.0"
+
+html-minifier@^3.0.1, html-minifier@^3.2.3:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.4.2.tgz#31896baaf735c1d95f7a0b7291f9dc36c0720752"
+  dependencies:
+    camel-case "3.0.x"
+    clean-css "4.0.x"
+    commander "2.9.x"
+    he "1.1.x"
+    ncname "1.0.x"
+    param-case "2.1.x"
+    relateurl "0.2.x"
+    uglify-js "2.8.x"
+
+html-tags@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-1.1.1.tgz#869f43859f12d9bdc3892419e494a628aa1b204e"
+
+html-webpack-plugin@2.28.0:
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.28.0.tgz#2e7863b57e5fd48fe263303e2ffc934c3064d009"
+  dependencies:
+    bluebird "^3.4.7"
+    html-minifier "^3.2.3"
+    loader-utils "^0.2.16"
+    lodash "^4.17.3"
+    pretty-error "^2.0.2"
+    toposort "^1.0.0"
+
+html@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/html/-/html-1.0.0.tgz#a544fa9ea5492bfb3a2cca8210a10be7b5af1f61"
+  dependencies:
+    concat-stream "^1.4.7"
+
+htmlparser2@^3.9.1:
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
+  dependencies:
+    domelementtype "^1.3.0"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^2.0.2"
+
+htmlparser2@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
+  dependencies:
+    domelementtype "1"
+    domhandler "2.1"
+    domutils "1.1"
+    readable-stream "1.0"
+
+http-errors@~1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750"
+  dependencies:
+    inherits "2.0.3"
+    setprototypeof "1.0.2"
+    statuses ">= 1.3.1 < 2"
+
+http-proxy-middleware@0.17.3:
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.3.tgz#940382147149b856084f5534752d5b5a8168cd1d"
+  dependencies:
+    http-proxy "^1.16.2"
+    is-glob "^3.1.0"
+    lodash "^4.17.2"
+    micromatch "^2.3.11"
+
+http-proxy@^1.16.2:
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
+  dependencies:
+    eventemitter3 "1.x.x"
+    requires-port "1.x.x"
+
+http-signature@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  dependencies:
+    assert-plus "^0.2.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
+
+humanize@0.0.9:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/humanize/-/humanize-0.0.9.tgz#1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"
+
+husky@0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-0.13.1.tgz#11efc6fc10e0ec4e789776f6582be37d71ba4ccf"
+  dependencies:
+    chalk "^1.1.3"
+    find-parent-dir "^0.3.0"
+    is-ci "^1.0.9"
+    normalize-path "^1.0.0"
+
+hyphenate-style-name@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b"
+
+iconv-lite@0.4.13, iconv-lite@~0.4.13:
+  version "0.4.13"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
+
+icss-replace-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"
+
+ieee754@^1.1.4:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
+
+ignore-styles@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-styles/-/ignore-styles-5.0.1.tgz#b49ef2274bdafcd8a4880a966bfe38d1a0bf4671"
+
+ignore@^3.2.0:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.6.tgz#26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c"
+
+image-webpack-loader@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/image-webpack-loader/-/image-webpack-loader-3.2.0.tgz#f26306d6048d3a2f5a8d844ecaedd2b7148f0a4e"
+  dependencies:
+    file-loader "^0.9.0"
+    imagemin "^5.2.2"
+    imagemin-gifsicle "^5.1.0"
+    imagemin-mozjpeg "^6.0.0"
+    imagemin-optipng "^5.2.1"
+    imagemin-pngquant "^5.0.0"
+    imagemin-svgo "^5.2.0"
+    loader-utils "^0.2.16"
+
+imagemin-gifsicle@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/imagemin-gifsicle/-/imagemin-gifsicle-5.1.0.tgz#2e4ddcda2a109b221cabaec498e1e2dd28ca768f"
+  dependencies:
+    exec-buffer "^3.0.0"
+    gifsicle "^3.0.0"
+    is-gif "^1.0.0"
+
+imagemin-mozjpeg@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/imagemin-mozjpeg/-/imagemin-mozjpeg-6.0.0.tgz#71a32a457aa1b26117a68eeef2d9b190c2e5091e"
+  dependencies:
+    exec-buffer "^3.0.0"
+    is-jpg "^1.0.0"
+    mozjpeg "^4.0.0"
+
+imagemin-optipng@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/imagemin-optipng/-/imagemin-optipng-5.2.1.tgz#d22da412c09f5ff00a4339960b98a88b1dbe8695"
+  dependencies:
+    exec-buffer "^3.0.0"
+    is-png "^1.0.0"
+    optipng-bin "^3.0.0"
+
+imagemin-pngquant@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/imagemin-pngquant/-/imagemin-pngquant-5.0.0.tgz#7d72405778caba9c510eb3cb4590c8413383560e"
+  dependencies:
+    exec-buffer "^3.0.0"
+    is-png "^1.0.0"
+    pngquant-bin "^3.0.0"
+
+imagemin-svgo@^5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/imagemin-svgo/-/imagemin-svgo-5.2.1.tgz#74d593ce4cbe1b87efdb3d06a4a56078f71a8147"
+  dependencies:
+    is-svg "^2.0.0"
+    svgo "^0.7.0"
+
+imagemin@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/imagemin/-/imagemin-5.2.2.tgz#e14a0f357f8810266875eda38634eeb96f6fbd16"
+  dependencies:
+    file-type "^3.8.0"
+    globby "^5.0.0"
+    mkdirp "^0.5.1"
+    pify "^2.3.0"
+    promise.pipe "^3.0.0"
+    replace-ext "0.0.1"
+
+immediate@~3.0.5:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+
+in-publish@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
+
+indent-string@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  dependencies:
+    repeating "^2.0.0"
+
+indexes-of@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+
+ini@^1.3.4, ini@~1.3.0:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
+
+inline-style-prefixer@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-2.0.5.tgz#c153c7e88fd84fef5c602e95a8168b2770671fe7"
+  dependencies:
+    bowser "^1.0.0"
+    hyphenate-style-name "^1.0.1"
+
+inquirer@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
+  dependencies:
+    ansi-escapes "^1.1.0"
+    ansi-regex "^2.0.0"
+    chalk "^1.0.0"
+    cli-cursor "^1.0.1"
+    cli-width "^2.0.0"
+    figures "^1.3.5"
+    lodash "^4.3.0"
+    readline2 "^1.0.1"
+    run-async "^0.1.0"
+    rx-lite "^3.1.2"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.0"
+    through "^2.3.6"
+
+inquirer@^3.0.1:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
+  dependencies:
+    ansi-escapes "^1.1.0"
+    chalk "^1.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^2.0.1"
+    figures "^2.0.0"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rx "^4.1.0"
+    string-width "^2.0.0"
+    strip-ansi "^3.0.0"
+    through "^2.3.6"
+
+interpret@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.2.tgz#f4f623f0bb7122f15f5717c8e254b8161b5c5b2d"
+
+intl-format-cache@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/intl-format-cache/-/intl-format-cache-2.0.5.tgz#b484cefcb9353f374f25de389a3ceea1af18d7c9"
+
+intl-messageformat-parser@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.2.0.tgz#5906b7f953ab7470e0dc8549097b648b991892ff"
+
+intl-messageformat-parser@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.3.0.tgz#c5d26ffb894c7d9c2b9fa444c67f417ab2594268"
+
+intl-messageformat@1.3.0, intl-messageformat@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-1.3.0.tgz#f7d926aded7a3ab19b2dc601efd54e99a4bd4eae"
+  dependencies:
+    intl-messageformat-parser "1.2.0"
+
+intl-relativeformat@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-1.3.0.tgz#893dc7076fccd380cf091a2300c380fa57ace45b"
+  dependencies:
+    intl-messageformat "1.3.0"
+
+invariant@^2.0.0, invariant@^2.1.1, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+  dependencies:
+    loose-envify "^1.0.0"
+
+invert-kv@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+
+ip-regex@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd"
+
+ipaddr.js@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"
+
+irregular-plurals@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.2.0.tgz#38f299834ba8c00c30be9c554e137269752ff3ac"
+
+is-absolute-url@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
+
+is-absolute@^0.1.5:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.1.7.tgz#847491119fccb5fb436217cc737f7faad50f603f"
+  dependencies:
+    is-relative "^0.1.0"
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-buffer@^1.0.2, is-buffer@~1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
+
+is-builtin-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  dependencies:
+    builtin-modules "^1.0.0"
+
+is-bzip2@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-bzip2/-/is-bzip2-1.0.0.tgz#5ee58eaa5a2e9c80e21407bedf23ae5ac091b3fc"
+
+is-callable@^1.1.1, is-callable@^1.1.2, is-callable@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
+
+is-ci@^1.0.10, is-ci@^1.0.9:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
+  dependencies:
+    ci-info "^1.0.0"
+
+is-date-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+
+is-dotfile@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
+
+is-equal-shallow@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  dependencies:
+    is-primitive "^2.0.0"
+
+is-extendable@^0.1.0, is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+
+is-extglob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+
+is-extglob@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+
+is-finite@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+
+is-gif@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-gif/-/is-gif-1.0.0.tgz#a6d2ae98893007bffa97a1d8c01d63205832097e"
+
+is-glob@^2.0.0, is-glob@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  dependencies:
+    is-extglob "^1.0.0"
+
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-gzip@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-gzip/-/is-gzip-1.0.0.tgz#6ca8b07b99c77998025900e555ced8ed80879a83"
+
+is-hex-prefixed@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554"
+
+is-jpg@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-jpg/-/is-jpg-1.0.0.tgz#2959c17e73430db38264da75b90dd54f2d86da1c"
+
+is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
+  dependencies:
+    generate-function "^2.0.0"
+    generate-object-property "^1.1.0"
+    jsonpointer "^4.0.0"
+    xtend "^4.0.0"
+
+is-natural-number@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-2.1.1.tgz#7d4c5728377ef386c3e194a9911bf57c6dc335e7"
+
+is-number@^2.0.2, is-number@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-obj@^1.0.0, is-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+
+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f"
+  dependencies:
+    path-is-inside "^1.0.1"
+
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+
+is-plain-object@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.1.tgz#4d7ca539bc9db9b737b8acb612f2318ef92f294f"
+  dependencies:
+    isobject "^1.0.0"
+
+is-png@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-png/-/is-png-1.0.0.tgz#3d80373fe9b89d65fd341f659d3fc0a1135e718a"
+
+is-posix-bracket@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+
+is-primitive@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+
+is-promise@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+
+is-property@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+
+is-redirect@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
+
+is-regex@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  dependencies:
+    has "^1.0.1"
+
+is-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+
+is-relative@^0.1.0:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.1.3.tgz#905fee8ae86f45b3ec614bc3c15c869df0876e82"
+
+is-resolvable@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62"
+  dependencies:
+    tryit "^1.0.1"
+
+is-retry-allowed@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
+
+is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+
+is-subset@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
+
+is-supported-regexp-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz#8b520c85fae7a253382d4b02652e045576e13bb8"
+
+is-svg@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
+  dependencies:
+    html-comment-regex "^1.1.0"
+
+is-symbol@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
+
+is-tar@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-tar/-/is-tar-1.0.0.tgz#2f6b2e1792c1f5bb36519acaa9d65c0d26fe853d"
+
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+
+is-url@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.2.tgz#498905a593bf47cc2d9e7f738372bbf7696c7f26"
+
+is-utf8@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+
+is-valid-glob@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe"
+
+is-zip@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-zip/-/is-zip-1.0.0.tgz#47b0a8ff4d38a76431ccfd99a8e15a4c86ba2325"
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+
+isobject@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-1.0.2.tgz#f0f9b8ce92dd540fa0740882e3835a2e022ec78a"
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  dependencies:
+    isarray "1.0.0"
+
+isomorphic-fetch@2.2.1, isomorphic-fetch@^2.1.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
+  dependencies:
+    node-fetch "^1.0.1"
+    whatwg-fetch ">=0.10.0"
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+
+istanbul-api@^1.0.0-alpha:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.7.tgz#f6f37f09f8002b130f891c646b70ee4a8e7345ae"
+  dependencies:
+    async "^2.1.4"
+    fileset "^2.0.2"
+    istanbul-lib-coverage "^1.0.2"
+    istanbul-lib-hook "^1.0.5"
+    istanbul-lib-instrument "^1.7.0"
+    istanbul-lib-report "^1.0.0"
+    istanbul-lib-source-maps "^1.1.1"
+    istanbul-reports "^1.0.2"
+    js-yaml "^3.7.0"
+    mkdirp "^0.5.1"
+    once "^1.4.0"
+
+istanbul-lib-coverage@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.2.tgz#87a0c015b6910651cb3b184814dfb339337e25e1"
+
+istanbul-lib-hook@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.5.tgz#6ca3d16d60c5f4082da39f7c5cd38ea8a772b88e"
+  dependencies:
+    append-transform "^0.4.0"
+
+istanbul-lib-instrument@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.0.tgz#b8e0dc25709bb44e17336ab47b7bb5c97c23f659"
+  dependencies:
+    babel-generator "^6.18.0"
+    babel-template "^6.16.0"
+    babel-traverse "^6.18.0"
+    babel-types "^6.18.0"
+    babylon "^6.13.0"
+    istanbul-lib-coverage "^1.0.2"
+    semver "^5.3.0"
+
+istanbul-lib-report@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0.tgz#d83dac7f26566b521585569367fe84ccfc7aaecb"
+  dependencies:
+    istanbul-lib-coverage "^1.0.2"
+    mkdirp "^0.5.1"
+    path-parse "^1.0.5"
+    supports-color "^3.1.2"
+
+istanbul-lib-source-maps@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.1.tgz#f8c8c2e8f2160d1d91526d97e5bd63b2079af71c"
+  dependencies:
+    istanbul-lib-coverage "^1.0.2"
+    mkdirp "^0.5.1"
+    rimraf "^2.4.4"
+    source-map "^0.5.3"
+
+istanbul-reports@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.2.tgz#4e8366abe6fa746cc1cd6633f108de12cc6ac6fa"
+  dependencies:
+    handlebars "^4.0.3"
+
+istanbul@1.0.0-alpha.2:
+  version "1.0.0-alpha.2"
+  resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-1.0.0-alpha.2.tgz#06096bc08e98baad744aae46962d8df9fac63d08"
+  dependencies:
+    abbrev "1.0.x"
+    async "1.x"
+    istanbul-api "^1.0.0-alpha"
+    js-yaml "3.x"
+    mkdirp "0.5.x"
+    nopt "3.x"
+    which "^1.1.1"
+    wordwrap "^1.0.0"
+
+jodid25519@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967"
+  dependencies:
+    jsbn "~0.1.0"
+
+js-base64@^2.1.9:
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
+
+js-sha3@0.5.5:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.5.tgz#baf0c0e8c54ad5903447df96ade7a4a1bca79a4a"
+
+js-tokens@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
+
+js-yaml@3.6.1, js-yaml@3.x, js-yaml@^3.5.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^2.6.0"
+
+js-yaml@^3.4.3, js-yaml@^3.7.0:
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.2.tgz#02d3e2c0f6beab20248d412c352203827d786721"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^3.1.1"
+
+js-yaml@~3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^2.6.0"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+
+jsdom@9.11.0:
+  version "9.11.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.11.0.tgz#a95b0304e521a2ca5a63c6ea47bf7708a7a84591"
+  dependencies:
+    abab "^1.0.3"
+    acorn "^4.0.4"
+    acorn-globals "^3.1.0"
+    array-equal "^1.0.0"
+    content-type-parser "^1.0.1"
+    cssom ">= 0.3.2 < 0.4.0"
+    cssstyle ">= 0.2.37 < 0.3.0"
+    escodegen "^1.6.1"
+    html-encoding-sniffer "^1.0.1"
+    nwmatcher ">= 1.3.9 < 2.0.0"
+    parse5 "^1.5.1"
+    request "^2.79.0"
+    sax "^1.2.1"
+    symbol-tree "^3.2.1"
+    tough-cookie "^2.3.2"
+    webidl-conversions "^4.0.0"
+    whatwg-encoding "^1.0.1"
+    whatwg-url "^4.3.0"
+    xml-name-validator "^2.0.1"
+
+jsesc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+
+jsesc@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+
+json-loader@0.5.4, json-loader@^0.5.4:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+
+json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  dependencies:
+    jsonify "~0.0.0"
+
+json-stringify-safe@5.0.1, json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+
+json3@3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+
+json5@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+
+jsonfile@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonfilter@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/jsonfilter/-/jsonfilter-1.1.2.tgz#21ef7cedc75193813c75932e96a98be205ba5a11"
+  dependencies:
+    JSONStream "^0.8.4"
+    minimist "^1.1.0"
+    stream-combiner "^0.2.1"
+    through2 "^0.6.3"
+
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+
+jsonparse@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-0.0.5.tgz#330542ad3f0a654665b778f3eb2d9a9fa507ac64"
+
+jsonpointer@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+
+jsprim@^1.2.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.0.2"
+    json-schema "0.2.3"
+    verror "1.3.6"
+
+jsqr@^0.2.1:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/jsqr/-/jsqr-0.2.2.tgz#8c1f0279fb7c94542aaa9e8aeb7c722d523ea092"
+
+jsx-ast-utils@^1.3.4:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.0.tgz#5afe38868f56bc8cc7aeaef0100ba8c75bd12591"
+  dependencies:
+    object-assign "^4.1.0"
+
+keccak@^1.0.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/keccak/-/keccak-1.2.0.tgz#b53618fc7961b642f6e73f1546eec3329f7effe0"
+  dependencies:
+    bindings "^1.2.1"
+    inherits "^2.0.3"
+    nan "^2.2.1"
+    prebuild-install "^2.0.0"
+
+keycode@^2.1.1:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.1.8.tgz#94d2b7098215eff0e8f9a8931d5a59076c4532fb"
+
+keythereum@0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/keythereum/-/keythereum-0.4.3.tgz#514acfec3cc4d04b33a21f5d081600719457d2c0"
+  dependencies:
+    elliptic "6.4.0"
+    ethereumjs-util "5.1.1"
+    sjcl "1.0.6"
+    uuid "3.0.0"
+    validator "4.0.2"
+
+kind-of@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47"
+  dependencies:
+    is-buffer "^1.0.2"
+
+klaw@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
+  optionalDependencies:
+    graceful-fs "^4.1.9"
+
+known-css-properties@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.0.6.tgz#71a0b8fde1b6e3431c471efbc3d9733faebbcfbf"
+
+laggard@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/laggard/-/laggard-0.1.0.tgz#2efd645f7f2d8f3d27ac808039ca86a8ee341075"
+  dependencies:
+    minimist "^1.2.0"
+    pixrem "^3.0.0"
+    postcss "^5.0.0"
+    postcss-color-rgba-fallback "^2.0.0"
+    postcss-opacity "^3.0.0"
+    postcss-pseudoelements "^3.0.0"
+    postcss-reporter "^1.2.1"
+    postcss-vmin "^2.0.0"
+    postcss-will-change "^1.0.0"
+    read-file-stdin "^0.2.0"
+    write-file-stdout "0.0.2"
+
+lazy-cache@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+
+lazy-req@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/lazy-req/-/lazy-req-1.1.0.tgz#bdaebead30f8d824039ce0ce149d4daa07ba1fac"
+
+lazystream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
+  dependencies:
+    readable-stream "^2.0.5"
+
+lcid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  dependencies:
+    invert-kv "^1.0.0"
+
+lcov-parse@0.0.10:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
+
+ldjson-stream@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ldjson-stream/-/ldjson-stream-1.2.1.tgz#91beceda5ac4ed2b17e649fb777e7abfa0189c2b"
+  dependencies:
+    split2 "^0.2.1"
+    through2 "^0.6.1"
+
+leven@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+
+levn@^0.3.0, levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+lie@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+  dependencies:
+    immediate "~3.0.5"
+
+load-json-file@^1.0.0, load-json-file@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+
+loader-runner@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
+
+loader-utils@0.2.16:
+  version "0.2.16"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+    object-assign "^4.0.1"
+
+loader-utils@0.2.x, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@^0.2.7, loader-utils@~0.2.2, loader-utils@~0.2.5:
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+    object-assign "^4.0.1"
+
+loader-utils@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
+lodash-es@^4.2.1:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7"
+
+lodash._baseassign@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
+  dependencies:
+    lodash._basecopy "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash._basecopy@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
+
+lodash._basecreate@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
+
+lodash._basetostring@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
+
+lodash._basevalues@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
+
+lodash._getnative@^3.0.0:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+
+lodash._isiterateecall@^3.0.0:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
+
+lodash._reescape@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
+
+lodash._reevaluate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
+
+lodash._reinterpolate@^3.0.0, lodash._reinterpolate@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+
+lodash._root@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
+
+lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+
+lodash.assignin@^4.0.9:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
+
+lodash.bind@^4.1.4:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35"
+
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+
+lodash.create@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
+  dependencies:
+    lodash._baseassign "^3.0.0"
+    lodash._basecreate "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+
+lodash.defaults@^4.0.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+
+lodash.escape@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
+  dependencies:
+    lodash._root "^3.0.0"
+
+lodash.filter@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace"
+
+lodash.flatten@^4.2.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+
+lodash.foreach@^4.3.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
+
+lodash.isarguments@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+
+lodash.isarray@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+
+lodash.isequal@^4.0.0, lodash.isequal@^4.1.1:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+
+lodash.keys@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
+  dependencies:
+    lodash._getnative "^3.0.0"
+    lodash.isarguments "^3.0.0"
+    lodash.isarray "^3.0.0"
+
+lodash.map@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
+
+lodash.memoize@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+
+lodash.merge@^4.4.0, lodash.merge@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
+
+lodash.pad@^4.1.0:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70"
+
+lodash.padend@^4.1.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e"
+
+lodash.padstart@^4.1.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"
+
+lodash.pick@^4.2.1:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
+
+lodash.pickby@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
+
+lodash.reduce@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
+
+lodash.reject@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415"
+
+lodash.restparam@^3.0.0:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+
+lodash.some@^4.4.0, lodash.some@^4.5.1:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
+
+lodash.template@^3.0.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
+  dependencies:
+    lodash._basecopy "^3.0.0"
+    lodash._basetostring "^3.0.0"
+    lodash._basevalues "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+    lodash._reinterpolate "^3.0.0"
+    lodash.escape "^3.0.0"
+    lodash.keys "^3.0.0"
+    lodash.restparam "^3.0.0"
+    lodash.templatesettings "^3.0.0"
+
+lodash.template@^4.3.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+  dependencies:
+    lodash._reinterpolate "~3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+    lodash.escape "^3.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  dependencies:
+    lodash._reinterpolate "~3.0.0"
+
+lodash.throttle@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
+
+lodash.uniq@^4.3.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+
+lodash@4.13.1, lodash@~4.13.1:
+  version "4.13.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.13.1.tgz#83e4b10913f48496d4d16fec4a560af2ee744b68"
+
+lodash@4.17.2:
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42"
+
+lodash@^3.6.0:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
+
+lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.2:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+
+log-driver@1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056"
+
+log-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
+  dependencies:
+    chalk "^1.0.0"
+
+logalot@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/logalot/-/logalot-2.1.0.tgz#5f8e8c90d304edf12530951a5554abb8c5e3f552"
+  dependencies:
+    figures "^1.3.5"
+    squeak "^1.0.0"
+
+loglevel@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.4.1.tgz#95b383f91a3c2756fd4ab093667e4309161f2bcd"
+
+lolex@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"
+
+longest@^1.0.0, longest@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  dependencies:
+    js-tokens "^3.0.0"
+
+loud-rejection@^1.0.0, loud-rejection@^1.2.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  dependencies:
+    currently-unhandled "^0.4.1"
+    signal-exit "^3.0.0"
+
+lower-case@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+
+lowercase-keys@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+
+lpad-align@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/lpad-align/-/lpad-align-1.1.0.tgz#27fa786bcb695fc434ea1500723eb8d0bdc82bf4"
+  dependencies:
+    get-stdin "^4.0.1"
+    longest "^1.0.0"
+    lpad "^2.0.1"
+    meow "^3.3.0"
+
+lpad@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/lpad/-/lpad-2.0.1.tgz#28316b4e7b2015f511f6591459afc0e5944008ad"
+
+lru-cache@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
+  dependencies:
+    pseudomap "^1.0.1"
+    yallist "^2.0.0"
+
+macaddress@^0.2.8:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
+
+map-obj@^1.0.0, map-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+
+marked@0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"
+
+material-ui-chip-input@0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/material-ui-chip-input/-/material-ui-chip-input-0.11.1.tgz#e92b2cc5c9741cd75d6b1822f1c7771ad4ce6c10"
+
+material-ui@0.16.5:
+  version "0.16.5"
+  resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-0.16.5.tgz#bb8661aac7cac8cb223a3e76f4f57ee18a4aefc1"
+  dependencies:
+    babel-runtime "^6.11.6"
+    inline-style-prefixer "^2.0.1"
+    keycode "^2.1.1"
+    lodash.merge "^4.6.0"
+    lodash.throttle "^4.1.1"
+    react-addons-create-fragment "^15.0.0"
+    react-addons-transition-group "^15.0.0"
+    react-event-listener "^0.4.0"
+    recompose "^0.20.2"
+    simple-assign "^0.1.0"
+    warning "^3.0.0"
+
+math-expression-evaluator@^1.2.14:
+  version "1.2.16"
+  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.16.tgz#b357fa1ca9faefb8e48d10c14ef2bcb2d9f0a7c9"
+
+"mdurl@~ 1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+
+memory-fs@^0.4.0, memory-fs@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+memorystream@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
+
+meow@^3.1.0, meow@^3.3.0, meow@^3.5.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  dependencies:
+    camelcase-keys "^2.0.0"
+    decamelize "^1.1.2"
+    loud-rejection "^1.0.0"
+    map-obj "^1.0.1"
+    minimist "^1.1.3"
+    normalize-package-data "^2.3.4"
+    object-assign "^4.0.1"
+    read-pkg-up "^1.0.1"
+    redent "^1.0.0"
+    trim-newlines "^1.0.0"
+
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+
+merge-stream@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+  dependencies:
+    readable-stream "^2.0.1"
+
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+
+micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  dependencies:
+    arr-diff "^2.0.0"
+    array-unique "^0.2.1"
+    braces "^1.8.2"
+    expand-brackets "^0.1.4"
+    extglob "^0.3.1"
+    filename-regex "^2.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.1"
+    kind-of "^3.0.2"
+    normalize-path "^2.0.1"
+    object.omit "^2.0.0"
+    parse-glob "^3.0.4"
+    regex-cache "^0.4.2"
+
+miller-rabin@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.0.tgz#4a62fb1d42933c05583982f4c716f6fb9e6c6d3d"
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
+mime-db@~1.27.0:
+  version "1.27.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
+
+mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7:
+  version "2.1.15"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
+  dependencies:
+    mime-db "~1.27.0"
+
+mime@1.2.x:
+  version "1.2.11"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
+
+mime@1.3.4, mime@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
+
+mimic-fn@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
+
+min-document@^2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
+  dependencies:
+    dom-walk "^0.1.0"
+
+minimalistic-assert@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
+
+minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
+  dependencies:
+    brace-expansion "^1.0.0"
+
+minimist@0.0.8, minimist@~0.0.1:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.2, minimist@^1.1.3, minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
+mobx-react-devtools@4.2.10:
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/mobx-react-devtools/-/mobx-react-devtools-4.2.10.tgz#79274bd8d44ba04d950728738a144541fa2a6012"
+
+mobx-react@4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-4.0.3.tgz#40eb31d25e0b8d63048eda2376cc56bfabd14f75"
+  dependencies:
+    hoist-non-react-statics "^1.2.0"
+
+mobx@2.6.4:
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/mobx/-/mobx-2.6.4.tgz#e05a91a5b2c97dac3fdab34024e6b74a7f4311ab"
+
+mocha@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.2.0.tgz#7dc4f45e5088075171a68896814e6ae9eb7a85e3"
+  dependencies:
+    browser-stdout "1.3.0"
+    commander "2.9.0"
+    debug "2.2.0"
+    diff "1.4.0"
+    escape-string-regexp "1.0.5"
+    glob "7.0.5"
+    growl "1.9.2"
+    json3 "3.3.2"
+    lodash.create "3.1.1"
+    mkdirp "0.5.1"
+    supports-color "3.1.2"
+
+mock-local-storage@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/mock-local-storage/-/mock-local-storage-1.0.2.tgz#a65a65cddab4707433d52ba4e9f6b63084b8c298"
+  dependencies:
+    core-js "^0.8.3"
+
+mock-socket@6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/mock-socket/-/mock-socket-6.0.4.tgz#85f58a0aa83bc1db4ca7d14b42d8f9dd663e7569"
+
+moment@2.17.0:
+  version "2.17.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.0.tgz#a4c292e02aac5ddefb29a6eed24f51938dd3b74f"
+
+mozjpeg@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/mozjpeg/-/mozjpeg-4.1.1.tgz#859030b24f689a53db9b40f0160d89195b88fd50"
+  dependencies:
+    bin-build "^2.0.0"
+    bin-wrapper "^3.0.0"
+    logalot "^2.0.0"
+
+ms@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
+
+ms@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
+
+multimatch@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
+  dependencies:
+    array-differ "^1.0.0"
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    minimatch "^3.0.0"
+
+multipipe@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
+  dependencies:
+    duplexer2 "0.0.2"
+
+mute-stream@0.0.5, mute-stream@~0.0.4:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
+
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+
+nan@^2.2.1, nan@^2.3.0, nan@^2.3.3:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2"
+
+napa@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/napa/-/napa-2.3.0.tgz#4196546d1a0b6bb94f37042053cc5ddd79731e53"
+  dependencies:
+    download "^4.4.1"
+    extend "^3.0.0"
+    load-json-file "^1.1.0"
+    minimist "^1.2.0"
+    mkdirp "^0.5.0"
+    npm-cache-filename "^1.0.1"
+    npmlog "^2.0.2"
+    rimraf "^2.5.1"
+    tar-pack "^3.1.2"
+    write-json-file "^1.2.0"
+
+native-promise-only@~0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/native-promise-only/-/native-promise-only-0.8.1.tgz#20a318c30cb45f71fe7adfbf7b21c99c1472ef11"
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+
+ncname@1.0.x:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ncname/-/ncname-1.0.0.tgz#5b57ad18b1ca092864ef62b0b1ed8194f383b71c"
+  dependencies:
+    xml-char-classes "^1.0.0"
+
+negotiator@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+
+no-case@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.1.tgz#7aeba1c73a52184265554b7dc03baf720df80081"
+  dependencies:
+    lower-case "^1.1.1"
+
+nock@9.0.7:
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/nock/-/nock-9.0.7.tgz#cc93481bb15f38bec2a39c4442be07825235b1a1"
+  dependencies:
+    chai ">=1.9.2 <4.0.0"
+    debug "^2.2.0"
+    deep-equal "^1.0.0"
+    json-stringify-safe "^5.0.1"
+    lodash "~4.17.2"
+    mkdirp "^0.5.0"
+    propagate "0.4.0"
+    qs "^6.0.2"
+
+node-abi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.0.0.tgz#443bfd151b599231028ae425e592e76cd31cb537"
+
+node-dir@^0.1.10:
+  version "0.1.16"
+  resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.16.tgz#d2ef583aa50b90d93db8cdd26fcea58353957fe4"
+  dependencies:
+    minimatch "^3.0.2"
+
+node-emoji@^1.0.4:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.5.1.tgz#fd918e412769bf8c448051238233840b2aff16a1"
+  dependencies:
+    string.prototype.codepointat "^0.2.0"
+
+node-fetch@^1.0.1:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
+  dependencies:
+    encoding "^0.1.11"
+    is-stream "^1.0.1"
+
+node-gyp@^3.2.1:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.0.tgz#7474f63a3a0501161dda0b6341f022f14c423fa6"
+  dependencies:
+    fstream "^1.0.0"
+    glob "^7.0.3"
+    graceful-fs "^4.1.2"
+    minimatch "^3.0.2"
+    mkdirp "^0.5.0"
+    nopt "2 || 3"
+    npmlog "0 || 1 || 2 || 3 || 4"
+    osenv "0"
+    request "2"
+    rimraf "2"
+    semver "~5.3.0"
+    tar "^2.0.0"
+    which "1"
+
+node-libs-browser@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646"
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.1.4"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^1.0.0"
+    https-browserify "0.0.1"
+    os-browserify "^0.2.0"
+    path-browserify "0.0.0"
+    process "^0.11.0"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.0.5"
+    stream-browserify "^2.0.1"
+    stream-http "^2.3.1"
+    string_decoder "^0.10.25"
+    timers-browserify "^2.0.2"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.10.3"
+    vm-browserify "0.0.4"
+
+node-pre-gyp@^0.6.29:
+  version "0.6.34"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7"
+  dependencies:
+    mkdirp "^0.5.1"
+    nopt "^4.0.1"
+    npmlog "^4.0.2"
+    rc "^1.1.7"
+    request "^2.81.0"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^2.2.1"
+    tar-pack "^3.4.0"
+
+node-status-codes@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"
+
+noop-logger@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
+
+"nopt@2 || 3", nopt@3.x:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  dependencies:
+    abbrev "1"
+
+nopt@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.6.tgz#498fa420c96401f787402ba21e600def9f981fff"
+  dependencies:
+    hosted-git-info "^2.1.4"
+    is-builtin-module "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
+
+normalize-path@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+
+normalize-selector@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
+
+normalize-url@^1.4.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  dependencies:
+    object-assign "^4.0.1"
+    prepend-http "^1.0.0"
+    query-string "^4.1.0"
+    sort-keys "^1.0.0"
+
+npm-cache-filename@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz#ded306c5b0bfc870a9e9faf823bc5f283e05ae11"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  dependencies:
+    path-key "^2.0.0"
+
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.1, npmlog@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f"
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.1"
+    set-blocking "~2.0.0"
+
+npmlog@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692"
+  dependencies:
+    ansi "~0.3.1"
+    are-we-there-yet "~1.1.2"
+    gauge "~1.2.5"
+
+nth-check@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
+  dependencies:
+    boolbase "~1.0.0"
+
+num2fraction@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+
+"nwmatcher@>= 1.3.9 < 2.0.0":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.3.9.tgz#8bab486ff7fa3dfd086656bbe8b17116d3692d2a"
+
+oauth-sign@~0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+
+object-assign@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
+
+object-assign@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
+
+object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+object-is@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
+
+object-keys@^1.0.10, object-keys@^1.0.8:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
+
+object-path@^0.11.2:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.4.tgz#370ae752fbf37de3ea70a861c23bba8915691949"
+
+object.assign@^4.0.1, object.assign@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
+  dependencies:
+    define-properties "^1.1.2"
+    function-bind "^1.1.0"
+    object-keys "^1.0.10"
+
+object.entries@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.6.1"
+    function-bind "^1.1.0"
+    has "^1.0.1"
+
+object.omit@^2.0.0, object.omit@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  dependencies:
+    for-own "^0.1.4"
+    is-extendable "^0.1.1"
+
+object.values@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.6.1"
+    function-bind "^1.1.0"
+    has "^1.0.1"
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  dependencies:
+    ee-first "1.1.1"
+
+once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+once@~1.3.0:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
+  dependencies:
+    wrappy "1"
+
+onecolor@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/onecolor/-/onecolor-3.0.4.tgz#75a46f80da6c7aaa5b4daae17a47198bd9652494"
+
+onetime@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  dependencies:
+    mimic-fn "^1.0.0"
+
+optimist@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  dependencies:
+    minimist "~0.0.1"
+    wordwrap "~0.0.2"
+
+optionator@^0.8.1, optionator@^0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.4"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    wordwrap "~1.0.0"
+
+optipng-bin@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-3.1.2.tgz#18c5a3388ed5d6f1e6ef1998ab0a6bcc8bdd0ca0"
+  dependencies:
+    bin-build "^2.0.0"
+    bin-wrapper "^3.0.0"
+    logalot "^2.0.0"
+
+ordered-read-streams@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b"
+  dependencies:
+    is-stream "^1.0.1"
+    readable-stream "^2.0.1"
+
+os-browserify@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
+
+os-filter-obj@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/os-filter-obj/-/os-filter-obj-1.0.3.tgz#5915330d90eced557d2d938a31c6dd214d9c63ad"
+
+os-homedir@^1.0.0, os-homedir@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+
+os-locale@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  dependencies:
+    lcid "^1.0.0"
+
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+
+osenv@0, osenv@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+output-file-sync@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76"
+  dependencies:
+    graceful-fs "^4.1.4"
+    mkdirp "^0.5.1"
+    object-assign "^4.1.0"
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+
+p-limit@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
+
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  dependencies:
+    p-limit "^1.1.0"
+
+pako@~0.2.0:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+
+param-case@2.1.x:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
+  dependencies:
+    no-case "^2.2.0"
+
+parse-asn1@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
+  dependencies:
+    asn1.js "^4.0.0"
+    browserify-aes "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+
+parse-glob@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  dependencies:
+    glob-base "^0.3.0"
+    is-dotfile "^1.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.0"
+
+parse-json@^2.1.0, parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  dependencies:
+    error-ex "^1.2.0"
+
+parse5@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
+
+parseurl@~1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.1.tgz#c8ab8c9223ba34888aa64a297b28853bec18da56"
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+
+path-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  dependencies:
+    pinkie-promise "^2.0.0"
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-is-inside@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+
+path-key@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+
+path-parse@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+
+path-to-regexp@^1.0.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
+  dependencies:
+    isarray "0.0.1"
+
+path-type@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+pbkdf2@^3.0.3:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.9.tgz#f2c4b25a600058b3c3773c086c37dbbee1ffe693"
+  dependencies:
+    create-hmac "^1.1.2"
+
+pend@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
+
+performance-now@^0.2.0, performance-now@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+
+phoneformat.js@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/phoneformat.js/-/phoneformat.js-1.0.3.tgz#11be3474e76474540fe3734cc33f1a65841d5f87"
+
+pify@^2.0.0, pify@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+
+pipetteur@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pipetteur/-/pipetteur-2.0.3.tgz#1955760959e8d1a11cb2a50ec83eec470633e49f"
+  dependencies:
+    onecolor "^3.0.4"
+    synesthesia "^1.0.1"
+
+pixrem@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/pixrem/-/pixrem-3.0.2.tgz#30d1bafb4c3bdce8e9bb4bd56a13985619320c34"
+  dependencies:
+    browserslist "^1.0.0"
+    postcss "^5.0.0"
+    reduce-css-calc "^1.2.7"
+
+pkg-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
+  dependencies:
+    find-up "^1.0.0"
+
+plur@^2.0.0, plur@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
+  dependencies:
+    irregular-plurals "^1.0.0"
+
+pluralize@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
+
+pngquant-bin@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/pngquant-bin/-/pngquant-bin-3.1.1.tgz#d124d98a75a9487f40c1640b4dbfcbb2bd5a1fd1"
+  dependencies:
+    bin-build "^2.0.0"
+    bin-wrapper "^3.0.0"
+    logalot "^2.0.0"
+
+postcss-alias@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-alias/-/postcss-alias-1.0.0.tgz#070c61ee1197af6ee5eb75d26adf48899b9d2f7b"
+  dependencies:
+    postcss "^5.0.0"
+
+postcss-calc@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
+  dependencies:
+    postcss "^5.0.2"
+    postcss-message-helpers "^2.0.0"
+    reduce-css-calc "^1.2.6"
+
+postcss-clearfix@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-clearfix/-/postcss-clearfix-1.0.0.tgz#afec6a0e01d25dac36a54adb89ffd4bfe1d219af"
+  dependencies:
+    postcss "^5.0"
+
+postcss-color-rgba-fallback@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-color-rgba-fallback/-/postcss-color-rgba-fallback-2.2.0.tgz#6d29491be5990a93173d47e7c76f5810b09402ba"
+  dependencies:
+    postcss "^5.0.0"
+    postcss-value-parser "^3.0.2"
+    rgb-hex "^1.0.0"
+
+postcss-colormin@^2.1.8:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
+  dependencies:
+    colormin "^1.0.5"
+    postcss "^5.0.13"
+    postcss-value-parser "^3.2.3"
+
+postcss-convert-values@^2.3.4:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
+  dependencies:
+    postcss "^5.0.11"
+    postcss-value-parser "^3.1.2"
+
+postcss-discard-comments@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
+  dependencies:
+    postcss "^5.0.14"
+
+postcss-discard-duplicates@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-discard-empty@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
+  dependencies:
+    postcss "^5.0.14"
+
+postcss-discard-overridden@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
+  dependencies:
+    postcss "^5.0.16"
+
+postcss-discard-unused@^2.2.1:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
+  dependencies:
+    postcss "^5.0.14"
+    uniqs "^2.0.0"
+
+postcss-easings@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-easings/-/postcss-easings-0.3.0.tgz#23dccbf97587e28d5da19c3bae4b50698c5aad5e"
+  dependencies:
+    postcss "^5.0.2"
+
+postcss-filter-plugins@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
+  dependencies:
+    postcss "^5.0.4"
+    uniqid "^4.0.0"
+
+postcss-fontpath@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-fontpath/-/postcss-fontpath-0.3.0.tgz#28142a79dd18f2c9f0bf5c87f7a3eb794c53929e"
+  dependencies:
+    object-assign "^4.0.1"
+    postcss "^5.0.0"
+
+postcss-hexrgba@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/postcss-hexrgba/-/postcss-hexrgba-0.2.1.tgz#5c61abba439c0a38e49e7fbc0b3cd936119ec225"
+  dependencies:
+    postcss "^5.0.0"
+
+postcss-import@9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-9.1.0.tgz#95fe9876a1e79af49fbdc3589f01fe5aa7cc1e80"
+  dependencies:
+    object-assign "^4.0.1"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+    promise-each "^2.2.0"
+    read-cache "^1.0.0"
+    resolve "^1.1.7"
+
+postcss-input-style@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-input-style/-/postcss-input-style-0.3.0.tgz#e3b4fdb0aa441bed1930cbb44d8ad5634cf38540"
+  dependencies:
+    postcss "^5.0.0"
+
+postcss-less@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-0.14.0.tgz#c631b089c6cce422b9a10f3a958d2bedd3819324"
+  dependencies:
+    postcss "^5.0.21"
+
+postcss-load-config@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
+  dependencies:
+    cosmiconfig "^2.1.0"
+    object-assign "^4.1.0"
+    postcss-load-options "^1.2.0"
+    postcss-load-plugins "^2.3.0"
+
+postcss-load-options@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-options/-/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
+  dependencies:
+    cosmiconfig "^2.1.0"
+    object-assign "^4.1.0"
+
+postcss-load-plugins@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
+  dependencies:
+    cosmiconfig "^2.1.1"
+    object-assign "^4.1.0"
+
+postcss-loader@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-1.3.2.tgz#c568b61c2e48e274e1c224a2587fb566f4ec26f5"
+  dependencies:
+    loader-utils "^1.0.2"
+    object-assign "^4.1.1"
+    postcss "^5.2.15"
+    postcss-load-config "^1.2.0"
+
+postcss-media-query-parser@^0.2.0:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
+
+postcss-merge-idents@^2.1.5:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.10"
+    postcss-value-parser "^3.1.1"
+
+postcss-merge-longhand@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-merge-rules@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
+  dependencies:
+    browserslist "^1.5.2"
+    caniuse-api "^1.5.2"
+    postcss "^5.0.4"
+    postcss-selector-parser "^2.2.2"
+    vendors "^1.0.0"
+
+postcss-message-helpers@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
+
+postcss-minify-font-values@^1.0.2:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
+  dependencies:
+    object-assign "^4.0.1"
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.2"
+
+postcss-minify-gradients@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
+  dependencies:
+    postcss "^5.0.12"
+    postcss-value-parser "^3.3.0"
+
+postcss-minify-params@^1.0.4:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
+  dependencies:
+    alphanum-sort "^1.0.1"
+    postcss "^5.0.2"
+    postcss-value-parser "^3.0.2"
+    uniqs "^2.0.0"
+
+postcss-minify-selectors@^2.0.4:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
+  dependencies:
+    alphanum-sort "^1.0.2"
+    has "^1.0.1"
+    postcss "^5.0.14"
+    postcss-selector-parser "^2.0.0"
+
+postcss-modules-extract-imports@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.1.tgz#8fb3fef9a6dd0420d3f6d4353cf1ff73f2b2a341"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-modules-local-by-default@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.1.1.tgz#29a10673fa37d19251265ca2ba3150d9040eb4ce"
+  dependencies:
+    css-selector-tokenizer "^0.6.0"
+    postcss "^5.0.4"
+
+postcss-modules-scope@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.0.2.tgz#ff977395e5e06202d7362290b88b1e8cd049de29"
+  dependencies:
+    css-selector-tokenizer "^0.6.0"
+    postcss "^5.0.4"
+
+postcss-modules-values@^1.1.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1"
+  dependencies:
+    icss-replace-symbols "^1.0.2"
+    postcss "^5.0.14"
+
+postcss-nested@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-1.0.0.tgz#d136bd4b576bd5632df142c12b2198a9ccf794df"
+  dependencies:
+    postcss "^5.0.2"
+
+postcss-normalize-charset@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
+  dependencies:
+    postcss "^5.0.5"
+
+postcss-normalize-url@^3.0.7:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
+  dependencies:
+    is-absolute-url "^2.0.0"
+    normalize-url "^1.4.0"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+
+postcss-opacity@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-opacity/-/postcss-opacity-3.0.0.tgz#7879bcc734405bf74aa6c81c391762052fc55b29"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-opacity@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-opacity/-/postcss-opacity-4.0.0.tgz#aa562043da3394c94a3acedcf43f0c323d0986a1"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-ordered-values@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
+  dependencies:
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.1"
+
+postcss-position@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/postcss-position/-/postcss-position-0.5.0.tgz#8653d4f0b84ffb07e544fb7f7eae08c6551b73a0"
+  dependencies:
+    postcss "^5.0.0"
+
+postcss-pseudoelements@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-pseudoelements/-/postcss-pseudoelements-3.0.0.tgz#6c682177c7900ba053b6df17f8c590284c7b8bbc"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-quantity-queries@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/postcss-quantity-queries/-/postcss-quantity-queries-0.4.0.tgz#be1370a7be9312a173639c0869aa4210244f86ce"
+  dependencies:
+    balanced-match "^0.2.0"
+    postcss "^5.0.4"
+
+postcss-reduce-idents@^2.2.2:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
+  dependencies:
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.2"
+
+postcss-reduce-initial@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-reduce-transforms@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.8"
+    postcss-value-parser "^3.0.1"
+
+postcss-reporter@^1.2.1, postcss-reporter@^1.3.3:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-1.4.1.tgz#c136f0a5b161915f379dd3765c61075f7e7b9af2"
+  dependencies:
+    chalk "^1.0.0"
+    lodash "^4.1.0"
+    log-symbols "^1.0.2"
+    postcss "^5.0.0"
+
+postcss-reporter@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-2.0.0.tgz#d25e74ba7fce911e2aa72ec1ae592fade6ec3671"
+  dependencies:
+    chalk "^1.0.0"
+    lodash "^4.1.0"
+    log-symbols "^1.0.2"
+    postcss "^5.0.0"
+
+postcss-reporter@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-3.0.0.tgz#09ea0f37a444c5693878606e09b018ebeff7cf8f"
+  dependencies:
+    chalk "^1.0.0"
+    lodash "^4.1.0"
+    log-symbols "^1.0.2"
+    postcss "^5.0.0"
+
+postcss-resolve-nested-selector@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
+
+postcss-responsive-type@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/postcss-responsive-type/-/postcss-responsive-type-0.5.1.tgz#274133bc046359e542a58bbc621847d040fd10e6"
+  dependencies:
+    postcss "^5.0.0"
+
+postcss-scss@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-0.4.1.tgz#ad771b81f0f72f5f4845d08aa60f93557653d54c"
+  dependencies:
+    postcss "^5.2.13"
+
+postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.1.1, postcss-selector-parser@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
+  dependencies:
+    flatten "^1.0.2"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
+postcss-simple-vars@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-3.0.0.tgz#1fa4ccb4b7151d9f0d52fb8ea19a15c1319599d6"
+  dependencies:
+    postcss "^5.0.21"
+
+postcss-svgo@^2.1.1:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
+  dependencies:
+    is-svg "^2.0.0"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+    svgo "^0.7.0"
+
+postcss-unique-selectors@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
+  dependencies:
+    alphanum-sort "^1.0.1"
+    postcss "^5.0.4"
+    uniqs "^2.0.0"
+
+postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+
+postcss-vmin@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-vmin/-/postcss-vmin-2.0.0.tgz#5327c21191371256868fd7a739917f1474d57fee"
+  dependencies:
+    postcss "^5.0.0"
+
+postcss-will-change@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-will-change/-/postcss-will-change-1.1.0.tgz#a651dd5a81e82c412d39a6cf90a92bb3269af18c"
+  dependencies:
+    postcss "^5.0.16"
+
+postcss-zindex@^2.0.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.4"
+    uniqs "^2.0.0"
+
+postcss@^5.0, postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.18, postcss@^5.0.2, postcss@^5.0.20, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.13, postcss@^5.2.15, postcss@^5.2.16, postcss@^5.2.4:
+  version "5.2.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.16.tgz#732b3100000f9ff8379a48a53839ed097376ad57"
+  dependencies:
+    chalk "^1.1.3"
+    js-base64 "^2.1.9"
+    source-map "^0.5.6"
+    supports-color "^3.2.3"
+
+prebuild-install@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.1.1.tgz#d0a77ea51b6a00f928cb71bc0ccea24f87ec171e"
+  dependencies:
+    expand-template "^1.0.2"
+    github-from-package "0.0.0"
+    minimist "^1.2.0"
+    node-abi "^2.0.0"
+    noop-logger "^0.1.1"
+    npmlog "^4.0.1"
+    os-homedir "^1.0.1"
+    pump "^1.0.1"
+    rc "^1.1.6"
+    simple-get "^1.4.2"
+    tar-fs "^1.13.0"
+    tunnel-agent "^0.4.3"
+    xtend "4.0.1"
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+
+prepend-http@^1.0.0, prepend-http@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+
+preserve@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+
+pretty-error@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.0.3.tgz#bed3d816a008e76da617cde8216f4b778849b5d9"
+  dependencies:
+    renderkid "^2.0.1"
+    utila "~0.4"
+
+private@^0.1.6, private@~0.1.5:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
+
+process-nextick-args@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+
+process@^0.11.0:
+  version "0.11.9"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1"
+
+process@~0.5.1:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
+
+progress-bar-webpack-plugin@1.9.3:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.9.3.tgz#81fb8bd8e38da6edaf9a20beed79bd978dd63c2a"
+  dependencies:
+    chalk "^1.1.1"
+    object.assign "^4.0.1"
+    progress "^1.1.8"
+
+progress@1.1.8, progress@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
+
+promise-each@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/promise-each/-/promise-each-2.2.0.tgz#3353174eff2694481037e04e01f77aa0fb6d1b60"
+  dependencies:
+    any-promise "^0.1.0"
+
+promise-worker@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/promise-worker/-/promise-worker-1.1.1.tgz#c2b75d045d249625c02264e2dff9ad22e031c69b"
+  dependencies:
+    is-promise "^2.1.0"
+    lie "^3.0.2"
+
+promise.pipe@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/promise.pipe/-/promise.pipe-3.0.0.tgz#b8f729867f54353996e6d8e86f3bbd56882e32a6"
+
+promise@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.1.1.tgz#489654c692616b8aa55b0724fa809bb7db49c5bf"
+  dependencies:
+    asap "~2.0.3"
+
+propagate@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/propagate/-/propagate-0.4.0.tgz#f3fcca0a6fe06736a7ba572966069617c130b481"
+
+proper-lockfile@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-2.0.0.tgz#b21f5e79bcbb6b4e23eeeced15cfc7f63e8a2e55"
+  dependencies:
+    graceful-fs "^4.1.2"
+    retry "^0.10.0"
+
+proxy-addr@~1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3"
+  dependencies:
+    forwarded "~0.1.0"
+    ipaddr.js "1.3.0"
+
+prr@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
+
+pseudomap@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+
+public-encrypt@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+
+pump@^1.0.0, pump@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.2.tgz#3b3ee6512f94f0e575538c17995f9f16990a5d51"
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+
+punycode@^1.2.4, punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
+push.js@0.0.11:
+  version "0.0.11"
+  resolved "https://registry.yarnpkg.com/push.js/-/push.js-0.0.11.tgz#4fad3a9f90844212e2aa67d073a23d470e32a891"
+
+q@^1.1.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
+
+qs@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"
+
+qs@6.3.0, qs@^6.0.2, qs@~6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
+
+qs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+
+query-string@^4.1.0, query-string@^4.2.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.2.tgz#ec0fd765f58a50031a3968c2431386f8947a5cdd"
+  dependencies:
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+
+querystring@0.2.0, querystring@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+
+raf@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/raf/-/raf-3.3.0.tgz#93845eeffc773f8129039f677f80a36044eee2c3"
+  dependencies:
+    performance-now "~0.2.0"
+
+randomatic@^1.1.3:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
+  dependencies:
+    is-number "^2.0.2"
+    kind-of "^3.0.2"
+
+randombytes@^2.0.0, randombytes@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.3.tgz#674c99760901c3c4112771a31e521dc349cc09ec"
+
+range-parser@^1.0.3, range-parser@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+
+raw-loader@0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
+
+rc@^1.1.2, rc@^1.1.6, rc@^1.1.7:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
+  dependencies:
+    deep-extend "~0.4.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+react-ace@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-4.1.0.tgz#659faa010d173f60d6a8940f0b325c5e422cab54"
+  dependencies:
+    brace "^0.8.0"
+    lodash.isequal "^4.1.1"
+
+react-addons-create-fragment@^15.0.0:
+  version "15.5.1"
+  resolved "https://registry.yarnpkg.com/react-addons-create-fragment/-/react-addons-create-fragment-15.5.1.tgz#62c2427ee1e32fcd511f612cf3fe326ef9671b1c"
+  dependencies:
+    fbjs "^0.8.4"
+    object-assign "^4.1.0"
+
+react-addons-css-transition-group@15.4.2:
+  version "15.4.2"
+  resolved "https://registry.yarnpkg.com/react-addons-css-transition-group/-/react-addons-css-transition-group-15.4.2.tgz#b7828834dfa14229fe07750e331e8a8cb6fb7745"
+  dependencies:
+    fbjs "^0.8.4"
+    object-assign "^4.1.0"
+
+react-addons-perf@15.4.2:
+  version "15.4.2"
+  resolved "https://registry.yarnpkg.com/react-addons-perf/-/react-addons-perf-15.4.2.tgz#110bdcf5c459c4f77cb85ed634bcd3397536383b"
+  dependencies:
+    fbjs "^0.8.4"
+    object-assign "^4.1.0"
+
+react-addons-shallow-compare@^15.4.2:
+  version "15.5.0"
+  resolved "https://registry.yarnpkg.com/react-addons-shallow-compare/-/react-addons-shallow-compare-15.5.0.tgz#4d95c68a5537ccb75f395169b64db1745617fab5"
+  dependencies:
+    fbjs "^0.8.4"
+    object-assign "^4.1.0"
+
+react-addons-test-utils@15.4.2:
+  version "15.4.2"
+  resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.4.2.tgz#93bcaa718fcae7360d42e8fb1c09756cc36302a2"
+  dependencies:
+    fbjs "^0.8.4"
+    object-assign "^4.1.0"
+
+"react-addons-transition-group@^0.14.0 || ^15.0.0", react-addons-transition-group@^15.0.0:
+  version "15.5.0"
+  resolved "https://registry.yarnpkg.com/react-addons-transition-group/-/react-addons-transition-group-15.5.0.tgz#4a7dd48d2061f49a8977396f9e7c3f40f1b07a40"
+  dependencies:
+    fbjs "^0.8.4"
+    object-assign "^4.1.0"
+
+react-container-dimensions@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/react-container-dimensions/-/react-container-dimensions-1.2.0.tgz#bfb5e70e10aa82d2ecba49147d14bb4c22cafdaa"
+  dependencies:
+    element-resize-detector "^1.1.0"
+    invariant "^2.2.1"
+
+react-copy-to-clipboard@4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-4.2.3.tgz#268c5a0fbde9a95d96145014e7f85110b0e7fb8e"
+  dependencies:
+    copy-to-clipboard "^3"
+
+react-deep-force-update@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-2.0.1.tgz#4f7f6c12c3e7de42f345992a3c518236fa1ecad3"
+
+react-dom@15.4.2:
+  version "15.4.2"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.4.2.tgz#015363f05b0a1fd52ae9efdd3a0060d90695208f"
+  dependencies:
+    fbjs "^0.8.1"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.0"
+
+react-dropzone@3.7.3:
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-3.7.3.tgz#7852b6652a43afc7fa072021f3369123ea4a61e0"
+  dependencies:
+    attr-accept "^1.0.3"
+
+react-element-to-jsx-string@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/react-element-to-jsx-string/-/react-element-to-jsx-string-6.0.0.tgz#f2c151476ee8dd817891ed352be4ace9fb3631c2"
+  dependencies:
+    collapse-white-space "^1.0.0"
+    is-plain-object "^2.0.1"
+    lodash "^4.17.4"
+    sortobject "^1.0.0"
+    stringify-object "^3.1.0"
+    traverse "^0.6.6"
+
+react-element-to-jsx-string@^5.0.0:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/react-element-to-jsx-string/-/react-element-to-jsx-string-5.0.7.tgz#c663a4800a9c712115c0d8519cb0215a46a1f0f2"
+  dependencies:
+    collapse-white-space "^1.0.0"
+    is-plain-object "^2.0.1"
+    lodash "^4.17.4"
+    sortobject "^1.0.0"
+    stringify-object "2.4.0"
+    traverse "^0.6.6"
+
+react-event-listener@0.4.1, react-event-listener@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.4.1.tgz#86b53974c3df651857766b7b177682ed7c7c8318"
+  dependencies:
+    babel-runtime "^6.20.0"
+    react-addons-shallow-compare "^15.4.2"
+    warning "^3.0.0"
+
+react-hot-loader@3.0.0-beta.6:
+  version "3.0.0-beta.6"
+  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-3.0.0-beta.6.tgz#463fac0bfc8b63a8385258af20c91636abce75f4"
+  dependencies:
+    babel-template "^6.7.0"
+    global "^4.3.0"
+    react-deep-force-update "^2.0.1"
+    react-proxy "^3.0.0-alpha.0"
+    redbox-react "^1.2.5"
+    source-map "^0.4.4"
+
+react-intl-aggregate-webpack-plugin@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/react-intl-aggregate-webpack-plugin/-/react-intl-aggregate-webpack-plugin-0.0.1.tgz#c29958860d7bcdfa6f460dec79f55ae0220488c6"
+  dependencies:
+    mkdirp "^0.5.1"
+
+react-intl@2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-2.1.5.tgz#f9795ea34b790dcb5d0d8ef7060dddbe85bf8763"
+  dependencies:
+    intl-format-cache "^2.0.5"
+    intl-messageformat "^1.3.0"
+    intl-relativeformat "^1.3.0"
+    invariant "^2.1.1"
+
+react-markdown@2.4.4:
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-2.4.4.tgz#26d825438d292e7ca6e292fe76201e1dbf2cfeee"
+  dependencies:
+    commonmark "^0.24.0"
+    commonmark-react-renderer "^4.2.4"
+    in-publish "^2.0.0"
+
+react-portal@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-3.0.0.tgz#9304fce836e8a3216b22588f8dc91b447728f0ae"
+
+react-proxy@^3.0.0-alpha.0:
+  version "3.0.0-alpha.1"
+  resolved "https://registry.yarnpkg.com/react-proxy/-/react-proxy-3.0.0-alpha.1.tgz#4400426bcfa80caa6724c7755695315209fa4b07"
+  dependencies:
+    lodash "^4.6.1"
+
+react-qr-reader@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/react-qr-reader/-/react-qr-reader-1.0.3.tgz#9cd9e526cb2ae3ef2eabd7b3798172b8990d11ce"
+  dependencies:
+    jsqr "^0.2.1"
+    webrtc-adapter "^2.0.8"
+
+react-redux@4.4.6:
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-4.4.6.tgz#4b9d32985307a11096a2dd61561980044fcc6209"
+  dependencies:
+    hoist-non-react-statics "^1.0.3"
+    invariant "^2.0.0"
+    lodash "^4.2.0"
+    loose-envify "^1.1.0"
+
+react-router-redux@4.0.7:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-4.0.7.tgz#9b1fde4e70106c50f47214e12bdd888cfb96e2a6"
+
+react-router@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-3.0.0.tgz#3f313e4dbaf57048c48dd0a8c3cac24d93667dff"
+  dependencies:
+    history "^3.0.0"
+    hoist-non-react-statics "^1.2.0"
+    invariant "^2.2.1"
+    loose-envify "^1.2.0"
+    warning "^3.0.0"
+
+react-smooth@0.1.11:
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/react-smooth/-/react-smooth-0.1.11.tgz#f389f8e58cbb546abb4921ca0cbe7b079bc51a0d"
+  dependencies:
+    lodash "~4.13.1"
+    raf "^3.2.0"
+    react-addons-transition-group "^0.14.0 || ^15.0.0"
+
+react-tap-event-plugin@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/react-tap-event-plugin/-/react-tap-event-plugin-2.0.1.tgz#316beb3bc6556e29ec869a7293e89c826a9074d2"
+  dependencies:
+    fbjs "^0.8.6"
+
+react-tooltip@3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-3.2.2.tgz#3a599c0eabbd9eb9597aa2d72b217fd7ba358767"
+  dependencies:
+    classnames "^2.2.0"
+
+react@15.4.2:
+  version "15.4.2"
+  resolved "https://registry.yarnpkg.com/react/-/react-15.4.2.tgz#41f7991b26185392ba9bae96c8889e7e018397ef"
+  dependencies:
+    fbjs "^0.8.4"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.0"
+
+read-all-stream@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa"
+  dependencies:
+    pinkie-promise "^2.0.0"
+    readable-stream "^2.0.0"
+
+read-cache@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
+  dependencies:
+    pify "^2.3.0"
+
+read-file-stdin@^0.2.0, read-file-stdin@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/read-file-stdin/-/read-file-stdin-0.2.1.tgz#25eccff3a153b6809afacb23ee15387db9e0ee61"
+  dependencies:
+    gather-stream "^1.0.0"
+
+read-pkg-up@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  dependencies:
+    find-up "^1.0.0"
+    read-pkg "^1.0.0"
+
+read-pkg@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  dependencies:
+    load-json-file "^1.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^1.0.0"
+
+read@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
+  dependencies:
+    mute-stream "~0.0.4"
+
+readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0":
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readable-stream@^1.0.33, readable-stream@~1.1.9:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816"
+  dependencies:
+    buffer-shims "^1.0.0"
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    string_decoder "~0.10.x"
+    util-deprecate "~1.0.1"
+
+readdirp@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
+  dependencies:
+    graceful-fs "^4.1.2"
+    minimatch "^3.0.2"
+    readable-stream "^2.0.2"
+    set-immediate-shim "^1.0.1"
+
+readline2@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    mute-stream "0.0.5"
+
+recast@~0.11.12:
+  version "0.11.23"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
+  dependencies:
+    ast-types "0.9.6"
+    esprima "~3.1.0"
+    private "~0.1.5"
+    source-map "~0.5.0"
+
+recharts-scale@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/recharts-scale/-/recharts-scale-0.2.1.tgz#378f543ed17c3245e4d9afb10aaf6298240d2fcb"
+
+recharts@0.15.2:
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/recharts/-/recharts-0.15.2.tgz#636f21a341f00b31c925739ed4aef70adb55d80f"
+  dependencies:
+    classnames "2.2.5"
+    core-js "2.4.0"
+    d3-scale "1.0.0"
+    d3-shape "1.0.0"
+    lodash "4.13.1"
+    react-container-dimensions "1.2.0"
+    react-smooth "0.1.11"
+    recharts-scale "0.2.1"
+    reduce-css-calc "^1.3.0"
+
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  dependencies:
+    resolve "^1.1.6"
+
+recompose@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.20.2.tgz#113d6ac7e29ca664cfffec16b681ddddf15250bc"
+  dependencies:
+    change-emitter "^0.1.2"
+    fbjs "^0.8.1"
+    hoist-non-react-statics "^1.0.0"
+    symbol-observable "^0.2.4"
+
+redbox-react@^1.2.5:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/redbox-react/-/redbox-react-1.3.4.tgz#3d882bb62cc7c8f6256279d12f05c6a5a96d24c6"
+  dependencies:
+    error-stack-parser "^1.3.6"
+    object-assign "^4.0.1"
+
+redent@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  dependencies:
+    indent-string "^2.1.0"
+    strip-indent "^1.0.1"
+
+reduce-css-calc@^1.2.6, reduce-css-calc@^1.2.7, reduce-css-calc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
+  dependencies:
+    balanced-match "^0.4.2"
+    math-expression-evaluator "^1.2.14"
+    reduce-function-call "^1.0.1"
+
+reduce-function-call@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
+  dependencies:
+    balanced-match "^0.4.2"
+
+reduce-reducers@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.1.2.tgz#fa1b4718bc5292a71ddd1e5d839c9bea9770f14b"
+
+redux-actions@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/redux-actions/-/redux-actions-1.1.0.tgz#df8ec791d9e267544e58a8ba2b72fc5c30afba3b"
+  dependencies:
+    invariant "^2.2.1"
+    lodash "^4.13.1"
+    reduce-reducers "^0.1.0"
+
+redux-thunk@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.1.0.tgz#c724bfee75dbe352da2e3ba9bc14302badd89a98"
+
+redux@3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-3.6.0.tgz#887c2b3d0b9bd86eca2be70571c27654c19e188d"
+  dependencies:
+    lodash "^4.2.1"
+    lodash-es "^4.2.1"
+    loose-envify "^1.1.0"
+    symbol-observable "^1.0.2"
+
+regenerate@^1.2.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
+
+regenerator-runtime@^0.10.0:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e"
+
+regenerator-transform@0.9.8:
+  version "0.9.8"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.8.tgz#0f88bb2bc03932ddb7b6b7312e68078f01026d6c"
+  dependencies:
+    babel-runtime "^6.18.0"
+    babel-types "^6.19.0"
+    private "^0.1.6"
+
+regex-cache@^0.4.2:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
+  dependencies:
+    is-equal-shallow "^0.1.3"
+    is-primitive "^2.0.0"
+
+regexpu-core@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+regexpu-core@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+regjsgen@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+
+regjsparser@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  dependencies:
+    jsesc "~0.5.0"
+
+relateurl@0.2.x:
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
+
+remove-trailing-separator@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
+
+renderkid@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.1.tgz#898cabfc8bede4b7b91135a3ffd323e58c0db319"
+  dependencies:
+    css-select "^1.1.0"
+    dom-converter "~0.1"
+    htmlparser2 "~3.3.0"
+    strip-ansi "^3.0.0"
+    utila "~0.3"
+
+repeat-element@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+
+repeat-string@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+
+repeating@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  dependencies:
+    is-finite "^1.0.0"
+
+replace-ext@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
+
+request-capture-har@^1.1.4:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/request-capture-har/-/request-capture-har-1.2.2.tgz#cd692cfb2cc744fd84a3358aac6ee51528cf720d"
+
+request@2, request@^2.75.0, request@^2.81.0:
+  version "2.81.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~4.2.1"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    performance-now "^0.2.0"
+    qs "~6.4.0"
+    safe-buffer "^5.0.1"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.0.0"
+
+request@2.79.0, request@^2.79.0:
+  version "2.79.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.11.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~2.0.6"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    qs "~6.3.0"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "~0.4.1"
+    uuid "^3.0.0"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+
+require-from-string@^1.1.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
+
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+
+require-uncached@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+  dependencies:
+    caller-path "^0.1.0"
+    resolve-from "^1.0.0"
+
+requires-port@1.x.x:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+
+resolve-from@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+
+resolve-from@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
+
+resolve@^1.1.6, resolve@^1.1.7:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235"
+  dependencies:
+    path-parse "^1.0.5"
+
+restore-cursor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
+  dependencies:
+    exit-hook "^1.0.0"
+    onetime "^1.0.0"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+retry@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+
+rgb-hex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/rgb-hex/-/rgb-hex-1.0.0.tgz#bfaf8cd9cd9164b5a26d71eb4f15a0965324b3c1"
+
+right-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  dependencies:
+    align-text "^0.1.1"
+
+rimraf@2, rimraf@^2.2.6, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@^2.5.0, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
+  dependencies:
+    glob "^7.0.5"
+
+ripemd160@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-1.0.1.tgz#93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"
+
+rlp@2.0.0, rlp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/rlp/-/rlp-2.0.0.tgz#9db384ff4b89a8f61563d92395d8625b18f3afb0"
+
+roadrunner@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/roadrunner/-/roadrunner-1.1.0.tgz#1180a30d64e1970d8f55dd8cb0da8ffccecad71e"
+
+rucksack-css@0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/rucksack-css/-/rucksack-css-0.9.1.tgz#da7eba4c67bd05b00cbf4c834305c5fe55375de1"
+  dependencies:
+    autoprefixer "^6.0.0"
+    laggard "^0.1.0"
+    minimist "^1.1.2"
+    postcss "^5.0.0"
+    postcss-alias "^1.0.0"
+    postcss-clearfix "^1.0.0"
+    postcss-color-rgba-fallback "^2.0.0"
+    postcss-easings "^0.3.0"
+    postcss-fontpath "^0.3.0"
+    postcss-hexrgba "^0.2.0"
+    postcss-input-style "^0.3.0"
+    postcss-opacity "^4.0.0"
+    postcss-position "^0.5.0"
+    postcss-pseudoelements "^3.0.0"
+    postcss-quantity-queries "^0.4.0"
+    postcss-reporter "^2.0.0"
+    postcss-responsive-type "^0.5.0"
+    postcss-vmin "^2.0.0"
+    read-file-stdin "^0.2.0"
+    write-file-stdout "^0.0.2"
+
+run-async@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
+  dependencies:
+    once "^1.3.0"
+
+run-async@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  dependencies:
+    is-promise "^2.1.0"
+
+rx-lite@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
+
+rx@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
+
+safe-buffer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
+
+samsam@1.1.2, samsam@~1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.2.tgz#bec11fdc83a9fda063401210e40176c3024d1567"
+
+sax@^1.2.1, sax@~1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
+
+script-ext-html-webpack-plugin@1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.7.1.tgz#ae9c0e26d7767d4aa793c76e3550344ec08b6d10"
+  dependencies:
+    debug "^2.3.3"
+
+scryptsy@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-2.0.0.tgz#262c36f0231cfa7654e2363fa394cd2dec66f378"
+
+sdp@^1.0.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/sdp/-/sdp-1.4.1.tgz#68e1a8d88e3a10ae098aaf32b147b70851b42165"
+
+secp256k1@3.2.5, secp256k1@^3.0.1:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-3.2.5.tgz#0dde5b27e5021665f6dffca7b2c3e010c6c13c93"
+  dependencies:
+    bindings "^1.2.1"
+    bip66 "^1.1.3"
+    bn.js "^4.11.3"
+    create-hash "^1.1.2"
+    drbg.js "^1.0.1"
+    elliptic "^6.2.3"
+    nan "^2.2.1"
+    prebuild-install "^2.0.0"
+
+seek-bzip@^1.0.3:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc"
+  dependencies:
+    commander "~2.8.1"
+
+semver-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-1.0.0.tgz#92a4969065f9c70c694753d55248fc68f8f652c9"
+
+semver-truncate@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/semver-truncate/-/semver-truncate-1.1.2.tgz#57f41de69707a62709a7e0104ba2117109ea47e8"
+  dependencies:
+    semver "^5.3.0"
+
+"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@~5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+
+semver@^4.0.3:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+
+send@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.14.2.tgz#39b0438b3f510be5dc6f667a11f71689368cdeef"
+  dependencies:
+    debug "~2.2.0"
+    depd "~1.1.0"
+    destroy "~1.0.4"
+    encodeurl "~1.0.1"
+    escape-html "~1.0.3"
+    etag "~1.7.0"
+    fresh "0.3.0"
+    http-errors "~1.5.1"
+    mime "1.3.4"
+    ms "0.7.2"
+    on-finished "~2.3.0"
+    range-parser "~1.2.0"
+    statuses "~1.3.1"
+
+serve-static@~1.11.2:
+  version "1.11.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.11.2.tgz#2cf9889bd4435a320cc36895c9aa57bd662e6ac7"
+  dependencies:
+    encodeurl "~1.0.1"
+    escape-html "~1.0.3"
+    parseurl "~1.3.1"
+    send "0.14.2"
+
+serviceworker-cache-polyfill@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serviceworker-cache-polyfill/-/serviceworker-cache-polyfill-4.0.0.tgz#de19ee73bef21ab3c0740a37b33db62464babdeb"
+
+serviceworker-webpack-plugin@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/serviceworker-webpack-plugin/-/serviceworker-webpack-plugin-0.2.0.tgz#6de9dec82ed144c754c6f15b343e7b8764ac5b28"
+  dependencies:
+    minimatch "^3.0.3"
+
+set-blocking@^2.0.0, set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+
+set-immediate-shim@^1.0.0, set-immediate-shim@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+
+setimmediate@^1.0.4, setimmediate@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+
+setprototypeof@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08"
+
+sha.js@^2.3.6:
+  version "2.4.8"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f"
+  dependencies:
+    inherits "^2.0.1"
+
+shelljs@^0.7.5:
+  version "0.7.7"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+
+simple-assign@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/simple-assign/-/simple-assign-0.1.0.tgz#17fd3066a5f3d7738f50321bb0f14ca281cc4baa"
+
+simple-get@^1.4.2:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-1.4.3.tgz#e9755eda407e96da40c5e5158c9ea37b33becbeb"
+  dependencies:
+    once "^1.3.1"
+    unzip-response "^1.0.0"
+    xtend "^4.0.0"
+
+sinon-as-promised@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/sinon-as-promised/-/sinon-as-promised-4.0.2.tgz#120e9ce033daa39648dc429062fe660be1b5b412"
+  dependencies:
+    create-thenable "~1.0.0"
+    native-promise-only "~0.8.1"
+
+sinon-chai@2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/sinon-chai/-/sinon-chai-2.8.0.tgz#432a9bbfd51a6fc00798f4d2526a829c060687ac"
+
+sinon@1.17.7:
+  version "1.17.7"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-1.17.7.tgz#4542a4f49ba0c45c05eb2e9dd9d203e2b8efe0bf"
+  dependencies:
+    formatio "1.1.1"
+    lolex "1.3.2"
+    samsam "1.1.2"
+    util ">=0.10.3 <1"
+
+sjcl@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/sjcl/-/sjcl-1.0.6.tgz#6415462a63cc0d4215c49baec9d3fa0c1b53520f"
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+
+slice-ansi@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+
+slide@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+
+sntp@1.x.x:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  dependencies:
+    hoek "2.x.x"
+
+solc@ngotchac/solc-js:
+  version "0.4.4"
+  resolved "https://codeload.github.com/ngotchac/solc-js/tar.gz/04eb38cc3003fba8cb3656653a7941ed36408818"
+  dependencies:
+    memorystream "^0.3.1"
+    require-from-string "^1.1.0"
+    yargs "^4.7.1"
+
+sort-keys@^1.0.0, sort-keys@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+sortobject@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/sortobject/-/sortobject-1.1.1.tgz#4f695d4d44ed0a4c06482c34c2582a2dcdc2ab34"
+  dependencies:
+    editions "^1.1.1"
+
+source-list-map@^0.1.4, source-list-map@~0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+
+source-map-support@^0.4.2:
+  version "0.4.14"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.14.tgz#9d4463772598b86271b4f523f6c1f4e02a7d6aef"
+  dependencies:
+    source-map "^0.5.6"
+
+source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+
+source-map@^0.4.2, source-map@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
+  dependencies:
+    amdefine ">=0.0.4"
+
+sparkles@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
+
+spdx-correct@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+  dependencies:
+    spdx-license-ids "^1.0.2"
+
+spdx-expression-parse@~1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+
+spdx-license-ids@^1.0.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+
+specificity@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.3.0.tgz#332472d4e5eb5af20821171933998a6bc3b1ce6f"
+
+split2@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-0.2.1.tgz#02ddac9adc03ec0bb78c1282ec079ca6e85ae900"
+  dependencies:
+    through2 "~0.6.1"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+squeak@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/squeak/-/squeak-1.3.0.tgz#33045037b64388b567674b84322a6521073916c3"
+  dependencies:
+    chalk "^1.0.0"
+    console-stream "^0.1.1"
+    lpad-align "^1.0.1"
+
+sshpk@^1.7.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.11.0.tgz#2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    dashdash "^1.12.0"
+    getpass "^0.1.1"
+  optionalDependencies:
+    bcrypt-pbkdf "^1.0.0"
+    ecc-jsbn "~0.1.1"
+    jodid25519 "^1.0.0"
+    jsbn "~0.1.0"
+    tweetnacl "~0.14.0"
+
+stackframe@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-0.3.1.tgz#33aa84f1177a5548c8935533cbfeb3420975f5a4"
+
+stat-mode@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
+
+"statuses@>= 1.3.1 < 2", statuses@~1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+
+store@1.3.20:
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/store/-/store-1.3.20.tgz#13ea7e3fb2d6c239868265d686b1d84e99c5be3e"
+
+stream-browserify@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
+stream-combiner2@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe"
+  dependencies:
+    duplexer2 "~0.1.0"
+    readable-stream "^2.0.2"
+
+stream-combiner@^0.2.1:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
+  dependencies:
+    duplexer "~0.1.1"
+    through "~2.3.4"
+
+stream-http@^2.3.1:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.0.tgz#cec1f4e3b494bc4a81b451808970f8b20b4ed5f6"
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.2.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
+stream-shift@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+
+string-width@^1.0.1, string-width@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+string-width@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^3.0.0"
+
+string.prototype.codepointat@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz#6b26e9bd3afcaa7be3b4269b526de1b82000ac78"
+
+string.prototype.repeat@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf"
+
+string_decoder@^0.10.25, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
+stringify-object@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-2.4.0.tgz#c62d11023eb21fe2d9b087be039a26df3b22a09d"
+  dependencies:
+    is-plain-obj "^1.0.0"
+    is-regexp "^1.0.0"
+
+stringify-object@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.0.tgz#94370a135e41bc048358813bf99481f1315c6aa6"
+  dependencies:
+    get-own-enumerable-property-symbols "^1.0.1"
+    is-obj "^1.0.1"
+    is-regexp "^1.0.0"
+
+stringstream@~0.0.4:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-bom-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee"
+  dependencies:
+    first-chunk-stream "^1.0.0"
+    strip-bom "^2.0.0"
+
+strip-bom@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  dependencies:
+    is-utf8 "^0.2.0"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+
+strip-dirs@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-1.1.1.tgz#960bbd1287844f3975a4558aa103a8255e2456a0"
+  dependencies:
+    chalk "^1.0.0"
+    get-stdin "^4.0.1"
+    is-absolute "^0.1.5"
+    is-natural-number "^2.0.0"
+    minimist "^1.1.0"
+    sum-up "^1.0.1"
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+
+strip-hex-prefix@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz#0c5f155fef1151373377de9dbb588da05500e36f"
+  dependencies:
+    is-hex-prefixed "1.0.0"
+
+strip-indent@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  dependencies:
+    get-stdin "^4.0.1"
+
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+
+strip-outer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.0.tgz#aac0ba60d2e90c5d4f275fd8869fd9a2d310ffb8"
+  dependencies:
+    escape-string-regexp "^1.0.2"
+
+style-loader@0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.1.tgz#468280efbc0473023cd3a6cd56e33b5a1d7fc3a9"
+  dependencies:
+    loader-utils "^0.2.7"
+
+style-search@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
+
+stylehacks@^2.3.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-2.3.2.tgz#64c83e0438a68c9edf449e8c552a7d9ab6009b0b"
+  dependencies:
+    browserslist "^1.1.3"
+    chalk "^1.1.1"
+    log-symbols "^1.0.2"
+    minimist "^1.2.0"
+    plur "^2.1.2"
+    postcss "^5.0.18"
+    postcss-reporter "^1.3.3"
+    postcss-selector-parser "^2.0.0"
+    read-file-stdin "^0.2.1"
+    text-table "^0.2.0"
+    write-file-stdout "0.0.2"
+
+stylelint-config-standard@16.0.0:
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-16.0.0.tgz#bb7387bff1d7dd7186a52b3ebf885b2405d691bf"
+
+stylelint@7.9.0:
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.9.0.tgz#b8d9ea20f887ab351075c6aded9528de24509327"
+  dependencies:
+    autoprefixer "^6.0.0"
+    balanced-match "^0.4.0"
+    chalk "^1.1.1"
+    colorguard "^1.2.0"
+    cosmiconfig "^2.1.1"
+    doiuse "^2.4.1"
+    execall "^1.0.0"
+    get-stdin "^5.0.0"
+    globby "^6.0.0"
+    globjoin "^0.1.4"
+    html-tags "^1.1.1"
+    ignore "^3.2.0"
+    known-css-properties "^0.0.6"
+    lodash "^4.17.4"
+    log-symbols "^1.0.2"
+    meow "^3.3.0"
+    micromatch "^2.3.11"
+    normalize-selector "^0.2.0"
+    postcss "^5.0.20"
+    postcss-less "^0.14.0"
+    postcss-media-query-parser "^0.2.0"
+    postcss-reporter "^3.0.0"
+    postcss-resolve-nested-selector "^0.1.1"
+    postcss-scss "^0.4.0"
+    postcss-selector-parser "^2.1.1"
+    postcss-value-parser "^3.1.1"
+    resolve-from "^2.0.0"
+    specificity "^0.3.0"
+    string-width "^2.0.0"
+    style-search "^0.1.0"
+    stylehacks "^2.3.0"
+    sugarss "^0.2.0"
+    svg-tags "^1.0.0"
+    table "^4.0.1"
+
+sugarss@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-0.2.0.tgz#ac34237563327c6ff897b64742bf6aec190ad39e"
+  dependencies:
+    postcss "^5.2.4"
+
+sum-up@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sum-up/-/sum-up-1.0.3.tgz#1c661f667057f63bcb7875aa1438bc162525156e"
+  dependencies:
+    chalk "^1.0.0"
+
+supports-color@3.1.2, supports-color@^3.1.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
+  dependencies:
+    has-flag "^1.0.0"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+
+supports-color@^3.1.2, supports-color@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  dependencies:
+    has-flag "^1.0.0"
+
+svg-tags@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
+
+svgo@^0.7.0:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
+  dependencies:
+    coa "~1.0.1"
+    colors "~1.1.2"
+    csso "~2.3.1"
+    js-yaml "~3.7.0"
+    mkdirp "~0.5.1"
+    sax "~1.2.1"
+    whet.extend "~0.9.9"
+
+sw-toolbox@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/sw-toolbox/-/sw-toolbox-3.6.0.tgz#26df1d1c70348658e4dea2884319149b7b3183b5"
+  dependencies:
+    path-to-regexp "^1.0.1"
+    serviceworker-cache-polyfill "^4.0.0"
+
+symbol-observable@^0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
+
+symbol-observable@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
+
+symbol-tree@^3.2.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+
+synesthesia@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/synesthesia/-/synesthesia-1.0.1.tgz#5ef95ea548c0d5c6e6f9bb4b0d0731dff864a777"
+  dependencies:
+    css-color-names "0.0.3"
+
+table@^3.7.8:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
+  dependencies:
+    ajv "^4.7.0"
+    ajv-keywords "^1.0.0"
+    chalk "^1.1.1"
+    lodash "^4.0.0"
+    slice-ansi "0.0.4"
+    string-width "^2.0.0"
+
+table@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/table/-/table-4.0.1.tgz#a8116c133fac2c61f4a420ab6cdf5c4d61f0e435"
+  dependencies:
+    ajv "^4.7.0"
+    ajv-keywords "^1.0.0"
+    chalk "^1.1.1"
+    lodash "^4.0.0"
+    slice-ansi "0.0.4"
+    string-width "^2.0.0"
+
+tapable@^0.2.5, tapable@~0.2.5:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d"
+
+tar-fs@^1.13.0:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.15.2.tgz#761f5b32932c7b39461a60d537faea0d8084830c"
+  dependencies:
+    chownr "^1.0.1"
+    mkdirp "^0.5.1"
+    pump "^1.0.0"
+    tar-stream "^1.1.2"
+
+tar-pack@^3.1.2, tar-pack@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
+  dependencies:
+    debug "^2.2.0"
+    fstream "^1.0.10"
+    fstream-ignore "^1.0.5"
+    once "^1.3.3"
+    readable-stream "^2.1.4"
+    rimraf "^2.5.1"
+    tar "^2.2.1"
+    uid-number "^0.0.6"
+
+tar-stream@^1.1.1, tar-stream@^1.1.2, tar-stream@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.2.tgz#fbc6c6e83c1a19d4cb48c7d96171fc248effc7bf"
+  dependencies:
+    bl "^1.0.0"
+    end-of-stream "^1.0.0"
+    readable-stream "^2.0.0"
+    xtend "^4.0.0"
+
+tar@^2.0.0, tar@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  dependencies:
+    block-stream "*"
+    fstream "^1.0.2"
+    inherits "2"
+
+tempfile@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"
+  dependencies:
+    os-tmpdir "^1.0.0"
+    uuid "^2.0.1"
+
+text-table@^0.2.0, text-table@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+
+through2-filter@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec"
+  dependencies:
+    through2 "~2.0.0"
+    xtend "~4.0.0"
+
+through2@^0.6.0, through2@^0.6.1, through2@^0.6.3, through2@~0.6.1:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
+  dependencies:
+    readable-stream ">=1.0.33-1 <1.1.0-0"
+    xtend ">=4.0.0 <4.1.0-0"
+
+through2@^2.0.0, through2@~2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  dependencies:
+    readable-stream "^2.1.5"
+    xtend "~4.0.1"
+
+"through@>=2.2.7 <3", through@^2.3.6, through@~2.3.4, through@~2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
+time-stamp@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.0.1.tgz#9f4bd23559c9365966f3302dbba2b07c6b99b151"
+
+timed-out@^3.0.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217"
+
+timers-browserify@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86"
+  dependencies:
+    setimmediate "^1.0.4"
+
+tmp@^0.0.31:
+  version "0.0.31"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
+  dependencies:
+    os-tmpdir "~1.0.1"
+
+to-absolute-glob@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f"
+  dependencies:
+    extend-shallow "^2.0.1"
+
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+
+to-fast-properties@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320"
+
+to-source@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/to-source/-/to-source-2.0.3.tgz#5387f8259cf35762b3e3e9b5c2dcd8e3db9a2d15"
+
+toggle-selection@^1.0.3:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.5.tgz#726c703de607193a73c32c7df49cd24950fc574f"
+
+toposort@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.3.tgz#f02cd8a74bd8be2fc0e98611c3bacb95a171869c"
+
+tough-cookie@^2.3.2, tough-cookie@~2.3.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
+  dependencies:
+    punycode "^1.4.1"
+
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+
+traverse@^0.6.6:
+  version "0.6.6"
+  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
+
+trim-newlines@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+
+trim-repeated@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21"
+  dependencies:
+    escape-string-regexp "^1.0.2"
+
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+
+tryit@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
+
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+
+tunnel-agent@^0.4.0, tunnel-agent@^0.4.3, tunnel-agent@~0.4.1:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-detect@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
+
+type-detect@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
+
+type-is@~1.6.14:
+  version "1.6.15"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.15"
+
+typedarray-to-buffer@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.2.tgz#1017b32d984ff556eba100f501589aba1ace2e04"
+  dependencies:
+    is-typedarray "^1.0.0"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+
+u2f-api-polyfill@0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/u2f-api-polyfill/-/u2f-api-polyfill-0.4.3.tgz#b7ad165a6f962558517a867c5c4bf9399fcf7e98"
+
+u2f-api@0.0.9:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/u2f-api/-/u2f-api-0.0.9.tgz#bded457ba5a9a9ee9b58b3de291f8c1f8feacb7a"
+
+ua-parser-js@^0.7.9:
+  version "0.7.12"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
+
+uglify-js@2.8.16, uglify-js@2.8.x, uglify-js@^2.6, uglify-js@^2.7.5:
+  version "2.8.16"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.16.tgz#d286190b6eefc6fd65eb0ecac6551e0b0e8839a4"
+  dependencies:
+    source-map "~0.5.1"
+    yargs "~3.10.0"
+  optionalDependencies:
+    uglify-to-browserify "~1.0.0"
+
+uglify-to-browserify@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+
+uid-number@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+
+uniq@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+
+uniqid@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
+  dependencies:
+    macaddress "^0.2.8"
+
+uniqs@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
+
+unique-concat@~0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/unique-concat/-/unique-concat-0.2.2.tgz#9210f9bdcaacc5e1e3929490d7c019df96f18712"
+
+unique-stream@^2.0.2:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"
+  dependencies:
+    json-stable-stringify "^1.0.0"
+    through2-filter "^2.0.0"
+
+unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+
+unzip-response@^1.0.0, unzip-response@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
+
+upper-case@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
+
+url-loader@0.5.7:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.7.tgz#67e8779759f8000da74994906680c943a9b0925d"
+  dependencies:
+    loader-utils "0.2.x"
+    mime "1.2.x"
+
+url-parse-lax@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
+  dependencies:
+    prepend-http "^1.0.1"
+
+url-regex@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/url-regex/-/url-regex-3.2.0.tgz#dbad1e0c9e29e105dd0b1f09f6862f7fdb482724"
+  dependencies:
+    ip-regex "^1.0.1"
+
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+user-home@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
+
+user-home@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
+  dependencies:
+    os-homedir "^1.0.0"
+
+useragent.js@0.5.6:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/useragent.js/-/useragent.js-0.5.6.tgz#a76aef101e2483702523ff6fb58a400af77e22a9"
+
+utf8@2.1.2, utf8@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96"
+
+util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+
+util@0.10.3, "util@>=0.10.3 <1", util@^0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  dependencies:
+    inherits "2.0.1"
+
+utila@~0.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226"
+
+utila@~0.4:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
+
+utils-merge@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
+
+uuid@3.0.0, uuid@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.0.tgz#6728fc0459c450d796a99c31837569bdf672d728"
+
+uuid@^2.0.1, uuid@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
+
+v8flags@^2.0.10:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.0.12.tgz#73235d9f7176f8e8833fb286795445f7938d84e5"
+  dependencies:
+    user-home "^1.1.1"
+
+vali-date@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6"
+
+valid-url@1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200"
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  dependencies:
+    spdx-correct "~1.0.0"
+    spdx-expression-parse "~1.0.0"
+
+validator@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-4.0.2.tgz#70a1c2525ec4744e409971c1b298aa69a7534251"
+
+validator@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-6.2.0.tgz#b2cccdc49ff0f4b8ee4e61dba2ddd3dde13f23e7"
+
+vary@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"
+
+vendors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
+
+verror@1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
+  dependencies:
+    extsprintf "1.0.2"
+
+vinyl-assign@^1.0.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/vinyl-assign/-/vinyl-assign-1.2.1.tgz#4d198891b5515911d771a8cd9c5480a46a074a45"
+  dependencies:
+    object-assign "^4.0.1"
+    readable-stream "^2.0.0"
+
+vinyl-fs@^2.2.0:
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-2.4.4.tgz#be6ff3270cb55dfd7d3063640de81f25d7532239"
+  dependencies:
+    duplexify "^3.2.0"
+    glob-stream "^5.3.2"
+    graceful-fs "^4.0.0"
+    gulp-sourcemaps "1.6.0"
+    is-valid-glob "^0.3.0"
+    lazystream "^1.0.0"
+    lodash.isequal "^4.0.0"
+    merge-stream "^1.0.0"
+    mkdirp "^0.5.0"
+    object-assign "^4.0.0"
+    readable-stream "^2.0.4"
+    strip-bom "^2.0.0"
+    strip-bom-stream "^1.0.0"
+    through2 "^2.0.0"
+    through2-filter "^2.0.0"
+    vali-date "^1.0.0"
+    vinyl "^1.0.0"
+
+vinyl@^0.4.3:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
+  dependencies:
+    clone "^0.2.0"
+    clone-stats "^0.0.1"
+
+vinyl@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
+  dependencies:
+    clone "^1.0.0"
+    clone-stats "^0.0.1"
+    replace-ext "0.0.1"
+
+vinyl@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
+  dependencies:
+    clone "^1.0.0"
+    clone-stats "^0.0.1"
+    replace-ext "0.0.1"
+
+vm-browserify@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  dependencies:
+    indexof "0.0.1"
+
+w3c-blob@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/w3c-blob/-/w3c-blob-0.0.1.tgz#b0cd352a1a50f515563420ffd5861f950f1d85b8"
+
+ware@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ware/-/ware-1.3.0.tgz#d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"
+  dependencies:
+    wrap-fn "^0.1.0"
+
+warning@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
+  dependencies:
+    loose-envify "^1.0.0"
+
+watchpack@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87"
+  dependencies:
+    async "^2.1.2"
+    chokidar "^1.4.3"
+    graceful-fs "^4.1.2"
+
+web3@0.17.0-beta:
+  version "0.17.0-beta"
+  resolved "https://registry.yarnpkg.com/web3/-/web3-0.17.0-beta.tgz#57af38245bff7a32099f7ce5780fad5bbc00da5b"
+  dependencies:
+    bignumber.js "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2"
+    crypto-js "^3.1.4"
+    utf8 "^2.1.1"
+    xmlhttprequest "*"
+
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+
+webidl-conversions@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
+
+webpack-bundle-size-analyzer@2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-size-analyzer/-/webpack-bundle-size-analyzer-2.5.0.tgz#939ea465e4559353a9fce40af511820f216a9c80"
+  dependencies:
+    commander "^2.7.1"
+    filesize "^3.1.2"
+    humanize "0.0.9"
+
+webpack-dev-middleware@1.10.1:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.1.tgz#c6b4cf428139cf1aefbe06a0c00fdb4f8da2f893"
+  dependencies:
+    memory-fs "~0.4.1"
+    mime "^1.3.4"
+    path-is-absolute "^1.0.0"
+    range-parser "^1.0.3"
+
+webpack-error-notification@0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/webpack-error-notification/-/webpack-error-notification-0.1.6.tgz#ebfcbd4ef46b83466b59c12fde8790168f47a257"
+
+webpack-hot-middleware@2.17.1:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.17.1.tgz#0c8fbf6f93ff29c095d684b07ab6d6c0f2f951d7"
+  dependencies:
+    ansi-html "0.0.7"
+    html-entities "^1.2.0"
+    querystring "^0.2.0"
+    strip-ansi "^3.0.0"
+
+webpack-sources@^0.1.0, webpack-sources@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
+  dependencies:
+    source-list-map "~0.1.7"
+    source-map "~0.5.3"
+
+webpack@2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.2.1.tgz#7bb1d72ae2087dd1a4af526afec15eed17dda475"
+  dependencies:
+    acorn "^4.0.4"
+    acorn-dynamic-import "^2.0.0"
+    ajv "^4.7.0"
+    ajv-keywords "^1.1.1"
+    async "^2.1.2"
+    enhanced-resolve "^3.0.0"
+    interpret "^1.0.0"
+    json-loader "^0.5.4"
+    loader-runner "^2.3.0"
+    loader-utils "^0.2.16"
+    memory-fs "~0.4.1"
+    mkdirp "~0.5.0"
+    node-libs-browser "^2.0.0"
+    source-map "^0.5.3"
+    supports-color "^3.1.0"
+    tapable "~0.2.5"
+    uglify-js "^2.7.5"
+    watchpack "^1.2.0"
+    webpack-sources "^0.1.4"
+    yargs "^6.0.0"
+
+webrtc-adapter@^2.0.8:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/webrtc-adapter/-/webrtc-adapter-2.1.0.tgz#612b5bc6ce8e73c9d0660038a21f9255a867bf3e"
+  dependencies:
+    sdp "^1.0.0"
+
+websocket@1.0.24:
+  version "1.0.24"
+  resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.24.tgz#74903e75f2545b6b2e1de1425bc1c905917a1890"
+  dependencies:
+    debug "^2.2.0"
+    nan "^2.3.3"
+    typedarray-to-buffer "^3.1.2"
+    yaeti "^0.0.6"
+
+whatwg-encoding@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz#3c6c451a198ee7aec55b1ec61d0920c67801a5f4"
+  dependencies:
+    iconv-lite "0.4.13"
+
+whatwg-fetch@2.0.1, whatwg-fetch@>=0.10.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.1.tgz#078b9461bbe91cea73cbce8bb122a05f9e92b772"
+
+whatwg-url@^4.3.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.7.0.tgz#202035ac1955b087cdd20fa8b58ded3ab1cd2af5"
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+whet.extend@~0.9.9:
+  version "0.9.9"
+  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
+
+which-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+
+which@1, which@^1.1.1, which@^1.2.9:
+  version "1.2.14"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.0.tgz#40edde802a71fea1f070da3e62dcda2e7add96ad"
+  dependencies:
+    string-width "^1.0.1"
+
+window-size@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+
+window-size@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
+
+wordwrap@0.0.2, wordwrap@~0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+
+wordwrap@^1.0.0, wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+
+worker-loader@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-0.8.0.tgz#13582960dcd7d700dc829d3fd252a7561696167e"
+  dependencies:
+    loader-utils "^1.0.2"
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+wrap-fn@^0.1.0:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/wrap-fn/-/wrap-fn-0.1.5.tgz#f21b6e41016ff4a7e31720dbc63a09016bdf9845"
+  dependencies:
+    co "3.1.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+write-file-atomic@^1.1.2:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.1.tgz#7d45ba32316328dd1ec7d90f60ebc0d845bb759a"
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    slide "^1.1.5"
+
+write-file-stdout@0.0.2, write-file-stdout@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-stdout/-/write-file-stdout-0.0.2.tgz#c252d7c7c5b1b402897630e3453c7bfe690d9ca1"
+
+write-json-file@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-1.2.0.tgz#2d5dfe96abc3c889057c93971aa4005efb548134"
+  dependencies:
+    graceful-fs "^4.1.2"
+    mkdirp "^0.5.1"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    sort-keys "^1.1.1"
+    write-file-atomic "^1.1.2"
+
+write@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+  dependencies:
+    mkdirp "^0.5.1"
+
+xml-char-classes@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"
+
+xml-name-validator@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
+
+xmlhttprequest@*:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
+
+xss-filters@^1.2.6:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/xss-filters/-/xss-filters-1.2.7.tgz#59fa1de201f36f2f3470dcac5f58ccc2830b0a9a"
+
+xtend@4.0.1, "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+
+y18n@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+
+yaeti@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577"
+
+yallist@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+
+yargs-parser@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4"
+  dependencies:
+    camelcase "^3.0.0"
+    lodash.assign "^4.0.6"
+
+yargs-parser@^4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
+  dependencies:
+    camelcase "^3.0.0"
+
+yargs@6.6.0, yargs@^6.0.0:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
+  dependencies:
+    camelcase "^3.0.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^4.2.0"
+
+yargs@^1.2.6:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.3.3.tgz#054de8b61f22eefdb7207059eaef9d6b83fb931a"
+
+yargs@^3.5.4, yargs@~3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  dependencies:
+    camelcase "^1.0.2"
+    cliui "^2.1.0"
+    decamelize "^1.0.0"
+    window-size "0.1.0"
+
+yargs@^4.7.1:
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"
+  dependencies:
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    lodash.assign "^4.0.3"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.1"
+    which-module "^1.0.0"
+    window-size "^0.2.0"
+    y18n "^3.2.1"
+    yargs-parser "^2.4.1"
+
+yarn@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/yarn/-/yarn-0.21.3.tgz#8dda3a63c798b383cfa577452c2b3cb3e4aa87e0"
+  dependencies:
+    babel-runtime "^6.0.0"
+    bytes "^2.4.0"
+    camelcase "^3.0.0"
+    chalk "^1.1.1"
+    cmd-shim "^2.0.1"
+    commander "^2.9.0"
+    death "^1.0.0"
+    debug "^2.2.0"
+    defaults "^1.0.3"
+    detect-indent "^5.0.0"
+    ini "^1.3.4"
+    inquirer "^3.0.1"
+    invariant "^2.2.0"
+    is-builtin-module "^1.0.0"
+    is-ci "^1.0.10"
+    leven "^2.0.0"
+    loud-rejection "^1.2.0"
+    minimatch "^3.0.3"
+    mkdirp "^0.5.1"
+    node-emoji "^1.0.4"
+    node-gyp "^3.2.1"
+    object-path "^0.11.2"
+    proper-lockfile "^2.0.0"
+    read "^1.0.7"
+    request "^2.75.0"
+    request-capture-har "^1.1.4"
+    rimraf "^2.5.0"
+    roadrunner "^1.1.0"
+    semver "^5.1.0"
+    strip-bom "^3.0.0"
+    tar "^2.2.1"
+    tar-stream "^1.5.2"
+    validate-npm-package-license "^3.0.1"
+
+yauzl@^2.2.1:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.7.0.tgz#e21d847868b496fc29eaec23ee87fdd33e9b2bce"
+  dependencies:
+    buffer-crc32 "~0.2.3"
+    fd-slicer "~1.0.1"
+
+zxcvbn@4.4.1:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/zxcvbn/-/zxcvbn-4.4.1.tgz#2381aadd7f078a25a86b215327562647b80aa8ac"
diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity
new file mode 100644
index 000000000..bbcd21cb3
--- /dev/null
+++ b/node_modules/.yarn-integrity
@@ -0,0 +1 @@
+549854b8a60607db81d4c58008d59f812d744acba026266f380acd942941356a
\ No newline at end of file

From cf904b6b2f08a99a09552f2b854b587714c09656 Mon Sep 17 00:00:00 2001
From: Craig O'Connor <oconnorct1@gmail.com>
Date: Wed, 26 Apr 2017 05:34:48 -0400
Subject: [PATCH 062/117] Export acc js (#4973)

* Export account RPC

* Removing GethDirectory and ParityDirectory

* js export accounts as json

* js export accounts as json

* api - then - catch

* final touches

* pass

* oops

* individual accounts

* refactoring

* refactor one

* refactor one

* refactor two

* some grumble fixes

* file name changes

* constructor

* constructor

* git recognize file name change

* spec and updates

* specs

* one tiny fix

* one tiny fix

* grumbles

* more grumbles

* sliders

* ff

* pointer default

* grumbles

* almost ready

* lots of updates

* accountList

* stupid debuglog

* bug fix

* bug fix

* some more good ol fashioned updates

* filter accounts

* clean

* update spec

* ff

* ff-f

* balances fix
---
 js/src/modals/ExportAccount/exportAccount.js  | 177 ++++++++++++++++++
 .../ExportAccount/exportAccount.spec.js       |  76 ++++++++
 .../ExportAccount/exportInput/exportInput.js  |  61 ++++++
 .../modals/ExportAccount/exportInput/index.js |  17 ++
 js/src/modals/ExportAccount/exportStore.js    | 106 +++++++++++
 .../modals/ExportAccount/exportStore.spec.js  | 133 +++++++++++++
 js/src/modals/ExportAccount/index.js          |  17 ++
 js/src/modals/index.js                        |   1 +
 js/src/ui/AccountCard/accountCard.js          |   4 +-
 js/src/ui/SelectionList/selectionList.js      |   8 +-
 js/src/views/Account/account.css              |   5 +
 js/src/views/Account/account.js               | 116 +++++++++++-
 js/src/views/Account/store.js                 |   5 +
 js/src/views/Accounts/accounts.js             |  50 ++++-
 yarn.lock                                     |   4 +
 15 files changed, 765 insertions(+), 15 deletions(-)
 create mode 100644 js/src/modals/ExportAccount/exportAccount.js
 create mode 100644 js/src/modals/ExportAccount/exportAccount.spec.js
 create mode 100644 js/src/modals/ExportAccount/exportInput/exportInput.js
 create mode 100644 js/src/modals/ExportAccount/exportInput/index.js
 create mode 100644 js/src/modals/ExportAccount/exportStore.js
 create mode 100644 js/src/modals/ExportAccount/exportStore.spec.js
 create mode 100644 js/src/modals/ExportAccount/index.js
 create mode 100644 yarn.lock

diff --git a/js/src/modals/ExportAccount/exportAccount.js b/js/src/modals/ExportAccount/exportAccount.js
new file mode 100644
index 000000000..48faaaec3
--- /dev/null
+++ b/js/src/modals/ExportAccount/exportAccount.js
@@ -0,0 +1,177 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { observer } from 'mobx-react';
+import React, { Component, PropTypes } from 'react';
+import { FormattedMessage } from 'react-intl';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+
+import { newError } from '~/redux/actions';
+import { personalAccountsInfo } from '~/redux/providers/personalActions';
+import { AccountCard, Button, Portal, SelectionList } from '~/ui';
+import { CancelIcon, CheckIcon } from '~/ui/Icons';
+import ExportInput from './exportInput';
+import ExportStore from './exportStore';
+
+@observer
+class ExportAccount extends Component {
+  static contextTypes = {
+    api: PropTypes.object.isRequired
+  };
+
+  static propTypes = {
+    accounts: PropTypes.object.isRequired,
+    balances: PropTypes.object.isRequired,
+    newError: PropTypes.func.isRequired,
+    personalAccountsInfo: PropTypes.func.isRequired,
+    onClose: PropTypes.func.isRequired
+  };
+
+  componentWillMount () {
+    const { accounts, newError } = this.props;
+
+    this.exportStore = new ExportStore(this.context.api, accounts, newError, null);
+  }
+
+  render () {
+    const { canExport } = this.exportStore;
+
+    return (
+      <Portal
+        buttons={ [
+          <Button
+            icon={ <CancelIcon /> }
+            key='cancel'
+            label={
+              <FormattedMessage
+                id='export.accounts.button.cancel'
+                defaultMessage='Cancel'
+              />
+            }
+            onClick={ this.onClose }
+          />,
+          <Button
+            disabled={ !canExport }
+            icon={ <CheckIcon /> }
+            key='execute'
+            label={
+              <FormattedMessage
+                id='export.accounts.button.export'
+                defaultMessage='Export'
+              />
+            }
+            onClick={ this.onExport }
+          />
+        ] }
+        onClose={ this.onClose }
+        open
+        title={
+          <FormattedMessage
+            id='export.accounts.title'
+            defaultMessage='Export an Account'
+          />
+        }
+      >
+        { this.renderList() }
+      </Portal>
+    );
+  }
+
+  renderList () {
+    const { accounts } = this.props;
+
+    const { selectedAccounts } = this.exportStore;
+
+    const accountList = Object.values(accounts)
+      .filter((account) => account.uuid)
+      .map((account) => {
+        account.checked = !!(selectedAccounts[account.address]);
+
+        return account;
+      });
+
+    return (
+      <SelectionList
+        items={ accountList }
+        noStretch
+        onSelectClick={ this.onSelect }
+        renderItem={ this.renderAccount }
+      />
+    );
+  }
+
+  renderAccount = (account) => {
+    const { balances } = this.props;
+    const balance = balances[account.address];
+    const { changePassword, getPassword } = this.exportStore;
+    const password = getPassword(account);
+
+    return (
+      <AccountCard
+        account={ account }
+        balance={ balance }
+      >
+        <div>
+          <ExportInput
+            account={ account }
+            value={ password }
+            onClick={ this.onClick }
+            onChange={ changePassword }
+          />
+        </div>
+      </AccountCard>
+    );
+  }
+
+  onSelect = (account) => {
+    this.exportStore.toggleSelectedAccount(account.address);
+  }
+
+  onClick = (address) => {
+    this.exportStore.onClick(address);
+  }
+
+  onClose = () => {
+    this.props.onClose();
+  }
+
+  onExport = () => {
+    this.exportStore.onExport();
+  }
+}
+
+function mapStateToProps (state) {
+  const { balances } = state;
+  const { accounts } = state.personal;
+
+  return {
+    accounts,
+    balances
+  };
+}
+
+function mapDispatchToProps (dispatch) {
+  return bindActionCreators({
+    newError,
+    personalAccountsInfo
+  }, dispatch);
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ExportAccount);
diff --git a/js/src/modals/ExportAccount/exportAccount.spec.js b/js/src/modals/ExportAccount/exportAccount.spec.js
new file mode 100644
index 000000000..7f185cc07
--- /dev/null
+++ b/js/src/modals/ExportAccount/exportAccount.spec.js
@@ -0,0 +1,76 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { shallow } from 'enzyme';
+import React from 'react';
+import sinon from 'sinon';
+
+import ExportAccount from './';
+
+const ADDRESS = '0x0123456789012345678901234567890123456789';
+
+let component;
+let NEWERROR;
+let PAI;
+let ONCLOSE;
+
+let reduxStore;
+
+function createReduxStore () {
+  reduxStore = {
+    dispatch: sinon.stub(),
+    subscribe: sinon.stub(),
+    getState: () => {
+      return {
+        balances: {
+          balances: {
+            [ADDRESS]: {}
+          }
+        },
+        personal: {
+          accounts: {
+            [ADDRESS]: {
+              address: ADDRESS
+            }
+          }
+        }
+      };
+    }
+  };
+
+  return reduxStore;
+}
+
+function render () {
+  component = shallow(
+    <ExportAccount
+      newError={ NEWERROR }
+      personalAccountsInfo={ PAI }
+      onClose={ ONCLOSE }
+    />,
+    {
+      context: { api: {}, store: createReduxStore() }
+    }
+  );
+
+  return component;
+}
+
+describe('CreateExportModal', () => {
+  it('renders defaults', () => {
+    expect(render()).to.be.ok;
+  });
+});
diff --git a/js/src/modals/ExportAccount/exportInput/exportInput.js b/js/src/modals/ExportAccount/exportInput/exportInput.js
new file mode 100644
index 000000000..07673b29b
--- /dev/null
+++ b/js/src/modals/ExportAccount/exportInput/exportInput.js
@@ -0,0 +1,61 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import React, { Component, PropTypes } from 'react';
+import { FormattedMessage } from 'react-intl';
+import { Input } from '~/ui/Form';
+
+export default class ExportInput extends Component {
+  static propTypes = {
+    account: PropTypes.object.isRequired,
+    onClick: PropTypes.func.isRequired,
+    onChange: PropTypes.func.isRequired,
+    value: PropTypes.string
+  };
+
+  render () {
+    const { value, onChange } = this.props;
+
+    return (
+      <Input
+        type='password'
+        label={
+          <FormattedMessage
+            id='export.setPassword.label'
+            defaultMessage='Password'
+          />
+        }
+        hint={
+          <FormattedMessage
+            id='export.setPassword.hint'
+            defaultMessage='Enter password Here'
+          />
+        }
+        value={ value }
+        onClick={ this.onClick }
+        onChange={ onChange }
+      />
+    );
+  }
+
+  onClick = (event) => {
+    const { account, onClick } = this.props;
+
+    event.stopPropagation();
+
+    onClick && onClick(account.address);
+  }
+}
diff --git a/js/src/modals/ExportAccount/exportInput/index.js b/js/src/modals/ExportAccount/exportInput/index.js
new file mode 100644
index 000000000..fb685bf6b
--- /dev/null
+++ b/js/src/modals/ExportAccount/exportInput/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './exportInput';
diff --git a/js/src/modals/ExportAccount/exportStore.js b/js/src/modals/ExportAccount/exportStore.js
new file mode 100644
index 000000000..cba8d00a9
--- /dev/null
+++ b/js/src/modals/ExportAccount/exportStore.js
@@ -0,0 +1,106 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { action, observable } from 'mobx';
+import FileSaver from 'file-saver';
+
+export default class ExportStore {
+  @observable canExport = false;
+  @observable selectedAccount = '';
+  @observable selectedAccounts = {};
+  @observable passwordInputs = {};
+
+  constructor (api, accounts, newError, address) {
+    this.accounts = accounts;
+    this._api = api;
+    this._newError = newError;
+    if (address) {
+      this.selectedAccounts[address] = true;
+      this.selectedAccount = address;
+    }
+  }
+
+  @action changePassword = (event, password) => {
+    this.passwordInputs[this.selectedAccount] = password;
+  }
+
+  @action getPassword = (address) => {
+    return this.passwordInputs[address];
+  }
+
+  @action onClick = (address) => {
+    this.selectedAccount = address;
+  }
+
+  @action resetAccountValue = () => {
+    this.passwordInputs[this.selectedAccount] = '';
+  }
+
+  @action setAccounts = (accounts) => {
+    this.accounts = accounts;
+  }
+
+  @action setSelectedAccount = (addr) => {
+    this.selectedAccounts[addr] = true;
+    this.canExport = true;
+  }
+
+  @action toggleSelectedAccount = (addr) => {
+    if (this.selectedAccounts[addr]) {
+      delete this.selectedAccounts[addr];
+    } else {
+      this.selectedAccounts[addr] = true;
+    }
+    this.canExport = false;
+    Object
+      .keys(this.selectedAccounts)
+      .forEach((address) => {
+        if (this.selectedAccounts[address]) {
+          this.canExport = true;
+        }
+      });
+  }
+
+  onExport = (event) => {
+    const { parity } = this._api;
+    const accounts = Object.keys(this.selectedAccounts);
+
+    accounts.forEach((address) => {
+      let password = this.passwordInputs[address];
+
+      parity
+        .exportAccount(address, password)
+        .then((content) => {
+          const text = JSON.stringify(content, null, 4);
+          const blob = new Blob([ text ], { type: 'application/json' });
+          const filename = this.accounts[address].uuid;
+
+          FileSaver.saveAs(blob, `${filename}.json`);
+
+          this.accountValue = '';
+          if (event) { event(); }
+        })
+        .catch((err) => {
+          const { name, meta } = this.accounts[address];
+          const { passwordHint } = meta;
+
+          this._newError({
+            message: `[${err.code}] Account "${name}" - Incorrect password. (Password Hint: ${passwordHint})`
+          });
+        });
+    });
+  }
+}
diff --git a/js/src/modals/ExportAccount/exportStore.spec.js b/js/src/modals/ExportAccount/exportStore.spec.js
new file mode 100644
index 000000000..08dcbddb8
--- /dev/null
+++ b/js/src/modals/ExportAccount/exportStore.spec.js
@@ -0,0 +1,133 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import sinon from 'sinon';
+
+import ExportStore from './exportStore';
+
+const ADDRESS = '0x00000123456789abcdef123456789abcdef123456789abcdef';
+const ADDRESS_2 = '0x123456789abcdef123456789abcdef123456789abcdef00000';
+const ACCOUNTS = { ADDRESS: {}, ADDRESS_2: {} };
+
+let api;
+let AccountStore;
+
+function createApi () {
+  return {
+    eth: {
+    },
+    parity: {
+      exportAccount: sinon.stub().resolves({})
+    }
+  };
+}
+
+function createMultiAccountStore (loadGeth) {
+  api = createApi();
+  AccountStore = new ExportStore(api, ACCOUNTS, null, null);
+
+  return AccountStore;
+}
+
+describe('modals/exportAccount/Store', () => {
+  beforeEach(() => {
+    createMultiAccountStore();
+  });
+
+  describe('constructor', () => {
+    it('insert api', () => {
+      expect(AccountStore._api).to.deep.equal(api);
+    });
+
+    it('insert accounts', () => {
+      expect(AccountStore.accounts).to.deep.equal(ACCOUNTS);
+    });
+
+    it('newError created', () => {
+      expect(AccountStore._newError).to.deep.equal(null);
+    });
+  });
+
+  describe('@action', () => {
+    describe('toggleSelectedAccount', () => {
+      it('Updates the selected accounts', () => {
+        // First set selectedAccounts
+        AccountStore.selectedAccounts = {
+          [ADDRESS]: true,
+          [ADDRESS_2]: false
+        };
+        // Toggle
+        AccountStore.toggleSelectedAccount(ADDRESS_2);
+        // Prep eqality
+        const eq = {
+          [ADDRESS]: true,
+          [ADDRESS_2]: true
+        };
+
+        // Check equality
+        expect(JSON.stringify(AccountStore.selectedAccounts)).to.deep.equal(JSON.stringify(eq));
+      });
+    });
+
+    describe('getPassword', () => {
+      it('Grab from the selected accounts input', () => {
+        // First set passwordInputs
+        AccountStore.passwordInputs = {
+          [ADDRESS]: 'abc'
+        };
+        // getPassword
+        const pass = AccountStore.getPassword(ADDRESS);
+
+        // Check equality
+        expect(AccountStore.passwordInputs[ADDRESS]).to.deep.equal(pass);
+      });
+    });
+
+    describe('setPassword & getPassword', () => {
+      it('First save the input of the selected account, than get the input.', () => {
+        // Set password
+        AccountStore.selectedAccount = ADDRESS;
+        // Set new pass
+        AccountStore.changePassword(null, 'abc');
+        // getPassword
+        const pass = AccountStore.getPassword(ADDRESS);
+
+        // Check equality
+        expect(AccountStore.passwordInputs[ADDRESS]).to.deep.equal(pass);
+      });
+    });
+
+    describe('changePassword', () => {
+      it('Change the stored value with the new input.', () => {
+        // First set selectedAccounts
+        AccountStore.selectedAccounts = {
+          [ADDRESS]: true,
+          [ADDRESS_2]: false
+        };
+        // First set passwordInputs
+        AccountStore.passwordInputs = {
+          [ADDRESS]: 'abc'
+        };
+        // 'Click' on the address:
+        AccountStore.onClick(ADDRESS);
+        // Change password
+        AccountStore.changePassword(null, '123');
+        // Check equality
+        expect(AccountStore.passwordInputs[ADDRESS]).to.deep.equal('123');
+      });
+    });
+  });
+});
diff --git a/js/src/modals/ExportAccount/index.js b/js/src/modals/ExportAccount/index.js
new file mode 100644
index 000000000..eb61a884b
--- /dev/null
+++ b/js/src/modals/ExportAccount/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './exportAccount';
diff --git a/js/src/modals/index.js b/js/src/modals/index.js
index 6fe10bfb1..7c313a2ef 100644
--- a/js/src/modals/index.js
+++ b/js/src/modals/index.js
@@ -24,6 +24,7 @@ export DeleteAccount from './DeleteAccount';
 export DeployContract from './DeployContract';
 export EditMeta from './EditMeta';
 export ExecuteContract from './ExecuteContract';
+export ExportAccount from './ExportAccount';
 export Faucet from './Faucet';
 export FirstRun from './FirstRun';
 export LoadContract from './LoadContract';
diff --git a/js/src/ui/AccountCard/accountCard.js b/js/src/ui/AccountCard/accountCard.js
index da59f0e69..de7cc3d18 100644
--- a/js/src/ui/AccountCard/accountCard.js
+++ b/js/src/ui/AccountCard/accountCard.js
@@ -27,6 +27,7 @@ import styles from './accountCard.css';
 
 export default class AccountCard extends Component {
   static propTypes = {
+    children: PropTypes.node,
     account: PropTypes.object.isRequired,
     balance: PropTypes.object,
     className: PropTypes.string,
@@ -44,7 +45,7 @@ export default class AccountCard extends Component {
   };
 
   render () {
-    const { account, balance, className, onFocus } = this.props;
+    const { account, balance, className, onFocus, children } = this.props;
     const { copied } = this.state;
     const { address, description, meta = {}, name } = account;
     const { tags = [] } = meta;
@@ -89,6 +90,7 @@ export default class AccountCard extends Component {
             className={ styles.balance }
             showOnlyEth
           />
+          { children }
         </div>
 
         {
diff --git a/js/src/ui/SelectionList/selectionList.js b/js/src/ui/SelectionList/selectionList.js
index a7375581d..266dce893 100644
--- a/js/src/ui/SelectionList/selectionList.js
+++ b/js/src/ui/SelectionList/selectionList.js
@@ -29,7 +29,7 @@ export default class SelectionList extends Component {
     items: arrayOrObjectProptype().isRequired,
     noStretch: PropTypes.bool,
     onDefaultClick: PropTypes.func,
-    onSelectClick: PropTypes.func.isRequired,
+    onSelectClick: PropTypes.func,
     onSelectDoubleClick: PropTypes.func,
     renderItem: PropTypes.func.isRequired
   };
@@ -57,8 +57,10 @@ export default class SelectionList extends Component {
       : item.checked;
 
     const handleClick = () => {
-      onSelectClick(item);
-      return false;
+      if (onSelectClick) {
+        onSelectClick(item);
+        return false;
+      }
     };
     const handleDoubleClick = () => {
       onSelectDoubleClick(item);
diff --git a/js/src/views/Account/account.css b/js/src/views/Account/account.css
index 068c07c60..88c5f2a85 100644
--- a/js/src/views/Account/account.css
+++ b/js/src/views/Account/account.css
@@ -19,3 +19,8 @@
   width: 24px;
   height: 24px;
 }
+
+.textbox {
+  line-height: 1.5em;
+  margin-bottom: 1.5em;
+}
diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js
index 6f38cdf72..fdccac793 100644
--- a/js/src/views/Account/account.js
+++ b/js/src/views/Account/account.js
@@ -20,13 +20,15 @@ import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
+import { newError } from '~/redux/actions';
 import shapeshiftBtn from '~/../assets/images/shapeshift-btn.png';
 import HardwareStore from '~/mobx/hardwareStore';
+import ExportStore from '~/modals/ExportAccount/exportStore';
 import { DeleteAccount, EditMeta, Faucet, PasswordManager, Shapeshift, Transfer, Verification } from '~/modals';
 import { setVisibleAccounts } from '~/redux/providers/personalActions';
 import { fetchCertifiers, fetchCertifications } from '~/redux/providers/certifications/actions';
-import { Actionbar, Button, Page } from '~/ui';
-import { DeleteIcon, DialIcon, EditIcon, LockedIcon, SendIcon, VerifyIcon } from '~/ui/Icons';
+import { Actionbar, Button, ConfirmDialog, Input, Page, Portal } from '~/ui';
+import { DeleteIcon, DialIcon, EditIcon, LockedIcon, SendIcon, VerifyIcon, FileDownloadIcon } from '~/ui/Icons';
 
 import DeleteAddress from '../Address/Delete';
 
@@ -42,6 +44,7 @@ class Account extends Component {
   };
 
   static propTypes = {
+    accounts: PropTypes.object.isRequired,
     fetchCertifiers: PropTypes.func.isRequired,
     fetchCertifications: PropTypes.func.isRequired,
     setVisibleAccounts: PropTypes.func.isRequired,
@@ -49,12 +52,20 @@ class Account extends Component {
     account: PropTypes.object,
     certifications: PropTypes.object,
     netVersion: PropTypes.string.isRequired,
+    newError: PropTypes.func,
     params: PropTypes.object
   }
 
   store = new Store();
   hwstore = HardwareStore.get(this.context.api);
 
+  componentWillMount () {
+    const { accounts, newError, params } = this.props;
+    const { address } = params;
+
+    this.exportStore = new ExportStore(this.context.api, accounts, newError, address);
+  }
+
   componentDidMount () {
     this.props.fetchCertifiers();
     this.setVisibleAccounts();
@@ -63,10 +74,15 @@ class Account extends Component {
   componentWillReceiveProps (nextProps) {
     const prevAddress = this.props.params.address;
     const nextAddress = nextProps.params.address;
+    const { accounts } = nextProps;
 
     if (prevAddress !== nextAddress) {
       this.setVisibleAccounts(nextProps);
     }
+
+    if (!Object.keys(this.exportStore.accounts).length) {
+      this.exportStore.setAccounts(accounts);
+    }
   }
 
   componentWillUnmount () {
@@ -95,6 +111,7 @@ class Account extends Component {
       <div>
         { this.renderDeleteDialog(account) }
         { this.renderEditDialog(account) }
+        { this.renderExportDialog() }
         { this.renderFaucetDialog() }
         { this.renderFundDialog() }
         { this.renderPasswordDialog(account) }
@@ -212,6 +229,17 @@ class Account extends Component {
         }
         onClick={ this.store.toggleEditDialog }
       />,
+      <Button
+        icon={ <FileDownloadIcon /> }
+        key='exportmeta'
+        label={
+          <FormattedMessage
+            id='account.button.export'
+            defaultMessage='export'
+          />
+        }
+        onClick={ this.store.toggleExportDialog }
+      />,
       !(account.external || account.hardware) && (
         <Button
           icon={ <LockedIcon /> }
@@ -320,6 +348,64 @@ class Account extends Component {
     );
   }
 
+  renderExportDialog () {
+    const { changePassword, accountValue } = this.exportStore;
+
+    if (!this.store.isExportVisible) {
+      return null;
+    }
+
+    return (
+      <Portal
+        open
+        isSmallModal
+        onClose={ this.exportClose }
+      >
+        <ConfirmDialog
+          open
+          disabledConfirm={ false }
+          labelConfirm='Export'
+          labelDeny='Cancel'
+          onConfirm={ this.onExport }
+          onDeny={ this.exportClose }
+          title={
+            <FormattedMessage
+              id='export.account.title'
+              defaultMessage='Export Account'
+            />
+          }
+        >
+          <div className={ styles.textbox }>
+            <FormattedMessage
+              id='export.account.info'
+              defaultMessage='Export your account as a JSON file. Please enter the password linked with this account.'
+            />
+          </div>
+          <Input
+            className={ styles.textbox }
+            onKeyDown={ this.onEnter }
+            autoFocus
+            type='password'
+            hint={
+              <FormattedMessage
+                id='export.account.password.hint'
+                defaultMessage='The password specified when creating this account'
+              />
+            }
+            label={
+              <FormattedMessage
+                id='export.account.password.label'
+                defaultMessage='Account password'
+              />
+            }
+            onChange={ changePassword }
+            value={ accountValue }
+          />
+        </ConfirmDialog>
+      </Portal>
+    );
+  }
+
   renderFaucetDialog () {
     const { netVersion } = this.props;
 
@@ -393,6 +479,30 @@ class Account extends Component {
       />
     );
   }
+
+  onEnter = (event) => {
+    if (event.key === 'Enter') {
+      this.onExport();
+    }
+  }
+
+  exportClose = () => {
+    const { toggleExportDialog } = this.store;
+    const { resetAccountValue } = this.exportStore;
+
+    resetAccountValue();
+    toggleExportDialog();
+  }
+
+  onExport = () => {
+    const { onExport } = this.exportStore;
+
+    onExport(this.hideExport);
+  }
+
+  hideExport = () => {
+    this.store.toggleExportDialog();
+  }
 }
 
 function mapStateToProps (state, props) {
@@ -406,6 +516,7 @@ function mapStateToProps (state, props) {
 
   return {
     account,
+    accounts,
     certifications,
     netVersion
   };
@@ -415,6 +526,7 @@ function mapDispatchToProps (dispatch) {
   return bindActionCreators({
     fetchCertifiers,
     fetchCertifications,
+    newError,
     setVisibleAccounts
   }, dispatch);
 }
diff --git a/js/src/views/Account/store.js b/js/src/views/Account/store.js
index 45a9a7a8c..f9046ee74 100644
--- a/js/src/views/Account/store.js
+++ b/js/src/views/Account/store.js
@@ -19,6 +19,7 @@ import { action, observable } from 'mobx';
 export default class Store {
   @observable isDeleteVisible = false;
   @observable isEditVisible = false;
+  @observable isExportVisible = false;
   @observable isFaucetVisible = false;
   @observable isFundVisible = false;
   @observable isPasswordVisible = false;
@@ -33,6 +34,10 @@ export default class Store {
     this.isEditVisible = !this.isEditVisible;
   }
 
+  @action toggleExportDialog = () => {
+    this.isExportVisible = !this.isExportVisible;
+  }
+
   @action toggleFaucetDialog = () => {
     this.isFaucetVisible = !this.isFaucetVisible;
   }
diff --git a/js/src/views/Accounts/accounts.js b/js/src/views/Accounts/accounts.js
index 40bd31bf5..c597ddf15 100644
--- a/js/src/views/Accounts/accounts.js
+++ b/js/src/views/Accounts/accounts.js
@@ -24,9 +24,9 @@ import { Link } from 'react-router';
 import { bindActionCreators } from 'redux';
 
 import HardwareStore from '~/mobx/hardwareStore';
-import { CreateAccount, CreateWallet } from '~/modals';
-import { Actionbar, ActionbarExport, ActionbarSearch, ActionbarSort, Button, Page, Tooltip } from '~/ui';
-import { AddIcon, KeyIcon } from '~/ui/Icons';
+import { CreateAccount, CreateWallet, ExportAccount } from '~/modals';
+import { Actionbar, ActionbarSearch, ActionbarSort, Button, Page, Tooltip } from '~/ui';
+import { AddIcon, KeyIcon, FileDownloadIcon } from '~/ui/Icons';
 import { setVisibleAccounts } from '~/redux/providers/personalActions';
 
 import List from './List';
@@ -52,6 +52,7 @@ class Accounts extends Component {
     addressBook: false,
     newDialog: false,
     newWalletDialog: false,
+    newExportDialog: false,
     sortOrder: '',
     searchValues: [],
     searchTokens: [],
@@ -96,6 +97,7 @@ class Accounts extends Component {
       <div>
         { this.renderNewDialog() }
         { this.renderNewWalletDialog() }
+        { this.renderNewExportDialog() }
         { this.renderActionbar() }
 
         <Page>
@@ -244,8 +246,6 @@ class Accounts extends Component {
   }
 
   renderActionbar () {
-    const { accounts } = this.props;
-
     const buttons = [
       <Link
         to='/vaults'
@@ -284,10 +284,16 @@ class Accounts extends Component {
         }
         onClick={ this.onNewWalletClick }
       />,
-      <ActionbarExport
-        key='exportAccounts'
-        content={ accounts }
-        filename='accounts'
+      <Button
+        key='newExport'
+        icon={ <FileDownloadIcon /> }
+        label={
+          <FormattedMessage
+            id='accounts.button.export'
+            defaultMessage='export'
+          />
+        }
+        onClick={ this.onNewExportClick }
       />,
       this.renderSearchButton(),
       this.renderSortButton()
@@ -351,6 +357,20 @@ class Accounts extends Component {
     );
   }
 
+  renderNewExportDialog () {
+    const { newExportDialog } = this.state;
+
+    if (!newExportDialog) {
+      return null;
+    }
+
+    return (
+      <ExportAccount
+        onClose={ this.onNewExportClose }
+      />
+    );
+  }
+
   onAddSearchToken = (token) => {
     const { searchTokens } = this.state;
     const newSearchTokens = uniq([].concat(searchTokens, token));
@@ -370,6 +390,12 @@ class Accounts extends Component {
     });
   }
 
+  onNewExportClick = () => {
+    this.setState({
+      newExportDialog: true
+    });
+  }
+
   onNewAccountClose = () => {
     this.setState({
       newDialog: false
@@ -382,6 +408,12 @@ class Accounts extends Component {
     });
   }
 
+  onNewExportClose = () => {
+    this.setState({
+      newExportDialog: false
+    });
+  }
+
   onNewAccountUpdate = () => {
   }
 
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 000000000..fb57ccd13
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+

From 012615ae46848251de9d32d580dc4a3775c6beda Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Wed, 26 Apr 2017 10:19:53 +0000
Subject: [PATCH 063/117] [ci skip] js-precompiled 20170426-101558

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 10df3d472..5c71774fa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1777,7 +1777,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#ec0b7ad836a553142ab6e833bb3480f7fc570db7"
+source = "git+https://github.com/paritytech/js-precompiled.git#4d50e7bfc3712287e37da1d45fe983f2a6e69ca7"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 760a838e4..f2c5150a7 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.59",
+  "version": "1.7.60",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 3d9deb77704bbeb27e4e6cd373aef077b0683437 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Wed, 26 Apr 2017 12:38:21 +0200
Subject: [PATCH 064/117] npm cleanups (#5512)

* Cleanup @parity modules in npm run clean

* Remove top-level yarn files (only in js)
---
 .gitignore                   | 1 +
 js/package.json              | 2 +-
 node_modules/.yarn-integrity | 1 -
 yarn.lock                    | 4 ----
 4 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 node_modules/.yarn-integrity
 delete mode 100644 yarn.lock

diff --git a/.gitignore b/.gitignore
index c36ae1c90..994559bb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@
 
 # npm stuff
 npm-debug.log
+node_modules
 
 # gdb files
 .gdb_history
diff --git a/js/package.json b/js/package.json
index f2c5150a7..0d95f82a3 100644
--- a/js/package.json
+++ b/js/package.json
@@ -48,7 +48,7 @@
     "ci:build:embed": "NODE_ENV=production EMBED=1 node webpack/embed",
     "start": "npm install && npm run build:lib && npm run build:dll && npm run start:app",
     "start:app": "node webpack/dev.server",
-    "clean": "rm -rf ./.build ./.coverage ./.happypack ./.npmjs ./build ./node_modules/.cache",
+    "clean": "rm -rf ./.build ./.coverage ./.happypack ./.npmjs ./build ./node_modules/.cache ./node_modules/@parity",
     "coveralls": "npm run testCoverage && coveralls < coverage/lcov.info",
     "lint": "npm run lint:css && npm run lint:js",
     "lint:cached": "npm run lint:css && npm run lint:js:cached",
diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity
deleted file mode 100644
index bbcd21cb3..000000000
--- a/node_modules/.yarn-integrity
+++ /dev/null
@@ -1 +0,0 @@
-549854b8a60607db81d4c58008d59f812d744acba026266f380acd942941356a
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
deleted file mode 100644
index fb57ccd13..000000000
--- a/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-

From 30b3b5e2a7ebaea2a9e21f7bc11629892f2da905 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Wed, 26 Apr 2017 11:12:52 +0000
Subject: [PATCH 065/117] [ci skip] js-precompiled 20170426-110849

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5c71774fa..d6b128491 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1777,7 +1777,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#4d50e7bfc3712287e37da1d45fe983f2a6e69ca7"
+source = "git+https://github.com/paritytech/js-precompiled.git#76c40dc32016e1189fd3b35d9cf7b8f53c648162"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 0d95f82a3..913092d9d 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.60",
+  "version": "1.7.61",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 2245863f047761e01c445d8a9d2a402e1b2120cc Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Thu, 27 Apr 2017 16:14:51 +0300
Subject: [PATCH 066/117] add snap to CI

initial build snap package for parity
---
 .gitlab-ci.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c2ad13d6..99dd7c11b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,6 +60,20 @@ linux-stable:
     - target/release/ethstore
     - target/release/ethkey
     name: "stable-x86_64-unknown-linux-gnu_parity"
+linux-snap:
+  stage: build
+  only:
+    - snap
+  script:
+    - git clone https://github.com/paritytech/parity
+    - git submodule update --init --recursive
+    - cd scripts
+    - snapcraft
+    - sudo snap install *.snap --dangerous
+    - parity -v
+  tags:
+    - snap
+  allow_failure: true
 linux-stable-debian:
   stage: build
   image: ethcore/rust-debian:latest

From 011f6102a5416ae8b18d8d82c3acd0f6d8b2948d Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Thu, 27 Apr 2017 16:27:28 +0300
Subject: [PATCH 067/117] update gitlab-ci

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99dd7c11b..6c996d87c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,7 +65,7 @@ linux-snap:
   only:
     - snap
   script:
-    - git clone https://github.com/paritytech/parity
+    #- git clone https://github.com/paritytech/parity
     - git submodule update --init --recursive
     - cd scripts
     - snapcraft

From e439b53652f01a200b25524a06776bee3039f7ea Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Thu, 27 Apr 2017 17:20:00 +0300
Subject: [PATCH 068/117] switch to docker runner

---
 .gitlab-ci.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c996d87c..ebd8cd900 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,17 +62,20 @@ linux-stable:
     name: "stable-x86_64-unknown-linux-gnu_parity"
 linux-snap:
   stage: build
+  image: ubuntu:latest
   only:
     - snap
+  before_script:
+    - apt install snapcraft
   script:
-    #- git clone https://github.com/paritytech/parity
     - git submodule update --init --recursive
     - cd scripts
     - snapcraft
     - sudo snap install *.snap --dangerous
     - parity -v
   tags:
-    - snap
+    - rust
+    - rust-stable
   allow_failure: true
 linux-stable-debian:
   stage: build

From 43175f17e4468c6e861959f9a75e0d78bd5aa605 Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@parity.io>
Date: Thu, 27 Apr 2017 18:22:55 +0200
Subject: [PATCH 069/117] Treat clock numbers as strings, not BigNums. (#5449)

---
 js/src/views/Application/Requests/requests.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/src/views/Application/Requests/requests.js b/js/src/views/Application/Requests/requests.js
index 1054cc4e2..dfbb866b9 100644
--- a/js/src/views/Application/Requests/requests.js
+++ b/js/src/views/Application/Requests/requests.js
@@ -103,7 +103,7 @@ class Requests extends Component {
               <LinearProgress
                 max={ 6 }
                 mode={ state.type === WAITING_STATE ? 'indeterminate' : 'determinate' }
-                value={ state.type === DONE_STATE ? request.blockHeight.toNumber() : 6 }
+                value={ state.type === DONE_STATE ? +request.blockHeight : 6 }
               />
             )
         }
@@ -158,8 +158,8 @@ class Requests extends Component {
           id='requests.status.transactionMined'
           defaultMessage='Transaction mined at block #{blockNumber} ({blockHeight} blocks ago)'
           values={ {
-            blockHeight: request.blockHeight.toNumber(),
-            blockNumber: transactionReceipt.blockNumber.toFormat()
+            blockHeight: +request.blockHeight,
+            blockNumber: +transactionReceipt.blockNumber
           } }
         />
       );

From 28dcbc642617b381e1bbddce17aef46e7bfb1d3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Thu, 27 Apr 2017 18:23:22 +0200
Subject: [PATCH 070/117] Support external eth_sign  (#5481)

* Display a QR for eth_sign requests.

* Support raw confirmation of eth_sign

* Fix ethkey issue on nightly.

* Fixing test.

* Fixing test.
---
 Cargo.lock                                    |   1 +
 ethkey/src/brain.rs                           |   4 +-
 ethkey/src/signature.rs                       |  42 +++++++-
 js/src/redux/providers/signerMiddleware.js    |  23 ++--
 js/src/util/qrscan.js                         |  18 +++-
 .../components/RequestOrigin/requestOrigin.js |   2 +-
 .../components/SignRequest/signRequest.js     |  15 ++-
 .../TransactionPending/transactionPending.js  |   7 +-
 .../transactionPendingFormConfirm.js          |  62 +++++++----
 .../transactionPendingFormConfirm.spec.js     |   1 +
 .../transactionPendingForm.js                 |  15 ++-
 rpc/Cargo.toml                                |   1 +
 rpc/src/lib.rs                                |   4 +
 rpc/src/v1/helpers/dispatch.rs                |  29 ++---
 rpc/src/v1/impls/signer.rs                    |  79 +++++++++-----
 rpc/src/v1/tests/mocked/signer.rs             | 101 +++++++++++++++++-
 rpc/src/v1/types/confirmations.rs             |   2 +-
 17 files changed, 313 insertions(+), 93 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d6b128491..b87285205 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1711,6 +1711,7 @@ dependencies = [
  "order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-reactor 0.1.0",
  "parity-updater 1.7.0",
+ "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rlp 0.1.0",
  "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ethkey/src/brain.rs b/ethkey/src/brain.rs
index 5ed23b404..cf675a843 100644
--- a/ethkey/src/brain.rs
+++ b/ethkey/src/brain.rs
@@ -57,8 +57,8 @@ mod tests {
 	#[test]
 	fn test_brain() {
 		let words = "this is sparta!".to_owned();
-		let first_keypair = Brain(words.clone()).generate().unwrap();
-		let second_keypair = Brain(words.clone()).generate().unwrap();
+		let first_keypair = Brain::new(words.clone()).generate().unwrap();
+		let second_keypair = Brain::new(words.clone()).generate().unwrap();
 		assert_eq!(first_keypair.secret(), second_keypair.secret());
 	}
 }
diff --git a/ethkey/src/signature.rs b/ethkey/src/signature.rs
index 347222287..0c9e41ef5 100644
--- a/ethkey/src/signature.rs
+++ b/ethkey/src/signature.rs
@@ -25,6 +25,7 @@ use rustc_serialize::hex::{ToHex, FromHex};
 use bigint::hash::{H520, H256};
 use {Secret, Public, SECP256K1, Error, Message, public_to_address, Address};
 
+/// Signature encoded as RSV components
 #[repr(C)]
 pub struct Signature([u8; 65]);
 
@@ -44,8 +45,32 @@ impl Signature {
 		self.0[64]
 	}
 
+	/// Encode the signature into VRS array (V altered to be in "Electrum" notation).
+	pub fn into_vrs(self) -> [u8; 65] {
+		let mut vrs = [0u8; 65];
+		vrs[0] = self.v() + 27;
+		vrs[1..33].copy_from_slice(self.r());
+		vrs[33..65].copy_from_slice(self.s());
+		vrs
+	}
+
+	/// Parse bytes as a signature encoded as VRS (V in "Electrum" notation).
+	/// May return empty (invalid) signature if given data has invalid length.
+	pub fn from_vrs(data: &[u8]) -> Self {
+		if data.len() != 65 || data[0] < 27 {
+			// fallback to empty (invalid) signature
+			return Signature::default();
+		}
+
+		let mut sig = [0u8; 65];
+		sig[0..32].copy_from_slice(&data[1..33]);
+		sig[32..64].copy_from_slice(&data[33..65]);
+		sig[64] = data[0] - 27;
+		Signature(sig)
+	}
+
 	/// Create a signature object from the sig.
-	pub fn from_rsv(r: &H256, s: &H256, v: u8) -> Signature {
+	pub fn from_rsv(r: &H256, s: &H256, v: u8) -> Self {
 		let mut sig = [0u8; 65];
 		sig[0..32].copy_from_slice(&r);
 		sig[32..64].copy_from_slice(&s);
@@ -222,6 +247,21 @@ mod tests {
 	use {Generator, Random, Message};
 	use super::{sign, verify_public, verify_address, recover, Signature};
 
+	#[test]
+	fn vrs_conversion() {
+		// given
+		let keypair = Random.generate().unwrap();
+		let message = Message::default();
+		let signature = sign(keypair.secret(), &message).unwrap();
+
+		// when
+		let vrs = signature.clone().into_vrs();
+		let from_vrs = Signature::from_vrs(&vrs);
+
+		// then
+		assert_eq!(signature, from_vrs);
+	}
+
 	#[test]
 	fn signature_to_and_from_str() {
 		let keypair = Random.generate().unwrap();
diff --git a/js/src/redux/providers/signerMiddleware.js b/js/src/redux/providers/signerMiddleware.js
index f50057abe..869a7d802 100644
--- a/js/src/redux/providers/signerMiddleware.js
+++ b/js/src/redux/providers/signerMiddleware.js
@@ -87,14 +87,20 @@ export default class SignerMiddleware {
         return this._hwstore.signLedger(transaction);
       })
       .then((rawTx) => {
-        return this.confirmRawTransaction(store, id, rawTx);
+        return this.confirmRawRequest(store, id, rawTx);
       });
   }
 
-  confirmRawTransaction (store, id, rawTx) {
+  confirmRawRequest (store, id, rawData) {
     const handlePromise = this._createConfirmPromiseHandler(store, id);
 
-    return handlePromise(this._api.signer.confirmRequestRaw(id, rawTx));
+    return handlePromise(this._api.signer.confirmRequestRaw(id, rawData));
+  }
+
+  confirmSignedData (store, id, dataSigned) {
+    const { signature } = dataSigned;
+
+    return this.confirmRawRequest(store, id, signature);
   }
 
   confirmSignedTransaction (store, id, txSigned) {
@@ -102,7 +108,7 @@ export default class SignerMiddleware {
     const { signature, tx } = txSigned;
     const { rlp } = createSignedTx(netVersion, signature, tx);
 
-    return this.confirmRawTransaction(store, id, rlp);
+    return this.confirmRawRequest(store, id, rlp);
   }
 
   confirmWalletTransaction (store, id, transaction, wallet, password) {
@@ -138,7 +144,7 @@ export default class SignerMiddleware {
         return signer.signTransaction(txData);
       })
       .then((rawTx) => {
-        return this.confirmRawTransaction(store, id, rawTx);
+        return this.confirmRawRequest(store, id, rawTx);
       })
       .catch((error) => {
         console.error(error.message);
@@ -147,7 +153,7 @@ export default class SignerMiddleware {
   }
 
   onConfirmStart = (store, action) => {
-    const { condition, gas = 0, gasPrice = 0, id, password, payload, txSigned, wallet } = action.payload;
+    const { condition, gas = 0, gasPrice = 0, id, password, payload, txSigned, dataSigned, wallet } = action.payload;
     const handlePromise = this._createConfirmPromiseHandler(store, id);
     const transaction = payload.sendTransaction || payload.signTransaction;
 
@@ -170,6 +176,11 @@ export default class SignerMiddleware {
       }
     }
 
+    // TODO [ToDr] Support eth_sign for external wallet (wallet && !transction)
+    if (dataSigned) {
+      return this.confirmSignedData(store, id, dataSigned);
+    }
+
     return handlePromise(this._api.signer.confirmRequest(id, { gas, gasPrice, condition }, password));
   }
 
diff --git a/js/src/util/qrscan.js b/js/src/util/qrscan.js
index f3cf2f9e9..da73d5b8f 100644
--- a/js/src/util/qrscan.js
+++ b/js/src/util/qrscan.js
@@ -19,8 +19,8 @@ import Transaction from 'ethereumjs-tx';
 import { inAddress, inHex, inNumber10 } from '~/api/format/input';
 import { sha3 } from '~/api/util/sha3';
 
-export function createUnsignedTx (api, netVersion, gasStore, transaction) {
-  const { data, from, gas, gasPrice, to, value } = gasStore.overrideTransaction(transaction);
+export function createUnsignedTx (api, netVersion, transaction) {
+  const { data, from, gas, gasPrice, to, value } = transaction;
 
   return api.parity
     .nextNonce(from)
@@ -111,8 +111,18 @@ export function generateQr (from, tx, hash, rlp) {
   });
 }
 
-export function generateTxQr (api, netVersion, gasStore, transaction) {
-  return createUnsignedTx(api, netVersion, gasStore, transaction)
+export function generateDataQr (data) {
+  return Promise.resolve({
+    data,
+    value: JSON.stringify({
+      action: 'signData',
+      data
+    })
+  });
+}
+
+export function generateTxQr (api, netVersion, transaction) {
+  return createUnsignedTx(api, netVersion, transaction)
     .then((qr) => {
       qr.value = generateQr(transaction.from, qr.tx, qr.hash, qr.rlp);
 
diff --git a/js/src/views/Signer/components/RequestOrigin/requestOrigin.js b/js/src/views/Signer/components/RequestOrigin/requestOrigin.js
index 6582e9780..435d90a6b 100644
--- a/js/src/views/Signer/components/RequestOrigin/requestOrigin.js
+++ b/js/src/views/Signer/components/RequestOrigin/requestOrigin.js
@@ -85,7 +85,7 @@ export default class RequestOrigin extends Component {
         <span>
           <FormattedMessage
             id='signer.requestOrigin.rpc'
-            defaultMessage='via RPC {rpc}'
+            defaultMessage='via RPC {url}'
             values={ {
               url: (
                 <span className={ styles.url }>
diff --git a/js/src/views/Signer/components/SignRequest/signRequest.js b/js/src/views/Signer/components/SignRequest/signRequest.js
index 624e0931f..705b89965 100644
--- a/js/src/views/Signer/components/SignRequest/signRequest.js
+++ b/js/src/views/Signer/components/SignRequest/signRequest.js
@@ -19,6 +19,8 @@ import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 
+import HardwareStore from '~/mobx/hardwareStore';
+
 import Account from '../Account';
 import TransactionPendingForm from '../TransactionPendingForm';
 import RequestOrigin from '../RequestOrigin';
@@ -68,6 +70,8 @@ class SignRequest extends Component {
     }
   };
 
+  hardwareStore = HardwareStore.get(this.context.api);
+
   componentWillMount () {
     const { address, signerStore } = this.props;
 
@@ -155,8 +159,9 @@ class SignRequest extends Component {
   }
 
   renderActions () {
-    const { accounts, address, focus, isFinished, status } = this.props;
-    const account = accounts[address];
+    const { accounts, address, focus, isFinished, status, data } = this.props;
+    const account = accounts[address] || {};
+    const disabled = account.hardware && !this.hardwareStore.isConnected(address);
 
     if (isFinished) {
       if (status === 'confirmed') {
@@ -188,21 +193,23 @@ class SignRequest extends Component {
       <TransactionPendingForm
         account={ account }
         address={ address }
+        disabled={ disabled }
         focus={ focus }
         isSending={ this.props.isSending }
         netVersion={ this.props.netVersion }
         onConfirm={ this.onConfirm }
         onReject={ this.onReject }
         className={ styles.actions }
+        dataToSign={ { data } }
       />
     );
   }
 
   onConfirm = (data) => {
     const { id } = this.props;
-    const { password } = data;
+    const { password, dataSigned, wallet } = data;
 
-    this.props.onConfirm({ id, password });
+    this.props.onConfirm({ id, password, dataSigned, wallet });
   }
 
   onReject = () => {
diff --git a/js/src/views/Signer/components/TransactionPending/transactionPending.js b/js/src/views/Signer/components/TransactionPending/transactionPending.js
index 666ff16a1..b9cc8f684 100644
--- a/js/src/views/Signer/components/TransactionPending/transactionPending.js
+++ b/js/src/views/Signer/components/TransactionPending/transactionPending.js
@@ -98,7 +98,9 @@ class TransactionPending extends Component {
   }
 
   renderTransaction () {
-    const { accounts, className, focus, id, isSending, netVersion, origin, signerStore, transaction } = this.props;
+    const transaction = this.gasStore.overrideTransaction(this.props.transaction);
+
+    const { accounts, className, focus, id, isSending, netVersion, origin, signerStore } = this.props;
     const { totalValue } = this.state;
     const { balances, externalLink } = signerStore;
     const { from, value } = transaction;
@@ -127,12 +129,11 @@ class TransactionPending extends Component {
           address={ from }
           disabled={ disabled }
           focus={ focus }
-          gasStore={ this.gasStore }
           isSending={ isSending }
           netVersion={ netVersion }
           onConfirm={ this.onConfirm }
           onReject={ this.onReject }
-          transaction={ transaction }
+          dataToSign={ { transaction } }
         />
       </div>
     );
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
index 0152bb71d..8d4e4a9cc 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
@@ -22,7 +22,7 @@ import { FormattedMessage } from 'react-intl';
 import ReactTooltip from 'react-tooltip';
 
 import { Form, Input, IdentityIcon, QrCode, QrScan } from '~/ui';
-import { generateTxQr } from '~/util/qrscan';
+import { generateTxQr, generateDataQr } from '~/util/qrscan';
 
 import styles from './transactionPendingFormConfirm.css';
 
@@ -40,11 +40,10 @@ export default class TransactionPendingFormConfirm extends Component {
     address: PropTypes.string.isRequired,
     disabled: PropTypes.bool,
     focus: PropTypes.bool,
-    gasStore: PropTypes.object.isRequired,
     netVersion: PropTypes.string.isRequired,
     isSending: PropTypes.bool.isRequired,
     onConfirm: PropTypes.func.isRequired,
-    transaction: PropTypes.object.isRequired
+    dataToSign: PropTypes.object.isRequired
   };
 
   static defaultProps = {
@@ -406,7 +405,7 @@ export default class TransactionPendingFormConfirm extends Component {
   }
 
   onScanTx = (signature) => {
-    const { chainId, rlp, tx } = this.state.qr;
+    const { chainId, rlp, tx, data } = this.state.qr;
 
     if (signature && signature.substr(0, 2) !== '0x') {
       signature = `0x${signature}`;
@@ -414,12 +413,22 @@ export default class TransactionPendingFormConfirm extends Component {
 
     this.setState({ qrState: QR_COMPLETED });
 
+    if (tx) {
+      this.props.onConfirm({
+        txSigned: {
+          chainId,
+          rlp,
+          signature,
+          tx
+        }
+      });
+      return;
+    }
+
     this.props.onConfirm({
-      txSigned: {
-        chainId,
-        rlp,
-        signature,
-        tx
+      dataSigned: {
+        data,
+        signature
       }
     });
   }
@@ -487,13 +496,20 @@ export default class TransactionPendingFormConfirm extends Component {
     });
   }
 
-  generateTxQr = () => {
+  generateQr = () => {
     const { api } = this.context;
-    const { netVersion, gasStore, transaction } = this.props;
-
-    generateTxQr(api, netVersion, gasStore, transaction).then((qr) => {
+    const { netVersion, dataToSign } = this.props;
+    const { transaction, data } = dataToSign;
+    const setState = qr => {
       this.setState({ qr });
-    });
+    };
+
+    if (transaction) {
+      generateTxQr(api, netVersion, transaction).then(setState);
+      return;
+    }
+
+    generateDataQr(data).then(setState);
   }
 
   onKeyDown = (event) => {
@@ -528,19 +544,25 @@ export default class TransactionPendingFormConfirm extends Component {
 
   readNonce = () => {
     const { api } = this.context;
-    const { account } = this.props;
+    const { account, dataToSign } = this.props;
+    const { qr } = this.state;
 
-    if (!account || !account.external || !api.transport.isConnected) {
+    if (dataToSign.data && qr && !qr.value) {
+      this.generateQr();
+      return;
+    }
+
+    if (!account || !account.external || !api.transport.isConnected || !dataToSign.transaction) {
       return;
     }
 
     return api.parity
       .nextNonce(account.address)
-      .then((nonce) => {
-        const { qr } = this.state;
+      .then((newNonce) => {
+        const { nonce } = this.state.qr;
 
-        if (!qr.nonce || !nonce.eq(qr.nonce)) {
-          this.generateTxQr();
+        if (!nonce || !newNonce.eq(nonce)) {
+          this.generateQr();
         }
       });
   }
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.spec.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.spec.js
index 1176a01f0..2e984400d 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.spec.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.spec.js
@@ -52,6 +52,7 @@ function render (address) {
       address={ address }
       onConfirm={ onConfirm }
       isSending={ false }
+      dataToSign={ {} }
     />
   );
   instance = component.instance();
diff --git a/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js b/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js
index af360897a..e176b97e9 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js
@@ -30,12 +30,18 @@ export default class TransactionPendingForm extends Component {
     className: PropTypes.string,
     disabled: PropTypes.bool,
     focus: PropTypes.bool,
-    gasStore: PropTypes.object.isRequired,
     netVersion: PropTypes.string.isRequired,
     isSending: PropTypes.bool.isRequired,
     onConfirm: PropTypes.func.isRequired,
     onReject: PropTypes.func.isRequired,
-    transaction: PropTypes.object.isRequired
+    dataToSign: PropTypes.oneOfType([
+      PropTypes.shape({
+        transaction: PropTypes.object.isRequired
+      }),
+      PropTypes.shape({
+        data: PropTypes.string.isRequired
+      })
+    ]).isRequired
   };
 
   static defaultProps = {
@@ -59,7 +65,7 @@ export default class TransactionPendingForm extends Component {
   }
 
   renderForm () {
-    const { account, address, disabled, focus, gasStore, isSending, netVersion, onConfirm, onReject, transaction } = this.props;
+    const { account, address, disabled, focus, isSending, netVersion, onConfirm, onReject, dataToSign } = this.props;
 
     if (this.state.isRejectOpen) {
       return (
@@ -73,11 +79,10 @@ export default class TransactionPendingForm extends Component {
         account={ account }
         disabled={ disabled }
         focus={ focus }
-        gasStore={ gasStore }
         netVersion={ netVersion }
         isSending={ isSending }
         onConfirm={ onConfirm }
-        transaction={ transaction }
+        dataToSign={ dataToSign }
       />
     );
   }
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 87e340b02..70ff7202d 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -49,6 +49,7 @@ fetch = { path = "../util/fetch" }
 stats = { path = "../util/stats" }
 
 clippy = { version = "0.0.103", optional = true}
+pretty_assertions = "0.1"
 
 [features]
 dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev"]
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index 53b8f994c..ae51d879c 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -66,6 +66,10 @@ extern crate ethjson;
 #[cfg(test)]
 extern crate ethcore_devtools as devtools;
 
+#[cfg(test)]
+#[macro_use]
+extern crate pretty_assertions;
+
 pub extern crate jsonrpc_ws_server as ws;
 
 mod metadata;
diff --git a/rpc/src/v1/helpers/dispatch.rs b/rpc/src/v1/helpers/dispatch.rs
index c6af8d7e7..5b25c3124 100644
--- a/rpc/src/v1/helpers/dispatch.rs
+++ b/rpc/src/v1/helpers/dispatch.rs
@@ -206,6 +206,17 @@ pub fn fetch_gas_price_corpus(
 	}
 }
 
+/// Returns a eth_sign-compatible hash of data to sign.
+/// The data is prepended with special message to prevent
+/// chosen-plaintext attacks.
+pub fn eth_data_hash(mut data: Bytes) -> H256 {
+	let mut message_data =
+		format!("\x19Ethereum Signed Message:\n{}", data.len())
+		.into_bytes();
+	message_data.append(&mut data);
+	message_data.sha3()
+}
+
 /// Dispatcher for light clients -- fetches default gas price, next nonce, etc. from network.
 #[derive(Clone)]
 pub struct LightDispatcher {
@@ -474,21 +485,11 @@ pub fn execute<D: Dispatcher + 'static>(
 					.map(ConfirmationResponse::SignTransaction)
 				).boxed()
 		},
-		ConfirmationPayload::EthSignMessage(address, mut data) => {
-			let mut message_data =
-				format!("\x19Ethereum Signed Message:\n{}", data.len())
-				.into_bytes();
-			message_data.append(&mut data);
-			let res = signature(&accounts, address, message_data.sha3(), pass)
+		ConfirmationPayload::EthSignMessage(address, data) => {
+			let hash = eth_data_hash(data);
+			let res = signature(&accounts, address, hash, pass)
 				.map(|result| result
-					.map(|rsv| {
-						let mut vrs = [0u8; 65];
-						let rsv = rsv.as_ref();
-						vrs[0] = rsv[64] + 27;
-						vrs[1..33].copy_from_slice(&rsv[0..32]);
-						vrs[33..65].copy_from_slice(&rsv[32..64]);
-						H520(vrs)
-					})
+					.map(|rsv| H520(rsv.into_vrs()))
 					.map(RpcH520::from)
 					.map(ConfirmationResponse::Signature)
 				);
diff --git a/rpc/src/v1/impls/signer.rs b/rpc/src/v1/impls/signer.rs
index d46bfdcc5..e34743e1d 100644
--- a/rpc/src/v1/impls/signer.rs
+++ b/rpc/src/v1/impls/signer.rs
@@ -21,12 +21,13 @@ use std::sync::{Arc, Weak};
 use rlp::UntrustedRlp;
 use ethcore::account_provider::AccountProvider;
 use ethcore::transaction::{SignedTransaction, PendingTransaction};
+use ethkey;
 use futures::{future, BoxFuture, Future, IntoFuture};
 
 use jsonrpc_core::Error;
-use v1::helpers::{errors, SignerService, SigningQueue, ConfirmationPayload};
-use v1::helpers::dispatch::{self, Dispatcher, WithToken};
 use v1::helpers::accounts::unwrap_provider;
+use v1::helpers::dispatch::{self, Dispatcher, WithToken, eth_data_hash};
+use v1::helpers::{errors, SignerService, SigningQueue, ConfirmationPayload, FilledTransactionRequest};
 use v1::traits::Signer;
 use v1::types::{TransactionModification, ConfirmationRequest, ConfirmationResponse, ConfirmationResponseWithToken, U256, Bytes};
 
@@ -104,6 +105,37 @@ impl<D: Dispatcher + 'static> SignerClient<D> {
 		})
 		.unwrap_or_else(|| future::err(errors::invalid_params("Unknown RequestID", id)).boxed())
 	}
+
+	fn verify_transaction<F>(bytes: Bytes, request: FilledTransactionRequest, process: F) -> Result<ConfirmationResponse, Error> where
+		F: FnOnce(PendingTransaction) -> Result<ConfirmationResponse, Error>,
+	{
+		let signed_transaction = UntrustedRlp::new(&bytes.0).as_val().map_err(errors::from_rlp_error)?;
+		let signed_transaction = SignedTransaction::new(signed_transaction).map_err(|e| errors::invalid_params("Invalid signature.", e))?;
+		let sender = signed_transaction.sender();
+
+		// Verification
+		let sender_matches = sender == request.from;
+		let data_matches = signed_transaction.data == request.data;
+		let value_matches = signed_transaction.value == request.value;
+		let nonce_matches = match request.nonce {
+			Some(nonce) => signed_transaction.nonce == nonce,
+			None => true,
+		};
+
+		// Dispatch if everything is ok
+		if sender_matches && data_matches && value_matches && nonce_matches {
+			let pending_transaction = PendingTransaction::new(signed_transaction, request.condition.map(Into::into));
+			process(pending_transaction)
+		} else {
+			let mut error = Vec::new();
+			if !sender_matches { error.push("from") }
+			if !data_matches { error.push("data") }
+			if !value_matches { error.push("value") }
+			if !nonce_matches { error.push("nonce") }
+
+			Err(errors::invalid_params("Sent transaction does not match the request.", error))
+		}
+	}
 }
 
 impl<D: Dispatcher + 'static> Signer for SignerClient<D> {
@@ -149,38 +181,27 @@ impl<D: Dispatcher + 'static> Signer for SignerClient<D> {
 		signer.peek(&id).map(|confirmation| {
 			let result = match confirmation.payload {
 				ConfirmationPayload::SendTransaction(request) => {
-					let signed_transaction = UntrustedRlp::new(&bytes.0).as_val().map_err(errors::from_rlp_error)?;
-					let signed_transaction = SignedTransaction::new(signed_transaction).map_err(|e| errors::invalid_params("Invalid signature.", e))?;
-					let sender = signed_transaction.sender();
-
-					// Verification
-					let sender_matches = sender == request.from;
-					let data_matches = signed_transaction.data == request.data;
-					let value_matches = signed_transaction.value == request.value;
-					let nonce_matches = match request.nonce {
-						Some(nonce) => signed_transaction.nonce == nonce,
-						None => true,
-					};
-
-					// Dispatch if everything is ok
-					if sender_matches && data_matches && value_matches && nonce_matches {
-						let pending_transaction = PendingTransaction::new(signed_transaction, request.condition.map(Into::into));
+					Self::verify_transaction(bytes, request, |pending_transaction| {
 						self.dispatcher.dispatch_transaction(pending_transaction)
 							.map(Into::into)
 							.map(ConfirmationResponse::SendTransaction)
-					} else {
-						let mut error = Vec::new();
-						if !sender_matches { error.push("from") }
-						if !data_matches { error.push("data") }
-						if !value_matches { error.push("value") }
-						if !nonce_matches { error.push("nonce") }
-
-						Err(errors::invalid_params("Sent transaction does not match the request.", error))
+					})
+				},
+				ConfirmationPayload::SignTransaction(request) => {
+					Self::verify_transaction(bytes, request, |pending_transaction| {
+						Ok(ConfirmationResponse::SignTransaction(pending_transaction.transaction.into()))
+					})
+				},
+				ConfirmationPayload::EthSignMessage(address, data) => {
+					let expected_hash = eth_data_hash(data);
+					let signature = ethkey::Signature::from_vrs(&bytes.0);
+					match ethkey::verify_address(&address, &signature, &expected_hash) {
+						Ok(true) => Ok(ConfirmationResponse::Signature(bytes.0.as_slice().into())),
+						Ok(false) => Err(errors::invalid_params("Sender address does not match the signature.", ())),
+						Err(err) => Err(errors::invalid_params("Invalid signature received.", err)),
 					}
 				},
-				// TODO [ToDr]:
-				// 1. Sign - verify signature
-				// 2. Decrypt - pass through?
+				// TODO [ToDr]: Decrypt - pass through?
 				_ => Err(errors::unimplemented(Some("Non-transaction requests does not support RAW signing yet.".into()))),
 			};
 			if let Ok(ref response) = result {
diff --git a/rpc/src/v1/tests/mocked/signer.rs b/rpc/src/v1/tests/mocked/signer.rs
index 973e33528..473a7aa7e 100644
--- a/rpc/src/v1/tests/mocked/signer.rs
+++ b/rpc/src/v1/tests/mocked/signer.rs
@@ -20,7 +20,7 @@ use util::{U256, Uint, Address, ToPretty};
 
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::TestBlockChainClient;
-use ethcore::transaction::{Transaction, Action};
+use ethcore::transaction::{Transaction, Action, SignedTransaction};
 use rlp::encode;
 
 use serde_json;
@@ -28,8 +28,9 @@ use jsonrpc_core::IoHandler;
 use v1::{SignerClient, Signer, Origin};
 use v1::metadata::Metadata;
 use v1::tests::helpers::TestMinerService;
+use v1::types::H520;
 use v1::helpers::{SigningQueue, SignerService, FilledTransactionRequest, ConfirmationPayload};
-use v1::helpers::dispatch::FullDispatcher;
+use v1::helpers::dispatch::{FullDispatcher, eth_data_hash};
 
 struct SignerTester {
 	signer: Arc<SignerService>,
@@ -359,7 +360,6 @@ fn should_confirm_transaction_with_rlp() {
 		"params":["0x1", "0x"#.to_owned() + &rlp.to_hex() + r#""],
 		"id":1
 	}"#;
-println!("{:?}", request);
 	let response = r#"{"jsonrpc":"2.0","result":""#.to_owned() + format!("0x{:?}", t.hash()).as_ref() + r#"","id":1}"#;
 
 	// then
@@ -415,6 +415,101 @@ fn should_return_error_when_sender_does_not_match() {
 	assert_eq!(tester.signer.requests().len(), 1);
 }
 
+#[test]
+fn should_confirm_sign_transaction_with_rlp() {
+	// given
+	let tester = signer_tester();
+	let address = tester.accounts.new_account("test").unwrap();
+	let recipient = Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap();
+	tester.signer.add_request(ConfirmationPayload::SignTransaction(FilledTransactionRequest {
+		from: address,
+		used_default_from: false,
+		to: Some(recipient),
+		gas_price: U256::from(10_000),
+		gas: U256::from(10_000_000),
+		value: U256::from(1),
+		data: vec![],
+		nonce: None,
+		condition: None,
+	}), Origin::Unknown).unwrap();
+	assert_eq!(tester.signer.requests().len(), 1);
+
+	let t = Transaction {
+		nonce: U256::zero(),
+		gas_price: U256::from(0x1000),
+		gas: U256::from(10_000_000),
+		action: Action::Call(recipient),
+		value: U256::from(0x1),
+		data: vec![]
+	};
+	let signature = tester.accounts.sign(address, Some("test".into()), t.hash(None)).unwrap();
+	let t = SignedTransaction::new(t.with_signature(signature.clone(), None)).unwrap();
+	let rlp = encode(&t);
+
+	// when
+	let request = r#"{
+		"jsonrpc":"2.0",
+		"method":"signer_confirmRequestRaw",
+		"params":["0x1", "0x"#.to_owned() + &rlp.to_hex() + r#""],
+		"id":1
+	}"#;
+	let response = r#"{"jsonrpc":"2.0","result":{"#.to_owned() +
+		r#""raw":"0x"# + &rlp.to_hex() + r#"","# +
+		r#""tx":{"# +
+		r#""blockHash":null,"blockNumber":null,"condition":null,"creates":null,"# +
+		&format!("\"from\":\"0x{:?}\",", &address) +
+		r#""gas":"0x989680","gasPrice":"0x1000","# +
+		&format!("\"hash\":\"0x{:?}\",", t.hash()) +
+		r#""input":"0x","# +
+		&format!("\"networkId\":{},", t.network_id().map_or("null".to_owned(), |n| format!("{}", n))) +
+		r#""nonce":"0x0","# +
+		&format!("\"publicKey\":\"0x{:?}\",", t.public_key().unwrap()) +
+		&format!("\"r\":\"0x{}\",", U256::from(signature.r()).to_hex()) +
+		&format!("\"raw\":\"0x{}\",", rlp.to_hex()) +
+		&format!("\"s\":\"0x{}\",", U256::from(signature.s()).to_hex()) +
+		&format!("\"standardV\":\"0x{}\",", U256::from(t.standard_v()).to_hex()) +
+		r#""to":"0xd46e8dd67c5d32be8058bb8eb970870f07244567","transactionIndex":null,"# +
+		&format!("\"v\":\"0x{}\",", U256::from(t.original_v()).to_hex()) +
+		r#""value":"0x1""# +
+		r#"}},"id":1}"#;
+
+	// then
+	assert_eq!(tester.io.handle_request_sync(&request), Some(response.to_owned()));
+	assert_eq!(tester.signer.requests().len(), 0);
+	assert_eq!(tester.miner.imported_transactions.lock().len(), 0);
+}
+
+
+#[test]
+fn should_confirm_data_sign_with_signature() {
+	// given
+	let tester = signer_tester();
+	let address = tester.accounts.new_account("test").unwrap();
+	tester.signer.add_request(ConfirmationPayload::EthSignMessage(
+		address,
+		vec![1, 2, 3, 4].into(),
+	), Origin::Unknown).unwrap();
+	assert_eq!(tester.signer.requests().len(), 1);
+
+	let data_hash = eth_data_hash(vec![1, 2, 3, 4].into());
+	let signature = H520(tester.accounts.sign(address, Some("test".into()), data_hash).unwrap().into_vrs());
+	let signature = format!("0x{:?}", signature);
+
+	// when
+	let request = r#"{
+		"jsonrpc":"2.0",
+		"method":"signer_confirmRequestRaw",
+		"params":["0x1", ""#.to_owned() + &signature + r#""],
+		"id":1
+	}"#;
+	let response = r#"{"jsonrpc":"2.0","result":""#.to_owned() + &signature + r#"","id":1}"#;
+
+	// then
+	assert_eq!(tester.io.handle_request_sync(&request), Some(response.to_owned()));
+	assert_eq!(tester.signer.requests().len(), 0);
+	assert_eq!(tester.miner.imported_transactions.lock().len(), 0);
+}
+
 #[test]
 fn should_generate_new_token() {
 	// given
diff --git a/rpc/src/v1/types/confirmations.rs b/rpc/src/v1/types/confirmations.rs
index ac1fba4fe..9a6d6837a 100644
--- a/rpc/src/v1/types/confirmations.rs
+++ b/rpc/src/v1/types/confirmations.rs
@@ -129,7 +129,7 @@ pub enum ConfirmationResponse {
 	SendTransaction(H256),
 	/// Transaction RLP
 	SignTransaction(RichRawTransaction),
-	/// Signature
+	/// Signature (encoded as VRS)
 	Signature(H520),
 	/// Decrypted data
 	Decrypt(Bytes),

From 1ed0fedfd5b5e2d3fe9ada9da22e6ca91c64e84c Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Thu, 27 Apr 2017 16:56:27 +0000
Subject: [PATCH 071/117] [ci skip] js-precompiled 20170427-165204

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b87285205..f7d2dfcbe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1778,7 +1778,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#76c40dc32016e1189fd3b35d9cf7b8f53c648162"
+source = "git+https://github.com/paritytech/js-precompiled.git#e2616ff5fba5ee7bf35b9dbd29ea896b2ed8ecea"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 913092d9d..46aee41c7 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.61",
+  "version": "1.7.62",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 81c449fc99e6b4b5208a0be2df4d0781866962d0 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Fri, 28 Apr 2017 01:17:20 +0300
Subject: [PATCH 072/117] update CentOS dockerfile

https://github.com/paritytech/parity/issues/5463
---
 docker/centos/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
index d765c1516..a4b98e9d6 100644
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -6,7 +6,7 @@ RUN yum -y update&& \
 # install rustup
 RUN curl -sSf https://static.rust-lang.org/rustup.sh -o rustup.sh &&\
 ls&&\
- sh rustup.sh -s -- --disable-sudo
+ sh rustup.sh --disable-sudo
 # show backtraces
 ENV RUST_BACKTRACE 1
 # set compiler

From e989e2f12c510b0911c68d9f51af79703086e03f Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Fri, 28 Apr 2017 15:16:40 +0300
Subject: [PATCH 073/117] add artifacts for snap

---
 .gitlab-ci.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ebd8cd900..55e1e51de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,21 +62,20 @@ linux-stable:
     name: "stable-x86_64-unknown-linux-gnu_parity"
 linux-snap:
   stage: build
-  image: ubuntu:latest
+  image: ethcore/snapcraft:latest
   only:
     - snap
-  before_script:
-    - apt install snapcraft
   script:
-    - git submodule update --init --recursive
     - cd scripts
     - snapcraft
-    - sudo snap install *.snap --dangerous
-    - parity -v
   tags:
     - rust
     - rust-stable
+  artifacts:
+    paths:
+    - parity*.snap
   allow_failure: true
+  name: "stable-x86_64-unknown-linux-gnu_parity-snap"
 linux-stable-debian:
   stage: build
   image: ethcore/rust-debian:latest

From a1aaead6a946b580e78f5c8782e977136271e87e Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Fri, 28 Apr 2017 15:19:10 +0300
Subject: [PATCH 074/117] fix CI lint

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55e1e51de..a2ee51c20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,8 +74,8 @@ linux-snap:
   artifacts:
     paths:
     - parity*.snap
+    name: "stable-x86_64-unknown-linux-gnu_parity-snap"
   allow_failure: true
-  name: "stable-x86_64-unknown-linux-gnu_parity-snap"
 linux-stable-debian:
   stage: build
   image: ethcore/rust-debian:latest

From e9ebb2498b9649e724e471f03aa52e926b94b6ce Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Fri, 28 Apr 2017 15:52:58 +0300
Subject: [PATCH 075/117] parity_master_amd64.snap

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2ee51c20..88dcf4b54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,7 +73,7 @@ linux-snap:
     - rust-stable
   artifacts:
     paths:
-    - parity*.snap
+    - parity_master_amd64.snap
     name: "stable-x86_64-unknown-linux-gnu_parity-snap"
   allow_failure: true
 linux-stable-debian:

From 2ecdf111b0e9ca5190fbd52bab02555730c07355 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Fri, 28 Apr 2017 16:45:59 +0300
Subject: [PATCH 076/117] fix path to artefacts

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88dcf4b54..7f4396b3d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,7 @@ linux-snap:
   only:
     - snap
   script:
+    - rm -rf *snap
     - cd scripts
     - snapcraft
   tags:
@@ -73,7 +74,7 @@ linux-snap:
     - rust-stable
   artifacts:
     paths:
-    - parity_master_amd64.snap
+    - scripts/parity_master_amd64.snap
     name: "stable-x86_64-unknown-linux-gnu_parity-snap"
   allow_failure: true
 linux-stable-debian:

From c39da9643e1e67dc28d9ec243e90d6a844985182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Tue, 2 May 2017 11:39:48 +0200
Subject: [PATCH 077/117] Compose transaction RPC. (#5524)

---
 rpc/src/v1/helpers/dispatch.rs      | 54 +++++++++++++++++++++--------
 rpc/src/v1/impls/personal.rs        |  2 +-
 rpc/src/v1/impls/signing.rs         |  8 ++++-
 rpc/src/v1/impls/signing_unsafe.rs  |  6 ++++
 rpc/src/v1/tests/mocked/signing.rs  | 26 ++++++++++++++
 rpc/src/v1/traits/parity_signing.rs |  5 +++
 6 files changed, 84 insertions(+), 17 deletions(-)

diff --git a/rpc/src/v1/helpers/dispatch.rs b/rpc/src/v1/helpers/dispatch.rs
index 5b25c3124..96c38d931 100644
--- a/rpc/src/v1/helpers/dispatch.rs
+++ b/rpc/src/v1/helpers/dispatch.rs
@@ -58,7 +58,7 @@ pub trait Dispatcher: Send + Sync + Clone {
 	// type Out<T>: IntoFuture<T, Error>
 
 	/// Fill optional fields of a transaction request, fetching gas price but not nonce.
-	fn fill_optional_fields(&self, request: TransactionRequest, default_sender: Address)
+	fn fill_optional_fields(&self, request: TransactionRequest, default_sender: Address, force_nonce: bool)
 		-> BoxFuture<FilledTransactionRequest, Error>;
 
 	/// Sign the given transaction request without dispatching, fetching appropriate nonce.
@@ -96,17 +96,30 @@ impl<C, M> Clone for FullDispatcher<C, M> {
 	}
 }
 
+impl<C: MiningBlockChainClient, M: MinerService> FullDispatcher<C, M> {
+	fn fill_nonce(nonce: Option<U256>, from: &Address, miner: &M, client: &C) -> U256 {
+		nonce
+			.or_else(|| miner.last_nonce(from).map(|nonce| nonce + U256::one()))
+			.unwrap_or_else(|| client.latest_nonce(from))
+	}
+}
+
 impl<C: MiningBlockChainClient, M: MinerService> Dispatcher for FullDispatcher<C, M> {
-	fn fill_optional_fields(&self, request: TransactionRequest, default_sender: Address)
+	fn fill_optional_fields(&self, request: TransactionRequest, default_sender: Address, force_nonce: bool)
 		-> BoxFuture<FilledTransactionRequest, Error>
 	{
 		let (client, miner) = (take_weakf!(self.client), take_weakf!(self.miner));
 		let request = request;
+		let from = request.from.unwrap_or(default_sender);
+		let nonce = match force_nonce {
+			false => request.nonce,
+			true => Some(Self::fill_nonce(request.nonce, &from, &miner, &client)),
+		};
 		future::ok(FilledTransactionRequest {
-			from: request.from.unwrap_or(default_sender),
+			from: from,
 			used_default_from: request.from.is_none(),
 			to: request.to,
-			nonce: request.nonce,
+			nonce: nonce,
 			gas_price: request.gas_price.unwrap_or_else(|| default_gas_price(&*client, &*miner)),
 			gas: request.gas.unwrap_or_else(|| miner.sensible_gas_limit()),
 			value: request.value.unwrap_or_else(|| 0.into()),
@@ -123,12 +136,7 @@ impl<C: MiningBlockChainClient, M: MinerService> Dispatcher for FullDispatcher<C
 		let address = filled.from;
 		future::done({
 			let t = Transaction {
-				nonce: filled.nonce
-					.or_else(|| miner
-						.last_nonce(&filled.from)
-						.map(|nonce| nonce + U256::one()))
-					.unwrap_or_else(|| client.latest_nonce(&filled.from)),
-
+				nonce: Self::fill_nonce(filled.nonce, &filled.from, &miner, &client),
 				action: filled.to.map_or(Action::Create, Action::Call),
 				gas: filled.gas,
 				gas_price: filled.gas_price,
@@ -288,18 +296,20 @@ impl LightDispatcher {
 }
 
 impl Dispatcher for LightDispatcher {
-	fn fill_optional_fields(&self, request: TransactionRequest, default_sender: Address)
+	fn fill_optional_fields(&self, request: TransactionRequest, default_sender: Address, force_nonce: bool)
 		-> BoxFuture<FilledTransactionRequest, Error>
 	{
 		const DEFAULT_GAS_PRICE: U256 = U256([0, 0, 0, 21_000_000]);
 
 		let gas_limit = self.client.best_block_header().gas_limit();
 		let request_gas_price = request.gas_price.clone();
+		let request_nonce = request.nonce.clone();
+		let from = request.from.unwrap_or(default_sender);
 
 		let with_gas_price = move |gas_price| {
 			let request = request;
 			FilledTransactionRequest {
-				from: request.from.unwrap_or(default_sender),
+				from: from.clone(),
 				used_default_from: request.from.is_none(),
 				to: request.to,
 				nonce: request.nonce,
@@ -312,7 +322,7 @@ impl Dispatcher for LightDispatcher {
 		};
 
 		// fast path for known gas price.
-		match request_gas_price {
+		let gas_price = match request_gas_price {
 			Some(gas_price) => future::ok(with_gas_price(gas_price)).boxed(),
 			None => fetch_gas_price_corpus(
 				self.sync.clone(),
@@ -323,6 +333,20 @@ impl Dispatcher for LightDispatcher {
 				Some(median) => future::ok(*median),
 				None => future::ok(DEFAULT_GAS_PRICE), // fall back to default on error.
 			}).map(with_gas_price).boxed()
+		};
+
+		match (request_nonce, force_nonce) {
+			(_, false) | (Some(_), true) => gas_price,
+			(None, true) => {
+				let next_nonce = self.next_nonce(from);
+				gas_price.and_then(move |mut filled| next_nonce
+					.map_err(|_| errors::no_light_peers())
+					.map(move |nonce| {
+						filled.nonce = Some(nonce);
+						filled
+					})
+				).boxed()
+			},
 		}
 	}
 
@@ -563,12 +587,12 @@ pub fn from_rpc<D>(payload: RpcConfirmationPayload, default_account: Address, di
 {
 	match payload {
 		RpcConfirmationPayload::SendTransaction(request) => {
-			dispatcher.fill_optional_fields(request.into(), default_account)
+			dispatcher.fill_optional_fields(request.into(), default_account, false)
 				.map(ConfirmationPayload::SendTransaction)
 				.boxed()
 		},
 		RpcConfirmationPayload::SignTransaction(request) => {
-			dispatcher.fill_optional_fields(request.into(), default_account)
+			dispatcher.fill_optional_fields(request.into(), default_account, false)
 				.map(ConfirmationPayload::SignTransaction)
 				.boxed()
 		},
diff --git a/rpc/src/v1/impls/personal.rs b/rpc/src/v1/impls/personal.rs
index 26551df45..6e2be5ecc 100644
--- a/rpc/src/v1/impls/personal.rs
+++ b/rpc/src/v1/impls/personal.rs
@@ -115,7 +115,7 @@ impl<D: Dispatcher + 'static> Personal for PersonalClient<D> {
 			Err(e) => return future::err(e).boxed(),
 		};
 
-		dispatcher.fill_optional_fields(request.into(), default)
+		dispatcher.fill_optional_fields(request.into(), default, false)
 			.and_then(move |filled| {
 				let condition = filled.condition.clone().map(Into::into);
 				dispatcher.sign(accounts, filled, SignWith::Password(password))
diff --git a/rpc/src/v1/impls/signing.rs b/rpc/src/v1/impls/signing.rs
index 376418ead..ccbaeac78 100644
--- a/rpc/src/v1/impls/signing.rs
+++ b/rpc/src/v1/impls/signing.rs
@@ -27,7 +27,7 @@ use jsonrpc_core::Error;
 use v1::helpers::{
 	errors, oneshot,
 	DefaultAccount,
-	SIGNING_QUEUE_LIMIT, SigningQueue, ConfirmationPromise, ConfirmationResult, SignerService
+	SIGNING_QUEUE_LIMIT, SigningQueue, ConfirmationPromise, ConfirmationResult, SignerService,
 };
 use v1::helpers::dispatch::{self, Dispatcher};
 use v1::helpers::accounts::unwrap_provider;
@@ -137,6 +137,12 @@ impl<D: Dispatcher + 'static> SigningQueueClient<D> {
 impl<D: Dispatcher + 'static> ParitySigning for SigningQueueClient<D> {
 	type Metadata = Metadata;
 
+	fn compose_transaction(&self, meta: Metadata, transaction: RpcTransactionRequest) -> BoxFuture<RpcTransactionRequest, Error> {
+		let accounts = try_bf!(self.account_provider());
+		let default_account = accounts.dapp_default_address(meta.dapp_id().into()).ok().unwrap_or_default();
+		self.dispatcher.fill_optional_fields(transaction.into(), default_account, true).map(Into::into).boxed()
+	}
+
 	fn post_sign(&self, meta: Metadata, address: RpcH160, data: RpcBytes) -> BoxFuture<RpcEither<RpcU256, RpcConfirmationResponse>, Error> {
 		let pending = self.pending.clone();
 		self.dispatch(
diff --git a/rpc/src/v1/impls/signing_unsafe.rs b/rpc/src/v1/impls/signing_unsafe.rs
index 6fb483c5e..0cb50ac3c 100644
--- a/rpc/src/v1/impls/signing_unsafe.rs
+++ b/rpc/src/v1/impls/signing_unsafe.rs
@@ -111,6 +111,12 @@ impl<D: Dispatcher + 'static> EthSigning for SigningUnsafeClient<D>
 impl<D: Dispatcher + 'static> ParitySigning for SigningUnsafeClient<D> {
 	type Metadata = Metadata;
 
+	fn compose_transaction(&self, meta: Metadata, transaction: RpcTransactionRequest) -> BoxFuture<RpcTransactionRequest, Error> {
+		let accounts = try_bf!(self.account_provider());
+		let default_account = accounts.dapp_default_address(meta.dapp_id().into()).ok().unwrap_or_default();
+		self.dispatcher.fill_optional_fields(transaction.into(), default_account, true).map(Into::into).boxed()
+	}
+
 	fn decrypt_message(&self, _: Metadata, address: RpcH160, data: RpcBytes) -> BoxFuture<RpcBytes, Error> {
 		self.handle(RpcConfirmationPayload::Decrypt((address.clone(), data).into()), address.into())
 			.then(|res| match res {
diff --git a/rpc/src/v1/tests/mocked/signing.rs b/rpc/src/v1/tests/mocked/signing.rs
index 9307d95b6..6f6380abb 100644
--- a/rpc/src/v1/tests/mocked/signing.rs
+++ b/rpc/src/v1/tests/mocked/signing.rs
@@ -439,3 +439,29 @@ fn should_add_decryption_to_the_queue() {
 	let res = promise.wait().unwrap();
 	assert_eq!(res, Some(response.to_owned()));
 }
+
+#[test]
+fn should_compose_transaction() {
+	// given
+	let tester = eth_signing();
+	let acc = Random.generate().unwrap();
+	assert_eq!(tester.signer.requests().len(), 0);
+	let from = format!("{:?}", acc.address());
+
+	// when
+	let request = r#"{
+		"jsonrpc": "2.0",
+		"method": "parity_composeTransaction",
+		"params": [{"from":"0x"#.to_owned() + &from + r#"","value":"0x5"}],
+		"id": 1
+	}"#;
+
+	let response = r#"{"jsonrpc":"2.0","result":{"condition":null,"data":"0x","from":"0x"#.to_owned()
+		+ &from
+		+ r#"","gas":"0x5208","gasPrice":"0x4a817c800","nonce":"0x0","to":null,"value":"0x5"},"id":1}"#;
+
+
+	// then
+	let res = tester.io.handle_request(&request).wait().unwrap();
+	assert_eq!(res, Some(response.to_owned()));
+}
diff --git a/rpc/src/v1/traits/parity_signing.rs b/rpc/src/v1/traits/parity_signing.rs
index 372c31fb2..344a477c4 100644
--- a/rpc/src/v1/traits/parity_signing.rs
+++ b/rpc/src/v1/traits/parity_signing.rs
@@ -25,6 +25,11 @@ build_rpc_trait! {
 	pub trait ParitySigning {
 		type Metadata;
 
+		/// Given partial transaction request produces transaction with all fields filled in.
+		/// Such transaction can be then signed externally.
+		#[rpc(meta, name = "parity_composeTransaction")]
+		fn compose_transaction(&self, Self::Metadata, TransactionRequest) -> BoxFuture<TransactionRequest, Error>;
+
 		/// Posts sign request asynchronously.
 		/// Will return a confirmation ID for later use with check_transaction.
 		#[rpc(meta, name = "parity_postSign")]

From da2f684f1863027ba44a85f332a70a752d2f80f8 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Tue, 2 May 2017 11:40:03 +0200
Subject: [PATCH 078/117] Memory usage optimization (#5526)

---
 Cargo.lock              |  4 ++--
 ethash/src/compute.rs   |  3 +--
 parity/cache.rs         |  8 ++++----
 parity/cli/mod.rs       |  6 +++---
 parity/configuration.rs | 10 +++++-----
 util/src/kvdb.rs        |  3 +++
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f7d2dfcbe..5080484d9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2044,7 +2044,7 @@ dependencies = [
 [[package]]
 name = "rocksdb"
 version = "0.4.5"
-source = "git+https://github.com/paritytech/rust-rocksdb#8579e896a98cdeff086392236d411dd4aa141774"
+source = "git+https://github.com/paritytech/rust-rocksdb#acd192f6ee017a3e8be704958617349d20ee783b"
 dependencies = [
  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "rocksdb-sys 0.3.0 (git+https://github.com/paritytech/rust-rocksdb)",
@@ -2053,7 +2053,7 @@ dependencies = [
 [[package]]
 name = "rocksdb-sys"
 version = "0.3.0"
-source = "git+https://github.com/paritytech/rust-rocksdb#8579e896a98cdeff086392236d411dd4aa141774"
+source = "git+https://github.com/paritytech/rust-rocksdb#acd192f6ee017a3e8be704958617349d20ee783b"
 dependencies = [
  "gcc 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ethash/src/compute.rs b/ethash/src/compute.rs
index 69a46308d..992578041 100644
--- a/ethash/src/compute.rs
+++ b/ethash/src/compute.rs
@@ -123,7 +123,7 @@ impl Light {
 			return Err(io::Error::new(io::ErrorKind::Other, "Cache file size mismatch"));
 		}
 		let num_nodes = cache_size / NODE_BYTES;
-		let mut nodes: Vec<Node> = Vec::new();
+		let mut nodes: Vec<Node> = Vec::with_capacity(num_nodes);
 		nodes.resize(num_nodes, unsafe { mem::uninitialized() });
 		let buf = unsafe { slice::from_raw_parts_mut(nodes.as_mut_ptr() as *mut u8, cache_size) };
 		file.read_exact(buf)?;
@@ -342,7 +342,6 @@ fn calculate_dag_item(node_index: u32, cache: &[Node]) -> Node {
 }
 
 fn light_new(block_number: u64) -> Light {
-
 	let seed_compute = SeedHashCompute::new();
 	let seedhash = seed_compute.get_seedhash(block_number);
 	let cache_size = get_cache_size(block_number);
diff --git a/parity/cache.rs b/parity/cache.rs
index 4351838fc..8784ffa3d 100644
--- a/parity/cache.rs
+++ b/parity/cache.rs
@@ -19,7 +19,7 @@ use std::cmp::max;
 const MIN_BC_CACHE_MB: u32 = 4;
 const MIN_DB_CACHE_MB: u32 = 2;
 const MIN_BLOCK_QUEUE_SIZE_LIMIT_MB: u32 = 16;
-const DEFAULT_BLOCK_QUEUE_SIZE_LIMIT_MB: u32 = 50;
+const DEFAULT_BLOCK_QUEUE_SIZE_LIMIT_MB: u32 = 40;
 const DEFAULT_TRACE_CACHE_SIZE: u32 = 20;
 const DEFAULT_STATE_CACHE_SIZE: u32 = 25;
 
@@ -41,7 +41,7 @@ pub struct CacheConfig {
 
 impl Default for CacheConfig {
 	fn default() -> Self {
-		CacheConfig::new(64, 8, DEFAULT_BLOCK_QUEUE_SIZE_LIMIT_MB, DEFAULT_STATE_CACHE_SIZE)
+		CacheConfig::new(32, 8, DEFAULT_BLOCK_QUEUE_SIZE_LIMIT_MB, DEFAULT_STATE_CACHE_SIZE)
 	}
 }
 
@@ -113,7 +113,7 @@ mod tests {
 		let config = CacheConfig::new_with_total_cache_size(200);
 		assert_eq!(config.db, 140);
 		assert_eq!(config.blockchain(), 20);
-		assert_eq!(config.queue(), 50);
+		assert_eq!(config.queue(), 40);
 		assert_eq!(config.state(), 30);
 		assert_eq!(config.jump_tables(), 10);
 	}
@@ -129,6 +129,6 @@ mod tests {
 	#[test]
 	fn test_cache_config_default() {
 		assert_eq!(CacheConfig::default(),
-			CacheConfig::new(64, 8, super::DEFAULT_BLOCK_QUEUE_SIZE_LIMIT_MB, super::DEFAULT_STATE_CACHE_SIZE));
+			CacheConfig::new(32, 8, super::DEFAULT_BLOCK_QUEUE_SIZE_LIMIT_MB, super::DEFAULT_STATE_CACHE_SIZE));
 	}
 }
diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs
index ed1b6526f..05627b90b 100644
--- a/parity/cli/mod.rs
+++ b/parity/cli/mod.rs
@@ -294,13 +294,13 @@ usage! {
 			or |c: &Config| otry!(c.footprint).pruning.clone(),
 		flag_pruning_history: u64 = 64u64,
 			or |c: &Config| otry!(c.footprint).pruning_history.clone(),
-		flag_pruning_memory: usize = 75usize,
+		flag_pruning_memory: usize = 32usize,
 			or |c: &Config| otry!(c.footprint).pruning_memory.clone(),
-		flag_cache_size_db: u32 = 64u32,
+		flag_cache_size_db: u32 = 32u32,
 			or |c: &Config| otry!(c.footprint).cache_size_db.clone(),
 		flag_cache_size_blocks: u32 = 8u32,
 			or |c: &Config| otry!(c.footprint).cache_size_blocks.clone(),
-		flag_cache_size_queue: u32 = 50u32,
+		flag_cache_size_queue: u32 = 40u32,
 			or |c: &Config| otry!(c.footprint).cache_size_queue.clone(),
 		flag_cache_size_state: u32 = 25u32,
 			or |c: &Config| otry!(c.footprint).cache_size_state.clone(),
diff --git a/parity/configuration.rs b/parity/configuration.rs
index 61748018d..356be8025 100644
--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@@ -1124,7 +1124,7 @@ mod tests {
 			format: Default::default(),
 			pruning: Default::default(),
 			pruning_history: 64,
-			pruning_memory: 75,
+			pruning_memory: 32,
 			compaction: Default::default(),
 			wal: true,
 			tracing: Default::default(),
@@ -1147,7 +1147,7 @@ mod tests {
 			file_path: Some("blockchain.json".into()),
 			pruning: Default::default(),
 			pruning_history: 64,
-			pruning_memory: 75,
+			pruning_memory: 32,
 			format: Default::default(),
 			compaction: Default::default(),
 			wal: true,
@@ -1170,7 +1170,7 @@ mod tests {
 			file_path: Some("state.json".into()),
 			pruning: Default::default(),
 			pruning_history: 64,
-			pruning_memory: 75,
+			pruning_memory: 32,
 			format: Default::default(),
 			compaction: Default::default(),
 			wal: true,
@@ -1195,7 +1195,7 @@ mod tests {
 			file_path: Some("blockchain.json".into()),
 			pruning: Default::default(),
 			pruning_history: 64,
-			pruning_memory: 75,
+			pruning_memory: 32,
 			format: Some(DataFormat::Hex),
 			compaction: Default::default(),
 			wal: true,
@@ -1231,7 +1231,7 @@ mod tests {
 			spec: Default::default(),
 			pruning: Default::default(),
 			pruning_history: 64,
-			pruning_memory: 75,
+			pruning_memory: 32,
 			daemon: None,
 			logger_config: Default::default(),
 			miner_options: Default::default(),
diff --git a/util/src/kvdb.rs b/util/src/kvdb.rs
index 084969f30..dbadc0593 100644
--- a/util/src/kvdb.rs
+++ b/util/src/kvdb.rs
@@ -35,6 +35,7 @@ use std::fs::File;
 
 const DB_BACKGROUND_FLUSHES: i32 = 2;
 const DB_BACKGROUND_COMPACTIONS: i32 = 2;
+const DB_WRITE_BUFFER_SIZE: usize = 2048 * 1000;
 
 /// Required length of prefixes.
 pub const PREFIX_LEN: usize = 12;
@@ -440,6 +441,7 @@ fn col_config(col: u32, config: &DatabaseConfig) -> Options {
 	opts.set_compaction_style(DBCompactionStyle::DBUniversalCompaction);
 	opts.set_target_file_size_base(config.compaction.initial_file_size);
 	opts.set_target_file_size_multiplier(config.compaction.file_size_multiplier);
+	opts.set_db_write_buffer_size(DB_WRITE_BUFFER_SIZE);
 
 	let col_opt = config.columns.map(|_| col);
 
@@ -487,6 +489,7 @@ impl Database {
 		opts.set_max_open_files(config.max_open_files);
 		opts.create_if_missing(true);
 		opts.set_use_fsync(false);
+		opts.set_db_write_buffer_size(DB_WRITE_BUFFER_SIZE);
 
 		opts.set_max_background_flushes(DB_BACKGROUND_FLUSHES);
 		opts.set_max_background_compactions(DB_BACKGROUND_COMPACTIONS);

From 02b54ff7e8688f757e51628bb2536b99d21488d9 Mon Sep 17 00:00:00 2001
From: Rien <maertensrien@gmail.com>
Date: Tue, 2 May 2017 11:41:09 +0200
Subject: [PATCH 079/117] find . -type f -not -path './.*' -exec sed -i -e
 "s/ethcore\.io/parity.io/g" {} \; (#5528)

---
 README.md                                     |  4 ++--
 hash-fetch/src/client.rs                      |  2 +-
 hash-fetch/src/urlhint.rs                     | 12 +++++------
 .../email-verification/terms-of-service.js    |  2 +-
 .../sms-verification/terms-of-service.js      |  2 +-
 js/src/lib.rs.in                              |  2 +-
 js/src/modals/FirstRun/TnC/tnc.js             |  6 +++---
 js/src/views/Dapps/builtin.json               | 20 +++++++++----------
 parity/configuration.rs                       | 12 +++++------
 rpc/src/v1/tests/mocked/parity_set.rs         |  2 +-
 rpc_cli/Cargo.toml                            |  4 ++--
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index c74b51a58..a21e6eeb9 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-# [Parity](https://ethcore.io/parity.html)
+# [Parity](https://parity.io/parity.html)
 ### Fast, light, and robust Ethereum implementation
 
 ### [Download latest release](https://github.com/paritytech/parity/releases)
 
-[![build status](https://gitlab.ethcore.io/parity/parity/badges/master/build.svg)](https://gitlab.ethcore.io/parity/parity/commits/master) [![Coverage Status][coveralls-image]][coveralls-url]  [![GPLv3][license-image]][license-url]
+[![build status](https://gitlab.parity.io/parity/parity/badges/master/build.svg)](https://gitlab.parity.io/parity/parity/commits/master) [![Coverage Status][coveralls-image]][coveralls-url]  [![GPLv3][license-image]][license-url]
 
 ### Join the chat!
 
diff --git a/hash-fetch/src/client.rs b/hash-fetch/src/client.rs
index 40682a89c..958fc7aa2 100644
--- a/hash-fetch/src/client.rs
+++ b/hash-fetch/src/client.rs
@@ -211,7 +211,7 @@ mod tests {
 		}
 
 		fn fetch_with_abort(&self, url: &str, _abort: fetch::Abort) -> Self::Result {
-			assert_eq!(url, "https://ethcore.io/assets/images/ethcore-black-horizontal.png");
+			assert_eq!(url, "https://parity.io/assets/images/ethcore-black-horizontal.png");
 			future::ok(if self.return_success {
 				let cursor = ::std::io::Cursor::new(b"result");
 				fetch::Response::from_reader(cursor)
diff --git a/hash-fetch/src/urlhint.rs b/hash-fetch/src/urlhint.rs
index 579c83845..156420dad 100644
--- a/hash-fetch/src/urlhint.rs
+++ b/hash-fetch/src/urlhint.rs
@@ -370,7 +370,7 @@ pub mod tests {
 
 		// then
 		assert_eq!(res, Some(URLHintResult::Content(Content {
-			url: "https://ethcore.io/assets/images/ethcore-black-horizontal.png".into(),
+			url: "https://parity.io/assets/images/ethcore-black-horizontal.png".into(),
 			mime: mime!(Image/Png),
 			owner: Address::from_str("deadcafebeefbeefcafedeaddeedfeedffffffff").unwrap(),
 		})))
@@ -395,11 +395,11 @@ pub mod tests {
 
 	#[test]
 	fn should_guess_mime_type_from_url() {
-		let url1 = "https://ethcore.io/parity";
-		let url2 = "https://ethcore.io/parity#content-type=image/png";
-		let url3 = "https://ethcore.io/parity#something&content-type=image/png";
-		let url4 = "https://ethcore.io/parity.png#content-type=image/jpeg";
-		let url5 = "https://ethcore.io/parity.png";
+		let url1 = "https://parity.io/parity";
+		let url2 = "https://parity.io/parity#content-type=image/png";
+		let url3 = "https://parity.io/parity#something&content-type=image/png";
+		let url4 = "https://parity.io/parity.png#content-type=image/jpeg";
+		let url5 = "https://parity.io/parity.png";
 
 
 		assert_eq!(guess_mime_type(url1), None);
diff --git a/js/src/3rdparty/email-verification/terms-of-service.js b/js/src/3rdparty/email-verification/terms-of-service.js
index c5deb7ee4..8826be032 100644
--- a/js/src/3rdparty/email-verification/terms-of-service.js
+++ b/js/src/3rdparty/email-verification/terms-of-service.js
@@ -22,6 +22,6 @@ export default (
     <li>We collect your email address when you use this service. This is temporarily kept in memory, and then encrypted and stored in our EU servers. We only retain the cryptographic hash of the email address to prevent duplicated accounts. The cryptographic hash of your email address is also stored on the blockchain which is public by design. You consent to this use.</li>
     <li>You pay a fee for the cost of this service using the account you want to verify.</li>
     <li>Your email address is transmitted to a third party EU email verification service mailjet for the sole purpose of the email verification. You consent to this use. Mailjet's privacy policy is here: <a href='https://www.mailjet.com/privacy-policy'>https://www.mailjet.com/privacy-policy</a>.</li>
-    <li><i>Parity Technology Limited</i> is registered in England and Wales under company number <code>09760015</code> and complies with the Data Protection Act 1998 (UK). You may contact us via email at <a href={ 'mailto:admin@parity.io' }>admin@parity.io</a>. Our general privacy policy can be found here: <a href={ 'https://ethcore.io/legal.html' }>https://ethcore.io/legal.html</a>.</li>
+    <li><i>Parity Technology Limited</i> is registered in England and Wales under company number <code>09760015</code> and complies with the Data Protection Act 1998 (UK). You may contact us via email at <a href={ 'mailto:admin@parity.io' }>admin@parity.io</a>. Our general privacy policy can be found here: <a href={ 'https://parity.io/legal.html' }>https://parity.io/legal.html</a>.</li>
   </ul>
 );
diff --git a/js/src/3rdparty/sms-verification/terms-of-service.js b/js/src/3rdparty/sms-verification/terms-of-service.js
index 98acd2599..9451a382b 100644
--- a/js/src/3rdparty/sms-verification/terms-of-service.js
+++ b/js/src/3rdparty/sms-verification/terms-of-service.js
@@ -22,6 +22,6 @@ export default (
     <li>We collect your phone number when you use this service. This is temporarily kept in memory, and then encrypted and stored in our EU servers. We only retain the cryptographic hash of the number to prevent duplicated accounts. You consent to this use.</li>
     <li>You pay a fee for the cost of this service using the account you want to verify.</li>
     <li>Your phone number is transmitted to a third party US SMS verification service Twilio for the sole purpose of the SMS verification. You consent to this use. Twilio’s privacy policy is here: <a href={ 'https://www.twilio.com/legal/privacy/developer' }>https://www.twilio.com/legal/privacy/developer</a>.</li>
-    <li><i>Parity Technology Limited</i> is registered in England and Wales under company number <code>09760015</code> and complies with the Data Protection Act 1998 (UK). You may contact us via email at <a href={ 'mailto:admin@parity.io' }>admin@parity.io</a>. Our general privacy policy can be found here: <a href={ 'https://ethcore.io/legal.html' }>https://ethcore.io/legal.html</a>.</li>
+    <li><i>Parity Technology Limited</i> is registered in England and Wales under company number <code>09760015</code> and complies with the Data Protection Act 1998 (UK). You may contact us via email at <a href={ 'mailto:admin@parity.io' }>admin@parity.io</a>. Our general privacy policy can be found here: <a href={ 'https://parity.io/legal.html' }>https://parity.io/legal.html</a>.</li>
   </ul>
 );
diff --git a/js/src/lib.rs.in b/js/src/lib.rs.in
index 42d25c995..2dabd46c5 100644
--- a/js/src/lib.rs.in
+++ b/js/src/lib.rs.in
@@ -42,7 +42,7 @@ impl WebApp for App {
 		Info {
 			name: "Parity UI",
 			version: env!("CARGO_PKG_VERSION"),
-			author: "Ethcore <admin@ethcore.io>",
+			author: "Ethcore <admin@parity.io>",
 			description: "New UI for Parity.",
 			icon_url: "icon.png",
 		}
diff --git a/js/src/modals/FirstRun/TnC/tnc.js b/js/src/modals/FirstRun/TnC/tnc.js
index 195401b7e..51b70f8dc 100644
--- a/js/src/modals/FirstRun/TnC/tnc.js
+++ b/js/src/modals/FirstRun/TnC/tnc.js
@@ -76,7 +76,7 @@ export default class TnC extends Component {
         <p>You agree that you are solely responsible for (and that EthCore has no responsibility to you or to any third party for) any breach of your obligations under these terms and for the consequences (including any loss or damage which EthCore may suffer) of any such breach.</p>
 
         <h3>Privacy and your personal information</h3>
-        <p>You agree to the use of your data (if any is gathered) in accordance with EthCore’s privacy policies: <a href='https://ethcore.io/legal.html' target='_blank'>https://ethcore.io/legal.html</a>. This policy explains how EthCore treats your personal information (if any is gathered), and protects your privacy, when you use EthCore’s Products.</p>
+        <p>You agree to the use of your data (if any is gathered) in accordance with EthCore’s privacy policies: <a href='https://parity.io/legal.html' target='_blank'>https://parity.io/legal.html</a>. This policy explains how EthCore treats your personal information (if any is gathered), and protects your privacy, when you use EthCore’s Products.</p>
 
         <h3>Content in Parity</h3>
         <p>You understand that all information and data (such as smart contracts, data files, written text, computer software, music, audio files or other sounds, photographs, videos or other images) which you may have access to as part of, or through your use of, EthCore’s Product are the sole responsibility of the person from which such content originated. All such information is referred to below as the “Content”.</p>
@@ -87,7 +87,7 @@ export default class TnC extends Component {
         <h3>Proprietary rights</h3>
         <p>You acknowledge and agree that EthCore own all legal right, title and interest in and to the Parity and EthCore’s Products, including any intellectual property rights which subsist in Parity and EthCore’s Products (whether those rights happen to be registered or not, and wherever in the world those rights may exist).</p>
         <p>Unless you have agreed otherwise in writing with EthCore, nothing in the Terms gives you a right to use any of EthCore’s trade names, trade marks, service marks, logos, domain names, and other distinctive brand features.</p>
-        <p>If you have been given an explicit right to use any of these brand features in a separate written agreement with EthCore, then you agree that your use of such features shall be in compliance with that agreement, any applicable provisions of these terms, and EthCore’s brand feature use guidelines as updated from time to time. These guidelines can be viewed online at <a href='https://ethcore.io/press.html' target='_blank'>https://ethcore.io/press.html</a>.</p>
+        <p>If you have been given an explicit right to use any of these brand features in a separate written agreement with EthCore, then you agree that your use of such features shall be in compliance with that agreement, any applicable provisions of these terms, and EthCore’s brand feature use guidelines as updated from time to time. These guidelines can be viewed online at <a href='https://parity.io/press.html' target='_blank'>https://parity.io/press.html</a>.</p>
         <p>EthCore acknowledges and agrees that it obtains no right, title or interest from you (or your licensors) under these terms in or to any content that you submit, post, transmit or display on, or through, Parity, including any intellectual property rights which subsist in that content (whether those rights happen to be registered or not, and wherever in the world those rights may exist). Unless you have agreed otherwise in writing with EthCore, you agree that you are responsible for protecting and enforcing those rights and that EthCore has no obligation to do so on your behalf.</p>
         <p>You agree that you shall not remove, obscure, or alter any proprietary rights notices (including copyright and trade mark notices) which may be affixed to or contained within Parity or EthCore’s Products.</p>
         <p>Unless you have been expressly authorized to do so in writing by EthCore, you agree that in using Parity, you will not use any trade mark, service mark, trade name, logo of any company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos.</p>
@@ -145,7 +145,7 @@ export default class TnC extends Component {
         <p>You acknowledge and agree that EthCore is not liable for any loss or damage which may be incurred by you as a result of the availability of those external sites or resources, or as a result of any reliance placed by you on the completeness, accuracy or existence of any advertising, products or other materials on, or available from, such web sites or resources.</p>
 
         <h3>Changes to the Terms</h3>
-        <p>EthCore may make changes to these from time to time. When these changes are made, EthCore will make a new copy of these terms available at https://ethcore.io/legal.html and any new terms will be made available to you from within, or through, the affected EthCore’s Product.</p>
+        <p>EthCore may make changes to these from time to time. When these changes are made, EthCore will make a new copy of these terms available at https://parity.io/legal.html and any new terms will be made available to you from within, or through, the affected EthCore’s Product.</p>
         <p>You understand and agree that if you use Parity or EthCore’s Products after the date on which the Terms have changed, EthCore will treat your use as acceptance of the updated terms.</p>
 
         <h3>General legal terms</h3>
diff --git a/js/src/views/Dapps/builtin.json b/js/src/views/Dapps/builtin.json
index 673b4acd3..e223730eb 100644
--- a/js/src/views/Dapps/builtin.json
+++ b/js/src/views/Dapps/builtin.json
@@ -3,7 +3,7 @@
     "url": "chaindeploy",
     "name": "Chain Deployment",
     "description": "Deploy all basic contracts, names & applications to the network",
-    "author": "Parity Team <admin@ethcore.io>",
+    "author": "Parity Team <admin@parity.io>",
     "version": "1.0.0",
     "visible": false
   },
@@ -12,7 +12,7 @@
     "url": "tokendeploy",
     "name": "Token Deployment",
     "description": "Deploy new basic tokens that you are able to send around",
-    "author": "Parity Team <admin@ethcore.io>",
+    "author": "Parity Team <admin@parity.io>",
     "version": "1.0.0",
     "visible": true
   },
@@ -21,7 +21,7 @@
     "url": "registry",
     "name": "Registry",
     "description": "A global registry of addresses on the network",
-    "author": "Parity Team <admin@ethcore.io>",
+    "author": "Parity Team <admin@parity.io>",
     "version": "1.0.0",
     "visible": true
   },
@@ -30,7 +30,7 @@
     "url": "tokenreg",
     "name": "Token Registry",
     "description": "A registry of transactable tokens on the network",
-    "author": "Parity Team <admin@ethcore.io>",
+    "author": "Parity Team <admin@parity.io>",
     "version": "1.0.0",
     "visible": true,
     "secure": true
@@ -40,7 +40,7 @@
     "url": "signaturereg",
     "name": "Method Registry",
     "description": "A registry of method signatures for lookups on transactions",
-    "author": "Parity Team <admin@ethcore.io>",
+    "author": "Parity Team <admin@parity.io>",
     "version": "1.0.0",
     "visible": true
   },
@@ -49,7 +49,7 @@
     "url": "githubhint",
     "name": "GitHub Hint",
     "description": "A mapping of GitHub URLs to hashes for use in contracts as references",
-    "author": "Parity Team <admin@ethcore.io>",
+    "author": "Parity Team <admin@parity.io>",
     "version": "1.0.0",
     "visible": false,
     "secure": true
@@ -59,7 +59,7 @@
     "url": "localtx",
     "name": "TxQueue Viewer",
     "description": "Have a peek at the internals of your node's transaction queue",
-    "author": "Parity Team <admin@ethcore.io>",
+    "author": "Parity Team <admin@parity.io>",
     "version": "1.0.0",
     "visible": true,
     "secure": true
@@ -69,7 +69,7 @@
     "url": "dappreg",
     "name": "Dapp Registration",
     "description": "Enables the registration and content management of dapps on the network",
-    "author": "Parity Team <admin@ethcore.io>",
+    "author": "Parity Team <admin@parity.io>",
     "version": "1.0.0",
     "visible": false,
     "secure": true
@@ -79,7 +79,7 @@
     "url": "web",
     "name": "Browser",
     "description": "A Web 2.0 hosted pseudo-dapps browser",
-    "author": "Parity Team <admin@ethcore.io>",
+    "author": "Parity Team <admin@parity.io>",
     "version": "1.0.0",
     "visible": true,
     "skipBuild": true,
@@ -91,7 +91,7 @@
     "name": "Parity/Web3 console",
     "description": "A Javascript development console complete with web3 and parity objects",
     "version": "0.3",
-    "author": "Gav Wood <gavin@ethcore.io>",
+    "author": "Gav Wood <gavin@parity.io>",
     "position": "top-right",
     "visible": true,
     "secure": true,
diff --git a/parity/configuration.rs b/parity/configuration.rs
index 356be8025..3c3c591c1 100644
--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@@ -1369,13 +1369,13 @@ mod tests {
 		let conf0 = parse(&["parity"]);
 		let conf1 = parse(&["parity", "--jsonrpc-hosts", "none"]);
 		let conf2 = parse(&["parity", "--jsonrpc-hosts", "all"]);
-		let conf3 = parse(&["parity", "--jsonrpc-hosts", "ethcore.io,something.io"]);
+		let conf3 = parse(&["parity", "--jsonrpc-hosts", "parity.io,something.io"]);
 
 		// then
 		assert_eq!(conf0.rpc_hosts(), Some(Vec::new()));
 		assert_eq!(conf1.rpc_hosts(), Some(Vec::new()));
 		assert_eq!(conf2.rpc_hosts(), None);
-		assert_eq!(conf3.rpc_hosts(), Some(vec!["ethcore.io".into(), "something.io".into()]));
+		assert_eq!(conf3.rpc_hosts(), Some(vec!["parity.io".into(), "something.io".into()]));
 	}
 
 	#[test]
@@ -1386,13 +1386,13 @@ mod tests {
 		let conf0 = parse(&["parity"]);
 		let conf1 = parse(&["parity", "--ipfs-api-hosts", "none"]);
 		let conf2 = parse(&["parity", "--ipfs-api-hosts", "all"]);
-		let conf3 = parse(&["parity", "--ipfs-api-hosts", "ethcore.io,something.io"]);
+		let conf3 = parse(&["parity", "--ipfs-api-hosts", "parity.io,something.io"]);
 
 		// then
 		assert_eq!(conf0.ipfs_hosts(), Some(Vec::new()));
 		assert_eq!(conf1.ipfs_hosts(), Some(Vec::new()));
 		assert_eq!(conf2.ipfs_hosts(), None);
-		assert_eq!(conf3.ipfs_hosts(), Some(vec!["ethcore.io".into(), "something.io".into()]));
+		assert_eq!(conf3.ipfs_hosts(), Some(vec!["parity.io".into(), "something.io".into()]));
 	}
 
 	#[test]
@@ -1402,12 +1402,12 @@ mod tests {
 		// when
 		let conf0 = parse(&["parity"]);
 		let conf1 = parse(&["parity", "--ipfs-api-cors", "*"]);
-		let conf2 = parse(&["parity", "--ipfs-api-cors", "http://ethcore.io,http://something.io"]);
+		let conf2 = parse(&["parity", "--ipfs-api-cors", "http://parity.io,http://something.io"]);
 
 		// then
 		assert_eq!(conf0.ipfs_cors(), None);
 		assert_eq!(conf1.ipfs_cors(), Some(vec!["*".into()]));
-		assert_eq!(conf2.ipfs_cors(), Some(vec!["http://ethcore.io".into(),"http://something.io".into()]));
+		assert_eq!(conf2.ipfs_cors(), Some(vec!["http://parity.io".into(),"http://something.io".into()]));
 	}
 
 	#[test]
diff --git a/rpc/src/v1/tests/mocked/parity_set.rs b/rpc/src/v1/tests/mocked/parity_set.rs
index 4383ee560..0e2d6ab27 100644
--- a/rpc/src/v1/tests/mocked/parity_set.rs
+++ b/rpc/src/v1/tests/mocked/parity_set.rs
@@ -198,7 +198,7 @@ fn rpc_parity_set_hash_content() {
 	let mut io = IoHandler::new();
 	io.extend_with(parity_set_client(&client, &miner, &updater, &network).to_delegate());
 
-	let request = r#"{"jsonrpc": "2.0", "method": "parity_hashContent", "params":["https://ethcore.io/assets/images/ethcore-black-horizontal.png"], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_hashContent", "params":["https://parity.io/assets/images/ethcore-black-horizontal.png"], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":"0x2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e","id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
diff --git a/rpc_cli/Cargo.toml b/rpc_cli/Cargo.toml
index bb3588015..ed53bcc16 100644
--- a/rpc_cli/Cargo.toml
+++ b/rpc_cli/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
-authors = ["Ethcore <admin@ethcore.io>"]
+authors = ["Ethcore <admin@parity.io>"]
 description = "Parity Cli Tool"
-homepage = "http://ethcore.io"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "rpc-cli"
 version = "1.4.0"

From 77c8d588fa028d6f292bb6e46cd93f7c401cf637 Mon Sep 17 00:00:00 2001
From: Afri <afri@parity.io>
Date: Tue, 2 May 2017 12:08:48 +0200
Subject: [PATCH 080/117] Add CHANGELOG.md (#5513)

* Add CHANGELOG.md

* Add some more verbose CHANGELOG information for beta and stable releases

* Add dates to releases
---
 CHANGELOG.md | 3842 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 3842 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..b52c4e1f3
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,3842 @@
+## Parity [v1.6.6](https://github.com/paritytech/parity/releases/tag/v1.6.6) (2017-04-11)
+
+This release brings warp sync support for kovan network.
+
+- Beta Backports [#5434](https://github.com/paritytech/parity/pull/5434)
+  - Bump to v1.6.6
+  - Strict validation transitions [#4988](https://github.com/paritytech/parity/pull/4988)
+    - Ability to make validation stricter
+    - Fix consensus
+    - Remove logger
+  - Fix eth_sign showing as wallet account [#5309](https://github.com/paritytech/parity/pull/5309)
+    - DefaultProps for account
+    - Pass signing account
+    - Update tests for Connect(...)
+  - Add new seed nodes [#5345](https://github.com/paritytech/parity/pull/5345)
+  - Kovan warp sync fixed
+- Aura eip155 validation transition [#5363](https://github.com/paritytech/parity/pull/5363)
+  - Add eip155 validation
+  - Add transition block
+- Default eip155 validation [#5350](https://github.com/paritytech/parity/pull/5350)
+- Backport syntax libs update [#5316](https://github.com/paritytech/parity/pull/5316)
+
+## Parity [v1.6.5](https://github.com/paritytech/parity/releases/tag/v1.6.5) (2017-03-28)
+
+This release contains the following changes:
+
+- Warp sync snapshot format improvements.
+- Fix for Firefox UI issues.
+- Fix for restoring from a file snapshot.
+- Fix for auto-updater error handling.
+- Updated configuration for [Ropsten revival](https://github.com/ethereum/ropsten/blob/master/revival.md). Make sure to delete old Ropsten blockchain first with `parity db kill --chain ropsten`. After that you can sync normally with `parity --chain ropsten`.
+
+Full changes:
+
+- Beta Backports [#5299](https://github.com/paritytech/parity/pull/5299)
+  - Fix FireFox overflows [#5000](https://github.com/paritytech/parity/pull/5000)
+    - Max width for container
+    - Set min-width
+  - Switching ValidatorSet [#4961](https://github.com/paritytech/parity/pull/4961)
+    - Add multi validator set
+    - Nicer comment
+    - Validate in constructor
+    - Reporting
+  - Avoid clogging up tmp when updater dir has bad permissions. [#5024](https://github.com/paritytech/parity/pull/5024)
+  - Force earliest era set in snapshot restore [#5021](https://github.com/paritytech/parity/pull/5021)
+  - Bumb to v1.6.5
+  - Fine grained snapshot chunking
+  - Ropsten revival
+- Fix validator contract syncing [#4789](https://github.com/paritytech/parity/pull/4789) [#5011](https://github.com/paritytech/parity/pull/5011)
+  - Make validator set aware of various states
+  - Fix updater build
+  - Clean up contract call
+  - Failing sync test
+  - Adjust tests
+  - Nicer indent
+  - Revert bound divisor
+
+## Parity [v1.5.12](https://github.com/paritytech/parity/releases/tag/v1.5.12) (2017-03-27)
+
+Stable release that adds support for a new warp sync snapshot format.
+
+- Stable Backports [#5297](https://github.com/paritytech/parity/pull/5297)
+  - Bump to v1.5.12
+  - Fine grained snapshot chunking
+
+## Parity [v1.6.4](https://github.com/paritytech/parity/releases/tag/v1.6.4) (2017-03-22)
+
+A number of issues fixed in this release:
+
+- Ledger device connectivity issues for some users on Windows.
+- Improved vault usability.
+- Stratum mining no longer requires `--force-sealing`.
+- `evm` binary has been renamed to `parity-evm` to avoid conflict with cpp-ethereum package.
+
+Full Changes:
+
+- Backporting to beta [#4995](https://github.com/paritytech/parity/pull/4995)
+  - Bump to v1.6.4
+  - Ensure sealing work enabled if notifier registed
+  - Fix condition check
+  - Always send full chunks [#4960](https://github.com/paritytech/parity/pull/4960)
+  - Bump nanomsg [#4965](https://github.com/paritytech/parity/pull/4965)
+  - Renaming evm binary to avoid conflicts. [#4899](https://github.com/paritytech/parity/pull/4899)
+- Beta UI backports [#4993](https://github.com/paritytech/parity/pull/4993)
+  - Update js-precompiled 20170314-121823
+  - Attach hardware wallets already in addressbook [#4912](https://github.com/paritytech/parity/pull/4912)
+    - Attach hardware wallets already in addressbook
+    - Only set values changed
+  - Add Vaults logic to First Run [#4894](https://github.com/paritytech/parity/issues/4894) [#4914](https://github.com/paritytech/parity/pull/4914)
+  - Add ability to configure Secure API (for [#4885](https://github.com/paritytech/parity/issues/4885)) [#4922](https://github.com/paritytech/parity/pull/4922)
+  - Add z-index to small modals as well [#4923](https://github.com/paritytech/parity/pull/4923)
+  - Eth_sign where account === undefined [#4964](https://github.com/paritytech/parity/pull/4964)
+    - Update for case where account === undefined
+    - Update tests to not mask account === undefined
+    - Default account = {} where undefined (thanks [@tomusdrw](https://github.com/tomusdrw))
+  - Fix Password Dialog forms style issue [#4968](https://github.com/paritytech/parity/pull/4968)
+
+
+## Parity [v1.6.3](https://github.com/paritytech/parity/releases/tag/v1.6.3) (2017-03-14)
+
+This release fixes issue compatibility with Safari on MacOS.
+
+- Safari fixes [#4902](https://github.com/paritytech/parity/pull/4902)
+  - Add intitial max-width to sections
+  - Move background z-index to -1
+
+## Parity [v1.5.11](https://github.com/paritytech/parity/releases/tag/v1.5.11) (2017-03-14)
+
+Parity 1.5.11 Includes a patch for a more comprehensive block verification.
+
+- Bump to v1.5.11
+- Additional kovan params
+- Recalculate receipt roots in close_and_lock
+- Bump to v1.5.10
+
+## Parity [v1.6.2](https://github.com/paritytech/parity/releases/tag/v1.6.2) (2017-03-13)
+
+A major release introducing a few new features:
+
+- Revamped UI.
+- Account Vaults.
+- Support for Ledger hardware wallet devices.
+- Stratum protocol for PoW mining.
+- A new MacOS installer. Parity for MacOS now includes a Menu Bar icon that allows controlling Parity service.
+- Disk backed transaction store. Pending transactions are now saved to disk and won't get lost when Parity is restarted.
+- Improved memory management.
+
+See the [blog post](https://blog.parity.io/announcing-parity-1-6/) for more details.
+
+Full Changes:
+
+- Fix auto-updater beta [#4868](https://github.com/paritytech/parity/pull/4868)
+- Beta UI backports [#4855](https://github.com/paritytech/parity/pull/4855)
+  - Added React Hot Reload to dapps + TokenDeplpoy fix ([#4846](https://github.com/paritytech/parity/pull/4846))
+  - Fix method decoding ([#4845](https://github.com/paritytech/parity/pull/4845))
+    - Fix contract deployment method decoding in Signer
+    - Linting
+  - Fix TxViewer when no `to` (contract deployment) ([#4847](https://github.com/paritytech/parity/pull/4847))
+    - Added React Hot Reload to dapps + TokenDeplpoy fix
+    - Fixes to the LocalTx dapp
+    - Don't send the nonce for mined transactions
+    - Don't encode empty to values for options
+  - Pull steps from actual available steps ([#4848](https://github.com/paritytech/parity/pull/4848))
+  - Wait for the value to have changed in the input ([#4844](https://github.com/paritytech/parity/pull/4844))
+  - Backport Regsirty changes from [#4589](https://github.com/paritytech/parity/pull/4589)
+  - Test fixes for [#4589](https://github.com/paritytech/parity/pull/4589)
+- Beta Simple score [#4852](https://github.com/paritytech/parity/pull/4852)
+  - Simple score
+  - Ignore part of a test
+- Backporting to beta [#4840](https://github.com/paritytech/parity/pull/4840)
+  - Fixes to the Registry dapp ([#4838](https://github.com/paritytech/parity/pull/4838))
+    - Fix wrong ABI methods
+    - Fix comparison
+  - Bump to v1.6.1
+- Show token icons on list summary pages ([#4826](https://github.com/paritytech/parity/pull/4826)) [#4827](https://github.com/paritytech/parity/pull/4827)
+  - Adjust balance overlay margins (no jumps)
+  - Img only balances, small verifications
+  - Invalid tests removed
+  - Always wrap display (Thanks [@ngotchac](https://github.com/ngotchac))
+  - Update tests to reflect reality
+- Beta Engine backports [#4806](https://github.com/paritytech/parity/pull/4806)
+  - Calibrate before rejection
+  - Change flag name
+  - Add eip155
+  - Make network_id default
+- Beta UI backports [#4823](https://github.com/paritytech/parity/pull/4823)
+  - Better logic for contract deployments ([#4821](https://github.com/paritytech/parity/pull/4821))
+- Beta UI backports [#4818](https://github.com/paritytech/parity/pull/4818)
+  - Update the key ([#4817](https://github.com/paritytech/parity/pull/4817))
+  - Adjust selection colours/display ([#4811](https://github.com/paritytech/parity/pull/4811))
+    - Adjust selection colours to match with mui
+    - allow -> disable (simplify selections)
+    - Only use top-border
+    - Overlay selection line
+    - Slightly more muted unselected
+    - Restore address icon
+  - Fix default values for contract queries
+- Beta UI backports [#4809](https://github.com/paritytech/parity/pull/4809)
+  - Update Wallet to new Wallet Code ([#4805](https://github.com/paritytech/parity/pull/4805))
+    - Update Wallet Version
+    - Update Wallet Library
+    - Update Wallets Bytecodes
+    - Typo
+    - Separate Deploy in Contract API
+    - Use the new Wallet ABI // Update wallet code
+    - WIP .// Deploy from Wallet
+    - Update Wallet contract
+    - Contract Deployment for Wallet
+    - Working deployments for Single Owned Wallet contracts
+    - Linting
+    - Create a Wallet from a Wallet
+    - Linting
+    - Fix Signer transactions // Add Gas Used for transactions
+    - Deploy wallet contract fix
+    - Fix too high gas estimate for Wallet Contract Deploys
+    - Final piece ; deploying from Wallet owned by wallet
+    - Update Wallet Code
+    - Updated the Wallet Codes
+    - Fixing Wallet Deployments
+    - Add Support for older wallets
+    - Linting
+  - SMS Faucet ([#4774](https://github.com/paritytech/parity/pull/4774))
+    - Faucet
+    - Remove flakey button-index testing
+    - Only display faucet when sms verified (mainnet)
+    - Simplify availability checks
+    - WIP
+    - Resuest from verified -> verified
+    - Update endpoint, display response text
+    - Error icon on errors
+    - Parse hash text response
+    - Use /api/:address endpoint
+    - Hash -> data
+    - Adjust sms-certified message
+  - Fix SectionList hovering issue ([#4749](https://github.com/paritytech/parity/pull/4749))
+    - Fix SectionList Items hover when <3 items
+    - Even easier...
+  - Lint (new)
+- Update ETC bootnodes [#4794](https://github.com/paritytech/parity/pull/4794)
+- Update comments and reg ABI [#4787](https://github.com/paritytech/parity/pull/4787)
+- Optimize signature for fallback function. [#4780](https://github.com/paritytech/parity/pull/4780)
+- Rephrasing token generation screen. [#4777](https://github.com/paritytech/parity/pull/4777)
+- Etherscan links based on netVersion identifier [#4772](https://github.com/paritytech/parity/pull/4772)
+- Update README.md  [#4762](https://github.com/paritytech/parity/pull/4762)
+- Fix invalid props to verification code [#4766](https://github.com/paritytech/parity/pull/4766)
+- Extend authority round consensus test [#4756](https://github.com/paritytech/parity/pull/4756)
+- Revert last hyper "fix" [#4752](https://github.com/paritytech/parity/pull/4752)
+- Vault Management UI (round 3) [#4652](https://github.com/paritytech/parity/pull/4652)
+- Update SelectionList indicators [#4736](https://github.com/paritytech/parity/pull/4736)
+- Update testnet detection [#4746](https://github.com/paritytech/parity/pull/4746)
+- Fix Portal in Portal ESC issue [#4745](https://github.com/paritytech/parity/pull/4745)
+- Update wiki [#4743](https://github.com/paritytech/parity/pull/4743)
+- Account selector close operations [#4728](https://github.com/paritytech/parity/pull/4728)
+- Fix Account Selection in Signer [#4744](https://github.com/paritytech/parity/pull/4744)
+- Support both V1 & V2 DataChanged events in registry [#4734](https://github.com/paritytech/parity/pull/4734)
+- Add info on forks. [#4733](https://github.com/paritytech/parity/pull/4733)
+- Add registry addr [#4732](https://github.com/paritytech/parity/pull/4732)
+- UI support for hardware wallets [#4539](https://github.com/paritytech/parity/pull/4539)
+- S/delete/forget/ for wallets [#4729](https://github.com/paritytech/parity/pull/4729)
+- New chains [#4720](https://github.com/paritytech/parity/pull/4720)
+- Enable --warp by default [#4719](https://github.com/paritytech/parity/pull/4719)
+- Update Uglify (fix to 2.8.2) to fix binary builds [#4723](https://github.com/paritytech/parity/pull/4723)
+- Extract i18n strings in modals/* [#4706](https://github.com/paritytech/parity/pull/4706)
+- Provide uncle size where available in RPC [#4713](https://github.com/paritytech/parity/pull/4713)
+- EC math functions [#4696](https://github.com/paritytech/parity/pull/4696)
+- Add registrar fields [#4716](https://github.com/paritytech/parity/pull/4716)
+- Extract i18n strings in views/* [#4695](https://github.com/paritytech/parity/pull/4695)
+- Removing network=disable from config files [#4715](https://github.com/paritytech/parity/pull/4715)
+- Fast in-place migration for adding and removing column families [#4687](https://github.com/paritytech/parity/pull/4687)
+- Display badges on summary view [#4689](https://github.com/paritytech/parity/pull/4689)
+- Consistent file uploads [#4699](https://github.com/paritytech/parity/pull/4699)
+- Rename https://mkr.market -> https://oasisdex.com [#4701](https://github.com/paritytech/parity/pull/4701)
+- Stop copy & clickthrough from list summaries [#4700](https://github.com/paritytech/parity/pull/4700)
+- Display ... for address summary overflows [#4691](https://github.com/paritytech/parity/pull/4691)
+- Less agressive grayscale/opacity in SelectionList [#4688](https://github.com/paritytech/parity/pull/4688)
+- Propagate trie errors upwards from State [#4655](https://github.com/paritytech/parity/pull/4655)
+- Generic state backend [#4632](https://github.com/paritytech/parity/pull/4632)
+- Enhance dialog layouts (round 1) [#4637](https://github.com/paritytech/parity/pull/4637)
+- Vault Management UI (round 2) [#4631](https://github.com/paritytech/parity/pull/4631)
+- Fix Portal broad event stopper [#4674](https://github.com/paritytech/parity/pull/4674)
+- Custom dev chain presets [#4671](https://github.com/paritytech/parity/pull/4671)
+- Max gas limit and min gas price [#4661](https://github.com/paritytech/parity/pull/4661)
+- Align list displays with SectionList (UI consistency) [#4621](https://github.com/paritytech/parity/pull/4621)
+- Add SelectionList component to DRY up [#4639](https://github.com/paritytech/parity/pull/4639)
+- I18n NL linting updates [#4662](https://github.com/paritytech/parity/pull/4662)
+- Misc. small UI fixes [#4657](https://github.com/paritytech/parity/pull/4657)
+- More CLI settings for IPFS API [#4608](https://github.com/paritytech/parity/pull/4608)
+- Fix Tendermint deadlock [#4654](https://github.com/paritytech/parity/pull/4654)
+- Nl translations [#4649](https://github.com/paritytech/parity/pull/4649)
+- Update transaction condition documentation [#4659](https://github.com/paritytech/parity/pull/4659)
+- Bump hyper versions [#4645](https://github.com/paritytech/parity/pull/4645)
+- Sane updater [#4658](https://github.com/paritytech/parity/pull/4658)
+- Remainder of RPC APIs implemented for the light client [#4594](https://github.com/paritytech/parity/pull/4594)
+- Preserve vault meta when changing pwd [#4650](https://github.com/paritytech/parity/pull/4650)
+- Fix Geth account import [#4641](https://github.com/paritytech/parity/pull/4641)
+- Tweak some checks. [#4633](https://github.com/paritytech/parity/pull/4633)
+- Attempt to fix subscribeToEvents test [#4638](https://github.com/paritytech/parity/pull/4638)
+- Fix selection value from RadioButtons [#4636](https://github.com/paritytech/parity/pull/4636)
+- Convert all remaining Modals to use Portal (UI consistency) [#4625](https://github.com/paritytech/parity/pull/4625)
+- Default account selection update [#4609](https://github.com/paritytech/parity/pull/4609)
+- Display ETH balance in overlay account selector [#4588](https://github.com/paritytech/parity/pull/4588)
+- Fixed minor grammar mistake in readme [#4627](https://github.com/paritytech/parity/pull/4627)
+- Extract newly available i18n strings [#4623](https://github.com/paritytech/parity/pull/4623)
+- Save pending local transactions in the database [#4566](https://github.com/paritytech/parity/pull/4566)
+- Bump CID version to allow compilation on all platforms [#4614](https://github.com/paritytech/parity/pull/4614)
+- Vault Management UI (first round) [#4446](https://github.com/paritytech/parity/pull/4446)
+- Let Engine decide if it seals internally [#4613](https://github.com/paritytech/parity/pull/4613)
+- Show only known accounts/wallets/addresses on Home [#4612](https://github.com/paritytech/parity/pull/4612)
+- Proper default accounts RPCs [#4580](https://github.com/paritytech/parity/pull/4580)
+- Hash-fetch errors in case upstream returns non-200 [#4599](https://github.com/paritytech/parity/pull/4599)
+- Added pending transaction info to eth_getTransactionByHash [#4570](https://github.com/paritytech/parity/pull/4570)
+- Secret store - initial version [#4567](https://github.com/paritytech/parity/pull/4567)
+- Handle invalid ABI retrieved from address_book gracefully [#4606](https://github.com/paritytech/parity/pull/4606)
+- Optimize key directory reloads [#4583](https://github.com/paritytech/parity/pull/4583)
+- Revert Double Click on Accounts to close in Signer Bar [#4590](https://github.com/paritytech/parity/pull/4590)
+- IPFS MVP [#4545](https://github.com/paritytech/parity/pull/4545)
+- Networking fixes [#4563](https://github.com/paritytech/parity/pull/4563)
+- Remove eth_compile* RPCs [#4577](https://github.com/paritytech/parity/pull/4577)
+- Ledger wallet signing fixed [#4578](https://github.com/paritytech/parity/pull/4578)
+- Remove vertx from Webpack config [#4576](https://github.com/paritytech/parity/pull/4576)
+- Better display of tags [#4564](https://github.com/paritytech/parity/pull/4564)
+- Added vaults support to `ethstore-cli` [#4532](https://github.com/paritytech/parity/pull/4532)
+- Fixed font URLs [#4579](https://github.com/paritytech/parity/pull/4579)
+- Explicitly set seconds to 0 from selector [#4559](https://github.com/paritytech/parity/pull/4559)
+- Fixes evmbin compilation and adding to standard build. [#4561](https://github.com/paritytech/parity/pull/4561)
+- Alias for personal_sendTransaction [#4554](https://github.com/paritytech/parity/pull/4554)
+- Key derivation in ethstore & rpc [#4515](https://github.com/paritytech/parity/pull/4515)
+- Skip OOG check for simple transfers [#4558](https://github.com/paritytech/parity/pull/4558)
+- Light Client transaction queue, initial LightDispatcher [#4501](https://github.com/paritytech/parity/pull/4501)
+- Fixes BadgeReg Middleware [#4556](https://github.com/paritytech/parity/pull/4556)
+- Fix pasting of value in Input fields [#4555](https://github.com/paritytech/parity/pull/4555)
+- Tooltips with react-intl [#4549](https://github.com/paritytech/parity/pull/4549)
+- Close on double-click for Signer Account selection [#4540](https://github.com/paritytech/parity/pull/4540)
+- Signer provenance [#4477](https://github.com/paritytech/parity/pull/4477)
+- Fix console dapp [#4544](https://github.com/paritytech/parity/pull/4544)
+- Extract i18n string into i18n/_defaults (base of translations) [#4514](https://github.com/paritytech/parity/pull/4514)
+- Fix contract queries bug [#4534](https://github.com/paritytech/parity/pull/4534)
+- Fixing namespace of couple methods in console. [#4538](https://github.com/paritytech/parity/pull/4538)
+- Home landing page [#4178](https://github.com/paritytech/parity/pull/4178)
+- Bump JSON RPC crates versions [#4530](https://github.com/paritytech/parity/pull/4530)
+- Update rust version in README [#4531](https://github.com/paritytech/parity/pull/4531)
+- Lower default pruning history and memory [#4528](https://github.com/paritytech/parity/pull/4528)
+- Serde 0.9 [#4508](https://github.com/paritytech/parity/pull/4508)
+- Fixes to Token Deploy dapp [#4513](https://github.com/paritytech/parity/pull/4513)
+- Fixed receipt decoding [#4521](https://github.com/paritytech/parity/pull/4521)
+- Several fixes to the Wallet in general [#4504](https://github.com/paritytech/parity/pull/4504)
+- Use the current contract name for Solidity compilation [#4510](https://github.com/paritytech/parity/pull/4510)
+- Preparation for Light client RPC [#4485](https://github.com/paritytech/parity/pull/4485)
+- Fix Dutch translation [#4509](https://github.com/paritytech/parity/pull/4509)
+- Fixed a warning and bumped libusb-sys [#4507](https://github.com/paritytech/parity/pull/4507)
+- Fix TnC overflows on small screens [#4505](https://github.com/paritytech/parity/pull/4505)
+- Fix no data sent in TxQueue dapp [#4502](https://github.com/paritytech/parity/pull/4502)
+- Ledger wallet support [#4486](https://github.com/paritytech/parity/pull/4486)
+- Add new Componennt for Token Images [#4498](https://github.com/paritytech/parity/pull/4498)
+- Fix address and accounts links [#4491](https://github.com/paritytech/parity/pull/4491)
+- Fix Token Reg Dapp issues in Firefox [#4489](https://github.com/paritytech/parity/pull/4489)
+- Parity.js interfaces for vaults [#4497](https://github.com/paritytech/parity/pull/4497)
+- Initial Dutch translations [#4484](https://github.com/paritytech/parity/pull/4484)
+- Fix key.meta.vault for root dir keys && read vault.meta without vault key [#4482](https://github.com/paritytech/parity/pull/4482)
+- Arbitrary labels for extended keys (u32, H256 built-in) [#4438](https://github.com/paritytech/parity/pull/4438)
+- Fix ethstore build [#4492](https://github.com/paritytech/parity/pull/4492)
+- Fixed compilation of ethstore-cli [#4493](https://github.com/paritytech/parity/pull/4493)
+- Build embedded Parity JS properly and separatly  [#4426](https://github.com/paritytech/parity/pull/4426)
+- Static link for snappy [#4487](https://github.com/paritytech/parity/pull/4487)
+- Work with string numbers in contract (Fixes #4472) [#4478](https://github.com/paritytech/parity/pull/4478)
+- Metadata support for vaults [#4475](https://github.com/paritytech/parity/pull/4475)
+- Sort gas price corpus when hitting genesis [#4470](https://github.com/paritytech/parity/pull/4470)
+- Fixing CORS headers for parity.web3.site [#4461](https://github.com/paritytech/parity/pull/4461)
+- Make signing compatible with geth. [#4468](https://github.com/paritytech/parity/pull/4468)
+- Handle registry not found errors [#4465](https://github.com/paritytech/parity/pull/4465)
+- Fix Portal scrolling getting stuck [#4455](https://github.com/paritytech/parity/pull/4455)
+- Fix AccountCard stretch to 100% [#4450](https://github.com/paritytech/parity/pull/4450)
+- Include total difficulty in CHTs and hide implementation details from consumers [#4428](https://github.com/paritytech/parity/pull/4428)
+- Fix RLP encoding for types recursively calling `RlpStream::append` [#4362](https://github.com/paritytech/parity/pull/4362)
+- Open popup without attempting inline [#4440](https://github.com/paritytech/parity/pull/4440)
+- Fixing histogram again ([#4464](https://github.com/paritytech/parity/issues/4464)) port from beta [#4467](https://github.com/paritytech/parity/pull/4467)
+- Vaults RPCs [#4366](https://github.com/paritytech/parity/pull/4366)
+- Ethkey - extended keys [#4377](https://github.com/paritytech/parity/pull/4377)
+- Use secure websocket from HTTPS clients [#4436](https://github.com/paritytech/parity/pull/4436)
+- RPC middleware: Informant & Client.keep_alive [#4384](https://github.com/paritytech/parity/pull/4384)
+- Fix eth_sign/parity_postSign [#4432](https://github.com/paritytech/parity/pull/4432)
+- Web view with web3.site support [#4313](https://github.com/paritytech/parity/pull/4313)
+- Extend Portal component with title, buttons & steps (as per Modal) [#4392](https://github.com/paritytech/parity/pull/4392)
+- Extension installation overlay [#4423](https://github.com/paritytech/parity/pull/4423)
+- Add block & timestamp conditions to Signer [#4411](https://github.com/paritytech/parity/pull/4411)
+- Transaction timestamp condition [#4419](https://github.com/paritytech/parity/pull/4419)
+- Poll for defaultAccount to update dapp & overlay subscriptions [#4417](https://github.com/paritytech/parity/pull/4417)
+- Validate dapps accounts with address book [#4407](https://github.com/paritytech/parity/pull/4407)
+- Dapps use defaultAccount instead of own selectors [#4386](https://github.com/paritytech/parity/pull/4386)
+- Fix lock and rename tracing [#4403](https://github.com/paritytech/parity/pull/4403)
+- Restarting fetch client every now and then [#4399](https://github.com/paritytech/parity/pull/4399)
+- Perform a sync between Rust and JS when generating markdown instead of in spec tests [#4408](https://github.com/paritytech/parity/pull/4408)
+- Registry dapp: make lookup use lower case [#4409](https://github.com/paritytech/parity/pull/4409)
+- Available Dapp selection alignment with Permissions (Portal) [#4374](https://github.com/paritytech/parity/pull/4374)
+- More permissive verification process [#4317](https://github.com/paritytech/parity/pull/4317)
+- Fix ParityBar account selection overflows [#4405](https://github.com/paritytech/parity/pull/4405)
+- Mac binaries signing [#4397](https://github.com/paritytech/parity/pull/4397)
+- Revert "remove [ci skip]" [#4398](https://github.com/paritytech/parity/pull/4398)
+- Registry, s/a the owner/the owner/ [#4391](https://github.com/paritytech/parity/pull/4391)
+- Fixing invalid address in docs [#4388](https://github.com/paritytech/parity/pull/4388)
+- Remove [ci skip] [#4381](https://github.com/paritytech/parity/pull/4381)
+- Fixing estimate gas in case histogram is not available [#4387](https://github.com/paritytech/parity/pull/4387)
+- Default Account selector in Signer overlay [#4375](https://github.com/paritytech/parity/pull/4375)
+- Fixing web3 in console [#4382](https://github.com/paritytech/parity/pull/4382)
+- Add parity_defaultAccount RPC (with subscription) [#4383](https://github.com/paritytech/parity/pull/4383)
+- Full JSON-RPC docs + sync tests. [#4335](https://github.com/paritytech/parity/pull/4335)
+- Expose util as Api.util [#4372](https://github.com/paritytech/parity/pull/4372)
+- Dapp Account Selection & Defaults [#4355](https://github.com/paritytech/parity/pull/4355)
+- Publish @parity/jsonrpc [#4365](https://github.com/paritytech/parity/pull/4365)
+- Fix signing [#4363](https://github.com/paritytech/parity/pull/4363)
+- Fixing embedded bar not closing in chrome extension [#4367](https://github.com/paritytech/parity/pull/4367)
+- Update AccountCard for re-use [#4350](https://github.com/paritytech/parity/pull/4350)
+- Add proper event listener to Portal [#4359](https://github.com/paritytech/parity/pull/4359)
+- Optional from field in Transaction Requests [#4332](https://github.com/paritytech/parity/pull/4332)
+- Rust 1.14 in README [ci-skip] [#4361](https://github.com/paritytech/parity/pull/4361)
+- Fix JournalDB::earliest_era on empty database [#4316](https://github.com/paritytech/parity/pull/4316)
+- Fixed race condition deadlock on fetching enode URL [#4354](https://github.com/paritytech/parity/pull/4354)
+- Allow Portal to be used as top-level modal [#4338](https://github.com/paritytech/parity/pull/4338)
+- Fix postsign [#4347](https://github.com/paritytech/parity/pull/4347)
+- Renaming signAndSendTransaction to sendTransaction [#4351](https://github.com/paritytech/parity/pull/4351)
+- Add api.util.encodeMethodCall to parity.js [#4330](https://github.com/paritytech/parity/pull/4330)
+- Initial commit for vaults [#4312](https://github.com/paritytech/parity/pull/4312)
+- Returning default account as coinbase + allow altering sender in signer [#4323](https://github.com/paritytech/parity/pull/4323)
+- Persistent tracking of dapps [#4302](https://github.com/paritytech/parity/pull/4302)
+- Exposing all RPCs over dapps port as CLI option [#4346](https://github.com/paritytech/parity/pull/4346)
+- New macOS App [#4345](https://github.com/paritytech/parity/pull/4345)
+- Display QrCode for accounts, addresses & contracts [#4329](https://github.com/paritytech/parity/pull/4329)
+- Add QrCode & Copy to ShapeShift [#4322](https://github.com/paritytech/parity/pull/4322)
+- Parity.js api.parity.chainStatus should handle { blockGap: null } [#4327](https://github.com/paritytech/parity/pull/4327)
+- DeleteAccount & LoadContract modal updates [#4320](https://github.com/paritytech/parity/pull/4320)
+- Split Tab from TabBar [#4318](https://github.com/paritytech/parity/pull/4318)
+- Contracts interface expansion [#4307](https://github.com/paritytech/parity/pull/4307)
+- HistoryStore for tracking relevant routes [#4305](https://github.com/paritytech/parity/pull/4305)
+- Split Dapp icon into ui/DappIcon (re-use) [#4308](https://github.com/paritytech/parity/pull/4308)
+- Add a Playground for the UI Components [#4301](https://github.com/paritytech/parity/pull/4301)
+- Update CreateWallet with FormattedMessage [#4298](https://github.com/paritytech/parity/pull/4298)
+- Update dates for new PRs missed [#4306](https://github.com/paritytech/parity/pull/4306)
+- EIP-98: Optional transaction state root [#4296](https://github.com/paritytech/parity/pull/4296)
+- Fix whitespace [#4299](https://github.com/paritytech/parity/pull/4299)
+- Attempt to fix console. [#4294](https://github.com/paritytech/parity/pull/4294)
+- Ui/SectionList component [#4292](https://github.com/paritytech/parity/pull/4292)
+- Stratum up [#4233](https://github.com/paritytech/parity/pull/4233)
+- Logging transaction duration [#4297](https://github.com/paritytech/parity/pull/4297)
+- Generic engine utilities [#4258](https://github.com/paritytech/parity/pull/4258)
+- JSON-RPC interfaces with documentation [#4276](https://github.com/paritytech/parity/pull/4276)
+- Dont decode seal fields [#4263](https://github.com/paritytech/parity/pull/4263)
+- Skip misbehaving test until properly fixed [#4283](https://github.com/paritytech/parity/pull/4283)
+- Additional logs for own transactions [#4278](https://github.com/paritytech/parity/pull/4278)
+- Ensure write lock isn't held when calling handlers [#4285](https://github.com/paritytech/parity/pull/4285)
+- Feature selector [#4074](https://github.com/paritytech/parity/pull/4074)
+- AccountCreate updates [#3988](https://github.com/paritytech/parity/pull/3988)
+- Extended JS interface -> Markdown generator [#4275](https://github.com/paritytech/parity/pull/4275)
+- Added 3 warpnodes for ropsten [#4289](https://github.com/paritytech/parity/pull/4289)
+- Ledger Communication JS toolkit [#4268](https://github.com/paritytech/parity/pull/4268)
+- ValidatorSet reporting [#4208](https://github.com/paritytech/parity/pull/4208)
+- Add support for api.subscribe('parity_accountsInfo') [#4273](https://github.com/paritytech/parity/pull/4273)
+- Display AccountCard name via IdentityName [#4235](https://github.com/paritytech/parity/pull/4235)
+- Dapp visibility save/load tests [#4150](https://github.com/paritytech/parity/pull/4150)
+- Fix wrong output format of peers [#4270](https://github.com/paritytech/parity/pull/4270)
+- Chain scoring [#4218](https://github.com/paritytech/parity/pull/4218)
+- Rust 1.14 for windows builds [#4269](https://github.com/paritytech/parity/pull/4269)
+- Eslint formatting updates [#4234](https://github.com/paritytech/parity/pull/4234)
+- Embeddable ParityBar [#4222](https://github.com/paritytech/parity/pull/4222)
+- Update deb-build.sh to fix libssl dependency [#4260](https://github.com/paritytech/parity/pull/4260)
+- Integration with zgp whitelist contract [#4215](https://github.com/paritytech/parity/pull/4215)
+- Adjust the location of the signer snippet [#4155](https://github.com/paritytech/parity/pull/4155)
+- Fix wrong token handling [#4254](https://github.com/paritytech/parity/pull/4254)
+- Additional building-block UI components [#4239](https://github.com/paritytech/parity/pull/4239)
+- Bump package.json to 0.3.0 (1.6 track) [#4244](https://github.com/paritytech/parity/pull/4244)
+- Disable incoming ETH notifications [#4243](https://github.com/paritytech/parity/pull/4243)
+- Memory-based pruning history size [#4114](https://github.com/paritytech/parity/pull/4114)
+- Common EngineSigner [#4189](https://github.com/paritytech/parity/pull/4189)
+- Verification: don't request a code twice [#4221](https://github.com/paritytech/parity/pull/4221)
+- S/Delete Contract/Forget Contract/ [#4237](https://github.com/paritytech/parity/pull/4237)
+- Light protocol syncing improvements [#4212](https://github.com/paritytech/parity/pull/4212)
+- LES Peer Info [#4195](https://github.com/paritytech/parity/pull/4195)
+- Don't panic on uknown git commit hash [#4231](https://github.com/paritytech/parity/pull/4231)
+- Cache registry reverses in local storage [#4182](https://github.com/paritytech/parity/pull/4182)
+- Update version numbers in README [#4223](https://github.com/paritytech/parity/pull/4223)
+- CHT calculations for full nodes [#4181](https://github.com/paritytech/parity/pull/4181)
+- Use single source of info for dapp meta (build & display) [#4217](https://github.com/paritytech/parity/pull/4217)
+- Non-secure API for DappReg [#4216](https://github.com/paritytech/parity/pull/4216)
+- Console now has admin [#4220](https://github.com/paritytech/parity/pull/4220)
+- Verification: add mainnet BadgeReg ids [#4190](https://github.com/paritytech/parity/pull/4190)
+- Fixing minimal transaction queue price [#4204](https://github.com/paritytech/parity/pull/4204)
+- Remove unnecessary Engine method [#4184](https://github.com/paritytech/parity/pull/4184)
+- Fixed --base-path on windows [#4193](https://github.com/paritytech/parity/pull/4193)
+- Fixing etherscan price parsing [#4202](https://github.com/paritytech/parity/pull/4202)
+- LES: Better timeouts + Track failed requests [#4093](https://github.com/paritytech/parity/pull/4093)
+- ESLint additional rules [#4186](https://github.com/paritytech/parity/pull/4186)
+- JsonRPC bump for IPC fix [#4200](https://github.com/paritytech/parity/pull/4200)
+- Poll for upgrades as part of global status (long) [#4197](https://github.com/paritytech/parity/pull/4197)
+- Updater fixes [#4196](https://github.com/paritytech/parity/pull/4196)
+- Prevent duplicate incoming connections [#4180](https://github.com/paritytech/parity/pull/4180)
+- Minor typo to ensure it updates only when synced. [#4188](https://github.com/paritytech/parity/pull/4188)
+- Minor refactor for clarity [#4174](https://github.com/paritytech/parity/pull/4174)
+- Secret - from hash function, also validate data [#4159](https://github.com/paritytech/parity/pull/4159)
+- Gas_limit for blocks, mined by Parity will be divisible by 37 [#4154](https://github.com/paritytech/parity/pull/4154)
+- Support HTML5-routed dapps [#4173](https://github.com/paritytech/parity/pull/4173)
+- Fix subscribeToEvents test [#4166](https://github.com/paritytech/parity/pull/4166)
+- Fix dapps not loading [#4170](https://github.com/paritytech/parity/pull/4170)
+- Fix broken token images [#4169](https://github.com/paritytech/parity/pull/4169)
+- Bumping hyper [#4167](https://github.com/paritytech/parity/pull/4167)
+- Icarus -> update, increase web timeout. [#4165](https://github.com/paritytech/parity/pull/4165)
+- Add a password strength component [#4153](https://github.com/paritytech/parity/pull/4153)
+- Stop flickering + added loader in AddressSelector [#4149](https://github.com/paritytech/parity/pull/4149)
+- On demand LES request [#4036](https://github.com/paritytech/parity/pull/4036)
+- Ropsten fork detection [#4163](https://github.com/paritytech/parity/pull/4163)
+- Pull in console dapp as builtin [#4145](https://github.com/paritytech/parity/pull/4145)
+- Optimized hash lookups [#4144](https://github.com/paritytech/parity/pull/4144)
+- UnverifiedTransaction type [#4134](https://github.com/paritytech/parity/pull/4134)
+- Verification: check if server is running [#4140](https://github.com/paritytech/parity/pull/4140)
+- Remove onSubmit of current (no auto-change on password edit) [#4151](https://github.com/paritytech/parity/pull/4151)
+- Trim spaces from InputAddress [#4126](https://github.com/paritytech/parity/pull/4126)
+- Don't pop-up notifications after network switch [#4076](https://github.com/paritytech/parity/pull/4076)
+- Use estimateGas error (as per updated implementation) [#4131](https://github.com/paritytech/parity/pull/4131)
+- Improvements and optimisations to estimate_gas [#4142](https://github.com/paritytech/parity/pull/4142)
+- New jsonrpc-core with futures and metadata support [#3859](https://github.com/paritytech/parity/pull/3859)
+- Reenable mainnet update server. [#4137](https://github.com/paritytech/parity/pull/4137)
+- Temporarily skip failing test [#4138](https://github.com/paritytech/parity/pull/4138)
+- Refactor VoteCollector [#4101](https://github.com/paritytech/parity/pull/4101)
+- Another minor estimation fix [#4133](https://github.com/paritytech/parity/pull/4133)
+- Add proper label to method decoding inputs [#4136](https://github.com/paritytech/parity/pull/4136)
+- Remove bindActionCreators({}, dispatch) (empty, unneeded) [#4135](https://github.com/paritytech/parity/pull/4135)
+- Better contract error log reporting & handling [#4128](https://github.com/paritytech/parity/pull/4128)
+- Fix broken Transfer : total account balance [#4127](https://github.com/paritytech/parity/pull/4127)
+- Test harness for lightsync [#4109](https://github.com/paritytech/parity/pull/4109)
+- Fix call/estimate_gas [#4121](https://github.com/paritytech/parity/pull/4121)
+- Fixing decoding ABI with signatures in names [#4125](https://github.com/paritytech/parity/pull/4125)
+- Get rid of unsafe code in ethkey, propagate incorrect Secret errors. [#4119](https://github.com/paritytech/parity/pull/4119)
+- Basic tests for subscribeToEvents [#4115](https://github.com/paritytech/parity/pull/4115)
+- Auto-detect hex encoded bytes in sha3 [#4108](https://github.com/paritytech/parity/pull/4108)
+- Use binary chop to estimate gas accurately [#4100](https://github.com/paritytech/parity/pull/4100)
+- V1.6 in master [#4113](https://github.com/paritytech/parity/pull/4113)
+- Ignore get_price_info test by default. [#4112](https://github.com/paritytech/parity/pull/4112)
+- Fix wrong information logging [#4106](https://github.com/paritytech/parity/pull/4106)
+- Avoid comms with not-yet-active release update server. [#4111](https://github.com/paritytech/parity/pull/4111)
+- Update Transfer logic + Better logging [#4098](https://github.com/paritytech/parity/pull/4098)
+- Fix Signer : wrong account on reload [#4104](https://github.com/paritytech/parity/pull/4104)
+- Cache registry reverses, completion in address selector [#4066](https://github.com/paritytech/parity/pull/4066)
+- Validator/authority contract [#3937](https://github.com/paritytech/parity/pull/3937)
+- No reorg limit for ancient blocks [#4099](https://github.com/paritytech/parity/pull/4099)
+- Update registration after every write [#4102](https://github.com/paritytech/parity/pull/4102)
+- Default to no auto-update. [#4092](https://github.com/paritytech/parity/pull/4092)
+- Don't remove out of date local transactions [#4094](https://github.com/paritytech/parity/pull/4094)
+
+## Parity [v1.5.9](https://github.com/paritytech/parity/releases/tag/v1.5.9) (2017-03-11)
+
+First stable release of 1.5.x series. This release enables EIP-161 transaction replay protection for PoA networks.
+
+- Bump to v1.5.9
+- Fix auto-updater stable [#4869](https://github.com/paritytech/parity/pull/4869)
+- Fixing windows build script
+- Bump js-precompiled 20170308-152339
+- Force js update
+- Stable Engine backports [#4807](https://github.com/paritytech/parity/pull/4807)
+  - Calibrate before rejection
+  - Change flag name
+  - Add eip155
+  - Fix build
+  - Make network_id default
+- Switch js branch to stable
+- Bump to v1.5.8
+
+## Parity [v1.5.7](https://github.com/paritytech/parity/releases/tag/v1.5.7) (2017-03-07)
+
+This release resolves a single issue with failing auto-updates.
+
+- Update ETC bootnodes [#4794](https://github.com/paritytech/parity/pull/4794)
+- Bump to v1.5.7
+- Sane updater [#4658](https://github.com/paritytech/parity/pull/4658)
+  - Disable if files can't be moved.
+  - Make updater avoid downloading earlier versions.
+
+## Parity [v1.5.6](https://github.com/paritytech/parity/releases/tag/v1.5.6) (2017-03-06)
+
+This release among various stability fixes adds support for a new [Kovan](https://github.com/kovan-testnet/proposal) testnet.
+
+See [full list of changes.](https://github.com/paritytech/parity/compare/v1.5.4...v1.5.6):
+
+- Beta Update comments and reg ABI [#4788](https://github.com/paritytech/parity/pull/4788)
+  - Update comments.
+  - Fix up new ABI.
+- Bump to v1.5.6 in beta [#4786](https://github.com/paritytech/parity/pull/4786)
+- Beta Optimize signature for fallback function. ([#4780](https://github.com/paritytech/parity/pull/4780)) [#4784](https://github.com/paritytech/parity/pull/4784)
+- Beta Add registrar fields ([#4716](https://github.com/paritytech/parity/pull/4716)) [#4781](https://github.com/paritytech/parity/pull/4781)
+- Beta Etherscan links ([#4772](https://github.com/paritytech/parity/pull/4772)) [#4778](https://github.com/paritytech/parity/pull/4778)
+  - Etherscan links [#4772](https://github.com/paritytech/parity/pull/4772)
+    - Use netVersion to determine external links
+    - Update additional isTest references
+  - Port tests
+  - Update address links
+  - Signer accountlink isTest
+- Beta Fix invalid props [#4767](https://github.com/paritytech/parity/pull/4767)
+- Backporting to beta [#4741](https://github.com/paritytech/parity/pull/4741)
+  - New chains [#4720](https://github.com/paritytech/parity/pull/4720)
+    - Add Kovan chain.
+    - Fix up --testnet.
+    - Fix tests.
+  - Fix to UglifyJS 2.8.2 to fix app build issues [#4723](https://github.com/paritytech/parity/pull/4723)
+  - Update classic bootnodes, ref #4717 [#4735](https://github.com/paritytech/parity/pull/4735)
+  - Allow failure docker beta
+  - Adjust pruning history default to 64 [#4709](https://github.com/paritytech/parity/pull/4709)
+  - Backporting from master
+    - Update docker-build.sh
+    - Update gitlab.ci
+    - Fix docker hub build
+    - Update gitlab
+    - Docker beta-release->latest
+    - Add registry.
+    - Add info on forks.
+    - Fixed spec file
+  - Support both V1 & V2 DataChanged events in registry [#4734](https://github.com/paritytech/parity/pull/4734)
+    - Add info on forks.
+    - Add new registry ABI
+    - Import registry2 & fix exports
+    - Select ABI based on code hash
+    - Render new event types (owner not available)
+    - New registry.
+    - Rename old chain.
+    - Fix test.
+    - Another fix.
+    - Finish rename.
+  - Fixed fonts URLs [#4579](https://github.com/paritytech/parity/pull/4579)
+  - Fix Token Reg Dapp issues in Firefox [#4489](https://github.com/paritytech/parity/pull/4489)
+    - Fix overflow issues in Firefox [#4348](https://github.com/paritytech/parity/issues/4348)
+    - Fix wrong Promise inferance
+    - Revert "Add new Componennt for Token Images [#4496](https://github.com/paritytech/parity/issues/4496)"
+    - Add new Componennt for Token Images [#4496](https://github.com/paritytech/parity/issues/4496)
+  - Add StackEventListener [#4745](https://github.com/paritytech/parity/pull/4745)
+  - Update testnet detection [#4746](https://github.com/paritytech/parity/pull/4746)
+  - Fix Account Selection in Signer [#4744](https://github.com/paritytech/parity/pull/4744)
+    - Can pass FormattedMessage to Input (eg. Status // RPC Enabled)
+    - Simple fixed-width fix for Accoutn Selection in Parity Signer
+- Beta backports [#4763](https://github.com/paritytech/parity/pull/4763)
+  - Https://mkr-market -> https://oasisdex.com [#4701](https://github.com/paritytech/parity/pull/4701)
+  - Wallet s/delete/forget/ [#4741](https://github.com/paritytech/parity/pull/4741)
+- Update classic bootnodes [#4735](https://github.com/paritytech/parity/pull/4735)
+- Engine backports [#4718](https://github.com/paritytech/parity/pull/4718)
+  - Custom dev presets
+  - Add registrar field
+  - Use constructor for dev registrar
+  - Fix test
+- Beta Adjust pruning history default to 64 [#4709](https://github.com/paritytech/parity/pull/4709)
+- Bump to v1.5.5
+
+## Parity [v1.5.4](https://github.com/paritytech/parity/releases/tag/v1.5.4) (2017-02-23)
+
+A couple of issue fixed in this release:
+
+- Parity now allows uncles headers to have timestamp set to arbitrary future value.
+- Importing keys from geth is now working again.
+
+Changes:
+
+- Beta Fix Geth account import [#4643](https://github.com/paritytech/parity/pull/4643)
+  - Fix Geth import - actually pass addresses through
+  - Fix geth accounts not displayed
+  - Port saving of returned addresses (master MobX, beta state)
+  - Log result -> importGethAccounts
+- Beta Backporting ([#4633](https://github.com/paritytech/parity/pull/4633)) [#4640](https://github.com/paritytech/parity/pull/4640)
+  - Tweak some checks.
+  - Fixed build and added a difficulty test
+  - Bump to v1.5.4
+
+## Parity [v1.4.12](https://github.com/paritytech/parity/releases/tag/v1.4.12) (2017-02-22)
+
+This stable release fixes an issue with block uncle validation. Parity now allows uncle headers to have timestamp set to arbitrary future value.
+
+- Stable Backporting ([#4633](https://github.com/paritytech/parity/pull/4633)) [#4642](https://github.com/paritytech/parity/pull/4642)
+  - Tweak some checks.
+  - Fixed build and added a difficulty test
+  - Bump to v1.4.12
+- Add missing maxCodeSize [#4585](https://github.com/paritytech/parity/pull/4585)
+
+## Parity [v1.5.3](https://github.com/paritytech/parity/releases/tag/v1.5.3) (2017-02-20)
+
+This is a maintenance release that fixes a number of stability issues. Notably this resolves an issue where Parity would allow a pre EIP-155 transaction into the sealed block.
+
+See [full list of changes](https://github.com/paritytech/parity/compare/v1.5.2...v1.5.3):
+
+- Bump to v1.5.3 [#4611](https://github.com/paritytech/parity/pull/4611)
+- Handle invalid ABI retrieved from address_book gracefully ([#4606](https://github.com/paritytech/parity/pull/4606)) [#4610](https://github.com/paritytech/parity/pull/4610)
+  - Handle invalid ABI gracefully
+  - Also include failed abi in log
+- Backporting to beta [#4602](https://github.com/paritytech/parity/pull/4602)
+  - Static link for snappy
+  - added 3 warpnodes for ropsten ([#4289](https://github.com/paritytech/parity/pull/4289))
+  - Fixed indentation
+- Validate transaction before adding to the queue [#4600](https://github.com/paritytech/parity/pull/4600)
+- Beta backports [#4569](https://github.com/paritytech/parity/pull/4569)
+  - Fixing evmbin compilation and added standard build. ([#4561](https://github.com/paritytech/parity/pull/4561))
+  - Alias for personal_sendTransaction ([#4554](https://github.com/paritytech/parity/pull/4554))
+  - Fix console dapp ([#4544](https://github.com/paritytech/parity/pull/4544))
+  - Fixing linting issues. Better support for console as secure app
+  - Fixing linting issues
+  - Fix no data sent in TxQueue dapp ([#4502](https://github.com/paritytech/parity/pull/4502))
+  - Fix wrong PropType req for Embedded Signer
+  - Fix wrong data for tx #4499
+- Explicitly set seconds to 0 from selector ([#4559](https://github.com/paritytech/parity/pull/4559)) [#4571](https://github.com/paritytech/parity/pull/4571)
+  - Explicitly set seconds/milli to 0
+  - Use condition time & block setters consistently
+  - Fix failing test
+  - test for 0 ms & sec
+  - It cannot hurt, clone date before setting
+  - Prettier date test constants (OCD)
+- Remove invalid expectation [#4542](https://github.com/paritytech/parity/pull/4542)
+- Skip OOG check for simple transfers [#4558](https://github.com/paritytech/parity/pull/4558) [#4560](https://github.com/paritytech/parity/pull/4560)
+ - Skip OOG check for simple transfers [#4558](https://github.com/paritytech/parity/pull/4558)
+ - Fix failing test
+
+## Parity [v1.4.11](https://github.com/paritytech/parity/releases/tag/v1.4.11) (2017-02-17)
+
+This release corrects the Ropsten chain specification file.
+
+- Bump to v1.4.11 [#4587](https://github.com/paritytech/parity/pull/4587)
+- Fixing etherscan price parsing ([#4202](https://github.com/paritytech/parity/pull/4202)) [#4209](https://github.com/paritytech/parity/pull/4209)
+ - Fixing etherscan price parsing
+ - Handling all errors
+- Removed pdbs
+- Add missing maxCodeSize [#4585](https://github.com/paritytech/parity/pull/4585)
+
+## Parity [v1.5.2](https://github.com/paritytech/parity/releases/tag/v1.5.2) (2017-02-08)
+
+This release brings a few stability fixes along with a feature that allows queuing transactions that are activated and send out on selected date or block number.
+- Debian packages have been updated to require `libssl1.0.0` for better compatibility.
+- eth_sign (and parity_postSign) used to return concatenated r ++ s ++ v with v being 0 or 1. it now agrees with geth as v ++ r ++ s with v being 27 or 28.
+
+Parity Wallet
+- Accounts & ShapeShift integration now displays QR code for scanning from mobile wallets
+- Dapp integration now allows for the selection of available accounts and the setting of the default account
+- Transaction creation now allows for the selection of future blocks or timestamps after which the transaction is released
+
+Parity Extension
+- First release of the Parity Extension, allowing for Parity integration from web-based dapps
+
+See [full list of changes](https://github.com/paritytech/parity/compare/v1.5.0...v1.5.2):
+- Work with string numbers in contract (Fixes #4472) ([#4478](https://github.com/paritytech/parity/pull/4478)) [#4480](https://github.com/paritytech/parity/pull/4480)
+- Eth_sign improvements backport [#4473](https://github.com/paritytech/parity/pull/4473)
+  - Fix postsign ([#4347](https://github.com/paritytech/parity/pull/4347))
+  - Fix whitespace.
+  - Fix post sign.
+  - Fix message.
+  - Fix tests.
+  - Rest of the problems.
+  - All hail the linter and its omniscience.
+  - ...and its divine omniscience.
+  - Grumbles and wording.
+  - Make signing compatible with geth. ([#4468](https://github.com/paritytech/parity/pull/4468))
+- Sort gas price corpus when hitting genesis [#4471](https://github.com/paritytech/parity/pull/4471)
+- Wallet dev chain fix [#4466](https://github.com/paritytech/parity/pull/4466)
+- Fixing histogram again [#4464](https://github.com/paritytech/parity/pull/4464)
+- Beta backports [#4462](https://github.com/paritytech/parity/pull/4462)
+  - Support HTML5-routed dapps ([#4173](https://github.com/paritytech/parity/pull/4173))
+  - Fix compilation on latest nightly
+  - Updating precompiled
+- Fix Portal scrolling getting stuck [#4456](https://github.com/paritytech/parity/pull/4456)
+  - Fix Portal scrolling getting stuck
+  - DappCard container flex
+  - Container height to 100%
+- Fix AccountCard stretch to 100% [#4451](https://github.com/paritytech/parity/pull/4451)
+- Fix wrong output format of peers ([#4270](https://github.com/paritytech/parity/pull/4270)) [#4442](https://github.com/paritytech/parity/pull/4442)
+  - Fix wrong output format of peers
+  - Add outPeer tests
+- Opening extension page without inline installation [#4441](https://github.com/paritytech/parity/pull/4441)
+  - Open popup without attempting inline
+  - Cater for all .web3.site addresses
+- Fix svg extension image webpack inlining [#4437](https://github.com/paritytech/parity/pull/4437)
+- Backporting to beta [#4434](https://github.com/paritytech/parity/pull/4434)
+  - Bump to v1.5.2
+  - Fix eth_sign/parity_postSign ([#4432](https://github.com/paritytech/parity/pull/4432))
+  - Fix dispatch for signing.
+  - Remove console log
+  - Fix signing & tests.
+- Returning default account as coinbase [#4431](https://github.com/paritytech/parity/pull/4431)
+  - Returning first address as coinbase
+  - Allowing sender alteration in signer
+  - Adding default account RPC
+- UI updates for 1.5.1 [#4429](https://github.com/paritytech/parity/pull/4429)
+  - S/Delete Contract/Forget Contract/ ([#4237](https://github.com/paritytech/parity/pull/4237))
+  - Adjust the location of the signer snippet ([#4155](https://github.com/paritytech/parity/pull/4155))
+  - Additional building-block UI components ([#4239](https://github.com/paritytech/parity/pull/4239))
+  - Currency WIP
+  - Expand tests
+  - Pass className
+  - Add QrCode
+  - Export new components in ~/ui
+  - S/this.props.netSymbol/netSymbol/
+  - Fix import case
+  - Ui/SectionList component ([#4292](https://github.com/paritytech/parity/pull/4292))
+  - Array chunking utility
+  - Add SectionList component
+  - Add TODOs to indicate possible future work
+  - Add missing overlay style (as used in dapps at present)
+  - Add a Playground for the UI Components ([#4301](https://github.com/paritytech/parity/pull/4301))
+  - Playground // WIP
+  - Linting
+  - Add Examples with code
+  - CSS Linting
+  - Linting
+  - Add Connected Currency Symbol
+  - 2015-2017
+  - Added `renderSymbol` tests
+  - PR grumbles
+  - Add Eth and Btc QRCode examples
+  - 2015-2017
+  - Add tests for playground
+  - Fixing tests
+  - Split Dapp icon into ui/DappIcon ([#4308](https://github.com/paritytech/parity/pull/4308))
+  - Add QrCode & Copy to ShapeShift ([#4322](https://github.com/paritytech/parity/pull/4322))
+  - Extract CopyIcon to ~/ui/Icons
+  - Add copy & QrCode address
+  - Default size 4
+  - Add bitcoin: link
+  - Use protocol links applicable to coin exchanged
+  - Remove .only
+  - Display QrCode for accounts, addresses & contracts ([#4329](https://github.com/paritytech/parity/pull/4329))
+  - Allow Portal to be used as top-level modal ([#4338](https://github.com/paritytech/parity/pull/4338))
+  - Portal
+  - Allow Portal to be used in as both top-level and popover
+  - Modal/popover variable naming
+  - Export Portal in ~/ui
+  - Properly handle optional onKeyDown
+  - Add simple Playground Example
+  - Add proper event listener to Portal ([#4359](https://github.com/paritytech/parity/pull/4359))
+  - Display AccountCard name via IdentityName ([#4235](https://github.com/paritytech/parity/pull/4235))
+  - Fix signing ([#4363](https://github.com/paritytech/parity/pull/4363))
+  - Dapp Account Selection & Defaults ([#4355](https://github.com/paritytech/parity/pull/4355))
+  - Add parity_defaultAccount RPC (with subscription) ([#4383](https://github.com/paritytech/parity/pull/4383))
+  - Default Account selector in Signer overlay ([#4375](https://github.com/paritytech/parity/pull/4375))
+  - Typo, fixes #4271 ([#4391](https://github.com/paritytech/parity/pull/4391))
+  - Fix ParityBar account selection overflows ([#4405](https://github.com/paritytech/parity/pull/4405))
+  - Available Dapp selection alignment with Permissions (Portal) ([#4374](https://github.com/paritytech/parity/pull/4374))
+  - Registry dapp: make lookup use lower case ([#4409](https://github.com/paritytech/parity/pull/4409))
+  - Dapps use defaultAccount instead of own selectors ([#4386](https://github.com/paritytech/parity/pull/4386))
+  - Poll for defaultAccount to update dapp & overlay subscriptions ([#4417](https://github.com/paritytech/parity/pull/4417))
+  - Poll for defaultAccount (Fixes #4413)
+  - Fix nextTimeout on catch
+  - Store timers
+  - Re-enable default updates on change detection
+  - Add block & timestamp conditions to Signer ([#4411](https://github.com/paritytech/parity/pull/4411))
+  - Extension installation overlay ([#4423](https://github.com/paritytech/parity/pull/4423))
+  - Extension installation overlay
+  - Pr gumbles
+  - Spelling
+  - Update Chrome URL
+  - Fix for non-included jsonrpc
+  - Extend Portal component (as per Modal) [#4392](https://github.com/paritytech/parity/pull/4392)
+- Transaction timestamp condition [#4427](https://github.com/paritytech/parity/pull/4427)
+- Fixing embedded bar not closing in chrome extension [#4421](https://github.com/paritytech/parity/pull/4421)
+- Backporting to beta [#4418](https://github.com/paritytech/parity/pull/4418)
+  - Bump to 1.5.1
+  - Disable notifications ([#4243](https://github.com/paritytech/parity/pull/4243))
+  - Fix wrong token handling ([#4254](https://github.com/paritytech/parity/pull/4254))
+  - Fixing wrong token displayed
+  - Linting
+  - Revert filtering out
+  - Revert the revert
+  - Don't panic on uknown git commit hash ([#4231](https://github.com/paritytech/parity/pull/4231))
+  - Additional logs for own transactions ([#4278](https://github.com/paritytech/parity/pull/4278))
+  - Integration with zgp whitelist contract ([#4215](https://github.com/paritytech/parity/pull/4215))
+  - Zgp-transactions checker
+  - Polishing
+  - Rename + refactor
+  - Refuse-service-transactions cl option
+  - Fixed tests compilation
+  - Renaming signAndSendTransaction to sendTransaction ([#4351](https://github.com/paritytech/parity/pull/4351))
+  - Fixed deadlock in external_url ([#4354](https://github.com/paritytech/parity/pull/4354))
+  - Fixing web3 in console ([#4382](https://github.com/paritytech/parity/pull/4382))
+  - Fixing estimate gas in case histogram is not available ([#4387](https://github.com/paritytech/parity/pull/4387))
+  - Restarting fetch client every now and then ([#4399](https://github.com/paritytech/parity/pull/4399))
+- Embeddable ParityBar ([#4222](https://github.com/paritytech/parity/pull/4222)) [#4287](https://github.com/paritytech/parity/pull/4287)
+  - Embeddable ParityBar
+  - Replacing storage with store
+  - Fixing  references.
+  - Addressing style issues
+  - Supporting parity background
+
+## Parity [v1.5.0: "Nativity"](https://github.com/paritytech/parity/releases/tag/v1.5.0) (2017-01-19)
+
+Major feature release including _Tendermint_ consensus engine, _Multisig wallet_ support, _badge/certification_ UI integration and _automatic updates_.
+
+Directories:
+
+- New XDG-informed Parity data directory structure. Base dir (`--base-path` or `-d`) that defaulted to `$HOME/.parity` is changed to:
+  - `/Users/You/AppData/Roaming/Parity/Ethereum` on Windows
+  - `/Users/you/Library/Application Support/io.parity.ethereum` on MacOS
+  - `/home/you/.local/share/parity` on Linux/Unix
+- Keys are now stored in chain-specific directories . On first run of 1.5, all keys will be moved into the key's directory of the chain you run. You'll need to move the wallet files between directories manually if you wish to split them between testnet/mainnet.
+- `--db-path` option now controls the path just for the databases, not for keys (`--keys-path`) or dapps (`--dapps-path`).
+
+Basics:
+
+- Version tracking, consensus-protection, hypervised auto-updating:
+  - Parity will ensure syncing is paused if its version cannot support an upcoming hard-fork (disable with `--no-consensus`).
+  - Parity will automatically download the latest version and may be updated through Parity Wallet (disable with `--no-download`)
+  - Parity can automatically update and seamlessly restart to later versions in the same release track (enable with `--auto-update=all` or `--auto-update=critical`).
+  - Parity hypervisor will automatically run the latest version (disable with `--force-direct`).
+- Fat database; to enable, sync the chain with the option `--fat-db`.
+  - Accounts and storage entries can be enumerated.
+  - Chain state can be exported to JSON for analysis with `parity export state`.
+- CLI and config options renamed: all variants of `--signer` are renamed to `--ui`.
+- Log files are appended by default rather than truncated (useful for daemon deployments).
+
+Parity Wallet:
+
+- Multisig wallet support: "New Wallet" button in the "Accounts" section allows you to create a new multisig wallet or import an existing one.
+- Solidity compiler: "Develop Contract" button in the "Contracts" section allows you to write, edit, compile and deploy contracts.
+- SMS & e-mail verification: Accounts can now be certified as verified using Parity's SMS and e-Mail verification/registration oracle.
+- Badge/certification integration: The `BadgeReg` contract can be used to deploy additional certifications.
+- Local transaction propagation tracking: "TxQueue Viewer" in the "Applications" section allows you to track and resubmit previously sent transactions.
+- Contract executions can now have gas and gas-price configured.
+- Signer can now alter the gas and gas-price of transactions at password-entry.
+- The deprecated Chrome "Signer" extension is now incompatible.
+
+[Proof of Authority](https://github.com/paritytech/parity/wiki/Proof-of-Authority-Chains):
+
+- Authority Round consensus engine: `engine: authorityRound {...}`; this is a high-performance Proof-of-Authority consensus engine. It is not BFT under normal circumstances (however the `--force-sealing` flag can be used to ensure consensus even with Byzantine nodes).
+- Tendermint Engine: `engine: tendermint {...}`; this is an experimental Proof-of-Authority consensus engine. BFT up to one third of the authorities and falling back to delayed finalization chain ordering (50% fault tolerant).
+- Generic seal JSON spec includes engine-specific types (`seal: { generic: { rlp: "0x..." } }` becomes `seal: { authority_round { step: 0, signature: "0x..." } }`.
+- To set a node as authority either `--engine-signer ADDRESS` should be used with `--password` or `parity_setEngineSigner(address, password)` RPC should be called. Unlocking the account permanently or using `--author` is now unnecessary.
+- Set of authorities can now be specified using a [list or a contract](https://github.com/paritytech/parity/wiki/Consensus-Engines#validator-engines).
+
+Chains:
+
+- Dev chain: `--chain=dev`; instant seal engine (no mining needed). Great for development work.
+- Ropsten chain (`--chain=ropsten` or `--chain=testnet`) configures for Ropsten, the new test net.
+- Morden chain (`--chain=morden`) changed to "Classic" rules and stays as the Ethereum Classic test net.
+
+RPCs/APIs:
+
+- All JSON-RPC interfaces have strict JSON deserialization - no extra fields are allowed.
+- `eth_sign` RPC now hashes given data instead of getting the hash.
+- `signer_confirmRequestWithToken`: additional RPC for signing transactions with a rotating token, alleviating the need for keeping an account password in memory.
+- `eth_signTransaction` now conforms to the specification, `eth_submitTransaction` is introduced.
+
+Full changes:
+
+- Backporting to beta [#4211](https://github.com/paritytech/parity/pull/4211)
+  - JsonRPC bump for IPC fix
+  - Fixing etherscan price parsing ([#4202](https://github.com/paritytech/parity/pull/4202))
+  - Handling all errors
+  - Fixed --base-path on windows ([#4193](https://github.com/paritytech/parity/pull/4193))
+  - Add support for optional args with default text
+  - Fixing minimal transaction queue price ([#4204](https://github.com/paritytech/parity/pull/4204))
+  - Fixing tests
+  - verification: add mainnet BadgeReg ids ([#4190](https://github.com/paritytech/parity/pull/4190))
+  - verification: fetch contracts by name
+  - verification: better wording
+  - typo
+  - reregistered badges
+  - Console now has admin ([#4220](https://github.com/paritytech/parity/pull/4220))
+  - Fixes [#4210](https://github.com/paritytech/parity/pull/4210)
+  - Non-secure for DappReg ([#4216](https://github.com/paritytech/parity/pull/4216))
+- Backporting to beta [#4203](https://github.com/paritytech/parity/pull/4203)
+  - Minor typo to ensure it updates only when synced. ([#4188](https://github.com/paritytech/parity/pull/4188))
+  - Updater fixes ([#4196](https://github.com/paritytech/parity/pull/4196))
+  - Minor typo to ensure it updates only when synced.
+  - Fix deadlock.
+  - Skip unneeded arg in making list.
+  - Allow auto-restart even when not running an update.
+  - Fix trace.
+  - Update update info on each loop.
+  - Fix build.
+  - Shutdown all sockets
+  - Remove superfluous use.
+  - Poll for upgrades as part of global status (long) ([#4197](https://github.com/paritytech/parity/pull/4197))
+  - Fix path
+  - Prevent duplicate incoming connections ([#4180](https://github.com/paritytech/parity/pull/4180))
+- Gas_limit for blocks, mined by Parity will be divisible by 37 ([#4154](https://github.com/paritytech/parity/pull/4154)) [#4176](https://github.com/paritytech/parity/pull/4176)
+  - gas_limit for new blocks will divide evenly by 13
+  - increased PARITY_GAS_LIMIT_DETERMINANT to 37
+  - separate method for marking mined block
+  - debug_asserts(gas_limit within protocol range)
+  - round_block_gas_limit method is now static
+  - made round_block_gas_limit free-function
+  - multiplier->multiple
+- Backporting to beta [#4175](https://github.com/paritytech/parity/pull/4175)
+  - verification: check if server is running ([#4140](https://github.com/paritytech/parity/pull/4140))
+  - verification: check if server is running
+  - See also ethcore/email-verification#67c6466 and ethcore/sms-verification#a585e42.
+  - verification: show in the UI if server is running
+  - verification: code style ✨, more i18n
+  - fix i18n key
+  - Optimized hash lookups ([#4144](https://github.com/paritytech/parity/pull/4144))
+  - Optimize hash comparison
+  - Use libc
+  - Ropsten fork detection ([#4163](https://github.com/paritytech/parity/pull/4163))
+  - Stop flickering + added loader in AddressSelector ([#4149](https://github.com/paritytech/parity/pull/4149))
+  - Stop UI flickering + added loader to AddressSelector [#4103](https://github.com/paritytech/parity/pull/4103)
+  - PR Grumbles
+  - Add a password strength component ([#4153](https://github.com/paritytech/parity/pull/4153))
+  - Added new PasswordStrength Component
+  - Added tests
+  - PR Grumbles
+  - icarus -> update, increase web timeout. ([#4165](https://github.com/paritytech/parity/pull/4165))
+  - Fix estimate gas
+  - Fix token images // Error in Contract Queries ([#4169](https://github.com/paritytech/parity/pull/4169))
+  - Fix dapps not loading ([#4170](https://github.com/paritytech/parity/pull/4170))
+  - Add secure to dappsreg
+  - Remove trailing slash // fix dapps
+- Bumping hyper [#4168](https://github.com/paritytech/parity/pull/4168)
+  - Bumping hyper
+  - Bumping again
+- Backporting to beta [#4158](https://github.com/paritytech/parity/pull/4158)
+  - Remove onSubmit of current (no auto-change on password edit) ([#4151](https://github.com/paritytech/parity/pull/4151))
+  - Remove onSubmit from current password
+  - Remove onSubmit from hint
+  - Pull in console dapp as builtin ([#4145](https://github.com/paritytech/parity/pull/4145))
+  - Copy static dapps from static (no build)
+  - Console sources
+  - Add console to builtins
+  - Remove console assets
+  - Disable eslint on console.js
+  - Enable eslint after disable
+  - Webpack copy
+- Backporting to beta [#4152](https://github.com/paritytech/parity/pull/4152)
+  - Fix broken transfer total balance ([#4127](https://github.com/paritytech/parity/pull/4127))
+  - Add proper label to method decoding inputs ([#4136](https://github.com/paritytech/parity/pull/4136))
+  - Another minor estimation fix ([#4133](https://github.com/paritytech/parity/pull/4133))
+  - Return 0 instead of error with out of gas on estimate_gas
+  - Fix stuff up.
+  - Another estimate gas fix.
+  - Alter balance to maximum possible rather than GP=0.
+  - Only increase to amount strictly necessary.
+  - Get rid of unsafe code in ethkey, propagate incorrect Secret errors. ([#4119](https://github.com/paritytech/parity/pull/4119))
+  - Implementing secret
+  - Fixing tests
+  - Refactor VoteCollector ([#4101](https://github.com/paritytech/parity/pull/4101))
+  - dir
+  - simple validator list
+  - stub validator contract
+  - make the engine hold Weak<Client> instead of IoChannel
+  - validator set factory
+  - register weak client with ValidatorContract
+  - check chain security
+  - add address array to generator
+  - register provider contract
+  - update validator set on notify
+  - add validator contract spec
+  - simple list test
+  - split update and contract test
+  - contract change
+  - use client in tendermint
+  - fix deadlock
+  - step duration in params
+  - adapt tendermint tests
+  - add storage fields to test spec
+  - constructor spec
+  - execute under wrong address
+  - create under correct address
+  - revert
+  - validator contract constructor
+  - move genesis block lookup
+  - add removal ability to contract
+  - validator contract adding validators
+  - fix basic authority
+  - validator changing test
+  - more docs
+  - update sync tests
+  - remove env_logger
+  - another env_logger
+  - cameltoe
+  - hold EngineClient instead of Client
+  - return error on misbehaviour
+  - nicer return
+  - sprinkle docs
+  - Reenable mainnet update server. ([#4137](https://github.com/paritytech/parity/pull/4137))
+  - basic tests for subscribeToEvents ([#4115](https://github.com/paritytech/parity/pull/4115))
+  - subscribeToEvent fixtures ✅
+  - subscribeToEvent tests ✅
+  - temporarily skip failing test ([#4138](https://github.com/paritytech/parity/pull/4138))
+  - Improvements and optimisations to estimate_gas ([#4142](https://github.com/paritytech/parity/pull/4142))
+  - Return 0 instead of error with out of gas on estimate_gas
+  - Fix stuff up.
+  - Another estimate gas fix.
+  - Alter balance to maximum possible rather than GP=0.
+  - Only increase to amount strictly necessary.
+  - Improvements and optimisations to estimate_gas.
+  - Introduce proper error type
+  - Avoid building costly traces
+  - Fix tests.
+  - Actually fix testsActually fix tests
+  - Use estimateGas error (as per updated implementation) ([#4131](https://github.com/paritytech/parity/pull/4131))
+  - EXCEPTION_ERROR as per #4142
+  - Better error log reporting & handling ([#4128](https://github.com/paritytech/parity/pull/4128))
+  - Don't pop-up notifications after network switch ([#4076](https://github.com/paritytech/parity/pull/4076))
+  - Better notifications
+  - Don't pollute with notifs if switched networks
+  - Better connection close/open events / No more notifs on change network
+  - PR Grumbles
+  - Add close and open events to HTTP // Add tests
+  - Fix tests
+  - WIP Signer Fix
+  - Fix Signer // Better reconnection handling
+  - PR Grumbles
+  - PR Grumbles
+  - Fixes wrong fetching of balances + Notifications
+  - Secure API WIP
+  - Updated Secure API Connection + Status
+  - Linting
+  - Updated Secure API Logic
+  - Proper handling of token updates // Fixing poping notifications
+  - PR Grumbles
+  - Fixing tests
+  - Trim spaces from InputAddress ([#4126](https://github.com/paritytech/parity/pull/4126))
+  - Trim spaces for addresses
+  - onSubmit has only value, not event
+  - onSubmit (again)
+  - Length check on trimmed value
+  - Remove bindActionCreators({}, dispatch) (empty) ([#4135](https://github.com/paritytech/parity/pull/4135))
+- Backporting to beta [#4118](https://github.com/paritytech/parity/pull/4118)
+  - Ignore get_price_info test by default. ([#4112](https://github.com/paritytech/parity/pull/4112))
+  - Auto-detect hex encoded bytes in sha3 ([#4108](https://github.com/paritytech/parity/pull/4108))
+  - Using types/isHex
+  - Removing unused imports
+  - Use binary chop to estimate gas accurately ([#4100](https://github.com/paritytech/parity/pull/4100))
+  - Initial sketch.
+  - Building.
+  - Fix a few things.
+  - Fix issue, add tracing.
+  - Address grumbles
+  - Raise upper limit if needed
+  - Fix test.
+  - Fixing decoding API with signatures in names ([#4125](https://github.com/paritytech/parity/pull/4125))
+  - Fix call/estimate_gas ([#4121](https://github.com/paritytech/parity/pull/4121))
+  - Return 0 instead of error with out of gas on estimate_gas
+  - Fix stuff up.
+- Current release: 1.3 -> 1.4 [#4183](https://github.com/paritytech/parity/pull/4183)
+- Fix rebroadcast panic [#4084](https://github.com/paritytech/parity/pull/4084)
+- Use shallow-only rendering in all tests [#4087](https://github.com/paritytech/parity/pull/4087)
+- Sending transactions in chunks [#4089](https://github.com/paritytech/parity/pull/4089)
+- Move to new auto-update server. [#4091](https://github.com/paritytech/parity/pull/4091)
+- Fixing compilation without dapps. [#4088](https://github.com/paritytech/parity/pull/4088)
+- Fix balances update [#4077](https://github.com/paritytech/parity/pull/4077)
+- Key derivation in Worker [#4071](https://github.com/paritytech/parity/pull/4071)
+- Display contract block creation [#4069](https://github.com/paritytech/parity/pull/4069)
+- Improving logs for transactions sync and disable re-broadcasting while syncing [#4065](https://github.com/paritytech/parity/pull/4065)
+- Passwords are valid by default [#4075](https://github.com/paritytech/parity/pull/4075)
+- Show Origin label to events table [#4073](https://github.com/paritytech/parity/pull/4073)
+- Fix tags not working [#4070](https://github.com/paritytech/parity/pull/4070)
+- Zero-alloc trie lookups [#3998](https://github.com/paritytech/parity/pull/3998)
+- Opening local dapp [#4041](https://github.com/paritytech/parity/pull/4041)
+- Bringing back `js-sha3` to fix in-browser signing [#4063](https://github.com/paritytech/parity/pull/4063)
+- Fix wrong transaction input for contract deployments [#4052](https://github.com/paritytech/parity/pull/4052)
+- Re-broadcast transactions to few random peers on each new block. [#4054](https://github.com/paritytech/parity/pull/4054)
+- Removing old transactions from the queue [#4046](https://github.com/paritytech/parity/pull/4046)
+- Add block rewards to more Engines [#4055](https://github.com/paritytech/parity/pull/4055)
+- Return old trie values on insert and remove [#4053](https://github.com/paritytech/parity/pull/4053)
+- Let users open urls from dapps view [#4042](https://github.com/paritytech/parity/pull/4042)
+- Util/validation update [#4051](https://github.com/paritytech/parity/pull/4051)
+- Convert ShapeShift modal to store [#4035](https://github.com/paritytech/parity/pull/4035)
+- Using local path on Windows [#4017](https://github.com/paritytech/parity/pull/4017)
+- Fixing minGasLimit > ceil limit mining issue [#4018](https://github.com/paritytech/parity/pull/4018)
+- Naive light client synchronization [#3892](https://github.com/paritytech/parity/pull/3892)
+- Starting on homestead shows reload snackbar [#4043](https://github.com/paritytech/parity/pull/4043)
+- Show contract parameters in MethodDecoding [#4024](https://github.com/paritytech/parity/pull/4024)
+- UI component updates [#4010](https://github.com/paritytech/parity/pull/4010)
+- Account view updates [#4008](https://github.com/paritytech/parity/pull/4008)
+- Better error messages for PoA chains [#4034](https://github.com/paritytech/parity/pull/4034)
+- Make some spec fields optional [#4019](https://github.com/paritytech/parity/pull/4019)
+- Basic account type [#4021](https://github.com/paritytech/parity/pull/4021)
+- Fix wallet in main net [#4038](https://github.com/paritytech/parity/pull/4038)
+- Removing orphaned Cargo.toml [#4032](https://github.com/paritytech/parity/pull/4032)
+- Address selector: support reverse lookup [#4033](https://github.com/paritytech/parity/pull/4033)
+- Only fetch App when necessary [#4023](https://github.com/paritytech/parity/pull/4023)
+- Connection UI cleanups & tests for prior PR [#4020](https://github.com/paritytech/parity/pull/4020)
+- Unsubscribe error on ShapeShift modal close [#4005](https://github.com/paritytech/parity/pull/4005)
+- Add ownership checks the Registry dApp [#4001](https://github.com/paritytech/parity/pull/4001)
+- Refresh balances of contacts & contracts when syncing [#4022](https://github.com/paritytech/parity/pull/4022)
+- Show message on new chain [#4016](https://github.com/paritytech/parity/pull/4016)
+- Use TypedInputs in Contracts view [#4015](https://github.com/paritytech/parity/pull/4015)
+- Fix focus on Modal [#4014](https://github.com/paritytech/parity/pull/4014)
+- Fix newError noops when not bound to dispacher [#4013](https://github.com/paritytech/parity/pull/4013)
+- Parse testnet chain as ropsten [#4004](https://github.com/paritytech/parity/pull/4004)
+- Work on Portal Style [#4003](https://github.com/paritytech/parity/pull/4003)
+- Make Wallet first-class citizens [#3990](https://github.com/paritytech/parity/pull/3990)
+- Don't slice non-existent tags [#4000](https://github.com/paritytech/parity/pull/4000)
+- Update dev dependencies and make Webpack less verbose [#3997](https://github.com/paritytech/parity/pull/3997)
+- Correct log index in transaction receipt [#3995](https://github.com/paritytech/parity/pull/3995)
+- Add Email and Registry lookups to Address Selector [#3992](https://github.com/paritytech/parity/pull/3992)
+- Remove node journal: dead code [#3994](https://github.com/paritytech/parity/pull/3994)
+- Cleanup AddContract with store [#3981](https://github.com/paritytech/parity/pull/3981)
+- Store for EditPassword Modal [#3979](https://github.com/paritytech/parity/pull/3979)
+- Additional fetch tests [#3983](https://github.com/paritytech/parity/pull/3983)
+- Owning views of blockchain data [#3982](https://github.com/paritytech/parity/pull/3982)
+- Make test network generic over peer type [#3974](https://github.com/paritytech/parity/pull/3974)
+- Fetch tests (first batch) [#3977](https://github.com/paritytech/parity/pull/3977)
+- Fetch certifiers only when needed [#3978](https://github.com/paritytech/parity/pull/3978)
+- Visible accounts for dapps (default whitelist) [#3898](https://github.com/paritytech/parity/pull/3898)
+- Remove some old (unused/duplicate) files [#3975](https://github.com/paritytech/parity/pull/3975)
+- Port `try` macro to new `?` operator. [#3962](https://github.com/paritytech/parity/pull/3962)
+- Small UI fixes [#3966](https://github.com/paritytech/parity/pull/3966)
+- Fix wrong use of Icons [#3973](https://github.com/paritytech/parity/pull/3973)
+- Updating dependencies [#3968](https://github.com/paritytech/parity/pull/3968)
+- Web Based Dapps [#3956](https://github.com/paritytech/parity/pull/3956)
+- Contract query: render false as false [#3971](https://github.com/paritytech/parity/pull/3971)
+- Email verification: add Terms of Service [#3970](https://github.com/paritytech/parity/pull/3970)
+- Fix method decoding [#3967](https://github.com/paritytech/parity/pull/3967)
+- Store for EditMeta modal [#3959](https://github.com/paritytech/parity/pull/3959)
+- Registry dapp: cleanup, support reverse entries [#3933](https://github.com/paritytech/parity/pull/3933)
+- New Address Selector Component [#3829](https://github.com/paritytech/parity/pull/3829)
+- Limiting accounts returned by parity_accountInfo [#3931](https://github.com/paritytech/parity/pull/3931)
+- Unknown block error for RPC [#3965](https://github.com/paritytech/parity/pull/3965)
+- Remove unused fields in informant [#3963](https://github.com/paritytech/parity/pull/3963)
+- Allow contract constructors in chain spec [#3932](https://github.com/paritytech/parity/pull/3932)
+- Sync reorg up to history size [#3874](https://github.com/paritytech/parity/pull/3874)
+- Rising the limit for fetch [#3964](https://github.com/paritytech/parity/pull/3964)
+- Bring integer arithmetic up to crates.io [#3943](https://github.com/paritytech/parity/pull/3943)
+- Eslint rule for block curlies [#3955](https://github.com/paritytech/parity/pull/3955)
+- Gas exception warnings on deployment [#3938](https://github.com/paritytech/parity/pull/3938)
+- Move verification store into modal [#3951](https://github.com/paritytech/parity/pull/3951)
+- Allow setting of minBlock on sending [#3921](https://github.com/paritytech/parity/pull/3921)
+- Allow empty address [#3961](https://github.com/paritytech/parity/pull/3961)
+- Fix default import [#3960](https://github.com/paritytech/parity/pull/3960)
+- Display 0x00..00 as null [#3950](https://github.com/paritytech/parity/pull/3950)
+- Global Fetch Service [#3915](https://github.com/paritytech/parity/pull/3915)
+- Update babel-loader for WebPack 2.2-rc [#3953](https://github.com/paritytech/parity/pull/3953)
+- Fix Webpack build [#3946](https://github.com/paritytech/parity/pull/3946)
+- Fix manual input token [#3945](https://github.com/paritytech/parity/pull/3945)
+- Update Webpack [#3952](https://github.com/paritytech/parity/pull/3952)
+- Add missing Ethcore -> Parity headers [#3948](https://github.com/paritytech/parity/pull/3948)
+- Code example: do start before register_protocol [#3947](https://github.com/paritytech/parity/pull/3947)
+- Set CHAIN_ID for Classic [#3934](https://github.com/paritytech/parity/pull/3934)
+- Fixed compile error. [#3940](https://github.com/paritytech/parity/pull/3940)
+- Fix dapps not loading [#3935](https://github.com/paritytech/parity/pull/3935)
+- Fix Secure API hangs [#3927](https://github.com/paritytech/parity/pull/3927)
+- Parity_chainStatus RPC for block gap info [#3899](https://github.com/paritytech/parity/pull/3899)
+- Custom attribute for binary serialization  [#3922](https://github.com/paritytech/parity/pull/3922)
+- Split intermediate stage into two. [#3926](https://github.com/paritytech/parity/pull/3926)
+- Move release-registering to intermediate stage. [#3920](https://github.com/paritytech/parity/pull/3920)
+- Blocktime format rounding [#3894](https://github.com/paritytech/parity/pull/3894)
+- Ignore dapps_policy.json [#3919](https://github.com/paritytech/parity/pull/3919)
+- Fixing Contract Development [#3912](https://github.com/paritytech/parity/pull/3912)
+- Use rhash for non-native CI platforms and submit build. [#3911](https://github.com/paritytech/parity/pull/3911)
+- Remove -Zorbit=off from rustflags on windows [#3907](https://github.com/paritytech/parity/pull/3907)
+- Fixed upgrading keys on the first run [#3904](https://github.com/paritytech/parity/pull/3904)
+- Fix deadlock in queue drop [#3903](https://github.com/paritytech/parity/pull/3903)
+- Require only simpler methods on Provider [#3897](https://github.com/paritytech/parity/pull/3897)
+- Fix grammar ("you try" -> "you tried" + article) [#3902](https://github.com/paritytech/parity/pull/3902)
+- Remove light server capability temporarily [#3872](https://github.com/paritytech/parity/pull/3872)
+- Allow retry for future blocks [#3896](https://github.com/paritytech/parity/pull/3896)
+- Consistent engine and seal names [#3895](https://github.com/paritytech/parity/pull/3895)
+- Update email certification ABI [#3893](https://github.com/paritytech/parity/pull/3893)
+- Remove existence & length checks on passwords & phrases [#3854](https://github.com/paritytech/parity/pull/3854)
+- Refresh certifications automatically [#3878](https://github.com/paritytech/parity/pull/3878)
+- Fix Wallet Settings Modal [#3856](https://github.com/paritytech/parity/pull/3856)
+- Fix difficulty adjustment. [#3884](https://github.com/paritytech/parity/pull/3884)
+- Final fixups for updater [#3883](https://github.com/paritytech/parity/pull/3883)
+- Attempt to fix windows CI. [#3882](https://github.com/paritytech/parity/pull/3882)
+- Fixing racy test [#3881](https://github.com/paritytech/parity/pull/3881)
+- Fix updater permissions [#3880](https://github.com/paritytech/parity/pull/3880)
+- Delayed transactions [#3865](https://github.com/paritytech/parity/pull/3865)
+- Don't log auth token [#3853](https://github.com/paritytech/parity/pull/3853)
+- Loading default config from default path [#3875](https://github.com/paritytech/parity/pull/3875)
+- New paths [#3877](https://github.com/paritytech/parity/pull/3877)
+- Update tests, gitlabci [#3876](https://github.com/paritytech/parity/pull/3876)
+- Base directory option [#3868](https://github.com/paritytech/parity/pull/3868)
+- Auto-updating [#3505](https://github.com/paritytech/parity/pull/3505)
+- Fix naming collision [#3873](https://github.com/paritytech/parity/pull/3873)
+- Get rid of unecessary redirection while fetching content [#3858](https://github.com/paritytech/parity/pull/3858)
+- Fix verification stores [#3864](https://github.com/paritytech/parity/pull/3864)
+- Store subscriptionId, align with main subscription model [#3863](https://github.com/paritytech/parity/pull/3863)
+- Additional RPCs for dapps accounts management [#3792](https://github.com/paritytech/parity/pull/3792)
+- Add Ws Json rpc client and command line utils (take 2) [#3830](https://github.com/paritytech/parity/pull/3830)
+- Fix typo in method call (broken contract interface) [#3862](https://github.com/paritytech/parity/pull/3862)
+- Fix flaky test [#3860](https://github.com/paritytech/parity/pull/3860)
+- Converting traces API to AutoArgs [#3844](https://github.com/paritytech/parity/pull/3844)
+- Get certifications from BadgeReg, show them in accounts overview [#3768](https://github.com/paritytech/parity/pull/3768)
+- New directory structure [#3828](https://github.com/paritytech/parity/pull/3828)
+- First run: skip account creation if they already have accounts [#3827](https://github.com/paritytech/parity/pull/3827)
+- Tendermint seal [#3857](https://github.com/paritytech/parity/pull/3857)
+- Tendermint Engine [#3759](https://github.com/paritytech/parity/pull/3759)
+- Expand lint to catch css issues [#3852](https://github.com/paritytech/parity/pull/3852)
+- Inject exports both partiy & web3 [#3851](https://github.com/paritytech/parity/pull/3851)
+- Let Webpack talk again [#3848](https://github.com/paritytech/parity/pull/3848)
+- AuthorityRound seal and simplify Generic seal Spec [#3843](https://github.com/paritytech/parity/pull/3843)
+- Signing transactions with rotating token [#3691](https://github.com/paritytech/parity/pull/3691)
+- Bump dev chain [#3835](https://github.com/paritytech/parity/pull/3835)
+- Spelling [#3839](https://github.com/paritytech/parity/pull/3839)
+- Email verification [#3766](https://github.com/paritytech/parity/pull/3766)
+- Network configuration for Ethereum Classic [#3812](https://github.com/paritytech/parity/pull/3812)
+- Using jsonrpc-macros [#3831](https://github.com/paritytech/parity/pull/3831)
+- Fixed bool dropdown in contract execution [#3823](https://github.com/paritytech/parity/pull/3823)
+- Avoid broadcasting transactions to peers that send them [#3796](https://github.com/paritytech/parity/pull/3796)
+- Eth_sign RPC now hashes given data instead of getting the hash [#3800](https://github.com/paritytech/parity/pull/3800)
+- Add store for MethodDecoding [#3821](https://github.com/paritytech/parity/pull/3821)
+- Add store for AddAddress [#3819](https://github.com/paritytech/parity/pull/3819)
+- Fix React-Router in i18n locale change [#3815](https://github.com/paritytech/parity/pull/3815)
+- Cache fetched Dapps [#3804](https://github.com/paritytech/parity/pull/3804)
+- Authors & homepage => Parity [#3818](https://github.com/paritytech/parity/pull/3818)
+- Rename Ethcore -> Parity Technologies [#3817](https://github.com/paritytech/parity/pull/3817)
+- Allow editing of gasPrice & gas in Signer [#3777](https://github.com/paritytech/parity/pull/3777)
+- I18n string dictionaries [#3532](https://github.com/paritytech/parity/pull/3532)
+- Fix padding in App [#3813](https://github.com/paritytech/parity/pull/3813)
+- Light server improvements and protocol adjustments [#3801](https://github.com/paritytech/parity/pull/3801)
+- Tolerate errors in user_defaults [#3810](https://github.com/paritytech/parity/pull/3810)
+- Block: enforce gas limit falls within engine bounds [#3809](https://github.com/paritytech/parity/pull/3809)
+- Target Babel to latest Chrome Versions in dev [#3806](https://github.com/paritytech/parity/pull/3806)
+- Lowercase npm packages [#3807](https://github.com/paritytech/parity/pull/3807)
+- Extended publishing of libraries to npm [#3786](https://github.com/paritytech/parity/pull/3786)
+- Several Fixes to the UI [#3799](https://github.com/paritytech/parity/pull/3799)
+- Remove "s [#3805](https://github.com/paritytech/parity/pull/3805)
+- Extract CSS to file in production builds [#3783](https://github.com/paritytech/parity/pull/3783)
+- Notify user on transaction received [#3782](https://github.com/paritytech/parity/pull/3782)
+- Removing all old entries from transaction queue [#3772](https://github.com/paritytech/parity/pull/3772)
+- Status page updates [#3774](https://github.com/paritytech/parity/pull/3774)
+- Allow modifications of gas when confirming in signer [#3798](https://github.com/paritytech/parity/pull/3798)
+- Network connectivity fixes [#3794](https://github.com/paritytech/parity/pull/3794)
+- Make *ID names consistent with std Rust (Id) [#3781](https://github.com/paritytech/parity/pull/3781)
+- Update CI builds [#3780](https://github.com/paritytech/parity/pull/3780)
+- Update AuthorityRound tests to new spec [#3790](https://github.com/paritytech/parity/pull/3790)
+- Fixes to the Wallet UI [#3787](https://github.com/paritytech/parity/pull/3787)
+- Add support for wallets without getOwner() interface [#3779](https://github.com/paritytech/parity/pull/3779)
+- Update Material-UI [#3785](https://github.com/paritytech/parity/pull/3785)
+- Fixes error in Transfer modal [#3788](https://github.com/paritytech/parity/pull/3788)
+- LES Part 3: Event handlers and handling responses [#3755](https://github.com/paritytech/parity/pull/3755)
+- Basic UI rendering tests [#3743](https://github.com/paritytech/parity/pull/3743)
+- Network: process packets only after connection handler finishes [#3776](https://github.com/paritytech/parity/pull/3776)
+- AuthorityRound network simulation test [#3778](https://github.com/paritytech/parity/pull/3778)
+- GasPrice selection for contract execution [#3770](https://github.com/paritytech/parity/pull/3770)
+- Reject existing transactions [#3762](https://github.com/paritytech/parity/pull/3762)
+- Allow autoRemove from api.subscribe based on callback return values [#3752](https://github.com/paritytech/parity/pull/3752)
+- Replace misplaced & with && in gitlab-ci.yml [#3753](https://github.com/paritytech/parity/pull/3753)
+- Lower gas usage for creating a Multisig Wallet [#3773](https://github.com/paritytech/parity/pull/3773)
+- Added IO service explicit stop [#3761](https://github.com/paritytech/parity/pull/3761)
+- Be lenient around invalid owners map [#3764](https://github.com/paritytech/parity/pull/3764)
+- GasEditor component [#3750](https://github.com/paritytech/parity/pull/3750)
+- Cleanups [#3742](https://github.com/paritytech/parity/pull/3742)
+- Update babel, fix CI build due to breaking changes [#3754](https://github.com/paritytech/parity/pull/3754)
+- Small fixes to contract [#3751](https://github.com/paritytech/parity/pull/3751)
+- Make engine hold AccountProvider [#3725](https://github.com/paritytech/parity/pull/3725)
+- Properly delete addresses/contracts in addressbook [#3739](https://github.com/paritytech/parity/pull/3739)
+- Display Wallet Owners Icons in Accounts list [#3741](https://github.com/paritytech/parity/pull/3741)
+- Edit Multisig Wallet settings [#3740](https://github.com/paritytech/parity/pull/3740)
+- Replace build directory completely [#3748](https://github.com/paritytech/parity/pull/3748)
+- Add existing release files before merge [#3747](https://github.com/paritytech/parity/pull/3747)
+- Release script back to using fetch/merge [#3746](https://github.com/paritytech/parity/pull/3746)
+- Update with -X only for merge [#3745](https://github.com/paritytech/parity/pull/3745)
+- Give accounts precedence over address_book entries [#3732](https://github.com/paritytech/parity/pull/3732)
+- Enable Panic=abort [#3423](https://github.com/paritytech/parity/pull/3423)
+- Cleanups on js-precompiled [#3738](https://github.com/paritytech/parity/pull/3738)
+- Add parity_removeAddress RPC [#3735](https://github.com/paritytech/parity/pull/3735)
+- Fix up the transaction JSON serialisation for RPC. [#3633](https://github.com/paritytech/parity/pull/3633)
+- Queue: CLI for auto-scaling and num verifiers [#3709](https://github.com/paritytech/parity/pull/3709)
+- Add functionalities to multi-sig wallet [#3729](https://github.com/paritytech/parity/pull/3729)
+- PropTypes as function call [#3731](https://github.com/paritytech/parity/pull/3731)
+- Unify proptypes in util/proptypes.js [#3728](https://github.com/paritytech/parity/pull/3728)
+- Bump jsonrpc-ipc-server to fix windows build [#3730](https://github.com/paritytech/parity/pull/3730)
+- LES Part 2 [#3527](https://github.com/paritytech/parity/pull/3527)
+- First draft of the MultiSig Wallet [#3700](https://github.com/paritytech/parity/pull/3700)
+- Engine block ordering [#3719](https://github.com/paritytech/parity/pull/3719)
+- Use fdlimit utility crate from crates.io [#3716](https://github.com/paritytech/parity/pull/3716)
+- Move decoding for contract deployment logic earlier [#3714](https://github.com/paritytech/parity/pull/3714)
+- Possible fix for queue drop deadlock [#3702](https://github.com/paritytech/parity/pull/3702)
+- Encode networkid as a u64. [#3713](https://github.com/paritytech/parity/pull/3713)
+- Use valid RLP in generic genesis seal spec [#3717](https://github.com/paritytech/parity/pull/3717)
+- Update JS dependencies [#3710](https://github.com/paritytech/parity/pull/3710)
+- Use Webpack Aliases [#3711](https://github.com/paritytech/parity/pull/3711)
+- Dapps-specific accounts [#3627](https://github.com/paritytech/parity/pull/3627)
+- Signer method parameter decoding & destination info [#3671](https://github.com/paritytech/parity/pull/3671)
+- Remove invalid slice test [#3712](https://github.com/paritytech/parity/pull/3712)
+- React library update [#3704](https://github.com/paritytech/parity/pull/3704)
+- New Loading Component for the UI [#3707](https://github.com/paritytech/parity/pull/3707)
+- Refactoring Transfer Modal [#3705](https://github.com/paritytech/parity/pull/3705)
+- Fix extra scrollbars in dapps [#3706](https://github.com/paritytech/parity/pull/3706)
+- Indent state tests [#3431](https://github.com/paritytech/parity/pull/3431)
+- Filter null transactions for display (not available on node) [#3698](https://github.com/paritytech/parity/pull/3698)
+- Move recovery phrase print button [#3697](https://github.com/paritytech/parity/pull/3697)
+- Fix padding bottom needed after fixed status [#3701](https://github.com/paritytech/parity/pull/3701)
+- Don't share the snapshot while downloading old blocks [#3695](https://github.com/paritytech/parity/pull/3695)
+- Button to print recovery phrase [#3694](https://github.com/paritytech/parity/pull/3694)
+- Fix status bar to bottom of the screen [#3692](https://github.com/paritytech/parity/pull/3692)
+- Splitting serialization of signTransaction and sendTransaction confirmation requests [#3642](https://github.com/paritytech/parity/pull/3642)
+- Implement basic badges/certifications/flair [#3665](https://github.com/paritytech/parity/pull/3665)
+- Simplify Container title rendering [#3680](https://github.com/paritytech/parity/pull/3680)
+- Update loading splash to fit in with l&f [#3685](https://github.com/paritytech/parity/pull/3685)
+- Safari UI fixes [#3678](https://github.com/paritytech/parity/pull/3678)
+- Remove strict mode for DappReg (work-around for package upgrade) [#3681](https://github.com/paritytech/parity/pull/3681)
+- Bumping clippy [#3654](https://github.com/paritytech/parity/pull/3654)
+- Return of the Fat DB [#3636](https://github.com/paritytech/parity/pull/3636)
+- Invalidate blocks from future [#3652](https://github.com/paritytech/parity/pull/3652)
+- Make Modal always scrollable [#3667](https://github.com/paritytech/parity/pull/3667)
+- Display local/completed transactions [#3630](https://github.com/paritytech/parity/pull/3630)
+- Added build-essential dep to dockerfiles [#3666](https://github.com/paritytech/parity/pull/3666)
+- Strict config parsing (uknown keys are rejected) [#3663](https://github.com/paritytech/parity/pull/3663)
+- Strict deserialization [#3662](https://github.com/paritytech/parity/pull/3662)
+- Disable peer if no common block found [#3655](https://github.com/paritytech/parity/pull/3655)
+- Show snackbar on password change [#3661](https://github.com/paritytech/parity/pull/3661)
+- Bring back PV62 support [#3660](https://github.com/paritytech/parity/pull/3660)
+- Unlock expecting quantity [#3659](https://github.com/paritytech/parity/pull/3659)
+- Update Webpack => v2 [#3643](https://github.com/paritytech/parity/pull/3643)
+- Update SMS verification [#3579](https://github.com/paritytech/parity/pull/3579)
+- Simplify tx confirmations display [#3559](https://github.com/paritytech/parity/pull/3559)
+- Fixes overflow in Signer tx data [#3657](https://github.com/paritytech/parity/pull/3657)
+- Fixed tab bar not updating [#3653](https://github.com/paritytech/parity/pull/3653)
+- Set default min tx price to $0.0025 [#3617](https://github.com/paritytech/parity/pull/3617)
+- Use accountsInfo instead of eth_accounts for first check [#3618](https://github.com/paritytech/parity/pull/3618)
+- Fix Copy to Clipboard Snackbar [#3619](https://github.com/paritytech/parity/pull/3619)
+- Manually add \r to Windows phrases pre 1.4.5 [#3615](https://github.com/paritytech/parity/pull/3615)
+- Signer layouts to flexbox [#3600](https://github.com/paritytech/parity/pull/3600)
+- Fixing wrong tokens type in Redux store [#3621](https://github.com/paritytech/parity/pull/3621)
+- Add dappreg link to apps list [#3568](https://github.com/paritytech/parity/pull/3568)
+- Smarter balance fetching [#3605](https://github.com/paritytech/parity/pull/3605)
+- Dapp iframe allow forms, allow target=_blank [#3597](https://github.com/paritytech/parity/pull/3597)
+- Align copy button to input field [#3604](https://github.com/paritytech/parity/pull/3604)
+- Appending logs by default [#3609](https://github.com/paritytech/parity/pull/3609)
+- Update test, fix number. [#3612](https://github.com/paritytech/parity/pull/3612)
+- Fixing phrases generated on windows [#3614](https://github.com/paritytech/parity/pull/3614)
+- Check for network ID for live/test matching [#3602](https://github.com/paritytech/parity/pull/3602)
+- Always insert traces for genesis. [#3603](https://github.com/paritytech/parity/pull/3603)
+- Real deleting accounts [#3540](https://github.com/paritytech/parity/pull/3540)
+- Trim whitespace from input recovery phrase [#3599](https://github.com/paritytech/parity/pull/3599)
+- Fix local tx requests  [#3589](https://github.com/paritytech/parity/pull/3589)
+- Fix CPU usage when idle [#3592](https://github.com/paritytech/parity/pull/3592)
+- Don't fetch balances on every new block if syncing [#3591](https://github.com/paritytech/parity/pull/3591)
+- Work around WS in UI [#3587](https://github.com/paritytech/parity/pull/3587)
+- CLI option to disable ancient block downloading [#3573](https://github.com/paritytech/parity/pull/3573)
+- Move Signer balance queries to store for component-wide re-use [#3531](https://github.com/paritytech/parity/pull/3531)
+- Fix wrong method name in `contract.js` [#3580](https://github.com/paritytech/parity/pull/3580)
+- Smarter Tokens fetching [#3546](https://github.com/paritytech/parity/pull/3546)
+- Fix panic on importing own invalid transaction [#3550](https://github.com/paritytech/parity/pull/3550)
+- Use an adaptive number of threads in the verification queue [#2445](https://github.com/paritytech/parity/pull/2445)
+- Faster UI - React Tweaks [#3555](https://github.com/paritytech/parity/pull/3555)
+- Send value & contract execute gas limit warnings [#3512](https://github.com/paritytech/parity/pull/3512)
+- Add TxQueue visibility specifier (not added between merges) [#3566](https://github.com/paritytech/parity/pull/3566)
+- DappRegistry [#3405](https://github.com/paritytech/parity/pull/3405)
+- Import account message [#3552](https://github.com/paritytech/parity/pull/3552)
+- --testnet set to ropsten [#3551](https://github.com/paritytech/parity/pull/3551)
+- Fix flaky test [#3547](https://github.com/paritytech/parity/pull/3547)
+- Sms verification code style [#3564](https://github.com/paritytech/parity/pull/3564)
+- [Registry] Clear input and working buttons [#3563](https://github.com/paritytech/parity/pull/3563)
+- Fix peers not displaying [#3561](https://github.com/paritytech/parity/pull/3561)
+- New registry contract address for ropsten [#3549](https://github.com/paritytech/parity/pull/3549)
+- Use contract Registry fee, not a hard-coded value [#3554](https://github.com/paritytech/parity/pull/3554)
+- Don't query chain in Signer, use Redux isTest [#3524](https://github.com/paritytech/parity/pull/3524)
+- Moving fetching of hash-addressed dapps/content to separate crate. [#3543](https://github.com/paritytech/parity/pull/3543)
+- Ropsten network [#3539](https://github.com/paritytech/parity/pull/3539)
+- Add simple one-line installer to README.md [#3534](https://github.com/paritytech/parity/pull/3534)
+- Propagations & local transactions tracking [#3491](https://github.com/paritytech/parity/pull/3491)
+- Correct format of eth_signTransaction [#3503](https://github.com/paritytech/parity/pull/3503)
+- ABI can be empty and auto-fill contract name [#3518](https://github.com/paritytech/parity/pull/3518)
+- Fix versions for NPM [#3516](https://github.com/paritytech/parity/pull/3516)
+- Better GHH event display & tracking [#3498](https://github.com/paritytech/parity/pull/3498)
+- Dapp section & visibility changes [#3438](https://github.com/paritytech/parity/pull/3438)
+- Fix parity.js badly built [#3526](https://github.com/paritytech/parity/pull/3526)
+- Updated the european warp bootnode addresses [#3528](https://github.com/paritytech/parity/pull/3528)
+- Limit sync reorg to 20 blocks [#3519](https://github.com/paritytech/parity/pull/3519)
+- Revert "Limit sync reorganization to 20 blocks" [#3517](https://github.com/paritytech/parity/pull/3517)
+- Check transaction signature when adding to the queue [#3508](https://github.com/paritytech/parity/pull/3508)
+- Limit sync reorganization to 20 blocks [#3509](https://github.com/paritytech/parity/pull/3509)
+- Keep track of block gasLimit [#3506](https://github.com/paritytech/parity/pull/3506)
+- Smarter Status Polling [#3504](https://github.com/paritytech/parity/pull/3504)
+- Handle solc combined output [#3496](https://github.com/paritytech/parity/pull/3496)
+- Wallet names shouldn't use UUID [#3481](https://github.com/paritytech/parity/pull/3481)
+- Make parity.js usable by Node and Browser [#3475](https://github.com/paritytech/parity/pull/3475)
+- Sms verification modal [#3336](https://github.com/paritytech/parity/pull/3336)
+- Sudo -c is not supported on Mac [#3488](https://github.com/paritytech/parity/pull/3488)
+- Add trace_{call, rawTransaction, replayTransaction} [#3492](https://github.com/paritytech/parity/pull/3492)
+- Check for possible panics in scrypt key derivation [#3490](https://github.com/paritytech/parity/pull/3490)
+- Sync traffic optimization [#3477](https://github.com/paritytech/parity/pull/3477)
+- Wallet files shouldn't give away the address [#3378](https://github.com/paritytech/parity/pull/3378)
+- Fixing tests, fixing refreshing precompiled [#3483](https://github.com/paritytech/parity/pull/3483)
+- Better Errors Snackbar in UI [#3478](https://github.com/paritytech/parity/pull/3478)
+- Handle Signer Rejection [#3476](https://github.com/paritytech/parity/pull/3476)
+- Enhanced MethodDecoding in Transactions list [#3454](https://github.com/paritytech/parity/pull/3454)
+- Signer new-token generates a link and opens browser [#3379](https://github.com/paritytech/parity/pull/3379)
+- Make tokenreg dapp fast again [#3474](https://github.com/paritytech/parity/pull/3474)
+- Build fix [#3470](https://github.com/paritytech/parity/pull/3470)
+- Display deployed Basic token addresses [#3447](https://github.com/paritytech/parity/pull/3447)
+- Export accounts as JSON or CSV [#2866](https://github.com/paritytech/parity/pull/2866)
+- Set HF2 block number [#3466](https://github.com/paritytech/parity/pull/3466)
+- Better word list for secret phrase generation [#3461](https://github.com/paritytech/parity/pull/3461)
+- Drop spec when no longer useful [#3460](https://github.com/paritytech/parity/pull/3460)
+- Add fallback check in ABI validation [#3459](https://github.com/paritytech/parity/pull/3459)
+- Save sort order in LocalStorage [#3457](https://github.com/paritytech/parity/pull/3457)
+- Adds onPaste event to Inputs [#3456](https://github.com/paritytech/parity/pull/3456)
+- Update signer to take care of text overflows [#3450](https://github.com/paritytech/parity/pull/3450)
+- Authority round consensus engine [#3426](https://github.com/paritytech/parity/pull/3426)
+- Fix transfer token decimal calculation [#3445](https://github.com/paritytech/parity/pull/3445)
+- Restrict max code size for EIP-150 and after. [#3363](https://github.com/paritytech/parity/pull/3363)
+- Contract queries should display IdentityIcons [#3453](https://github.com/paritytech/parity/pull/3453)
+- Use Babel in vendor when needed [#3451](https://github.com/paritytech/parity/pull/3451)
+- Use signature of functions instead of names [#3448](https://github.com/paritytech/parity/pull/3448)
+- Handle contract constructor inputs [#3430](https://github.com/paritytech/parity/pull/3430)
+- Use Contract owner for unregistering Token [#3446](https://github.com/paritytech/parity/pull/3446)
+- Create directories only if feature is enabled [#3442](https://github.com/paritytech/parity/pull/3442)
+- Import AddresBook from exported JSON [#3433](https://github.com/paritytech/parity/pull/3433)
+- Scrollable accounts in autocomplete [#3427](https://github.com/paritytech/parity/pull/3427)
+- Bump ws-rs [#3428](https://github.com/paritytech/parity/pull/3428)
+- Swap TokenReg dapp from base to decimals [#3425](https://github.com/paritytech/parity/pull/3425)
+- Change beta builds to stable on Travis [#3421](https://github.com/paritytech/parity/pull/3421)
+- Refactor copy to clipboard functionality [#3420](https://github.com/paritytech/parity/pull/3420)
+- Dev chain [#3385](https://github.com/paritytech/parity/pull/3385)
+- Fetch known code from the database during restoration [#3377](https://github.com/paritytech/parity/pull/3377)
+- Fixing benches [#3422](https://github.com/paritytech/parity/pull/3422)
+- Fix chainspec storage field. [#3406](https://github.com/paritytech/parity/pull/3406)
+- Abort snapshot restoration faster [#3356](https://github.com/paritytech/parity/pull/3356)
+- Remove addresses, display non-refundable warning on registries [#3403](https://github.com/paritytech/parity/pull/3403)
+- Don't auto-unsubscribe when subscriber callback throws [#3401](https://github.com/paritytech/parity/pull/3401)
+- Fix dapp account selection [#3399](https://github.com/paritytech/parity/pull/3399)
+- Fix travis build: remove unused import [#3381](https://github.com/paritytech/parity/pull/3381)
+- Optimize memory footprint [#3376](https://github.com/paritytech/parity/pull/3376)
+- Fixing parsing passwords from file [#3367](https://github.com/paritytech/parity/pull/3367)
+- Remove some unwraps from parity/helpers [#3364](https://github.com/paritytech/parity/pull/3364)
+- Load external, builtin & local apps in parallel [#3340](https://github.com/paritytech/parity/pull/3340)
+- Solidity Compiler in UI [#3279](https://github.com/paritytech/parity/pull/3279)
+- Determine real-time HTTP connected status [#3335](https://github.com/paritytech/parity/pull/3335)
+- Clarify error message about disabled Signer [#3359](https://github.com/paritytech/parity/pull/3359)
+- Cater for home.parity hostname in dappsUrl [#3341](https://github.com/paritytech/parity/pull/3341)
+- Make sure Token is ECR20 [#3347](https://github.com/paritytech/parity/pull/3347)
+- [TokenReg dApp] Fixed Unregister for Contract Owner only [#3346](https://github.com/paritytech/parity/pull/3346)
+- LES Part 1 [#3322](https://github.com/paritytech/parity/pull/3322)
+- Make transactions load [#3348](https://github.com/paritytech/parity/pull/3348)
+- Manual bump package.json [#3345](https://github.com/paritytech/parity/pull/3345)
+- Windows app and installer fixes [#3338](https://github.com/paritytech/parity/pull/3338)
+- Fix JS API test [#3342](https://github.com/paritytech/parity/pull/3342)
+- Git pre-push checks for UI [#3072](https://github.com/paritytech/parity/pull/3072)
+- Disarm the HF and add more bootnodes [#3323](https://github.com/paritytech/parity/pull/3323)
+- Default contract type on UI [#3310](https://github.com/paritytech/parity/pull/3310)
+- In-browser signing support [#3231](https://github.com/paritytech/parity/pull/3231)
+- Handle redirects from /api/content on manifest.json gracefully [#3315](https://github.com/paritytech/parity/pull/3315)
+- Dapps interface RPC [#3311](https://github.com/paritytech/parity/pull/3311)
+- Additional snapshot sync checks [#3318](https://github.com/paritytech/parity/pull/3318)
+- Fix spurious signer tests failures [#3312](https://github.com/paritytech/parity/pull/3312)
+- Fix signer token updates [#3302](https://github.com/paritytech/parity/pull/3302)
+- Update account recovery phrase hint [#3316](https://github.com/paritytech/parity/pull/3316)
+- New transaction tests [#3313](https://github.com/paritytech/parity/pull/3313)
+- Remove 127.0.0.1 references [#3303](https://github.com/paritytech/parity/pull/3303)
+- Fix for opening UI after installation on mac [#3300](https://github.com/paritytech/parity/pull/3300)
+- Fixed uncle query [#3299](https://github.com/paritytech/parity/pull/3299)
+- Updated blance display with max decimals [#3266](https://github.com/paritytech/parity/pull/3266)
+- Refactoring Signer to auto_args + eth_signTransaction [#3261](https://github.com/paritytech/parity/pull/3261)
+- Fix typo [#3298](https://github.com/paritytech/parity/pull/3298)
+- Change to more common focused spelling [#3264](https://github.com/paritytech/parity/pull/3264)
+- Manual bump of package.json (recovery) [#3295](https://github.com/paritytech/parity/pull/3295)
+- Fix initial token generation [#3289](https://github.com/paritytech/parity/pull/3289)
+- Fixed IO service shutdown [#3286](https://github.com/paritytech/parity/pull/3286)
+- Autostart setting for windows tray app [#3269](https://github.com/paritytech/parity/pull/3269)
+- Fixes for 1.4 [#3260](https://github.com/paritytech/parity/pull/3260)
+- Build tray app for x64 [#3255](https://github.com/paritytech/parity/pull/3255)
+- Add secure flag back [#3244](https://github.com/paritytech/parity/pull/3244)
+- Verify chunk hashes in cli restore [#3241](https://github.com/paritytech/parity/pull/3241)
+- Load network apps manifests as contentHash (no coding) [#3235](https://github.com/paritytech/parity/pull/3235)
+- Fixed some typos [#3236](https://github.com/paritytech/parity/pull/3236)
+- Rename cli and config options signer->ui [#3232](https://github.com/paritytech/parity/pull/3232)
+- Add store for dapps state [#3211](https://github.com/paritytech/parity/pull/3211)
+- Fix first-time tagging of contracts [#3222](https://github.com/paritytech/parity/pull/3222)
+- Fix /parity-utils/{web3,parity}.js webpack errors [#3221](https://github.com/paritytech/parity/pull/3221)
+- Improve 'invalid raw key' error msg [#3219](https://github.com/paritytech/parity/pull/3219)
+- Cleaning up polluted namespaces [#3143](https://github.com/paritytech/parity/pull/3143)
+- Set passive mode for first run only [#3214](https://github.com/paritytech/parity/pull/3214)
+- Parity configuration settings, i.e. mode [#3212](https://github.com/paritytech/parity/pull/3212)
+- Ethash unsafety cleanup [#3210](https://github.com/paritytech/parity/pull/3210)
+- Mode improvements for UI [#3109](https://github.com/paritytech/parity/pull/3109)
+- Delay bomb for Classic (ECIP-1010) [#3179](https://github.com/paritytech/parity/pull/3179)
+- Use ethcore_dappsPort when constructing URLs [#3139](https://github.com/paritytech/parity/pull/3139)
+- Add copy address button to Contract deploy [#3199](https://github.com/paritytech/parity/pull/3199)
+- Expose Parity api as window.secureApi [#3207](https://github.com/paritytech/parity/pull/3207)
+- Add error for sendRawTransaction and estimateGas [#3194](https://github.com/paritytech/parity/pull/3194)
+- Exposing engine extra info in block RPC [#3169](https://github.com/paritytech/parity/pull/3169)
+- V1.5 [#3195](https://github.com/paritytech/parity/pull/3195)
+- Remove dapp logos (GHH points to dapp-assets) [#3192](https://github.com/paritytech/parity/pull/3192)
+- Fixing possible race in ethcore_hashContent [#3191](https://github.com/paritytech/parity/pull/3191)
+- Bump package.json version (1.5 is master) [#3193](https://github.com/paritytech/parity/pull/3193)
+
+## Parity [v1.4.10](https://github.com/paritytech/parity/releases/tag/v1.4.10) (2017-01-18)
+
+Parity 1.4.10 is a first stable release of 1.4.x series. It includes a few minor networking fixes.
+
+- Gas_limit for blocks, mined by Parity will be divisible by 37 (#4154) [#4179](https://github.com/paritytech/parity/pull/4179)
+  - gas_limit for new blocks will divide evenly by 13
+  - increased PARITY_GAS_LIMIT_DETERMINANT to 37
+  - separate method for marking mined block
+  - debug_asserts(gas_limit within protocol range)
+  - round_block_gas_limit method is now static
+  - made round_block_gas_limit free-function
+  - multiplier->multiple
+- Backporing to 1.4.10-stable [#4110](https://github.com/paritytech/parity/pull/4110)
+  - Bump to v1.4.10
+  - No reorg limit for ancient blocks
+  - Update registration after every write
+
+## Parity [v1.4.9](https://github.com/paritytech/parity/releases/tag/v1.4.9) (2017-01-09)
+
+This fixes an issue introduced in 1.4.8 that causes Parity to panic on propagating transactions in some cases.
+
+- v1.4.9 in beta [#4097](https://github.com/paritytech/parity/pull/4097)
+  - Bump to v1.4.9
+  - Disable armv6 build
+- beta Fix queue deadlock [#4095](https://github.com/paritytech/parity/pull/4095)
+- Fix rebroadcast panic beta [#4085](https://github.com/paritytech/parity/pull/4085)
+  - fix compile
+  - fix backport
+  - clean up old method
+  - remove unnecessary reference
+  - simplify
+  - Fixing 'simplify'
+
+## Parity [v1.4.8](https://github.com/paritytech/parity/releases/tag/v1.4.8) (2017-01-06)
+
+Ethereum Classic Hard Fork ready release containing various bugfixes:
+
+- Fix for excessive transactions propagation
+- Fix for inconsistent `logIndex` in transaction receipts
+
+See [full list of changes](https://github.com/paritytech/parity/compare/v1.4.7...v1.4.8):
+
+- Beta backports [#4067](https://github.com/paritytech/parity/pull/4067)
+- Re-broadcast transactions to few random peers on each new block. (#4054) [#4061](https://github.com/paritytech/parity/pull/4061)
+- Tolerate errors in user_defaults [#4060](https://github.com/paritytech/parity/pull/4060)
+- ETC Config change backport [#4056](https://github.com/paritytech/parity/pull/4056)
+- [beta] Avoid re-broadcasting transactions on each block [#4047](https://github.com/paritytech/parity/pull/4047)
+- Beta Backports [#4012](https://github.com/paritytech/parity/pull/4012)
+
+## Parity [v1.4.7](https://github.com/paritytech/parity/releases/tag/v1.4.7) (2016-12-27)
+
+This maintenance release fixes an issue with sync falling behind occasionally.
+
+- Backporting to beta [#3980](https://github.com/paritytech/parity/pull/3980)
+- [beta] enforce gas limit falls within engine bounds [#3816](https://github.com/paritytech/parity/pull/3816)
+
+
+## Parity [v1.3.15](https://github.com/paritytech/parity/releases/tag/v1.3.15) (2016-12-10)
+
+This patch release fixes an issue with syncing on the Ropsten test network.
+
+- Backporting to stable [#3793](https://github.com/paritytech/parity/pull/3793)
+
+## Parity [v1.4.6](https://github.com/paritytech/parity/releases/tag/v1.4.6) (2016-12-05)
+
+This patch release fixes an issue with syncing on the Ropsten test network.
+
+- Backporting to beta [#3718](https://github.com/paritytech/parity/pull/3718)
+- [beta] scrollable contract deploy & execute modals [#3656](https://github.com/paritytech/parity/pull/3656)
+
+## Parity [v1.4.5](https://github.com/paritytech/parity/releases/tag/v1.4.5) (2016-11-26)
+
+1.4.5 release fixes a number of issues, notably:
+- High CPU usage when idle.
+- Key recovery phrases generated on windows now can be imported.
+
+#### Configuration changes
+- `--usd-per-tx` is now set to 0.0025 by default.
+
+#### New features
+- Support for Ropsten test network is introduced with `--chain=ropsten` or `--testnet`. Morden network is still available via `--chain=morden`
+
+#### Full changes
+- [beta] Pin package versions for React [#3628](https://github.com/paritytech/parity/pull/3628)
+- Backporting to beta [#3623](https://github.com/paritytech/parity/pull/3623)
+- [beta] Ropsten chain for UI [#3622](https://github.com/paritytech/parity/pull/3622)
+
+## Parity [v1.3.14](https://github.com/paritytech/parity/releases/tag/v1.3.14) (2016-11-25)
+
+Parity 1.3.14 fixes a few stability issues and adds support for the Ropsten testnet.
+
+- Backporting to stable [#3616](https://github.com/paritytech/parity/pull/3616)
+
+## Parity [v1.4.4](https://github.com/paritytech/parity/releases/tag/v1.4.4) (2016-11-18)
+
+This is a maintenance release that fixes an issue with EIP-155 transactions being added to the transaction pool. It also improves syncing stability and resolved a number of UI issues.
+Full changelog is available [here.](https://github.com/paritytech/parity/commit/3e0d033eaf789cfdf517f4a97effc500f1f9263b)
+
+- [beta] apps typo fix [#3533](https://github.com/paritytech/parity/pull/3533)
+- Backporting to beta [#3525](https://github.com/paritytech/parity/pull/3525)
+
+## Parity [v1.3.13](https://github.com/paritytech/parity/releases/tag/v1.3.13) (2016-11-18)
+
+This release fixes an issue with EIP-155 transactions being allowed into the transaction pool.
+
+- [stable] Check tx signatures before adding to the queue. [#3521](https://github.com/paritytech/parity/pull/3521)
+- Fix Stable Docker Build [#3479](https://github.com/paritytech/parity/pull/3479)
+
+## Parity [v1.4.3](https://github.com/paritytech/parity/releases/tag/v1.4.3) (2016-11-16)
+
+This release includes memory footprint optimization as well as a few fixes in the UI.
+EIP-155/160/161/170 hardfork is enabled at block 2675000 (1885000 for test network).
+Full changelog is available [here.](https://github.com/paritytech/parity/compare/v1.4.2...v1.4.3)
+
+- [beta] EIP-170 [#3464](https://github.com/paritytech/parity/pull/3464)
+- Backports to beta [#3465](https://github.com/paritytech/parity/pull/3465)
+- Backport: additional fields on transaction and receipt [#3463](https://github.com/paritytech/parity/pull/3463)
+- v1.4.3 in beta [#3424](https://github.com/paritytech/parity/pull/3424)
+
+
+## Parity [v1.3.12](https://github.com/paritytech/parity/releases/tag/v1.3.12) (2016-11-16)
+
+This stable release enables EIP-155/160/161/170 hardfork at block 2675000 (1885000 for test network).
+
+- [stable] EIP-170 [#3462](https://github.com/paritytech/parity/pull/3462)
+- #3035 Backport to stable [#3441](https://github.com/paritytech/parity/pull/3441)
+
+## Parity [v1.3.11](https://github.com/paritytech/parity/releases/tag/v1.3.11) (2016-11-11)
+
+This is a maintenance release for the stable series to delay the EIP-155/160/161 hard fork transition. **Update from 1.3.10 is mandatory**. It also deprecates and disables the old Parity UI.
+
+- [stable] Disable HF and UI  [#3372](https://github.com/paritytech/parity/pull/3372)
+- [stable] EIP-155 update with Vitalik's new test vectors (#3166) [#3190](https://github.com/paritytech/parity/pull/3190)
+- Backport EIP-150 to stable [#2672](https://github.com/paritytech/parity/pull/2672)
+- Create gitlab-ci.yml for stable [#2517](https://github.com/paritytech/parity/pull/2517)
+
+## Parity [v1.4.2](https://github.com/paritytech/parity/releases/tag/v1.4.2) (2016-11-10)
+
+This release fixes a few additional issues:
+- Parity now correctly handles external `--dapps-interface` and  `--ui-interface` in the UI.
+- Crash in `eth_getUncle*` has been fixed.
+- macOS installer now includes an uninstall script.
+- Security token input UI has been fixed.
+- Correct display for tokens with minimum decimals.
+
+And some additional minor changes. Full changelog is [available](https://github.com/paritytech/parity/compare/v1.4.1...v1.4.2)
+- Backporting to beta [#3344](https://github.com/paritytech/parity/pull/3344)
+- Backporting to beta [#3324](https://github.com/paritytech/parity/pull/3324)
+
+## Parity [v1.4.1](https://github.com/paritytech/parity/releases/tag/v1.4.1) (2016-11-09)
+
+This is a hotfix release to address a couple of issues with 1.4.0:
+
+- UI token is requested instead of being supplied automatically.
+- Running with `--geth` results in an error.
+
+- Backporting to beta [#3293](https://github.com/paritytech/parity/pull/3293)
+
+## Parity [v1.4.0](https://github.com/paritytech/parity/releases/tag/v1.4.0) (2016-11-07)
+
+First beta release of the 1.4 series.
+
+This includes the new Parity Wallet and Warp-Sync synchronisation as well as several optimisations and fixes.
+
+- Add secure flag back [#3246](https://github.com/paritytech/parity/pull/3246)
+- [BETA] verify chunk hashes in cli restore [#3242](https://github.com/paritytech/parity/pull/3242)
+- Backporting to beta [#3239](https://github.com/paritytech/parity/pull/3239)
+- UI fixes backporting [#3234](https://github.com/paritytech/parity/pull/3234)
+- Backporting to beta [#3229](https://github.com/paritytech/parity/pull/3229)
+- Beta branch cleanup [#3226](https://github.com/paritytech/parity/pull/3226)
+- [beta] Set passive mode for first run only (#3214) [#3216](https://github.com/paritytech/parity/pull/3216)
+- Mode configuration backported to beta [#3213](https://github.com/paritytech/parity/pull/3213)
+- Backporting [#3198](https://github.com/paritytech/parity/pull/3198)
+- [beta] EIP-155 update with Vitalik's new test vectors (#3166) [#3189](https://github.com/paritytech/parity/pull/3189)
+- Backporting to beta [#3176](https://github.com/paritytech/parity/pull/3176)
+- parity-ui-precompiled pinned to beta [#3168](https://github.com/paritytech/parity/pull/3168)
+- EIP-155 update with Vitalik's new test vectors [#3166](https://github.com/paritytech/parity/pull/3166)
+- Push precompiled for beta/stable, npm only master [#3163](https://github.com/paritytech/parity/pull/3163)
+- Back to real root after npm publish [#3178](https://github.com/paritytech/parity/pull/3178)
+- Remove extra cd js [#3177](https://github.com/paritytech/parity/pull/3177)
+- Fixes Gas price selection bug [#3175](https://github.com/paritytech/parity/pull/3175)
+- Exposing state root and logsBloom in RPC receipts [#3174](https://github.com/paritytech/parity/pull/3174)
+- Exposing v,r,s from transaction signature in RPC [#3172](https://github.com/paritytech/parity/pull/3172)
+- Enabling personal RPC over IPC by default [#3165](https://github.com/paritytech/parity/pull/3165)
+- Gitlab CI badge [#3164](https://github.com/paritytech/parity/pull/3164)
+- Dependencies in README [#3162](https://github.com/paritytech/parity/pull/3162)
+- Make the footer a bit less ugly. [#3160](https://github.com/paritytech/parity/pull/3160)
+- Linux build case sensitivity fix [#3161](https://github.com/paritytech/parity/pull/3161)
+- abbreviated enode, `CopyToClipboard` component [#3131](https://github.com/paritytech/parity/pull/3131)
+- EIPs 155, 160, 161 [#2976](https://github.com/paritytech/parity/pull/2976)
+- beta reset to 1.4.0 [#3157](https://github.com/paritytech/parity/pull/3157)
+- Fix histogram [#3150](https://github.com/paritytech/parity/pull/3150)
+- Remove network label from TabBar [#3142](https://github.com/paritytech/parity/pull/3142)
+- Speed up unresponsive Contract events & Account transactions [#3145](https://github.com/paritytech/parity/pull/3145)
+- Better windows shortcut [#3147](https://github.com/paritytech/parity/pull/3147)
+- Redirect content to the same address as requested [#3133](https://github.com/paritytech/parity/pull/3133)
+- Fixed peer ping timeout [#3137](https://github.com/paritytech/parity/pull/3137)
+- Fix for windows build [#3125](https://github.com/paritytech/parity/pull/3125)
+- Fix AddessInput icon position [#3132](https://github.com/paritytech/parity/pull/3132)
+- Fixed not scrollable accounts in tokenreg dapp [#3128](https://github.com/paritytech/parity/pull/3128)
+- Returning cache headers for network content [#3123](https://github.com/paritytech/parity/pull/3123)
+- Optimise contract events display [#3120](https://github.com/paritytech/parity/pull/3120)
+- Add basic validation for contract execute values [#3118](https://github.com/paritytech/parity/pull/3118)
+- Dapps errors embeddable on signer [#3115](https://github.com/paritytech/parity/pull/3115)
+- Use enode RPC in UI [#3108](https://github.com/paritytech/parity/pull/3108)
+- Windows tray app [#3103](https://github.com/paritytech/parity/pull/3103)
+- Displaying CLI errors on stderr [#3116](https://github.com/paritytech/parity/pull/3116)
+- new InputAddressSelect component [#3071](https://github.com/paritytech/parity/pull/3071)
+- Bump mio [#3117](https://github.com/paritytech/parity/pull/3117)
+- Minor typo fixed. [#3110](https://github.com/paritytech/parity/pull/3110)
+- Sort by ETH balance and contract by date [#3107](https://github.com/paritytech/parity/pull/3107)
+- Add RPC enode lookup [#3096](https://github.com/paritytech/parity/pull/3096)
+- Initializing logger for each command [#3090](https://github.com/paritytech/parity/pull/3090)
+- Allow registration of content bundles in GitHubHint [#3094](https://github.com/paritytech/parity/pull/3094)
+- Add read-only inputs to UI plus Copy to Clipboard buttons [#3095](https://github.com/paritytech/parity/pull/3095)
+- Allow boolean dropdowns for contract deploy [#3077](https://github.com/paritytech/parity/pull/3077)
+- Add mac installer files [#2995](https://github.com/paritytech/parity/pull/2995)
+- Fixing dapps sorting [#3086](https://github.com/paritytech/parity/pull/3086)
+- Add a Gitter chat badge to README.md [#3092](https://github.com/paritytech/parity/pull/3092)
+- Fixes webpack HTML loader [#3089](https://github.com/paritytech/parity/pull/3089)
+- Redirecting /home to new UI [#3084](https://github.com/paritytech/parity/pull/3084)
+- Allow GitHubHint content owner to update url [#3083](https://github.com/paritytech/parity/pull/3083)
+- Remove token assets (moved to ethcore/dapps-assets) [#3082](https://github.com/paritytech/parity/pull/3082)
+- Goodbye Gavcoin, Hello Gavcoin [#3080](https://github.com/paritytech/parity/pull/3080)
+- Load network dapps [#3078](https://github.com/paritytech/parity/pull/3078)
+- Swap account phrase input to normal (non-multiline) [#3060](https://github.com/paritytech/parity/pull/3060)
+- Fix minor typo in informant [#3056](https://github.com/paritytech/parity/pull/3056)
+- Warp sync status display [#3045](https://github.com/paritytech/parity/pull/3045)
+- Enhance address input [#3065](https://github.com/paritytech/parity/pull/3065)
+- Go to Accounts Page if Tooltips are displayed [#3063](https://github.com/paritytech/parity/pull/3063)
+- Change contract Execute bool values & query bool value display [#3024](https://github.com/paritytech/parity/pull/3024)
+- Update Parity logo [#3036](https://github.com/paritytech/parity/pull/3036)
+- settings: replace background patterns (inline) [#3047](https://github.com/paritytech/parity/pull/3047)
+- Multiple line description for dapps [#3058](https://github.com/paritytech/parity/pull/3058)
+- Fix status log order [#3062](https://github.com/paritytech/parity/pull/3062)
+- Graphical gas price selection [#2898](https://github.com/paritytech/parity/pull/2898)
+- [Registry dApp] Actions not available before selecting accounts [#3032](https://github.com/paritytech/parity/pull/3032)
+- apply post-consolidation migrations after consolidating [#3020](https://github.com/paritytech/parity/pull/3020)
+- fix chain badge padding [#3046](https://github.com/paritytech/parity/pull/3046)
+- Don't delete Tags input on blur (eg. tab) [#3044](https://github.com/paritytech/parity/pull/3044)
+- Fixing last hashes for ethcall [#3043](https://github.com/paritytech/parity/pull/3043)
+- Remove signer icons [#3039](https://github.com/paritytech/parity/pull/3039)
+- execute periodic snapshot in new thread [#3029](https://github.com/paritytech/parity/pull/3029)
+- fix background of embedded signer [#3026](https://github.com/paritytech/parity/pull/3026)
+- registry dapp: fix reducer [#3028](https://github.com/paritytech/parity/pull/3028)
+- Replace Execute by Query in contract button [#3031](https://github.com/paritytech/parity/pull/3031)
+- Fixing GavCoin dApp overflow issues [#3030](https://github.com/paritytech/parity/pull/3030)
+- execute contract function: validate address [#3013](https://github.com/paritytech/parity/pull/3013)
+- Align tag inputs with other input boxes [#2965](https://github.com/paritytech/parity/pull/2965)
+- Sweep panickers from IO and network [#3018](https://github.com/paritytech/parity/pull/3018)
+- Terms & Conditions [#3019](https://github.com/paritytech/parity/pull/3019)
+- open column families after reparing db corruption [#3017](https://github.com/paritytech/parity/pull/3017)
+- Snapshot sync and block gap info in `eth_syncing` [#2948](https://github.com/paritytech/parity/pull/2948)
+- personal_ RPCs to AutoArgs [#3000](https://github.com/paritytech/parity/pull/3000)
+- RPCs for mode change [#3002](https://github.com/paritytech/parity/pull/3002)
+- Fix a test sensitive to slow execution. [#3014](https://github.com/paritytech/parity/pull/3014)
+- Fixes search filtering issues [#3011](https://github.com/paritytech/parity/pull/3011)
+- Restart sync if no more peers with snapshots [#3007](https://github.com/paritytech/parity/pull/3007)
+- Allow empty/non-existant input arrays for ABIs in contract view [#3001](https://github.com/paritytech/parity/pull/3001)
+- Allow operation when no registry is available [#2980](https://github.com/paritytech/parity/pull/2980)
+- Make JS lint & test run on Travis [#2894](https://github.com/paritytech/parity/pull/2894)
+- Update account dropdowns [#2959](https://github.com/paritytech/parity/pull/2959)
+- Modify gas price statistics [#2947](https://github.com/paritytech/parity/pull/2947)
+- Fixes pending/mined transactions in registry dApp [#3004](https://github.com/paritytech/parity/pull/3004)
+- Prevent connecting to self [#2997](https://github.com/paritytech/parity/pull/2997)
+- Disable verbose in gitlab CI [#2999](https://github.com/paritytech/parity/pull/2999)
+- Allow warnings in gitlab [#2998](https://github.com/paritytech/parity/pull/2998)
+- Fix the brainwallet functionality. [#2994](https://github.com/paritytech/parity/pull/2994)
+- Provided gas description update [#2993](https://github.com/paritytech/parity/pull/2993)
+- Print messages to stderr [#2991](https://github.com/paritytech/parity/pull/2991)
+- Networking and syncing tweaks [#2990](https://github.com/paritytech/parity/pull/2990)
+- Allow build warnings [#2985](https://github.com/paritytech/parity/pull/2985)
+- Display network status for finished Signer requests [#2983](https://github.com/paritytech/parity/pull/2983)
+- Fixed rejecting transactions [#2984](https://github.com/paritytech/parity/pull/2984)
+- mio version bump [#2982](https://github.com/paritytech/parity/pull/2982)
+- Publish parity.js to npmjs registry [#2978](https://github.com/paritytech/parity/pull/2978)
+- Import raw private key [#2945](https://github.com/paritytech/parity/pull/2945)
+- refactor etherscan.io links [#2896](https://github.com/paritytech/parity/pull/2896)
+- Use separate lock for code cache [#2977](https://github.com/paritytech/parity/pull/2977)
+- Add favicon [#2974](https://github.com/paritytech/parity/pull/2974)
+- Align password change dialog with create dialog ordering [#2970](https://github.com/paritytech/parity/pull/2970)
+- WS bump [#2973](https://github.com/paritytech/parity/pull/2973)
+- Discovery performance optimization [#2972](https://github.com/paritytech/parity/pull/2972)
+- Pass gas & gasPrice to token transfers [#2964](https://github.com/paritytech/parity/pull/2964)
+- Updating ws-rs [#2962](https://github.com/paritytech/parity/pull/2962)
+- Run cargo with verbose flag when testing [#2943](https://github.com/paritytech/parity/pull/2943)
+- Fixing clippy warnings take two [#2961](https://github.com/paritytech/parity/pull/2961)
+- Snapshot sync improvements [#2960](https://github.com/paritytech/parity/pull/2960)
+- Gavcoin event display updates [#2956](https://github.com/paritytech/parity/pull/2956)
+- Eslint fixes [#2957](https://github.com/paritytech/parity/pull/2957)
+- Add import of raw private key RPCs [#2942](https://github.com/paritytech/parity/pull/2942)
+- Bring in styling queues from original Gavcoin [#2936](https://github.com/paritytech/parity/pull/2936)
+- Validating minimal required gas for a transaction [#2937](https://github.com/paritytech/parity/pull/2937)
+- Even more snapshot validity checks [#2935](https://github.com/paritytech/parity/pull/2935)
+- Shared code cache [#2921](https://github.com/paritytech/parity/pull/2921)
+- Updating bootnodes for ETC [#2938](https://github.com/paritytech/parity/pull/2938)
+- More bootnodes [#2926](https://github.com/paritytech/parity/pull/2926)
+- Revert hash updates until testable [#2925](https://github.com/paritytech/parity/pull/2925)
+- Release.sh verbose output [#2924](https://github.com/paritytech/parity/pull/2924)
+- additional release.sh debugging info [#2922](https://github.com/paritytech/parity/pull/2922)
+- Pass the js-precompiled commit hash to cargo update [#2920](https://github.com/paritytech/parity/pull/2920)
+- Next nonce RPC [#2917](https://github.com/paritytech/parity/pull/2917)
+- Get rid of duplicated code in EVM [#2915](https://github.com/paritytech/parity/pull/2915)
+- Transaction Queue banning [#2524](https://github.com/paritytech/parity/pull/2524)
+- Revert to gas price ordering [#2919](https://github.com/paritytech/parity/pull/2919)
+- Personal split [#2879](https://github.com/paritytech/parity/pull/2879)
+- Fixing config values for pruning_history [#2918](https://github.com/paritytech/parity/pull/2918)
+- Apply pending block details on commit [#2254](https://github.com/paritytech/parity/pull/2254)
+- Fixed GetNodeData output [#2892](https://github.com/paritytech/parity/pull/2892)
+- New sync protocol ID [#2912](https://github.com/paritytech/parity/pull/2912)
+- Clippy bump [#2877](https://github.com/paritytech/parity/pull/2877)
+- iconomi token images [#2906](https://github.com/paritytech/parity/pull/2906)
+- Fixes too long description and Token balance value in Dapps/Accounts [#2902](https://github.com/paritytech/parity/pull/2902)
+- Add missing images for local dapps [#2890](https://github.com/paritytech/parity/pull/2890)
+- Fix Webpack, again [#2895](https://github.com/paritytech/parity/pull/2895)
+- Enable suicide json test [#2893](https://github.com/paritytech/parity/pull/2893)
+- More snapshot fixes and optimizations [#2883](https://github.com/paritytech/parity/pull/2883)
+- Fixes CI JS precompiled build [#2886](https://github.com/paritytech/parity/pull/2886)
+- Fix empty tags modification [#2884](https://github.com/paritytech/parity/pull/2884)
+- Fix up informant. [#2865](https://github.com/paritytech/parity/pull/2865)
+- Get rid of MemoryDB denote [#2881](https://github.com/paritytech/parity/pull/2881)
+- Add inject to "bundle everything" list [#2871](https://github.com/paritytech/parity/pull/2871)
+- Fixes signer and MUI errors throwing [#2876](https://github.com/paritytech/parity/pull/2876)
+- Fix failing tests after log parsing updates [#2878](https://github.com/paritytech/parity/pull/2878)
+- Sweep some more panics [#2848](https://github.com/paritytech/parity/pull/2848)
+- Make GitLab js-precompiled really update Cargo.toml in main repo [#2869](https://github.com/paritytech/parity/pull/2869)
+- IPC version bump [#2870](https://github.com/paritytech/parity/pull/2870)
+- Snapshot sync fixes and optimizations [#2863](https://github.com/paritytech/parity/pull/2863)
+- Add Check and Change Password for an Account [#2861](https://github.com/paritytech/parity/pull/2861)
+- Output git fetch/push to log files [#2862](https://github.com/paritytech/parity/pull/2862)
+- Align contract event log l&f with transactions [#2812](https://github.com/paritytech/parity/pull/2812)
+- Nicer port in use errors [#2859](https://github.com/paritytech/parity/pull/2859)
+- Remove personal_* calls from dapps [#2860](https://github.com/paritytech/parity/pull/2860)
+- Token sorting, zero-ETH transfer & token decimals [#2805](https://github.com/paritytech/parity/pull/2805)
+- Don't fail badly when no transactions in last 100 blocks. [#2856](https://github.com/paritytech/parity/pull/2856)
+- Fixing home.parity address for new signer [#2851](https://github.com/paritytech/parity/pull/2851)
+- Enabling UI build back [#2853](https://github.com/paritytech/parity/pull/2853)
+- Remove eventName in unsubscribe API arguments [#2844](https://github.com/paritytech/parity/pull/2844)
+- Don't return empty names as clickable titles [#2809](https://github.com/paritytech/parity/pull/2809)
+- Auto-bump js-precompiled on release [#2828](https://github.com/paritytech/parity/pull/2828)
+- Remove ethcore::common re-export module [#2792](https://github.com/paritytech/parity/pull/2792)
+- Prevent database corruption on OOM [#2832](https://github.com/paritytech/parity/pull/2832)
+- Download/Export Addressbook [#2847](https://github.com/paritytech/parity/pull/2847)
+- Snapshot and blockchain stability improvements [#2843](https://github.com/paritytech/parity/pull/2843)
+- Extended network options [#2845](https://github.com/paritytech/parity/pull/2845)
+- fix failing master test build [#2846](https://github.com/paritytech/parity/pull/2846)
+- Local dapps embeddable on signer port [#2815](https://github.com/paritytech/parity/pull/2815)
+- Trigger accounts/contracts search on search input change [#2838](https://github.com/paritytech/parity/pull/2838)
+- Move snapshot sync to a subprotocol [#2820](https://github.com/paritytech/parity/pull/2820)
+- fix node log being reversed [#2839](https://github.com/paritytech/parity/pull/2839)
+- Fixes currency symbol font size in Shapeshift modal [#2840](https://github.com/paritytech/parity/pull/2840)
+- Disable personal APIs by default for security reasons [#2834](https://github.com/paritytech/parity/pull/2834)
+- Clear cached content [#2833](https://github.com/paritytech/parity/pull/2833)
+- Add ethcore_[dapps|signer]Port APIs [#2821](https://github.com/paritytech/parity/pull/2821)
+- CLI option to skip seal check when importing [#2842](https://github.com/paritytech/parity/pull/2842)
+- Fix case error in Dapps import [#2837](https://github.com/paritytech/parity/pull/2837)
+- Double click on address in account detail view should select it [#2841](https://github.com/paritytech/parity/pull/2841)
+- Bump js-precompiled to 20161022-223915 UTC [#2826](https://github.com/paritytech/parity/pull/2826)
+- Adjust paths to handle CORS changes [#2816](https://github.com/paritytech/parity/pull/2816)
+- RPC for dapps port and signer port [#2819](https://github.com/paritytech/parity/pull/2819)
+- Update build to working version on pre-compiled repo [#2825](https://github.com/paritytech/parity/pull/2825)
+- Adjust network name badge colours (darker) [#2823](https://github.com/paritytech/parity/pull/2823)
+- Removing submodule in favour of rust crate [#2756](https://github.com/paritytech/parity/pull/2756)
+- Return old-ish content even when syncing [#2757](https://github.com/paritytech/parity/pull/2757)
+- fix Signer UI [#2750](https://github.com/paritytech/parity/pull/2750)
+- USG, GBP, Euro & Yuan updates [#2818](https://github.com/paritytech/parity/pull/2818)
+- Make locally installed apps available again (Fixes #2771) [#2808](https://github.com/paritytech/parity/pull/2808)
+- Additional RPCs for password management [#2779](https://github.com/paritytech/parity/pull/2779)
+- flush DB changes on drop [#2795](https://github.com/paritytech/parity/pull/2795)
+- rename State::snapshot to checkpoint to avoid confusion [#2796](https://github.com/paritytech/parity/pull/2796)
+- Missing changes required to make new UI work [#2793](https://github.com/paritytech/parity/pull/2793)
+- Cleanup method decoding (Fixes #2811) [#2810](https://github.com/paritytech/parity/pull/2810)
+- Use trace API for decentralized transaction list [#2784](https://github.com/paritytech/parity/pull/2784)
+- Automatic compaction selection on Linux [#2785](https://github.com/paritytech/parity/pull/2785)
+- Update token images [#2804](https://github.com/paritytech/parity/pull/2804)
+- Hackergold token images [#2801](https://github.com/paritytech/parity/pull/2801)
+- Additional token images [#2800](https://github.com/paritytech/parity/pull/2800)
+- Additional token images [#2798](https://github.com/paritytech/parity/pull/2798)
+- Resolve morden fork [#2773](https://github.com/paritytech/parity/pull/2773)
+- Using SipHashes from crates.io [#2778](https://github.com/paritytech/parity/pull/2778)
+- Fixed issues on Searchable Addresses [#2790](https://github.com/paritytech/parity/pull/2790)
+- Currency icons [#2788](https://github.com/paritytech/parity/pull/2788)
+- Update token images [#2783](https://github.com/paritytech/parity/pull/2783)
+- Fix warning in master [#2775](https://github.com/paritytech/parity/pull/2775)
+- Add empty account existence test from beta. [#2769](https://github.com/paritytech/parity/pull/2769)
+- Update name of basiccoin manager [#2768](https://github.com/paritytech/parity/pull/2768)
+- sweep most unwraps from ethcore crate, dapps crate [#2762](https://github.com/paritytech/parity/pull/2762)
+- Check queue to determine major importing [#2763](https://github.com/paritytech/parity/pull/2763)
+- Trace filtering fix [#2760](https://github.com/paritytech/parity/pull/2760)
+- Update js precompiled to 20161020-141636 [#2761](https://github.com/paritytech/parity/pull/2761)
+- Incrementally calculate verification queue heap size [#2749](https://github.com/paritytech/parity/pull/2749)
+- Don't add empty accounts to bloom [#2753](https://github.com/paritytech/parity/pull/2753)
+- fix contract deployments not showing up [#2759](https://github.com/paritytech/parity/pull/2759)
+- Fixes a positioning issue in Address Selection component [#2754](https://github.com/paritytech/parity/pull/2754)
+- fix linting issues [#2758](https://github.com/paritytech/parity/pull/2758)
+- Making Trie.iter non-recursive [#2733](https://github.com/paritytech/parity/pull/2733)
+- Block import optimization [#2748](https://github.com/paritytech/parity/pull/2748)
+- Update js-precompiled to 20161020-110858 [#2752](https://github.com/paritytech/parity/pull/2752)
+- Fixing small files fetching [#2742](https://github.com/paritytech/parity/pull/2742)
+- Fixing stalled sync [#2747](https://github.com/paritytech/parity/pull/2747)
+- refactor signer components [#2691](https://github.com/paritytech/parity/pull/2691)
+- Png images with backgrounds (original svg) [#2740](https://github.com/paritytech/parity/pull/2740)
+- Make address selection searchable [#2739](https://github.com/paritytech/parity/pull/2739)
+- very basic dapp add/remove interface [#2721](https://github.com/paritytech/parity/pull/2721)
+- Frontport commits from beta to master [#2743](https://github.com/paritytech/parity/pull/2743)
+- Implements Trace API Formatter [#2732](https://github.com/paritytech/parity/pull/2732)
+- bump parking_lot to 0.3.x series [#2702](https://github.com/paritytech/parity/pull/2702)
+- Unify major syncing detection [#2699](https://github.com/paritytech/parity/pull/2699)
+- Fixes gas/gasPrice change not reflected in transaction modal [#2735](https://github.com/paritytech/parity/pull/2735)
+- Fixing build UI stuff along with Rust [#2726](https://github.com/paritytech/parity/pull/2726)
+- Fixed Snackbar not showing and/or behind transactions (#2730) [#2731](https://github.com/paritytech/parity/pull/2731)
+- Updating json tests to latest develop commit [#2728](https://github.com/paritytech/parity/pull/2728)
+- dapps: show errors [#2727](https://github.com/paritytech/parity/pull/2727)
+- node logs: break lines [#2722](https://github.com/paritytech/parity/pull/2722)
+- Bumping JSON-RPC http server [#2714](https://github.com/paritytech/parity/pull/2714)
+- Add ability to copy address to the clipboard [#2716](https://github.com/paritytech/parity/pull/2716)
+- Sort tags when displaying ; use AND for search results [#2720](https://github.com/paritytech/parity/pull/2720)
+- allow-same-origin for iframe [#2711](https://github.com/paritytech/parity/pull/2711)
+- Update Registry address (mainnet) [#2713](https://github.com/paritytech/parity/pull/2713)
+- Allow tags for Accounts, Addresses and Contracts [#2712](https://github.com/paritytech/parity/pull/2712)
+- Correct parameters for eth_sign [#2703](https://github.com/paritytech/parity/pull/2703)
+- Bump js-precompiled to 20161018-161705 [#2698](https://github.com/paritytech/parity/pull/2698)
+- Add inject.js (for web3 exposed) [#2692](https://github.com/paritytech/parity/pull/2692)
+- Remove obsolete dapps and update security headers [#2694](https://github.com/paritytech/parity/pull/2694)
+- Snapshot sync part 2 [#2098](https://github.com/paritytech/parity/pull/2098)
+- Fix issues with no ethereum test dir present (2382) [#2659](https://github.com/paritytech/parity/pull/2659)
+- Apply UI PRs after master merge [#2690](https://github.com/paritytech/parity/pull/2690)
+- Fix importing traces for non-canon blocks [#2683](https://github.com/paritytech/parity/pull/2683)
+- Fixing random test failures [#2577](https://github.com/paritytech/parity/pull/2577)
+- Disable IPC in default build for 1.4 [#2657](https://github.com/paritytech/parity/pull/2657)
+- use pruning history in CLI snapshots [#2658](https://github.com/paritytech/parity/pull/2658)
+- Fixing --no-default-features again and evmbin [#2670](https://github.com/paritytech/parity/pull/2670)
+- Settings > Proxy for proxy.pac setup instructions [#2678](https://github.com/paritytech/parity/pull/2678)
+- Re-instate transaitions to allow updating busy indicator [#2682](https://github.com/paritytech/parity/pull/2682)
+- signer: remove reject counter [#2685](https://github.com/paritytech/parity/pull/2685)
+- Initial new UI source code import [#2607](https://github.com/paritytech/parity/pull/2607)
+- Additional dapp logo images [#2677](https://github.com/paritytech/parity/pull/2677)
+- Redirect from :8080 to :8180 [#2676](https://github.com/paritytech/parity/pull/2676)
+- script to update js-precompiled [#2673](https://github.com/paritytech/parity/pull/2673)
+- Styling in FF is not 100% [#2669](https://github.com/paritytech/parity/pull/2669)
+- Don't allow gavcoin transfer with no balances [#2667](https://github.com/paritytech/parity/pull/2667)
+- fix signer rejections [#2666](https://github.com/paritytech/parity/pull/2666)
+- better text on unique background pattern [#2664](https://github.com/paritytech/parity/pull/2664)
+- Adjust z-index for error overlay [#2662](https://github.com/paritytech/parity/pull/2662)
+- Fix address selection for contract deployment [#2660](https://github.com/paritytech/parity/pull/2660)
+- Add additional contract images [#2655](https://github.com/paritytech/parity/pull/2655)
+- Update /api/* to point to :8080/api/* (first generation interface) [#2612](https://github.com/paritytech/parity/pull/2612)
+- Initial import of new UI (compiled JS code) [#2220](https://github.com/paritytech/parity/pull/2220)
+- Fixing evmbin compilation [#2652](https://github.com/paritytech/parity/pull/2652)
+- Fix up ETC EIP-150 transition to 2,500,000. [#2636](https://github.com/paritytech/parity/pull/2636)
+- Fixing compilation without default features [#2638](https://github.com/paritytech/parity/pull/2638)
+- [frontport] CLI to specify queue ordering strategy (#2494) [#2623](https://github.com/paritytech/parity/pull/2623)
+- Support for decryption in Signer [#2421](https://github.com/paritytech/parity/pull/2421)
+- EIP150.1c [#2591](https://github.com/paritytech/parity/pull/2591)
+- Release merge with origin with ours strategy [#2631](https://github.com/paritytech/parity/pull/2631)
+- Adjust build output directories [#2630](https://github.com/paritytech/parity/pull/2630)
+- cater for txhash returning null/empty object [#2629](https://github.com/paritytech/parity/pull/2629)
+- snapshot: single byte for empty accounts [#2625](https://github.com/paritytech/parity/pull/2625)
+- Configurable history size in master [#2606](https://github.com/paritytech/parity/pull/2606)
+- Database performance tweaks [#2619](https://github.com/paritytech/parity/pull/2619)
+- Enable suicide json test [#2626](https://github.com/paritytech/parity/pull/2626)
+- Split journaldb commit into two functions: journal_under and mark_canonical [#2329](https://github.com/paritytech/parity/pull/2329)
+- Fixed tx queue limit for local transactions [#2616](https://github.com/paritytech/parity/pull/2616)
+- Additional logs when transactions is removed from queue [#2617](https://github.com/paritytech/parity/pull/2617)
+- mitigate refcell conflict in state diffing [#2601](https://github.com/paritytech/parity/pull/2601)
+- Fix tests [#2611](https://github.com/paritytech/parity/pull/2611)
+- small styling updates [#2610](https://github.com/paritytech/parity/pull/2610)
+- Remove web3 from Signer, bring in parity.js API [#2604](https://github.com/paritytech/parity/pull/2604)
+- Mostly configurable canonical cache size [#2516](https://github.com/paritytech/parity/pull/2516)
+- Added peers details to ethcore_netPeers RPC [#2580](https://github.com/paritytech/parity/pull/2580)
+- Display account password hint when available [#2596](https://github.com/paritytech/parity/pull/2596)
+- Fix gas estimation on transfer when data supplied [#2593](https://github.com/paritytech/parity/pull/2593)
+- remove unused npm packages [#2590](https://github.com/paritytech/parity/pull/2590)
+- Bundle fonts as part of the build process [#2588](https://github.com/paritytech/parity/pull/2588)
+- Contract constructor params [#2586](https://github.com/paritytech/parity/pull/2586)
+- Update json test suite [#2574](https://github.com/paritytech/parity/pull/2574)
+- Filter apps that has been replaced for the local list [#2583](https://github.com/paritytech/parity/pull/2583)
+- Display local apps listed by Parity [#2581](https://github.com/paritytech/parity/pull/2581)
+- Network-specific nodes file [#2569](https://github.com/paritytech/parity/pull/2569)
+- Dont close when block is known to be invalid [#2572](https://github.com/paritytech/parity/pull/2572)
+- deny compiler warnings in CI [#2570](https://github.com/paritytech/parity/pull/2570)
+- adjust alignment of queries [#2573](https://github.com/paritytech/parity/pull/2573)
+- update ethcore-bigint crate to 0.1.1 [#2562](https://github.com/paritytech/parity/pull/2562)
+- Registry dapp uses setAddress to actually set addresses now [#2568](https://github.com/paritytech/parity/pull/2568)
+- Add the new EIP150 test. [#2563](https://github.com/paritytech/parity/pull/2563)
+- fix failing tests [#2567](https://github.com/paritytech/parity/pull/2567)
+- ΞTH -> ETH [#2566](https://github.com/paritytech/parity/pull/2566)
+- Ensure polling is only done when connected [#2565](https://github.com/paritytech/parity/pull/2565)
+- Fixed race condition in trace import [#2555](https://github.com/paritytech/parity/pull/2555)
+- Disable misbehaving peers while seeking for best block [#2537](https://github.com/paritytech/parity/pull/2537)
+- TX queue gas limit config and allow local transactions over the gas limit [#2553](https://github.com/paritytech/parity/pull/2553)
+- standard component for address -> name mappings (consistent use everywhere) [#2557](https://github.com/paritytech/parity/pull/2557)
+- Remove unwrap from client module [#2554](https://github.com/paritytech/parity/pull/2554)
+- Removing panickers from sync module [#2551](https://github.com/paritytech/parity/pull/2551)
+- Address images (tokens, dapps) as registered via contentHash (when available) [#2526](https://github.com/paritytech/parity/pull/2526)
+- TokenReg set & get images working [#2540](https://github.com/paritytech/parity/pull/2540)
+- adjust app_id where /api/content/<hash> is called, fixes #2541 [#2543](https://github.com/paritytech/parity/pull/2543)
+- connection dialog now shows up in dapps as well, closes #2538 [#2550](https://github.com/paritytech/parity/pull/2550)
+- display account uuid (where available), closes #2546 [#2549](https://github.com/paritytech/parity/pull/2549)
+- create accounts via recovery phrase [#2545](https://github.com/paritytech/parity/pull/2545)
+- Build ethcore/js-precompiled on GitLab [#2522](https://github.com/paritytech/parity/pull/2522)
+- Return errors from eth_call RPC [#2498](https://github.com/paritytech/parity/pull/2498)
+- registry dapp: manage records [#2323](https://github.com/paritytech/parity/pull/2323)
+- Print backtrace on panic [#2535](https://github.com/paritytech/parity/pull/2535)
+- GitHubHint dapp [#2531](https://github.com/paritytech/parity/pull/2531)
+- Backports to master [#2530](https://github.com/paritytech/parity/pull/2530)
+- Handle reorganizations in the state cache [#2490](https://github.com/paritytech/parity/pull/2490)
+- Hypervisor: terminate hanging modules [#2513](https://github.com/paritytech/parity/pull/2513)
+- signer & node connection prompts/indicators [#2504](https://github.com/paritytech/parity/pull/2504)
+- Using pending block only if is not old [#2514](https://github.com/paritytech/parity/pull/2514)
+- More caching optimizations [#2505](https://github.com/paritytech/parity/pull/2505)
+- Fixed possible panic in the networking [#2495](https://github.com/paritytech/parity/pull/2495)
+- Trim password from file [#2503](https://github.com/paritytech/parity/pull/2503)
+- Fixing RPC Filter conversion to EthFilter [#2500](https://github.com/paritytech/parity/pull/2500)
+- Fixing error message for transactions [#2496](https://github.com/paritytech/parity/pull/2496)
+- Adjustable stack size for EVM [#2483](https://github.com/paritytech/parity/pull/2483)
+- [master] Fixing penalization in future [#2499](https://github.com/paritytech/parity/pull/2499)
+- Preserve cache on reverting the snapshot [#2488](https://github.com/paritytech/parity/pull/2488)
+- RocksDB version bump [#2492](https://github.com/paritytech/parity/pull/2492)
+- Increase default size of transaction queue [#2489](https://github.com/paritytech/parity/pull/2489)
+- basiccoin v1 available [#2491](https://github.com/paritytech/parity/pull/2491)
+- Small EVM optimization [#2487](https://github.com/paritytech/parity/pull/2487)
+- Track dirty accounts in the state [#2461](https://github.com/paritytech/parity/pull/2461)
+- fix signature lookup address [#2480](https://github.com/paritytech/parity/pull/2480)
+- update registrar test with generic non-empty test [#2476](https://github.com/paritytech/parity/pull/2476)
+- Derive IPC interface only when ipc feature is on [#2463](https://github.com/paritytech/parity/pull/2463)
+- Fix ethstore opening all key files in the directory at once [#2471](https://github.com/paritytech/parity/pull/2471)
+- contract api event log fixes [#2469](https://github.com/paritytech/parity/pull/2469)
+- basiccoin base functionality in-place [#2468](https://github.com/paritytech/parity/pull/2468)
+- Merge IPC codegen attributes into one [#2460](https://github.com/paritytech/parity/pull/2460)
+- Close after importing keys from geth [#2464](https://github.com/paritytech/parity/pull/2464)
+- Port a couple more RPC APIs to the new auto args [#2325](https://github.com/paritytech/parity/pull/2325)
+- update rustc for appveyor to 1.12.0 [#2423](https://github.com/paritytech/parity/pull/2423)
+- dapp basiccoin send operations [#2456](https://github.com/paritytech/parity/pull/2456)
+- Better EVM informant & Slow transactions warning [#2436](https://github.com/paritytech/parity/pull/2436)
+- Fixing Signer token RPC API [#2437](https://github.com/paritytech/parity/pull/2437)
+- Fixed FatDB check [#2443](https://github.com/paritytech/parity/pull/2443)
+- dapp basiccoin structure [#2444](https://github.com/paritytech/parity/pull/2444)
+- Accounts bloom in master [#2426](https://github.com/paritytech/parity/pull/2426)
+- Polishing Actually enable fat db pr (#1974) [#2048](https://github.com/paritytech/parity/pull/2048)
+- Jumptable cache [#2427](https://github.com/paritytech/parity/pull/2427)
+- signaturereg registered, remove hardcoding [#2431](https://github.com/paritytech/parity/pull/2431)
+- tokenreg dapp fixes for non-null returns [#2430](https://github.com/paritytech/parity/pull/2430)
+- update ABI json to latest deployed versions [#2428](https://github.com/paritytech/parity/pull/2428)
+- update Morden registry address [#2417](https://github.com/paritytech/parity/pull/2417)
+- Make migration api more friendly [#2420](https://github.com/paritytech/parity/pull/2420)
+- Journaling bloom filter crate in util [#2395](https://github.com/paritytech/parity/pull/2395)
+- move abis from js/json to contracts/abi [#2418](https://github.com/paritytech/parity/pull/2418)
+- Fixing logs-receipt matching [#2403](https://github.com/paritytech/parity/pull/2403)
+- fix broken beta compilation [#2405](https://github.com/paritytech/parity/pull/2405)
+- registry dapp: transfer names [#2335](https://github.com/paritytech/parity/pull/2335)
+- manage firstRun better [#2398](https://github.com/paritytech/parity/pull/2398)
+- render contract deployment address [#2397](https://github.com/paritytech/parity/pull/2397)
+- Transaction Queue fix [#2392](https://github.com/paritytech/parity/pull/2392)
+- contracts abi types & execute value [#2394](https://github.com/paritytech/parity/pull/2394)
+- update styling with ParityBar overlay [#2390](https://github.com/paritytech/parity/pull/2390)
+- application Signer popup window [#2388](https://github.com/paritytech/parity/pull/2388)
+- Fixing Delegate Call in JIT [#2378](https://github.com/paritytech/parity/pull/2378)
+- Prioritizing re-imported transactions [#2372](https://github.com/paritytech/parity/pull/2372)
+- Revert #2172, pretty much. [#2387](https://github.com/paritytech/parity/pull/2387)
+- correct sync memory usage calculation [#2385](https://github.com/paritytech/parity/pull/2385)
+- fix migration system for post-consolidation migrations, better errors [#2334](https://github.com/paritytech/parity/pull/2334)
+- Fix the traceAddress field in transaction traces. [#2373](https://github.com/paritytech/parity/pull/2373)
+- Gavcoin utilises the popup box [#2381](https://github.com/paritytech/parity/pull/2381)
+- registry dapp: support dropping names [#2328](https://github.com/paritytech/parity/pull/2328)
+- settings view, set background & store views [#2380](https://github.com/paritytech/parity/pull/2380)
+- Removing extras data from retracted blocks. [#2375](https://github.com/paritytech/parity/pull/2375)
+- fixed #2263, geth keys with ciphertext shorter than 32 bytes [#2318](https://github.com/paritytech/parity/pull/2318)
+- Expanse compatibility [#2369](https://github.com/paritytech/parity/pull/2369)
+- Allow queries of constant functions on contracts [#2360](https://github.com/paritytech/parity/pull/2360)
+- Auto Open/Close the Signer window on new transaction request [#2362](https://github.com/paritytech/parity/pull/2362)
+- Specify column cache sizes explicitly; default fallback of 2MB [#2358](https://github.com/paritytech/parity/pull/2358)
+- Canonical state cache (master) [#2311](https://github.com/paritytech/parity/pull/2311)
+- method signature lookups, parameter decoding & management [#2313](https://github.com/paritytech/parity/pull/2313)
+- make block queue into a more generic verification queue and fix block heap size calculation [#2095](https://github.com/paritytech/parity/pull/2095)
+- Hash Content RPC method [#2355](https://github.com/paritytech/parity/pull/2355)
+- registry dapp: show reserved events by default [#2359](https://github.com/paritytech/parity/pull/2359)
+- Display timestamp in Signer requests details [#2324](https://github.com/paritytech/parity/pull/2324)
+- Reorder transaction_by_hash to favour canon search [#2332](https://github.com/paritytech/parity/pull/2332)
+- Optimize DIV for some common divisors [#2327](https://github.com/paritytech/parity/pull/2327)
+- Return error when deserializing invalid hex [#2339](https://github.com/paritytech/parity/pull/2339)
+- Changed http:// to https:// on some links [#2349](https://github.com/paritytech/parity/pull/2349)
+- user defaults [#2014](https://github.com/paritytech/parity/pull/2014)
+- Fixing jit feature compilation [#2310](https://github.com/paritytech/parity/pull/2310)
+- Tx Queue improvements  [#2292](https://github.com/paritytech/parity/pull/2292)
+- Removing PropTypes on build [#2322](https://github.com/paritytech/parity/pull/2322)
+- Lenient bytes deserialization [#2036](https://github.com/paritytech/parity/pull/2036)
+- reverse call data decoding given transaction data & method [#2312](https://github.com/paritytech/parity/pull/2312)
+- add missing gpl headers to gavcoin dapp [#2317](https://github.com/paritytech/parity/pull/2317)
+- contract Events, Functions & Queries sub-components as well as Event log visual updates [#2306](https://github.com/paritytech/parity/pull/2306)
+- webpack config updates (really include babel-polyfill, rename npm steps) [#2305](https://github.com/paritytech/parity/pull/2305)
+- remove unneeded Form from Account header [#2302](https://github.com/paritytech/parity/pull/2302)
+- edit of metadata across accounts, addresses & contracts [#2300](https://github.com/paritytech/parity/pull/2300)
+- Adjust all modals for consistency & css DRY-ness [#2301](https://github.com/paritytech/parity/pull/2301)
+- update container spacing [#2296](https://github.com/paritytech/parity/pull/2296)
+- local cache of generated background (no allocation on each re-render) [#2298](https://github.com/paritytech/parity/pull/2298)
+- fix failing tests [#2290](https://github.com/paritytech/parity/pull/2290)
+- Respecting standards for tokenreg dapp [#2287](https://github.com/paritytech/parity/pull/2287)
+- Separate RPC serialization from implementation [#2072](https://github.com/paritytech/parity/pull/2072)
+- Webpack optimisations - Using DLL [#2264](https://github.com/paritytech/parity/pull/2264)
+- header background, theme adjustments (not that harsh) [#2273](https://github.com/paritytech/parity/pull/2273)
+- contract view (developer-centric) [#2259](https://github.com/paritytech/parity/pull/2259)
+- Add hash as CLI function [#1995](https://github.com/paritytech/parity/pull/1995)
+- registry: fix mined events showing as pending [#2267](https://github.com/paritytech/parity/pull/2267)
+- Dapp - Tokereg ; Query Tokens from TLA or Address [#2266](https://github.com/paritytech/parity/pull/2266)
+- Fixes to the Token Registration dApp [#2250](https://github.com/paritytech/parity/pull/2250)
+- remove abi *.json duplication, provide a single version of the truth [#2253](https://github.com/paritytech/parity/pull/2253)
+- Separate path for ext code size [#2251](https://github.com/paritytech/parity/pull/2251)
+- Snapshot format changes [#2234](https://github.com/paritytech/parity/pull/2234)
+- Serving content at /api/content/<hash> [#2248](https://github.com/paritytech/parity/pull/2248)
+- Fails when deserializing non-hex uints [#2247](https://github.com/paritytech/parity/pull/2247)
+- registry dapp: add GPL headers [#2252](https://github.com/paritytech/parity/pull/2252)
+- registry dapp: user-friendly lookup [#2229](https://github.com/paritytech/parity/pull/2229)
+- registry dapp: show DataChanged events [#2242](https://github.com/paritytech/parity/pull/2242)
+- fixups for deploys [#2249](https://github.com/paritytech/parity/pull/2249)
+- Fixing output of eth_call and Bytes deserialization [#2230](https://github.com/paritytech/parity/pull/2230)
+- Encryption, decryption and public key RPCs. [#1946](https://github.com/paritytech/parity/pull/1946)
+- limit number of event logs returned [#2231](https://github.com/paritytech/parity/pull/2231)
+- babel-polyfill [#2239](https://github.com/paritytech/parity/pull/2239)
+- procedurally generate background based on signer key [#2233](https://github.com/paritytech/parity/pull/2233)
+- UI fixes [#2238](https://github.com/paritytech/parity/pull/2238)
+- expose isConnected() from transport [#2225](https://github.com/paritytech/parity/pull/2225)
+- registry dapp: rename event log [#2227](https://github.com/paritytech/parity/pull/2227)
+- registry dapp: show pending events [#2223](https://github.com/paritytech/parity/pull/2223)
+- Handle RLP to string UTF-8 decoding errors [#2217](https://github.com/paritytech/parity/pull/2217)
+- Use WebSocket transport for all built-in calls [#2216](https://github.com/paritytech/parity/pull/2216)
+- Remove panickers from trie iterators [#2209](https://github.com/paritytech/parity/pull/2209)
+- Limit for logs filter. [#2180](https://github.com/paritytech/parity/pull/2180)
+- Various state copy optimizations [#2172](https://github.com/paritytech/parity/pull/2172)
+- New signer token RPC & Initial signer connection without token. [#2096](https://github.com/paritytech/parity/pull/2096)
+- signer ui fixes [#2219](https://github.com/paritytech/parity/pull/2219)
+- contract deploy ui [#2212](https://github.com/paritytech/parity/pull/2212)
+- registry dapp: fix propTypes [#2218](https://github.com/paritytech/parity/pull/2218)
+- registry: fix IdentityIcon in events log [#2206](https://github.com/paritytech/parity/pull/2206)
+- Fixing evm-debug [#2161](https://github.com/paritytech/parity/pull/2161)
+- Fix syncing with pv63 peers [#2204](https://github.com/paritytech/parity/pull/2204)
+- registry: show shortened hashes [#2205](https://github.com/paritytech/parity/pull/2205)
+- registry dapp: remove owner [#2203](https://github.com/paritytech/parity/pull/2203)
+- webpack proxy updates for /api* [#2175](https://github.com/paritytech/parity/pull/2175)
+- simplify personal event publishing, fix delete refresh issues [#2183](https://github.com/paritytech/parity/pull/2183)
+- fix global & initial states [#2160](https://github.com/paritytech/parity/pull/2160)
+- Allow selection & saving of available views [#2131](https://github.com/paritytech/parity/pull/2131)
+- global/contract events with promisy subscribe/unsubscribe [#2136](https://github.com/paritytech/parity/pull/2136)
+- Token Registry dApp [#2178](https://github.com/paritytech/parity/pull/2178)
+- re-usable bytesToHex exposed in api.util [#2174](https://github.com/paritytech/parity/pull/2174)
+- Webpack optimisations [#2179](https://github.com/paritytech/parity/pull/2179)
+- cleanup on contract event subscriptions [#2104](https://github.com/paritytech/parity/pull/2104)
+- move utility functions to api.util [#2105](https://github.com/paritytech/parity/pull/2105)
+- registry dapp [#2077](https://github.com/paritytech/parity/pull/2077)
+- mui/FlatButton to ui/Button [#2129](https://github.com/paritytech/parity/pull/2129)
+- address delete functionality [#2128](https://github.com/paritytech/parity/pull/2128)
+- contract deployment updates [#2106](https://github.com/paritytech/parity/pull/2106)
+- contract events, indexed string fix [#2108](https://github.com/paritytech/parity/pull/2108)
+- Bumping jsonrpc-core & jsonrpc-http-server [#2162](https://github.com/paritytech/parity/pull/2162)
+- gitlab testing & build processes [#2090](https://github.com/paritytech/parity/pull/2090)
+- Misc small UI fixes (recently broken) [#2101](https://github.com/paritytech/parity/pull/2101)
+- Bump clippy & Fix warnings [#2109](https://github.com/paritytech/parity/pull/2109)
+- Import command summary [#2102](https://github.com/paritytech/parity/pull/2102)
+- check for existence of deprecated ethash file before attempting delete [#2103](https://github.com/paritytech/parity/pull/2103)
+- shapeshift Promise API library [#2088](https://github.com/paritytech/parity/pull/2088)
+- fund account via ShapeShift [#2099](https://github.com/paritytech/parity/pull/2099)
+- Get bigint on crates.io [#2078](https://github.com/paritytech/parity/pull/2078)
+- Enable sealing if Engine provides internal sealing given author [#2084](https://github.com/paritytech/parity/pull/2084)
+- Config files [#2070](https://github.com/paritytech/parity/pull/2070)
+- re-add lodash plugin to babel config [#2092](https://github.com/paritytech/parity/pull/2092)
+- Remove old cache data [#2081](https://github.com/paritytech/parity/pull/2081)
+- Logs limit & log_index bug [#2073](https://github.com/paritytech/parity/pull/2073)
+- flatten store, muiTheme & api providers [#2087](https://github.com/paritytech/parity/pull/2087)
+- add babel es2016 & es2017 presets [#2083](https://github.com/paritytech/parity/pull/2083)
+- remove all '<name>/index' imports in API [#2089](https://github.com/paritytech/parity/pull/2089)
+- add missing GPL headers to all files [#2086](https://github.com/paritytech/parity/pull/2086)
+- readme cleanups [#2085](https://github.com/paritytech/parity/pull/2085)
+- gavcoin global import of parity api  [#2082](https://github.com/paritytech/parity/pull/2082)
+- Fixing removal from gas price when moving future->current [#2076](https://github.com/paritytech/parity/pull/2076)
+- Split internal sealing from work preparation [#2071](https://github.com/paritytech/parity/pull/2071)
+- ensure the target folder doesn't exist before renaming [#2074](https://github.com/paritytech/parity/pull/2074)
+- Get rid of 'Dapp is being downloaded' page [#2055](https://github.com/paritytech/parity/pull/2055)
+- fix failing master build: update tests to new init_restore signature. [#2069](https://github.com/paritytech/parity/pull/2069)
+- Local snapshot restore [#2058](https://github.com/paritytech/parity/pull/2058)
+- import: keep informant going until finished [#2065](https://github.com/paritytech/parity/pull/2065)
+- Add a few tests for the snapshot service [#2059](https://github.com/paritytech/parity/pull/2059)
+- IPC tweaks [#2046](https://github.com/paritytech/parity/pull/2046)
+- Update arm* Docker [#2064](https://github.com/paritytech/parity/pull/2064)
+- Fetching any content-addressed content [#2050](https://github.com/paritytech/parity/pull/2050)
+- Use proper database configuration in snapshots. [#2052](https://github.com/paritytech/parity/pull/2052)
+- periodic snapshot tweaks [#2054](https://github.com/paritytech/parity/pull/2054)
+- ethkey-cli [#2057](https://github.com/paritytech/parity/pull/2057)
+- Forward ethstore-cli feature [#2056](https://github.com/paritytech/parity/pull/2056)
+- handling invalid spec jsons properly, additional tests, closes #1840 [#2049](https://github.com/paritytech/parity/pull/2049)
+- Periodic snapshots [#2044](https://github.com/paritytech/parity/pull/2044)
+- Snapshot sync [#2047](https://github.com/paritytech/parity/pull/2047)
+- Nice error pages for Dapps & Signer [#2033](https://github.com/paritytech/parity/pull/2033)
+- Add a few small snapshot tests [#2038](https://github.com/paritytech/parity/pull/2038)
+- facelift for traces, added errors [#2042](https://github.com/paritytech/parity/pull/2042)
+- Fetching content from HTTPS using `rustls` [#2024](https://github.com/paritytech/parity/pull/2024)
+- Skipping log when there are no transactions were sent [#2045](https://github.com/paritytech/parity/pull/2045)
+- rlp as separate crate [#2034](https://github.com/paritytech/parity/pull/2034)
+- Fixing uint serialization [#2037](https://github.com/paritytech/parity/pull/2037)
+- Fixing new transactions propagation [#2039](https://github.com/paritytech/parity/pull/2039)
+- Propagating transactions to peers on timer. [#2035](https://github.com/paritytech/parity/pull/2035)
+- Remove Populatable and BytesConvertable traits [#2019](https://github.com/paritytech/parity/pull/2019)
+- fixed #1933 [#1979](https://github.com/paritytech/parity/pull/1979)
+- Synchronization tweaks for IPC services [#2028](https://github.com/paritytech/parity/pull/2028)
+- Asynchronous RPC support [#2017](https://github.com/paritytech/parity/pull/2017)
+- Disable ArchiveDB counter check [#2016](https://github.com/paritytech/parity/pull/2016)
+- always process trie death row on commit, add more tracing [#2025](https://github.com/paritytech/parity/pull/2025)
+- fixed transaction addresses mapping, fixes #1971 [#2026](https://github.com/paritytech/parity/pull/2026)
+- Adding tests for dapps server. [#2021](https://github.com/paritytech/parity/pull/2021)
+- builtin trait refactoring [#2018](https://github.com/paritytech/parity/pull/2018)
+- Start parity with systemd [#1967](https://github.com/paritytech/parity/pull/1967)
+- Control service for IPC [#2013](https://github.com/paritytech/parity/pull/2013)
+- LRU cache for dapps [#2006](https://github.com/paritytech/parity/pull/2006)
+- CLI for valid hosts for dapps server [#2005](https://github.com/paritytech/parity/pull/2005)
+- Make the block header struct's internals private [#2000](https://github.com/paritytech/parity/pull/2000)
+- Take control of recovered snapshots, start restoration asynchronously [#2010](https://github.com/paritytech/parity/pull/2010)
+- remove internal locking from DBTransaction [#2003](https://github.com/paritytech/parity/pull/2003)
+- Snapshot optimizations [#1991](https://github.com/paritytech/parity/pull/1991)
+- Revert removing ecies [#2009](https://github.com/paritytech/parity/pull/2009)
+- small blooms optimization [#1998](https://github.com/paritytech/parity/pull/1998)
+- protection from adding empty traces && assertion in traces db [#1994](https://github.com/paritytech/parity/pull/1994)
+- Stratum IPC service [#1959](https://github.com/paritytech/parity/pull/1959)
+- Signature cleanup [#1921](https://github.com/paritytech/parity/pull/1921)
+- Fixed discovery skipping some nodes [#1996](https://github.com/paritytech/parity/pull/1996)
+- Trie query recording and AccountDB factory for no mangling [#1944](https://github.com/paritytech/parity/pull/1944)
+- Validating sha3 of a dapp bundle [#1993](https://github.com/paritytech/parity/pull/1993)
+- Improve eth_getWork timeout test rpc_get_work_should_timeout [#1992](https://github.com/paritytech/parity/pull/1992)
+- Resolving URLs from contract [#1964](https://github.com/paritytech/parity/pull/1964)
+- Add timeout for eth_getWork call [#1975](https://github.com/paritytech/parity/pull/1975)
+- CLI for Signer interface [#1980](https://github.com/paritytech/parity/pull/1980)
+- IPC timeout multiplied [#1990](https://github.com/paritytech/parity/pull/1990)
+- Use relative path for IPC sockets [#1983](https://github.com/paritytech/parity/pull/1983)
+- Market-orientated transaction pricing [#1963](https://github.com/paritytech/parity/pull/1963)
+- Bump clippy [#1982](https://github.com/paritytech/parity/pull/1982)
+- Fixing mutual recursive types serialization [#1977](https://github.com/paritytech/parity/pull/1977)
+- Fix open on FreeBSD [#1984](https://github.com/paritytech/parity/pull/1984)
+- Upgrade hyper dependency to 0.9 [#1973](https://github.com/paritytech/parity/pull/1973)
+- Create network-specific nodes files [#1970](https://github.com/paritytech/parity/pull/1970)
+- Getting rid of syntex [#1965](https://github.com/paritytech/parity/pull/1965)
+- Remove binary specification from hypervisor [#1960](https://github.com/paritytech/parity/pull/1960)
+- Stratum protocol general [#1954](https://github.com/paritytech/parity/pull/1954)
+- keep track of first block in blockchain [#1937](https://github.com/paritytech/parity/pull/1937)
+- introduce ethcore/state module [#1953](https://github.com/paritytech/parity/pull/1953)
+- Apply settings to column families [#1956](https://github.com/paritytech/parity/pull/1956)
+- move column family constants into db module [#1955](https://github.com/paritytech/parity/pull/1955)
+- ECIES without MAC [#1948](https://github.com/paritytech/parity/pull/1948)
+- Fix canny warnings [#1951](https://github.com/paritytech/parity/pull/1951)
+- Fetchable dapps [#1949](https://github.com/paritytech/parity/pull/1949)
+- remove impossible panickers related to infallible db transaction [#1947](https://github.com/paritytech/parity/pull/1947)
+- Minor optimizations [#1943](https://github.com/paritytech/parity/pull/1943)
+- remove randomness from bigint benches, fix warnings [#1945](https://github.com/paritytech/parity/pull/1945)
+- Fix several RPCs [#1926](https://github.com/paritytech/parity/pull/1926)
+- Bump clippy, fix warnings [#1939](https://github.com/paritytech/parity/pull/1939)
+- DB WAL size limit [#1935](https://github.com/paritytech/parity/pull/1935)
+- Use explicit global namespaces in codegen [#1928](https://github.com/paritytech/parity/pull/1928)
+- Fix build on master [#1934](https://github.com/paritytech/parity/pull/1934)
+- IPC on by default [#1927](https://github.com/paritytech/parity/pull/1927)
+- fix util benches compilation [#1931](https://github.com/paritytech/parity/pull/1931)
+- Update gitlab-ci [#1929](https://github.com/paritytech/parity/pull/1929)
+- ethkey and ethstore use hash structures from bigint [#1851](https://github.com/paritytech/parity/pull/1851)
+
+## Parity [v1.3.10](https://github.com/paritytech/parity/releases/tag/v1.3.10) (2016-11-04)
+
+The latest 1.3 series release, now considered stable.
+
+This includes several additional optimisations and fixes together with provisional support for the upcoming hard fork for EIP155/160/161.
+
+- Stable branch reset to 1.3.10 [#3156](https://github.com/paritytech/parity/pull/3156)
+- Backporting to beta [#3149](https://github.com/paritytech/parity/pull/3149)
+- apply post-consolidation migrations after consolidating (BETA) [#3048](https://github.com/paritytech/parity/pull/3048)
+- [beta] Fix the brainwallet functionality. (#2994) [#3005](https://github.com/paritytech/parity/pull/3005)
+- Bumping json-ipc-server [#2989](https://github.com/paritytech/parity/pull/2989)
+- Backports for 1.3.10 [#2987](https://github.com/paritytech/parity/pull/2987)
+
+## Parity [v1.3.9](https://github.com/paritytech/parity/releases/tag/v1.3.9) (2016-10-21)
+
+This release enables EIP-150 hard fork for Ethereum Classic chain and resolves a few stability and performance issues, such as:
+- Interrupted syncing on the test network.
+- Block import delays caused by a large number of incoming transactions. A full re-sync is recommended for performance improvement to take effect.
+
+Full changes:
+- [beta] Resolve morden fork [#2776](https://github.com/paritytech/parity/pull/2776)
+- Fixing botched merge [#2767](https://github.com/paritytech/parity/pull/2767)
+- Backports for beta [#2764](https://github.com/paritytech/parity/pull/2764)
+- Introduce EIP150 hardfork block for ETC [#2736](https://github.com/paritytech/parity/pull/2736)
+- [beta] fix issues with no test dir present (#2659) [#2724](https://github.com/paritytech/parity/pull/2724)
+- [beta] Bumping jsonrpc-http-server [#2715](https://github.com/paritytech/parity/pull/2715)
+- [beta] Fix migration system, better errors [#2661](https://github.com/paritytech/parity/pull/2661)
+
+## Parity [v1.3.8](https://github.com/paritytech/parity/releases/tag/v1.3.8) (2016-10-15)
+
+Parity 1.3.8 is our EIP150 hard-fork compliant release.
+
+Running this will enact a mild change of the protocol at block number 2,463,000 which should occur on Tuesday 18th October 2016 at approximately 12:20 London time (BST). This change alters the gas prices for a number of operations, mainly centring around i/o intensive Merkle trie lookups (`BALANCE`, `EXTCODESIZE` &c.) and state-trie polluters (`SUICIDE`, `CREATE` and `CALL`). These operations were heavily underpriced, an oversight which lead to the recent degradation of network service. The full details of the alteration are specified in [EIP-150](https://github.com/ethereum/EIPs/issues/150).
+
+Additionally several issues have been fixed including:
+- a transaction queue limitation leading to dropped transactions;
+- a synchronisation issue leading to stalls when syncing;
+
+And some small features including database performance improvements and additional logging.
+
+#### Upgrading private chain specification files.
+
+All the chain specification files now have EIP-150 rules enabled by default. To continue using the chain add the `eip150Transition` key under `Engine/ethash/params` and set it to a future transition block as shown in [this example](https://github.com/paritytech/parity/blob/85eeb3ea6e5e21ad8e5644241edf82eb8069f536/ethcore/res/ethereum/morden.json#L13).
+
+The key related to homestead transition has been renamed from `frontierCompatibilityModeLimit` to `homesteadTransition`.
+
+#### Full changes
+
+- [beta] EIP150.1c [#2599](https://github.com/paritytech/parity/pull/2599)
+- Remove count limit for local transactions [#2634](https://github.com/paritytech/parity/pull/2634)
+- Tweak DB and mining defaults [#2598](https://github.com/paritytech/parity/pull/2598)
+- Revert "Bloom upgrade in beta" [#2635](https://github.com/paritytech/parity/pull/2635)
+- Bloom upgrade in beta [#2609](https://github.com/paritytech/parity/pull/2609)
+- Backports to beta [#2628](https://github.com/paritytech/parity/pull/2628)
+
+## Parity [v1.3.7](https://github.com/paritytech/parity/releases/tag/v1.3.7) (2016-10-12)
+
+This release contains fixes to reduce memory usage under the DoS attack and improve transaction relay.
+
+- Configurable history size in beta [#2587](https://github.com/paritytech/parity/pull/2587)
+- Backports to beta [#2592](https://github.com/paritytech/parity/pull/2592)
+
+
+## Parity [v1.3.6](https://github.com/paritytech/parity/releases/tag/v1.3.6) (2016-10-11)
+
+Parity 1.3.6 is another hotfix release to address transaction spam and deal with stability issues. With this release transaction pool gas limit no longer applies to local transactions. Full list of changes is available here:
+
+- Backports to beta v1.3.6 [#2571](https://github.com/paritytech/parity/pull/2571)
+- Use global state cache when mining [#2529](https://github.com/paritytech/parity/pull/2529)
+- Transaction queue limited by gas [#2528](https://github.com/paritytech/parity/pull/2528)
+
+## Parity [v1.3.5](https://github.com/paritytech/parity/releases/tag/v1.3.5) (2016-10-08)
+
+1.3.5 is a hotfix release for the transaction propagation issue. Transaction pool limit is now calculated based on the block gas limit.
+
+- Update appveyor rustc [beta] [#2521](https://github.com/paritytech/parity/pull/2521)
+- Increase size of transaction queue by default [#2519](https://github.com/paritytech/parity/pull/2519)
+
+## Parity [v1.3.4](https://github.com/paritytech/parity/releases/tag/v1.3.4) (2016-10-07)
+
+Parity 1.3.4 release contains more optimizations to internal caching as well as stability improvements.
+
+It also introduces an ability for miners to choose a transaction ordering strategy:
+
+    --tx-queue-strategy S    Prioritization strategy used to order transactions
+                             in the queue. S may be:
+                             gas - Prioritize txs with low gas limit;
+                             gas_price - Prioritize txs with high gas price;
+                             gas_factor - Prioritize txs using gas price
+                             and gas limit ratio [default: gas_factor].
+
+- Backport to beta [#2518](https://github.com/paritytech/parity/pull/2518)
+- [beta] Fixing RPC Filter conversion to EthFilter [#2501](https://github.com/paritytech/parity/pull/2501)
+- [beta] Using pending block only if is not old [#2515](https://github.com/paritytech/parity/pull/2515)
+- Backports into beta [#2512](https://github.com/paritytech/parity/pull/2512)
+- CLI to specify queue ordering strategy [#2494](https://github.com/paritytech/parity/pull/2494)
+- Fix ethstore opening all key files in the directory at once (BETA) [#2472](https://github.com/paritytech/parity/pull/2472)
+- Beta backports [#2465](https://github.com/paritytech/parity/pull/2465)
+- IPC-library dependency fork & bump for beta [#2455](https://github.com/paritytech/parity/pull/2455)
+
+## Parity [v1.3.3](https://github.com/paritytech/parity/releases/tag/v1.3.3) (2016-10-04)
+
+1.3.3 is another hotfix release for the DoS attack
+
+- Jumptable cache [#2435](https://github.com/paritytech/parity/pull/2435)
+- fix broken beta compilation (backport to beta) [#2414](https://github.com/paritytech/parity/pull/2414)
+- Run inplace upgrades after version update [#2411](https://github.com/paritytech/parity/pull/2411)
+
+## Parity [v1.3.2](https://github.com/paritytech/parity/releases/tag/v1.3.2) (2016-09-29)
+
+This is a hotfix release to address stability and performance issues uncovered during the network DoS attack. Full list of changes is available [here](https://github.com/paritytech/parity/compare/v1.3.1...v1.3.2)
+
+- Beta Backports [#2396](https://github.com/paritytech/parity/pull/2396)
+- Fixing penalization in future [#2493](https://github.com/paritytech/parity/pull/2493)
+- A quick fix for missing tree route blocks [#2400](https://github.com/paritytech/parity/pull/2400)
+- Cache the fork block header after snapshot restoration [#2391](https://github.com/paritytech/parity/pull/2391)
+- correct sync memory usage calculation (BETA) [#2386](https://github.com/paritytech/parity/pull/2386)
+- Accounts bloom [#2357](https://github.com/paritytech/parity/pull/2357)
+- Disable colors when generating signer token. [#2379](https://github.com/paritytech/parity/pull/2379)
+- Fixing jit feature compilation [#2376](https://github.com/paritytech/parity/pull/2376)
+- Clear state cache on sealed block import [#2377](https://github.com/paritytech/parity/pull/2377)
+- DIV optimization (beta) [#2353](https://github.com/paritytech/parity/pull/2353)
+- Canonical state cache [#2308](https://github.com/paritytech/parity/pull/2308)
+- Reorder transaction_by_hash to favour canon search [#2331](https://github.com/paritytech/parity/pull/2331)
+- Lenient bytes deserialization [#2340](https://github.com/paritytech/parity/pull/2340)
+- Penalize transactions with gas above gas limit [#2271](https://github.com/paritytech/parity/pull/2271)
+- Peek transaction queue via RPC [#2270](https://github.com/paritytech/parity/pull/2270)
+- Handle RLP to string UTF-8 decoding errors (#2217) [#2226](https://github.com/paritytech/parity/pull/2226)
+- Fixing compilation without default features [beta] [#2207](https://github.com/paritytech/parity/pull/2207)
+- Avoid cloning clean stuff [beta backport] [#2173](https://github.com/paritytech/parity/pull/2173)
+- v1.3.2 in beta [#2200](https://github.com/paritytech/parity/pull/2200)
+
+## Parity [v1.3.1](https://github.com/paritytech/parity/releases/tag/v1.3.1) (2016-09-11)
+
+1.3.1 includes many [bugfixes](https://github.com/paritytech/parity/commit/2a82fa0a47b00bedfec520a2fdd3cc31aa4ccd8c). Critical ones:
+- **Chain reorganisation fix** Transaction receipts / traces were sometimes linked with incorrect block hash. Fixed in https://github.com/paritytech/parity/commit/a9587f8965a32c84973c35ce1c8d51d07044143f
+- **Trace overflow fix** Overflow which occurred during tracing. Fixed in https://github.com/paritytech/parity/pull/1979
+
+- Backports to beta [#2068](https://github.com/paritytech/parity/pull/2068)
+- Fixing serde overflow error (#1977) [#2030](https://github.com/paritytech/parity/pull/2030)
+- Simplified db pruning detection in beta [#1924](https://github.com/paritytech/parity/pull/1924)
+- Backports to beta [#1919](https://github.com/paritytech/parity/pull/1919)
+
+## Parity [v1.3.0: "Acuity"](https://github.com/paritytech/parity/releases/tag/v1.3.0) (2016-08-12)
+
+As well as many bug fixes, 1.3.0 includes a number of important improvements including:
+- **Optimisations** Heavily optimised block/transaction processing core - up to 2x faster than 1.2 series.
+- **Database compression** Databases take as much as 30% less storage than before.
+- **State snapshotting** An installation synchronised from scratch in 1-2 minutes can be made after downloading the 140MB state snapshot. See [the wiki](https://github.com/paritytech/parity/wiki/Getting-Synced) for more information.
+- **Process isolation** The networking/chain-synchronisation is now a fully independent process.
+
+Incremental improvements include:
+- Additional [RPCs](https://github.com/paritytech/parity/wiki/JSONRPC) for transaction tracing, state diffing, VM tracing, asynchronous transaction posting, accounts metadata and message signing.
+- Improved logging, including for chain reorganisations.
+- Added a `--fast-and-loose` option for additional speed-ups which can compromise integrity on a dirty shutdown.
+- Column families to ensure maximal inter-database integrity.
+- Key naming includes date/time of creation.
+- Various improvements to networking robustness and performance.
+- Solidity compilation supported through RPC if `solc` is available.
+- Various improvements to the miner including [HTTP push work notification](https://github.com/ethcoreparitytech/parity/wiki/Mining#starting-it).
+
+Full changes:
+- Bumping Parity UI [#1920](https://github.com/paritytech/parity/pull/1920)
+- Adding entrypoints to docker images [#1909](https://github.com/paritytech/parity/pull/1909)
+- Save nodes removed from backing_overlay until commit [#1917](https://github.com/paritytech/parity/pull/1917)
+- RPC for importing geth keys [#1916](https://github.com/paritytech/parity/pull/1916)
+- Peers RPC + UI displaying active/connected/max peers [#1915](https://github.com/paritytech/parity/pull/1915)
+- RPC for deriving address from phrase. [#1912](https://github.com/paritytech/parity/pull/1912)
+- adjust polling & connection timeouts for ipc [#1910](https://github.com/paritytech/parity/pull/1910)
+- Don't return deleted nodes that are not yet flushed [#1908](https://github.com/paritytech/parity/pull/1908)
+- Wallet rpcs [#1898](https://github.com/paritytech/parity/pull/1898)
+- Fix binary serialization bug [#1907](https://github.com/paritytech/parity/pull/1907)
+- fixed #1889, .DS_Store is no longer treated as key file [#1892](https://github.com/paritytech/parity/pull/1892)
+- Purging .derefs, fixing clippy warnings. [#1890](https://github.com/paritytech/parity/pull/1890)
+- RocksDB version bump [#1904](https://github.com/paritytech/parity/pull/1904)
+- Fix ipc compilation and add ipc feature to test targets [#1902](https://github.com/paritytech/parity/pull/1902)
+- Autocreating geth dir if none and geth mode on [#1896](https://github.com/paritytech/parity/pull/1896)
+- v1.4.0 in master [#1886](https://github.com/paritytech/parity/pull/1886)
+- Adding more details to miner log [#1891](https://github.com/paritytech/parity/pull/1891)
+- moved hash.rs to bigint library [#1827](https://github.com/paritytech/parity/pull/1827)
+- fixed cache_manager lock order [#1877](https://github.com/paritytech/parity/pull/1877)
+- Fixing miner deadlock [#1885](https://github.com/paritytech/parity/pull/1885)
+- Updating WS + Increasing token validity [#1882](https://github.com/paritytech/parity/pull/1882)
+- take snapshot at specified block and slightly better informants [#1873](https://github.com/paritytech/parity/pull/1873)
+- RPC errors & logs [#1845](https://github.com/paritytech/parity/pull/1845)
+- Reduce max open files [#1876](https://github.com/paritytech/parity/pull/1876)
+- Send new block hashes to all peers [#1875](https://github.com/paritytech/parity/pull/1875)
+- Use UntrustedRlp for block verification [#1872](https://github.com/paritytech/parity/pull/1872)
+- Update cache usage on commiting block info [#1871](https://github.com/paritytech/parity/pull/1871)
+- Validating conversion U256->usize when doing gas calculation (for 32bits) [#1870](https://github.com/paritytech/parity/pull/1870)
+- Sync to peers with confirmed fork block only [#1863](https://github.com/paritytech/parity/pull/1863)
+- miner and client take spec reference [#1853](https://github.com/paritytech/parity/pull/1853)
+- Unlock account with timeout for geth compatibility [#1854](https://github.com/paritytech/parity/pull/1854)
+- Fixed reported max height and transaction propagation [#1852](https://github.com/paritytech/parity/pull/1852)
+- Snapshot creation and restoration [#1679](https://github.com/paritytech/parity/pull/1679)
+- fix deprecated typo [#1850](https://github.com/paritytech/parity/pull/1850)
+- Split IO and network crates [#1828](https://github.com/paritytech/parity/pull/1828)
+- updated classic JSON spec with classic bootnodes, fixes #1842 [#1847](https://github.com/paritytech/parity/pull/1847)
+- protect unsafety in plainhasher; get more unique hashes [#1841](https://github.com/paritytech/parity/pull/1841)
+- use mutex in dbtransaction [#1843](https://github.com/paritytech/parity/pull/1843)
+- Fix state not using "account_starting_nonce" [#1830](https://github.com/paritytech/parity/pull/1830)
+- Supporting blockid in eth_call and trace_call/trace_raw [#1837](https://github.com/paritytech/parity/pull/1837)
+- eth_checkTransaction renamed to eth_checkRequest [#1817](https://github.com/paritytech/parity/pull/1817)
+- Bump json-ipc-server again [#1839](https://github.com/paritytech/parity/pull/1839)
+- Fixing another deadlock in trace db [#1833](https://github.com/paritytech/parity/pull/1833)
+- Fix up the VM trace. [#1829](https://github.com/paritytech/parity/pull/1829)
+- fixed parsing export params, fixes #1826 [#1834](https://github.com/paritytech/parity/pull/1834)
+- More performance optimizations [#1814](https://github.com/paritytech/parity/pull/1814)
+- Bumping clippy & fixing warnings [#1823](https://github.com/paritytech/parity/pull/1823)
+- removed unused code from util and unnecessary dependency of FixedHash [#1824](https://github.com/paritytech/parity/pull/1824)
+- Remove (almost all) panickers from trie module [#1776](https://github.com/paritytech/parity/pull/1776)
+- Fixing account naming [#1810](https://github.com/paritytech/parity/pull/1810)
+- JournalDB inject [#1806](https://github.com/paritytech/parity/pull/1806)
+- No block number in get work while in geth-compat mode. [#1821](https://github.com/paritytech/parity/pull/1821)
+- Import wallet fix [#1820](https://github.com/paritytech/parity/pull/1820)
+- Supporting eth_sign in Signer [#1787](https://github.com/paritytech/parity/pull/1787)
+- Fixing cache update after chain reorg [#1816](https://github.com/paritytech/parity/pull/1816)
+- Development mode for Signer UI [#1788](https://github.com/paritytech/parity/pull/1788)
+- Miner tweaks [#1797](https://github.com/paritytech/parity/pull/1797)
+- Util & ipc clenup [#1807](https://github.com/paritytech/parity/pull/1807)
+- Fixing unlock parsing [#1802](https://github.com/paritytech/parity/pull/1802)
+- fixed importing presale wallet with encseed longer than 96 bytes [#1801](https://github.com/paritytech/parity/pull/1801)
+- DRYing build scripts [#1795](https://github.com/paritytech/parity/pull/1795)
+- Allow code from spec json [#1790](https://github.com/paritytech/parity/pull/1790)
+- nano-tests (ipc transport) to the CI [#1793](https://github.com/paritytech/parity/pull/1793)
+- Commit best block after closing transaction [#1791](https://github.com/paritytech/parity/pull/1791)
+- Place thread name in the log output [#1792](https://github.com/paritytech/parity/pull/1792)
+- Fix ipc tests and bring to CI [#1789](https://github.com/paritytech/parity/pull/1789)
+- dynamic keys pickup [#1779](https://github.com/paritytech/parity/pull/1779)
+- ipc version bump [#1783](https://github.com/paritytech/parity/pull/1783)
+- Prevent deadlock on trace GC [#1780](https://github.com/paritytech/parity/pull/1780)
+- fixed trace_transaction crash when block contained suicide [#1781](https://github.com/paritytech/parity/pull/1781)
+- Fix block body migration [#1777](https://github.com/paritytech/parity/pull/1777)
+- cache manager and clearing tracing cache [#1769](https://github.com/paritytech/parity/pull/1769)
+- Return storage as H256 from RPC. [#1774](https://github.com/paritytech/parity/pull/1774)
+- Instant sealing engine [#1767](https://github.com/paritytech/parity/pull/1767)
+- fix state unsafety with a mostly-guaranteed handle [#1755](https://github.com/paritytech/parity/pull/1755)
+- Gas for mem optimization [#1768](https://github.com/paritytech/parity/pull/1768)
+- Min and Max peers setting [#1771](https://github.com/paritytech/parity/pull/1771)
+- Disable WAL [#1765](https://github.com/paritytech/parity/pull/1765)
+- Add new line when printing start strings [#1766](https://github.com/paritytech/parity/pull/1766)
+- Log tweak [#1764](https://github.com/paritytech/parity/pull/1764)
+- Remove update_sealing call on importing own block [#1762](https://github.com/paritytech/parity/pull/1762)
+- Single DB [#1741](https://github.com/paritytech/parity/pull/1741)
+- Tweak format of log so it's not so verbose. [#1758](https://github.com/paritytech/parity/pull/1758)
+- Combine mining queue and enabled into single locked datum [#1749](https://github.com/paritytech/parity/pull/1749)
+- Collect consensus/null engines into a single module [#1754](https://github.com/paritytech/parity/pull/1754)
+- Fix failing deserialization test [#1756](https://github.com/paritytech/parity/pull/1756)
+- Stackoverflow fix [#1742](https://github.com/paritytech/parity/pull/1742)
+- compaction profile used during migration, fixes #1750 [#1751](https://github.com/paritytech/parity/pull/1751)
+- Splitting documentation into separate build job [#1752](https://github.com/paritytech/parity/pull/1752)
+- handle keys deserialization errors, fixes #1592 [#1701](https://github.com/paritytech/parity/pull/1701)
+- add gitlab-ci yaml [#1753](https://github.com/paritytech/parity/pull/1753)
+- Better handling of multiple migrations [#1747](https://github.com/paritytech/parity/pull/1747)
+- Disconnect peers on a fork [#1738](https://github.com/paritytech/parity/pull/1738)
+- Add RPC & client call to replay a transaction. [#1734](https://github.com/paritytech/parity/pull/1734)
+- another version bump for jsonrpc-ipc [#1744](https://github.com/paritytech/parity/pull/1744)
+- Trace other types of calls [#1727](https://github.com/paritytech/parity/pull/1727)
+- Fixing compilation on latest nightly [#1736](https://github.com/paritytech/parity/pull/1736)
+- Blocks and snapshot compression [#1687](https://github.com/paritytech/parity/pull/1687)
+- bump json-ipc-server version [#1739](https://github.com/paritytech/parity/pull/1739)
+- Use std::sync::Condvar [#1732](https://github.com/paritytech/parity/pull/1732)
+- Bump json-ipc-server version [#1733](https://github.com/paritytech/parity/pull/1733)
+- bump json-ipc-server version [#1731](https://github.com/paritytech/parity/pull/1731)
+- Fixing some clippy warnings [#1728](https://github.com/paritytech/parity/pull/1728)
+- Bumping Parity UI [#1682](https://github.com/paritytech/parity/pull/1682)
+- Various improvements to tracing & diagnostics. [#1707](https://github.com/paritytech/parity/pull/1707)
+- Fixed reading chunked EIP8 handshake [#1712](https://github.com/paritytech/parity/pull/1712)
+- Fix for importing blocks from a pipe file [#1724](https://github.com/paritytech/parity/pull/1724)
+- Proper errors for binary serializer [#1714](https://github.com/paritytech/parity/pull/1714)
+- Use a transaction for writing blocks [#1718](https://github.com/paritytech/parity/pull/1718)
+- Exclude generated code from coverage [#1720](https://github.com/paritytech/parity/pull/1720)
+- Use single binary for ipc modules [#1710](https://github.com/paritytech/parity/pull/1710)
+- Log a chain-reorg. [#1715](https://github.com/paritytech/parity/pull/1715)
+- Restore new block informant message [#1716](https://github.com/paritytech/parity/pull/1716)
+- Parallel block body download [#1659](https://github.com/paritytech/parity/pull/1659)
+- Rotate blockchain cache [#1709](https://github.com/paritytech/parity/pull/1709)
+- Fix broken internal names. [#1711](https://github.com/paritytech/parity/pull/1711)
+- cli overhaul [#1600](https://github.com/paritytech/parity/pull/1600)
+- Key files include timestamp in name. [#1700](https://github.com/paritytech/parity/pull/1700)
+- Fixing warnings [#1705](https://github.com/paritytech/parity/pull/1705)
+- Ethereum classic [#1706](https://github.com/paritytech/parity/pull/1706)
+- Docker Arguments [#1703](https://github.com/paritytech/parity/pull/1703)
+- Informant tidyup. [#1699](https://github.com/paritytech/parity/pull/1699)
+- Name and meta in accounts [#1695](https://github.com/paritytech/parity/pull/1695)
+- Stackoverflow #1686 [#1698](https://github.com/paritytech/parity/pull/1698)
+- filtering transactions toAddress includes contract creation [#1697](https://github.com/paritytech/parity/pull/1697)
+- Prevent syncing to ancient blocks [#1693](https://github.com/paritytech/parity/pull/1693)
+- Enable WAL and disable DB repair [#1696](https://github.com/paritytech/parity/pull/1696)
+- Returning error when transaction is rejected (for consistency) [#1667](https://github.com/paritytech/parity/pull/1667)
+- Disabling signer when in geth-compatibility mode [#1676](https://github.com/paritytech/parity/pull/1676)
+- Suicides tracing [#1688](https://github.com/paritytech/parity/pull/1688)
+- small cleanup of substate.rs [#1685](https://github.com/paritytech/parity/pull/1685)
+- resolve #411: remove install scripts [#1684](https://github.com/paritytech/parity/pull/1684)
+- IPC (feature-gated) [#1654](https://github.com/paritytech/parity/pull/1654)
+- Bumping JSONRPC-http-server [#1678](https://github.com/paritytech/parity/pull/1678)
+- Fixing hash deserialisation [#1674](https://github.com/paritytech/parity/pull/1674)
+- Ping discovery nodes gradually [#1671](https://github.com/paritytech/parity/pull/1671)
+- Fixing the deadlock on incoming connection [#1672](https://github.com/paritytech/parity/pull/1672)
+- Fixing errors returned by sendTransaction* method family [#1665](https://github.com/paritytech/parity/pull/1665)
+- Moved syncing log out of the client [#1670](https://github.com/paritytech/parity/pull/1670)
+- Host validation (again) [#1666](https://github.com/paritytech/parity/pull/1666)
+- Update install-deps.sh [ci skip] [#1664](https://github.com/paritytech/parity/pull/1664)
+- fix typos [#1644](https://github.com/paritytech/parity/pull/1644)
+- Size for blocks [#1668](https://github.com/paritytech/parity/pull/1668)
+- Revert "Validating Host headers in RPC requests" [#1663](https://github.com/paritytech/parity/pull/1663)
+- Validating Host headers in RPC requests [#1658](https://github.com/paritytech/parity/pull/1658)
+- fixed failing master [#1662](https://github.com/paritytech/parity/pull/1662)
+- Fixing clippy warnings [#1660](https://github.com/paritytech/parity/pull/1660)
+- Don't ping all nodes on start [#1656](https://github.com/paritytech/parity/pull/1656)
+- More performance optimizations [#1649](https://github.com/paritytech/parity/pull/1649)
+- Removing unused client code [#1645](https://github.com/paritytech/parity/pull/1645)
+- Asynchronous transactions (polling based for now). [#1652](https://github.com/paritytech/parity/pull/1652)
+- Sync stand-alone binary and feature-gated dependencies refactoring  [#1637](https://github.com/paritytech/parity/pull/1637)
+- Re-enabling Parity UI [#1627](https://github.com/paritytech/parity/pull/1627)
+- Blockchain repair on missing state root [#1646](https://github.com/paritytech/parity/pull/1646)
+- Multi-mode logging. [#1643](https://github.com/paritytech/parity/pull/1643)
+- Pro paths [#1650](https://github.com/paritytech/parity/pull/1650)
+- Performance optimizations [#1642](https://github.com/paritytech/parity/pull/1642)
+- Removed DAO soft fork traces [#1639](https://github.com/paritytech/parity/pull/1639)
+- Compiler version update for windows [#1638](https://github.com/paritytech/parity/pull/1638)
+- Delete values immediately from DB overlay [#1631](https://github.com/paritytech/parity/pull/1631)
+- DAO hard-fork [#1483](https://github.com/paritytech/parity/pull/1483)
+- fix network_start regression [#1629](https://github.com/paritytech/parity/pull/1629)
+- Die if the DB is newer than the one supported. [#1630](https://github.com/paritytech/parity/pull/1630)
+- Cleanup of colour code. Use is_a_tty. [#1621](https://github.com/paritytech/parity/pull/1621)
+- don't batch best block for branches [#1623](https://github.com/paritytech/parity/pull/1623)
+- In-memory trie operations [#1408](https://github.com/paritytech/parity/pull/1408)
+- Fix "pending" parameter on RPC block requests [#1602](https://github.com/paritytech/parity/pull/1602)
+- Allow RPC to use solc to compile solidity [#1607](https://github.com/paritytech/parity/pull/1607)
+- IPC RPC deriving for traits [#1599](https://github.com/paritytech/parity/pull/1599)
+- Utilize cached kcov if exists [#1619](https://github.com/paritytech/parity/pull/1619)
+- Fixing no-ui feature [#1618](https://github.com/paritytech/parity/pull/1618)
+- Couple of rocksdb optimizations [#1614](https://github.com/paritytech/parity/pull/1614)
+- Miner tests [#1597](https://github.com/paritytech/parity/pull/1597)
+- Sync IPC interface [#1584](https://github.com/paritytech/parity/pull/1584)
+- Make sure reserved peers are in the node table [#1616](https://github.com/paritytech/parity/pull/1616)
+- Fix bloomchain on blockchain repair [#1610](https://github.com/paritytech/parity/pull/1610)
+- fixed broken tracing [#1615](https://github.com/paritytech/parity/pull/1615)
+- fix benchmark compilation [#1612](https://github.com/paritytech/parity/pull/1612)
+- Updating jsonrpc-http-server [#1611](https://github.com/paritytech/parity/pull/1611)
+- replace synchronization primitives with those from parking_lot [#1593](https://github.com/paritytech/parity/pull/1593)
+- ui compilation feature [#1604](https://github.com/paritytech/parity/pull/1604)
+- is_zero() and pow() optimisations for uint [#1608](https://github.com/paritytech/parity/pull/1608)
+- Optimizing & Cleaning the build [#1591](https://github.com/paritytech/parity/pull/1591)
+- Fix logging [#1590](https://github.com/paritytech/parity/pull/1590)
+- remove unnecessary mutex in logging [#1601](https://github.com/paritytech/parity/pull/1601)
+- Using streamlined parity-ui repository [#1566](https://github.com/paritytech/parity/pull/1566)
+- Optimizing InstructionInfo access. [#1595](https://github.com/paritytech/parity/pull/1595)
+- V7 Migration progress indicator [#1594](https://github.com/paritytech/parity/pull/1594)
+- bring snapshotting work into master [#1577](https://github.com/paritytech/parity/pull/1577)
+- Bump clippy [#1587](https://github.com/paritytech/parity/pull/1587)
+- refactoring of handshake messages serialization in ipc [#1586](https://github.com/paritytech/parity/pull/1586)
+- expunge &Vec<T> pattern [#1579](https://github.com/paritytech/parity/pull/1579)
+- EVM gas for memory tiny optimization [#1578](https://github.com/paritytech/parity/pull/1578)
+- cleaned up parity/signer [#1551](https://github.com/paritytech/parity/pull/1551)
+- Major sync <-> client interactions refactoring [#1572](https://github.com/paritytech/parity/pull/1572)
+- failing test with overlayrecent pruning [#1567](https://github.com/paritytech/parity/pull/1567)
+- Enable state queries for OverlayRecent DB [#1575](https://github.com/paritytech/parity/pull/1575)
+- have AccountDB use address hash for uniqueness [#1533](https://github.com/paritytech/parity/pull/1533)
+- Very basic EVM binary. [#1574](https://github.com/paritytech/parity/pull/1574)
+- Some obvious evm & uint optimizations  [#1576](https://github.com/paritytech/parity/pull/1576)
+- Fixing clippy warnings [#1568](https://github.com/paritytech/parity/pull/1568)
+- Miner's gas price gets updated dynamically [#1570](https://github.com/paritytech/parity/pull/1570)
+- bringing hypervisor as a crate in ipc dir [#1565](https://github.com/paritytech/parity/pull/1565)
+- Init public interface with IO message [#1573](https://github.com/paritytech/parity/pull/1573)
+- Uncommenting simple Miner tests [#1571](https://github.com/paritytech/parity/pull/1571)
+- Kill lock unwraps [#1558](https://github.com/paritytech/parity/pull/1558)
+- Fixing deadlock in miner [#1569](https://github.com/paritytech/parity/pull/1569)
+- Idealpeers in log [#1563](https://github.com/paritytech/parity/pull/1563)
+- Simple style fix. [#1561](https://github.com/paritytech/parity/pull/1561)
+- Enum variants serialisation test&fix [#1559](https://github.com/paritytech/parity/pull/1559)
+- Supporting /api/ping for dapps server [#1543](https://github.com/paritytech/parity/pull/1543)
+- Client IPC Interface [#1493](https://github.com/paritytech/parity/pull/1493)
+- Kill timers when removing IO handler [#1554](https://github.com/paritytech/parity/pull/1554)
+- Fix and add info messages [#1552](https://github.com/paritytech/parity/pull/1552)
+- Fix indent of #1541 [#1555](https://github.com/paritytech/parity/pull/1555)
+- Update sealing just once when  externally importing many blocks [#1541](https://github.com/paritytech/parity/pull/1541)
+- Remove soft-fork stuff. [#1548](https://github.com/paritytech/parity/pull/1548)
+- fix codegen warning [#1550](https://github.com/paritytech/parity/pull/1550)
+- Extend migration framework [#1546](https://github.com/paritytech/parity/pull/1546)
+- Refactoring dapps to support API endpoints. [#1542](https://github.com/paritytech/parity/pull/1542)
+- serde is no longer util dependency [#1534](https://github.com/paritytech/parity/pull/1534)
+- mention wiki in README [#1549](https://github.com/paritytech/parity/pull/1549)
+- Skipping transactions with invalid nonces when pushing to block. [#1545](https://github.com/paritytech/parity/pull/1545)
+- Silent running operating modes [#1477](https://github.com/paritytech/parity/pull/1477)
+- util cleanup [#1474](https://github.com/paritytech/parity/pull/1474)
+- Calculating gas using usize (if supplied gaslimit fits in usize) [#1518](https://github.com/paritytech/parity/pull/1518)
+- add owning NibbleVec [#1536](https://github.com/paritytech/parity/pull/1536)
+- Attempt to fix blochchain/extras DBs sync [#1538](https://github.com/paritytech/parity/pull/1538)
+- Client API refactoring - limiting errors to crate-level error types [#1525](https://github.com/paritytech/parity/pull/1525)
+- IPC codegen enhancement - allow void methods [#1540](https://github.com/paritytech/parity/pull/1540)
+- Fixing serving nested files for dapps. [#1539](https://github.com/paritytech/parity/pull/1539)
+- Fixed public address config [#1537](https://github.com/paritytech/parity/pull/1537)
+- Fixing compilation&clippy warnings [#1531](https://github.com/paritytech/parity/pull/1531)
+- creating ethereum dir while in geth mode [#1530](https://github.com/paritytech/parity/pull/1530)
+- Bumping clippy [#1532](https://github.com/paritytech/parity/pull/1532)
+- Make signer default as long as --unlock isn't used. [#1524](https://github.com/paritytech/parity/pull/1524)
+- add client timeout when requesting usd price for gas [#1526](https://github.com/paritytech/parity/pull/1526)
+- Fix gitter-url link in README.md [#1528](https://github.com/paritytech/parity/pull/1528)
+- Fix error message. [#1527](https://github.com/paritytech/parity/pull/1527)
+- BTreeMap binary serialization [#1489](https://github.com/paritytech/parity/pull/1489)
+- Save block reference in the queue on notification [#1501](https://github.com/paritytech/parity/pull/1501)
+- bigint tests to run on CI [#1522](https://github.com/paritytech/parity/pull/1522)
+- Client api cleaning - uncles are returned as rlp [#1516](https://github.com/paritytech/parity/pull/1516)
+- Fatdb integration with CLI [#1464](https://github.com/paritytech/parity/pull/1464)
+- Optimizing/simplifying shr [#1517](https://github.com/paritytech/parity/pull/1517)
+- change IPC codegen to allow attributes [#1500](https://github.com/paritytech/parity/pull/1500)
+- Fix warnings [#1514](https://github.com/paritytech/parity/pull/1514)
+- FatDB [#1452](https://github.com/paritytech/parity/pull/1452)
+- Fix the reseal mechanism. [#1513](https://github.com/paritytech/parity/pull/1513)
+- Update Dockerfile ubuntu-aarch64 [#1509](https://github.com/paritytech/parity/pull/1509)
+- Update Ubuntu-arm Dockerfile [#1510](https://github.com/paritytech/parity/pull/1510)
+- Update Ubuntu-jit Dockerfile [#1511](https://github.com/paritytech/parity/pull/1511)
+- Update Ubuntu Dockerfile [#1512](https://github.com/paritytech/parity/pull/1512)
+- Update CentOS Dockerfile [#1508](https://github.com/paritytech/parity/pull/1508)
+- bump status page v0.5.1 [#1502](https://github.com/paritytech/parity/pull/1502)
+- Update CentOS Dockerfile [#1507](https://github.com/paritytech/parity/pull/1507)
+- Update Dockerfile ubuntu-aarch64 [#1506](https://github.com/paritytech/parity/pull/1506)
+- Update Ubuntu-arm Dockerfile [#1505](https://github.com/paritytech/parity/pull/1505)
+- Update Ubuntu-jit Dockerfile [#1504](https://github.com/paritytech/parity/pull/1504)
+- Update Ubuntu Dockerfile [#1503](https://github.com/paritytech/parity/pull/1503)
+- Optionally clone block behind work-package [#1497](https://github.com/paritytech/parity/pull/1497)
+- Fix no colour on windows. [#1498](https://github.com/paritytech/parity/pull/1498)
+- Workaround for hyper panic [#1495](https://github.com/paritytech/parity/pull/1495)
+- Colourful notification on mine [#1488](https://github.com/paritytech/parity/pull/1488)
+- Quick fix for max open files error [#1494](https://github.com/paritytech/parity/pull/1494)
+- Work notification over HTTP [#1491](https://github.com/paritytech/parity/pull/1491)
+- Sealed block importing and propagation optimization [#1478](https://github.com/paritytech/parity/pull/1478)
+- vm factory to mining client [#1487](https://github.com/paritytech/parity/pull/1487)
+- topbar dialog fix [#1479](https://github.com/paritytech/parity/pull/1479)
+- Minor additions to allow resetting of code. [#1482](https://github.com/paritytech/parity/pull/1482)
+- Introduce options for fine-grained management of work queue. [#1484](https://github.com/paritytech/parity/pull/1484)
+- Snapshot state restoration [#1308](https://github.com/paritytech/parity/pull/1308)
+- Merge master into pv64 branch [#1486](https://github.com/paritytech/parity/pull/1486)
+- Ensure we don't reject our own transactions for gasprice. [#1485](https://github.com/paritytech/parity/pull/1485)
+- Signing parity executable & windows installer in appveyor [#1481](https://github.com/paritytech/parity/pull/1481)
+- Rearrange fork CLI options. [#1476](https://github.com/paritytech/parity/pull/1476)
+- give appveyor some breath [#1475](https://github.com/paritytech/parity/pull/1475)
+- Ensure we always get the latest work when mining on submitted. [#1469](https://github.com/paritytech/parity/pull/1469)
+- Tests for views [#1471](https://github.com/paritytech/parity/pull/1471)
+- json ipc version bump [#1470](https://github.com/paritytech/parity/pull/1470)
+- verifier is no longer a template type of client [#1467](https://github.com/paritytech/parity/pull/1467)
+- Allow configuration of when to reseal blocks. [#1460](https://github.com/paritytech/parity/pull/1460)
+- removed unsafe code [#1466](https://github.com/paritytech/parity/pull/1466)
+- WS bump + Adding default for value [#1465](https://github.com/paritytech/parity/pull/1465)
+- Attempt DB repair if corrupted [#1461](https://github.com/paritytech/parity/pull/1461)
+- Database configuration extended [#1454](https://github.com/paritytech/parity/pull/1454)
+- Updating WS-RS server [#1459](https://github.com/paritytech/parity/pull/1459)
+- Reduced IO messages; removed panics on IO notifications [#1457](https://github.com/paritytech/parity/pull/1457)
+- Handle errors when starting parity --signer [#1451](https://github.com/paritytech/parity/pull/1451)
+- Fixed losing queued blocks on error [#1453](https://github.com/paritytech/parity/pull/1453)
+- Updated to latest hyper with patched mio [#1450](https://github.com/paritytech/parity/pull/1450)
+- Retweak BASE and MULTIPLIER in rocksdb config. [#1445](https://github.com/paritytech/parity/pull/1445)
+- Removing Miner::default. [#1410](https://github.com/paritytech/parity/pull/1410)
+- Don't mine without --author [#1436](https://github.com/paritytech/parity/pull/1436)
+- Revert the rescuedao extradata. [#1437](https://github.com/paritytech/parity/pull/1437)
+- More conservative settings for rocksdb. [#1440](https://github.com/paritytech/parity/pull/1440)
+- v1.3.0 in master [#1421](https://github.com/paritytech/parity/pull/1421)
+- Update Ubuntu-arm Dockerfile [#1429](https://github.com/paritytech/parity/pull/1429)
+- Create Dockerfile ubuntu-aarch64 [#1430](https://github.com/paritytech/parity/pull/1430)
+- Update CentOS Dockerfile [#1424](https://github.com/paritytech/parity/pull/1424)
+- Update Ubuntu Dockerfile [#1426](https://github.com/paritytech/parity/pull/1426)
+- Update Ubuntu-jit Dockerfile [#1427](https://github.com/paritytech/parity/pull/1427)
+- Update SF blocknumber to 1800000. [#1418](https://github.com/paritytech/parity/pull/1418)
+
+## Parity [v1.2.4](https://github.com/paritytech/parity/releases/tag/v1.2.4) (2016-08-09)
+
+Parity 1.2.4 Is a maintenance release that fixes a [few](https://github.com/paritytech/parity/pull/1888/commits) issues related to mining and peer synchronization.
+This release is marked as stable.
+
+- Backports for beta [#1888](https://github.com/paritytech/parity/pull/1888)
+- BETA: fixed trace_transaction crash when block contained suicide [#1782](https://github.com/paritytech/parity/pull/1782)
+
+## Parity [v1.2.3](https://github.com/paritytech/parity/releases/tag/v1.2.3) (2016-07-31)
+
+Parity 1.2.3 is a patch release that addresses network stability issues for both Ethereum HF and Ethereum classic chains and brings a few changes to the transaction tracing API.
+
+#### Tracing API changes
+- Added tracing for `CALLCODE`, `DELEGATECALL` and `SUICIDE`
+- `trace_call` returns traces in flat format
+- Added 2 new methods: `trace_rawTransaction` and `trace_replayTransaction`
+
+Note that to continue using tracing features in this version you need to re-sync the blockchain. This can be done by using `parity export $HOME/ethereum-chain-backup.rlp` , deleting the database usually located at `~/.parity/906a34e69aec8c0d` followed by `parity import $HOME/ethereum-chain-backup.rlp`.
+
+- [beta] Updating UI [#1778](https://github.com/paritytech/parity/pull/1778)
+- tracing backport [#1770](https://github.com/paritytech/parity/pull/1770)
+- Backport commits to beta [#1763](https://github.com/paritytech/parity/pull/1763)
+- Deadlock on incoming connection (#1672) [#1675](https://github.com/paritytech/parity/pull/1675)
+- [BETA] Removed DAO soft fork traces [#1640](https://github.com/paritytech/parity/pull/1640)
+
+
+## Parity [v1.2.2](https://github.com/paritytech/parity/releases/tag/v1.2.2) (2016-07-16)
+
+#### New
+- DAO hard-fork.
+
+DAO hard-fork implementation conforms to the [specification](https://blog.slock.it/hard-fork-specification-24b889e70703) and is enabled by default.
+
+#### Changed
+- `--reseal-on-txs` defaults to `own`.
+- DAO soft-fork support has been removed along with related command line options.
+
+#### Resolved issues
+- `--db-cache-size` consuming too much memory.
+  `eth_getWork` RPC response additionally includes the block number.
+- Skipping transactions with invalid nonces when pushing to block.
+- Update sealing just once when externally importing many blocks (#1541).
+- Transaction tracing skipping simple transactions (#1606).
+- Other small fixes and improvements.
+
+Full changelog
+
+- DAO hard-fork (#1483) [#1636](https://github.com/paritytech/parity/pull/1636)
+- Backports for beta [#1628](https://github.com/paritytech/parity/pull/1628)
+- don't batch best block for branches (#1623) [#1626](https://github.com/paritytech/parity/pull/1626)
+- Merge bugfixes from master to beta [#1605](https://github.com/paritytech/parity/pull/1605)
+- (BETA) using block options cache instead of general cache for rocksdb [#1613](https://github.com/paritytech/parity/pull/1613)
+- Backport sealing fixes to beta [#1583](https://github.com/paritytech/parity/pull/1583)
+- v1.2.2 in beta [#1581](https://github.com/paritytech/parity/pull/1581)
+- Skipping transactions with invalid nonces when pushing to block. (#1545) [#1547](https://github.com/paritytech/parity/pull/1547)
+
+
+## Parity [v1.2.1](https://github.com/paritytech/parity/releases/tag/v1.2.1) (2016-07-01)
+
+#### New
+- Options for more precise mining tuning (see below).
+- Informative notification when block mined.
+- HTTP signal on new work-package.
+- Optimised database insertion for self-mined blocks.
+- Short-circuit for local transaction gas-price approval.
+- A number of issues related to mining have been fixed.
+
+##### Mining options
+- `--author` is now required for mining.
+- `--reseal-on-txs` Specify which transactions should force the node to reseal a block. By default parity updates the seal on incoming transactions to reduce transaction latency. Set this option to `none` to force updates on new blocks only.
+- `--reseal-min-period` Can be used to control how often a new pending block is generated if `none` is not selected on prior option.
+- `--work-queue-size` Controls how many pending blocks to keep in memory.
+- `--relay-set`  Can be used to enable more strict transaction verification.
+- `--remove-solved` Move solved blocks from the work package queue instead of cloning them. This gives a slightly faster import speed, but means that extra solutions submitted for the same work package will go unused.
+- `--notify-work` Accepts a list of URLs that will receive a POST request when new work package is available. The body of the POST message is JSON encoded and has the same format as `eth_getWork` RPC response.
+
+##### RPC
+
+`eth_getWork` RPC response additionally includes the block number.
+
+##### DAO soft-fork
+
+DAO soft-fork control options have been replaced by the single `--fork` option which disables the soft-fork by default.
+
+#### Changes
+
+- v1.2.1 in beta [#1492](https://github.com/paritytech/parity/pull/1492)
+- (BETA) add artifacts [#1420](https://github.com/paritytech/parity/pull/1420)
+
+## Parity [v1.2.0: "Security"](https://github.com/paritytech/parity/releases/tag/v1.2.0) (2016-06-24)
+
+[Blog post](https://blog.parity.io/announcing-parity-1-2/)
+
+#### New
+
+- Transaction signing UI.
+- IPC/RPC module.
+- Optimised mining support.
+- Windows build.
+- DAO soft-fork support.
+
+##### Transaction signing UI
+
+This is a new framework for signing transactions. It fulfills three requirements:
+- You should never have to type your passwords into a Dapp.
+- No Javascript code should ever hold a secret.
+- No transaction should ever be signed without the consent of the user.
+
+The feature is enabled through the `--signer` flag. When enabled, the user must ensure at least one "Signer UI" is set-up for managing transaction confirmation. There are two such UIs available; one through a Google Chrome Extension, separately installable and the second through a special web page hosted locally. Set-up must be done once for each such UI, through copying and pasting a token from the output console of Parity into the UI. Specific instructions are given in the UI.
+
+From this point on, no transaction may ever be signed by Parity except through one of these allowed Signer UIs, and no password should ever be entered anywhere else.
+
+##### IPC/RPC module and Mist/Geth compatibility
+
+Should be started with `--geth` to ensure Mist compatibility.
+
+##### Optimised mining support
+
+Numerous improvements and optimisations have been added to our mining implementation. A large "active queue" ensures that late-included transactions are included in the mined block without sacrificing older results from latent-reported `ethminer` results.
+
+##### Windows build
+
+We're happy to announce full Windows support with 1.2!
+
+##### Soft-fork
+
+This release includes support for the proposed [DAO soft-fork](https://docs.google.com/document/d/10RktunzjKNfp6Y8Cu4EhR5V9IqxEZq42LU126EYhWY4/pub). Upon upgrade, all mining nodes can vote for or against the soft fork (this is done through altering the block gas limit; a gas limit of at most 4M results in the soft-fork being triggered).
+
+By default, nodes vote "for" the DAO soft-fork (and try to reduce the gas limit to 3.1M). To vote against the soft-fork (keeping it at 4.7M), run with `--dont-help-rescue-dao`. Not upgrading is not recommended; if the majority votes with a soft-fork, an upgrade will be necessary to mine on the correct chain.
+
+#### Changed
+- Fast pruning method is now default for a fresh sync.
+- Web UI renamed to Dapps UI.
+- JSONRPC and Dapps UI enabled by default.
+- CLI options ending `-off` renamed to GNU-consistent prefix `--no-`.
+- Dynamic gas-pricing (data feed and statistical techniques used to determine optimum gas prices).
+
+Full changes:
+
+- Signer enabled by default for UI [#1417](https://github.com/paritytech/parity/pull/1417)
+- Remove experimental pruning options. [#1415](https://github.com/paritytech/parity/pull/1415)
+- Fixing interface and port for parity ui [#1414](https://github.com/paritytech/parity/pull/1414)
+- Configurable gas limit cap. [#1405](https://github.com/paritytech/parity/pull/1405)
+- Bumping TopBar, Minimal SignerUI and wallet [#1413](https://github.com/paritytech/parity/pull/1413)
+- Sync: Update highest block for progress reporting [#1411](https://github.com/paritytech/parity/pull/1411)
+- Tweaked CLI options for the release [#1407](https://github.com/paritytech/parity/pull/1407)
+- Further rocksdb tuning [#1409](https://github.com/paritytech/parity/pull/1409)
+- Fixing jit compilation [#1406](https://github.com/paritytech/parity/pull/1406)
+- Bump clippy [#1403](https://github.com/paritytech/parity/pull/1403)
+- Shortcut SF condition when canon known [#1401](https://github.com/paritytech/parity/pull/1401)
+- Additional assertions for internal state of queue [#1402](https://github.com/paritytech/parity/pull/1402)
+- Replace deprecated hashdb trait names [#1394](https://github.com/paritytech/parity/pull/1394)
+- rpc api by default for ipc [#1400](https://github.com/paritytech/parity/pull/1400)
+- Ensure judging the SF trigger by relative branch [#1399](https://github.com/paritytech/parity/pull/1399)
+- Signer with unlocked account working as expected. [#1398](https://github.com/paritytech/parity/pull/1398)
+- Make --signer default. [#1392](https://github.com/paritytech/parity/pull/1392)
+- Presale wallet [#1376](https://github.com/paritytech/parity/pull/1376)
+- Removing signer connection limit [#1396](https://github.com/paritytech/parity/pull/1396)
+- Optional gas price in transactions come from statistics [#1388](https://github.com/paritytech/parity/pull/1388)
+- Update README.md with cargo install [ci-skip] [#1389](https://github.com/paritytech/parity/pull/1389)
+- Fixing possible overflow during multiplication [#1381](https://github.com/paritytech/parity/pull/1381)
+- Update SF to latest spec [#1386](https://github.com/paritytech/parity/pull/1386)
+- Sync optimization [#1385](https://github.com/paritytech/parity/pull/1385)
+- Fixing order of if statements to avoid overflows. [#1384](https://github.com/paritytech/parity/pull/1384)
+- New topbar & signer UI [#1383](https://github.com/paritytech/parity/pull/1383)
+- Install trigger for DAO-rescue soft-fork. [#1329](https://github.com/paritytech/parity/pull/1329)
+- Rocksdb flush/compact limit [#1375](https://github.com/paritytech/parity/pull/1375)
+- CentOS Dockerfile [#1377](https://github.com/paritytech/parity/pull/1377)
+- RPC method to return number of unconfirmed transactions... [#1371](https://github.com/paritytech/parity/pull/1371)
+- bump jsonrpc-http-server [#1369](https://github.com/paritytech/parity/pull/1369)
+- Fix lock order when updating sealing [#1364](https://github.com/paritytech/parity/pull/1364)
+- Update sealing on new transactions [#1365](https://github.com/paritytech/parity/pull/1365)
+- Fixed panic on aborted connection [#1370](https://github.com/paritytech/parity/pull/1370)
+- importing presale wallet [#1368](https://github.com/paritytech/parity/pull/1368)
+- Set default database file size large enough [#1363](https://github.com/paritytech/parity/pull/1363)
+- Reserved peers rpc API [#1360](https://github.com/paritytech/parity/pull/1360)
+- Fixing replacing transaction with lower gas_price result. [#1343](https://github.com/paritytech/parity/pull/1343)
+- fixed migration of empty pruning dir [#1362](https://github.com/paritytech/parity/pull/1362)
+- Transaction processing queue [#1335](https://github.com/paritytech/parity/pull/1335)
+- Fixing last nonce values in case transaction is replaced [#1359](https://github.com/paritytech/parity/pull/1359)
+- docopt is an optional dependency of ethkey and ethstore [#1358](https://github.com/paritytech/parity/pull/1358)
+- Fixing clippy warnings [#1354](https://github.com/paritytech/parity/pull/1354)
+- Reduce locking when syncing [#1357](https://github.com/paritytech/parity/pull/1357)
+- removed unnecessary logs [#1356](https://github.com/paritytech/parity/pull/1356)
+- Updating parity-dapps [#1353](https://github.com/paritytech/parity/pull/1353)
+- moved keystore tests files from util to ethstore [#1352](https://github.com/paritytech/parity/pull/1352)
+- removed redundant bigint deps [#1351](https://github.com/paritytech/parity/pull/1351)
+- Reopen "reserved peers and reserved-only flag" [#1350](https://github.com/paritytech/parity/pull/1350)
+- Configurable rocksdb cache size [#1348](https://github.com/paritytech/parity/pull/1348)
+- Fixing future order and errors when reaching limit. [#1346](https://github.com/paritytech/parity/pull/1346)
+- Removing priority on local transactions [#1342](https://github.com/paritytech/parity/pull/1342)
+- Revert "Reserved peers, reserved-only flag" [#1349](https://github.com/paritytech/parity/pull/1349)
+- Sync attack defense: Deactivate peers on invalid block bodies [#1345](https://github.com/paritytech/parity/pull/1345)
+- Reserved peers, reserved-only flag [#1347](https://github.com/paritytech/parity/pull/1347)
+- CI for ethkey and ethstore [#1341](https://github.com/paritytech/parity/pull/1341)
+- Fixed empty block body composition [#1340](https://github.com/paritytech/parity/pull/1340)
+- Provide a signer UI token by default. [#1334](https://github.com/paritytech/parity/pull/1334)
+- docker uses rustup, fixes #1337 [#1344](https://github.com/paritytech/parity/pull/1344)
+- Fixed network service dispose [#1339](https://github.com/paritytech/parity/pull/1339)
+- Sync: Cache last sync round block parents [#1331](https://github.com/paritytech/parity/pull/1331)
+- secret store separated from util [#1304](https://github.com/paritytech/parity/pull/1304)
+- --geth prevent getTransactionReceipt from using pending. [#1325](https://github.com/paritytech/parity/pull/1325)
+- Fixing locks order in miner. [#1328](https://github.com/paritytech/parity/pull/1328)
+- Update default gas limit, rename field [#1324](https://github.com/paritytech/parity/pull/1324)
+- Use constants for DatabaseConfig [#1318](https://github.com/paritytech/parity/pull/1318)
+- Fixing clippy warnings [#1321](https://github.com/paritytech/parity/pull/1321)
+- Bumping topbar. Fixing ws server closing when suspending [#1312](https://github.com/paritytech/parity/pull/1312)
+- Syncing fix [#1320](https://github.com/paritytech/parity/pull/1320)
+- Filling-in optional fields of TransactionRequest... [#1305](https://github.com/paritytech/parity/pull/1305)
+- Removing MakerOTC and DAO dapps  [#1319](https://github.com/paritytech/parity/pull/1319)
+- Disabling ethcore_set* APIs by default (+ Status page update) [#1315](https://github.com/paritytech/parity/pull/1315)
+- fixed #1180 [#1282](https://github.com/paritytech/parity/pull/1282)
+- Network start/stop [#1313](https://github.com/paritytech/parity/pull/1313)
+- Additional logging for own transactions in queue [#1311](https://github.com/paritytech/parity/pull/1311)
+- DAO Rescue soft fork [#1309](https://github.com/paritytech/parity/pull/1309)
+- Appveyor config for windows build+installer [#1302](https://github.com/paritytech/parity/pull/1302)
+- Key load avoid warning [#1303](https://github.com/paritytech/parity/pull/1303)
+- More meaningful errors when sending transaction [#1290](https://github.com/paritytech/parity/pull/1290)
+- Gas price statistics. [#1291](https://github.com/paritytech/parity/pull/1291)
+- Fix read-ahead bug. [#1298](https://github.com/paritytech/parity/pull/1298)
+- firewall rules for windows installer [#1297](https://github.com/paritytech/parity/pull/1297)
+- x64 program files path for installer [#1296](https://github.com/paritytech/parity/pull/1296)
+- Fixed loosing peers on incoming connections. [#1293](https://github.com/paritytech/parity/pull/1293)
+- fixed #1261, overflow when calculating work [#1283](https://github.com/paritytech/parity/pull/1283)
+- snappy and minor block compression [#1286](https://github.com/paritytech/parity/pull/1286)
+- clarify build instructions [#1287](https://github.com/paritytech/parity/pull/1287)
+- fixed #1255 [#1280](https://github.com/paritytech/parity/pull/1280)
+- bump rust-crypto [#1289](https://github.com/paritytech/parity/pull/1289)
+- Security audit issues fixed [#1279](https://github.com/paritytech/parity/pull/1279)
+- Fixing origin/host validation [#1273](https://github.com/paritytech/parity/pull/1273)
+- windows installer + parity start ui cli option [#1284](https://github.com/paritytech/parity/pull/1284)
+- ipc lib version bump [#1285](https://github.com/paritytech/parity/pull/1285)
+- Syncing improvements [#1274](https://github.com/paritytech/parity/pull/1274)
+- removed redundant if condition [#1270](https://github.com/paritytech/parity/pull/1270)
+- Naive chunk creation, snapshotting [#1263](https://github.com/paritytech/parity/pull/1263)
+- Fixing generating new token while another parity instance is running. [#1272](https://github.com/paritytech/parity/pull/1272)
+- README: rustup and windows instructions [#1266](https://github.com/paritytech/parity/pull/1266)
+- Windows build [#1253](https://github.com/paritytech/parity/pull/1253)
+- removed try_seal from MiningBlockChainClient [#1262](https://github.com/paritytech/parity/pull/1262)
+- simplified block opening [#1232](https://github.com/paritytech/parity/pull/1232)
+- Clippy bump [#1259](https://github.com/paritytech/parity/pull/1259)
+- Fixing uint ASM macros compilation [#1258](https://github.com/paritytech/parity/pull/1258)
+- Signer port returned from RPC + Topbar showing count of unconfirmed transactions. [#1252](https://github.com/paritytech/parity/pull/1252)
+- codegen - avoid unwraps leading to compilation crash [#1250](https://github.com/paritytech/parity/pull/1250)
+- Dapps bump [#1257](https://github.com/paritytech/parity/pull/1257)
+- Windows named pipes [#1254](https://github.com/paritytech/parity/pull/1254)
+- remove unsafety from util/hash.rs and util/bigint/uint.rs [#1236](https://github.com/paritytech/parity/pull/1236)
+- Fixing CORS settings for special values: * & null. [#1247](https://github.com/paritytech/parity/pull/1247)
+- JSONRPC test strings avoid using \ char [#1246](https://github.com/paritytech/parity/pull/1246)
+- Tests for JSON serialisation of statediff/vmtrace [#1241](https://github.com/paritytech/parity/pull/1241)
+- Bumping Dapps & TopBar to newest version. [#1245](https://github.com/paritytech/parity/pull/1245)
+- keys import [#1240](https://github.com/paritytech/parity/pull/1240)
+- Splitting RPC Apis into more fine-grained sets [#1234](https://github.com/paritytech/parity/pull/1234)
+- Refactor triedb constructors to error on invalid state root  [#1230](https://github.com/paritytech/parity/pull/1230)
+- Signer RPC method to check if signer is enabled [#1238](https://github.com/paritytech/parity/pull/1238)
+- Fixing signer behaviour when confirming transaction with wrong password. [#1237](https://github.com/paritytech/parity/pull/1237)
+- SystemUIs authorization [#1233](https://github.com/paritytech/parity/pull/1233)
+- IPC path for tesetnet with --geth compatibility [#1231](https://github.com/paritytech/parity/pull/1231)
+- Transaction tracing for eth_call [#1210](https://github.com/paritytech/parity/pull/1210)
+- Removing compilation warnings [#1227](https://github.com/paritytech/parity/pull/1227)
+- Allowing connections only from chrome-extension and self-hosted client [#1226](https://github.com/paritytech/parity/pull/1226)
+- Clippy bump & fixing warnings [#1219](https://github.com/paritytech/parity/pull/1219)
+- Bumping serde & syntex [#1216](https://github.com/paritytech/parity/pull/1216)
+- Minimal Signer UI (System UI) exposed over websockets. [#1211](https://github.com/paritytech/parity/pull/1211)
+- Switch RPC namespace form ethcore_ to trace_ [#1208](https://github.com/paritytech/parity/pull/1208)
+- Verify the state root exists before creating a State [#1217](https://github.com/paritytech/parity/pull/1217)
+- Integrate state diffing into the ethcore JSONRPC [#1206](https://github.com/paritytech/parity/pull/1206)
+- Updating topbar to latest version [#1220](https://github.com/paritytech/parity/pull/1220)
+- Loading local Dapps from FS. [#1214](https://github.com/paritytech/parity/pull/1214)
+- Ipc serialization & protocol fixes [#1188](https://github.com/paritytech/parity/pull/1188)
+- Have Ext::ret take self by value [#1187](https://github.com/paritytech/parity/pull/1187)
+- Simple WebSockets notification about new request [#1202](https://github.com/paritytech/parity/pull/1202)
+- Removing leftovers of ethminer [#1207](https://github.com/paritytech/parity/pull/1207)
+- fixed #1204 [#1205](https://github.com/paritytech/parity/pull/1205)
+- VM tracing and JSON RPC endpoint for it. [#1169](https://github.com/paritytech/parity/pull/1169)
+- devtools helpers extended [#1186](https://github.com/paritytech/parity/pull/1186)
+- Networking refactoring [#1172](https://github.com/paritytech/parity/pull/1172)
+- Client & Miner refactoring [#1195](https://github.com/paritytech/parity/pull/1195)
+- update readme [#1201](https://github.com/paritytech/parity/pull/1201)
+- Simple signing queue, confirmation APIs exposed in signer WebSockets. [#1182](https://github.com/paritytech/parity/pull/1182)
+- Using ordered hashmap to keep the order of dapps on home screen [#1199](https://github.com/paritytech/parity/pull/1199)
+- Disabling `ethcore` by default, adding x-frame-options header to dapps. [#1197](https://github.com/paritytech/parity/pull/1197)
+- transaction count verifier tests [#1196](https://github.com/paritytech/parity/pull/1196)
+- expunge x! and xx! from the codebase [#1192](https://github.com/paritytech/parity/pull/1192)
+- Database service upgrade (from the ipc branch) [#1185](https://github.com/paritytech/parity/pull/1185)
+- stop eth_syncing from returning true forever [#1181](https://github.com/paritytech/parity/pull/1181)
+- Sync fixes and tweaks [#1164](https://github.com/paritytech/parity/pull/1164)
+- Exposing RPC over Signer WebSockets [#1167](https://github.com/paritytech/parity/pull/1167)
+- implement missing rpc methods and tests [#1171](https://github.com/paritytech/parity/pull/1171)
+- json ipc server version bump [#1170](https://github.com/paritytech/parity/pull/1170)
+- Updated dependencies for windows build [#1173](https://github.com/paritytech/parity/pull/1173)
+- Framework for improved RPC unit tests [#1141](https://github.com/paritytech/parity/pull/1141)
+- remove all possible unsafe code in crypto [#1168](https://github.com/paritytech/parity/pull/1168)
+- Base for Signer Websockets server [#1158](https://github.com/paritytech/parity/pull/1158)
+- Write queue to speed-up db ipc [#1160](https://github.com/paritytech/parity/pull/1160)
+- Fixing few clippy warnings [#1163](https://github.com/paritytech/parity/pull/1163)
+- Change eth_signAndSendTransaction to personal_SignAndSendTransaction [#1154](https://github.com/paritytech/parity/pull/1154)
+- Support "earliest" and specific block parameters in RPC where possible [#1149](https://github.com/paritytech/parity/pull/1149)
+- migration fixes [#1155](https://github.com/paritytech/parity/pull/1155)
+- Empty trusted signer crate with it's general purpose described. [#1150](https://github.com/paritytech/parity/pull/1150)
+- More bootnodes for morden. [#1153](https://github.com/paritytech/parity/pull/1153)
+- move existing rpc tests into mocked module [#1151](https://github.com/paritytech/parity/pull/1151)
+- Bloomchain [#1014](https://github.com/paritytech/parity/pull/1014)
+- Renaming dapps repos. Updating dapps [#1142](https://github.com/paritytech/parity/pull/1142)
+- fixed pending transactions [#1147](https://github.com/paritytech/parity/pull/1147)
+- Basic benches to provide metrics for ipc optimizations [#1145](https://github.com/paritytech/parity/pull/1145)
+- Fixing clippy warnings [#1148](https://github.com/paritytech/parity/pull/1148)
+- correct signature of SecTrieDB::raw_mut [#1143](https://github.com/paritytech/parity/pull/1143)
+- Merge to master and start hypervisor for import/export [#1138](https://github.com/paritytech/parity/pull/1138)
+- Bumping clippy. Fixing warnings [#1139](https://github.com/paritytech/parity/pull/1139)
+- Display progress when importing [#1136](https://github.com/paritytech/parity/pull/1136)
+- foundation of simple db migration [#1128](https://github.com/paritytech/parity/pull/1128)
+- Fixpending [#1074](https://github.com/paritytech/parity/pull/1074)
+- Sync: Propagate uncles and fix status reporting [#1134](https://github.com/paritytech/parity/pull/1134)
+- Coloured, padding logging. [#1133](https://github.com/paritytech/parity/pull/1133)
+- Importing [#1132](https://github.com/paritytech/parity/pull/1132)
+- Have `die_with_error` use `fmt::Display` rather than Debug [#1116](https://github.com/paritytech/parity/pull/1116)
+- Exporting [#1129](https://github.com/paritytech/parity/pull/1129)
+- Sign and send transaction [#1124](https://github.com/paritytech/parity/pull/1124)
+- Fixing unused imports warnings [#1125](https://github.com/paritytech/parity/pull/1125)
+- Adding info messages on mined blocks [#1127](https://github.com/paritytech/parity/pull/1127)
+- Fix styling - don't mix spaces with tabs!!! [#1123](https://github.com/paritytech/parity/pull/1123)
+- Fix is_syncing so it's false as long as the update is trivial. [#1122](https://github.com/paritytech/parity/pull/1122)
+- Relock unlocked accounts after first use [#1120](https://github.com/paritytech/parity/pull/1120)
+- Avoid importing keys into wrong place. [#1119](https://github.com/paritytech/parity/pull/1119)
+- Implement receipt's gasUsed field [#1118](https://github.com/paritytech/parity/pull/1118)
+- New dapps & query parameter handling [#1113](https://github.com/paritytech/parity/pull/1113)
+- pretty print trace error [#1098](https://github.com/paritytech/parity/pull/1098)
+- New syncing strategy [#1095](https://github.com/paritytech/parity/pull/1095)
+- ethcore-db crate [#1097](https://github.com/paritytech/parity/pull/1097)
+- Fix the default for pruning. [#1107](https://github.com/paritytech/parity/pull/1107)
+- Make Id/ID and db/Db/DB usage consistent [#1105](https://github.com/paritytech/parity/pull/1105)
+- Miner holds it's own copy of spec/engine [#1091](https://github.com/paritytech/parity/pull/1091)
+- Apps listing API & Home webapp. [#1101](https://github.com/paritytech/parity/pull/1101)
+- CLI option for using JITEVM [#1103](https://github.com/paritytech/parity/pull/1103)
+- Fix up the seal fields in RPC output [#1096](https://github.com/paritytech/parity/pull/1096)
+- Fixing some warnings [#1102](https://github.com/paritytech/parity/pull/1102)
+- fixed incorrect decoding of header seal_fields. added tests. #1090 [#1094](https://github.com/paritytech/parity/pull/1094)
+- Bumping Clippy [#1093](https://github.com/paritytech/parity/pull/1093)
+- Injectable topbar support. [#1092](https://github.com/paritytech/parity/pull/1092)
+- New syncing part 1: Block collection [#1088](https://github.com/paritytech/parity/pull/1088)
+- Moving all Client public API types to separate mod & binary serialization codegen for that mod [#1051](https://github.com/paritytech/parity/pull/1051)
+- Subdomains support in content server (webapps server). [#1082](https://github.com/paritytech/parity/pull/1082)
+- Fix uncle getter [#1087](https://github.com/paritytech/parity/pull/1087)
+- Provide fallback for usd-per-eth option when offline. [#1085](https://github.com/paritytech/parity/pull/1085)
+- path centralized [#1083](https://github.com/paritytech/parity/pull/1083)
+- Limiting result of the execution to execution-specific errors [#1071](https://github.com/paritytech/parity/pull/1071)
+- Configurable keys security [#1080](https://github.com/paritytech/parity/pull/1080)
+- comma delimeting multiple cors headers [#1078](https://github.com/paritytech/parity/pull/1078)
+- Update error message [#1081](https://github.com/paritytech/parity/pull/1081)
+- Updating dapp-wallet [#1076](https://github.com/paritytech/parity/pull/1076)
+- Fixed connecting to local nodes on startup [#1070](https://github.com/paritytech/parity/pull/1070)
+- Validate signature in Tx queue [#1068](https://github.com/paritytech/parity/pull/1068)
+- moving deps to ethcore/hyper and bumping jsonrpc-http-server version [#1067](https://github.com/paritytech/parity/pull/1067)
+- Updating status page. Bringing back wallet [#1064](https://github.com/paritytech/parity/pull/1064)
+- Fix --geth IPC for MacOS. [#1062](https://github.com/paritytech/parity/pull/1062)
+- Fixing formatter for defaultExtraData [#1060](https://github.com/paritytech/parity/pull/1060)
+- --geth IPC compatibility [#1059](https://github.com/paritytech/parity/pull/1059)
+- Moving dependencies to ethcore & uniforming syntax libs through all crates [#1050](https://github.com/paritytech/parity/pull/1050)
+- update hyper branch mio [#1054](https://github.com/paritytech/parity/pull/1054)
+- IPC lib update [#1047](https://github.com/paritytech/parity/pull/1047)
+- Updating hyper-mio revision [#1048](https://github.com/paritytech/parity/pull/1048)
+- Bump ipc-lib version [#1046](https://github.com/paritytech/parity/pull/1046)
+- Tidy up CLI options and make JSONRPC & webapps on by default. [#1045](https://github.com/paritytech/parity/pull/1045)
+- Fixing clippy warnings [#1044](https://github.com/paritytech/parity/pull/1044)
+- Fixing RPC modules compatibility [#1041](https://github.com/paritytech/parity/pull/1041)
+- Fixing hyper-mio revision [#1043](https://github.com/paritytech/parity/pull/1043)
+- Updating locations of webapp stuff [#1040](https://github.com/paritytech/parity/pull/1040)
+- JSON-RPC over IPC [#1039](https://github.com/paritytech/parity/pull/1039)
+- Update nix/mio for ARM [#1036](https://github.com/paritytech/parity/pull/1036)
+- Basic Authority [#991](https://github.com/paritytech/parity/pull/991)
+- Prioritizing of local transaction [#1023](https://github.com/paritytech/parity/pull/1023)
+- Version 1.2 [#1030](https://github.com/paritytech/parity/pull/1030)
+- Bumping status page [#1033](https://github.com/paritytech/parity/pull/1033)
+
+## Parity [v1.1.0](https://github.com/paritytech/parity/releases/tag/v1.1.0) (2016-05-02)
+
+Parity 1.1.0 introduces:
+
+- Transaction tracing. Parity now optionally indexes & stores message-call/"internal transaction" information and provides additional RPC for querying.
+- Web interface for logs, status & JSON RPC.
+- Improved JSON RPC compatibility.
+- Reduced memory footprint.
+- Optimized EVM interpreter performance.
+
+Full Changes:
+
+- Exposing default extra data via ethcore RPC [#1032](https://github.com/paritytech/parity/pull/1032)
+- Net etiquette [#1028](https://github.com/paritytech/parity/pull/1028)
+- Bumping clippy & fixing warnings [#1024](https://github.com/paritytech/parity/pull/1024)
+- Tracedb interface && cli [#997](https://github.com/paritytech/parity/pull/997)
+- Switching to geth-attach supporting version of rpc core and server [#1022](https://github.com/paritytech/parity/pull/1022)
+- Fixing status page displaying homestead  [#1020](https://github.com/paritytech/parity/pull/1020)
+- Core tracedb functionality. [#996](https://github.com/paritytech/parity/pull/996)
+- RPC method for supported modules [#1019](https://github.com/paritytech/parity/pull/1019)
+- Updating status page [#1015](https://github.com/paritytech/parity/pull/1015)
+- Disabling wallet [#1017](https://github.com/paritytech/parity/pull/1017)
+- More detailed fatal error reporting [#1016](https://github.com/paritytech/parity/pull/1016)
+- Support 'pending' block in RPC [#1007](https://github.com/paritytech/parity/pull/1007)
+- Enable pending block when there is local transaction pending. [#1005](https://github.com/paritytech/parity/pull/1005)
+- updating key files permissions on save [#1010](https://github.com/paritytech/parity/pull/1010)
+- IPC JSON RPC (for external interface) [#1009](https://github.com/paritytech/parity/pull/1009)
+- Fixing Firefox authorization issues [#1013](https://github.com/paritytech/parity/pull/1013)
+- cargo update [#1012](https://github.com/paritytech/parity/pull/1012)
+- Switching to rust-url@1.0.0 [#1011](https://github.com/paritytech/parity/pull/1011)
+- Exception handling in RPC & WebApps [#988](https://github.com/paritytech/parity/pull/988)
+- Fixed uint deserialization from hex [#1008](https://github.com/paritytech/parity/pull/1008)
+- Tweak timeout and packet size to handle slow networks better [#1004](https://github.com/paritytech/parity/pull/1004)
+- db key is generic and can be made smaller [#1006](https://github.com/paritytech/parity/pull/1006)
+- IPC with new serialization [#998](https://github.com/paritytech/parity/pull/998)
+- make jsonrpc api engine agnostic [#1001](https://github.com/paritytech/parity/pull/1001)
+- updated cargo.lock [#1002](https://github.com/paritytech/parity/pull/1002)
+- updated parity dependencies [#993](https://github.com/paritytech/parity/pull/993)
+- Auto (with codegen) binary serializer  [#980](https://github.com/paritytech/parity/pull/980)
+- Fixing transaction queue last_nonces update [#995](https://github.com/paritytech/parity/pull/995)
+- import route contains ommited blocks [#994](https://github.com/paritytech/parity/pull/994)
+- fixed encoding 0u8 [#992](https://github.com/paritytech/parity/pull/992)
+- Use latest netstats [#989](https://github.com/paritytech/parity/pull/989)
+- RPC shared external miner [#984](https://github.com/paritytech/parity/pull/984)
+- Additional RPC methods for settings [#983](https://github.com/paritytech/parity/pull/983)
+- Fixing transaction_queue deadlock [#985](https://github.com/paritytech/parity/pull/985)
+- Refactoring of `parity/main.rs` [#981](https://github.com/paritytech/parity/pull/981)
+- Fixing clippy warnings. [#982](https://github.com/paritytech/parity/pull/982)
+- Bumping status page [#977](https://github.com/paritytech/parity/pull/977)
+- querying extras separated to its own module [#972](https://github.com/paritytech/parity/pull/972)
+- Exposing application logs via RPC. [#976](https://github.com/paritytech/parity/pull/976)
+- Addressing binary serialization for db types [#966](https://github.com/paritytech/parity/pull/966)
+- removed redundant unwraps [#935](https://github.com/paritytech/parity/pull/935)
+- fixed transaction queue merge conflict [#975](https://github.com/paritytech/parity/pull/975)
+- Configurable limit for transaction queue (CLI & Ethcore-RPC) [#974](https://github.com/paritytech/parity/pull/974)
+- Enforce limit caused `last_nonce` to return incorrect values. [#973](https://github.com/paritytech/parity/pull/973)
+- Even more detailed errors for transaction queue [#969](https://github.com/paritytech/parity/pull/969)
+- temporary fix of panic in blockchain garbage collection [#970](https://github.com/paritytech/parity/pull/970)
+- IPC codegen - some minor fixes & enhancements [#967](https://github.com/paritytech/parity/pull/967)
+- Additional logging for transactions [#968](https://github.com/paritytech/parity/pull/968)
+- refactored blockchain extras keys building [#963](https://github.com/paritytech/parity/pull/963)
+- Using hyper-mio branch in webapps. [#957](https://github.com/paritytech/parity/pull/957)
+- Remove nanomsg from build-dependencies [#965](https://github.com/paritytech/parity/pull/965)
+- Fix build for --target=armv7-unknown-linux-gnueabihf [#964](https://github.com/paritytech/parity/pull/964)
+- IPC RPC codegen extra feature [#962](https://github.com/paritytech/parity/pull/962)
+- IPC RPC codegen for generic implementation [#961](https://github.com/paritytech/parity/pull/961)
+- using db_path directory when upgrading [#960](https://github.com/paritytech/parity/pull/960)
+- IPC hypervisor [#958](https://github.com/paritytech/parity/pull/958)
+- Removing a transaction from queue now removes all from this sender with lower nonces. [#950](https://github.com/paritytech/parity/pull/950)
+- bump status page version 0.1.7 [#955](https://github.com/paritytech/parity/pull/955)
+- Changing cors header to be optional [#956](https://github.com/paritytech/parity/pull/956)
+- Update ARM Dockerfile [#959](https://github.com/paritytech/parity/pull/959)
+- Sensible gas limits for eth_sendTransaction [#953](https://github.com/paritytech/parity/pull/953)
+- Fix upgrade script and make parity run when no .parity dir. [#954](https://github.com/paritytech/parity/pull/954)
+- Tracing and docs for --pruning=auto. [#952](https://github.com/paritytech/parity/pull/952)
+- IPC serialization for custom parameters [#946](https://github.com/paritytech/parity/pull/946)
+- default filter from block should be Latest, not Earliest [#948](https://github.com/paritytech/parity/pull/948)
+- README.md: removes sudo from multirust installation [#943](https://github.com/paritytech/parity/pull/943)
+- Disable long lines formatting + ethash example. [#939](https://github.com/paritytech/parity/pull/939)
+- Ethcore-specific RPC methods for altering miner parameters. [#934](https://github.com/paritytech/parity/pull/934)
+- Use ethcore nanomsg bindings [#941](https://github.com/paritytech/parity/pull/941)
+- Update IPC codegen to latest syntax libs [#938](https://github.com/paritytech/parity/pull/938)
+- IPC documentation [#937](https://github.com/paritytech/parity/pull/937)
+- Bumping clippy and fixing warnings. [#936](https://github.com/paritytech/parity/pull/936)
+- Pruning auto [#927](https://github.com/paritytech/parity/pull/927)
+- IPC persistent client link [#933](https://github.com/paritytech/parity/pull/933)
+- IPC persistent client link [#930](https://github.com/paritytech/parity/pull/930)
+- IPC handshake (negotiating protocol/api version) [#928](https://github.com/paritytech/parity/pull/928)
+- Upgrade logic between versions [#914](https://github.com/paritytech/parity/pull/914)
+- executive tracing cleanup [#903](https://github.com/paritytech/parity/pull/903)
+- Ethcore-specific RPC methods [#923](https://github.com/paritytech/parity/pull/923)
+- Parameter to allow user to force the sealing mechanism [#918](https://github.com/paritytech/parity/pull/918)
+- updated dependencies [#921](https://github.com/paritytech/parity/pull/921)
+- Fixed send transaction deadlock [#920](https://github.com/paritytech/parity/pull/920)
+- --unlock is comma-delimited. [#916](https://github.com/paritytech/parity/pull/916)
+- fixed eth_getLogs [#915](https://github.com/paritytech/parity/pull/915)
+- create provided custom dir for keys if none [#912](https://github.com/paritytech/parity/pull/912)
+- spec loading cleanup [#858](https://github.com/paritytech/parity/pull/858)
+- WebApps HTTP Basic Auth Support [#906](https://github.com/paritytech/parity/pull/906)
+- Removing match on constant [#888](https://github.com/paritytech/parity/pull/888)
+- Update auth.rs [#907](https://github.com/paritytech/parity/pull/907)
+- Enabling webapps compilation by default [#904](https://github.com/paritytech/parity/pull/904)
+- fixed #895 [#898](https://github.com/paritytech/parity/pull/898)
+- Support for compile-time included WebApplications. [#899](https://github.com/paritytech/parity/pull/899)
+- Propagate transaction queue [#894](https://github.com/paritytech/parity/pull/894)
+- Use new json RPC server [#901](https://github.com/paritytech/parity/pull/901)
+- Gracefully dying when trying to enable RPC and app is compiled without it. [#900](https://github.com/paritytech/parity/pull/900)
+- Additional logging and friendlier error messages [#893](https://github.com/paritytech/parity/pull/893)
+- Avoid signalling readiness when app is about to be closed. [#897](https://github.com/paritytech/parity/pull/897)
+- fixed #875 and added tests for eth_sendTransaction [#890](https://github.com/paritytech/parity/pull/890)
+- passing key path to all invocations [#891](https://github.com/paritytech/parity/pull/891)
+- Fixed eth_call nonce and gas handling [#892](https://github.com/paritytech/parity/pull/892)
+- ipc rpc with nano transport (simple duplex) [#886](https://github.com/paritytech/parity/pull/886)
+- Bumping clippy and fixing warnings [#889](https://github.com/paritytech/parity/pull/889)
+- More descriptive expectations to transaction queue consistency. [#878](https://github.com/paritytech/parity/pull/878)
+- uint bug - replace add with or [#879](https://github.com/paritytech/parity/pull/879)
+- Fixing typo in bigint [#877](https://github.com/paritytech/parity/pull/877)
+- update misleading cli help msg for author [#874](https://github.com/paritytech/parity/pull/874)
+- Find geth data store cross-platform. [#871](https://github.com/paritytech/parity/pull/871)
+- Import geth 1.4.0 keys [#872](https://github.com/paritytech/parity/pull/872)
+- Syntax helpers for IPC RPC (part 2) [#854](https://github.com/paritytech/parity/pull/854)
+- Fixed bootnode URL and error message [#870](https://github.com/paritytech/parity/pull/870)
+- replace popcnt with mov (861) [#867](https://github.com/paritytech/parity/pull/867)
+- weekly dependencies update [#865](https://github.com/paritytech/parity/pull/865)
+- Remove unused mut [#866](https://github.com/paritytech/parity/pull/866)
+- fixed #855 [#864](https://github.com/paritytech/parity/pull/864)
+- simplified trace from functions, removed clippy warnings [#862](https://github.com/paritytech/parity/pull/862)
+- Update deprecated HashDB methods in docs. [#857](https://github.com/paritytech/parity/pull/857)
+- refactored loading transaction json tests [#853](https://github.com/paritytech/parity/pull/853)
+- reorganised price info lookup [#852](https://github.com/paritytech/parity/pull/852)
+- Publish locally-made transactions to peers. [#850](https://github.com/paritytech/parity/pull/850)
+- Add generalbeck's token [#847](https://github.com/paritytech/parity/pull/847)
+- Fix response for mining. [#846](https://github.com/paritytech/parity/pull/846)
+- USD-based pricing of gas. [#843](https://github.com/paritytech/parity/pull/843)
+- Parity can accept older work packages [#811](https://github.com/paritytech/parity/pull/811)
+- Caching for computing seed hashes (#541) [#841](https://github.com/paritytech/parity/pull/841)
+- checking transaction queue for pending transaction [#838](https://github.com/paritytech/parity/pull/838)
+- refactored loading of state tests [#817](https://github.com/paritytech/parity/pull/817)
+- tests for deserialization of transaction from issue #835 [#837](https://github.com/paritytech/parity/pull/837)
+- unlocks with no expiration [on top of 833] [#834](https://github.com/paritytech/parity/pull/834)
+- Unlock accounts on CLI. [#833](https://github.com/paritytech/parity/pull/833)
+- Make BlockNumber optional, fix eth_call [#829](https://github.com/paritytech/parity/pull/829)
+- Test socket to common test code (ethcore-devtools) [#831](https://github.com/paritytech/parity/pull/831)
+- Use network id for the web3_net_version return. [#822](https://github.com/paritytech/parity/pull/822)
+- json-rpc web3_sha3 [#824](https://github.com/paritytech/parity/pull/824)
+- remove some unused files [#819](https://github.com/paritytech/parity/pull/819)
+- debug symbols for master/beta [#818](https://github.com/paritytech/parity/pull/818)
+- Syntax helpers for IPC RPC [#809](https://github.com/paritytech/parity/pull/809)
+- refactored loading of execution tests [#803](https://github.com/paritytech/parity/pull/803)
+- Rustfmt.toml [#805](https://github.com/paritytech/parity/pull/805)
+- install-partiy runs brew reinstall parity on osx [#810](https://github.com/paritytech/parity/pull/810)
+- Fix mining from spinning [#807](https://github.com/paritytech/parity/pull/807)
+
+## Parity [v1.0.2](https://github.com/paritytech/parity/releases/tag/v1.0.2) (2016-04-11)
+
+Parity 1.0.2 release improves Json RPC compatibility and fixes a number of stability issues.
+
+- Flush password prompt [#1031](https://github.com/paritytech/parity/pull/1031)
+- [beta] dependencies update [#949](https://github.com/paritytech/parity/pull/949)
+- Master to beta v1.0.2 [#922](https://github.com/paritytech/parity/pull/922)
+- Master to beta 1.0.2 [#908](https://github.com/paritytech/parity/pull/908)
+
+## Parity [v1.0.1](https://github.com/paritytech/parity/releases/tag/v1.0.1) (2016-03-28)
+
+Parity 1.0.1 update fixes a number of issues with Json RPC, transaction propagation and syncing.
+
+- Imporved sync error handling [#905](https://github.com/paritytech/parity/pull/905)
+- Publish locally-made transactions to peers. [#851](https://github.com/paritytech/parity/pull/851)
+- Merge fixes from master to beta [#845](https://github.com/paritytech/parity/pull/845)
+- Full sync restart on bad block [#844](https://github.com/paritytech/parity/pull/844)
+- Make BlockNumber optional, fix eth_call [#828](https://github.com/paritytech/parity/pull/828)
+- Web3sha3 beta [#826](https://github.com/paritytech/parity/pull/826)
+- Use network id for the web3_net_version return. [#821](https://github.com/paritytech/parity/pull/821)
+- Fix mining from spinning [#806](https://github.com/paritytech/parity/pull/806)
+- Merge master to beta [#796](https://github.com/paritytech/parity/pull/796)
+
+## Parity [v1.0.0](https://github.com/paritytech/parity/releases/tag/v1.0.0) (2016-03-24)
+
+Parity 1.0.0 release adds the following features:
+
+- Standard JsonRPC interface.
+- Full Homestead compatibility.
+- Transaction management.
+- Mining with external miner.
+- Account management.
+- Geth key chain compatibility.
+- Additional command line options.
+- State trie pruning.
+- Cache and queue footprint.
+- Network discovery & NAT traversal.
+- Custom chain specification files.
+
+Note that in this release the state database is in archive (full) mode by default. Run with one of the `--pruning` options to enable pruning.
+
+- First part of multi-mining support [#804](https://github.com/paritytech/parity/pull/804)
+- Fixing future-current transactions clash [#802](https://github.com/paritytech/parity/pull/802)
+- Increase threads to num_cpus & fix author reporting [#800](https://github.com/paritytech/parity/pull/800)
+- another batch of rpc improvements [#798](https://github.com/paritytech/parity/pull/798)
+- Avoid tracing DELEGATECALL and CALLCODE. Plus tests for it. [#794](https://github.com/paritytech/parity/pull/794)
+- complete getting started steps for OS X [#793](https://github.com/paritytech/parity/pull/793)
+- Auto detect available port (with fixed test) [#788](https://github.com/paritytech/parity/pull/788)
+- eth_getTransactionReceipt [#792](https://github.com/paritytech/parity/pull/792)
+- Comprehensive tests for tracing transactions [#791](https://github.com/paritytech/parity/pull/791)
+- Disable preparing work package if miners don't ask for it. [#771](https://github.com/paritytech/parity/pull/771)
+- Listen on all interfaces for JSONRPC by default. [#786](https://github.com/paritytech/parity/pull/786)
+- eth_call [#783](https://github.com/paritytech/parity/pull/783)
+- Revert "Auto detect available port" [#789](https://github.com/paritytech/parity/pull/789)
+- added output to execution result [#777](https://github.com/paritytech/parity/pull/777)
+- Auto detect available port [#782](https://github.com/paritytech/parity/pull/782)
+- Allow 0x prefix for --author. [#785](https://github.com/paritytech/parity/pull/785)
+- updated dependencies, moved rpctest to its own submodule [#784](https://github.com/paritytech/parity/pull/784)
+- use ethjson module to load chain json tests [#778](https://github.com/paritytech/parity/pull/778)
+- Tracing implemented. [#772](https://github.com/paritytech/parity/pull/772)
+- test ethjson module on travis [#780](https://github.com/paritytech/parity/pull/780)
+- batch of rpc fixes [#775](https://github.com/paritytech/parity/pull/775)
+- rpctest executable [#757](https://github.com/paritytech/parity/pull/757)
+- Refactoring error transaction_queue error handling and `update_sealing` method. [#753](https://github.com/paritytech/parity/pull/753)
+- Avoid importing transactions with gas above 1.1*block_gas_limit to transaction queue [#760](https://github.com/paritytech/parity/pull/760)
+- Removing transactions that failed to be pushed to block. [#752](https://github.com/paritytech/parity/pull/752)
+- Updating clippy [#766](https://github.com/paritytech/parity/pull/766)
+- Attempting to add all transactions to mined block [#754](https://github.com/paritytech/parity/pull/754)
+- Prettier version w/o git dir; Use rustc compile time version [#761](https://github.com/paritytech/parity/pull/761)
+- Stop adding transactions to queue while not fully synced [#751](https://github.com/paritytech/parity/pull/751)
+- Verify sender's balance before importing transaction to queue [#746](https://github.com/paritytech/parity/pull/746)
+- Returning number of transactions pending in block not queue [#750](https://github.com/paritytech/parity/pull/750)
+- Speeding up build [#733](https://github.com/paritytech/parity/pull/733)
+- adding check for a sync when giving work to miner [#742](https://github.com/paritytech/parity/pull/742)
+- json deserialization module [#745](https://github.com/paritytech/parity/pull/745)
+- Update install-parity.sh [#749](https://github.com/paritytech/parity/pull/749)
+- Restart sync on getting old unknown header [#747](https://github.com/paritytech/parity/pull/747)
+- Missing return for #737 [#744](https://github.com/paritytech/parity/pull/744)
+- Enact block with uncles test [#741](https://github.com/paritytech/parity/pull/741)
+- Fix outdated libc version on dependency [#740](https://github.com/paritytech/parity/pull/740)
+- Fixing possible race in transaction queue [#735](https://github.com/paritytech/parity/pull/735)
+- Sync fixed again [#737](https://github.com/paritytech/parity/pull/737)
+- Don't change best block until extras is committed. [#734](https://github.com/paritytech/parity/pull/734)
+- stable only until travis speedup [#736](https://github.com/paritytech/parity/pull/736)
+- Optimizing uint operations (architecture independent) [#629](https://github.com/paritytech/parity/pull/629)
+- Add RLP, not a data item. [#725](https://github.com/paritytech/parity/pull/725)
+- PV63 receipts response [#687](https://github.com/paritytech/parity/pull/687)
+- another batch of rpc tests [#723](https://github.com/paritytech/parity/pull/723)
+- dockerfiles update [#726](https://github.com/paritytech/parity/pull/726)
+- Lock reports to avoid out of order badness. [#721](https://github.com/paritytech/parity/pull/721)
+- Fixed handshake leak [#722](https://github.com/paritytech/parity/pull/722)
+- Allow configuration of target gas limit. [#719](https://github.com/paritytech/parity/pull/719)
+- Version 1.1 in master [#714](https://github.com/paritytech/parity/pull/714)
+- Silence UDP warnings [#720](https://github.com/paritytech/parity/pull/720)
+- Rpc personal tests [#715](https://github.com/paritytech/parity/pull/715)
+- Fixing warnings [#704](https://github.com/paritytech/parity/pull/704)
+- docopts cleanups [#713](https://github.com/paritytech/parity/pull/713)
+- Removed rocksdb build dependency [#717](https://github.com/paritytech/parity/pull/717)
+- Fixed splitting Neighbours packet [#710](https://github.com/paritytech/parity/pull/710)
+- management of account expiration & memory [#701](https://github.com/paritytech/parity/pull/701)
+- Remove EarlyMerge from user docs. [#708](https://github.com/paritytech/parity/pull/708)
+- Fixes and traces for refcountdb. [#705](https://github.com/paritytech/parity/pull/705)
+- Check for NULL_RLP in AccountDB [#706](https://github.com/paritytech/parity/pull/706)
+- ethminer as crate [#700](https://github.com/paritytech/parity/pull/700)
+- Old ref-counted DB code [#692](https://github.com/paritytech/parity/pull/692)
+- next batch of rpc tests and fixes [#699](https://github.com/paritytech/parity/pull/699)
+- implemented eth_geStorageAt rpc method, added more tests for rpc [#695](https://github.com/paritytech/parity/pull/695)
+- Fix JournalDB era marker [#690](https://github.com/paritytech/parity/pull/690)
+- More sync fixes [#685](https://github.com/paritytech/parity/pull/685)
+- mark some key tests as heavy [#694](https://github.com/paritytech/parity/pull/694)
+- Limit incoming connections [#693](https://github.com/paritytech/parity/pull/693)
+- Updating clippy [#688](https://github.com/paritytech/parity/pull/688)
+- eth_accounts, eth_getBalance rpc functions && tests [#691](https://github.com/paritytech/parity/pull/691)
+- state query for archive jdb [#683](https://github.com/paritytech/parity/pull/683)
+- Fix for option 1 of JournalDB [#658](https://github.com/paritytech/parity/pull/658)
+- Rename into something that is a little more descriptive. [#689](https://github.com/paritytech/parity/pull/689)
+- JournalDB with in-memory overlay (option2) [#634](https://github.com/paritytech/parity/pull/634)
+- additional (failing) SecretStore test [#682](https://github.com/paritytech/parity/pull/682)
+- Updating clippy & fixing warnings. [#670](https://github.com/paritytech/parity/pull/670)
+- rpc web3 tests [#681](https://github.com/paritytech/parity/pull/681)
+- Making personal json-rpc configurable via cli [#677](https://github.com/paritytech/parity/pull/677)
+- RPC Pending Transactions Filter [#661](https://github.com/paritytech/parity/pull/661)
+- Rearrange journaldb infrastructure to make more extensible [#678](https://github.com/paritytech/parity/pull/678)
+- JournalDB -> Box<JournalDB>, and it's a trait. [#673](https://github.com/paritytech/parity/pull/673)
+- fix warning for transaction_queue.add usage [#676](https://github.com/paritytech/parity/pull/676)
+- Adding std::mem back (only for asm) [#680](https://github.com/paritytech/parity/pull/680)
+- update readme to exclude beta step (stable is ok) [#679](https://github.com/paritytech/parity/pull/679)
+- fixed U256 and transaction request deserialization [#675](https://github.com/paritytech/parity/pull/675)
+- More geth compatibility. [#666](https://github.com/paritytech/parity/pull/666)
+- Removing running clippy by default on nightly. [#671](https://github.com/paritytech/parity/pull/671)
+- rpc net submodule tests [#667](https://github.com/paritytech/parity/pull/667)
+- Client module overhaul [#665](https://github.com/paritytech/parity/pull/665)
+- Rpc transaction signing [#587](https://github.com/paritytech/parity/pull/587)
+- Transaction queue exposed via JSON rpc. [#652](https://github.com/paritytech/parity/pull/652)
+- Remove unneeded locking [#499](https://github.com/paritytech/parity/pull/499)
+- extend sync status interface to sync provider [#664](https://github.com/paritytech/parity/pull/664)
+- --archive is default. --pruning is option. [#663](https://github.com/paritytech/parity/pull/663)
+- jsonrpc uses client and sync interfaces [#641](https://github.com/paritytech/parity/pull/641)
+- Expose transaction insertion in sync lib [#609](https://github.com/paritytech/parity/pull/609)
+- Removing get prefix from poll_info [#660](https://github.com/paritytech/parity/pull/660)
+- Tx queue update height bug [#657](https://github.com/paritytech/parity/pull/657)
+- Tx_queue_docs -> To master [#651](https://github.com/paritytech/parity/pull/651)
+- blockchain import_route [#645](https://github.com/paritytech/parity/pull/645)
+- Stop workers before stopping event loop [#655](https://github.com/paritytech/parity/pull/655)
+- Validate sender before importing to queue [#650](https://github.com/paritytech/parity/pull/650)
+- Gas price threshold for transactions [#640](https://github.com/paritytech/parity/pull/640)
+- `dev` feature enabled when compiling without `--release` [#627](https://github.com/paritytech/parity/pull/627)
+- Don't call mark_as_bad needlessly [#648](https://github.com/paritytech/parity/pull/648)
+- Fixed sync handling large forks [#647](https://github.com/paritytech/parity/pull/647)
+- Additional documentation for transaction queue [#631](https://github.com/paritytech/parity/pull/631)
+- Transaction Queue Integration [#607](https://github.com/paritytech/parity/pull/607)
+- Keys cli [#639](https://github.com/paritytech/parity/pull/639)
+- fix build warning [#643](https://github.com/paritytech/parity/pull/643)
+- updated jsonrpc-core and http-server libs [#642](https://github.com/paritytech/parity/pull/642)
+- jsonrpc panics gracefully shutdown client [#638](https://github.com/paritytech/parity/pull/638)
+- Fixing CLI parameters [#633](https://github.com/paritytech/parity/pull/633)
+- Normal CLI options with geth. [#628](https://github.com/paritytech/parity/pull/628)
+- Do not remove the peer immediatelly on send error [#626](https://github.com/paritytech/parity/pull/626)
+- Jsonrpc block behind [#622](https://github.com/paritytech/parity/pull/622)
+- Remove println!s. [#624](https://github.com/paritytech/parity/pull/624)
+- JournalDB option 1 fix [#613](https://github.com/paritytech/parity/pull/613)
+- Network tracing cleanup [#611](https://github.com/paritytech/parity/pull/611)
+- Revert "Transaction Queue integration" [#602](https://github.com/paritytech/parity/pull/602)
+- fix benches compilation [#601](https://github.com/paritytech/parity/pull/601)
+- Transaction Queue integration [#595](https://github.com/paritytech/parity/pull/595)
+- verifier trait improvements [#597](https://github.com/paritytech/parity/pull/597)
+- build on rust stable [#600](https://github.com/paritytech/parity/pull/600)
+- Geth import silent if no geth [#599](https://github.com/paritytech/parity/pull/599)
+- Additional journaldb logging and assert [#593](https://github.com/paritytech/parity/pull/593)
+- Uncle inclusion in block authoring. [#578](https://github.com/paritytech/parity/pull/578)
+- Fixed potential deadlock on startup [#592](https://github.com/paritytech/parity/pull/592)
+- Fixing an overflow panic [#591](https://github.com/paritytech/parity/pull/591)
+- Fixed one more case of sync stalling [#590](https://github.com/paritytech/parity/pull/590)
+- JournalDB can now operate in "archive" mode [#589](https://github.com/paritytech/parity/pull/589)
+- Secret store integration with client [#586](https://github.com/paritytech/parity/pull/586)
+- fix build on nightly rust [#588](https://github.com/paritytech/parity/pull/588)
+- deserialization for uint generic [#585](https://github.com/paritytech/parity/pull/585)
+- TransactionsQueue implementation [#559](https://github.com/paritytech/parity/pull/559)
+- JSON-RPC personal service (follows #582) [#583](https://github.com/paritytech/parity/pull/583)
+- making key directory thread-safe [#582](https://github.com/paritytech/parity/pull/582)
+- verifier trait [#581](https://github.com/paritytech/parity/pull/581)
+- shrink_to_fit after removing hashes. [#580](https://github.com/paritytech/parity/pull/580)
+- support for rpc polling [#504](https://github.com/paritytech/parity/pull/504)
+- limit serde codegen only to rpc types submodule [#569](https://github.com/paritytech/parity/pull/569)
+- fork test for Issue test/568 [#573](https://github.com/paritytech/parity/pull/573)
+- Fixing clippy warnings = small refactoring of `request_blocks` [#560](https://github.com/paritytech/parity/pull/560)
+- Improved journaldb logging [#571](https://github.com/paritytech/parity/pull/571)
+- Additional check to ancient enactments. [#570](https://github.com/paritytech/parity/pull/570)
+- chainfilter shouldnt exclude to_block from results [#564](https://github.com/paritytech/parity/pull/564)
+- Fix coverage test run [#567](https://github.com/paritytech/parity/pull/567)
+- Mining [#547](https://github.com/paritytech/parity/pull/547)
+- fix uint warnings [#565](https://github.com/paritytech/parity/pull/565)
+- Finished blockchain generator. [#562](https://github.com/paritytech/parity/pull/562)
+- fixed broken master [#563](https://github.com/paritytech/parity/pull/563)
+- uint to separate crate [#544](https://github.com/paritytech/parity/pull/544)
+- improved test chain generator [#554](https://github.com/paritytech/parity/pull/554)
+- Fixing spelling in propagade->propagate [#558](https://github.com/paritytech/parity/pull/558)
+- Changing RefCell to Cell in transaction. [#557](https://github.com/paritytech/parity/pull/557)
+- Fix for morden consensus. [#556](https://github.com/paritytech/parity/pull/556)
+- blockchain generator [#550](https://github.com/paritytech/parity/pull/550)
+- Sparse Table Implementation (Row, Col) -> Val [#545](https://github.com/paritytech/parity/pull/545)
+- fixup install script [#548](https://github.com/paritytech/parity/pull/548)
+- Fixing clippy warnings [#546](https://github.com/paritytech/parity/pull/546)
+- ignore out directory [#543](https://github.com/paritytech/parity/pull/543)
+- u256 full multiplication [#539](https://github.com/paritytech/parity/pull/539)
+- Fix panic when downloading stales, update homestead transition [#537](https://github.com/paritytech/parity/pull/537)
+- changing x64 asm config [#534](https://github.com/paritytech/parity/pull/534)
+- uncomment state transition tests [#533](https://github.com/paritytech/parity/pull/533)
+- jsonrpc uses weak pointers to client [#532](https://github.com/paritytech/parity/pull/532)
+- Morden switch to Homestead rules at #494,000. [#531](https://github.com/paritytech/parity/pull/531)
+- Blockchain module cleanup [#524](https://github.com/paritytech/parity/pull/524)
+- Multiplication issue + very exhaustive tests for it [#528](https://github.com/paritytech/parity/pull/528)
+- EIP-8 [#498](https://github.com/paritytech/parity/pull/498)
+- Make "random" trie tests fully deterministic. [#527](https://github.com/paritytech/parity/pull/527)
+- udpated serde to version 0.7.0 [#526](https://github.com/paritytech/parity/pull/526)
+- Better memory management [#516](https://github.com/paritytech/parity/pull/516)
+- Typo [#523](https://github.com/paritytech/parity/pull/523)
+- U512 add/sub optimize [#521](https://github.com/paritytech/parity/pull/521)
+- Account management + geth keystore import (no utility crate added) [#509](https://github.com/paritytech/parity/pull/509)
+- Delayed UPnP initialization [#505](https://github.com/paritytech/parity/pull/505)
+- Fixing marking blocks as bad & SyncMessage bugs + small client refactoring. [#503](https://github.com/paritytech/parity/pull/503)
+- optimization of U256 [#515](https://github.com/paritytech/parity/pull/515)
+- Removed rocksdb from build scripts and instructions [#520](https://github.com/paritytech/parity/pull/520)
+- RocksDB abstraction layer + Hash index for state DB [#464](https://github.com/paritytech/parity/pull/464)
+- bloomfilter [#418](https://github.com/paritytech/parity/pull/418)
+- Fixed a race condition when connecting peer disconnects immediately [#519](https://github.com/paritytech/parity/pull/519)
+- ignore intellij idea project files as well [#518](https://github.com/paritytech/parity/pull/518)
+- updated version of unicase [#517](https://github.com/paritytech/parity/pull/517)
+- jsonrpc security, cors headers, fixed #359 [#493](https://github.com/paritytech/parity/pull/493)
+- Rust implementations to replace data tables (#161) [#482](https://github.com/paritytech/parity/pull/482)
+- fix issue with starting requested block number was not included itself [#512](https://github.com/paritytech/parity/pull/512)
+- fixed travis --org GH_TOKEN [#510](https://github.com/paritytech/parity/pull/510)
+- Improved log format [#506](https://github.com/paritytech/parity/pull/506)
+- Log address on failed connection attempt [#502](https://github.com/paritytech/parity/pull/502)
+- Bumping clippy and fixing warnings. [#501](https://github.com/paritytech/parity/pull/501)
+- Bumping versions. Fixes #496 [#500](https://github.com/paritytech/parity/pull/500)
+- Manage final user-input errors. [#494](https://github.com/paritytech/parity/pull/494)
+- Remove unneeded code, fix minor potential issue with length. [#495](https://github.com/paritytech/parity/pull/495)
+- Remove "unknown" from version string. [#488](https://github.com/paritytech/parity/pull/488)
+- Include git commit date & hash. [#486](https://github.com/paritytech/parity/pull/486)
+- Use proper version string. [#485](https://github.com/paritytech/parity/pull/485)
+- Networking fixes [#480](https://github.com/paritytech/parity/pull/480)
+- Fix potential deadlock on node table update [#484](https://github.com/paritytech/parity/pull/484)
+- Squash more warnings [#481](https://github.com/paritytech/parity/pull/481)
+- dev/test/build tools to separate crate [#477](https://github.com/paritytech/parity/pull/477)
+- Back to original slab crate [#479](https://github.com/paritytech/parity/pull/479)
+- Better user errors. [#476](https://github.com/paritytech/parity/pull/476)
+- UDP Discovery [#440](https://github.com/paritytech/parity/pull/440)
+- update readme with rust override [#475](https://github.com/paritytech/parity/pull/475)
+- fixed warnings on rust beta [#474](https://github.com/paritytech/parity/pull/474)
+- Secret store (part2 - encrypted key/value svc) [#449](https://github.com/paritytech/parity/pull/449)
+- Kill bad test. [#473](https://github.com/paritytech/parity/pull/473)
+- Make clippy an optional dependency [#422](https://github.com/paritytech/parity/pull/422)
+- parity compiling fine [#469](https://github.com/paritytech/parity/pull/469)
+- compiling ethcore on beta [#468](https://github.com/paritytech/parity/pull/468)
+- Utils compiling in beta [#467](https://github.com/paritytech/parity/pull/467)
+- Get rid of lru_cache dependency [#466](https://github.com/paritytech/parity/pull/466)
+- Add daemonization. [#459](https://github.com/paritytech/parity/pull/459)
+- Master upgrade [#448](https://github.com/paritytech/parity/pull/448)
+- Remove contributing stuff now that we have CLA bot. [#447](https://github.com/paritytech/parity/pull/447)
+- Add Morden bootnode. [#446](https://github.com/paritytech/parity/pull/446)
+- beta fixes to master [#441](https://github.com/paritytech/parity/pull/441)
+- Secret store (part1 - key management) [#423](https://github.com/paritytech/parity/pull/423)
+- Use 1100000 as the homestead transition, fix build instructions. [#438](https://github.com/paritytech/parity/pull/438)
+- More sync and propagation fixes [#420](https://github.com/paritytech/parity/pull/420)
+- back to cargo crates [#436](https://github.com/paritytech/parity/pull/436)
+- Fixing clippy warnings [#435](https://github.com/paritytech/parity/pull/435)
+- preserving root cargo lock [#434](https://github.com/paritytech/parity/pull/434)
+- Nightly fix [#432](https://github.com/paritytech/parity/pull/432)
+- nightly fixes [#431](https://github.com/paritytech/parity/pull/431)
+- Delay Homestead transition from 1,000,000. [#429](https://github.com/paritytech/parity/pull/429)
+- Nightly fix effort (still should fail) [#428](https://github.com/paritytech/parity/pull/428)
+- clippy version update, docopt-macro moving to fork [#425](https://github.com/paritytech/parity/pull/425)
+- Network/Sync fixes and optimizations [#416](https://github.com/paritytech/parity/pull/416)
+- Use latest era instead of end era as journal marker [#414](https://github.com/paritytech/parity/pull/414)
+- api changes [#402](https://github.com/paritytech/parity/pull/402)
+- Option for no init nodes. [#408](https://github.com/paritytech/parity/pull/408)
+- Fixed block_bodies not returning a list [#406](https://github.com/paritytech/parity/pull/406)
+- Fix test. [#405](https://github.com/paritytech/parity/pull/405)
+- Allow path to be configured. [#404](https://github.com/paritytech/parity/pull/404)
+- Upnp [#400](https://github.com/paritytech/parity/pull/400)
+- eth_syncing, fixed #397 [#398](https://github.com/paritytech/parity/pull/398)
+- Using modified version of ctrlc that catches SIGTERM [#399](https://github.com/paritytech/parity/pull/399)
+- Catching panics. [#396](https://github.com/paritytech/parity/pull/396)
+- jsonrpc [#391](https://github.com/paritytech/parity/pull/391)
+- Externalities tests (still clumsy) [#394](https://github.com/paritytech/parity/pull/394)
+- excluding test code itself from coverage [#395](https://github.com/paritytech/parity/pull/395)
+- Additional tweaks to options. [#390](https://github.com/paritytech/parity/pull/390)
+- --chain option for setting which network to go on. [#388](https://github.com/paritytech/parity/pull/388)
+- Ethash unit tests final [#387](https://github.com/paritytech/parity/pull/387)
+- jsonrpc [#374](https://github.com/paritytech/parity/pull/374)
+- Editorconfig file. [#384](https://github.com/paritytech/parity/pull/384)
+- Coverage effort [in progress] [#382](https://github.com/paritytech/parity/pull/382)
+- making root kcov runner simular to the one running on CI [#380](https://github.com/paritytech/parity/pull/380)
+- add gcc as a dependency to dockerfiles [#381](https://github.com/paritytech/parity/pull/381)
+- Check for handshake expiration before attempting connection replace [#375](https://github.com/paritytech/parity/pull/375)
+- Blocks propagation [#364](https://github.com/paritytech/parity/pull/364)
+- Network params. [#376](https://github.com/paritytech/parity/pull/376)
+- Add parity-node-zero to bootnodes. [#373](https://github.com/paritytech/parity/pull/373)
+- kcov uses travis_job_id instead of coveralls token [#370](https://github.com/paritytech/parity/pull/370)
+- Add parity-node-zero.ethcore.io to boot nodes. [#371](https://github.com/paritytech/parity/pull/371)
+
+## Parity [v1.0.0-rc1](https://github.com/paritytech/parity/releases/tag/v1.0.0-rc1) (2016-03-15)
+
+First Parity 1.0.0 release candidate.
+
+- Version 1.0 in beta [#712](https://github.com/paritytech/parity/pull/712)
+- Fix test for beta [#617](https://github.com/paritytech/parity/pull/617)
+- JournalDB fix option 1 for beta [#614](https://github.com/paritytech/parity/pull/614)
+- Failing test. [#606](https://github.com/paritytech/parity/pull/606)
+- Fix transition points [#604](https://github.com/paritytech/parity/pull/604)
+- (BETA) Update README.md [#549](https://github.com/paritytech/parity/pull/549)
+- (BETA) instructions for beta release channel [#456](https://github.com/paritytech/parity/pull/456)
+- (BETA) fix nightly - remerge [#454](https://github.com/paritytech/parity/pull/454)
+- (BETA) fixing nightly version for beta [#452](https://github.com/paritytech/parity/pull/452)
+
+## Parity [beta-0.9.1](https://github.com/paritytech/parity/releases/tag/beta-0.9.1) (2016-02-16)
+
+Homestead transition block changed to 1100000.
+
+- Beta patch to 0.9.1 [#445](https://github.com/paritytech/parity/pull/445)
+- Delay homestead transition [#430](https://github.com/paritytech/parity/pull/430)
+- (BETA) https link in the installer (?) [#392](https://github.com/paritytech/parity/pull/392)
+- beta: Check for handshake expiration before attempting replace [#377](https://github.com/paritytech/parity/pull/377)
+
+## Parity [beta-0.9](https://github.com/paritytech/parity/releases/tag/beta-0.9) (2016-02-08)
+
+First Parity Beta 0.9 released.
+
+- Panic on missing counters; Client cleanup [#368](https://github.com/paritytech/parity/pull/368)
+- Update README for new PPAs. [#369](https://github.com/paritytech/parity/pull/369)
+- block_queue::clear should be more thorough [#365](https://github.com/paritytech/parity/pull/365)
+- Fixed an issue with forked counters [#363](https://github.com/paritytech/parity/pull/363)
+- Install parity [#362](https://github.com/paritytech/parity/pull/362)
+- DB directory versioning [#358](https://github.com/paritytech/parity/pull/358)
+- Raise FD limit for MacOS [#357](https://github.com/paritytech/parity/pull/357)
+- Travis slack integration. [#356](https://github.com/paritytech/parity/pull/356)
+- SignedTransaction structure [#350](https://github.com/paritytech/parity/pull/350)
+- License [#354](https://github.com/paritytech/parity/pull/354)
+- Performance optimizations [#353](https://github.com/paritytech/parity/pull/353)
+- Gitter in README. [#355](https://github.com/paritytech/parity/pull/355)
+- test efforts, receipt requests [#352](https://github.com/paritytech/parity/pull/352)
+- sync tests setup & local module coverage [#348](https://github.com/paritytech/parity/pull/348)
+- install parity script [#347](https://github.com/paritytech/parity/pull/347)
+- evmjit homestead merge [#342](https://github.com/paritytech/parity/pull/342)
+- Fixed sync stalling on fork [#343](https://github.com/paritytech/parity/pull/343)
+- Remerge 264 [#334](https://github.com/paritytech/parity/pull/334)
+- Ethsync tests bfix [#339](https://github.com/paritytech/parity/pull/339)
+- Fix default options. [#335](https://github.com/paritytech/parity/pull/335)
+- sync queue limit hotfix [#338](https://github.com/paritytech/parity/pull/338)
+- Network tests, separate local coverage for utils [#333](https://github.com/paritytech/parity/pull/333)
+- fix parity version so netstats can parse it [#332](https://github.com/paritytech/parity/pull/332)
+- reveal surprise [#331](https://github.com/paritytech/parity/pull/331)
+- Revert removal of `new_code`. [#330](https://github.com/paritytech/parity/pull/330)
+- Network mod tests first part [#329](https://github.com/paritytech/parity/pull/329)
+- Look ma no `dead_code` [#323](https://github.com/paritytech/parity/pull/323)
+- Fixing JIT, Updating hook to run `ethcore` tests. [#326](https://github.com/paritytech/parity/pull/326)
+- Final docs [#327](https://github.com/paritytech/parity/pull/327)
+- update install-deps.sh [#316](https://github.com/paritytech/parity/pull/316)
+- Finish all my docs. Fix previous test compilation. [#320](https://github.com/paritytech/parity/pull/320)
+- Additional evm tests (extops, call, jumps) and some docs [#317](https://github.com/paritytech/parity/pull/317)
+- More documentation. [#318](https://github.com/paritytech/parity/pull/318)
+- Additional documentation. [#315](https://github.com/paritytech/parity/pull/315)
+- unused functions cleanup [#310](https://github.com/paritytech/parity/pull/310)
+- update ethcore.github.io documentation automatically [#311](https://github.com/paritytech/parity/pull/311)
+- Another try with travis ci credentials [#314](https://github.com/paritytech/parity/pull/314)
+- Document some stuff. [#309](https://github.com/paritytech/parity/pull/309)
+- Check block parent on import; Peer timeouts [#303](https://github.com/paritytech/parity/pull/303)
+- Increasing coverage for evm. [#306](https://github.com/paritytech/parity/pull/306)
+- ethcore docs [#301](https://github.com/paritytech/parity/pull/301)
+- Replacing secure token for deployment [#305](https://github.com/paritytech/parity/pull/305)
+- doc.sh [#299](https://github.com/paritytech/parity/pull/299)
+- Building beta-* and stable-* tags [#302](https://github.com/paritytech/parity/pull/302)
+- Deploying artifacts for tags (release/beta) [#300](https://github.com/paritytech/parity/pull/300)
+- cov.sh to show coverage locally [#298](https://github.com/paritytech/parity/pull/298)
+- benchmark fixes [#297](https://github.com/paritytech/parity/pull/297)
+- Include JSONRPC CLI options. [#296](https://github.com/paritytech/parity/pull/296)
+- travis.yml fixes [#293](https://github.com/paritytech/parity/pull/293)
+- Improve version string. [#295](https://github.com/paritytech/parity/pull/295)
+- Fixed block queue test [#294](https://github.com/paritytech/parity/pull/294)
+- Util docs [#292](https://github.com/paritytech/parity/pull/292)
+- fixed building docs [#289](https://github.com/paritytech/parity/pull/289)
+- update travis to build PRs only against master [#290](https://github.com/paritytech/parity/pull/290)
+- Coverage effort [#272](https://github.com/paritytech/parity/pull/272)
+- updated docker containers [#288](https://github.com/paritytech/parity/pull/288)
+- rpc module fixes [#287](https://github.com/paritytech/parity/pull/287)
+- Test for Receipt RLP. [#282](https://github.com/paritytech/parity/pull/282)
+- Building from source guide [#284](https://github.com/paritytech/parity/pull/284)
+- Fixed neted empty list RLP encoding [#283](https://github.com/paritytech/parity/pull/283)
+- Fix CALLDATACOPY (and bonus CODECOPY, too!). [#279](https://github.com/paritytech/parity/pull/279)
+- added travis && coveralls badge to README.md [#280](https://github.com/paritytech/parity/pull/280)
+- coveralls coverage [#277](https://github.com/paritytech/parity/pull/277)
+- Travis [in progress] [#257](https://github.com/paritytech/parity/pull/257)
+- Travis on reorganized repo [#276](https://github.com/paritytech/parity/pull/276)
+- umbrella project [#275](https://github.com/paritytech/parity/pull/275)
+- Ethash disk cache [#273](https://github.com/paritytech/parity/pull/273)
+- Parity executable name and version [#274](https://github.com/paritytech/parity/pull/274)
+- Dockerfile [#195](https://github.com/paritytech/parity/pull/195)
+- Garbage collection test fix [#267](https://github.com/paritytech/parity/pull/267)
+- Fix stCallCreateCallCodeTest, add more tests [#271](https://github.com/paritytech/parity/pull/271)
+- Moved sync out of ethcore crate; Added block validation [#265](https://github.com/paritytech/parity/pull/265)
+- RLP encoder refactoring [#252](https://github.com/paritytech/parity/pull/252)
+- Chain sync tests and minor refactoring [#264](https://github.com/paritytech/parity/pull/264)
+- Common log init function [#263](https://github.com/paritytech/parity/pull/263)
+- changed max vm depth from 128 to 64, change homestead block to 1_000_000 [#262](https://github.com/paritytech/parity/pull/262)
+- fixed blockchain tests crash on log init [#261](https://github.com/paritytech/parity/pull/261)
+- Blockchain tests and some helpers for guarding temp directory [#256](https://github.com/paritytech/parity/pull/256)
+- Fix logging and random tests. [#260](https://github.com/paritytech/parity/pull/260)
+- Fix difficulty calculation algo. [#259](https://github.com/paritytech/parity/pull/259)
+- fix submodule version [#258](https://github.com/paritytech/parity/pull/258)
+- temp dir spawn refactoring [#246](https://github.com/paritytech/parity/pull/246)
+- fixed tests submodule branch [#254](https://github.com/paritytech/parity/pull/254)
+- rpc net methods returns real peer count && protocol version [#253](https://github.com/paritytech/parity/pull/253)
+- Add homestead & random tests. [#245](https://github.com/paritytech/parity/pull/245)
+- Fixing suicide with self-refund to be consistent with CPP. [#247](https://github.com/paritytech/parity/pull/247)
+- stubs for rpc methods [#251](https://github.com/paritytech/parity/pull/251)
+- clippy, missing docs, renaming etc. [#244](https://github.com/paritytech/parity/pull/244)
+- impl missing methods in tests [#243](https://github.com/paritytech/parity/pull/243)
+- General tests and some helpers [#239](https://github.com/paritytech/parity/pull/239)
+- Note additional tests are fixed, fix doc test. [#242](https://github.com/paritytech/parity/pull/242)
+- jsonrpc http server [#193](https://github.com/paritytech/parity/pull/193)
+- Ethash nonce is H64 not a u64 [#240](https://github.com/paritytech/parity/pull/240)
+- Fix import for bcMultiChainTest [#236](https://github.com/paritytech/parity/pull/236)
+- Client basic tests [#232](https://github.com/paritytech/parity/pull/232)
+- Fix ensure_db_good() and flush_queue(), block refactoring, check block format, be strict. [#231](https://github.com/paritytech/parity/pull/231)
+- Rlp [#207](https://github.com/paritytech/parity/pull/207)
+- Schedule documentation [#219](https://github.com/paritytech/parity/pull/219)
+- U256<->H256 Conversion [#206](https://github.com/paritytech/parity/pull/206)
+- Spawning new thread when we are reaching stack limit [#217](https://github.com/paritytech/parity/pull/217)
+- Blockchain tests [#211](https://github.com/paritytech/parity/pull/211)
+- fixed failing sync test [#218](https://github.com/paritytech/parity/pull/218)
+- Removing println [#216](https://github.com/paritytech/parity/pull/216)
+- Cleaning readme [#212](https://github.com/paritytech/parity/pull/212)
+- Fixing delegatecall [#196](https://github.com/paritytech/parity/pull/196)
+- Autogenerate the Args from the docopt macro. [#205](https://github.com/paritytech/parity/pull/205)
+- Networking fixes [#202](https://github.com/paritytech/parity/pull/202)
+- Argument parsing from CLI [#204](https://github.com/paritytech/parity/pull/204)
+- Removed wildcard from clippy version [#203](https://github.com/paritytech/parity/pull/203)
+- Fixed tests and tweaked sync progress report [#201](https://github.com/paritytech/parity/pull/201)
+- Heavy tests [#199](https://github.com/paritytech/parity/pull/199)
+- Mutithreaded IO [#198](https://github.com/paritytech/parity/pull/198)
+- Populating last_hashes [#197](https://github.com/paritytech/parity/pull/197)
+- Fixing clippy stuff [#170](https://github.com/paritytech/parity/pull/170)
+- basic .travis.yml [#194](https://github.com/paritytech/parity/pull/194)
+- Generating coverage reports. [#190](https://github.com/paritytech/parity/pull/190)
+- Adding doc requests comments [#192](https://github.com/paritytech/parity/pull/192)
+- moved src/bin/client.rs -> src/bin/client/main.rs [#185](https://github.com/paritytech/parity/pull/185)
+- removed overflowing_shr [#188](https://github.com/paritytech/parity/pull/188)
+- fixed wrapping ops on latest nightly [#187](https://github.com/paritytech/parity/pull/187)
+- Pruned state DB [#176](https://github.com/paritytech/parity/pull/176)
+- Memory management for cache [#180](https://github.com/paritytech/parity/pull/180)
+- Implement signs having low-s. [#183](https://github.com/paritytech/parity/pull/183)
+- Introduce sha3 crate and use it in ethash [#178](https://github.com/paritytech/parity/pull/178)
+- Multithreaded block queue [#173](https://github.com/paritytech/parity/pull/173)
+- Iterator for NibbleSlice and TrieDB. [#171](https://github.com/paritytech/parity/pull/171)
+- Handling all possible overflows [#145](https://github.com/paritytech/parity/pull/145)
+- Global secp256k1 context [#164](https://github.com/paritytech/parity/pull/164)
+- Ethash [#152](https://github.com/paritytech/parity/pull/152)
+- Move util into here [#153](https://github.com/paritytech/parity/pull/153)
+- EVM Interpreter [#103](https://github.com/paritytech/parity/pull/103)
+- Homestead transition support, maybe. [#141](https://github.com/paritytech/parity/pull/141)
+- externalities refactor [#131](https://github.com/paritytech/parity/pull/131)
+- More open files. [#140](https://github.com/paritytech/parity/pull/140)
+- Single array for logs output. [#133](https://github.com/paritytech/parity/pull/133)
+- Client app event handler [#132](https://github.com/paritytech/parity/pull/132)
+- Various consensus fixes. [#130](https://github.com/paritytech/parity/pull/130)
+- callcode builtins tests pass [#127](https://github.com/paritytech/parity/pull/127)
+- Client state syncing [#119](https://github.com/paritytech/parity/pull/119)
+- Split externalities from executive. [#126](https://github.com/paritytech/parity/pull/126)
+- executive error on not enoguh base gas [#124](https://github.com/paritytech/parity/pull/124)
+- Gav [#125](https://github.com/paritytech/parity/pull/125)
+- builtin sets excepted to true [#123](https://github.com/paritytech/parity/pull/123)
+- More state tests. [#122](https://github.com/paritytech/parity/pull/122)
+- updated to rocksdb wrapper version 0.3 [#121](https://github.com/paritytech/parity/pull/121)
+- out_of_gas -> excepted [#120](https://github.com/paritytech/parity/pull/120)
+- Parametrizing evm::Factory [#111](https://github.com/paritytech/parity/pull/111)
+- stLogs tests passing [#118](https://github.com/paritytech/parity/pull/118)
+- Fix executive. [#117](https://github.com/paritytech/parity/pull/117)
+- Fixes for marek's shooting from the hip. [#116](https://github.com/paritytech/parity/pull/116)
+- Executive revert fix [#115](https://github.com/paritytech/parity/pull/115)
+- Fix storage/account and add butress test. [#114](https://github.com/paritytech/parity/pull/114)
+- Refactored Pod & Diff types into separate files, JSON infrastructure revamp. [#113](https://github.com/paritytech/parity/pull/113)
+- Fix storage stuff and introduce per-item dirty-tracking. [#112](https://github.com/paritytech/parity/pull/112)
+- Check logs in state tests. [#109](https://github.com/paritytech/parity/pull/109)
+- executive gas calculation fixes [#108](https://github.com/paritytech/parity/pull/108)
+- proper gas calculation in executive [#107](https://github.com/paritytech/parity/pull/107)
+- Fixing MaxDepth param for executive [#105](https://github.com/paritytech/parity/pull/105)
+- Fix determination of state roots. [#106](https://github.com/paritytech/parity/pull/106)
+- transact substracts tx_gas [#104](https://github.com/paritytech/parity/pull/104)
+- Pretty-print and fix for state. [#102](https://github.com/paritytech/parity/pull/102)
+- Tier step price. [#101](https://github.com/paritytech/parity/pull/101)
+- Refactor Diff datastructures. [#100](https://github.com/paritytech/parity/pull/100)
+- externalities use u256 instead of u64 for gas calculation [#99](https://github.com/paritytech/parity/pull/99)
+- Executive tests [#97](https://github.com/paritytech/parity/pull/97)
+- State conensus tests now print mismatching diff on fail. [#98](https://github.com/paritytech/parity/pull/98)
+- State testing framework. First test is failing. [#96](https://github.com/paritytech/parity/pull/96)
+- executive tests [#95](https://github.com/paritytech/parity/pull/95)
+- Use U512s for ether cost calculation, complete transaction API [#94](https://github.com/paritytech/parity/pull/94)
+- Utils for consensus test decoding and better layout. [#93](https://github.com/paritytech/parity/pull/93)
+- executive fixes + tests [#89](https://github.com/paritytech/parity/pull/89)
+- All transaction tests pass. Nicer testing framework. [#92](https://github.com/paritytech/parity/pull/92)
+- Block verification tests; BlockProvider blockchain trait for testing [#88](https://github.com/paritytech/parity/pull/88)
+- State::exists, docs and tests. [#87](https://github.com/paritytech/parity/pull/87)
+- Add tests module, add two more transaction tests. [#86](https://github.com/paritytech/parity/pull/86)
+- bring back removed tests, removed build warnings [#82](https://github.com/paritytech/parity/pull/82)
+- Nicer transaction validation API. Nicer OutOfBounds API in general. [#85](https://github.com/paritytech/parity/pull/85)
+- Transaction fixes and consensus tests (all passing) [#84](https://github.com/paritytech/parity/pull/84)
+- fixed getting block info in evmjit + tests [#81](https://github.com/paritytech/parity/pull/81)
+- evm tests cleanup [#80](https://github.com/paritytech/parity/pull/80)
+- renamed VmFactory -> Factory [#77](https://github.com/paritytech/parity/pull/77)
+- fixed rust-evmjit description of improper_ctypes usage [#76](https://github.com/paritytech/parity/pull/76)
+- jit feature enabled by default [#75](https://github.com/paritytech/parity/pull/75)
+- evm [#52](https://github.com/paritytech/parity/pull/52)
+- state clone [#74](https://github.com/paritytech/parity/pull/74)
+- Block Verification (no tests yet) [#72](https://github.com/paritytech/parity/pull/72)
+- Improvements to LogEntry and Transaction [#73](https://github.com/paritytech/parity/pull/73)
+- Use getter in header in preparation for a Header trait; additional testing in enact_block(). [#64](https://github.com/paritytech/parity/pull/64)
+- BlockChain sync and Client app [#55](https://github.com/paritytech/parity/pull/55)
+- Block enactment (including test) [#63](https://github.com/paritytech/parity/pull/63)
+- Block complete. Needs tests. [#62](https://github.com/paritytech/parity/pull/62)
+- More on OpenBlock::close; State::kill_account added [#61](https://github.com/paritytech/parity/pull/61)
+- Remove genesis module, add more chain specs and separate out ethereum-specific stuff [#60](https://github.com/paritytech/parity/pull/60)
+- State::new_contract, camelCase engine params, missing param [#59](https://github.com/paritytech/parity/pull/59)
+- Use reorganisation [#58](https://github.com/paritytech/parity/pull/58)
+- Initial Ethash/Block skeleton implementations. [#57](https://github.com/paritytech/parity/pull/57)
+- Spec with tested Morden genesis decoder and builtins. [#54](https://github.com/paritytech/parity/pull/54)
+- Move all chain parameters into `engine_params` [#50](https://github.com/paritytech/parity/pull/50)
+- jit ffi improvements [please review] [#51](https://github.com/paritytech/parity/pull/51)
+- blockchain [please review] [#34](https://github.com/paritytech/parity/pull/34)
+- Move information from networkparams.rs into spec.rs [#48](https://github.com/paritytech/parity/pull/48)
+- Move bulking out in Engine/Params. [#47](https://github.com/paritytech/parity/pull/47)
+- Removed need for mutation in State. [#46](https://github.com/paritytech/parity/pull/46)
+- State::code and State::storage_at + tests. [#45](https://github.com/paritytech/parity/pull/45)
+- State functions for balance and nonce operations [#44](https://github.com/paritytech/parity/pull/44)
+- Account::storage_at, Account::ensure_cached and tests. [#43](https://github.com/paritytech/parity/pull/43)
+- Additional tests. [#42](https://github.com/paritytech/parity/pull/42)
+- seal todo done [#41](https://github.com/paritytech/parity/pull/41)
+- missing rustc_serialize crate && rlp `as_list` function [#40](https://github.com/paritytech/parity/pull/40)
+- More methods in Account, documentation and tests. [#39](https://github.com/paritytech/parity/pull/39)
+- Minor reworking of Account. [#38](https://github.com/paritytech/parity/pull/38)
+- Add Account and State classes. [#37](https://github.com/paritytech/parity/pull/37)
+- Revert regressions [#36](https://github.com/paritytech/parity/pull/36)

From b0e4c913c02c4fa5ebcbf7ee47b4fd26f7d766f5 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Tue, 2 May 2017 10:42:38 +0000
Subject: [PATCH 081/117] [ci skip] js-precompiled 20170502-103844

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5080484d9..c68707117 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1778,7 +1778,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#e2616ff5fba5ee7bf35b9dbd29ea896b2ed8ecea"
+source = "git+https://github.com/paritytech/js-precompiled.git#6ae27a1126a30b21bac014d8d2a5eaac0c38ba1f"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 46aee41c7..5274487f2 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.62",
+  "version": "1.7.63",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From a56b2f599377cf639e539d4a2c7a251aabdacbc8 Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Tue, 2 May 2017 17:52:49 +0200
Subject: [PATCH 082/117] Fix utf8 decoding (#5533)

* Fixes #5492

* Linting
---
 js/src/abi/decoder/decoder.js      | 10 +++++++++-
 js/src/abi/decoder/decoder.spec.js |  8 ++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/js/src/abi/decoder/decoder.js b/js/src/abi/decoder/decoder.js
index 9cb07e3d7..6922c91e8 100644
--- a/js/src/abi/decoder/decoder.js
+++ b/js/src/abi/decoder/decoder.js
@@ -113,7 +113,15 @@ export default class Decoder {
 
         const str = taken.bytes.map((code) => String.fromCharCode(code)).join('');
 
-        return new DecodeResult(new Token(param.type, utf8.decode(str)), offset + 1);
+        let decoded;
+
+        try {
+          decoded = utf8.decode(str);
+        } catch (error) {
+          decoded = str;
+        }
+
+        return new DecodeResult(new Token(param.type, decoded), offset + 1);
 
       case 'array':
         lengthOffset = asU32(Decoder.peek(slices, offset)).div(32).toNumber();
diff --git a/js/src/abi/decoder/decoder.spec.js b/js/src/abi/decoder/decoder.spec.js
index 1f27a3e65..5065be3a7 100644
--- a/js/src/abi/decoder/decoder.spec.js
+++ b/js/src/abi/decoder/decoder.spec.js
@@ -38,6 +38,7 @@ describe('abi/decoder/Decoder', () => {
   const int1 = '0111111111111111111111111111111111111111111111111111111111111111';
   const intn = 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff85';
   const string1 = '6761766f66796f726b0000000000000000000000000000000000000000000000';
+  const string2 = '4665726ee16e64657a0000000000000000000000000000000000000000000000';
   const tokenAddress1 = new Token('address', `0x${address1.slice(-40)}`);
   const tokenAddress2 = new Token('address', `0x${address2.slice(-40)}`);
   const tokenAddress3 = new Token('address', `0x${address3.slice(-40)}`);
@@ -53,6 +54,7 @@ describe('abi/decoder/Decoder', () => {
   const tokenUint1 = new Token('uint', new BigNumber(int1, 16));
   const tokenUintn = new Token('uint', new BigNumber(intn, 16));
   const tokenString1 = new Token('string', 'gavofyork');
+  const tokenString2 = new Token('string', 'Fernández');
   const slices = [ address1, address2, address3, address4 ];
 
   describe('peek', () => {
@@ -160,6 +162,12 @@ describe('abi/decoder/Decoder', () => {
       ).to.deep.equal(tokenString1);
     });
 
+    it('decodes utf8-invalid string', () => {
+      expect(
+        Decoder.decodeParam(new ParamType('string'), [padU32(0x20), padU32(9), string2], 0).token
+      ).to.deep.equal(tokenString2);
+    });
+
     it('decodes string (indexed)', () => {
       expect(
         Decoder.decodeParam(new ParamType('string', null, 0, true), [bytes1], 0)

From b17c6ec054a7d1c1ba65c059b1484a4ea4053083 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Tue, 2 May 2017 16:16:27 +0000
Subject: [PATCH 083/117] [ci skip] js-precompiled 20170502-161232

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c68707117..583b85559 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1778,7 +1778,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#6ae27a1126a30b21bac014d8d2a5eaac0c38ba1f"
+source = "git+https://github.com/paritytech/js-precompiled.git#b5581e7b303487d9696b62a70eb54b96bc76f590"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 5274487f2..c756faf32 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.63",
+  "version": "1.7.64",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 09bd3a9642e8587cf12b207cd3f06d871ea3c0c0 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Tue, 2 May 2017 20:45:19 +0300
Subject: [PATCH 084/117] update CI docker images

switch to hub.docker.com/r/parity
---
 .gitlab-ci.yml | 43 +++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f4396b3d..7ddc58c9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,26 +60,9 @@ linux-stable:
     - target/release/ethstore
     - target/release/ethkey
     name: "stable-x86_64-unknown-linux-gnu_parity"
-linux-snap:
-  stage: build
-  image: ethcore/snapcraft:latest
-  only:
-    - snap
-  script:
-    - rm -rf *snap
-    - cd scripts
-    - snapcraft
-  tags:
-    - rust
-    - rust-stable
-  artifacts:
-    paths:
-    - scripts/parity_master_amd64.snap
-    name: "stable-x86_64-unknown-linux-gnu_parity-snap"
-  allow_failure: true
 linux-stable-debian:
   stage: build
-  image: ethcore/rust-debian:latest
+  image: parity/rust-debian:gitlab-ci
   only:
     - beta
     - tags
@@ -163,7 +146,7 @@ linux-nightly:
   allow_failure: true
 linux-centos:
   stage: build
-  image: ethcore/rust-centos:latest
+  image: parity/rust-centos:gitlab-ci
   only:
     - beta
     - tags
@@ -194,7 +177,7 @@ linux-centos:
     name: "x86_64-unknown-centos-gnu_parity"
 linux-i686:
   stage: build
-  image: ethcore/rust-i686:latest
+  image: parity/rust-i686:gitlab-ci
   only:
     - beta
     - tags
@@ -234,7 +217,7 @@ linux-i686:
   allow_failure: true
 linux-armv7:
   stage: build
-  image: ethcore/rust-armv7:latest
+  image: parity/rust-armv7:gitlab-ci
   only:
     - beta
     - tags
@@ -280,7 +263,7 @@ linux-armv7:
   allow_failure: true
 linux-arm:
   stage: build
-  image: ethcore/rust-arm:latest
+  image: parity/rust-arm:gitlab-ci
   only:
     - beta
     - tags
@@ -365,7 +348,7 @@ linux-armv6:
   allow_failure: true
 linux-aarch64:
   stage: build
-  image: ethcore/rust-aarch64:latest
+  image: parity/rust-arm64:latest
   only:
     - beta
     - tags
@@ -577,7 +560,7 @@ test-rust-stable:
     - rust-stable
 js-test:
   stage: test
-  image: ethcore/rust:stable
+  image: parity/rust:gitlab-ci
   before_script:
     - git submodule update --init --recursive
     - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l)
@@ -591,11 +574,12 @@ test-rust-beta:
   stage: test
   only:
     - triggers
-  image: ethcore/rust:beta
+  image: parity/rust:gitlab-ci
   before_script:
     - git submodule update --init --recursive
     - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
   script:
+    - rustup default beta
     - export RUST_BACKTRACE=1
     - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
   tags:
@@ -606,11 +590,12 @@ test-rust-nightly:
   stage: test
   only:
     - triggers
-  image: ethcore/rust:nightly
+  image: parity/rust:gitlab-ci
   before_script:
     - git submodule update --init --recursive
     - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
   script:
+    - rustup default stable
     - export RUST_BACKTRACE=1
     - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
   tags:
@@ -624,12 +609,13 @@ js-release:
     - beta
     - stable
     - tags
-  image: ethcore/rust:stable
+  image: parity/rust:gitlab-ci
   before_script:
     - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l)
     - echo $JS_FILES_MODIFIED
     - if [ $JS_FILES_MODIFIED -eq 0  ]; then echo "Skipping JS deps install since no JS files modified."; else ./js/scripts/install-deps.sh;fi
   script:
+    - rustup default stable
     - echo $JS_FILES_MODIFIED
     - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS rebuild since no JS files modified."; else ./js/scripts/build.sh && ./js/scripts/release.sh; fi
   tags:
@@ -638,8 +624,9 @@ push-release:
   stage: push-release
   only:
     - tags
-  image: ethcore/rust:stable
+  image: parity/rust:gitlab-ci
   script:
+    - rustup default stable
     - curl --data "secret=$RELEASES_SECRET" http://update.parity.io:1337/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF
     - curl --data "secret=$RELEASES_SECRET" http://update.parity.io:1338/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF
   tags:

From 2bb6546ed64fb15a21fbe9d24d01a22a6c5d2fc5 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Tue, 2 May 2017 21:29:10 +0300
Subject: [PATCH 085/117] replace CI docker images to hub.docker.com/r/parity

---
 .gitlab-ci.yml | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c2ad13d6..7ddc58c9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,7 +62,7 @@ linux-stable:
     name: "stable-x86_64-unknown-linux-gnu_parity"
 linux-stable-debian:
   stage: build
-  image: ethcore/rust-debian:latest
+  image: parity/rust-debian:gitlab-ci
   only:
     - beta
     - tags
@@ -146,7 +146,7 @@ linux-nightly:
   allow_failure: true
 linux-centos:
   stage: build
-  image: ethcore/rust-centos:latest
+  image: parity/rust-centos:gitlab-ci
   only:
     - beta
     - tags
@@ -177,7 +177,7 @@ linux-centos:
     name: "x86_64-unknown-centos-gnu_parity"
 linux-i686:
   stage: build
-  image: ethcore/rust-i686:latest
+  image: parity/rust-i686:gitlab-ci
   only:
     - beta
     - tags
@@ -217,7 +217,7 @@ linux-i686:
   allow_failure: true
 linux-armv7:
   stage: build
-  image: ethcore/rust-armv7:latest
+  image: parity/rust-armv7:gitlab-ci
   only:
     - beta
     - tags
@@ -263,7 +263,7 @@ linux-armv7:
   allow_failure: true
 linux-arm:
   stage: build
-  image: ethcore/rust-arm:latest
+  image: parity/rust-arm:gitlab-ci
   only:
     - beta
     - tags
@@ -348,7 +348,7 @@ linux-armv6:
   allow_failure: true
 linux-aarch64:
   stage: build
-  image: ethcore/rust-aarch64:latest
+  image: parity/rust-arm64:latest
   only:
     - beta
     - tags
@@ -560,7 +560,7 @@ test-rust-stable:
     - rust-stable
 js-test:
   stage: test
-  image: ethcore/rust:stable
+  image: parity/rust:gitlab-ci
   before_script:
     - git submodule update --init --recursive
     - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l)
@@ -574,11 +574,12 @@ test-rust-beta:
   stage: test
   only:
     - triggers
-  image: ethcore/rust:beta
+  image: parity/rust:gitlab-ci
   before_script:
     - git submodule update --init --recursive
     - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
   script:
+    - rustup default beta
     - export RUST_BACKTRACE=1
     - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
   tags:
@@ -589,11 +590,12 @@ test-rust-nightly:
   stage: test
   only:
     - triggers
-  image: ethcore/rust:nightly
+  image: parity/rust:gitlab-ci
   before_script:
     - git submodule update --init --recursive
     - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
   script:
+    - rustup default stable
     - export RUST_BACKTRACE=1
     - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
   tags:
@@ -607,12 +609,13 @@ js-release:
     - beta
     - stable
     - tags
-  image: ethcore/rust:stable
+  image: parity/rust:gitlab-ci
   before_script:
     - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l)
     - echo $JS_FILES_MODIFIED
     - if [ $JS_FILES_MODIFIED -eq 0  ]; then echo "Skipping JS deps install since no JS files modified."; else ./js/scripts/install-deps.sh;fi
   script:
+    - rustup default stable
     - echo $JS_FILES_MODIFIED
     - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS rebuild since no JS files modified."; else ./js/scripts/build.sh && ./js/scripts/release.sh; fi
   tags:
@@ -621,8 +624,9 @@ push-release:
   stage: push-release
   only:
     - tags
-  image: ethcore/rust:stable
+  image: parity/rust:gitlab-ci
   script:
+    - rustup default stable
     - curl --data "secret=$RELEASES_SECRET" http://update.parity.io:1337/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF
     - curl --data "secret=$RELEASES_SECRET" http://update.parity.io:1338/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF
   tags:

From 5fd5c9e85c99a5274196f653a7e4e9ce0e2cea7c Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Wed, 3 May 2017 03:03:39 +0300
Subject: [PATCH 086/117] Update .gitlab-ci.yml

fix typo arm64
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ddc58c9b..37e369382 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -348,7 +348,7 @@ linux-armv6:
   allow_failure: true
 linux-aarch64:
   stage: build
-  image: parity/rust-arm64:latest
+  image: parity/rust-arm64:gitlab-ci
   only:
     - beta
     - tags

From 9cfb50f90fc995045279e059eb17cdfe64e3b507 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Wed, 3 May 2017 03:12:45 +0300
Subject: [PATCH 087/117] Update .gitlab-ci.yml

build snap beta
---
 .gitlab-ci.yml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ddc58c9b..6688d6f23 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,6 +60,24 @@ linux-stable:
     - target/release/ethstore
     - target/release/ethkey
     name: "stable-x86_64-unknown-linux-gnu_parity"
+linux-snap:
+  stage: build
+  image: parity/snapcraft:gitlab-ci
+  only:
+    - snap
+    - beta
+  script:
+    - rm -rf *snap
+    - cd scripts
+    - snapcraft
+  tags:
+    - rust
+    - rust-stable
+  artifacts:
+    paths:
+    - scripts/parity_master_amd64.snap
+    name: "stable-x86_64-unknown-linux-gnu_parity-snap"
+  allow_failure: true
 linux-stable-debian:
   stage: build
   image: parity/rust-debian:gitlab-ci
@@ -348,7 +366,7 @@ linux-armv6:
   allow_failure: true
 linux-aarch64:
   stage: build
-  image: parity/rust-arm64:latest
+  image: parity/rust-arm64:gitlab-ci
   only:
     - beta
     - tags

From 60bb0de9d678603961d4217139cfb0dec0ecc980 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Wed, 3 May 2017 09:00:02 +0200
Subject: [PATCH 088/117] Calculate post-constructors state root in spec at
 load time (#5523)

* apply contract constructors at spec load time

* debugging

* do trie updates in two stages

* add lint exception to newly-dead constructor

* squash warning in RPC tests

* kill dead accountdb constructors

* restore accountdb constructors under test configuration

* use provided state root in spec, if it exists
---
 ethcore/src/account_db.rs       |   4 +-
 ethcore/src/client/client.rs    |   3 +-
 ethcore/src/ethereum/mod.rs     |   1 +
 ethcore/src/json_tests/chain.rs |   2 +-
 ethcore/src/pod_account.rs      |   3 +-
 ethcore/src/spec/spec.rs        | 268 ++++++++++++++++++--------------
 ethcore/src/state/backend.rs    |  33 +++-
 ethcore/src/state_db.rs         |   3 +-
 rpc/src/v1/tests/eth.rs         |   2 +-
 9 files changed, 196 insertions(+), 123 deletions(-)

diff --git a/ethcore/src/account_db.rs b/ethcore/src/account_db.rs
index 3db3e3c81..34dcb9760 100644
--- a/ethcore/src/account_db.rs
+++ b/ethcore/src/account_db.rs
@@ -78,6 +78,7 @@ pub struct AccountDB<'db> {
 
 impl<'db> AccountDB<'db> {
 	/// Create a new AccountDB from an address.
+	#[cfg(test)]
 	pub fn new(db: &'db HashDB, address: &Address) -> Self {
 		Self::from_hash(db, address.sha3())
 	}
@@ -131,6 +132,7 @@ pub struct AccountDBMut<'db> {
 
 impl<'db> AccountDBMut<'db> {
 	/// Create a new AccountDB from an address.
+	#[cfg(test)]
 	pub fn new(db: &'db mut HashDB, address: &Address) -> Self {
 		Self::from_hash(db, address.sha3())
 	}
@@ -143,7 +145,7 @@ impl<'db> AccountDBMut<'db> {
 		}
 	}
 
-	#[allow(dead_code)]
+	#[cfg(test)]
 	pub fn immutable(&'db self) -> AccountDB<'db> {
 		AccountDB { db: self.db, address_hash: self.address_hash.clone() }
 	}
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 91719ccca..b80d68317 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -166,8 +166,7 @@ impl Client {
 		db: Arc<KeyValueDB>,
 		miner: Arc<Miner>,
 		message_channel: IoChannel<ClientIoMessage>,
-	) -> Result<Arc<Client>, ClientError> {
-
+	) -> Result<Arc<Client>, ::error::Error> {
 		let trie_spec = match config.fat_db {
 			true => TrieSpec::Fat,
 			false => TrieSpec::Secure,
diff --git a/ethcore/src/ethereum/mod.rs b/ethcore/src/ethereum/mod.rs
index b54401572..af0582a36 100644
--- a/ethcore/src/ethereum/mod.rs
+++ b/ethcore/src/ethereum/mod.rs
@@ -95,6 +95,7 @@ mod tests {
 		let engine = &spec.engine;
 		let genesis_header = spec.genesis_header();
 		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
+
 		let s = State::from_existing(db, genesis_header.state_root().clone(), engine.account_start_nonce(), Default::default()).unwrap();
 		assert_eq!(s.balance(&"0000000000000000000000000000000000000001".into()).unwrap(), 1u64.into());
 		assert_eq!(s.balance(&"0000000000000000000000000000000000000002".into()).unwrap(), 1u64.into());
diff --git a/ethcore/src/json_tests/chain.rs b/ethcore/src/json_tests/chain.rs
index 45a4f1d52..ccdd7d499 100644
--- a/ethcore/src/json_tests/chain.rs
+++ b/ethcore/src/json_tests/chain.rs
@@ -51,7 +51,7 @@ pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec<String> {
 					ChainEra::_Eip161 => ethereum::new_eip161_test(),
 					ChainEra::TransitionTest => ethereum::new_transition_test(),
 				};
-				spec.set_genesis_state(state);
+				spec.set_genesis_state(state).expect("Failed to overwrite genesis state");
 				spec.overwrite_genesis_params(genesis);
 				assert!(spec.is_state_root_valid());
 				spec
diff --git a/ethcore/src/pod_account.rs b/ethcore/src/pod_account.rs
index 4b5dc8921..984f37bd8 100644
--- a/ethcore/src/pod_account.rs
+++ b/ethcore/src/pod_account.rs
@@ -16,7 +16,6 @@
 
 use util::*;
 use state::Account;
-use account_db::AccountDBMut;
 use ethjson;
 use types::account_diff::*;
 use rlp::{self, RlpStream};
@@ -64,7 +63,7 @@ impl PodAccount {
 	}
 
 	/// Place additional data into given hash DB.
-	pub fn insert_additional(&self, db: &mut AccountDBMut, factory: &TrieFactory) {
+	pub fn insert_additional(&self, db: &mut HashDB, factory: &TrieFactory) {
 		match self.code {
 			Some(ref c) if !c.is_empty() => { db.insert(c); }
 			_ => {}
diff --git a/ethcore/src/spec/spec.rs b/ethcore/src/spec/spec.rs
index c258d89cb..efbfc435d 100644
--- a/ethcore/src/spec/spec.rs
+++ b/ethcore/src/spec/spec.rs
@@ -16,25 +16,27 @@
 
 //! Parameters for a block chain.
 
-use util::*;
-use builtin::Builtin;
-use engines::{Engine, NullEngine, InstantSeal, BasicAuthority, AuthorityRound, Tendermint};
-use factory::Factories;
-use executive::Executive;
-use trace::{NoopTracer, NoopVMTracer};
-use action_params::{ActionValue, ActionParams};
-use types::executed::CallType;
-use state::{Backend, State, Substate};
-use env_info::EnvInfo;
-use pod_state::*;
-use account_db::*;
-use header::{BlockNumber, Header};
-use state_db::StateDB;
 use super::genesis::Genesis;
 use super::seal::Generic as GenericSeal;
+
+use action_params::{ActionValue, ActionParams};
+use builtin::Builtin;
+use engines::{Engine, NullEngine, InstantSeal, BasicAuthority, AuthorityRound, Tendermint};
+use env_info::EnvInfo;
+use error::Error;
 use ethereum;
 use ethjson;
+use executive::Executive;
+use factory::Factories;
+use header::{BlockNumber, Header};
+use pod_state::*;
 use rlp::{Rlp, RlpStream};
+use state_db::StateDB;
+use state::{Backend, State, Substate};
+use state::backend::Basic as BasicBackend;
+use trace::{NoopTracer, NoopVMTracer};
+use types::executed::CallType;
+use util::*;
 
 /// Parameters common to all engines.
 #[derive(Debug, PartialEq, Clone, Default)]
@@ -119,39 +121,46 @@ pub struct Spec {
 	constructors: Vec<(Address, Bytes)>,
 
 	/// May be prepopulated if we know this in advance.
-	state_root_memo: RwLock<Option<H256>>,
+	state_root_memo: RwLock<H256>,
 
 	/// Genesis state as plain old data.
 	genesis_state: PodState,
 }
 
-impl From<ethjson::spec::Spec> for Spec {
-	fn from(s: ethjson::spec::Spec) -> Self {
-		let builtins = s.accounts.builtins().into_iter().map(|p| (p.0.into(), From::from(p.1))).collect();
-		let g = Genesis::from(s.genesis);
-		let GenericSeal(seal_rlp) = g.seal.into();
-		let params = CommonParams::from(s.params);
-		Spec {
-			name: s.name.clone().into(),
-			params: params.clone(),
-			engine: Spec::engine(s.engine, params, builtins),
-			data_dir: s.data_dir.unwrap_or(s.name).into(),
-			nodes: s.nodes.unwrap_or_else(Vec::new),
-			parent_hash: g.parent_hash,
-			transactions_root: g.transactions_root,
-			receipts_root: g.receipts_root,
-			author: g.author,
-			difficulty: g.difficulty,
-			gas_limit: g.gas_limit,
-			gas_used: g.gas_used,
-			timestamp: g.timestamp,
-			extra_data: g.extra_data,
-			seal_rlp: seal_rlp,
-			constructors: s.accounts.constructors().into_iter().map(|(a, c)| (a.into(), c.into())).collect(),
-			state_root_memo: RwLock::new(g.state_root),
-			genesis_state: From::from(s.accounts),
-		}
+fn load_from(s: ethjson::spec::Spec) -> Result<Spec, Error> {
+	let builtins = s.accounts.builtins().into_iter().map(|p| (p.0.into(), From::from(p.1))).collect();
+	let g = Genesis::from(s.genesis);
+	let GenericSeal(seal_rlp) = g.seal.into();
+	let params = CommonParams::from(s.params);
+
+	let mut s = Spec {
+		name: s.name.clone().into(),
+		params: params.clone(),
+		engine: Spec::engine(s.engine, params, builtins),
+		data_dir: s.data_dir.unwrap_or(s.name).into(),
+		nodes: s.nodes.unwrap_or_else(Vec::new),
+		parent_hash: g.parent_hash,
+		transactions_root: g.transactions_root,
+		receipts_root: g.receipts_root,
+		author: g.author,
+		difficulty: g.difficulty,
+		gas_limit: g.gas_limit,
+		gas_used: g.gas_used,
+		timestamp: g.timestamp,
+		extra_data: g.extra_data,
+		seal_rlp: seal_rlp,
+		constructors: s.accounts.constructors().into_iter().map(|(a, c)| (a.into(), c.into())).collect(),
+		state_root_memo: RwLock::new(Default::default()), // will be overwritten right after.
+		genesis_state: s.accounts.into(),
+	};
+
+	// use memoized state root if provided.
+	match g.state_root {
+		Some(root) => *s.state_root_memo.get_mut() = root,
+		None => { let _ = s.run_constructors(&Default::default(), BasicBackend(MemoryDB::new()))?; },
 	}
+
+	Ok(s)
 }
 
 macro_rules! load_bundled {
@@ -174,13 +183,93 @@ impl Spec {
 		}
 	}
 
+	// given a pre-constructor state, run all the given constructors and produce a new state and state root.
+	fn run_constructors<T: Backend>(&self, factories: &Factories, mut db: T) -> Result<T, Error> {
+		let mut root = SHA3_NULL_RLP;
+
+		// basic accounts in spec.
+		{
+			let mut t = factories.trie.create(db.as_hashdb_mut(), &mut root);
+
+			for (address, account) in self.genesis_state.get().iter() {
+				t.insert(&**address, &account.rlp())?;
+			}
+		}
+
+		for (address, account) in self.genesis_state.get().iter() {
+			db.note_non_null_account(address);
+			account.insert_additional(
+				&mut *factories.accountdb.create(db.as_hashdb_mut(), address.sha3()),
+				&factories.trie
+			);
+		}
+
+		let start_nonce = self.engine.account_start_nonce();
+
+		let (root, db) = {
+			let mut state = State::from_existing(
+				db,
+				root,
+				start_nonce,
+				factories.clone(),
+			)?;
+
+			// Execute contract constructors.
+			let env_info = EnvInfo {
+				number: 0,
+				author: self.author,
+				timestamp: self.timestamp,
+				difficulty: self.difficulty,
+				last_hashes: Default::default(),
+				gas_used: U256::zero(),
+				gas_limit: U256::max_value(),
+			};
+
+			let from = Address::default();
+			for &(ref address, ref constructor) in self.constructors.iter() {
+				trace!(target: "spec", "run_constructors: Creating a contract at {}.", address);
+				trace!(target: "spec", "  .. root before = {}", state.root());
+				let params = ActionParams {
+					code_address: address.clone(),
+					code_hash: constructor.sha3(),
+					address: address.clone(),
+					sender: from.clone(),
+					origin: from.clone(),
+					gas: U256::max_value(),
+					gas_price: Default::default(),
+					value: ActionValue::Transfer(Default::default()),
+					code: Some(Arc::new(constructor.clone())),
+					data: None,
+					call_type: CallType::None,
+				};
+
+				let mut substate = Substate::new();
+				state.kill_account(&address);
+
+				{
+					let mut exec = Executive::new(&mut state, &env_info, self.engine.as_ref(), &factories.vm);
+					if let Err(e) = exec.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer) {
+						warn!(target: "spec", "Genesis constructor execution at {} failed: {}.", address, e);
+					}
+				}
+
+				if let Err(e) = state.commit() {
+					warn!(target: "spec", "Genesis constructor trie commit at {} failed: {}.", address, e);
+				}
+
+				trace!(target: "spec", "  .. root after = {}", state.root());
+			}
+
+			state.drop()
+		};
+
+		*self.state_root_memo.write() = root;
+		Ok(db)
+	}
+
 	/// Return the state root for the genesis state, memoising accordingly.
 	pub fn state_root(&self) -> H256 {
-		if self.state_root_memo.read().is_none() {
-			*self.state_root_memo.write() = Some(self.genesis_state.root());
-		}
-		self.state_root_memo.read().as_ref().cloned()
-			.expect("state root memo ensured to be set at this point; qed")
+		self.state_root_memo.read().clone()
 	}
 
 	/// Get the known knodes of the network in enode format.
@@ -243,95 +332,46 @@ impl Spec {
 		self.timestamp = g.timestamp;
 		self.extra_data = g.extra_data;
 		self.seal_rlp = seal_rlp;
-		self.state_root_memo = RwLock::new(g.state_root);
 	}
 
 	/// Alter the value of the genesis state.
-	pub fn set_genesis_state(&mut self, s: PodState) {
+	pub fn set_genesis_state(&mut self, s: PodState) -> Result<(), Error> {
 		self.genesis_state = s;
-		*self.state_root_memo.write() = None;
+		let _ = self.run_constructors(&Default::default(), BasicBackend(MemoryDB::new()))?;
+
+		Ok(())
 	}
 
 	/// Returns `false` if the memoized state root is invalid. `true` otherwise.
 	pub fn is_state_root_valid(&self) -> bool {
-		self.state_root_memo.read().clone().map_or(true, |sr| sr == self.genesis_state.root())
+		// TODO: get rid of this function and ensure state root always is valid.
+		// we're mostly there, but `self.genesis_state.root()` doesn't encompass
+		// post-constructor state.
+		*self.state_root_memo.read() == self.genesis_state.root()
 	}
 
 	/// Ensure that the given state DB has the trie nodes in for the genesis state.
-	pub fn ensure_db_good(&self, mut db: StateDB, factories: &Factories) -> Result<StateDB, Box<TrieError>> {
+	pub fn ensure_db_good(&self, db: StateDB, factories: &Factories) -> Result<StateDB, Error> {
 		if db.as_hashdb().contains(&self.state_root()) {
 			return Ok(db)
 		}
-		trace!(target: "spec", "ensure_db_good: Fresh database? Cannot find state root {}", self.state_root());
-		let mut root = H256::new();
 
-		{
-			let mut t = factories.trie.create(db.as_hashdb_mut(), &mut root);
-			for (address, account) in self.genesis_state.get().iter() {
-				t.insert(&**address, &account.rlp())?;
-			}
-		}
+		// TODO: could optimize so we don't re-run, but `ensure_db_good` is barely ever
+		// called anyway.
+		let db = self.run_constructors(factories, db)?;
 
-		trace!(target: "spec", "ensure_db_good: Populated sec trie; root is {}", root);
-		for (address, account) in self.genesis_state.get().iter() {
-			db.note_non_null_account(address);
-			account.insert_additional(&mut AccountDBMut::new(db.as_hashdb_mut(), address), &factories.trie);
-		}
-
-		// Execute contract constructors.
-		let env_info = EnvInfo {
-			number: 0,
-			author: self.author,
-			timestamp: self.timestamp,
-			difficulty: self.difficulty,
-			last_hashes: Default::default(),
-			gas_used: U256::zero(),
-			gas_limit: U256::max_value(),
-		};
-		let from = Address::default();
-		let start_nonce = self.engine.account_start_nonce();
-
-		let mut state = State::from_existing(db, root, start_nonce, factories.clone())?;
-		// Mutate the state with each constructor.
-		for &(ref address, ref constructor) in self.constructors.iter() {
-			trace!(target: "spec", "ensure_db_good: Creating a contract at {}.", address);
-			let params = ActionParams {
-				code_address: address.clone(),
-				code_hash: constructor.sha3(),
-				address: address.clone(),
-				sender: from.clone(),
-				origin: from.clone(),
-				gas: U256::max_value(),
-				gas_price: Default::default(),
-				value: ActionValue::Transfer(Default::default()),
-				code: Some(Arc::new(constructor.clone())),
-				data: None,
-				call_type: CallType::None,
-			};
-			let mut substate = Substate::new();
-			state.kill_account(address);
-			{
-				let mut exec = Executive::new(&mut state, &env_info, self.engine.as_ref(), &factories.vm);
-				if let Err(e) = exec.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer) {
-					warn!(target: "spec", "Genesis constructor execution at {} failed: {}.", address, e);
-				}
-			}
-			if let Err(e) = state.commit() {
-				warn!(target: "spec", "Genesis constructor trie commit at {} failed: {}.", address, e);
-			}
-		}
-		let (root, db) = state.drop();
-
-		*self.state_root_memo.write() = Some(root);
 		Ok(db)
 	}
 
-	/// Loads spec from json file.
+	/// Loads spec from json file. Provide factories for executing contracts and ensuring
+	/// storage goes to the right place.
 	pub fn load<R>(reader: R) -> Result<Self, String> where R: Read {
-		match ethjson::spec::Spec::load(reader) {
-			Ok(spec) => Ok(spec.into()),
-			Err(e) => Err(format!("Spec json is invalid: {}", e)),
+		fn fmt<F: ::std::fmt::Display>(f: F) -> String {
+			format!("Spec json is invalid: {}", f)
 		}
+
+		ethjson::spec::Spec::load(reader).map_err(fmt)
+			.and_then(|x| load_from(x).map_err(fmt))
 	}
 
 	/// Create a new Spec which conforms to the Frontier-era Morden chain except that it's a NullEngine consensus.
diff --git a/ethcore/src/state/backend.rs b/ethcore/src/state/backend.rs
index 5ab620b0e..ea172b5af 100644
--- a/ethcore/src/state/backend.rs
+++ b/ethcore/src/state/backend.rs
@@ -206,7 +206,8 @@ impl<H: AsHashDB> Proving<H> {
 		}
 	}
 
-	/// Consume the backend, extracting the gathered proof.
+	/// Consume the backend, extracting the gathered proof in lexicographical order
+	/// by value.
 	pub fn extract_proof(self) -> Vec<DBValue> {
 		self.proof.into_inner().into_iter().collect()
 	}
@@ -221,3 +222,33 @@ impl<H: AsHashDB + Clone> Clone for Proving<H> {
 		}
 	}
 }
+
+/// A basic backend. Just wraps the given database, directly inserting into and deleting from
+/// it. Doesn't cache anything.
+pub struct Basic<H>(pub H);
+
+impl<H: AsHashDB + Send + Sync> Backend for Basic<H> {
+	fn as_hashdb(&self) -> &HashDB {
+		self.0.as_hashdb()
+	}
+
+	fn as_hashdb_mut(&mut self) -> &mut HashDB {
+		self.0.as_hashdb_mut()
+	}
+
+	fn add_to_account_cache(&mut self, _: Address, _: Option<Account>, _: bool) { }
+
+	fn cache_code(&self, _: H256, _: Arc<Vec<u8>>) { }
+
+	fn get_cached_account(&self, _: &Address) -> Option<Option<Account>> { None }
+
+	fn get_cached<F, U>(&self, _: &Address, _: F) -> Option<U>
+		where F: FnOnce(Option<&mut Account>) -> U
+	{
+		None
+	}
+
+	fn get_cached_code(&self, _: &H256) -> Option<Arc<Vec<u8>>> { None }
+	fn note_non_null_account(&self, _: &Address) { }
+	fn is_known_null(&self, _: &Address) -> bool { false }
+}
diff --git a/ethcore/src/state_db.rs b/ethcore/src/state_db.rs
index 6bf8bbd8e..a5823f50b 100644
--- a/ethcore/src/state_db.rs
+++ b/ethcore/src/state_db.rs
@@ -448,7 +448,8 @@ impl state::Backend for StateDB {
 	fn is_known_null(&self, address: &Address) -> bool {
 		trace!(target: "account_bloom", "Check account bloom: {:?}", address);
 		let bloom = self.account_bloom.lock();
-		!bloom.check(&*address.sha3())
+		let is_null = !bloom.check(&*address.sha3());
+		is_null
 	}
 }
 
diff --git a/rpc/src/v1/tests/eth.rs b/rpc/src/v1/tests/eth.rs
index e0df518f7..c2093a51b 100644
--- a/rpc/src/v1/tests/eth.rs
+++ b/rpc/src/v1/tests/eth.rs
@@ -83,7 +83,7 @@ fn make_spec(chain: &BlockChain) -> Spec {
 	let genesis = Genesis::from(chain.genesis());
 	let mut spec = ethereum::new_frontier_test();
 	let state = chain.pre_state.clone().into();
-	spec.set_genesis_state(state);
+	spec.set_genesis_state(state).expect("unable to set genesis state");
 	spec.overwrite_genesis_params(genesis);
 	assert!(spec.is_state_root_valid());
 	spec

From a3d9cce7c50ad831cb24581bb79daf794a14dad7 Mon Sep 17 00:00:00 2001
From: keorn <pczaban@gmail.com>
Date: Wed, 3 May 2017 09:01:24 +0200
Subject: [PATCH 089/117] Pass additional data when reporting (#5527)

* pass additional data when reporting

* checkout correct tests
---
 ethcore/native_contracts/build.rs             |  2 +-
 ethcore/res/validator_contract.json           |  2 +-
 ethcore/src/engines/authority_round.rs        |  4 +-
 ethcore/src/engines/tendermint/mod.rs         | 11 ++---
 ethcore/src/engines/validator_set/contract.rs | 10 ++---
 ethcore/src/engines/validator_set/mod.rs      |  8 ++--
 ethcore/src/engines/validator_set/multi.rs    | 14 +++---
 ethcore/src/engines/vote_collector.rs         | 45 +++++++++++++------
 8 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/ethcore/native_contracts/build.rs b/ethcore/native_contracts/build.rs
index 7da55a977..9c6fb85c4 100644
--- a/ethcore/native_contracts/build.rs
+++ b/ethcore/native_contracts/build.rs
@@ -31,7 +31,7 @@ const SECRETSTORE_ACL_STORAGE_ABI: &'static str = r#"[{"constant":true,"inputs":
 // changes.
 const VALIDATOR_SET_ABI: &'static str = r#"[{"constant":true,"inputs":[],"name":"transitionNonce","outputs":[{"name":"nonce","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getValidators","outputs":[{"name":"validators","type":"address[]"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"_parent_hash","type":"bytes32"},{"indexed":true,"name":"_nonce","type":"uint256"},{"indexed":false,"name":"_new_set","type":"address[]"}],"name":"ValidatorsChanged","type":"event"}]"#;
 
-const VALIDATOR_REPORT_ABI: &'static str = r#"[{"constant":false,"inputs":[{"name":"validator","type":"address"}],"name":"reportMalicious","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"validator","type":"address"}],"name":"reportBenign","outputs":[],"payable":false,"type":"function"}]"#;
+const VALIDATOR_REPORT_ABI: &'static str = r#"[{"constant":false,"inputs":[{"name":"validator","type":"address"},{"name":"blockNumber","type":"uint256"},{"name":"proof","type":"bytes"}],"name":"reportMalicious","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"validator","type":"address"},{"name":"blockNumber","type":"uint256"}],"name":"reportBenign","outputs":[],"payable":false,"type":"function"}]"#;
 
 fn build_file(name: &str, abi: &str, filename: &str) {
 	let code = ::native_contract_generator::generate_module(name, abi).unwrap();
diff --git a/ethcore/res/validator_contract.json b/ethcore/res/validator_contract.json
index 6c2f87758..4ef27e30e 100644
--- a/ethcore/res/validator_contract.json
+++ b/ethcore/res/validator_contract.json
@@ -36,7 +36,7 @@
 		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"0000000000000000000000000000000000000005": {
 			"balance": "1",
-			"constructor": "6060604052604060405190810160405280737d577a597b2742b498cb5cf0c26cdcd726d39e6e73ffffffffffffffffffffffffffffffffffffffff1681526020017382a978b3f5962a5b0957d9ee9eef472ee55b42f173ffffffffffffffffffffffffffffffffffffffff1681525060009060028280548282559060005260206000209081019282156100ec579160200282015b828111156100eb5782518260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555091602001919060010190610093565b5b50905061012f91905b8082111561012b57600081816101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055506001016100f5565b5090565b505034610000575b6000600090505b6000805490508110156101d5578060016000600084815481101561000057906000526020600020900160005b9054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055505b808060010191505061013e565b5b505b6105f2806101e76000396000f30060606040523615610076576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806335aa2e441461007b5780634d238c8e146100d8578063b7ab4db51461010b578063bfc708a01461017d578063d8f2e0bf146101b0578063fd6e1b50146101ff575b610000565b34610000576100966004808035906020019091905050610232565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3461000057610109600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190505061026f565b005b346100005761011861030f565b604051808060200182810382528381815181526020019150805190602001906020028083836000831461016a575b80518252602083111561016a57602082019150602081019050602083039250610146565b5050509050019250505060405180910390f35b34610000576101ae600480803573ffffffffffffffffffffffffffffffffffffffff169060200190919050506103ad565b005b34610000576101bd61055b565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3461000057610230600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610581565b005b600081815481101561000057906000526020600020900160005b915054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600080548060010182818154818355818115116102b8578183600052602060002091820191016102b791905b808211156102b357600081600090555060010161029b565b5090565b5b505050916000526020600020900160005b83909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505b50565b602060405190810160405280600081525060008054806020026020016040519081016040528092919081815260200182805480156103a257602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311610358575b505050505090505b90565b6000600160008054905003815481101561000057906000526020600020900160005b9054906101000a900473ffffffffffffffffffffffffffffffffffffffff166000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054815481101561000057906000526020600020900160005b6101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600090556000600160008054905003815481101561000057906000526020600020900160005b6101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905560008054809190600190038154818355818115116105535781836000526020600020918201910161055291905b8082111561054e576000816000905550600101610536565b5090565b5b505050505b50565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b80600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b505600a165627a7a7230582063a0123d8e8f5dde980af6b47e20acc5b7a1acac3e3101fa1c933471ef4b405c0029"
+			"constructor": "60a06040819052737d577a597b2742b498cb5cf0c26cdcd726d39e6e60609081527382a978b3f5962a5b0957d9ee9eef472ee55b42f1608052600080546002825581805290927f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e5639182019291905b828111156100a25782518254600160a060020a031916600160a060020a0390911617825560209092019160019091019061006d565b5b506100cd9291505b808211156100c9578054600160a060020a03191681556001016100ab565b5090565b505034610000575b60005b60005481101561012f578060016000600084815481101561000057906000526020600020900160005b9054600160a060020a036101009290920a90041681526020810191909152604001600020555b6001016100d8565b5b505b610453806101416000396000f3006060604052361561005c5763ffffffff60e060020a60003504166335aa2e4481146100615780634d238c8e1461008d578063b7ab4db5146100a8578063c476dd4014610110578063d69f13bb14610172578063d8f2e0bf14610190575b610000565b34610000576100716004356101b9565b60408051600160a060020a039092168252519081900360200190f35b34610000576100a6600160a060020a03600435166101e9565b005b34610000576100b5610260565b60408051602080825283518183015283519192839290830191858101910280838382156100fd575b8051825260208311156100fd57601f1990920191602091820191016100dd565b5050509050019250505060405180910390f35b3461000057604080516020600460443581810135601f81018490048402850184019095528484526100a6948235600160a060020a03169460248035956064949293919092019181908401838280828437509496506102ca95505050505050565b005b34610000576100a6600160a060020a03600435166024356103eb565b005b3461000057610071610418565b60408051600160a060020a039092168252519081900360200190f35b600081815481101561000057906000526020600020900160005b915054906101000a9004600160a060020a031681565b6000805480600101828181548183558181151161022b5760008381526020902061022b9181019083015b808211156102275760008155600101610213565b5090565b5b505050916000526020600020900160005b8154600160a060020a038086166101009390930a92830292021916179055505b50565b60408051602081810183526000808352805484518184028101840190955280855292939290918301828280156102bf57602002820191906000526020600020905b8154600160a060020a031681526001909101906020018083116102a1575b505050505090505b90565b6000805460001981019081101561000057906000526020600020900160005b9054906101000a9004600160a060020a031660006001600086600160a060020a0316600160a060020a0316815260200190815260200160002054815481101561000057906000526020600020900160005b8154600160a060020a039384166101009290920a918202918402191617905583166000908152600160205260408120819055805460001981019081101561000057906000526020600020900160005b6101000a815490600160a060020a03021916905560008054809190600190038154818355818115116103e0576000838152602090206103e09181019083015b808211156102275760008155600101610213565b5090565b5b505050505b505050565b6002805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384161790555b5050565b600254600160a060020a0316815600a165627a7a72305820f7876e17abd5f0927fff16788b4b3c9028ed64e6db740d788b07fc5f0a8f10920029"
 		},
 		"0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { "balance": "1606938044258990275541962092341162602522202993782792835301376" },
 		"0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { "balance": "1606938044258990275541962092341162602522202993782792835301376" }
diff --git a/ethcore/src/engines/authority_round.rs b/ethcore/src/engines/authority_round.rs
index 937d6ccc4..d2ae144d5 100644
--- a/ethcore/src/engines/authority_round.rs
+++ b/ethcore/src/engines/authority_round.rs
@@ -160,7 +160,7 @@ fn verify_external(header: &Header, validators: &ValidatorSet, step: &Step) -> R
 	// Give one step slack if step is lagging, double vote is still not possible.
 	if step.is_future(header_step) {
 		trace!(target: "engine", "verify_block_unordered: block from the future");
-		validators.report_benign(header.author());
+		validators.report_benign(header.author(), header.number());
 		Err(BlockError::InvalidSeal)?
 	} else {
 		let proposer_signature = header_signature(header)?;
@@ -381,7 +381,7 @@ impl Engine for AuthorityRound {
 		let parent_step = header_step(parent)?;
 		if step <= parent_step {
 			trace!(target: "engine", "Multiple blocks proposed for step {}.", parent_step);
-			self.validators.report_malicious(header.author());
+			self.validators.report_malicious(header.author(), header.number(), Default::default());
 			Err(EngineError::DoubleVote(header.author().clone()))?;
 		}
 
diff --git a/ethcore/src/engines/tendermint/mod.rs b/ethcore/src/engines/tendermint/mod.rs
index 65e11d19e..137f70a7a 100644
--- a/ethcore/src/engines/tendermint/mod.rs
+++ b/ethcore/src/engines/tendermint/mod.rs
@@ -471,8 +471,8 @@ impl Engine for Tendermint {
 				return Err(EngineError::NotAuthorized(sender).into());
 			}
 			self.broadcast_message(rlp.as_raw().to_vec());
-			if self.votes.vote(message.clone(), &sender).is_some() {
-				self.validators.report_malicious(&sender);
+			if let Some(double) = self.votes.vote(message.clone(), &sender) {
+				self.validators.report_malicious(&sender, message.vote_step.height as BlockNumber, ::rlp::encode(&double).to_vec());
 				return Err(EngineError::DoubleVote(sender).into());
 			}
 			trace!(target: "engine", "Handling a valid {:?} from {}.", message, sender);
@@ -560,7 +560,7 @@ impl Engine for Tendermint {
 		let min_gas = parent.gas_limit().clone() - parent.gas_limit().clone() / gas_limit_divisor;
 		let max_gas = parent.gas_limit().clone() + parent.gas_limit().clone() / gas_limit_divisor;
 		if header.gas_limit() <= &min_gas || header.gas_limit() >= &max_gas {
-			self.validators.report_malicious(header.author());
+			self.validators.report_malicious(header.author(), header.number(), Default::default());
 			return Err(BlockError::InvalidGasLimit(OutOfBounds { min: Some(min_gas), max: Some(max_gas), found: header.gas_limit().clone() }).into());
 		}
 
@@ -610,8 +610,9 @@ impl Engine for Tendermint {
 				trace!(target: "engine", "Propose timeout.");
 				if self.proposal.read().is_none() {
 					// Report the proposer if no proposal was received.
-					let current_proposer = self.view_proposer(&*self.proposal_parent.read(), self.height.load(AtomicOrdering::SeqCst), self.view.load(AtomicOrdering::SeqCst));
-					self.validators.report_benign(&current_proposer);
+					let height = self.height.load(AtomicOrdering::SeqCst);
+					let current_proposer = self.view_proposer(&*self.proposal_parent.read(), height, self.view.load(AtomicOrdering::SeqCst));
+					self.validators.report_benign(&current_proposer, height as BlockNumber);
 				}
 				Step::Prevote
 			},
diff --git a/ethcore/src/engines/validator_set/contract.rs b/ethcore/src/engines/validator_set/contract.rs
index 22506c348..dd4623023 100644
--- a/ethcore/src/engines/validator_set/contract.rs
+++ b/ethcore/src/engines/validator_set/contract.rs
@@ -25,7 +25,7 @@ use native_contracts::ValidatorReport as Provider;
 
 use client::{Client, BlockChainClient};
 use engines::Call;
-use header::Header;
+use header::{Header, BlockNumber};
 
 use super::ValidatorSet;
 use super::safe_contract::ValidatorSafeContract;
@@ -92,15 +92,15 @@ impl ValidatorSet for ValidatorContract {
 		self.validators.count_with_caller(bh, caller)
 	}
 
-	fn report_malicious(&self, address: &Address) {
-		match self.provider.report_malicious(&*self.transact(), *address).wait() {
+	fn report_malicious(&self, address: &Address, block: BlockNumber, proof: Bytes) {
+		match self.provider.report_malicious(&*self.transact(), *address, block.into(), proof).wait() {
 			Ok(_) => warn!(target: "engine", "Reported malicious validator {}", address),
 			Err(s) => warn!(target: "engine", "Validator {} could not be reported {}", address, s),
 		}
 	}
 
-	fn report_benign(&self, address: &Address) {
-		match self.provider.report_benign(&*self.transact(), *address).wait() {
+	fn report_benign(&self, address: &Address, block: BlockNumber) {
+		match self.provider.report_benign(&*self.transact(), *address, block.into()).wait() {
 			Ok(_) => warn!(target: "engine", "Reported benign validator misbehaviour {}", address),
 			Err(s) => warn!(target: "engine", "Validator {} could not be reported {}", address, s),
 		}
diff --git a/ethcore/src/engines/validator_set/mod.rs b/ethcore/src/engines/validator_set/mod.rs
index a7e0f196f..f0765db5d 100644
--- a/ethcore/src/engines/validator_set/mod.rs
+++ b/ethcore/src/engines/validator_set/mod.rs
@@ -23,10 +23,10 @@ mod multi;
 
 use std::sync::Weak;
 use ids::BlockId;
-use util::{Address, H256};
+use util::{Bytes, Address, H256};
 use ethjson::spec::ValidatorSet as ValidatorSpec;
 use client::Client;
-use header::Header;
+use header::{Header, BlockNumber};
 
 pub use self::simple_list::SimpleList;
 use self::contract::ValidatorContract;
@@ -111,9 +111,9 @@ pub trait ValidatorSet: Send + Sync {
 	fn count_with_caller(&self, parent_block_hash: &H256, caller: &Call) -> usize;
 
 	/// Notifies about malicious behaviour.
-	fn report_malicious(&self, _validator: &Address) {}
+	fn report_malicious(&self, _validator: &Address, _block: BlockNumber, _proof: Bytes) {}
 	/// Notifies about benign misbehaviour.
-	fn report_benign(&self, _validator: &Address) {}
+	fn report_benign(&self, _validator: &Address, _block: BlockNumber) {}
 	/// Allows blockchain state access.
 	fn register_contract(&self, _client: Weak<Client>) {}
 }
diff --git a/ethcore/src/engines/validator_set/multi.rs b/ethcore/src/engines/validator_set/multi.rs
index abb034698..df3659ac3 100644
--- a/ethcore/src/engines/validator_set/multi.rs
+++ b/ethcore/src/engines/validator_set/multi.rs
@@ -19,7 +19,7 @@
 use std::collections::BTreeMap;
 use std::sync::Weak;
 use engines::{Call, EpochChange};
-use util::{H256, Address, RwLock};
+use util::{Bytes, H256, Address, RwLock};
 use ids::BlockId;
 use header::{BlockNumber, Header};
 use client::{Client, BlockChainClient};
@@ -110,16 +110,12 @@ impl ValidatorSet for Multi {
 			.map_or_else(usize::max_value, |set| set.count_with_caller(bh, caller))
 	}
 
-	fn report_malicious(&self, validator: &Address) {
-		for set in self.sets.values() {
-			set.report_malicious(validator);
-		}
+	fn report_malicious(&self, validator: &Address, block: BlockNumber, proof: Bytes) {
+		self.correct_set_by_number(block).1.report_malicious(validator, block, proof);
 	}
 
-	fn report_benign(&self, validator: &Address) {
-		for set in self.sets.values() {
-			set.report_benign(validator);
-		}
+	fn report_benign(&self, validator: &Address, block: BlockNumber) {
+		self.correct_set_by_number(block).1.report_benign(validator, block);
 	}
 
 	fn register_contract(&self, client: Weak<Client>) {
diff --git a/ethcore/src/engines/vote_collector.rs b/ethcore/src/engines/vote_collector.rs
index 482dd1d4b..d01d07f15 100644
--- a/ethcore/src/engines/vote_collector.rs
+++ b/ethcore/src/engines/vote_collector.rs
@@ -18,7 +18,7 @@
 
 use std::fmt::Debug;
 use util::*;
-use rlp::Encodable;
+use rlp::{Encodable, RlpStream};
 
 pub trait Message: Clone + PartialEq + Eq + Hash + Encodable + Debug {
 	type Round: Clone + PartialEq + Eq + Hash + Default + Debug + Ord;
@@ -40,25 +40,44 @@ pub struct VoteCollector<M: Message> {
 
 #[derive(Debug, Default)]
 struct StepCollector<M: Message> {
-	voted: HashSet<Address>,
+	voted: HashMap<Address, M>,
 	pub block_votes: HashMap<Option<H256>, HashMap<H520, Address>>,
 	messages: HashSet<M>,
 }
 
+#[derive(Debug)]
+pub struct DoubleVote<'a, M: Message> {
+	pub author: &'a Address,
+	vote_one: M,
+	vote_two: M,
+}
+
+impl<'a, M: Message> Encodable for DoubleVote<'a, M> {
+	fn rlp_append(&self, s: &mut RlpStream) {
+		s.begin_list(2)
+			.append(&self.vote_one)
+			.append(&self.vote_two);
+	}
+}
+
 impl <M: Message> StepCollector<M> {
 	/// Returns Some(&Address) when validator is double voting.
-	fn insert<'a>(&mut self, message: M, address: &'a Address) -> Option<&'a Address> {
+	fn insert<'a>(&mut self, message: M, address: &'a Address) -> Option<DoubleVote<'a, M>> {
 		// Do nothing when message was seen.
 		if self.messages.insert(message.clone()) {
-			if self.voted.insert(address.clone()) {
+			if let Some(previous) = self.voted.insert(address.clone(), message.clone()) {
+				// Bad validator sent a different message.
+				return Some(DoubleVote {
+					author: address,
+					vote_one: previous,
+					vote_two: message
+				});
+			} else {
 				self
 					.block_votes
 					.entry(message.block_hash())
 					.or_insert_with(HashMap::new)
 					.insert(message.signature(), address.clone());
-			} else {
-				// Bad validator sent a different message.
-				return Some(address);
 			}
 		}
 		None
@@ -101,7 +120,7 @@ impl <M: Message + Default> Default for VoteCollector<M> {
 
 impl <M: Message + Default + Encodable + Debug> VoteCollector<M> {
 	/// Insert vote if it is newer than the oldest one.
-	pub fn vote<'a>(&self, message: M, voter: &'a Address) -> Option<&'a Address> {
+	pub fn vote<'a>(&self, message: M, voter: &'a Address) -> Option<DoubleVote<'a, M>> {
 		self
 			.votes
 			.write()
@@ -220,11 +239,11 @@ mod tests {
 	}
 
 	fn random_vote(collector: &VoteCollector<TestMessage>, signature: H520, step: TestStep, block_hash: Option<H256>) -> bool {
-		full_vote(collector, signature, step, block_hash, &H160::random()).is_none()
+		full_vote(collector, signature, step, block_hash, &H160::random())
 	}
 
-	fn full_vote<'a>(collector: &VoteCollector<TestMessage>, signature: H520, step: TestStep, block_hash: Option<H256>, address: &'a Address) -> Option<&'a Address> {
-		collector.vote(TestMessage { signature: signature, step: step, block_hash: block_hash }, address)
+	fn full_vote<'a>(collector: &VoteCollector<TestMessage>, signature: H520, step: TestStep, block_hash: Option<H256>, address: &'a Address) -> bool {
+		collector.vote(TestMessage { signature: signature, step: step, block_hash: block_hash }, address).is_none()
 	}
 
 	#[test]
@@ -319,9 +338,9 @@ mod tests {
 		let collector = VoteCollector::default();
 		let round = 3;
 		// Vote is inserted fine.
-		assert!(full_vote(&collector, H520::random(), round, Some("0".sha3()), &Address::default()).is_none());
+		assert!(full_vote(&collector, H520::random(), round, Some("0".sha3()), &Address::default()));
 		// Returns the double voting address.
-		full_vote(&collector, H520::random(), round, Some("1".sha3()), &Address::default()).unwrap();
+		assert!(!full_vote(&collector, H520::random(), round, Some("1".sha3()), &Address::default()));
 		assert_eq!(collector.count_round_votes(&round), 1);
 	}
 }

From 0658e42dadef0f5258f7b8717633811340cca3da Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Wed, 3 May 2017 13:50:08 +0300
Subject: [PATCH 090/117] fix nightly published

add `nightly` to S3_BUCKET=builds-parity-published
---
 .gitlab-ci.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6688d6f23..375735545 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ linux-stable:
     - md5sum "parity_"$VER"_amd64.deb" > "parity_"$VER"_amd64.deb.md5"
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity --body target/release/parity
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity.md5 --body parity.md5
@@ -107,7 +107,7 @@ linux-stable-debian:
     - md5sum "parity_"$VER"_amd64.deb" > "parity_"$VER"_amd64.deb.md5"
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/parity --body target/release/parity
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/parity.md5 --body parity.md5
@@ -180,7 +180,7 @@ linux-centos:
     - export SHA3=$(target/release/parity tools hash target/release/parity)
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity --body target/release/parity
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity.md5 --body parity.md5
@@ -217,7 +217,7 @@ linux-i686:
     - md5sum "parity_"$VER"_i386.deb" > "parity_"$VER"_i386.deb.md5"
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
@@ -263,7 +263,7 @@ linux-armv7:
     - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
@@ -309,7 +309,7 @@ linux-arm:
     - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
@@ -350,7 +350,7 @@ linux-armv6:
     - md5sum target/$PLATFORM/release/parity > parity.md5
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
@@ -394,7 +394,7 @@ linux-aarch64:
     - md5sum "parity_"$VER"_arm64.deb" > "parity_"$VER"_arm64.deb.md5"
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_arm64.deb" --body "parity_"$VER"_arm64.deb"
@@ -434,7 +434,7 @@ darwin:
       md5sum "parity-"$VER"-macos-installer.pkg" >> "parity-"$VER"-macos-installer.pkg.md5"
       aws configure set aws_access_key_id $s3_key
       aws configure set aws_secret_access_key $s3_secret
-      if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+      if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
       aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
       aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/release/parity
       aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
@@ -491,6 +491,7 @@ windows:
     - echo %CI_BUILD_REF_NAME% | findstr /R "master" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
     - echo %CI_BUILD_REF_NAME% | findstr /R "beta" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
     - echo %CI_BUILD_REF_NAME% | findstr /R "stable" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
+    - echo %CI_BUILD_REF_NAME% | findstr /R "nightly" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
     - echo %S3_BUCKET%
     - aws s3 rm --recursive s3://%S3_BUCKET%/%CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc
     - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe --body target\release\parity.exe

From 70e87677b36b8dcee9e9900575cc24283833631b Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Wed, 3 May 2017 14:12:06 +0200
Subject: [PATCH 091/117] Retrieve block headers only for header-only info
 (#5480)

* Add parity_getBlockHeaderByNumber

* Use parity_getBlockHeaderByNumber for retrieval
---
 js/src/api/rpc/parity/parity.js               | 12 ++--
 js/src/dapps/registry/Events/actions.js       |  2 +-
 js/src/dapps/signaturereg/services.js         |  2 +-
 .../dapps/tokendeploy/Deploy/Event/event.js   |  2 +-
 .../dapps/tokendeploy/Transfer/Event/event.js |  4 +-
 js/src/jsonrpc/interfaces/parity.js           | 13 ++++
 js/src/redux/providers/status.js              |  6 +-
 js/src/ui/TxList/store.js                     | 67 ++++++++++---------
 js/src/views/Contract/Events/Event/event.js   |  2 +-
 9 files changed, 65 insertions(+), 45 deletions(-)

diff --git a/js/src/api/rpc/parity/parity.js b/js/src/api/rpc/parity/parity.js
index 16b14eaef..53610545a 100644
--- a/js/src/api/rpc/parity/parity.js
+++ b/js/src/api/rpc/parity/parity.js
@@ -14,10 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import {
-  inAddress, inAddresses, inData, inHex, inNumber16, inOptions, inBlockNumber, inDeriveHash, inDeriveIndex
-} from '../../format/input';
-import { outAccountInfo, outAddress, outAddresses, outChainStatus, outHistogram, outHwAccountInfo, outNodeKind, outNumber, outPeers, outRecentDapps, outTransaction, outVaultMeta } from '../../format/output';
+import { inAddress, inAddresses, inBlockNumber, inData, inDeriveHash, inDeriveIndex, inHex, inNumber16, inOptions } from '../../format/input';
+import { outAccountInfo, outAddress, outAddresses, outBlock, outChainStatus, outHistogram, outHwAccountInfo, outNodeKind, outNumber, outPeers, outRecentDapps, outTransaction, outVaultMeta } from '../../format/output';
 
 export default class Parity {
   constructor (transport) {
@@ -189,6 +187,12 @@ export default class Parity {
       .execute('parity_generateSecretPhrase');
   }
 
+  getBlockHeaderByNumber (blockNumber = 'latest') {
+    return this._transport
+      .execute('parity_getBlockHeaderByNumber', inBlockNumber(blockNumber))
+      .then(outBlock);
+  }
+
   getDappAddresses (dappId) {
     return this._transport
       .execute('parity_getDappAddresses', dappId)
diff --git a/js/src/dapps/registry/Events/actions.js b/js/src/dapps/registry/Events/actions.js
index 2b15b0f13..e1f316718 100644
--- a/js/src/dapps/registry/Events/actions.js
+++ b/js/src/dapps/registry/Events/actions.js
@@ -43,7 +43,7 @@ export const subscribe = (name, from = 0, to = 'pending') =>
 
         events.forEach((e) => {
           Promise.all([
-            api.eth.getBlockByNumber(e.blockNumber),
+            api.parity.getBlockHeaderByNumber(e.blockNumber),
             api.eth.getTransactionByHash(e.transactionHash)
           ])
           .then(([block, tx]) => {
diff --git a/js/src/dapps/signaturereg/services.js b/js/src/dapps/signaturereg/services.js
index d9c60da6b..9c01e49fb 100644
--- a/js/src/dapps/signaturereg/services.js
+++ b/js/src/dapps/signaturereg/services.js
@@ -158,7 +158,7 @@ export function attachEvents (contract, callback) {
 }
 
 export function getBlock (blockNumber) {
-  return api.eth.getBlockByNumber(blockNumber);
+  return api.parity.getBlockHeaderByNumber(blockNumber);
 }
 
 export function callRegister (instance, id, options = {}) {
diff --git a/js/src/dapps/tokendeploy/Deploy/Event/event.js b/js/src/dapps/tokendeploy/Deploy/Event/event.js
index 4fa0726da..9503c67c2 100644
--- a/js/src/dapps/tokendeploy/Deploy/Event/event.js
+++ b/js/src/dapps/tokendeploy/Deploy/Event/event.js
@@ -94,7 +94,7 @@ export default class Event extends Component {
 
     Promise
       .all([
-        api.eth.getBlockByNumber(event.blockNumber),
+        api.parity.getBlockHeaderByNumber(event.blockNumber),
         getCoin(event.params.tokenreg, event.params.coin)
       ])
       .then(([block, coin]) => {
diff --git a/js/src/dapps/tokendeploy/Transfer/Event/event.js b/js/src/dapps/tokendeploy/Transfer/Event/event.js
index 623220baf..bc28bd8b1 100644
--- a/js/src/dapps/tokendeploy/Transfer/Event/event.js
+++ b/js/src/dapps/tokendeploy/Transfer/Event/event.js
@@ -97,8 +97,8 @@ export default class Event extends Component {
       return;
     }
 
-    api.eth
-      .getBlockByNumber(event.blockNumber)
+    api.parity
+      .getBlockHeaderByNumber(event.blockNumber)
       .then((block) => {
         this.setState({ block });
       });
diff --git a/js/src/jsonrpc/interfaces/parity.js b/js/src/jsonrpc/interfaces/parity.js
index 5d71c54df..797052037 100644
--- a/js/src/jsonrpc/interfaces/parity.js
+++ b/js/src/jsonrpc/interfaces/parity.js
@@ -296,6 +296,19 @@ export default {
     }
   },
 
+  getBlockHeaderByNumber: {
+    section: SECTION_NET,
+    desc: 'Returns block header information by number (same as eth_getBlockByNumber without transactions and uncles)',
+    params: [
+      {
+        type: BlockNumber,
+        desc: 'integer of a block number, or the string `\'earliest\'`, `\'latest\'` or `\'pending\'`, as in the [default block parameter](#the-default-block-parameter).',
+        example: fromDecimal(436)
+      }
+    ],
+    returns: 'See [eth_getBlockByHash](#eth_getblockbyhash) (without transactions and uncles)'
+  },
+
   getVaultMeta: {
     section: SECTION_VAULT,
     desc: 'Returns the metadata for a specific vault',
diff --git a/js/src/redux/providers/status.js b/js/src/redux/providers/status.js
index 19bec2c0a..e2e4b81de 100644
--- a/js/src/redux/providers/status.js
+++ b/js/src/redux/providers/status.js
@@ -134,8 +134,8 @@ export default class Status {
 
         this._store.dispatch(statusBlockNumber(blockNumber));
 
-        this._api.eth
-          .getBlockByNumber(blockNumber)
+        this._api.parity
+          .getBlockHeaderByNumber(blockNumber)
           .then((block) => {
             if (!block) {
               return;
@@ -147,7 +147,7 @@ export default class Status {
             }));
           })
           .catch((error) => {
-            console.warn('status._subscribeBlockNumber', 'getBlockByNumber', error);
+            console.warn('status._subscribeBlockNumber', 'getBlockHeaderByNumber', error);
           });
       })
       .then((blockNumberSubscriptionId) => {
diff --git a/js/src/ui/TxList/store.js b/js/src/ui/TxList/store.js
index 99a081d57..180882b2d 100644
--- a/js/src/ui/TxList/store.js
+++ b/js/src/ui/TxList/store.js
@@ -70,48 +70,52 @@ export default class Store {
   }
 
   loadTransactions (_txhashes) {
-    const { eth } = this._api;
-
     // Ignore special cases and if the contents of _txhashes && this.sortedHashes are the same
     if (Array.isArray(_txhashes) || this.sameHashList(_txhashes)) {
       return;
     }
 
     // Remove any tx that are edited/cancelled
-    this.sortedHashes
-      .forEach((hash) => {
-        if (!_txhashes.includes(hash)) {
-          this.removeHash(hash);
-        }
-      });
+    this.sortedHashes.forEach((hash) => {
+      if (!_txhashes.includes(hash)) {
+        this.removeHash(hash);
+      }
+    });
 
     // Add any new tx
-    _txhashes
-      .forEach((txhash) => {
-        if (this.sortedHashes.includes(txhash)) { return; }
-        eth.getTransactionByHash(txhash)
-          .then((tx) => {
-            if (!tx) { return; }
-            this.transactions[txhash] = tx;
-            // If the tx has a blockHash, let's get the blockNumber, otherwise it's ready to be added
-            if (tx.blockHash) {
-              eth.getBlockByNumber(tx.blockNumber)
-                .then((block) => {
-                  this.blocks[tx.blockNumber] = block;
-                  this.addHash(txhash);
-                });
-            } else {
-              this.addHash(txhash);
-            }
-          });
-      });
+    _txhashes.forEach((txhash) => {
+      if (this.sortedHashes.includes(txhash)) {
+        return;
+      }
+
+      this._api.eth
+        .getTransactionByHash(txhash)
+        .then((tx) => {
+          if (!tx) {
+            return;
+          }
+
+          this.transactions[txhash] = tx;
+
+          // If the tx has a blockHash, let's get the blockNumber, otherwise it's ready to be added
+          if (tx.blockHash) {
+            this._api.parity
+              .getBlockHeaderByNumber(tx.blockNumber)
+              .then((block) => {
+                this.blocks[tx.blockNumber] = block;
+                this.addHash(txhash);
+              });
+          } else {
+            this.addHash(txhash);
+          }
+        });
+    });
   }
 
   cancelTransaction = (txComponent, tx) => {
-    const { parity } = this._api;
     const { hash } = tx;
 
-    parity
+    this._api.parity
       .removeTransaction(hash)
       .then(() => {
         txComponent.setState({ canceled: true });
@@ -122,13 +126,12 @@ export default class Store {
   }
 
   editTransaction = (txComponent, tx) => {
-    const { parity } = this._api;
     const { hash, gas, gasPrice, to, from, value, input, condition } = tx;
 
-    parity
+    this._api.parity
       .removeTransaction(hash)
       .then(() => {
-        parity.postTransaction({
+        return this._api.parity.postTransaction({
           from,
           to,
           gas,
diff --git a/js/src/views/Contract/Events/Event/event.js b/js/src/views/Contract/Events/Event/event.js
index 3c1572b51..eb370e7f1 100644
--- a/js/src/views/Contract/Events/Event/event.js
+++ b/js/src/views/Contract/Events/Event/event.js
@@ -146,7 +146,7 @@ export default class Event extends Component {
 
     Promise
       .all([
-        api.eth.getBlockByNumber(event.blockNumber),
+        api.parity.getBlockHeaderByNumber(event.blockNumber),
         api.eth.getTransactionByHash(event.transactionHash)
       ])
       .then(([block, transaction]) => {

From 160183b6e89adf177d697ed32d2676216cf72729 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Wed, 3 May 2017 12:34:57 +0000
Subject: [PATCH 092/117] [ci skip] js-precompiled 20170503-123121

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 583b85559..1a63bccdc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1778,7 +1778,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#b5581e7b303487d9696b62a70eb54b96bc76f590"
+source = "git+https://github.com/paritytech/js-precompiled.git#15530d00f0a48462e764a909e15a0c74870b1fad"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index c756faf32..fff3fd26a 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.64",
+  "version": "1.7.65",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 15c89a8fff7ec9ac672d5053da4576a358627343 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Wed, 3 May 2017 17:31:56 +0300
Subject: [PATCH 093/117] add docker build for hub.docker.com/r/parity

---
 .gitlab-ci.yml          | 12 ++++++++----
 scripts/docker-build.sh |  1 -
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 375735545..9a36d165b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -488,10 +488,10 @@ windows:
     - aws configure set aws_access_key_id %s3_key%
     - aws configure set aws_secret_access_key %s3_secret%
     - echo %CI_BUILD_REF_NAME%
-    - echo %CI_BUILD_REF_NAME% | findstr /R "master" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
-    - echo %CI_BUILD_REF_NAME% | findstr /R "beta" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
-    - echo %CI_BUILD_REF_NAME% | findstr /R "stable" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
-    - echo %CI_BUILD_REF_NAME% | findstr /R "nightly" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
+    - echo %CI_BUILD_REF_NAME% | findstr /R "master" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
+    - echo %CI_BUILD_REF_NAME% | findstr /R "beta" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
+    - echo %CI_BUILD_REF_NAME% | findstr /R "stable" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
+    - echo %CI_BUILD_REF_NAME% | findstr /R "nightly" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
     - echo %S3_BUCKET%
     - aws s3 rm --recursive s3://%S3_BUCKET%/%CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc
     - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe --body target\release\parity.exe
@@ -523,6 +523,10 @@ docker-build:
     - if [ "$CI_BUILD_REF_NAME" == "beta-release" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
     - docker login -u $Docker_Hub_User -p $Docker_Hub_Pass
     - sh scripts/docker-build.sh $DOCKER_TAG
+    - docker logout
+    - docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity
+    - sh scripts/docker-build.sh $DOCKER_TAG
+    - docker logout
   tags:
     - docker
 test-coverage:
diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh
index 01bffc48f..70bc85912 100644
--- a/scripts/docker-build.sh
+++ b/scripts/docker-build.sh
@@ -2,4 +2,3 @@
 cd docker/hub
 if [ "$1" == "latest" ]; then DOCKER_BUILD_TAG="beta-release"; fi
 docker build --build-arg BUILD_TAG=$DOCKER_BUILD_TAG --no-cache=true --tag ethcore/parity:$1 .
-docker push ethcore/parity:$1

From 8fdda2f5b7c22d2162e5a933141b089f52f1b292 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Wed, 3 May 2017 17:56:10 +0300
Subject: [PATCH 094/117] Update .gitlab-ci.yml

fix nightly test
- rustup default nightly
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a36d165b..286fe0d4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -618,7 +618,7 @@ test-rust-nightly:
     - git submodule update --init --recursive
     - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
   script:
-    - rustup default stable
+    - rustup default nightly
     - export RUST_BACKTRACE=1
     - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
   tags:

From 74044f4821af13564d7aa63c907d86764e813787 Mon Sep 17 00:00:00 2001
From: Nikolay Volf <nikvolf@gmail.com>
Date: Thu, 4 May 2017 10:21:33 +0300
Subject: [PATCH 095/117] bump jsonrpc & bytes (#5552)

---
 Cargo.lock | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1a63bccdc..9d4d7a458 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -201,7 +201,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "bytes"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1038,7 +1038,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "jsonrpc-core"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#8ed20d6e094e88f707045fca2d0959f46bfd23f9"
 dependencies = [
  "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1050,7 +1050,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-http-server"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#8ed20d6e094e88f707045fca2d0959f46bfd23f9"
 dependencies = [
  "hyper 0.10.0-a.0 (git+https://github.com/paritytech/hyper)",
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@@ -1063,9 +1063,9 @@ dependencies = [
 [[package]]
 name = "jsonrpc-ipc-server"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#8ed20d6e094e88f707045fca2d0959f46bfd23f9"
 dependencies = [
- "bytes 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1076,7 +1076,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-macros"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#8ed20d6e094e88f707045fca2d0959f46bfd23f9"
 dependencies = [
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-pubsub 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@@ -1086,7 +1086,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-minihttp-server"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#8ed20d6e094e88f707045fca2d0959f46bfd23f9"
 dependencies = [
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@@ -1100,7 +1100,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-pubsub"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#8ed20d6e094e88f707045fca2d0959f46bfd23f9"
 dependencies = [
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1110,7 +1110,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-server-utils"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#8ed20d6e094e88f707045fca2d0959f46bfd23f9"
 dependencies = [
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1121,9 +1121,9 @@ dependencies = [
 [[package]]
 name = "jsonrpc-tcp-server"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#8ed20d6e094e88f707045fca2d0959f46bfd23f9"
 dependencies = [
- "bytes 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1135,7 +1135,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-ws-server"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#306e200900e12313837733aa0a01966ff20610b1"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#8ed20d6e094e88f707045fca2d0959f46bfd23f9"
 dependencies = [
  "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@@ -1747,7 +1747,7 @@ name = "parity-tokio-ipc"
 version = "0.1.5"
 source = "git+https://github.com/nikvolf/parity-tokio-ipc#d6c5b3cfcc913a1b9cf0f0562a10b083ceb9fb7c"
 dependencies = [
- "bytes 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-named-pipes 0.1.4 (git+https://github.com/alexcrichton/mio-named-pipes)",
@@ -2466,7 +2466,7 @@ name = "tokio-core"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2481,7 +2481,7 @@ name = "tokio-io"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2506,7 +2506,7 @@ name = "tokio-named-pipes"
 version = "0.1.0"
 source = "git+https://github.com/nikvolf/tokio-named-pipes#0b9b728eaeb0a6673c287ac7692be398fd651752"
 dependencies = [
- "bytes 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-named-pipes 0.1.4 (git+https://github.com/alexcrichton/mio-named-pipes)",
  "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2558,7 +2558,7 @@ name = "tokio-uds"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2712,7 +2712,7 @@ name = "ws"
 version = "0.5.3"
 source = "git+https://github.com/paritytech/ws-rs.git?branch=parity-1.7#30415c17f1bec53b2dcabae5b8b887df75dcbe34"
 dependencies = [
- "bytes 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.1 (git+https://github.com/paritytech/mio)",
@@ -2800,7 +2800,7 @@ dependencies = [
 "checksum bn 0.4.4 (git+https://github.com/paritytech/bn)" = "<none>"
 "checksum byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c40977b0ee6b9885c9013cd41d9feffdd22deb3bb4dc3a71d901cc7a77de18c8"
 "checksum bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c129aff112dcc562970abb69e2508b40850dd24c274761bb50fb8a0067ba6c27"
-"checksum bytes 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "46112a0060ae15e3a3f9a445428a53e082b91215b744fa27a1948842f4a64b96"
+"checksum bytes 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f9edb851115d67d1f18680f9326901768a91d37875b87015518357c6ce22b553"
 "checksum cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c"
 "checksum cid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e53e6cdfa5ca294863e8c8a32a7cdb4dc0a442c8971d47a0e75b6c27ea268a6a"
 "checksum clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "5b4fabf979ddf6419a313c1c0ada4a5b95cfd2049c56e8418d622d27b4b6ff32"

From de1f7ee39be48a386dc0fa270dc87f148a801ce6 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Thu, 4 May 2017 12:13:50 +0200
Subject: [PATCH 096/117] option to disable persistent txqueue (#5544)

* option to disable persistent txqueue

* New option goes with kin
---
 local-store/src/lib.rs      | 18 +++++++++++++++---
 parity/cli/config.full.toml |  1 +
 parity/cli/mod.rs           |  6 +++++-
 parity/cli/usage.txt        |  3 +++
 parity/configuration.rs     |  2 ++
 parity/run.rs               | 27 ++++++++++++++++++++++-----
 6 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/local-store/src/lib.rs b/local-store/src/lib.rs
index d21ca031d..e975aa43d 100644
--- a/local-store/src/lib.rs
+++ b/local-store/src/lib.rs
@@ -173,14 +173,26 @@ impl<T: NodeInfo> LocalDataStore<T> {
 	pub fn update(&self) -> Result<(), Error> {
 		trace!(target: "local_store", "Updating local store entries.");
 
-		let mut batch = self.db.transaction();
-
 		let local_entries: Vec<TransactionEntry> = self.node.pending_transactions()
 			.into_iter()
 			.map(Into::into)
 			.collect();
 
-		let local_json = ::serde_json::to_value(&local_entries).map_err(Error::Json)?;
+		self.write_txs(&local_entries)
+	}
+
+	/// Clear data in this column.
+	pub fn clear(&self) -> Result<(), Error> {
+		trace!(target: "local_store", "Clearing local store entries.");
+
+		self.write_txs(&[])
+	}
+
+	// helper for writing a vector of transaction entries to disk.
+	fn write_txs(&self, txs: &[TransactionEntry]) -> Result<(), Error> {
+		let mut batch = self.db.transaction();
+
+		let local_json = ::serde_json::to_value(txs).map_err(Error::Json)?;
 		let json_str = format!("{}", local_json);
 
 		batch.put_vec(self.col, LOCAL_TRANSACTIONS_KEY, json_str.into_bytes());
diff --git a/parity/cli/config.full.toml b/parity/cli/config.full.toml
index 64ddd20e9..a88e01336 100644
--- a/parity/cli/config.full.toml
+++ b/parity/cli/config.full.toml
@@ -7,6 +7,7 @@ release_track = "current"
 public_node = false
 no_download = false
 no_consensus = false
+no_persistent_txqueue = false
 
 chain = "homestead"
 base_path = "$HOME/.parity"
diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs
index 05627b90b..fe21070f8 100644
--- a/parity/cli/mod.rs
+++ b/parity/cli/mod.rs
@@ -95,6 +95,8 @@ usage! {
 		flag_keys_path: String = "$BASE/keys", or |c: &Config| otry!(c.parity).keys_path.clone(),
 		flag_identity: String = "", or |c: &Config| otry!(c.parity).identity.clone(),
 		flag_light: bool = false, or |c: &Config| otry!(c.parity).light,
+		flag_no_persistent_txqueue: bool = false,
+			or |c: &Config| otry!(c.parity).no_persistent_txqueue,
 
 		// -- Account Options
 		flag_unlock: Option<String> = None,
@@ -345,7 +347,6 @@ usage! {
 		flag_no_color: bool = false,
 			or |c: &Config| otry!(c.misc).color.map(|c| !c).clone(),
 
-
 		// -- Legacy Options supported in configs
 		flag_dapps_port: Option<u16> = None,
 			or |c: &Config| otry!(c.dapps).port.clone().map(Some),
@@ -406,6 +407,7 @@ struct Operating {
 	keys_path: Option<String>,
 	identity: Option<String>,
 	light: Option<bool>,
+	no_persistent_txqueue: Option<bool>,
 }
 
 #[derive(Default, Debug, PartialEq, RustcDecodable)]
@@ -682,6 +684,7 @@ mod tests {
 			flag_keys_path: "$HOME/.parity/keys".into(),
 			flag_identity: "".into(),
 			flag_light: false,
+			flag_no_persistent_txqueue: false,
 
 			// -- Account Options
 			flag_unlock: Some("0xdeadbeefcafe0000000000000000000000000000".into()),
@@ -901,6 +904,7 @@ mod tests {
 				keys_path: None,
 				identity: None,
 				light: None,
+				no_persistent_txqueue: None,
 			}),
 			account: Some(Account {
 				unlock: Some(vec!["0x1".into(), "0x2".into(), "0x3".into()]),
diff --git a/parity/cli/usage.txt b/parity/cli/usage.txt
index 17b6ce2b8..9d2e4f6d5 100644
--- a/parity/cli/usage.txt
+++ b/parity/cli/usage.txt
@@ -304,6 +304,9 @@ Sealing/Mining Options:
                                    execution time limit. Also number of offending actions
                                    have to reach the threshold within that time.
                                    (default: {flag_tx_queue_ban_time} seconds)
+  --no-persistent-txqueue          Don't save pending local transactions to disk to be
+                                   restored whenever the node restarts.
+                                   (default: {flag_no_persistent_txqueue}).
   --remove-solved                  Move solved blocks from the work package queue
                                    instead of cloning them. This gives a slightly
                                    faster import speed, but means that extra solutions
diff --git a/parity/configuration.rs b/parity/configuration.rs
index 3c3c591c1..9aa0d9753 100644
--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@@ -388,6 +388,7 @@ impl Configuration {
 				verifier_settings: verifier_settings,
 				serve_light: !self.args.flag_no_serve_light,
 				light: self.args.flag_light,
+				no_persistent_txqueue: self.args.flag_no_persistent_txqueue,
 			};
 			Cmd::Run(run_cmd)
 		};
@@ -1270,6 +1271,7 @@ mod tests {
 			verifier_settings: Default::default(),
 			serve_light: true,
 			light: false,
+			no_persistent_txqueue: false,
 		};
 		expected.secretstore_conf.enabled = cfg!(feature = "secretstore");
 		assert_eq!(conf.into_command().unwrap().cmd, Cmd::Run(expected));
diff --git a/parity/run.rs b/parity/run.rs
index a76c6a4ca..9d90ba006 100644
--- a/parity/run.rs
+++ b/parity/run.rs
@@ -115,6 +115,7 @@ pub struct RunCmd {
 	pub verifier_settings: VerifierSettings,
 	pub serve_light: bool,
 	pub light: bool,
+	pub no_persistent_txqueue: bool,
 }
 
 pub fn open_ui(signer_conf: &signer::Configuration) -> Result<(), String> {
@@ -142,15 +143,20 @@ pub fn open_dapp(dapps_conf: &dapps::Configuration, rpc_conf: &rpc::HttpConfigur
 
 // node info fetcher for the local store.
 struct FullNodeInfo {
-	miner: Arc<Miner>, // TODO: only TXQ needed, just use that after decoupling.
+	miner: Option<Arc<Miner>>, // TODO: only TXQ needed, just use that after decoupling.
 }
 
 impl ::local_store::NodeInfo for FullNodeInfo {
 	fn pending_transactions(&self) -> Vec<::ethcore::transaction::PendingTransaction> {
-		let local_txs = self.miner.local_transactions();
-		self.miner.pending_transactions()
+		let miner = match self.miner.as_ref() {
+			Some(m) => m,
+			None => return Vec::new(),
+		};
+
+		let local_txs = miner.local_transactions();
+		miner.pending_transactions()
 			.into_iter()
-			.chain(self.miner.future_transactions())
+			.chain(miner.future_transactions())
 			.filter(|tx| local_txs.contains_key(&tx.hash()))
 			.collect()
 	}
@@ -515,11 +521,22 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 	let store = {
 		let db = service.db();
 		let node_info = FullNodeInfo {
-			miner: miner.clone(),
+			miner: match cmd.no_persistent_txqueue {
+				true => None,
+				false => Some(miner.clone()),
+			}
 		};
 
 		let store = ::local_store::create(db, ::ethcore::db::COL_NODE_INFO, node_info);
 
+		if cmd.no_persistent_txqueue {
+			info!("Running without a persistent transaction queue.");
+
+			if let Err(e) = store.clear() {
+				warn!("Error clearing persistent transaction queue: {}", e);
+			}
+		}
+
 		// re-queue pending transactions.
 		match store.pending_transactions() {
 			Ok(pending) => {

From d5683d20166b67a1fb13fa5ac52d9efbe3a75328 Mon Sep 17 00:00:00 2001
From: Maciej Hirsz <maciej.hirsz@gmail.com>
Date: Thu, 4 May 2017 17:58:01 +0200
Subject: [PATCH 097/117] Added missing methods (#5542)

* Added missing methods

* Adding to Parity.js
---
 js/src/api/rpc/parity/parity.js     | 10 +++
 js/src/jsonrpc/interfaces/parity.js | 95 +++++++++++++++++++++++++----
 rpc/src/v1/traits/personal.rs       |  2 +-
 3 files changed, 93 insertions(+), 14 deletions(-)

diff --git a/js/src/api/rpc/parity/parity.js b/js/src/api/rpc/parity/parity.js
index 53610545a..674091563 100644
--- a/js/src/api/rpc/parity/parity.js
+++ b/js/src/api/rpc/parity/parity.js
@@ -70,11 +70,21 @@ export default class Parity {
       .execute('parity_checkRequest', inNumber16(requestId));
   }
 
+  cidV0 (data) {
+    return this._transport
+      .execute('parity_cidV0', inData(data));
+  }
+
   closeVault (vaultName) {
     return this._transport
       .execute('parity_closeVault', vaultName);
   }
 
+  composeTransaction (options) {
+    return this._transport
+      .execute('parity_composeTransaction', inOptions(options));
+  }
+
   consensusCapability () {
     return this._transport
       .execute('parity_consensusCapability');
diff --git a/js/src/jsonrpc/interfaces/parity.js b/js/src/jsonrpc/interfaces/parity.js
index 797052037..6ab5ea212 100644
--- a/js/src/jsonrpc/interfaces/parity.js
+++ b/js/src/jsonrpc/interfaces/parity.js
@@ -296,19 +296,6 @@ export default {
     }
   },
 
-  getBlockHeaderByNumber: {
-    section: SECTION_NET,
-    desc: 'Returns block header information by number (same as eth_getBlockByNumber without transactions and uncles)',
-    params: [
-      {
-        type: BlockNumber,
-        desc: 'integer of a block number, or the string `\'earliest\'`, `\'latest\'` or `\'pending\'`, as in the [default block parameter](#the-default-block-parameter).',
-        example: fromDecimal(436)
-      }
-    ],
-    returns: 'See [eth_getBlockByHash](#eth_getblockbyhash) (without transactions and uncles)'
-  },
-
   getVaultMeta: {
     section: SECTION_VAULT,
     desc: 'Returns the metadata for a specific vault',
@@ -1927,5 +1914,87 @@ export default {
       desc: 'Message signature.',
       example: '0x1d9e33a8cf8bfc089a172bca01da462f9e359c6cb1b0f29398bc884e4d18df4f78588aee4fb5cc067ca62d2abab995e0bba29527be6ac98105b0320020a2efaf00'
     }
+  },
+
+  composeTransaction: {
+    desc: 'Given partial transaction request produces transaction with all fields filled in. Such transaction can be then signed externally.',
+    params: [
+      {
+        type: TransactionRequest,
+        desc: 'see [`eth_sendTransaction`](JSONRPC-eth-module#eth_sendtransaction).',
+        format: 'inputCallFormatter',
+        example: {
+          from: '0xb60e8dd61c5d32be8058bb8eb970870f07233155',
+          to: '0xd46e8dd67c5d32be8058bb8eb970870f07244567',
+          value: fromDecimal(2441406250)
+        }
+      }
+    ],
+    returns: {
+      type: Object,
+      desc: 'Transaction object (same as the parameter) with missing optional fields filled in by defaults.',
+      example: {
+        condition: null,
+        data: '0x',
+        from: '0xb60e8dd61c5d32be8058bb8eb970870f07233155',
+        gas: '0xe57e0',
+        gasPrice: '0x4a817c800',
+        nonce: '0x0',
+        to: '0xd46e8dd67c5d32be8058bb8eb970870f07244567',
+        value: '0x9184e72a'
+      }
+    }
+  },
+
+  getBlockHeaderByNumber: {
+    desc: 'Get block header. Same as [`eth_getBlockByNumber`](JSONRPC-eth-module#eth_getblockbynumber) but without uncles and transactions.',
+    params: [
+      {
+        type: BlockNumber,
+        desc: 'integer of a block number, or the string `\'earliest\'`, `\'latest\'` or `\'pending\'`, as in the [default block parameter](#the-default-block-parameter).',
+        example: fromDecimal(436)
+      }
+    ],
+    returns: {
+      type: Object,
+      desc: 'Block header',
+      example: {
+        author: '0xbb7b8287f3f0a933474a79eae42cbca977791171',
+        difficulty: '0x4ea3f27bc',
+        extraData: '0x476574682f4c5649562f76312e302e302f6c696e75782f676f312e342e32',
+        gasLimit: '0x1388',
+        gasUsed: '0x0',
+        hash: '0xdc0818cf78f21a8e70579cb46a43643f78291264dda342ae31049421c82d21ae',
+        logsBloom: '0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+        miner: '0xbb7b8287f3f0a933474a79eae42cbca977791171',
+        mixHash: '0x4fffe9ae21f1c9e15207b1f472d5bbdd68c9595d461666602f2be20daf5e7843',
+        nonce: '0x689056015818adbe',
+        number: '0x1b4',
+        parentHash: '0xe99e022112df268087ea7eafaf4790497fd21dbeeb6bd7a1721df161a6657a54',
+        receiptsRoot: '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421',
+        sealFields: ['0xa04fffe9ae21f1c9e15207b1f472d5bbdd68c9595d461666602f2be20daf5e7843', '0x88689056015818adbe'],
+        sha3Uncles: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347',
+        size: '0x21b',
+        stateRoot: '0xddc8b0234c2e0cad087c8b389aa7ef01f7d79b2570bccb77ce48648aa61c904d',
+        timestamp: '0x55ba467c',
+        transactionsRoot: '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421'
+      }
+    }
+  },
+
+  cidV0: {
+    desc: 'Compute a v0 IPFS Content ID from protobuf encoded bytes.',
+    params: [
+      {
+        type: Data,
+        desc: 'to encode.',
+        example: '0x666f6f626172'
+      }
+    ],
+    returns: {
+      type: String,
+      desc: 'Base58 encoded CID',
+      example: 'QmSbFjqjd6nFwNHqsBCC7SK8GShGcayLUEtysJjNGhZAnC'
+    }
   }
 };
diff --git a/rpc/src/v1/traits/personal.rs b/rpc/src/v1/traits/personal.rs
index a0a8cf1a4..f62f5ce7b 100644
--- a/rpc/src/v1/traits/personal.rs
+++ b/rpc/src/v1/traits/personal.rs
@@ -43,7 +43,7 @@ build_rpc_trait! {
 		#[rpc(meta, name = "personal_sendTransaction")]
 		fn send_transaction(&self, Self::Metadata, TransactionRequest, String) -> BoxFuture<H256, Error>;
 
-		/// Deprecated alias for `personal_sendTransaction`.
+		/// @deprecated alias for `personal_sendTransaction`.
 		#[rpc(meta, name = "personal_signAndSendTransaction")]
 		fn sign_and_send_transaction(&self, Self::Metadata, TransactionRequest, String) -> BoxFuture<H256, Error>;
 

From f5bfb208e78c8e0a5fc58be606e8c324aca5acd2 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Thu, 4 May 2017 16:23:12 +0000
Subject: [PATCH 098/117] [ci skip] js-precompiled 20170504-161940

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9d4d7a458..a6fb6ca6b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1778,7 +1778,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#15530d00f0a48462e764a909e15a0c74870b1fad"
+source = "git+https://github.com/paritytech/js-precompiled.git#4ad25201e9bc25a3873fd1e7a6d8a7b49861c946"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index fff3fd26a..a29e190ab 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.65",
+  "version": "1.7.66",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 951dc757f86a840b276d3f0f2ec24bb6340dff09 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Thu, 4 May 2017 23:46:25 +0300
Subject: [PATCH 099/117] fix docker build (ethcore+parity hub's)

---
 .gitlab-ci.yml          | 4 ++--
 scripts/docker-build.sh | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 286fe0d4e..52dc50931 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -522,10 +522,10 @@ docker-build:
   script:
     - if [ "$CI_BUILD_REF_NAME" == "beta-release" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
     - docker login -u $Docker_Hub_User -p $Docker_Hub_Pass
-    - sh scripts/docker-build.sh $DOCKER_TAG
+    - sh scripts/docker-build.sh $DOCKER_TAG ethcore
     - docker logout
     - docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity
-    - sh scripts/docker-build.sh $DOCKER_TAG
+    - sh scripts/docker-build.sh $DOCKER_TAG parity
     - docker logout
   tags:
     - docker
diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh
index 70bc85912..c83912080 100644
--- a/scripts/docker-build.sh
+++ b/scripts/docker-build.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
 cd docker/hub
 if [ "$1" == "latest" ]; then DOCKER_BUILD_TAG="beta-release"; fi
-docker build --build-arg BUILD_TAG=$DOCKER_BUILD_TAG --no-cache=true --tag ethcore/parity:$1 .
+docker build --build-arg BUILD_TAG=$DOCKER_BUILD_TAG --no-cache=true --tag $2/parity:$1 .
+docker push $2/parity:$1

From eb316fcb9c714935056f069e33eabb45db73c408 Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Fri, 5 May 2017 10:00:16 +0200
Subject: [PATCH 100/117] Fix issues in Contract Development view (#5555)

* Better errors in contract dev

* Use RAW Git instead of Github Raw URLs (better CORS support)

* Network first for Solc list

* Don't use importScript n Worker // update rawgit to use CDN
---
 js/src/serviceWorker.js                       |  6 +--
 js/src/util/solidity.js                       | 14 +-----
 js/src/views/WriteContract/writeContract.js   | 44 ++++++++++---------
 .../views/WriteContract/writeContractStore.js | 18 +++++---
 js/src/webWorker.js                           | 26 ++++++++---
 5 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/js/src/serviceWorker.js b/js/src/serviceWorker.js
index 5bdcb4dab..cf53dcd46 100644
--- a/js/src/serviceWorker.js
+++ b/js/src/serviceWorker.js
@@ -16,13 +16,11 @@
 
 import toolbox from 'sw-toolbox';
 
-toolbox.precache(self.serviceWorkerOption.assets);
-
 /**
  * Cache the SOLC files : if not available, make a network request
  */
-toolbox.router.any(/raw.githubusercontent.com\/ethereum\/solc-bin(.+)list\.json$/, toolbox.cacheFirst);
-toolbox.router.any(/raw.githubusercontent.com\/ethereum\/solc-bin(.+)soljson(.+)\.js$/, toolbox.cacheFirst);
+toolbox.router.any(/rawgit.com\/ethereum\/solc-bin(.+)list\.json$/, toolbox.networkFirst);
+toolbox.router.any(/rawgit.com\/ethereum\/solc-bin(.+)soljson(.+)\.js$/, toolbox.cacheFirst);
 
 self.addEventListener('install', (event) => {
   event.waitUntil(self.skipWaiting());
diff --git a/js/src/util/solidity.js b/js/src/util/solidity.js
index 120c2b736..7309e8072 100644
--- a/js/src/util/solidity.js
+++ b/js/src/util/solidity.js
@@ -52,21 +52,9 @@ export default class SolidityUtils {
 
   static getCompiler (build) {
     const { longVersion, path } = build;
-    const URL = `https://raw.githubusercontent.com/ethereum/solc-bin/gh-pages/bin/${path}`;
+    const URL = `https://cdn.rawgit.com/ethereum/solc-bin/gh-pages/bin/${path}`;
     const isWorker = typeof window !== 'object';
 
-    if (isWorker) {
-      return new Promise((resolve, reject) => {
-        self.importScripts(URL);
-
-        setTimeout(() => {
-          const compiler = solc(self.Module);
-
-          return resolve(compiler);
-        }, 50);
-      });
-    }
-
     return fetch(URL)
       .then((r) => r.text())
       .then((code) => {
diff --git a/js/src/views/WriteContract/writeContract.js b/js/src/views/WriteContract/writeContract.js
index 77e039bb4..df5ade348 100644
--- a/js/src/views/WriteContract/writeContract.js
+++ b/js/src/views/WriteContract/writeContract.js
@@ -271,24 +271,6 @@ class WriteContract extends Component {
   renderParameters () {
     const { compiling, contract, selectedBuild, loading, workerError } = this.store;
 
-    if (workerError) {
-      return (
-        <div className={ styles.panel }>
-          <div className={ styles.centeredMessage }>
-            <p>
-              <FormattedMessage
-                id='writeContract.error.params'
-                defaultMessage='An error occurred with the following description'
-              />
-            </p>
-            <div className={ styles.error }>
-              { workerError.toString() }
-            </div>
-          </div>
-        </div>
-      );
-    }
-
     if (selectedBuild < 0) {
       return (
         <div className={ `${styles.panel} ${styles.centeredMessage}` }>
@@ -306,10 +288,28 @@ class WriteContract extends Component {
       );
     }
 
-    if (loading) {
+    let content;
+
+    if (workerError) {
+      content = (
+        <div className={ styles.panel }>
+          <div className={ styles.centeredMessage }>
+            <p>
+              <FormattedMessage
+                id='writeContract.error.params'
+                defaultMessage='An error occurred with the following description'
+              />
+            </p>
+            <div className={ styles.error }>
+              { workerError.toString() }
+            </div>
+          </div>
+        </div>
+      );
+    } else if (loading) {
       const { longVersion } = this.store.builds[selectedBuild];
 
-      return (
+      content = (
         <div className={ styles.panel }>
           <div className={ styles.centeredMessage }>
             <CircularProgress
@@ -328,6 +328,8 @@ class WriteContract extends Component {
           </div>
         </div>
       );
+    } else {
+      content = this.renderCompilation();
     }
 
     return (
@@ -392,7 +394,7 @@ class WriteContract extends Component {
           </div>
         </div>
         { this.renderSolidityVersions() }
-        { this.renderCompilation() }
+        { content }
       </div>
     );
   }
diff --git a/js/src/views/WriteContract/writeContractStore.js b/js/src/views/WriteContract/writeContractStore.js
index 8774f6ce0..1a1a26b99 100644
--- a/js/src/views/WriteContract/writeContractStore.js
+++ b/js/src/views/WriteContract/writeContractStore.js
@@ -23,7 +23,7 @@ import store from 'store';
 import { sha3 } from '~/api/util/sha3';
 import SolidityUtils from '~/util/solidity';
 
-const SOLIDITY_LIST_URL = 'https://raw.githubusercontent.com/ethereum/solc-bin/gh-pages/bin/list.json';
+const SOLIDITY_LIST_URL = 'https://rawgit.com/ethereum/solc-bin/gh-pages/bin/list.json';
 const WRITE_CONTRACT_STORE_KEY = '_parity::writeContractStore';
 
 const SNIPPETS = {
@@ -197,6 +197,7 @@ export default class WriteContractStore {
         })
         .catch((error) => {
           this.setWorkerError(error);
+          throw error;
         });
     }
 
@@ -318,6 +319,7 @@ export default class WriteContractStore {
     transaction(() => {
       this.compiled = false;
       this.compiling = true;
+      this.setWorkerError(null);
     });
 
     const build = this.builds[this.selectedBuild];
@@ -365,12 +367,16 @@ export default class WriteContractStore {
           annotations, contracts, errors
         } = data.result;
 
-        this.contract = contract;
-        this.contractIndex = contractIndex;
+        if (!contract && errors && errors.length > 0) {
+          this.setWorkerError(errors[0]);
+        } else {
+          this.contract = contract;
+          this.contractIndex = contractIndex;
 
-        this.annotations = annotations;
-        this.contracts = contracts;
-        this.errors = errors;
+          this.annotations = annotations;
+          this.contracts = contracts;
+          this.errors = errors;
+        }
       }
 
       this.compiled = true;
diff --git a/js/src/webWorker.js b/js/src/webWorker.js
index 838382acf..115c61414 100644
--- a/js/src/webWorker.js
+++ b/js/src/webWorker.js
@@ -22,7 +22,10 @@ registerPromiseWorker((msg) => {
   return handleMessage(msg);
 });
 
-self.solc = {};
+self.compiler = {
+  version: null,
+  compiler: null
+};
 self.files = {};
 
 function handleMessage (message) {
@@ -57,7 +60,16 @@ function compile (data) {
 
   return getCompiler(build)
     .then((compiler) => {
+      console.warn('compiling');
       return SolidityUtils.compile(data, compiler);
+    })
+    .then((result) => {
+      console.warn('result in worker', result);
+      return result;
+    })
+    .catch((error) => {
+      console.error('error in worker', error);
+      throw error;
     });
 }
 
@@ -79,14 +91,18 @@ function setFiles (files) {
 function getCompiler (build) {
   const { longVersion } = build;
 
-  if (!self.solc[longVersion]) {
-    self.solc[longVersion] = SolidityUtils
+  if (self.compiler.version !== longVersion) {
+    self.compiler.version = longVersion;
+    self.compiler.compiler = SolidityUtils
       .getCompiler(build)
       .then((compiler) => {
-        self.solc[longVersion] = compiler;
+        if (self.compiler.version === longVersion) {
+          self.compiler.compiler = compiler;
+        }
+
         return compiler;
       });
   }
 
-  return Promise.resolve(self.solc[longVersion]);
+  return Promise.resolve(self.compiler.compiler);
 }

From d4dc58eafe123ca9a7889aceb5033f69ec28cb9b Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Fri, 5 May 2017 10:00:31 +0200
Subject: [PATCH 101/117] Fix #4277 (#5556)

---
 js/src/redux/providers/certifications/middleware.js |  3 ++-
 js/src/views/Contract/contract.js                   | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/js/src/redux/providers/certifications/middleware.js b/js/src/redux/providers/certifications/middleware.js
index a1403ee3a..b70ff4909 100644
--- a/js/src/redux/providers/certifications/middleware.js
+++ b/js/src/redux/providers/certifications/middleware.js
@@ -128,7 +128,8 @@ export default class CertificationsMiddleware {
         return badgeReg.getContract()
           .then((badgeRegContract) => {
             logs = badgeRegContract.parseEventLogs(logs);
-            const ids = logs.map((log) => log.params.id.value.toNumber());
+
+            const ids = logs.map((log) => log.params && log.params.id.value.toNumber());
 
             return fetchCertifiers(uniq(ids));
           });
diff --git a/js/src/views/Contract/contract.js b/js/src/views/Contract/contract.js
index 4af775cef..cc6b35d2b 100644
--- a/js/src/views/Contract/contract.js
+++ b/js/src/views/Contract/contract.js
@@ -101,8 +101,14 @@ class Contract extends Component {
     const { api } = this.context;
     const { subscriptionId, blockSubscriptionId, contract } = this.state;
 
-    api.unsubscribe(blockSubscriptionId);
-    contract.unsubscribe(subscriptionId);
+    if (blockSubscriptionId >= 0) {
+      api.unsubscribe(blockSubscriptionId);
+    }
+
+    if (subscriptionId >= 0) {
+      contract.unsubscribe(subscriptionId);
+    }
+
     this.props.setVisibleAccounts([]);
   }
 

From 25853b915e0448ab9b9a3e7507b641d2ee3af93d Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Fri, 5 May 2017 10:00:45 +0200
Subject: [PATCH 102/117] Fixes Parity Bar position (#5557)

---
 js/src/views/ParityBar/parityBar.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/js/src/views/ParityBar/parityBar.js b/js/src/views/ParityBar/parityBar.js
index b8dd669d5..618a1d05a 100644
--- a/js/src/views/ParityBar/parityBar.js
+++ b/js/src/views/ParityBar/parityBar.js
@@ -82,7 +82,10 @@ class ParityBar extends Component {
     dappsStore
       .on('loaded', (app) => {
         this.app = app;
-        this.loadPosition();
+
+        if (this.props.dapp) {
+          this.loadPosition();
+        }
       });
 
     if (this.props.dapp) {

From 4a2ad9fc2a8fbad60b2e434f7e1be4650950e529 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Fri, 5 May 2017 08:38:11 +0000
Subject: [PATCH 103/117] [ci skip] js-precompiled 20170505-083410

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a6fb6ca6b..ecb118d56 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1778,7 +1778,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#4ad25201e9bc25a3873fd1e7a6d8a7b49861c946"
+source = "git+https://github.com/paritytech/js-precompiled.git#b83f10bd5c196d59cc9cd031a14a7a24e51ed41a"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index a29e190ab..282a213b5 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.66",
+  "version": "1.7.67",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 0d8920347a72fc50e82b540855eba94c8bbb2c0f Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Fri, 5 May 2017 08:50:23 +0000
Subject: [PATCH 104/117] [ci skip] js-precompiled 20170505-084643

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ecb118d56..5f3131708 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1778,7 +1778,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#b83f10bd5c196d59cc9cd031a14a7a24e51ed41a"
+source = "git+https://github.com/paritytech/js-precompiled.git#b6fbfc59f044546ccd3b928fb17daa3812ae856e"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 282a213b5..4aaa18e15 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.67",
+  "version": "1.7.68",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 8b9adb4d74080fa53af42f1941909289ca0ca542 Mon Sep 17 00:00:00 2001
From: Svyatoslav Nikolsky <svyatonik@gmail.com>
Date: Fri, 5 May 2017 16:57:29 +0300
Subject: [PATCH 105/117] Secretstore RPCs + integration (#5439)

* ECDKG protocol prototype

* added test for enc/dec math

* get rid of decryption_session

* added licenses

* fix after merge

* get rid of unused serde dependency

* doc

* decryption session [without commutative enc]

* failed_dec_session

* fixed tests

* added commen

* added more decryption session tests

* helper to localize an issue

* more computations to localize error

* decryption_session::SessionParams

* added tests for EC math to localize problem

* secretstore network transport

* encryption_session_works_over_network

* network errors processing

* connecting to KeyServer

* licenses

* get rid of debug println-s

* fixed secretstore args

* encryption results are stored in KS database

* decryption protocol works over network

* enc/dec Session traits

* fixing warnings

* fix after merge

* on-chain ACL checker proto

* fixed compilation

* fixed compilation

* finally fixed <odd>-of-N-scheme

* temporary commented test

* 1-of-N works in math

* scheme 1-of-N works

* updated AclStorage with real contract ABI

* remove unnecessary unsafety

* fixed grumbles

* wakeup on access denied

* encrypt secretstore messages

* 'shadow' decryption

* fix grumbles

* lost files

* secretstore cli-options

* decryption seccion when ACL check failed on master

* disallow regenerating key for existing document

* removed obsolete TODO

* fix after merge

* switched to tokio_io

* fix after merge

* fix after merge

* fix after merge

* fix after merge

* fix after merge

* fixed test

* fix after merge

* encryption session errors are now fatal

* session timeouts

* autorestart decryption session

* remove sessions on completion

* exclude disconnected nodes from decryption session

* test for enc/dec session over network with 1 node

* remove debug printlns

* fixed 1-of-1 scheme

* drop for KeyServerHttpListener

* Use standard encryption and decryption (as in RPC)

* added some tests

* moved DEFAULT_MAC to ethcrypto

* rpc_secretstore_encrypt_and_decrypt

* serialization with "0x" prefix (RPC compatibility)

* secretstore RPC API

* fix after merge

* fixed typo

* secretstore_shadowDecrypt RPC

* enable secretstore RPCs by default

* fixed test

* SecStore RPCs available without SecStore feature

* fixed grumbles

* lost files

* added password argument to Parity RPCs

* update docs

* lost file
---
 Cargo.lock                                    |   1 +
 ethcrypto/src/lib.rs                          |   3 +
 parity/cli/config.full.toml                   |   6 +-
 parity/cli/mod.rs                             |  12 +-
 parity/rpc_apis.rs                            |  30 +++--
 rpc/Cargo.toml                                |   1 +
 rpc/src/lib.rs                                |   1 +
 rpc/src/v1/helpers/dispatch.rs                |   4 +-
 rpc/src/v1/helpers/mod.rs                     |   1 +
 rpc/src/v1/helpers/secretstore.rs             | 127 ++++++++++++++++++
 rpc/src/v1/impls/light/parity.rs              |   3 +-
 rpc/src/v1/impls/mod.rs                       |   2 +
 rpc/src/v1/impls/parity.rs                    |   2 +-
 rpc/src/v1/impls/secretstore.rs               |  85 ++++++++++++
 rpc/src/v1/mod.rs                             |   2 +-
 rpc/src/v1/tests/mocked/mod.rs                |   1 +
 rpc/src/v1/tests/mocked/secretstore.rs        |  98 ++++++++++++++
 rpc/src/v1/traits/mod.rs                      |   3 +-
 rpc/src/v1/traits/secretstore.rs              |  41 ++++++
 secret_store/src/http_listener.rs             |   7 +-
 secret_store/src/key_server.rs                |  16 +--
 .../key_server_cluster/decryption_session.rs  |  10 +-
 secret_store/src/serialization.rs             |  88 +++++++++---
 secret_store/src/types/all.rs                 |  10 ++
 24 files changed, 497 insertions(+), 57 deletions(-)
 create mode 100644 rpc/src/v1/helpers/secretstore.rs
 create mode 100644 rpc/src/v1/impls/secretstore.rs
 create mode 100644 rpc/src/v1/tests/mocked/secretstore.rs
 create mode 100644 rpc/src/v1/traits/secretstore.rs

diff --git a/Cargo.lock b/Cargo.lock
index 5f3131708..f59140ada 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1712,6 +1712,7 @@ dependencies = [
  "parity-reactor 0.1.0",
  "parity-updater 1.7.0",
  "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "rlp 0.1.0",
  "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ethcrypto/src/lib.rs b/ethcrypto/src/lib.rs
index ea0ea9754..4f14cf4d9 100644
--- a/ethcrypto/src/lib.rs
+++ b/ethcrypto/src/lib.rs
@@ -34,6 +34,9 @@ pub const KEY_LENGTH: usize = 32;
 pub const KEY_ITERATIONS: usize = 10240;
 pub const KEY_LENGTH_AES: usize = KEY_LENGTH / 2;
 
+/// Default MAC to use (in RPC).
+pub const DEFAULT_MAC: [u8; 2] = [0, 0];
+
 #[derive(PartialEq, Debug)]
 pub enum ScryptError {
 	// log(N) < r / 16
diff --git a/parity/cli/config.full.toml b/parity/cli/config.full.toml
index a88e01336..624c0ccdf 100644
--- a/parity/cli/config.full.toml
+++ b/parity/cli/config.full.toml
@@ -50,7 +50,7 @@ disable = false
 port = 8545
 interface = "local"
 cors = "null"
-apis = ["web3", "eth", "net", "parity", "traces", "rpc"]
+apis = ["web3", "eth", "net", "parity", "traces", "rpc", "secretstore"]
 hosts = ["none"]
 
 [websockets]
@@ -58,13 +58,13 @@ disable = false
 port = 8546
 interface = "local"
 origins = ["none"]
-apis = ["web3", "eth", "net", "parity", "traces", "rpc"]
+apis = ["web3", "eth", "net", "parity", "traces", "rpc", "secretstore"]
 hosts = ["none"]
 
 [ipc]
 disable = false
 path = "$HOME/.parity/jsonrpc.ipc"
-apis = ["web3", "eth", "net", "parity", "parity_accounts", "personal", "traces", "rpc"]
+apis = ["web3", "eth", "net", "parity", "parity_accounts", "personal", "traces", "rpc", "secretstore"]
 
 [dapps]
 disable = false
diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs
index fe21070f8..f36622357 100644
--- a/parity/cli/mod.rs
+++ b/parity/cli/mod.rs
@@ -165,7 +165,7 @@ usage! {
 			or |c: &Config| otry!(c.rpc).interface.clone(),
 		flag_jsonrpc_cors: Option<String> = None,
 			or |c: &Config| otry!(c.rpc).cors.clone().map(Some),
-		flag_jsonrpc_apis: String = "web3,eth,net,parity,traces,rpc",
+		flag_jsonrpc_apis: String = "web3,eth,net,parity,traces,rpc,secretstore",
 			or |c: &Config| otry!(c.rpc).apis.as_ref().map(|vec| vec.join(",")),
 		flag_jsonrpc_hosts: String = "none",
 			or |c: &Config| otry!(c.rpc).hosts.as_ref().map(|vec| vec.join(",")),
@@ -179,7 +179,7 @@ usage! {
 			or |c: &Config| otry!(c.websockets).port.clone(),
 		flag_ws_interface: String  = "local",
 			or |c: &Config| otry!(c.websockets).interface.clone(),
-		flag_ws_apis: String = "web3,eth,net,parity,traces,rpc",
+		flag_ws_apis: String = "web3,eth,net,parity,traces,rpc,secretstore",
 			or |c: &Config| otry!(c.websockets).apis.as_ref().map(|vec| vec.join(",")),
 		flag_ws_origins: String = "none",
 			or |c: &Config| otry!(c.websockets).origins.as_ref().map(|vec| vec.join(",")),
@@ -191,7 +191,7 @@ usage! {
 			or |c: &Config| otry!(c.ipc).disable.clone(),
 		flag_ipc_path: String = "$BASE/jsonrpc.ipc",
 			or |c: &Config| otry!(c.ipc).path.clone(),
-		flag_ipc_apis: String = "web3,eth,net,parity,parity_accounts,traces,rpc",
+		flag_ipc_apis: String = "web3,eth,net,parity,parity_accounts,traces,rpc,secretstore",
 			or |c: &Config| otry!(c.ipc).apis.as_ref().map(|vec| vec.join(",")),
 
 		// DAPPS
@@ -723,7 +723,7 @@ mod tests {
 			flag_jsonrpc_port: 8545u16,
 			flag_jsonrpc_interface: "local".into(),
 			flag_jsonrpc_cors: Some("null".into()),
-			flag_jsonrpc_apis: "web3,eth,net,parity,traces,rpc".into(),
+			flag_jsonrpc_apis: "web3,eth,net,parity,traces,rpc,secretstore".into(),
 			flag_jsonrpc_hosts: "none".into(),
 			flag_jsonrpc_threads: None,
 
@@ -731,14 +731,14 @@ mod tests {
 			flag_no_ws: false,
 			flag_ws_port: 8546u16,
 			flag_ws_interface: "local".into(),
-			flag_ws_apis: "web3,eth,net,parity,traces,rpc".into(),
+			flag_ws_apis: "web3,eth,net,parity,traces,rpc,secretstore".into(),
 			flag_ws_origins: "none".into(),
 			flag_ws_hosts: "none".into(),
 
 			// IPC
 			flag_no_ipc: false,
 			flag_ipc_path: "$HOME/.parity/jsonrpc.ipc".into(),
-			flag_ipc_apis: "web3,eth,net,parity,parity_accounts,personal,traces,rpc".into(),
+			flag_ipc_apis: "web3,eth,net,parity,parity_accounts,personal,traces,rpc,secretstore".into(),
 
 			// DAPPS
 			flag_dapps_path: "$HOME/.parity/dapps".into(),
diff --git a/parity/rpc_apis.rs b/parity/rpc_apis.rs
index 7643e0010..0ff204aba 100644
--- a/parity/rpc_apis.rs
+++ b/parity/rpc_apis.rs
@@ -59,6 +59,8 @@ pub enum Api {
 	Traces,
 	/// Rpc (Safe)
 	Rpc,
+	/// SecretStore (Safe)
+	SecretStore,
 }
 
 impl FromStr for Api {
@@ -78,6 +80,7 @@ impl FromStr for Api {
 			"parity_set" => Ok(ParitySet),
 			"traces" => Ok(Traces),
 			"rpc" => Ok(Rpc),
+			"secretstore" => Ok(SecretStore),
 			api => Err(format!("Unknown api: {}", api))
 		}
 	}
@@ -156,6 +159,7 @@ fn to_modules(apis: &[Api]) -> BTreeMap<String, String> {
 			Api::ParitySet => ("parity_set", "1.0"),
 			Api::Traces => ("traces", "1.0"),
 			Api::Rpc => ("rpc", "1.0"),
+			Api::SecretStore => ("secretstore", "1.0"),
 		};
 		modules.insert(name.into(), version.into());
 	}
@@ -295,7 +299,10 @@ impl Dependencies for FullDependencies {
 				Api::Rpc => {
 					let modules = to_modules(&apis);
 					handler.extend_with(RpcClient::new(modules).to_delegate());
-				}
+				},
+				Api::SecretStore => {
+					handler.extend_with(SecretStoreClient::new(&self.secret_store).to_delegate());
+				},
 			}
 		}
 	}
@@ -424,7 +431,11 @@ impl Dependencies for LightDependencies {
 				Api::Rpc => {
 					let modules = to_modules(&apis);
 					handler.extend_with(RpcClient::new(modules).to_delegate());
-				}
+				},
+				Api::SecretStore => {
+					let secret_store = Some(self.secret_store.clone());
+					handler.extend_with(SecretStoreClient::new(&secret_store).to_delegate());
+				},
 			}
 		}
 	}
@@ -438,7 +449,7 @@ impl ApiSet {
 
 	pub fn list_apis(&self) -> HashSet<Api> {
 		let mut public_list = vec![
-			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Rpc,
+			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Rpc, Api::SecretStore,
 		].into_iter().collect();
 		match *self {
 			ApiSet::List(ref apis) => apis.clone(),
@@ -496,6 +507,7 @@ mod test {
 		assert_eq!(Api::ParitySet, "parity_set".parse().unwrap());
 		assert_eq!(Api::Traces, "traces".parse().unwrap());
 		assert_eq!(Api::Rpc, "rpc".parse().unwrap());
+		assert_eq!(Api::SecretStore, "secretstore".parse().unwrap());
 		assert!("rp".parse::<Api>().is_err());
 	}
 
@@ -513,7 +525,7 @@ mod test {
 	fn test_api_set_unsafe_context() {
 		let expected = vec![
 			// make sure this list contains only SAFE methods
-			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc
+			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc, Api::SecretStore
 		].into_iter().collect();
 		assert_eq!(ApiSet::UnsafeContext.list_apis(), expected);
 	}
@@ -522,7 +534,7 @@ mod test {
 	fn test_api_set_ipc_context() {
 		let expected = vec![
 			// safe
-			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc,
+			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc, Api::SecretStore,
 			// semi-safe
 			Api::ParityAccounts
 		].into_iter().collect();
@@ -533,7 +545,7 @@ mod test {
 	fn test_api_set_safe_context() {
 		let expected = vec![
 			// safe
-			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc,
+			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc, Api::SecretStore,
 			// semi-safe
 			Api::ParityAccounts,
 			// Unsafe
@@ -545,7 +557,7 @@ mod test {
 	#[test]
 	fn test_all_apis() {
 		assert_eq!("all".parse::<ApiSet>().unwrap(), ApiSet::List(vec![
-			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc,
+			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc, Api::SecretStore,
 			Api::ParityAccounts,
 			Api::ParitySet, Api::Signer,
 			Api::Personal
@@ -555,7 +567,7 @@ mod test {
 	#[test]
 	fn test_all_without_personal_apis() {
 		assert_eq!("personal,all,-personal".parse::<ApiSet>().unwrap(), ApiSet::List(vec![
-			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc,
+			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc, Api::SecretStore,
 			Api::ParityAccounts,
 			Api::ParitySet, Api::Signer,
 		].into_iter().collect()));
@@ -564,7 +576,7 @@ mod test {
 	#[test]
 	fn test_safe_parsing() {
 		assert_eq!("safe".parse::<ApiSet>().unwrap(), ApiSet::List(vec![
-			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc,
+			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc, Api::SecretStore,
 		].into_iter().collect()));
 	}
 }
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 70ff7202d..0067bdeaa 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -21,6 +21,7 @@ transient-hashmap = "0.4"
 cid = "0.2.1"
 multihash = "0.5"
 rust-crypto = "0.2.36"
+rand = "0.3"
 
 jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
 jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index ae51d879c..291c5bcd8 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -30,6 +30,7 @@ extern crate transient_hashmap;
 extern crate cid;
 extern crate multihash;
 extern crate crypto as rust_crypto;
+extern crate rand;
 
 extern crate jsonrpc_core;
 extern crate jsonrpc_http_server as http;
diff --git a/rpc/src/v1/helpers/dispatch.rs b/rpc/src/v1/helpers/dispatch.rs
index 96c38d931..1588be5a9 100644
--- a/rpc/src/v1/helpers/dispatch.rs
+++ b/rpc/src/v1/helpers/dispatch.rs
@@ -37,6 +37,7 @@ use ethcore::miner::MinerService;
 use ethcore::client::MiningBlockChainClient;
 use ethcore::transaction::{Action, SignedTransaction, PendingTransaction, Transaction};
 use ethcore::account_provider::AccountProvider;
+use crypto::DEFAULT_MAC;
 
 use jsonrpc_core::Error;
 use v1::helpers::{errors, TransactionRequest, FilledTransactionRequest, ConfirmationPayload};
@@ -400,9 +401,6 @@ impl Dispatcher for LightDispatcher {
 	}
 }
 
-/// default MAC to use.
-pub const DEFAULT_MAC: [u8; 2] = [0, 0];
-
 /// Single-use account token.
 pub type AccountToken = String;
 
diff --git a/rpc/src/v1/helpers/mod.rs b/rpc/src/v1/helpers/mod.rs
index b85e6600f..0a4265616 100644
--- a/rpc/src/v1/helpers/mod.rs
+++ b/rpc/src/v1/helpers/mod.rs
@@ -25,6 +25,7 @@ pub mod light_fetch;
 pub mod informant;
 pub mod oneshot;
 pub mod ipfs;
+pub mod secretstore;
 
 mod network_settings;
 mod poll_manager;
diff --git a/rpc/src/v1/helpers/secretstore.rs b/rpc/src/v1/helpers/secretstore.rs
new file mode 100644
index 000000000..43c2c8943
--- /dev/null
+++ b/rpc/src/v1/helpers/secretstore.rs
@@ -0,0 +1,127 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::iter::repeat;
+use rand::{Rng, OsRng};
+use ethkey::{Public, Secret, math};
+use crypto;
+use util::Bytes;
+use jsonrpc_core::Error;
+use v1::helpers::errors;
+
+/// Initialization vector length.
+const INIT_VEC_LEN: usize = 16;
+
+/// Encrypt document with distributely generated key.
+pub fn encrypt_document(key: Bytes, document: Bytes) -> Result<Bytes, Error> {
+	// make document key
+	let key = into_document_key(key)?;
+
+	// use symmetric encryption to encrypt document
+	let iv = initialization_vector();
+	let mut encrypted_document = Vec::with_capacity(document.len() + iv.len());
+	encrypted_document.extend(repeat(0).take(document.len()));
+	crypto::aes::encrypt(&key, &iv, &document, &mut encrypted_document);
+	encrypted_document.extend_from_slice(&iv);
+
+	Ok(encrypted_document)
+}
+
+/// Decrypt document with distributely generated key.
+pub fn decrypt_document(key: Bytes, mut encrypted_document: Bytes) -> Result<Bytes, Error> {
+	// initialization vector takes INIT_VEC_LEN bytes
+	let encrypted_document_len = encrypted_document.len();
+	if encrypted_document_len < INIT_VEC_LEN {
+		return Err(errors::invalid_params("encrypted_document", "invalid encrypted data"));
+	}
+
+	// make document key
+	let key = into_document_key(key)?;
+
+	// use symmetric decryption to decrypt document
+	let iv = encrypted_document.split_off(encrypted_document_len - INIT_VEC_LEN);
+	let mut document = Vec::with_capacity(encrypted_document_len - INIT_VEC_LEN);
+	document.extend(repeat(0).take(encrypted_document_len - INIT_VEC_LEN));
+	crypto::aes::decrypt(&key, &iv, &encrypted_document, &mut document);
+
+	Ok(document)
+}
+
+pub fn decrypt_document_with_shadow(decrypted_secret: Public, common_point: Public, shadows: Vec<Secret>, encrypted_document: Bytes) -> Result<Bytes, Error> {
+	let key = decrypt_with_shadow_coefficients(decrypted_secret, common_point, shadows)?;
+	decrypt_document(key.to_vec(), encrypted_document)
+}
+
+fn into_document_key(key: Bytes) -> Result<Bytes, Error> {
+	// key is a previously distributely generated Public
+	if key.len() != 64 {
+		return Err(errors::invalid_params("key", "invalid public key length"));
+	}
+
+	// use x coordinate of distributely generated point as encryption key
+	Ok(key[..INIT_VEC_LEN].into())
+}
+
+fn initialization_vector() -> [u8; INIT_VEC_LEN] {
+	let mut result = [0u8; INIT_VEC_LEN];
+	let mut rng = OsRng::new().unwrap();
+	rng.fill_bytes(&mut result);
+	result
+}
+
+fn decrypt_with_shadow_coefficients(mut decrypted_shadow: Public, mut common_shadow_point: Public, shadow_coefficients: Vec<Secret>) -> Result<Public, Error> {
+	let mut shadow_coefficients_sum = shadow_coefficients[0].clone();
+	for shadow_coefficient in shadow_coefficients.iter().skip(1) {
+		shadow_coefficients_sum.add(shadow_coefficient)
+			.map_err(errors::encryption_error)?;
+	}
+
+	math::public_mul_secret(&mut common_shadow_point, &shadow_coefficients_sum)
+		.map_err(errors::encryption_error)?;
+	math::public_add(&mut decrypted_shadow, &common_shadow_point)
+		.map_err(errors::encryption_error)?;
+	Ok(decrypted_shadow)
+}
+
+#[cfg(test)]
+mod tests {
+	use util::Bytes;
+	use rustc_serialize::hex::FromHex;
+	use super::{encrypt_document, decrypt_document, decrypt_document_with_shadow};
+
+	#[test]
+	fn encrypt_and_decrypt_document() {
+		let document_key: Bytes = "cac6c205eb06c8308d65156ff6c862c62b000b8ead121a4455a8ddeff7248128d895692136f240d5d1614dc7cc4147b1bd584bd617e30560bb872064d09ea325".from_hex().unwrap();
+		let document: Bytes = b"Hello, world!!!"[..].into();
+
+		let encrypted_document = encrypt_document(document_key.clone(), document.clone()).unwrap();
+		assert!(document != encrypted_document);
+
+		let decrypted_document = decrypt_document(document_key.clone(), encrypted_document).unwrap();
+		assert_eq!(decrypted_document, document);
+	}
+
+	#[test]
+	fn encrypt_and_shadow_decrypt_document() {
+		let document: Bytes = "deadbeef".from_hex().unwrap();
+		let encrypted_document = "2ddec1f96229efa2916988d8b2a82a47ef36f71c".from_hex().unwrap();
+		let decrypted_secret = "843645726384530ffb0c52f175278143b5a93959af7864460f5a4fec9afd1450cfb8aef63dec90657f43f55b13e0a73c7524d4e9a13c051b4e5f1e53f39ecd91".parse().unwrap();
+		let common_point = "07230e34ebfe41337d3ed53b186b3861751f2401ee74b988bba55694e2a6f60c757677e194be2e53c3523cc8548694e636e6acb35c4e8fdc5e29d28679b9b2f3".parse().unwrap();
+		let shadows = vec!["46f542416216f66a7d7881f5a283d2a1ab7a87b381cbc5f29d0b093c7c89ee31".parse().unwrap()];
+		let decrypted_document = decrypt_document_with_shadow(decrypted_secret, common_point, shadows, encrypted_document).unwrap();
+		assert_eq!(decrypted_document, document);
+	}
+}
diff --git a/rpc/src/v1/impls/light/parity.rs b/rpc/src/v1/impls/light/parity.rs
index cacf33db5..63e1c64b6 100644
--- a/rpc/src/v1/impls/light/parity.rs
+++ b/rpc/src/v1/impls/light/parity.rs
@@ -27,13 +27,14 @@ use ethkey::{Brain, Generator};
 use ethstore::random_phrase;
 use ethsync::LightSyncProvider;
 use ethcore::account_provider::AccountProvider;
+use crypto::DEFAULT_MAC;
 
 use light::client::LightChainClient;
 
 use jsonrpc_core::Error;
 use jsonrpc_macros::Trailing;
 use v1::helpers::{errors, ipfs, SigningQueue, SignerService, NetworkSettings};
-use v1::helpers::dispatch::{LightDispatcher, DEFAULT_MAC};
+use v1::helpers::dispatch::LightDispatcher;
 use v1::helpers::light_fetch::LightFetch;
 use v1::metadata::Metadata;
 use v1::traits::Parity;
diff --git a/rpc/src/v1/impls/mod.rs b/rpc/src/v1/impls/mod.rs
index f5149d721..a128e7104 100644
--- a/rpc/src/v1/impls/mod.rs
+++ b/rpc/src/v1/impls/mod.rs
@@ -27,6 +27,7 @@ mod signer;
 mod signing;
 mod signing_unsafe;
 mod rpc;
+mod secretstore;
 mod traces;
 mod web3;
 
@@ -45,3 +46,4 @@ pub use self::signing::SigningQueueClient;
 pub use self::signing_unsafe::SigningUnsafeClient;
 pub use self::traces::TracesClient;
 pub use self::rpc::RpcClient;
+pub use self::secretstore::SecretStoreClient;
diff --git a/rpc/src/v1/impls/parity.rs b/rpc/src/v1/impls/parity.rs
index 1b62b7f81..689ba3e70 100644
--- a/rpc/src/v1/impls/parity.rs
+++ b/rpc/src/v1/impls/parity.rs
@@ -34,12 +34,12 @@ use ethcore::client::{MiningBlockChainClient};
 use ethcore::mode::Mode;
 use ethcore::account_provider::AccountProvider;
 use updater::{Service as UpdateService};
+use crypto::DEFAULT_MAC;
 
 use jsonrpc_core::Error;
 use jsonrpc_macros::Trailing;
 use v1::helpers::{errors, ipfs, SigningQueue, SignerService, NetworkSettings};
 use v1::helpers::accounts::unwrap_provider;
-use v1::helpers::dispatch::DEFAULT_MAC;
 use v1::metadata::Metadata;
 use v1::traits::Parity;
 use v1::types::{
diff --git a/rpc/src/v1/impls/secretstore.rs b/rpc/src/v1/impls/secretstore.rs
new file mode 100644
index 000000000..bf09baeb6
--- /dev/null
+++ b/rpc/src/v1/impls/secretstore.rs
@@ -0,0 +1,85 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! SecretStore-specific rpc implementation.
+
+use std::sync::{Arc, Weak};
+
+use crypto::DEFAULT_MAC;
+use ethkey::Secret;
+use ethcore::account_provider::AccountProvider;
+
+use jsonrpc_core::Error;
+use v1::helpers::errors;
+use v1::helpers::accounts::unwrap_provider;
+use v1::helpers::secretstore::{encrypt_document, decrypt_document, decrypt_document_with_shadow};
+use v1::traits::SecretStore;
+use v1::types::{H160, H512, Bytes};
+
+/// Parity implementation.
+pub struct SecretStoreClient {
+	accounts: Option<Weak<AccountProvider>>,
+}
+
+impl SecretStoreClient {
+	/// Creates new SecretStoreClient
+	pub fn new(store: &Option<Arc<AccountProvider>>) -> Self {
+		SecretStoreClient {
+			accounts: store.as_ref().map(Arc::downgrade),
+		}
+	}
+
+	/// Attempt to get the `Arc<AccountProvider>`, errors if provider was not
+	/// set, or if upgrading the weak reference failed.
+	fn account_provider(&self) -> Result<Arc<AccountProvider>, Error> {
+		unwrap_provider(&self.accounts)
+	}
+
+	/// Decrypt public key using account' private key
+	fn decrypt_key(&self, address: H160, password: String, key: Bytes) -> Result<Vec<u8>, Error> {
+		let store = self.account_provider()?;
+		store.decrypt(address.into(), Some(password), &DEFAULT_MAC, &key.0)
+			.map_err(|e| errors::account("Could not decrypt key.", e))
+	}
+
+	/// Decrypt secret key using account' private key
+	fn decrypt_secret(&self, address: H160, password: String, key: Bytes) -> Result<Secret, Error> {
+		self.decrypt_key(address, password, key)
+			.and_then(|s| Secret::from_slice(&s).map_err(|e| errors::account("invalid secret", e)))
+	}
+}
+
+impl SecretStore for SecretStoreClient {
+	fn encrypt(&self, address: H160, password: String, key: Bytes, data: Bytes) -> Result<Bytes, Error> {
+		encrypt_document(self.decrypt_key(address, password, key)?, data.0)
+			.map(Into::into)
+	}
+
+	fn decrypt(&self, address: H160, password: String, key: Bytes, data: Bytes) -> Result<Bytes, Error> {
+		decrypt_document(self.decrypt_key(address, password, key)?, data.0)
+			.map(Into::into)
+	}
+
+	fn shadow_decrypt(&self, address: H160, password: String, decrypted_secret: H512, common_point: H512, decrypt_shadows: Vec<Bytes>, data: Bytes) -> Result<Bytes, Error> {
+		let mut shadows = Vec::with_capacity(decrypt_shadows.len());
+		for decrypt_shadow in decrypt_shadows {
+			shadows.push(self.decrypt_secret(address.clone(), password.clone(), decrypt_shadow)?);
+		}
+
+		decrypt_document_with_shadow(decrypted_secret.into(), common_point.into(), shadows, data.0)
+			.map(Into::into)
+	}
+}
diff --git a/rpc/src/v1/mod.rs b/rpc/src/v1/mod.rs
index bd0656219..e591cbd43 100644
--- a/rpc/src/v1/mod.rs
+++ b/rpc/src/v1/mod.rs
@@ -58,7 +58,7 @@ pub mod traits;
 pub mod tests;
 pub mod types;
 
-pub use self::traits::{Web3, Eth, EthFilter, EthSigning, Net, Parity, ParityAccounts, ParitySet, ParitySigning, Signer, Personal, Traces, Rpc};
+pub use self::traits::{Web3, Eth, EthFilter, EthSigning, Net, Parity, ParityAccounts, ParitySet, ParitySigning, Signer, Personal, Traces, Rpc, SecretStore};
 pub use self::impls::*;
 pub use self::helpers::{SigningQueue, SignerService, ConfirmationsQueue, NetworkSettings, block_import, informant, dispatch};
 pub use self::metadata::Metadata;
diff --git a/rpc/src/v1/tests/mocked/mod.rs b/rpc/src/v1/tests/mocked/mod.rs
index aec2021a1..fed358574 100644
--- a/rpc/src/v1/tests/mocked/mod.rs
+++ b/rpc/src/v1/tests/mocked/mod.rs
@@ -25,6 +25,7 @@ mod parity_accounts;
 mod parity_set;
 mod personal;
 mod rpc;
+mod secretstore;
 mod signer;
 mod signing;
 mod traces;
diff --git a/rpc/src/v1/tests/mocked/secretstore.rs b/rpc/src/v1/tests/mocked/secretstore.rs
new file mode 100644
index 000000000..ed278ced8
--- /dev/null
+++ b/rpc/src/v1/tests/mocked/secretstore.rs
@@ -0,0 +1,98 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+
+use ethcore::account_provider::AccountProvider;
+
+use serde_json;
+use jsonrpc_core::{IoHandler, Success};
+use v1::metadata::Metadata;
+use v1::SecretStoreClient;
+use v1::traits::secretstore::SecretStore;
+
+struct Dependencies {
+	pub accounts: Arc<AccountProvider>,
+}
+
+impl Dependencies {
+	pub fn new() -> Self {
+		Dependencies {
+			accounts: Arc::new(AccountProvider::transient_provider()),
+		}
+	}
+
+	pub fn client(&self) -> SecretStoreClient {
+		SecretStoreClient::new(&Some(self.accounts.clone()))
+	}
+
+	fn default_client(&self) -> IoHandler<Metadata> {
+		let mut io = IoHandler::default();
+		io.extend_with(self.client().to_delegate());
+		io
+	}
+}
+
+#[test]
+fn rpc_secretstore_encrypt_and_decrypt() {
+	let deps = Dependencies::new();
+	let io = deps.default_client();
+
+	// insert new account && unlock it
+	let secret = "c1f1cfe279a5c350d13795bce162941967340c8a228e6ba175489afc564a5bef".parse().unwrap();
+	deps.accounts.insert_account(secret, "password").unwrap();
+
+	// execute encryption request
+	let encryption_request = r#"{"jsonrpc": "2.0", "method": "secretstore_encrypt", "params":[
+		"0x5c2f3b4ec0c2234f8358697edc8b82a62e3ac995", "password",
+		"0x0440262acc06f1e13cb11b34e792cdf698673a16bb812163cb52689ac34c94ae47047b58f58d8b596d21ac7b03a55896132d07a7dc028b2dad88f6c5a90623fa5b30ff4b1ba385a98c970432d13417cf6d7facd62f86faaef15ca993735890da0cb3e417e2740fc72de7501eef083a12dd5a9ebe513b592b1740848576a936a1eb88fc553fc624b1cae41a0a4e074e34e2aaae686709f08d70e505c5acba12ef96017e89be675a2adb07c72c4e95814fbf",
+		"0xdeadbeef"
+	], "id": 1}"#;
+	let encryption_response = io.handle_request_sync(encryption_request).unwrap();
+	let encryption_response: Success = serde_json::from_str(&encryption_response).unwrap();
+
+	// execute decryption request
+	let decryption_request_left = r#"{"jsonrpc": "2.0", "method": "secretstore_decrypt", "params":[
+		"0x5c2f3b4ec0c2234f8358697edc8b82a62e3ac995", "password",
+		"0x0440262acc06f1e13cb11b34e792cdf698673a16bb812163cb52689ac34c94ae47047b58f58d8b596d21ac7b03a55896132d07a7dc028b2dad88f6c5a90623fa5b30ff4b1ba385a98c970432d13417cf6d7facd62f86faaef15ca993735890da0cb3e417e2740fc72de7501eef083a12dd5a9ebe513b592b1740848576a936a1eb88fc553fc624b1cae41a0a4e074e34e2aaae686709f08d70e505c5acba12ef96017e89be675a2adb07c72c4e95814fbf",""#;
+	let decryption_request_mid = encryption_response.result.as_str().unwrap();
+	let decryption_request_right = r#""
+		], "id": 2}"#;
+	let decryption_request = decryption_request_left.to_owned() + decryption_request_mid + decryption_request_right;
+	let decryption_response = io.handle_request_sync(&decryption_request).unwrap();
+	assert_eq!(decryption_response, r#"{"jsonrpc":"2.0","result":"0xdeadbeef","id":2}"#);
+}
+
+#[test]
+fn rpc_secretstore_shadow_decrypt() {
+	let deps = Dependencies::new();
+	let io = deps.default_client();
+
+	// insert new account && unlock it
+	let secret = "82758356bf46b42710d3946a8efa612b7bf5e125e4d49f28facf1139db4a46f4".parse().unwrap();
+	deps.accounts.insert_account(secret, "password").unwrap();
+
+	// execute decryption request
+	let decryption_request = r#"{"jsonrpc": "2.0", "method": "secretstore_shadowDecrypt", "params":[
+		"0x00dfE63B22312ab4329aD0d28CaD8Af987A01932", "password",
+		"0x843645726384530ffb0c52f175278143b5a93959af7864460f5a4fec9afd1450cfb8aef63dec90657f43f55b13e0a73c7524d4e9a13c051b4e5f1e53f39ecd91",
+		"0x07230e34ebfe41337d3ed53b186b3861751f2401ee74b988bba55694e2a6f60c757677e194be2e53c3523cc8548694e636e6acb35c4e8fdc5e29d28679b9b2f3",
+		["0x049ce50bbadb6352574f2c59742f78df83333975cbd5cbb151c6e8628749a33dc1fa93bb6dffae5994e3eb98ae859ed55ee82937538e6adb054d780d1e89ff140f121529eeadb1161562af9d3342db0008919ca280a064305e5a4e518e93279de7a9396fe5136a9658e337e8e276221248c381c5384cd1ad28e5921f46ff058d5fbcf8a388fc881d0dd29421c218d51761"],
+		"0x2ddec1f96229efa2916988d8b2a82a47ef36f71c"
+	], "id": 1}"#;
+	let decryption_response = io.handle_request_sync(&decryption_request).unwrap();
+	assert_eq!(decryption_response, r#"{"jsonrpc":"2.0","result":"0xdeadbeef","id":1}"#);
+}
diff --git a/rpc/src/v1/traits/mod.rs b/rpc/src/v1/traits/mod.rs
index 6279ca0b4..3f4125341 100644
--- a/rpc/src/v1/traits/mod.rs
+++ b/rpc/src/v1/traits/mod.rs
@@ -28,6 +28,7 @@ pub mod personal;
 pub mod signer;
 pub mod traces;
 pub mod rpc;
+pub mod secretstore;
 
 pub use self::web3::Web3;
 pub use self::eth::{Eth, EthFilter};
@@ -41,4 +42,4 @@ pub use self::personal::Personal;
 pub use self::signer::Signer;
 pub use self::traces::Traces;
 pub use self::rpc::Rpc;
-
+pub use self::secretstore::SecretStore;
diff --git a/rpc/src/v1/traits/secretstore.rs b/rpc/src/v1/traits/secretstore.rs
new file mode 100644
index 000000000..c13367562
--- /dev/null
+++ b/rpc/src/v1/traits/secretstore.rs
@@ -0,0 +1,41 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! SecretStore-specific rpc interface.
+
+use jsonrpc_core::Error;
+
+use v1::types::{H160, H512, Bytes};
+
+build_rpc_trait! {
+	/// Parity-specific rpc interface.
+	pub trait SecretStore {
+		/// Encrypt data with key, received from secret store.
+		/// Arguments: `account`, `password`, `key`, `data`.
+		#[rpc(name = "secretstore_encrypt")]
+		fn encrypt(&self, H160, String, Bytes, Bytes) -> Result<Bytes, Error>;
+
+		/// Decrypt data with key, received from secret store.
+		/// Arguments: `account`, `password`, `key`, `data`.
+		#[rpc(name = "secretstore_decrypt")]
+		fn decrypt(&self, H160, String, Bytes, Bytes) -> Result<Bytes, Error>;
+
+		/// Decrypt data with shadow key, received from secret store.
+		/// Arguments: `account`, `password`, `decrypted_secret`, `common_point`, `decrypt_shadows`, `data`.
+		#[rpc(name = "secretstore_shadowDecrypt")]
+		fn shadow_decrypt(&self, H160, String, H512, H512, Vec<Bytes>, Bytes) -> Result<Bytes, Error>;
+	}
+}
diff --git a/secret_store/src/http_listener.rs b/secret_store/src/http_listener.rs
index 482fa92f6..bc51811de 100644
--- a/secret_store/src/http_listener.rs
+++ b/secret_store/src/http_listener.rs
@@ -24,9 +24,8 @@ use hyper::server::{Server as HttpServer, Request as HttpRequest, Response as Ht
 use serde_json;
 use url::percent_encoding::percent_decode;
 
-use util::ToPretty;
 use traits::KeyServer;
-use serialization::SerializableDocumentEncryptedKeyShadow;
+use serialization::{SerializableDocumentEncryptedKeyShadow, SerializableBytes};
 use types::all::{Error, NodeAddress, RequestSignature, DocumentAddress, DocumentEncryptedKey, DocumentEncryptedKeyShadow};
 
 /// Key server http-requests listener
@@ -168,9 +167,10 @@ impl<T> HttpHandler for KeyServerHttpHandler<T> where T: KeyServer + 'static {
 }
 
 fn return_document_key(req: HttpRequest, mut res: HttpResponse, document_key: Result<DocumentEncryptedKey, Error>) {
+	let document_key = document_key.
+		and_then(|k| serde_json::to_vec(&SerializableBytes(k)).map_err(|e| Error::Serde(e.to_string())));
 	match document_key {
 		Ok(document_key) => {
-			let document_key = document_key.to_hex().into_bytes();
 			res.headers_mut().set(header::ContentType::plaintext());
 			if let Err(err) = res.send(&document_key) {
 				// nothing to do, but to log an error
@@ -186,6 +186,7 @@ fn return_error(mut res: HttpResponse, err: Error) {
 		Error::BadSignature => *res.status_mut() = HttpStatusCode::BadRequest,
 		Error::AccessDenied => *res.status_mut() = HttpStatusCode::Forbidden,
 		Error::DocumentNotFound => *res.status_mut() = HttpStatusCode::NotFound,
+		Error::Serde(_) => *res.status_mut() = HttpStatusCode::BadRequest,
 		Error::Database(_) => *res.status_mut() = HttpStatusCode::InternalServerError,
 		Error::Internal(_) => *res.status_mut() = HttpStatusCode::InternalServerError,
 	}
diff --git a/secret_store/src/key_server.rs b/secret_store/src/key_server.rs
index 49016ac8e..f960c5cc5 100644
--- a/secret_store/src/key_server.rs
+++ b/secret_store/src/key_server.rs
@@ -67,7 +67,7 @@ impl KeyServer for KeyServerImpl {
 		let document_key = encryption_session.wait(None)?;
 
 		// encrypt document key with requestor public key
-		let document_key = ethcrypto::ecies::encrypt_single_message(&public, &document_key)
+		let document_key = ethcrypto::ecies::encrypt(&public, &ethcrypto::DEFAULT_MAC, &document_key)
 			.map_err(|err| Error::Internal(format!("Error encrypting document key: {}", err)))?;
 		Ok(document_key)
 	}
@@ -83,13 +83,13 @@ impl KeyServer for KeyServerImpl {
 		let document_key = decryption_session.wait()?.decrypted_secret;
 
 		// encrypt document key with requestor public key
-		let document_key = ethcrypto::ecies::encrypt_single_message(&public, &document_key)
+		let document_key = ethcrypto::ecies::encrypt(&public, &ethcrypto::DEFAULT_MAC, &document_key)
 			.map_err(|err| Error::Internal(format!("Error encrypting document key: {}", err)))?;
 		Ok(document_key)
 	}
 
 	fn document_key_shadow(&self, signature: &RequestSignature, document: &DocumentAddress) -> Result<DocumentEncryptedKeyShadow, Error> {
-		let decryption_session = self.data.lock().cluster.new_decryption_session(document.clone(), signature.clone(), false)?;
+		let decryption_session = self.data.lock().cluster.new_decryption_session(document.clone(), signature.clone(), true)?;
 		decryption_session.wait().map_err(Into::into)
 	}
 }
@@ -118,7 +118,7 @@ impl KeyServerCore {
 					return;
 				},
 			};
-			
+
 			let cluster = ClusterCore::new(el.handle(), config);
 			let cluster_client = cluster.and_then(|c| c.run().map(|_| c.client()));
 			tx.send(cluster_client.map_err(Into::into)).expect("Rx is blocking upper thread.");
@@ -229,12 +229,12 @@ pub mod tests {
 		let secret = Random.generate().unwrap().secret().clone();
 		let signature = ethkey::sign(&secret, &document).unwrap();
 		let generated_key = key_servers[0].generate_document_key(&signature, &document, threshold).unwrap();
-		let generated_key = ethcrypto::ecies::decrypt_single_message(&secret, &generated_key).unwrap();
+		let generated_key = ethcrypto::ecies::decrypt(&secret, &ethcrypto::DEFAULT_MAC, &generated_key).unwrap();
 
 		// now let's try to retrieve key back
 		for key_server in key_servers.iter() {
 			let retrieved_key = key_server.document_key(&signature, &document).unwrap();
-			let retrieved_key = ethcrypto::ecies::decrypt_single_message(&secret, &retrieved_key).unwrap();
+			let retrieved_key = ethcrypto::ecies::decrypt(&secret, &ethcrypto::DEFAULT_MAC, &retrieved_key).unwrap();
 			assert_eq!(retrieved_key, generated_key);
 		}
 	}
@@ -251,12 +251,12 @@ pub mod tests {
 			let secret = Random.generate().unwrap().secret().clone();
 			let signature = ethkey::sign(&secret, &document).unwrap();
 			let generated_key = key_servers[0].generate_document_key(&signature, &document, *threshold).unwrap();
-			let generated_key = ethcrypto::ecies::decrypt_single_message(&secret, &generated_key).unwrap();
+			let generated_key = ethcrypto::ecies::decrypt(&secret, &ethcrypto::DEFAULT_MAC, &generated_key).unwrap();
 
 			// now let's try to retrieve key back
 			for key_server in key_servers.iter() {
 				let retrieved_key = key_server.document_key(&signature, &document).unwrap();
-				let retrieved_key = ethcrypto::ecies::decrypt_single_message(&secret, &retrieved_key).unwrap();
+				let retrieved_key = ethcrypto::ecies::decrypt(&secret, &ethcrypto::DEFAULT_MAC, &retrieved_key).unwrap();
 				assert_eq!(retrieved_key, generated_key);
 			}
 		}
diff --git a/secret_store/src/key_server_cluster/decryption_session.rs b/secret_store/src/key_server_cluster/decryption_session.rs
index f4d64c246..8f5ecff7d 100644
--- a/secret_store/src/key_server_cluster/decryption_session.rs
+++ b/secret_store/src/key_server_cluster/decryption_session.rs
@@ -18,7 +18,8 @@ use std::cmp::{Ord, PartialOrd, Ordering};
 use std::collections::{BTreeSet, BTreeMap};
 use std::sync::Arc;
 use parking_lot::{Mutex, Condvar};
-use ethcrypto::ecies::encrypt_single_message;
+use ethcrypto::ecies::encrypt;
+use ethcrypto::DEFAULT_MAC;
 use ethkey::{self, Secret, Public, Signature};
 use key_server_cluster::{Error, AclStorage, DocumentKeyShare, NodeId, SessionId, DocumentEncryptedKeyShadow};
 use key_server_cluster::cluster::Cluster;
@@ -688,7 +689,7 @@ fn do_partial_decryption(node: &NodeId, requestor_public: &Public, is_shadow_dec
 		shadow_point: shadow_point,
 		decrypt_shadow: match decrypt_shadow {
 			None => None,
-			Some(decrypt_shadow) => Some(encrypt_single_message(requestor_public, &**decrypt_shadow)?),
+			Some(decrypt_shadow) => Some(encrypt(requestor_public, &DEFAULT_MAC, &**decrypt_shadow)?),
 		},
 	})
 }
@@ -1085,9 +1086,10 @@ mod tests {
 		assert!(decrypted_secret.common_point.is_some());
 		assert!(decrypted_secret.decrypt_shadows.is_some());
 		// check that KS client is able to restore original secret
-		use ethcrypto::ecies::decrypt_single_message;
+		use ethcrypto::DEFAULT_MAC;
+		use ethcrypto::ecies::decrypt;
 		let decrypt_shadows: Vec<_> = decrypted_secret.decrypt_shadows.unwrap().into_iter()
-			.map(|c| Secret::from_slice(&decrypt_single_message(key_pair.secret(), &c).unwrap()).unwrap())
+			.map(|c| Secret::from_slice(&decrypt(key_pair.secret(), &DEFAULT_MAC, &c).unwrap()).unwrap())
 			.collect();
 		let decrypted_secret = math::decrypt_with_shadow_coefficients(decrypted_secret.decrypted_secret, decrypted_secret.common_point.unwrap(), decrypt_shadows).unwrap();
 		assert_eq!(decrypted_secret, SECRET_PLAIN.into());
diff --git a/secret_store/src/serialization.rs b/secret_store/src/serialization.rs
index e918348fb..c88e9edf7 100644
--- a/secret_store/src/serialization.rs
+++ b/secret_store/src/serialization.rs
@@ -34,9 +34,9 @@ pub struct SerializableDocumentEncryptedKeyShadow {
 	pub decrypt_shadows: Vec<SerializableBytes>,
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialEq)]
 /// Serializable Bytes.
-pub struct SerializableBytes(Bytes);
+pub struct SerializableBytes(pub Bytes);
 
 impl<T> From<T> for SerializableBytes where Bytes: From<T> {
 	fn from(s: T) -> SerializableBytes {
@@ -60,7 +60,9 @@ impl Deref for SerializableBytes {
 
 impl Serialize for SerializableBytes {
 	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
-		serializer.serialize_str(&(*self.0).to_hex())
+		let mut serialized = "0x".to_owned();
+		serialized.push_str(self.0.to_hex().as_ref());
+		serializer.serialize_str(serialized.as_ref())
 	}
 }
 
@@ -69,14 +71,18 @@ impl Deserialize for SerializableBytes {
 		where D: Deserializer
 	{
 		let s = String::deserialize(deserializer)?;
-		let data = s.from_hex().map_err(SerdeError::custom)?;
-		Ok(SerializableBytes(data))
+		if s.len() >= 2 && &s[0..2] == "0x" && s.len() & 1 == 0 {
+			let data = s[2..].from_hex().map_err(SerdeError::custom)?;
+			Ok(SerializableBytes(data))
+		} else {
+			Err(SerdeError::custom("invalid format"))
+		}
 	}
 }
 
 #[derive(Clone, Debug)]
 /// Serializable Signature.
-pub struct SerializableSignature(Signature);
+pub struct SerializableSignature(pub Signature);
 
 impl<T> From<T> for SerializableSignature where Signature: From<T> {
 	fn from(s: T) -> SerializableSignature {
@@ -100,7 +106,9 @@ impl Deref for SerializableSignature {
 
 impl Serialize for SerializableSignature {
 	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
-		serializer.serialize_str(&(*self.0).to_hex())
+		let mut serialized = "0x".to_owned();
+		serialized.push_str(self.0.to_hex().as_ref());
+		serializer.serialize_str(serialized.as_ref())
 	}
 }
 
@@ -116,7 +124,11 @@ impl Deserialize for SerializableSignature {
 			}
 
 			fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-				value.parse().map(|s| SerializableSignature(s)).map_err(SerdeError::custom)
+				if value.len() >= 2 && &value[0..2] == "0x" && value.len() & 1 == 0 {
+					value[2..].parse().map(|s| SerializableSignature(s)).map_err(SerdeError::custom)
+				} else {
+					Err(SerdeError::custom("invalid format"))
+				}
 			}
 
 			fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
@@ -130,7 +142,7 @@ impl Deserialize for SerializableSignature {
 
 #[derive(Clone, Debug)]
 /// Serializable H256.
-pub struct SerializableH256(H256);
+pub struct SerializableH256(pub H256);
 
 impl<T> From<T> for SerializableH256 where H256: From<T> {
 	fn from(s: T) -> SerializableH256 {
@@ -154,7 +166,9 @@ impl Deref for SerializableH256 {
 
 impl Serialize for SerializableH256 {
 	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
-		serializer.serialize_str(&(*self.0).to_hex())
+		let mut serialized = "0x".to_owned();
+		serialized.push_str(self.0.to_hex().as_ref());
+		serializer.serialize_str(serialized.as_ref())
 	}
 }
 
@@ -170,7 +184,11 @@ impl Deserialize for SerializableH256 {
 			}
 
 			fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-				value.parse().map(|s| SerializableH256(s)).map_err(SerdeError::custom)
+				if value.len() >= 2 && &value[0..2] == "0x" && value.len() & 1 == 0 {
+					value[2..].parse().map(|s| SerializableH256(s)).map_err(SerdeError::custom)
+				} else {
+					Err(SerdeError::custom("invalid format"))
+				}
 			}
 
 			fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
@@ -184,7 +202,7 @@ impl Deserialize for SerializableH256 {
 
 #[derive(Clone, Debug)]
 /// Serializable EC scalar/secret key.
-pub struct SerializableSecret(Secret);
+pub struct SerializableSecret(pub Secret);
 
 impl<T> From<T> for SerializableSecret where Secret: From<T> {
 	fn from(s: T) -> SerializableSecret {
@@ -208,7 +226,9 @@ impl Deref for SerializableSecret {
 
 impl Serialize for SerializableSecret {
 	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
-		serializer.serialize_str(&(*self.0).to_hex())
+		let mut serialized = "0x".to_owned();
+		serialized.push_str(self.0.to_hex().as_ref());
+		serializer.serialize_str(serialized.as_ref())
 	}
 }
 
@@ -224,7 +244,11 @@ impl Deserialize for SerializableSecret {
 			}
 
 			fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-				value.parse().map(|s| SerializableSecret(s)).map_err(SerdeError::custom)
+				if value.len() >= 2 && &value[0..2] == "0x" && value.len() & 1 == 0 {
+					value[2..].parse().map(|s| SerializableSecret(s)).map_err(SerdeError::custom)
+				} else {
+					Err(SerdeError::custom("invalid format"))
+				}
 			}
 
 			fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
@@ -238,7 +262,7 @@ impl Deserialize for SerializableSecret {
 
 #[derive(Clone, Debug)]
 /// Serializable EC point/public key.
-pub struct SerializablePublic(Public);
+pub struct SerializablePublic(pub Public);
 
 impl<T> From<T> for SerializablePublic where Public: From<T> {
 	fn from(p: T) -> SerializablePublic {
@@ -282,7 +306,9 @@ impl PartialOrd for SerializablePublic {
 
 impl Serialize for SerializablePublic {
 	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
-		serializer.serialize_str(&(*self.0).to_hex())
+		let mut serialized = "0x".to_owned();
+		serialized.push_str(self.0.to_hex().as_ref());
+		serializer.serialize_str(serialized.as_ref())
 	}
 }
 
@@ -298,7 +324,11 @@ impl Deserialize for SerializablePublic {
 			}
 
 			fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-				value.parse().map(|s| SerializablePublic(s)).map_err(SerdeError::custom)
+				if value.len() >= 2 && &value[0..2] == "0x" && value.len() & 1 == 0 {
+					value[2..].parse().map(|s| SerializablePublic(s)).map_err(SerdeError::custom)
+				} else {
+					Err(SerdeError::custom("invalid format"))
+				}
 			}
 
 			fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
@@ -309,3 +339,27 @@ impl Deserialize for SerializablePublic {
 		deserializer.deserialize(HashVisitor)
 	}
 }
+
+#[cfg(test)]
+mod tests {
+	use serde_json;
+	use super::{SerializableBytes, SerializablePublic};
+
+	#[test]
+	fn serialize_and_deserialize_bytes() {
+		let bytes = SerializableBytes(vec![1, 2, 3, 4]);
+		let bytes_serialized = serde_json::to_string(&bytes).unwrap();
+		assert_eq!(&bytes_serialized, r#""0x01020304""#);
+		let bytes_deserialized: SerializableBytes = serde_json::from_str(&bytes_serialized).unwrap();
+		assert_eq!(bytes_deserialized, bytes);
+	}
+
+	#[test]
+	fn serialize_and_deserialize_public() {
+		let public = SerializablePublic("cac6c205eb06c8308d65156ff6c862c62b000b8ead121a4455a8ddeff7248128d895692136f240d5d1614dc7cc4147b1bd584bd617e30560bb872064d09ea325".parse().unwrap());
+		let public_serialized = serde_json::to_string(&public).unwrap();
+		assert_eq!(&public_serialized, r#""0xcac6c205eb06c8308d65156ff6c862c62b000b8ead121a4455a8ddeff7248128d895692136f240d5d1614dc7cc4147b1bd584bd617e30560bb872064d09ea325""#);
+		let public_deserialized: SerializablePublic = serde_json::from_str(&public_serialized).unwrap();
+		assert_eq!(public_deserialized, public);
+	}
+}
diff --git a/secret_store/src/types/all.rs b/secret_store/src/types/all.rs
index e3302a699..905841ea7 100644
--- a/secret_store/src/types/all.rs
+++ b/secret_store/src/types/all.rs
@@ -16,6 +16,7 @@
 
 use std::fmt;
 use std::collections::BTreeMap;
+use serde_json;
 
 use ethkey;
 use util;
@@ -44,6 +45,8 @@ pub enum Error {
 	AccessDenied,
 	/// Requested document not found
 	DocumentNotFound,
+	/// Serialization/deserialization error
+	Serde(String),
 	/// Database-related error
 	Database(String),
 	/// Internal error
@@ -107,12 +110,19 @@ impl fmt::Display for Error {
 			Error::BadSignature => write!(f, "Bad signature"),
 			Error::AccessDenied => write!(f, "Access dened"),
 			Error::DocumentNotFound => write!(f, "Document not found"),
+			Error::Serde(ref msg) => write!(f, "Serialization error: {}", msg),
 			Error::Database(ref msg) => write!(f, "Database error: {}", msg),
 			Error::Internal(ref msg) => write!(f, "Internal error: {}", msg),
 		}
 	}
 }
 
+impl From<serde_json::Error> for Error {
+	fn from(err: serde_json::Error) -> Self {
+		Error::Serde(err.to_string())
+	}
+}
+
 impl From<ethkey::Error> for Error {
 	fn from(err: ethkey::Error) -> Self {
 		Error::Internal(err.into())

From ed7c366b909a83ae1cdccb3aad70fe12cf2f4a6f Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Fri, 5 May 2017 16:00:40 +0200
Subject: [PATCH 106/117] EIP-86 fixes (#5506)

---
 ethcore/src/client/client.rs             | 13 ++++++-------
 ethcore/src/engines/mod.rs               |  6 ++++++
 ethcore/src/evm/instructions.rs          |  4 ++--
 ethcore/src/evm/interpreter/gasometer.rs |  2 +-
 ethcore/src/evm/interpreter/mod.rs       |  6 +++---
 ethcore/src/evm/schedule.rs              | 13 ++++---------
 ethcore/src/executive.rs                 |  7 ++++---
 ethcore/src/miner/miner.rs               |  2 +-
 ethcore/src/state/mod.rs                 |  5 +++++
 9 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index b80d68317..ccf106521 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -1354,8 +1354,7 @@ impl BlockChainClient for Client {
 					.collect();
 				match (transaction, previous_receipts) {
 					(Some(transaction), Some(previous_receipts)) => {
-						let schedule = self.engine().schedule(block_number);
-						Some(transaction_receipt(&schedule, transaction, previous_receipts))
+						Some(transaction_receipt(self.engine(), transaction, previous_receipts))
 					},
 					_ => None,
 				}
@@ -1748,7 +1747,7 @@ impl Drop for Client {
 
 /// Returns `LocalizedReceipt` given `LocalizedTransaction`
 /// and a vector of receipts from given block up to transaction index.
-fn transaction_receipt(schedule: &Schedule, mut tx: LocalizedTransaction, mut receipts: Vec<Receipt>) -> LocalizedReceipt {
+fn transaction_receipt(engine: &Engine, mut tx: LocalizedTransaction, mut receipts: Vec<Receipt>) -> LocalizedReceipt {
 	assert_eq!(receipts.len(), tx.transaction_index + 1, "All previous receipts are provided.");
 
 	let sender = tx.sender();
@@ -1772,7 +1771,7 @@ fn transaction_receipt(schedule: &Schedule, mut tx: LocalizedTransaction, mut re
 		gas_used: receipt.gas_used - prior_gas_used,
 		contract_address: match tx.action {
 			Action::Call(_) => None,
-			Action::Create => Some(contract_address(schedule.create_address, &sender, &tx.nonce, &tx.data.sha3()))
+			Action::Create => Some(contract_address(engine.create_address_scheme(block_number), &sender, &tx.nonce, &tx.data.sha3()))
 		},
 		logs: receipt.logs.into_iter().enumerate().map(|(i, log)| LocalizedLogEntry {
 			entry: log,
@@ -1827,17 +1826,17 @@ mod tests {
 	#[test]
 	fn should_return_correct_log_index() {
 		use super::transaction_receipt;
-		use evm::schedule::Schedule;
 		use ethkey::KeyPair;
 		use log_entry::{LogEntry, LocalizedLogEntry};
 		use receipt::{Receipt, LocalizedReceipt};
 		use transaction::{Transaction, LocalizedTransaction, Action};
 		use util::Hashable;
+		use tests::helpers::TestEngine;
 
 		// given
 		let key = KeyPair::from_secret_slice(&"test".sha3()).unwrap();
 		let secret = key.secret();
-		let schedule = Schedule::new_homestead();
+		let engine = TestEngine::new(0);
 
 		let block_number = 1;
 		let block_hash = 5.into();
@@ -1881,7 +1880,7 @@ mod tests {
 		}];
 
 		// when
-		let receipt = transaction_receipt(&schedule, transaction, receipts);
+		let receipt = transaction_receipt(&engine, transaction, receipts);
 
 		// then
 		assert_eq!(receipt, LocalizedReceipt {
diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
index ae57976b4..7041048b8 100644
--- a/ethcore/src/engines/mod.rs
+++ b/ethcore/src/engines/mod.rs
@@ -48,6 +48,7 @@ use receipt::Receipt;
 use snapshot::SnapshotComponents;
 use spec::CommonParams;
 use transaction::{UnverifiedTransaction, SignedTransaction};
+use evm::CreateContractAddress;
 
 use ethkey::Signature;
 use util::*;
@@ -294,4 +295,9 @@ pub trait Engine : Sync + Send {
 	fn snapshot_components(&self) -> Option<Box<SnapshotComponents>> {
 		None
 	}
+
+	/// Returns new contract address generation scheme at given block number.
+	fn create_address_scheme(&self, number: BlockNumber) -> CreateContractAddress {
+		if number >= self.params().eip86_transition { CreateContractAddress::FromCodeHash } else { CreateContractAddress::FromSenderAndNonce }
+	}
 }
diff --git a/ethcore/src/evm/instructions.rs b/ethcore/src/evm/instructions.rs
index 41c9e1ea1..eef1a9e3b 100644
--- a/ethcore/src/evm/instructions.rs
+++ b/ethcore/src/evm/instructions.rs
@@ -278,7 +278,7 @@ lazy_static! {
 		arr[RETURN as usize] =			InstructionInfo::new("RETURN",			0, 2, 0, true, GasPriceTier::Zero);
 		arr[DELEGATECALL as usize] =	InstructionInfo::new("DELEGATECALL",	0, 6, 1, true, GasPriceTier::Special);
 		arr[SUICIDE as usize] = 		InstructionInfo::new("SUICIDE",			0, 1, 0, true, GasPriceTier::Special);
-		arr[CREATE_P2SH as usize] = 	InstructionInfo::new("CREATE_P2SH",		0, 3, 1, true, GasPriceTier::Special);
+		arr[CREATE2 as usize] = 		InstructionInfo::new("CREATE2",			0, 3, 1, true, GasPriceTier::Special);
 		arr
 	};
 }
@@ -555,7 +555,7 @@ pub const RETURN: Instruction = 0xf3;
 /// like CALLCODE but keeps caller's value and sender
 pub const DELEGATECALL: Instruction = 0xf4;
 /// create a new account and set creation address to sha3(sender + sha3(init code)) % 2**160
-pub const CREATE_P2SH: Instruction = 0xfb;
+pub const CREATE2: Instruction = 0xfb;
 /// halt execution and register account for later deletion
 pub const SUICIDE: Instruction = 0xff;
 
diff --git a/ethcore/src/evm/interpreter/gasometer.rs b/ethcore/src/evm/interpreter/gasometer.rs
index fb0c86d35..246c93bad 100644
--- a/ethcore/src/evm/interpreter/gasometer.rs
+++ b/ethcore/src/evm/interpreter/gasometer.rs
@@ -223,7 +223,7 @@ impl<Gas: CostType> Gasometer<Gas> {
 
 				Request::GasMemProvide(gas, mem, Some(requested))
 			},
-			instructions::CREATE | instructions::CREATE_P2SH => {
+			instructions::CREATE | instructions::CREATE2 => {
 				let gas = Gas::from(schedule.create_gas);
 				let mem = mem_needed(stack.peek(1), stack.peek(2))?;
 
diff --git a/ethcore/src/evm/interpreter/mod.rs b/ethcore/src/evm/interpreter/mod.rs
index 7fbab7ebc..f08737d24 100644
--- a/ethcore/src/evm/interpreter/mod.rs
+++ b/ethcore/src/evm/interpreter/mod.rs
@@ -183,7 +183,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 		let schedule = ext.schedule();
 
 		if (instruction == instructions::DELEGATECALL && !schedule.have_delegate_call) ||
-			(instruction == instructions::CREATE_P2SH && !schedule.have_create_p2sh) {
+			(instruction == instructions::CREATE2 && !schedule.have_create2) {
 
 			return Err(evm::Error::BadInstruction {
 				instruction: instruction
@@ -268,12 +268,12 @@ impl<Cost: CostType> Interpreter<Cost> {
 			instructions::JUMPDEST => {
 				// ignore
 			},
-			instructions::CREATE | instructions::CREATE_P2SH => {
+			instructions::CREATE | instructions::CREATE2 => {
 				let endowment = stack.pop_back();
 				let init_off = stack.pop_back();
 				let init_size = stack.pop_back();
 
-				let address_scheme = if instruction == instructions::CREATE { ext.schedule().create_address } else { CreateContractAddress::FromSenderAndCodeHash };
+				let address_scheme = if instruction == instructions::CREATE { CreateContractAddress::FromSenderAndNonce } else { CreateContractAddress::FromSenderAndCodeHash };
 				let create_gas = provided.expect("`provided` comes through Self::exec from `Gasometer::get_gas_cost_mem`; `gas_gas_mem_cost` guarantees `Some` when instruction is `CALL`/`CALLCODE`/`DELEGATECALL`/`CREATE`; this is `CREATE`; qed");
 
 				let contract_code = self.mem.read_slice(init_off, init_size);
diff --git a/ethcore/src/evm/schedule.rs b/ethcore/src/evm/schedule.rs
index 97df4d784..3e01f3925 100644
--- a/ethcore/src/evm/schedule.rs
+++ b/ethcore/src/evm/schedule.rs
@@ -15,7 +15,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Cost schedule and other parameterisations for the EVM.
-use evm::CreateContractAddress;
 
 /// Definition of the cost schedule and other parameterisations for the EVM.
 pub struct Schedule {
@@ -24,7 +23,7 @@ pub struct Schedule {
 	/// Does it have a delegate cal
 	pub have_delegate_call: bool,
 	/// Does it have a CREATE_P2SH instruction
-	pub have_create_p2sh: bool,
+	pub have_create2: bool,
 	/// VM stack limit
 	pub stack_limit: usize,
 	/// Max number of nested calls/creates
@@ -102,8 +101,6 @@ pub struct Schedule {
 	pub no_empty: bool,
 	/// Kill empty accounts if touched.
 	pub kill_empty: bool,
-	/// Contract address generation scheme
-	pub create_address: CreateContractAddress,
 }
 
 impl Schedule {
@@ -118,11 +115,11 @@ impl Schedule {
 	}
 
 	/// Schedule for the post-EIP-150-era of the Ethereum main net.
-	pub fn new_post_eip150(max_code_size: usize, fix_exp: bool, no_empty: bool, kill_empty: bool, have_create_p2sh: bool) -> Schedule {
+	pub fn new_post_eip150(max_code_size: usize, fix_exp: bool, no_empty: bool, kill_empty: bool, have_metropolis_instructions: bool) -> Schedule {
 		Schedule {
 			exceptional_failed_code_deposit: true,
 			have_delegate_call: true,
-			have_create_p2sh: have_create_p2sh,
+			have_create2: have_metropolis_instructions,
 			stack_limit: 1024,
 			max_depth: 1024,
 			tier_step_gas: [0, 2, 3, 5, 8, 10, 20, 0],
@@ -161,7 +158,6 @@ impl Schedule {
 			sub_gas_cap_divisor: Some(64),
 			no_empty: no_empty,
 			kill_empty: kill_empty,
-			create_address: if have_create_p2sh { CreateContractAddress::FromCodeHash } else { CreateContractAddress::FromSenderAndNonce },
 		}
 	}
 
@@ -174,7 +170,7 @@ impl Schedule {
 		Schedule {
 			exceptional_failed_code_deposit: efcd,
 			have_delegate_call: hdc,
-			have_create_p2sh: false,
+			have_create2: false,
 			stack_limit: 1024,
 			max_depth: 1024,
 			tier_step_gas: [0, 2, 3, 5, 8, 10, 20, 0],
@@ -213,7 +209,6 @@ impl Schedule {
 			sub_gas_cap_divisor: None,
 			no_empty: false,
 			kill_empty: false,
-			create_address: CreateContractAddress::FromSenderAndNonce,
 		}
 	}
 }
diff --git a/ethcore/src/executive.rs b/ethcore/src/executive.rs
index 494d59db9..1974a6c8d 100644
--- a/ethcore/src/executive.rs
+++ b/ethcore/src/executive.rs
@@ -185,7 +185,7 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		let (gas_left, output) = match t.action {
 			Action::Create => {
 				let code_hash = t.data.sha3();
-				let new_address = contract_address(schedule.create_address, &sender, &nonce, &code_hash);
+				let new_address = contract_address(self.engine.create_address_scheme(self.info.number), &sender, &nonce, &code_hash);
 				let params = ActionParams {
 					code_address: new_address.clone(),
 					code_hash: code_hash,
@@ -386,8 +386,8 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		vm_tracer: &mut V,
 	) -> evm::Result<U256> where T: Tracer, V: VMTracer {
 
-		let schedule = self.engine.schedule(self.info.number);
-		if schedule.create_address != CreateContractAddress::FromSenderAndNonce && self.state.exists(&params.address)? {
+		let scheme = self.engine.create_address_scheme(self.info.number);
+		if scheme != CreateContractAddress::FromSenderAndNonce && self.state.exists_and_has_code(&params.address)? {
 			return Err(evm::Error::OutOfGas);
 		}
 
@@ -398,6 +398,7 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		let mut unconfirmed_substate = Substate::new();
 
 		// create contract and transfer value to it if necessary
+		let schedule = self.engine.schedule(self.info.number);
 		let nonce_offset = if schedule.no_empty {1} else {0}.into();
 		let prev_bal = self.state.balance(&params.address)?;
 		if let ActionValue::Transfer(val) = params.value {
diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
index ed551e2f3..38e97f683 100644
--- a/ethcore/src/miner/miner.rs
+++ b/ethcore/src/miner/miner.rs
@@ -1048,7 +1048,7 @@ impl MinerService for Miner {
 								Action::Call(_) => None,
 								Action::Create => {
 									let sender = tx.sender();
-									Some(contract_address(self.engine.schedule(pending.header().number()).create_address, &sender, &tx.nonce, &tx.data.sha3()))
+									Some(contract_address(self.engine.create_address_scheme(pending.header().number()), &sender, &tx.nonce, &tx.data.sha3()))
 								}
 							},
 							logs: receipt.logs.clone(),
diff --git a/ethcore/src/state/mod.rs b/ethcore/src/state/mod.rs
index 639fac053..11ca9154f 100644
--- a/ethcore/src/state/mod.rs
+++ b/ethcore/src/state/mod.rs
@@ -433,6 +433,11 @@ impl<B: Backend> State<B> {
 		self.ensure_cached(a, RequireCache::None, false, |a| a.map_or(false, |a| !a.is_null()))
 	}
 
+	/// Determine whether an account exists and has code.
+	pub fn exists_and_has_code(&self, a: &Address) -> trie::Result<bool> {
+		self.ensure_cached(a, RequireCache::CodeSize, false, |a| a.map_or(false, |a| a.code_size().map_or(false, |size| size != 0)))
+	}
+
 	/// Get the balance of account `a`.
 	pub fn balance(&self, a: &Address) -> trie::Result<U256> {
 		self.ensure_cached(a, RequireCache::None, true,

From 6dd1fe03125b9b9836020820a45e991598a52a6c Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Fri, 5 May 2017 16:01:19 +0200
Subject: [PATCH 107/117] reorg into blocks before minimum history (#5558)

---
 ethcore/src/client/client.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index ccf106521..a1f47251c 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -377,7 +377,7 @@ impl Client {
 		let chain = self.chain.read();
 		// Check the block isn't so old we won't be able to enact it.
 		let best_block_number = chain.best_block_number();
-		if best_block_number >= self.history && header.number() <= best_block_number - self.history {
+		if self.pruning_info().earliest_state > header.number() {
 			warn!(target: "client", "Block import failed for #{} ({})\nBlock is ancient (current best block: #{}).", header.number(), header.hash(), best_block_number);
 			return Err(());
 		}
@@ -770,7 +770,7 @@ impl Client {
 			let db = self.state_db.lock().boxed_clone();
 
 			// early exit for pruned blocks
-			if db.is_pruned() && self.chain.read().best_block_number() >= block_number + self.history {
+			if db.is_pruned() && self.pruning_info().earliest_state > block_number {
 				return None;
 			}
 
@@ -871,7 +871,7 @@ impl Client {
 		let best_block_number = self.chain_info().best_block_number;
 		let block_number = self.block_number(at).ok_or(snapshot::Error::InvalidStartingBlock(at))?;
 
-		if best_block_number > self.history + block_number && db.is_pruned() {
+		if db.is_pruned() && self.pruning_info().earliest_state > block_number {
 			return Err(snapshot::Error::OldBlockPrunedDB.into());
 		}
 

From 91d6f14e3c48c802fb4447c3ab681ed7f7acb10a Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@parity.io>
Date: Sat, 6 May 2017 13:24:00 +0200
Subject: [PATCH 108/117] Fix CI paths. (#5570)

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52dc50931..353941ae0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -254,7 +254,7 @@ linux-armv7:
     - cat .cargo/config
     - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
     - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity
-    - export SHA3=$(rhash --sha3-256 ~/Core/parity/target/release/parity -p %h)
+    - export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
     - md5sum target/$PLATFORM/release/parity > parity.md5
     - sh scripts/deb-build.sh armhf
     - cp target/$PLATFORM/release/parity deb/usr/bin/parity
@@ -300,7 +300,7 @@ linux-arm:
     - cat .cargo/config
     - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
     - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity
-    - export SHA3=$(rhash --sha3-256 ~/Core/parity/target/release/parity -p %h)
+    - export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
     - md5sum target/$PLATFORM/release/parity > parity.md5
     - sh scripts/deb-build.sh armhf
     - cp target/$PLATFORM/release/parity deb/usr/bin/parity
@@ -346,7 +346,7 @@ linux-armv6:
     - cat .cargo/config
     - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
     - arm-linux-gnueabi-strip target/$PLATFORM/release/parity
-    - export SHA3=$(rhash --sha3-256 ~/Core/parity/target/release/parity -p %h)
+    - export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
     - md5sum target/$PLATFORM/release/parity > parity.md5
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
@@ -385,7 +385,7 @@ linux-aarch64:
     - cat .cargo/config
     - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
     - aarch64-linux-gnu-strip target/$PLATFORM/release/parity
-    - export SHA3=$(rhash --sha3-256 ~/Core/parity/target/release/parity -p %h)
+    - export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
     - md5sum target/$PLATFORM/release/parity > parity.md5
     - sh scripts/deb-build.sh arm64
     - cp target/$PLATFORM/release/parity deb/usr/bin/parity

From 1617264b69e0901600e6ea331d42cf7ae8c4c17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Sat, 6 May 2017 13:24:18 +0200
Subject: [PATCH 109/117] Generic PubSub implementation (#5456)

* Generic PubSub

* Adding more tests.

* Fix submodules.

* Remove PartialEq

* Actually remove the implementation.

* Update mod.rs

* Update mod.rs
---
 Cargo.lock                                 |  12 ++
 parity/rpc.rs                              |  61 ++++++-
 parity/rpc_apis.rs                         |  53 +++++--
 parity/run.rs                              |   1 +
 rpc/Cargo.toml                             |   2 +
 rpc/src/lib.rs                             |   5 +-
 rpc/src/v1/helpers/mod.rs                  |   2 +
 rpc/src/v1/helpers/subscription_manager.rs | 175 +++++++++++++++++++++
 rpc/src/v1/impls/mod.rs                    |   4 +-
 rpc/src/v1/impls/pubsub.rs                 | 100 ++++++++++++
 rpc/src/v1/metadata.rs                     |  16 +-
 rpc/src/v1/mod.rs                          |   2 +-
 rpc/src/v1/tests/mocked/mod.rs             |   1 +
 rpc/src/v1/tests/mocked/pubsub.rs          |  76 +++++++++
 rpc/src/v1/traits/mod.rs                   |   2 +
 rpc/src/v1/traits/pubsub.rs                |  39 +++++
 16 files changed, 524 insertions(+), 27 deletions(-)
 create mode 100644 rpc/src/v1/helpers/subscription_manager.rs
 create mode 100644 rpc/src/v1/impls/pubsub.rs
 create mode 100644 rpc/src/v1/tests/mocked/pubsub.rs
 create mode 100644 rpc/src/v1/traits/pubsub.rs

diff --git a/Cargo.lock b/Cargo.lock
index f59140ada..e92bae295 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1705,6 +1705,7 @@ dependencies = [
  "jsonrpc-ipc-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-macros 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-minihttp-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
+ "jsonrpc-pubsub 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "jsonrpc-ws-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "multihash 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1722,6 +1723,7 @@ dependencies = [
  "serde_json 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "stats 0.1.0",
  "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "transient-hashmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2554,6 +2556,15 @@ dependencies = [
  "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tokio-timer"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "tokio-uds"
 version = "0.1.4"
@@ -2987,6 +2998,7 @@ dependencies = [
 "checksum tokio-proto 0.1.0 (git+https://github.com/tomusdrw/tokio-proto)" = "<none>"
 "checksum tokio-proto 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c0d6031f94d78d7b4d509d4a7c5e1cdf524a17e7b08d1c188a83cf720e69808"
 "checksum tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
+"checksum tokio-timer 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86f33def658c14724fc13ec6289b3875a8152ee8ae767a5b1ccbded363b03db8"
 "checksum tokio-uds 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bd209039933255ea77c6d7a1d18abc20b997d161acb900acca6eb74cdd049f31"
 "checksum toml 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "fcd27a04ca509aff336ba5eb2abc58d456f52c4ff64d9724d88acb85ead560b6"
 "checksum toml 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a442dfc13508e603c3f763274361db7f79d7469a0e95c411cde53662ab30fc72"
diff --git a/parity/rpc.rs b/parity/rpc.rs
index 1fc503767..2ac93baf7 100644
--- a/parity/rpc.rs
+++ b/parity/rpc.rs
@@ -22,7 +22,7 @@ use dir::default_data_path;
 use parity_rpc::informant::{RpcStats, Middleware};
 use parity_rpc::{self as rpc, HttpServerError, Metadata, Origin, DomainsValidation};
 use helpers::parity_ipc_path;
-use jsonrpc_core::MetaIoHandler;
+use jsonrpc_core::{futures, MetaIoHandler};
 use parity_reactor::TokioRemote;
 use rpc_apis::{self, ApiSet};
 
@@ -126,11 +126,53 @@ impl rpc::IpcMetaExtractor<Metadata> for RpcExtractor {
 	}
 }
 
-impl rpc::ws::MetaExtractor<Metadata> for RpcExtractor {
+struct Sender(rpc::ws::ws::Sender, futures::sync::mpsc::Receiver<String>);
+
+impl futures::Future for Sender {
+	type Item = ();
+	type Error = ();
+
+	fn poll(&mut self) -> futures::Poll<Self::Item, Self::Error> {
+		use self::futures::Stream;
+
+		let item = self.1.poll()?;
+		match item {
+			futures::Async::NotReady => {
+				Ok(futures::Async::NotReady)
+			},
+			futures::Async::Ready(None) => {
+				Ok(futures::Async::Ready(()))
+			},
+			futures::Async::Ready(Some(val)) => {
+				if let Err(e) = self.0.send(val) {
+					warn!("Error sending a subscription update: {:?}", e);
+				}
+				self.poll()
+			},
+		}
+	}
+}
+
+struct WsRpcExtractor {
+	remote: TokioRemote,
+}
+
+impl WsRpcExtractor {
+	fn wrap_out(&self, out: rpc::ws::ws::Sender) -> futures::sync::mpsc::Sender<String> {
+		let (sender, receiver) = futures::sync::mpsc::channel(8);
+		self.remote.spawn(move |_| Sender(out, receiver));
+		sender
+	}
+}
+
+impl rpc::ws::MetaExtractor<Metadata> for WsRpcExtractor {
 	fn extract(&self, req: &rpc::ws::RequestContext) -> Metadata {
 		let mut metadata = Metadata::default();
 		let id = req.session_id as u64;
 		metadata.origin = Origin::Ws(id.into());
+		metadata.session = Some(Arc::new(rpc::PubSubSession::new(
+			self.wrap_out(req.out.clone())
+		)));
 		metadata
 	}
 }
@@ -173,10 +215,12 @@ pub fn new_ws<D: rpc_apis::Dependencies>(
 	let start_result = rpc::start_ws(
 		&addr,
 		handler,
-		remote,
+		remote.clone(),
 		allowed_origins,
 		allowed_hosts,
-		RpcExtractor,
+		WsRpcExtractor {
+			remote: remote,
+		},
 		WsStats {
 			stats: deps.stats.clone(),
 		},
@@ -247,7 +291,14 @@ pub fn new_ipc<D: rpc_apis::Dependencies>(
 
 	let handler = setup_apis(conf.apis, dependencies);
 	let remote = dependencies.remote.clone();
-	match rpc::start_ipc(&conf.socket_addr, handler, remote, RpcExtractor) {
+	let ipc = rpc::start_ipc(
+		&conf.socket_addr,
+		handler,
+		remote,
+		RpcExtractor,
+	);
+
+	match ipc {
 		Ok(server) => Ok(Some(server)),
 		Err(io_error) => Err(format!("IPC error: {}", io_error)),
 	}
diff --git a/parity/rpc_apis.rs b/parity/rpc_apis.rs
index 0ff204aba..48e66e322 100644
--- a/parity/rpc_apis.rs
+++ b/parity/rpc_apis.rs
@@ -31,11 +31,12 @@ use parity_rpc::informant::{ActivityNotifier, Middleware, RpcStats, ClientNotifi
 use parity_rpc::dispatch::{FullDispatcher, LightDispatcher};
 use ethsync::{ManageNetwork, SyncProvider, LightSync};
 use hash_fetch::fetch::Client as FetchClient;
-use jsonrpc_core::{MetaIoHandler};
+use jsonrpc_core::{self as core, MetaIoHandler};
 use light::{TransactionQueue as LightTransactionQueue, Cache as LightDataCache};
 use updater::Updater;
 use util::{Mutex, RwLock};
 use ethcore_logger::RotatingLogger;
+use parity_reactor;
 
 #[derive(Debug, PartialEq, Clone, Eq, Hash)]
 pub enum Api {
@@ -195,18 +196,16 @@ pub struct FullDependencies {
 	pub dapps_interface: Option<String>,
 	pub dapps_port: Option<u16>,
 	pub fetch: FetchClient,
+	pub remote: parity_reactor::Remote,
 }
 
-impl Dependencies for FullDependencies {
-	type Notifier = ClientNotifier;
-
-	fn activity_notifier(&self) -> ClientNotifier {
-		ClientNotifier {
-			client: self.client.clone(),
-		}
-	}
-
-	fn extend_with_set(&self, handler: &mut MetaIoHandler<Metadata, Middleware>, apis: &[Api]) {
+impl FullDependencies {
+	fn extend_api<T: core::Middleware<Metadata>>(
+		&self,
+		handler: &mut MetaIoHandler<Metadata, T>,
+		apis: &[Api],
+		for_generic_pubsub: bool,
+	) {
 		use parity_rpc::v1::*;
 
 		macro_rules! add_signing_methods {
@@ -248,10 +247,12 @@ impl Dependencies for FullDependencies {
 					);
 					handler.extend_with(client.to_delegate());
 
-					let filter_client = EthFilterClient::new(self.client.clone(), self.miner.clone());
-					handler.extend_with(filter_client.to_delegate());
+					if !for_generic_pubsub {
+						let filter_client = EthFilterClient::new(self.client.clone(), self.miner.clone());
+						handler.extend_with(filter_client.to_delegate());
 
-					add_signing_methods!(EthSigning, handler, self);
+						add_signing_methods!(EthSigning, handler, self);
+					}
 				},
 				Api::Personal => {
 					handler.extend_with(PersonalClient::new(&self.secret_store, dispatcher.clone(), self.geth_compatibility).to_delegate());
@@ -278,8 +279,14 @@ impl Dependencies for FullDependencies {
 						self.dapps_port,
 					).to_delegate());
 
-					add_signing_methods!(EthSigning, handler, self);
-					add_signing_methods!(ParitySigning, handler, self);
+					if !for_generic_pubsub {
+						let mut rpc = MetaIoHandler::default();
+						self.extend_api(&mut rpc, apis, true);
+						handler.extend_with(PubSubClient::new(rpc, self.remote.clone()).to_delegate());
+
+						add_signing_methods!(EthSigning, handler, self);
+						add_signing_methods!(ParitySigning, handler, self);
+					}
 				},
 				Api::ParityAccounts => {
 					handler.extend_with(ParityAccountsClient::new(&self.secret_store).to_delegate());
@@ -308,6 +315,20 @@ impl Dependencies for FullDependencies {
 	}
 }
 
+impl Dependencies for FullDependencies {
+	type Notifier = ClientNotifier;
+
+	fn activity_notifier(&self) -> ClientNotifier {
+		ClientNotifier {
+			client: self.client.clone(),
+		}
+	}
+
+	fn extend_with_set(&self, handler: &mut MetaIoHandler<Metadata, Middleware<Self::Notifier>>, apis: &[Api]) {
+		self.extend_api(handler, apis, false)
+	}
+}
+
 /// Light client notifier. Doesn't do anything yet, but might in the future.
 pub struct LightClientNotifier;
 
diff --git a/parity/run.rs b/parity/run.rs
index 9d90ba006..083cbe5ce 100644
--- a/parity/run.rs
+++ b/parity/run.rs
@@ -631,6 +631,7 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 			false => None,
 		},
 		fetch: fetch.clone(),
+		remote: event_loop.remote(),
 	});
 
 	let dependencies = rpc::Dependencies {
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 0067bdeaa..b1e2d64aa 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -17,6 +17,7 @@ serde = "0.9"
 serde_derive = "0.9"
 serde_json = "0.9"
 time = "0.1"
+tokio-timer = "0.1"
 transient-hashmap = "0.4"
 cid = "0.2.1"
 multihash = "0.5"
@@ -29,6 +30,7 @@ jsonrpc-minihttp-server = { git = "https://github.com/paritytech/jsonrpc.git", b
 jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
 jsonrpc-ipc-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
 jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
+jsonrpc-pubsub = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
 
 ethcore-io = { path = "../util/io" }
 ethcore-ipc = { path = "../ipc/rpc" }
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index 291c5bcd8..4540d6b33 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -26,6 +26,7 @@ extern crate semver;
 extern crate serde;
 extern crate serde_json;
 extern crate time;
+extern crate tokio_timer;
 extern crate transient_hashmap;
 extern crate cid;
 extern crate multihash;
@@ -34,8 +35,9 @@ extern crate rand;
 
 extern crate jsonrpc_core;
 extern crate jsonrpc_http_server as http;
-extern crate jsonrpc_minihttp_server as minihttp;
 extern crate jsonrpc_ipc_server as ipc;
+extern crate jsonrpc_minihttp_server as minihttp;
+extern crate jsonrpc_pubsub;
 
 extern crate ethash;
 extern crate ethcore;
@@ -76,6 +78,7 @@ pub extern crate jsonrpc_ws_server as ws;
 mod metadata;
 pub mod v1;
 
+pub use jsonrpc_pubsub::Session as PubSubSession;
 pub use ipc::{Server as IpcServer, MetaExtractor as IpcMetaExtractor, RequestContext as IpcRequestContext};
 pub use http::{
 	hyper,
diff --git a/rpc/src/v1/helpers/mod.rs b/rpc/src/v1/helpers/mod.rs
index 0a4265616..1e26de852 100644
--- a/rpc/src/v1/helpers/mod.rs
+++ b/rpc/src/v1/helpers/mod.rs
@@ -33,6 +33,7 @@ mod poll_filter;
 mod requests;
 mod signer;
 mod signing_queue;
+mod subscription_manager;
 
 pub use self::dispatch::{Dispatcher, FullDispatcher};
 pub use self::network_settings::NetworkSettings;
@@ -46,3 +47,4 @@ pub use self::signing_queue::{
 	QUEUE_LIMIT as SIGNING_QUEUE_LIMIT,
 };
 pub use self::signer::SignerService;
+pub use self::subscription_manager::GenericPollManager;
diff --git a/rpc/src/v1/helpers/subscription_manager.rs b/rpc/src/v1/helpers/subscription_manager.rs
new file mode 100644
index 000000000..4b82fdcc4
--- /dev/null
+++ b/rpc/src/v1/helpers/subscription_manager.rs
@@ -0,0 +1,175 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Generic poll manager for Pub-Sub.
+
+use std::sync::Arc;
+use std::collections::HashMap;
+use util::Mutex;
+
+use jsonrpc_core::futures::future::{self, Either};
+use jsonrpc_core::futures::sync::mpsc;
+use jsonrpc_core::futures::{Sink, Future, BoxFuture};
+use jsonrpc_core::{self as core, MetaIoHandler};
+
+use v1::metadata::Metadata;
+
+#[derive(Debug)]
+struct Subscription {
+	metadata: Metadata,
+	method: String,
+	params: core::Params,
+	sink: mpsc::Sender<Result<core::Value, core::Error>>,
+	last_result: Arc<Mutex<Option<core::Output>>>,
+}
+
+/// A struct managing all subscriptions.
+/// TODO [ToDr] Depending on the method decide on poll interval.
+/// For most of the methods it will be enough to poll on new block instead of time-interval.
+pub struct GenericPollManager<S: core::Middleware<Metadata>> {
+	next_id: usize,
+	poll_subscriptions: HashMap<usize, Subscription>,
+	rpc: MetaIoHandler<Metadata, S>,
+}
+
+impl<S: core::Middleware<Metadata>> GenericPollManager<S> {
+	/// Creates new poll manager
+	pub fn new(rpc: MetaIoHandler<Metadata, S>) -> Self {
+		GenericPollManager {
+			next_id: 1,
+			poll_subscriptions: Default::default(),
+			rpc: rpc,
+		}
+	}
+
+	/// Subscribes to update from polling given method.
+	pub fn subscribe(&mut self, metadata: Metadata, method: String, params: core::Params)
+		-> (usize, mpsc::Receiver<Result<core::Value, core::Error>>)
+	{
+		let id = self.next_id;
+		self.next_id += 1;
+
+		let (sink, stream) = mpsc::channel(1);
+
+		let subscription = Subscription {
+			metadata: metadata,
+			method: method,
+			params: params,
+			sink: sink,
+			last_result: Default::default(),
+		};
+
+		debug!(target: "pubsub", "Adding subscription id={:?}, {:?}", id, subscription);
+		self.poll_subscriptions.insert(id, subscription);
+		(id, stream)
+	}
+
+	pub fn unsubscribe(&mut self, id: usize) -> bool {
+		debug!(target: "pubsub", "Removing subscription: {:?}", id);
+		self.poll_subscriptions.remove(&id).is_some()
+	}
+
+	pub fn tick(&self) -> BoxFuture<(), ()> {
+		let mut futures = Vec::new();
+		// poll all subscriptions
+		for (id, subscription) in self.poll_subscriptions.iter() {
+			let call = core::MethodCall {
+				jsonrpc: Some(core::Version::V2),
+				id: core::Id::Num(*id as u64),
+				method: subscription.method.clone(),
+				params: Some(subscription.params.clone()),
+			};
+			trace!(target: "pubsub", "Polling method: {:?}", call);
+			let result = self.rpc.handle_call(call.into(), subscription.metadata.clone());
+
+			let last_result = subscription.last_result.clone();
+			let sender = subscription.sink.clone();
+
+			let result = result.and_then(move |response| {
+				let mut last_result = last_result.lock();
+				if *last_result != response && response.is_some() {
+					let output = response.expect("Existence proved by the condition.");
+					debug!(target: "pubsub", "Got new response, sending: {:?}", output);
+					*last_result = Some(output.clone());
+
+					let send = match output {
+						core::Output::Success(core::Success { result, .. }) => Ok(result),
+						core::Output::Failure(core::Failure { error, .. }) => Err(error),
+					};
+					Either::A(sender.send(send).map(|_| ()).map_err(|_| ()))
+				} else {
+					trace!(target: "pubsub", "Response was not changed: {:?}", response);
+					Either::B(future::ok(()))
+				}
+			});
+
+			futures.push(result)
+		}
+
+		// return a future represeting all the polls
+		future::join_all(futures).map(|_| ()).boxed()
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use std::sync::atomic::{self, AtomicBool};
+
+	use jsonrpc_core::{MetaIoHandler, NoopMiddleware, Value, Params};
+	use jsonrpc_core::futures::{Future, Stream};
+	use http::tokio_core::reactor;
+
+	use super::GenericPollManager;
+
+	fn poll_manager() -> GenericPollManager<NoopMiddleware> {
+		let mut io = MetaIoHandler::default();
+		let called = AtomicBool::new(false);
+		io.add_method("hello", move |_| {
+			if !called.load(atomic::Ordering::SeqCst) {
+				called.store(true, atomic::Ordering::SeqCst);
+				Ok(Value::String("hello".into()))
+			} else {
+				Ok(Value::String("world".into()))
+			}
+		});
+		GenericPollManager::new(io)
+	}
+
+	#[test]
+	fn should_poll_subscribed_method() {
+		// given
+		let mut el = reactor::Core::new().unwrap();
+		let mut poll_manager = poll_manager();
+		let (id, rx) = poll_manager.subscribe(Default::default(), "hello".into(), Params::None);
+		assert_eq!(id, 1);
+
+		// then
+		poll_manager.tick().wait().unwrap();
+		let (res, rx) = el.run(rx.into_future()).unwrap();
+		assert_eq!(res, Some(Ok(Value::String("hello".into()))));
+
+		// retrieve second item
+		poll_manager.tick().wait().unwrap();
+		let (res, rx) = el.run(rx.into_future()).unwrap();
+		assert_eq!(res, Some(Ok(Value::String("world".into()))));
+
+		// and no more notifications
+		poll_manager.tick().wait().unwrap();
+		// we need to unsubscribe otherwise the future will never finish.
+		poll_manager.unsubscribe(1);
+		assert_eq!(el.run(rx.into_future()).unwrap().0, None);
+	}
+}
diff --git a/rpc/src/v1/impls/mod.rs b/rpc/src/v1/impls/mod.rs
index a128e7104..a8691b32b 100644
--- a/rpc/src/v1/impls/mod.rs
+++ b/rpc/src/v1/impls/mod.rs
@@ -23,6 +23,7 @@ mod parity;
 mod parity_accounts;
 mod parity_set;
 mod personal;
+mod pubsub;
 mod signer;
 mod signing;
 mod signing_unsafe;
@@ -33,7 +34,6 @@ mod web3;
 
 pub mod light;
 
-pub use self::web3::Web3Client;
 pub use self::eth::{EthClient, EthClientOptions};
 pub use self::eth_filter::EthFilterClient;
 pub use self::net::NetClient;
@@ -41,9 +41,11 @@ pub use self::parity::ParityClient;
 pub use self::parity_accounts::ParityAccountsClient;
 pub use self::parity_set::ParitySetClient;
 pub use self::personal::PersonalClient;
+pub use self::pubsub::PubSubClient;
 pub use self::signer::SignerClient;
 pub use self::signing::SigningQueueClient;
 pub use self::signing_unsafe::SigningUnsafeClient;
 pub use self::traces::TracesClient;
+pub use self::web3::Web3Client;
 pub use self::rpc::RpcClient;
 pub use self::secretstore::SecretStoreClient;
diff --git a/rpc/src/v1/impls/pubsub.rs b/rpc/src/v1/impls/pubsub.rs
new file mode 100644
index 000000000..8badefdb8
--- /dev/null
+++ b/rpc/src/v1/impls/pubsub.rs
@@ -0,0 +1,100 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Parity-specific PUB-SUB rpc implementation.
+
+use std::sync::Arc;
+use std::time::Duration;
+use util::RwLock;
+
+use futures::{self, BoxFuture, Future, Stream, Sink};
+use jsonrpc_core::{self as core, Error, MetaIoHandler};
+use jsonrpc_macros::pubsub::Subscriber;
+use jsonrpc_pubsub::SubscriptionId;
+use tokio_timer;
+
+use parity_reactor::Remote;
+use v1::helpers::GenericPollManager;
+use v1::metadata::Metadata;
+use v1::traits::PubSub;
+
+/// Parity PubSub implementation.
+pub struct PubSubClient<S: core::Middleware<Metadata>> {
+	poll_manager: Arc<RwLock<GenericPollManager<S>>>,
+	remote: Remote,
+}
+
+impl<S: core::Middleware<Metadata>> PubSubClient<S> {
+	/// Creates new `PubSubClient`.
+	pub fn new(rpc: MetaIoHandler<Metadata, S>, remote: Remote) -> Self {
+		let poll_manager = Arc::new(RwLock::new(GenericPollManager::new(rpc)));
+		let pm2 = poll_manager.clone();
+
+		let timer = tokio_timer::wheel()
+			.tick_duration(Duration::from_millis(500))
+			.build();
+
+		// Start ticking
+		let interval = timer.interval(Duration::from_millis(1000));
+		remote.spawn(interval
+			.map_err(|e| warn!("Polling timer error: {:?}", e))
+			.for_each(move |_| pm2.read().tick())
+		);
+
+		PubSubClient {
+			poll_manager: poll_manager,
+			remote: remote,
+		}
+	}
+}
+
+impl<S: core::Middleware<Metadata>> PubSub for PubSubClient<S> {
+	type Metadata = Metadata;
+
+	fn parity_subscribe(&self, mut meta: Metadata, subscriber: Subscriber<core::Value>, method: String, params: core::Params) {
+		// Make sure to get rid of PubSub session otherwise it will never be dropped.
+		meta.session = None;
+
+		let mut poll_manager = self.poll_manager.write();
+		let (id, receiver) = poll_manager.subscribe(meta, method, params);
+		match subscriber.assign_id(SubscriptionId::Number(id as u64)) {
+			Ok(sink) => {
+				self.remote.spawn(receiver.map(|res| match res {
+					Ok(val) => val,
+					Err(error) => {
+						warn!(target: "pubsub", "Subscription error: {:?}", error);
+						core::Value::Null
+					},
+				}).forward(sink.sink_map_err(|e| {
+					warn!("Cannot send notification: {:?}", e);
+				})).map(|_| ()));
+			},
+			Err(_) => {
+				poll_manager.unsubscribe(id);
+			},
+		}
+	}
+
+	fn parity_unsubscribe(&self, id: SubscriptionId) -> BoxFuture<bool, Error> {
+		let res = if let SubscriptionId::Number(id) = id {
+			self.poll_manager.write().unsubscribe(id as usize)
+		} else {
+			false
+		};
+
+		futures::future::ok(res).boxed()
+	}
+}
diff --git a/rpc/src/v1/metadata.rs b/rpc/src/v1/metadata.rs
index 26c79d976..74567d510 100644
--- a/rpc/src/v1/metadata.rs
+++ b/rpc/src/v1/metadata.rs
@@ -14,20 +14,26 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+use std::sync::Arc;
+
 use jsonrpc_core;
+use jsonrpc_pubsub::{Session, PubSubMetadata};
 
 use v1::types::{DappId, Origin};
 
 /// RPC methods metadata.
-#[derive(Clone, Default, Debug, PartialEq)]
+#[derive(Clone, Default, Debug)]
 pub struct Metadata {
 	/// Request origin
 	pub origin: Origin,
+	/// Request PubSub Session
+	pub session: Option<Arc<Session>>,
 }
 
 impl Metadata {
-	/// Get
+	/// Returns dapp id if this request is coming from a Dapp or default `DappId` otherwise.
 	pub fn dapp_id(&self) -> DappId {
+		// TODO [ToDr] Extract dapp info from Ws connections.
 		match self.origin {
 			Origin::Dapps(ref dapp_id) => dapp_id.clone(),
 			_ => DappId::default(),
@@ -36,4 +42,8 @@ impl Metadata {
 }
 
 impl jsonrpc_core::Metadata for Metadata {}
-
+impl PubSubMetadata for Metadata {
+	fn session(&self) -> Option<Arc<Session>> {
+		self.session.clone()
+	}
+}
diff --git a/rpc/src/v1/mod.rs b/rpc/src/v1/mod.rs
index e591cbd43..59aef84b3 100644
--- a/rpc/src/v1/mod.rs
+++ b/rpc/src/v1/mod.rs
@@ -58,7 +58,7 @@ pub mod traits;
 pub mod tests;
 pub mod types;
 
-pub use self::traits::{Web3, Eth, EthFilter, EthSigning, Net, Parity, ParityAccounts, ParitySet, ParitySigning, Signer, Personal, Traces, Rpc, SecretStore};
+pub use self::traits::{Web3, Eth, EthFilter, EthSigning, Net, Parity, ParityAccounts, ParitySet, ParitySigning, PubSub, Signer, Personal, Traces, Rpc, SecretStore};
 pub use self::impls::*;
 pub use self::helpers::{SigningQueue, SignerService, ConfirmationsQueue, NetworkSettings, block_import, informant, dispatch};
 pub use self::metadata::Metadata;
diff --git a/rpc/src/v1/tests/mocked/mod.rs b/rpc/src/v1/tests/mocked/mod.rs
index fed358574..e5a459633 100644
--- a/rpc/src/v1/tests/mocked/mod.rs
+++ b/rpc/src/v1/tests/mocked/mod.rs
@@ -24,6 +24,7 @@ mod parity;
 mod parity_accounts;
 mod parity_set;
 mod personal;
+mod pubsub;
 mod rpc;
 mod secretstore;
 mod signer;
diff --git a/rpc/src/v1/tests/mocked/pubsub.rs b/rpc/src/v1/tests/mocked/pubsub.rs
new file mode 100644
index 000000000..b7c8963e5
--- /dev/null
+++ b/rpc/src/v1/tests/mocked/pubsub.rs
@@ -0,0 +1,76 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::{atomic, Arc};
+
+use jsonrpc_core::{self as core, MetaIoHandler};
+use jsonrpc_core::futures::{self, Stream, Future};
+use jsonrpc_pubsub::Session;
+
+use parity_reactor::EventLoop;
+use v1::{PubSub, PubSubClient, Metadata};
+
+fn rpc() -> MetaIoHandler<Metadata, core::NoopMiddleware> {
+	let mut io = MetaIoHandler::default();
+	let called = atomic::AtomicBool::new(false);
+	io.add_method("hello", move |_| {
+		if !called.load(atomic::Ordering::SeqCst) {
+			called.store(true, atomic::Ordering::SeqCst);
+			Ok(core::Value::String("hello".into()))
+		} else {
+			Ok(core::Value::String("world".into()))
+		}
+	});
+	io
+}
+
+#[test]
+fn should_subscribe_to_a_method() {
+	// given
+	let el = EventLoop::spawn();
+	let rpc = rpc();
+	let pubsub = PubSubClient::new(rpc, el.remote()).to_delegate();
+
+	let mut io = MetaIoHandler::default();
+	io.extend_with(pubsub);
+
+	let mut metadata = Metadata::default();
+	let (sender, receiver) = futures::sync::mpsc::channel(8);
+	metadata.session = Some(Arc::new(Session::new(sender)));
+
+	// Subscribe
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_subscribe", "params": ["hello", []], "id": 1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":1,"id":1}"#;
+	assert_eq!(io.handle_request_sync(request, metadata.clone()), Some(response.to_owned()));
+
+	// Check notifications
+	let (res, receiver) = receiver.into_future().wait().unwrap();
+	let response = r#"{"jsonrpc":"2.0","method":"parity_subscription","params":{"result":"hello","subscription":1}}"#;
+	assert_eq!(res, Some(response.into()));
+
+	let (res, receiver) = receiver.into_future().wait().unwrap();
+	let response = r#"{"jsonrpc":"2.0","method":"parity_subscription","params":{"result":"world","subscription":1}}"#;
+	assert_eq!(res, Some(response.into()));
+
+	// And unsubscribe
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_unsubscribe", "params": [1], "id": 1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
+	assert_eq!(io.handle_request_sync(request, metadata), Some(response.to_owned()));
+
+	let (res, _receiver) = receiver.into_future().wait().unwrap();
+	assert_eq!(res, None);
+}
+
diff --git a/rpc/src/v1/traits/mod.rs b/rpc/src/v1/traits/mod.rs
index 3f4125341..9cef58ee7 100644
--- a/rpc/src/v1/traits/mod.rs
+++ b/rpc/src/v1/traits/mod.rs
@@ -25,6 +25,7 @@ pub mod parity_accounts;
 pub mod parity_set;
 pub mod parity_signing;
 pub mod personal;
+pub mod pubsub;
 pub mod signer;
 pub mod traces;
 pub mod rpc;
@@ -39,6 +40,7 @@ pub use self::parity_accounts::ParityAccounts;
 pub use self::parity_set::ParitySet;
 pub use self::parity_signing::ParitySigning;
 pub use self::personal::Personal;
+pub use self::pubsub::PubSub;
 pub use self::signer::Signer;
 pub use self::traces::Traces;
 pub use self::rpc::Rpc;
diff --git a/rpc/src/v1/traits/pubsub.rs b/rpc/src/v1/traits/pubsub.rs
new file mode 100644
index 000000000..a4672403a
--- /dev/null
+++ b/rpc/src/v1/traits/pubsub.rs
@@ -0,0 +1,39 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Parity-specific PUB-SUB rpc interface.
+
+use jsonrpc_core::{Error, Value, Params};
+use jsonrpc_pubsub::SubscriptionId;
+use jsonrpc_macros::pubsub::Subscriber;
+use futures::BoxFuture;
+
+build_rpc_trait! {
+	/// Parity-specific PUB-SUB rpc interface.
+	pub trait PubSub {
+		type Metadata;
+
+		#[pubsub(name = "parity_subscription")] {
+			/// Subscribe to changes of any RPC method in Parity.
+			#[rpc(name = "parity_subscribe")]
+			fn parity_subscribe(&self, Self::Metadata, Subscriber<Value>, String, Params);
+
+			/// Unsubscribe from existing Parity subscription.
+			#[rpc(name = "parity_unsubscribe")]
+			fn parity_unsubscribe(&self, SubscriptionId) -> BoxFuture<bool, Error>;
+		}
+	}
+}

From 0bd4d5bb0c1e65eff90d2a641f70808f00eb80e9 Mon Sep 17 00:00:00 2001
From: YaNing Zhang <zhangyaning1985@gmail.com>
Date: Sun, 7 May 2017 20:33:52 +0800
Subject: [PATCH 110/117] Typo (#5547)

---
 ethcore/src/state/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ethcore/src/state/mod.rs b/ethcore/src/state/mod.rs
index 11ca9154f..e710559df 100644
--- a/ethcore/src/state/mod.rs
+++ b/ethcore/src/state/mod.rs
@@ -238,7 +238,7 @@ pub fn check_proof(
 /// Reverting a checkpoint with `revert_to_checkpoint` involves copying
 /// original values from the latest checkpoint back into `cache`. The code
 /// takes care not to overwrite cached storage while doing that.
-/// checkpoint can be discateded with `discard_checkpoint`. All of the orignal
+/// checkpoint can be discarded with `discard_checkpoint`. All of the orignal
 /// backed-up values are moved into a parent checkpoint (if any).
 ///
 pub struct State<B: Backend> {

From df9096df80e371bab5b3169bbed33cb5cdccc7b4 Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Tue, 9 May 2017 12:55:35 +0200
Subject: [PATCH 111/117] Fix Multisig wallet settings (#5560)

* Improve add/remove owner in Wallet (use changeOwner)

* fix linting
---
 .../modals/WalletSettings/walletSettings.js   | 46 +++++++++++++++---
 .../WalletSettings/walletSettingsStore.js     | 47 +++++++++++++++----
 2 files changed, 78 insertions(+), 15 deletions(-)

diff --git a/js/src/modals/WalletSettings/walletSettings.js b/js/src/modals/WalletSettings/walletSettings.js
index 359dca697..1984e6213 100644
--- a/js/src/modals/WalletSettings/walletSettings.js
+++ b/js/src/modals/WalletSettings/walletSettings.js
@@ -246,8 +246,6 @@ class WalletSettings extends Component {
   }
 
   renderChange (change) {
-    const { accountsInfo } = this.props;
-
     switch (change.type) {
       case 'dailylimit':
         return (
@@ -278,14 +276,50 @@ class WalletSettings extends Component {
                 id='walletSettings.ownersChange.details'
                 defaultMessage=' from {from} to {to} '
                 values={ {
-                  from: <code>change.initial.toNumber()</code>,
-                  to: <code>change.value.toNumber()</code>
+                  from: <code>{ change.initial.toNumber() }</code>,
+                  to: <code>{ change.value.toNumber() }</code>
                 } }
               />
             </div>
           </div>
         );
 
+      case 'change_owner':
+        return (
+          <div className={ [ styles.change ].join(' ') }>
+            <div className={ styles.label }>
+              <FormattedMessage
+                id='walletSettings.changeOwner.title'
+                defaultMessage='Change Owner'
+              />
+            </div>
+            <div>
+              <InputAddress
+                disabled
+                label={
+                  <FormattedMessage
+                    id='walletSettings.changeOwner.labelFrom'
+                    defaultMessage='From'
+                  />
+                }
+                text
+                value={ change.value.from }
+              />
+              <InputAddress
+                disabled
+                label={
+                  <FormattedMessage
+                    id='walletSettings.changeOwner.labelTo'
+                    defaultMessage='To'
+                  />
+                }
+                text
+                value={ change.value.to }
+              />
+            </div>
+          </div>
+        );
+
       case 'add_owner':
         return (
           <div className={ [ styles.change, styles.add ].join(' ') }>
@@ -298,8 +332,8 @@ class WalletSettings extends Component {
             <div>
               <InputAddress
                 disabled
+                text
                 value={ change.value }
-                accounts={ accountsInfo }
               />
             </div>
           </div>
@@ -317,8 +351,8 @@ class WalletSettings extends Component {
             <div>
               <InputAddress
                 disabled
+                text
                 value={ change.value }
-                accounts={ accountsInfo }
               />
             </div>
           </div>
diff --git a/js/src/modals/WalletSettings/walletSettingsStore.js b/js/src/modals/WalletSettings/walletSettingsStore.js
index b4ae8fc9a..d31ec9eb2 100644
--- a/js/src/modals/WalletSettings/walletSettingsStore.js
+++ b/js/src/modals/WalletSettings/walletSettingsStore.js
@@ -78,12 +78,16 @@ export default class WalletSettingsStore {
       const changes = data.map((datum) => {
         const [ type, valueStr ] = datum.split(';');
 
-        let value = valueStr;
+        let value;
 
-        // Only addresses start with `0x`, the others
-        // are BigNumbers
-        if (!/^0x/.test(valueStr)) {
-          value = new BigNumber(valueStr, 16);
+        if (/^#BN#/.test(valueStr)) {
+          value = new BigNumber(valueStr.replace(/^#BN#/, ''), 16);
+        } else {
+          try {
+            value = JSON.parse(valueStr);
+          } catch (e) {
+            value = valueStr;
+          }
         }
 
         return { type, value };
@@ -104,8 +108,8 @@ export default class WalletSettingsStore {
       const { type, value } = change;
 
       const valueStr = (value && typeof value.plus === 'function')
-        ? value.toString(16)
-        : value;
+        ? '#BN#' + value.toString(16)
+        : JSON.stringify(value);
 
       return [
         type,
@@ -147,14 +151,26 @@ export default class WalletSettingsStore {
     const ownersToRemove = prevOwners.filter((owner) => !nextOwners.includes(owner));
     const ownersToAdd = nextOwners.filter((owner) => !prevOwners.includes(owner));
 
-    ownersToRemove.forEach((owner) => {
+    const ownersChangeCount = Math.min(ownersToRemove.length, ownersToAdd.length);
+
+    for (let i = 0; i < ownersChangeCount; i++) {
+      changes.push({
+        type: 'change_owner',
+        value: {
+          from: ownersToRemove[i],
+          to: ownersToAdd[i]
+        }
+      });
+    }
+
+    ownersToRemove.slice(ownersChangeCount).forEach((owner) => {
       changes.push({
         type: 'remove_owner',
         value: owner
       });
     });
 
-    ownersToAdd.forEach((owner) => {
+    ownersToAdd.slice(ownersChangeCount).forEach((owner) => {
       changes.push({
         type: 'add_owner',
         value: owner
@@ -182,6 +198,12 @@ export default class WalletSettingsStore {
             this.wallet.require = value;
             break;
 
+          case 'change_owner':
+            this.wallet.owners = this.wallet.owners
+              .filter((owner) => owner !== value.from)
+              .concat(value.to);
+            break;
+
           case 'remove_owner':
             this.wallet.owners = this.wallet.owners.filter((owner) => owner !== value);
             break;
@@ -309,6 +331,13 @@ export default class WalletSettingsStore {
       };
     }
 
+    if (change.type === 'change_owner') {
+      return {
+        method: walletInstance.changeOwner,
+        values: [ change.value.from, change.value.to ]
+      };
+    }
+
     if (change.type === 'remove_owner') {
       return {
         method: walletInstance.removeOwner,

From 1288b4b28ff1b874b02fc47c724e3b658b498fc9 Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Tue, 9 May 2017 12:55:52 +0200
Subject: [PATCH 112/117] Do not convert to Dates twice (#5563)

* Don't convert Dates twice

* Take string dates into account
---
 js/src/api/format/output.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/js/src/api/format/output.js b/js/src/api/format/output.js
index df40b59a0..7bf39d17c 100644
--- a/js/src/api/format/output.js
+++ b/js/src/api/format/output.js
@@ -92,6 +92,16 @@ export function outChainStatus (status) {
 }
 
 export function outDate (date) {
+  if (typeof date.toISOString === 'function') {
+    return date;
+  }
+
+  try {
+    if (typeof date === 'string' && (new Date(date)).toISOString() === date) {
+      return new Date(date);
+    }
+  } catch (error) {}
+
   return new Date(outNumber(date).toNumber() * 1000);
 }
 

From c5116e5049016eb65b50c92d3d84b6a5f8a2c08a Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Tue, 9 May 2017 12:56:08 +0200
Subject: [PATCH 113/117] Fix event params decoding when no names for
 parameters #5409 (#5567)

---
 js/src/abi/spec/event/event.js              | 6 +++---
 js/src/api/contract/contract.js             | 5 +++--
 js/src/views/Contract/Events/Event/event.js | 7 ++++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/js/src/abi/spec/event/event.js b/js/src/abi/spec/event/event.js
index 071a73965..604f58cb1 100644
--- a/js/src/abi/spec/event/event.js
+++ b/js/src/abi/spec/event/event.js
@@ -99,15 +99,15 @@ export default class Event {
     const namedTokens = {};
 
     topicParams.forEach((param, idx) => {
-      namedTokens[param.name] = topicTokens[idx];
+      namedTokens[param.name || idx] = topicTokens[idx];
     });
     dataParams.forEach((param, idx) => {
-      namedTokens[param.name] = dataTokens[idx];
+      namedTokens[param.name || idx] = dataTokens[idx];
     });
 
     const inputParamTypes = this.inputParamTypes();
     const decodedParams = this.inputParamNames()
-      .map((name, idx) => new DecodedLogParam(name, inputParamTypes[idx], namedTokens[name]));
+      .map((name, idx) => new DecodedLogParam(name, inputParamTypes[idx], namedTokens[name || idx]));
 
     return new DecodedLog(decodedParams, address);
   }
diff --git a/js/src/api/contract/contract.js b/js/src/api/contract/contract.js
index 2156b8af1..0aff05684 100644
--- a/js/src/api/contract/contract.js
+++ b/js/src/api/contract/contract.js
@@ -182,10 +182,11 @@ export default class Contract {
         log.params = {};
         log.event = event.name;
 
-        decoded.params.forEach((param) => {
+        decoded.params.forEach((param, index) => {
           const { type, value } = param.token;
+          const key = param.name || index;
 
-          log.params[param.name] = { type, value };
+          log.params[key] = { type, value };
         });
 
         return log;
diff --git a/js/src/views/Contract/Events/Event/event.js b/js/src/views/Contract/Events/Event/event.js
index eb370e7f1..fc2436f8e 100644
--- a/js/src/views/Contract/Events/Event/event.js
+++ b/js/src/views/Contract/Events/Event/event.js
@@ -112,11 +112,16 @@ export default class Event extends Component {
   }
 
   renderParam (name, param) {
+    // Don't add a label id the name is an index key (ie. a Number)
+    const label = parseInt(name).toString() === name.toString()
+      ? undefined
+      : name;
+
     return (
       <TypedInput
         allowCopy
         className={ styles.input }
-        label={ name }
+        label={ label }
         param={ param.type }
         readOnly
         value={ param.value }

From d83d938ee389ed0e04fb08b386c7317a8420c3b4 Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Tue, 9 May 2017 12:56:20 +0200
Subject: [PATCH 114/117] Remove formal verification messages (#5574)

---
 js/src/views/WriteContract/writeContractStore.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/src/views/WriteContract/writeContractStore.js b/js/src/views/WriteContract/writeContractStore.js
index 1a1a26b99..886d8afa4 100644
--- a/js/src/views/WriteContract/writeContractStore.js
+++ b/js/src/views/WriteContract/writeContractStore.js
@@ -397,11 +397,10 @@ export default class WriteContractStore {
 
     const { errors = [] } = data;
     const errorAnnotations = this.parseErrors(errors);
-    const formalAnnotations = this.parseErrors(data.formal && data.formal.errors, true);
+    // const formalAnnotations = this.parseErrors(data.formal && data.formal.errors, true);
 
     const annotations = [].concat(
-      errorAnnotations,
-      formalAnnotations
+      errorAnnotations
     );
 
     const contractKeys = Object.keys(contracts || {});

From e5ff36f1f11a89b3c2875c0307e4a10bb4b3c710 Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Tue, 9 May 2017 12:56:35 +0200
Subject: [PATCH 115/117] Load the sources immediatly in Contract Dev (#5575)

---
 js/src/views/WriteContract/writeContractStore.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/js/src/views/WriteContract/writeContractStore.js b/js/src/views/WriteContract/writeContractStore.js
index 886d8afa4..289f2d2ba 100644
--- a/js/src/views/WriteContract/writeContractStore.js
+++ b/js/src/views/WriteContract/writeContractStore.js
@@ -139,9 +139,10 @@ export default class WriteContractStore {
 
     this.worker = worker;
 
-    this
-      .fetchSolidityVersions()
-      .then(() => this.reloadContracts());
+    return Promise.all([
+      this.fetchSolidityVersions(),
+      this.reloadContracts(undefined, undefined, false)
+    ]);
   }
 
   fetchSolidityVersions () {
@@ -492,7 +493,7 @@ export default class WriteContractStore {
     this.reloadContracts(cId);
   }
 
-  @action reloadContracts = (id, sourcecode) => {
+  @action reloadContracts = (id, sourcecode, recompile = true) => {
     const localStore = store.get(WRITE_CONTRACT_STORE_KEY) || {};
 
     this.savedContracts = localStore.saved || {};
@@ -512,7 +513,9 @@ export default class WriteContractStore {
 
     this.resizeEditor();
 
-    return this.handleCompile();
+    if (recompile) {
+      return this.handleCompile();
+    }
   }
 
   @action handleLoadContract = (contract) => {

From 99474939776d1b2f9e72ea37026c70268f55d2f2 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Tue, 9 May 2017 11:25:44 +0000
Subject: [PATCH 116/117] [ci skip] js-precompiled 20170509-112134

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e92bae295..9b9710967 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1781,7 +1781,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#b6fbfc59f044546ccd3b928fb17daa3812ae856e"
+source = "git+https://github.com/paritytech/js-precompiled.git#0826776d9190ee6945bfe481e10b19ec05b3a049"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 4aaa18e15..3e711324b 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.68",
+  "version": "1.7.69",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 518b6e647be99a641e7e3019c33e618dcd8c517f Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Tue, 9 May 2017 11:58:48 +0000
Subject: [PATCH 117/117] [ci skip] js-precompiled 20170509-115458

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9b9710967..472e11fe5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1781,7 +1781,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#0826776d9190ee6945bfe481e10b19ec05b3a049"
+source = "git+https://github.com/paritytech/js-precompiled.git#cff0aec1877a4b75f51de3facee9fe439a41a90d"
 dependencies = [
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 3e711324b..61f239cbd 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.7.69",
+  "version": "1.7.70",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",