Validator/authority contract (#3937)

* 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

* add a comment about lock scope

json/src/spec/authority_round.rs

@@ -17,7 +17,7 @@
 //! Authority params deserialization.
 
 use uint::Uint;
-use hash::Address;
+use super::ValidatorSet;
 
 /// Authority params deserialization.
 #[derive(Debug, PartialEq, Deserialize)]
@@ -29,7 +29,7 @@ pub struct AuthorityRoundParams {
 	#[serde(rename="stepDuration")]
 	pub step_duration: Uint,
 	/// Valid authorities
-	pub authorities: Vec<Address>,
+	pub validators: ValidatorSet,
 	/// Block reward.
 	#[serde(rename="blockReward")]
 	pub block_reward: Option<Uint>,
@@ -57,7 +57,9 @@ mod tests {
 			"params": {
 				"gasLimitBoundDivisor": "0x0400",
 				"stepDuration": "0x02",
-				"authorities" : ["0xc6d9d2cd449a754c494264e1809c50e34d64562b"],
+				"validators": {
+					"list" : ["0xc6d9d2cd449a754c494264e1809c50e34d64562b"]
+				},
 				"blockReward": "0x50",
 				"startStep" : 24
 			}

json/src/spec/basic_authority.rs

@@ -17,7 +17,7 @@
 //! Authority params deserialization.
 
 use uint::Uint;
-use hash::Address;
+use super::ValidatorSet;
 
 /// Authority params deserialization.
 #[derive(Debug, PartialEq, Deserialize)]
@@ -29,7 +29,7 @@ pub struct BasicAuthorityParams {
 	#[serde(rename="durationLimit")]
 	pub duration_limit: Uint,
 	/// Valid authorities
-	pub authorities: Vec<Address>,
+	pub validators: ValidatorSet,
 }
 
 /// Authority engine deserialization.
@@ -50,7 +50,9 @@ mod tests {
 			"params": {
 				"gasLimitBoundDivisor": "0x0400",
 				"durationLimit": "0x0d",
-				"authorities" : ["0xc6d9d2cd449a754c494264e1809c50e34d64562b"]
+				"validators" : {
+					"list": ["0xc6d9d2cd449a754c494264e1809c50e34d64562b"]
+				}
 			}
 		}"#;
 

json/src/spec/engine.rs

@@ -16,10 +16,7 @@
 
 //! Engine deserialization.
 
-use spec::Ethash;
-use spec::BasicAuthority;
-use spec::AuthorityRound;
-use spec::Tendermint;
+use super::{Ethash, BasicAuthority, AuthorityRound, Tendermint};
 
 /// Engine deserialization.
 #[derive(Debug, PartialEq, Deserialize)]

json/src/spec/mod.rs

@@ -25,6 +25,7 @@ pub mod seal;
 pub mod engine;
 pub mod state;
 pub mod ethash;
+pub mod validator_set;
 pub mod basic_authority;
 pub mod authority_round;
 pub mod tendermint;
@@ -38,6 +39,7 @@ pub use self::seal::{Seal, Ethereum, AuthorityRoundSeal, TendermintSeal};
 pub use self::engine::Engine;
 pub use self::state::State;
 pub use self::ethash::{Ethash, EthashParams};
+pub use self::validator_set::ValidatorSet;
 pub use self::basic_authority::{BasicAuthority, BasicAuthorityParams};
 pub use self::authority_round::{AuthorityRound, AuthorityRoundParams};
 pub use self::tendermint::{Tendermint, TendermintParams};

json/src/spec/tendermint.rs

@@ -17,7 +17,7 @@
 //! Tendermint params deserialization.
 
 use uint::Uint;
-use hash::Address;
+use super::ValidatorSet;
 
 /// Tendermint params deserialization.
 #[derive(Debug, PartialEq, Deserialize)]
@@ -25,8 +25,8 @@ pub struct TendermintParams {
 	/// Gas limit divisor.
 	#[serde(rename="gasLimitBoundDivisor")]
 	pub gas_limit_bound_divisor: Uint,
-	/// Valid authorities
-	pub authorities: Vec<Address>,
+	/// Valid validators.
+	pub validators: ValidatorSet,
 	/// Propose step timeout in milliseconds.
 	#[serde(rename="timeoutPropose")]
 	pub timeout_propose: Option<Uint>,
@@ -60,8 +60,10 @@ mod tests {
 	fn tendermint_deserialization() {
 		let s = r#"{
 			"params": {
-				"gasLimitBoundDivisor": "0x400",
-				"authorities" : ["0xc6d9d2cd449a754c494264e1809c50e34d64562b"],
+				"gasLimitBoundDivisor": "0x0400",
+				"validators": {
+					"list": ["0xc6d9d2cd449a754c494264e1809c50e34d64562b"]
+				},
 				"blockReward": "0x50"
 			}
 		}"#;

json/src/spec/validator_set.rs

@@ -0,0 +1,47 @@
+// Copyright 2015, 2016 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/>.
+
+//! Validator set deserialization.
+
+use hash::Address;
+
+/// Different ways of specifying validators.
+#[derive(Debug, PartialEq, Deserialize)]
+pub enum ValidatorSet {
+	/// A simple list of authorities.
+	#[serde(rename="list")]
+	List(Vec<Address>),
+	/// Address of a contract that indicates the list of authorities.
+	#[serde(rename="contract")]
+	Contract(Address),
+}
+
+#[cfg(test)]
+mod tests {
+	use serde_json;
+	use spec::validator_set::ValidatorSet;
+
+	#[test]
+	fn validator_set_deserialization() {
+		let s = r#"[{
+			"list" : ["0xc6d9d2cd449a754c494264e1809c50e34d64562b"]
+		}, {
+			"contract" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b"
+		}]"#;
+
+		let _deserialized: Vec<ValidatorSet> = serde_json::from_str(s).unwrap();
+	}
+}