Merge branch 'master' into Fix-4858

2017-08-29 15:11:05 +02:00
parent bfd238e000 d520aa2633
commit 50495c6898
275 changed files with 6719 additions and 3562 deletions
--- a/json/src/spec/params.rs
+++ b/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)]