Merge branch 'master' into dapps-fetch

openethereum · Aug 18, 2016 · db3c965 · db3c965
2 parents 20c5a04 + eed3ef4
commit db3c965
Show file tree

Hide file tree

Showing 72 changed files with 262 additions and 210 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,7 +41,7 @@ ethcore-ipc-hypervisor = { path = "ipc/hypervisor" }
 ethcore-logger = { path = "logger" }
 json-ipc-server = { git = "https://github.com/ethcore/json-ipc-server.git" }
 ethcore-dapps = { path = "dapps", optional = true }
-clippy = { version = "0.0.80", optional = true}
+clippy = { version = "0.0.82", optional = true}
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.2"
@@ -54,7 +54,7 @@ version = "0.8"
 default-features = false
 
 [features]
-default = ["ui", "use-precompiled-js"]
+default = ["ui", "use-precompiled-js", "ipc"]
 ui = ["dapps", "ethcore-signer/ui"]
 use-precompiled-js = ["ethcore-dapps/use-precompiled-js", "ethcore-signer/use-precompiled-js"]
 dapps = ["ethcore-dapps"]

diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml
@@ -29,7 +29,7 @@ parity-dapps-status = { git = "https://github.com/ethcore/parity-ui.git", versio
 parity-dapps-home = { git = "https://github.com/ethcore/parity-ui.git", version = "1.4" }
 parity-dapps-wallet = { git = "https://github.com/ethcore/parity-ui.git", version = "1.4", optional = true }
 mime_guess = { version = "1.6.1" }
-clippy = { version = "0.0.80", optional = true}
+clippy = { version = "0.0.82", optional = true}
 
 [build-dependencies]
 serde_codegen = { version = "0.7.0", optional = true }

diff --git a/db/Cargo.toml b/db/Cargo.toml
@@ -12,7 +12,7 @@ syntex = "*"
 ethcore-ipc-codegen = { path = "../ipc/codegen" }
 
 [dependencies]
-clippy = { version = "0.0.80", optional = true}
+clippy = { version = "0.0.82", optional = true}
 ethcore-devtools = { path = "../devtools" }
 ethcore-ipc = { path = "../ipc/rpc" }
 rocksdb = { git = "https://github.com/ethcore/rust-rocksdb" }

diff --git a/db/src/traits.rs b/db/src/traits.rs
@@ -16,9 +16,6 @@
 
 //! Ethcore database trait
 
-use std::mem;
-use ipc::binary::BinaryConvertError;
-use std::collections::VecDeque;
 use std::cell::RefCell;
 
 pub type IteratorHandle = u32;

diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
@@ -25,7 +25,7 @@ semver = "0.2"
 bit-set = "0.4"
 time = "0.1"
 evmjit = { path = "../evmjit", optional = true }
-clippy = { version = "0.0.80", optional = true}
+clippy = { version = "0.0.82", optional = true}
 ethash = { path = "../ethash" }
 ethcore-util = { path = "../util" }
 ethcore-io = { path = "../util/io" }

diff --git a/ethcore/res/ethereum/morden.json b/ethcore/res/ethereum/morden.json
@@ -8,7 +8,7 @@
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
 				"blockReward": "0x4563918244F40000",
-				"registrar": "",
+				"registrar": "0x8e4e9b13d4b45cb0befc93c3061b1408f67316b2",
 				"frontierCompatibilityModeLimit": "0x789b0"
 			}
 		}

diff --git a/ethcore/src/account_provider.rs b/ethcore/src/account_provider.rs
@@ -117,17 +117,17 @@ impl AddressBook {
 
 	pub fn set_name(&mut self, a: Address, name: String) {
 		let mut x = self.cache.get(&a)
-			.map(|a| a.clone())
-			.unwrap_or(AccountMeta {name: Default::default(), meta: "{}".to_owned(), uuid: None});
+			.cloned()
+			.unwrap_or_else(|| AccountMeta {name: Default::default(), meta: "{}".to_owned(), uuid: None});
 		x.name = name;
 		self.cache.insert(a, x);
 		self.save();
 	}
 
 	pub fn set_meta(&mut self, a: Address, meta: String) {
 		let mut x = self.cache.get(&a)
-			.map(|a| a.clone())
-			.unwrap_or(AccountMeta {name: "Anonymous".to_owned(), meta: Default::default(), uuid: None});
+			.cloned()
+			.unwrap_or_else(|| AccountMeta {name: "Anonymous".to_owned(), meta: Default::default(), uuid: None});
 		x.meta = meta;
 		self.cache.insert(a, x);
 		self.save();
@@ -231,7 +231,7 @@ impl AccountProvider {
 	pub fn accounts_info(&self) -> Result<HashMap<Address, AccountMeta>, Error> {
 		let r: HashMap<Address, AccountMeta> = try!(self.sstore.accounts())
 			.into_iter()
-			.map(|a| (a.clone(), self.account_meta(a).unwrap_or_else(|_| Default::default())))
+			.map(|a| (a.clone(), self.account_meta(a).ok().unwrap_or_default()))
 			.collect();
 		Ok(r)
 	}

diff --git a/ethcore/src/block.rs b/ethcore/src/block.rs
@@ -352,11 +352,11 @@ impl<'x> OpenBlock<'x> {
 		let unclosed_state = s.block.state.clone();
 
 		s.engine.on_close_block(&mut s.block);
-		s.block.base.header.transactions_root = ordered_trie_root(s.block.base.transactions.iter().map(|ref e| e.rlp_bytes().to_vec()).collect());
+		s.block.base.header.transactions_root = ordered_trie_root(s.block.base.transactions.iter().map(|e| e.rlp_bytes().to_vec()).collect());
 		let uncle_bytes = s.block.base.uncles.iter().fold(RlpStream::new_list(s.block.base.uncles.len()), |mut s, u| {s.append_raw(&u.rlp(Seal::With), 1); s} ).out();
 		s.block.base.header.uncles_hash = uncle_bytes.sha3();
 		s.block.base.header.state_root = s.block.state.root().clone();
-		s.block.base.header.receipts_root = ordered_trie_root(s.block.receipts.iter().map(|ref r| r.rlp_bytes().to_vec()).collect());
+		s.block.base.header.receipts_root = ordered_trie_root(s.block.receipts.iter().map(|r| r.rlp_bytes().to_vec()).collect());
 		s.block.base.header.log_bloom = s.block.receipts.iter().fold(LogBloom::zero(), |mut b, r| {b = &b | &r.log_bloom; b}); //TODO: use |= operator
 		s.block.base.header.gas_used = s.block.receipts.last().map_or(U256::zero(), |r| r.gas_used);
 		s.block.base.header.note_dirty();
@@ -375,14 +375,14 @@ impl<'x> OpenBlock<'x> {
 
 		s.engine.on_close_block(&mut s.block);
 		if s.block.base.header.transactions_root.is_zero() || s.block.base.header.transactions_root == SHA3_NULL_RLP {
-			s.block.base.header.transactions_root = ordered_trie_root(s.block.base.transactions.iter().map(|ref e| e.rlp_bytes().to_vec()).collect());
+			s.block.base.header.transactions_root = ordered_trie_root(s.block.base.transactions.iter().map(|e| e.rlp_bytes().to_vec()).collect());
 		}
 		let uncle_bytes = s.block.base.uncles.iter().fold(RlpStream::new_list(s.block.base.uncles.len()), |mut s, u| {s.append_raw(&u.rlp(Seal::With), 1); s} ).out();
 		if s.block.base.header.uncles_hash.is_zero() {
 			s.block.base.header.uncles_hash = uncle_bytes.sha3();
 		}
 		if s.block.base.header.receipts_root.is_zero() || s.block.base.header.receipts_root == SHA3_NULL_RLP {
-			s.block.base.header.receipts_root = ordered_trie_root(s.block.receipts.iter().map(|ref r| r.rlp_bytes().to_vec()).collect());
+			s.block.base.header.receipts_root = ordered_trie_root(s.block.receipts.iter().map(|r| r.rlp_bytes().to_vec()).collect());
 		}
 		s.block.base.header.state_root = s.block.state.root().clone();
 		s.block.base.header.log_bloom = s.block.receipts.iter().fold(LogBloom::zero(), |mut b, r| {b = &b | &r.log_bloom; b}); //TODO: use |= operator

diff --git a/ethcore/src/client/chain_notify.rs b/ethcore/src/client/chain_notify.rs
@@ -14,9 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::collections::VecDeque;
-use std::mem;
-use ipc::{IpcConfig, BinaryConvertError};
+use ipc::IpcConfig;
 use util::H256;
 
 /// Represents what has to be handled by actor listening to chain events

diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
@@ -13,7 +13,7 @@
 
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-use std::collections::{HashSet, HashMap, VecDeque};
+use std::collections::{HashSet, HashMap, BTreeMap, VecDeque};
 use std::sync::{Arc, Weak};
 use std::path::{Path};
 use std::fmt;
@@ -49,8 +49,11 @@ use types::filter::Filter;
 use log_entry::LocalizedLogEntry;
 use block_queue::{BlockQueue, BlockQueueInfo};
 use blockchain::{BlockChain, BlockProvider, TreeRoute, ImportRoute};
-use client::{BlockID, TransactionID, UncleID, TraceId, ClientConfig, BlockChainClient, MiningBlockChainClient,
-	TraceFilter, CallAnalytics, BlockImportError, Mode, ChainNotify};
+use client::{
+	BlockID, TransactionID, UncleID, TraceId, ClientConfig, BlockChainClient,
+	MiningBlockChainClient, TraceFilter, CallAnalytics, BlockImportError, Mode,
+	ChainNotify
+};
 use client::Error as ClientError;
 use env_info::EnvInfo;
 use executive::{Executive, Executed, TransactOptions, contract_address};
@@ -916,6 +919,10 @@ impl BlockChainClient for Client {
 		}
 	}
 
+	fn additional_params(&self) -> BTreeMap<String, String> {
+		self.engine.additional_params().into_iter().collect()
+	}
+
 	fn blocks_with_bloom(&self, bloom: &H2048, from_block: BlockID, to_block: BlockID) -> Option<Vec<BlockNumber>> {
 		match (self.block_number(from_block), self.block_number(to_block)) {
 			(Some(from), Some(to)) => Some(self.chain.blocks_with_bloom(bloom, from, to)),

diff --git a/ethcore/src/client/test_client.rs b/ethcore/src/client/test_client.rs
@@ -21,9 +21,10 @@ use util::*;
 use devtools::*;
 use transaction::{Transaction, LocalizedTransaction, SignedTransaction, Action};
 use blockchain::TreeRoute;
-use client::{BlockChainClient, MiningBlockChainClient, BlockChainInfo, BlockStatus, BlockID,
-	TransactionID, UncleID, TraceId, TraceFilter, LastHashes, CallAnalytics,
-	BlockImportError};
+use client::{
+	BlockChainClient, MiningBlockChainClient, BlockChainInfo, BlockStatus, BlockID,
+	TransactionID, UncleID, TraceId, TraceFilter, LastHashes, CallAnalytics, BlockImportError
+};
 use header::{Header as BlockHeader, BlockNumber};
 use filter::Filter;
 use log_entry::LocalizedLogEntry;
@@ -517,6 +518,10 @@ impl BlockChainClient for TestBlockChainClient {
 	fn clear_queue(&self) {
 	}
 
+	fn additional_params(&self) -> BTreeMap<String, String> {
+		Default::default()
+	}
+
 	fn chain_info(&self) -> BlockChainInfo {
 		BlockChainInfo {
 			total_difficulty: *self.difficulty.read(),

diff --git a/ethcore/src/client/traits.rs b/ethcore/src/client/traits.rs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+use std::mem;
+use std::collections::{BTreeMap, VecDeque};
 use util::{U256, Address, H256, H2048, Bytes, Itertools};
 use blockchain::TreeRoute;
 use block_queue::BlockQueueInfo;
@@ -33,9 +35,7 @@ use executive::Executed;
 use env_info::LastHashes;
 use types::call_analytics::CallAnalytics;
 use block_import_error::BlockImportError;
-use std::mem;
-use std::collections::VecDeque;
-use ipc::{IpcConfig, BinaryConvertError};
+use ipc::IpcConfig;
 use types::blockchain_info::BlockChainInfo;
 use types::block_status::BlockStatus;
 
@@ -147,6 +147,9 @@ pub trait BlockChainClient : Sync + Send {
 	/// Get blockchain information.
 	fn chain_info(&self) -> BlockChainInfo;
 
+	/// Get the registrar address, if it exists.
+	fn additional_params(&self) -> BTreeMap<String, String>;
+
 	/// Get the best block header.
 	fn best_block_header(&self) -> Bytes;
 

diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
@@ -44,6 +44,9 @@ pub trait Engine : Sync + Send {
 	/// Additional engine-specific information for the user/developer concerning `header`.
 	fn extra_info(&self, _header: &Header) -> HashMap<String, String> { HashMap::new() }
 
+	/// Additional information.
+	fn additional_params(&self) -> HashMap<String, String> { HashMap::new() } 
+
 	/// Get the general parameters of the chain.
 	fn params(&self) -> &CommonParams;
 

diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs
@@ -92,6 +92,7 @@ impl Engine for Ethash {
 	fn seal_fields(&self) -> usize { 2 }
 
 	fn params(&self) -> &CommonParams { &self.params }
+	fn additional_params(&self) -> HashMap<String, String> { hash_map!["registrar".to_owned() => self.ethash_params.registrar.hex()] }
 
 	fn builtins(&self) -> &BTreeMap<Address, Builtin> {
 		&self.builtins

diff --git a/ethcore/src/lib.rs b/ethcore/src/lib.rs
@@ -28,6 +28,8 @@
 #![cfg_attr(feature="dev", allow(clone_on_copy))]
 // Complains on Box<E> when implementing From<Box<E>>
 #![cfg_attr(feature="dev", allow(boxed_local))]
+// Complains about nested modules with same name as parent
+#![cfg_attr(feature="dev", allow(module_inception))]
 // TODO [todr] a lot of warnings to be fixed
 #![cfg_attr(feature="dev", allow(assign_op_pattern))]