Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc

2016-12-15 13:28:37 +01:00
parent 627b8a8414 a74bce2c06
commit db73b0d66f
1571 changed files with 11446 additions and 5308 deletions
--- a/json/src/blockchain/account.rs
+++ b/json/src/blockchain/account.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/blockchain/block.rs
+++ b/json/src/blockchain/block.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/blockchain/blockchain.rs
+++ b/json/src/blockchain/blockchain.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/blockchain/header.rs
+++ b/json/src/blockchain/header.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/blockchain/mod.rs
+++ b/json/src/blockchain/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/blockchain/state.rs
+++ b/json/src/blockchain/state.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/blockchain/test.rs
+++ b/json/src/blockchain/test.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/blockchain/transaction.rs
+++ b/json/src/blockchain/transaction.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/bytes.rs
+++ b/json/src/bytes.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/hash.rs
+++ b/json/src/hash.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@ use std::str::FromStr;
 use serde::{Deserialize, Deserializer, Serialize, Serializer, Error};
 use serde::de::Visitor;
 use rustc_serialize::hex::ToHex;
-use util::hash::{H64 as Hash64, H160 as Hash160, H256 as Hash256, H2048 as Hash2048};
+use util::hash::{H64 as Hash64, H160 as Hash160, H256 as Hash256, H520 as Hash520, H2048 as Hash2048};


 macro_rules! impl_hash {
@@ -87,6 +87,7 @@ macro_rules! impl_hash {
 impl_hash!(H64, Hash64);
 impl_hash!(Address, Hash160);
 impl_hash!(H256, Hash256);
+impl_hash!(H520, Hash520);
 impl_hash!(Bloom, Hash2048);

 #[cfg(test)]
--- a/json/src/lib.rs
+++ b/json/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/lib.rs.in
+++ b/json/src/lib.rs.in
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/misc/account_meta.rs
+++ b/json/src/misc/account_meta.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@ pub struct AccountMeta {
 	pub name: String,
 	/// The rest of the metadata of the account.
 	pub meta: String,
-	/// The 128-bit UUID of the account, if it has one (brain-wallets don't).
+	/// The 128-bit Uuid of the account, if it has one (brain-wallets don't).
 	pub uuid: Option<String>,
 }

--- a/json/src/misc/dapps_settings.rs
+++ b/json/src/misc/dapps_settings.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/misc/mod.rs
+++ b/json/src/misc/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/spec/account.rs
+++ b/json/src/spec/account.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/spec/authority_round.rs
+++ b/json/src/spec/authority_round.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/spec/basic_authority.rs
+++ b/json/src/spec/basic_authority.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/spec/builtin.rs
+++ b/json/src/spec/builtin.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/spec/engine.rs
+++ b/json/src/spec/engine.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
@@ -19,6 +19,7 @@
 use spec::Ethash;
 use spec::BasicAuthority;
 use spec::AuthorityRound;
+use spec::Tendermint;

 /// Engine deserialization.
 #[derive(Debug, PartialEq, Deserialize)]
@@ -33,6 +34,8 @@ pub enum Engine {
 	BasicAuthority(BasicAuthority),
 	/// AuthorityRound engine.
 	AuthorityRound(AuthorityRound),
+	/// Tendermint engine.
+	Tendermint(Tendermint)
 }

 #[cfg(test)]
--- a/json/src/spec/ethash.rs
+++ b/json/src/spec/ethash.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/spec/genesis.rs
+++ b/json/src/spec/genesis.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/spec/mod.rs
+++ b/json/src/spec/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
@@ -27,15 +27,17 @@ pub mod state;
 pub mod ethash;
 pub mod basic_authority;
 pub mod authority_round;
+pub mod tendermint;

 pub use self::account::Account;
 pub use self::builtin::{Builtin, Pricing, Linear};
 pub use self::genesis::Genesis;
 pub use self::params::Params;
 pub use self::spec::Spec;
-pub use self::seal::{Seal, Ethereum, Generic};
+pub use self::seal::{Seal, Ethereum, AuthorityRoundSeal};
 pub use self::engine::Engine;
 pub use self::state::State;
 pub use self::ethash::{Ethash, EthashParams};
 pub use self::basic_authority::{BasicAuthority, BasicAuthorityParams};
 pub use self::authority_round::{AuthorityRound, AuthorityRoundParams};
+pub use self::tendermint::{Tendermint, TendermintParams};
--- a/json/src/spec/params.rs
+++ b/json/src/spec/params.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/spec/seal.rs
+++ b/json/src/spec/seal.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
@@ -16,7 +16,8 @@

 //! Spec seal deserialization.

-use hash::{H64, H256};
+use hash::*;
+use uint::Uint;
 use bytes::Bytes;

 /// Ethereum seal.
@@ -29,11 +30,13 @@ pub struct Ethereum {
 	pub mix_hash: H256,
 }

-/// Generic seal.
+/// AuthorityRound seal.
 #[derive(Debug, PartialEq, Deserialize)]
-pub struct Generic {
-	/// Seal rlp.
-	pub rlp: Bytes,
+pub struct AuthorityRoundSeal {
+	/// Seal step.
+	pub step: Uint,
+	/// Seal signature.
+	pub signature: H520,
 }

 /// Seal variants.
@@ -42,9 +45,12 @@ pub enum Seal {
 	/// Ethereum seal.
 	#[serde(rename="ethereum")]
 	Ethereum(Ethereum),
+	/// AuthorityRound seal.
+	#[serde(rename="authority_round")]
+	AuthorityRound(AuthorityRoundSeal),
 	/// Generic seal.
 	#[serde(rename="generic")]
-	Generic(Generic),
+	Generic(Bytes),
 }

 #[cfg(test)]
@@ -53,15 +59,18 @@ mod tests {
 	use spec::Seal;

 	#[test]
-	fn builtin_deserialization() {
+	fn seal_deserialization() {
 		let s = r#"[{
 			"ethereum": {
 				"nonce": "0x0000000000000042",
 				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
 			}
 		},{
-			"generic": {
-				"rlp": "0xe011bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa"
+			"generic": "0xe011bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa"
+		},{
+			"authority_round": {
+				"step": "0x0",
+				"signature": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
 			}
 		}]"#;
 		let _deserialized: Vec<Seal> = serde_json::from_str(s).unwrap();
--- a/json/src/spec/spec.rs
+++ b/json/src/spec/spec.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/spec/state.rs
+++ b/json/src/spec/state.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/spec/tendermint.rs
+++ b/json/src/spec/tendermint.rs
@@ -0,0 +1,67 @@
+// Copyright 2015, 2016 Ethcore (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/>.
+
+//! Tendermint params deserialization.
+
+use uint::Uint;
+use hash::Address;
+
+/// Tendermint params deserialization.
+#[derive(Debug, PartialEq, Deserialize)]
+pub struct TendermintParams {
+	/// Gas limit divisor.
+	#[serde(rename="gasLimitBoundDivisor")]
+	pub gas_limit_bound_divisor: Uint,
+	/// Valid authorities
+	pub authorities: Vec<Address>,
+	/// Propose step timeout in milliseconds.
+	#[serde(rename="timeoutPropose")]
+	pub timeout_propose: Option<Uint>,
+	/// Prevote step timeout in milliseconds.
+	#[serde(rename="timeoutPrevote")]
+	pub timeout_prevote: Option<Uint>,
+	/// Precommit step timeout in milliseconds.
+	#[serde(rename="timeoutPrecommit")]
+	pub timeout_precommit: Option<Uint>,
+	/// Commit step timeout in milliseconds.
+	#[serde(rename="timeoutCommit")]
+	pub timeout_commit: Option<Uint>,
+}
+
+/// Tendermint engine deserialization.
+#[derive(Debug, PartialEq, Deserialize)]
+pub struct Tendermint {
+	/// Ethash params.
+	pub params: TendermintParams,
+}
+
+#[cfg(test)]
+mod tests {
+	use serde_json;
+	use spec::tendermint::Tendermint;
+
+	#[test]
+	fn basic_authority_deserialization() {
+		let s = r#"{
+			"params": {
+				"gasLimitBoundDivisor": "0x0400",
+				"authorities" : ["0xc6d9d2cd449a754c494264e1809c50e34d64562b"]
+			}
+		}"#;
+
+		let _deserialized: Tendermint = serde_json::from_str(s).unwrap();
+	}
+}
--- a/json/src/state/log.rs
+++ b/json/src/state/log.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/state/mod.rs
+++ b/json/src/state/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/state/state.rs
+++ b/json/src/state/state.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/state/test.rs
+++ b/json/src/state/test.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/state/transaction.rs
+++ b/json/src/state/transaction.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/transaction/mod.rs
+++ b/json/src/transaction/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/transaction/test.rs
+++ b/json/src/transaction/test.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/transaction/transaction.rs
+++ b/json/src/transaction/transaction.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/transaction/txtest.rs
+++ b/json/src/transaction/txtest.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/trie/input.rs
+++ b/json/src/trie/input.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/trie/mod.rs
+++ b/json/src/trie/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/trie/test.rs
+++ b/json/src/trie/test.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/trie/trie.rs
+++ b/json/src/trie/trie.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/uint.rs
+++ b/json/src/uint.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/vm/call.rs
+++ b/json/src/vm/call.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/vm/env.rs
+++ b/json/src/vm/env.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/vm/log.rs
+++ b/json/src/vm/log.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/vm/mod.rs
+++ b/json/src/vm/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/vm/test.rs
+++ b/json/src/vm/test.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/vm/transaction.rs
+++ b/json/src/vm/transaction.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/json/src/vm/vm.rs
+++ b/json/src/vm/vm.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify