Merge branch 'master' into Fix-4858

json/src/spec/params.rs

@@ -105,6 +105,9 @@ pub struct Params {
 	/// Apply reward flag
 	#[serde(rename="applyReward")]
 	pub apply_reward: Option<bool>,
+	/// Node permission contract address.
+	#[serde(rename="nodePermissionContract")]
+	pub node_permission_contract: Option<Address>,
 }
 
 #[cfg(test)]

json/src/state/test.rs

@@ -104,7 +104,10 @@ pub enum ForkSpec {
 	EIP158,
 	Frontier,
 	Homestead,
+	// TODO [ToDr] Deprecated
 	Metropolis,
+	Byzantium,
+	Constantinople,
 }
 
 /// State test indexes deserialization.
@@ -161,7 +164,7 @@ mod tests {
 				"EIP150" : [
 					{
 						"hash" : "3e6dacc1575c6a8c76422255eca03529bbf4c0dda75dfc110b22d6dc4152396f",
-						"indexes" : { "data" : 0, "gas" : 0,  "value" : 0 } 
+						"indexes" : { "data" : 0, "gas" : 0,  "value" : 0 }
 					},
 					{
 						"hash" : "99a450d8ce5b987a71346d8a0a1203711f770745c7ef326912e46761f14cd764",