Merge branch 'master' into auth-round

2016-11-09 10:35:00 +00:00
parent a8b688b469 ad18a30535
commit 49f2a72d5d
184 changed files with 4102 additions and 2208 deletions
--- a/json/src/spec/ethash.rs
+++ b/json/src/spec/ethash.rs
@@ -85,6 +85,13 @@ pub struct EthashParams {
 	/// See main EthashParams docs.
 	#[serde(rename="eip161dTransition")]
 	pub eip161d_transition: Option<Uint>,
+
+	/// See main EthashParams docs.
+	#[serde(rename="ecip1010PauseTransition")]
+	pub ecip1010_pause_transition: Option<Uint>,
+	/// See main EthashParams docs.
+	#[serde(rename="ecip1010ContinueTransition")]
+	pub ecip1010_continue_transition: Option<Uint>,
 }

 /// Ethash engine deserialization.