Merge branch 'master' into pip-msg

ethcore/src/client/client.rs

@@ -25,7 +25,7 @@ use time::precise_time_ns;
 // util
 use util::{Bytes, PerfTimer, Itertools, Mutex, RwLock, MutexGuard, Hashable};
 use util::{journaldb, DBValue, TrieFactory, Trie};
-use util::{U256, H256, Address, H2048, Uint, FixedHash};
+use util::{U256, H256, Address, H2048, Uint};
 use util::trie::TrieSpec;
 use util::kvdb::*;
 
@@ -151,8 +151,9 @@ pub struct Client {
 	factories: Factories,
 	history: u64,
 	rng: Mutex<OsRng>,
-	on_mode_change: Mutex<Option<Box<FnMut(&Mode) + 'static + Send>>>,
+	on_user_defaults_change: Mutex<Option<Box<FnMut(Option<Mode>) + 'static + Send>>>,
 	registrar: Mutex<Option<Registry>>,
+	exit_handler: Mutex<Option<Box<Fn(bool, Option<String>) + 'static + Send>>>,
 }
 
 impl Client {
@@ -240,8 +241,9 @@ impl Client {
 			factories: factories,
 			history: history,
 			rng: Mutex::new(OsRng::new().map_err(::util::UtilError::StdIo)?),
-			on_mode_change: Mutex::new(None),
+			on_user_defaults_change: Mutex::new(None),
 			registrar: Mutex::new(None),
+			exit_handler: Mutex::new(None),
 		});
 
 		{
@@ -276,6 +278,11 @@ impl Client {
 		self.notify.write().push(Arc::downgrade(&target));
 	}
 
+	/// Set a closure to call when we want to restart the client
+	pub fn set_exit_handler<F>(&self, f: F) where F: Fn(bool, Option<String>) + 'static + Send {
+		*self.exit_handler.lock() = Some(Box::new(f));
+	}
+
 	/// Returns engine reference.
 	pub fn engine(&self) -> &Engine {
 		&*self.engine
@@ -294,9 +301,9 @@ impl Client {
 		self.registrar.lock()
 	}
 
-	/// Register an action to be done if a mode change happens.
-	pub fn on_mode_change<F>(&self, f: F) where F: 'static + FnMut(&Mode) + Send {
-		*self.on_mode_change.lock() = Some(Box::new(f));
+	/// Register an action to be done if a mode/spec_name change happens.
+	pub fn on_user_defaults_change<F>(&self, f: F) where F: 'static + FnMut(Option<Mode>) + Send {
+		*self.on_user_defaults_change.lock() = Some(Box::new(f));
 	}
 
 	/// Flush the block import queue.
@@ -386,7 +393,7 @@ impl Client {
 			})?;
 
 			// Final Verification
-			if let Err(e) = self.verifier.verify_block_final(header, locked_block.block().header()) {
+			if let Err(e) = self.verifier.verify_block_final(header, locked_block.block().header(), self.engine().params().validate_receipts) {
 				warn!(target: "client", "Stage 4 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
 				return Err(());
 			}
@@ -651,7 +658,6 @@ impl Client {
 		self.miner.clone()
 	}
 
-
 	/// Replace io channel. Useful for testing.
 	pub fn set_io_channel(&self, io_channel: IoChannel<ClientIoMessage>) {
 		*self.io_channel.lock() = io_channel;
@@ -1030,9 +1036,9 @@ impl BlockChainClient for Client {
 			let mut mode = self.mode.lock();
 			*mode = new_mode.clone().into();
 			trace!(target: "mode", "Mode now {:?}", &*mode);
-			if let Some(ref mut f) = *self.on_mode_change.lock() {
+			if let Some(ref mut f) = *self.on_user_defaults_change.lock() {
 				trace!(target: "mode", "Making callback...");
-				f(&*mode)
+				f(Some((&*mode).clone()))
 			}
 		}
 		match new_mode {
@@ -1042,6 +1048,22 @@ impl BlockChainClient for Client {
 		}
 	}
 
+	fn spec_name(&self) -> String {
+		self.config.spec_name.clone()
+	}
+
+	fn set_spec_name(&self, new_spec_name: String) {
+		trace!(target: "mode", "Client::set_spec_name({:?})", new_spec_name);
+		if !self.enabled.load(AtomicOrdering::Relaxed) {
+			return;
+		}
+		if let Some(ref h) = *self.exit_handler.lock() {
+			(*h)(true, Some(new_spec_name));
+		} else {
+			warn!("Not hypervised; cannot change chain.");
+		}
+	}
+
 	fn best_block_header(&self) -> encoded::Header {
 		self.chain.read().best_block_header()
 	}

ethcore/src/client/config.rs

@@ -123,6 +123,8 @@ pub struct ClientConfig {
 	pub db_wal: bool,
 	/// Operating mode
 	pub mode: Mode,
+	/// The chain spec name
+	pub spec_name: String,
 	/// Type of block verifier used by client.
 	pub verifier_type: VerifierType,
 	/// State db cache-size.

ethcore/src/client/error.rs

@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use trace::Error as TraceError;
 use util::UtilError;
 use std::fmt::{Display, Formatter, Error as FmtError};
 
@@ -23,8 +22,6 @@ use util::trie::TrieError;
 /// Client configuration errors.
 #[derive(Debug)]
 pub enum Error {
-	/// TraceDB configuration error.
-	Trace(TraceError),
 	/// TrieDB-related error.
 	Trie(TrieError),
 	/// Database error
@@ -33,12 +30,6 @@ pub enum Error {
 	Util(UtilError),
 }
 
-impl From<TraceError> for Error {
-	fn from(err: TraceError) -> Self {
-		Error::Trace(err)
-	}
-}
-
 impl From<TrieError> for Error {
 	fn from(err: TrieError) -> Self {
 		Error::Trie(err)
@@ -60,7 +51,6 @@ impl<E> From<Box<E>> for Error where Error: From<E> {
 impl Display for Error {
 	fn fmt(&self, f: &mut Formatter) -> Result<(), FmtError> {
 		match *self {
-			Error::Trace(ref err) => write!(f, "{}", err),
 			Error::Trie(ref err) => write!(f, "{}", err),
 			Error::Util(ref err) => write!(f, "{}", err),
 			Error::Database(ref s) => write!(f, "Database error: {}", s),

ethcore/src/client/registry.rs

@@ -5,7 +5,7 @@ use std::string::String;
 use std::result::Result;
 use std::fmt;
 use {util, ethabi};
-use util::{FixedHash, Uint};
+use util::{Uint};
 
 pub struct Registry {
 	contract: ethabi::Contract,
@@ -22,7 +22,7 @@ impl Registry {
 		}
 	}
 	fn as_string<T: fmt::Debug>(e: T) -> String { format!("{:?}", e) }
-	
+
 	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_data","type":"address"}],"name":"canReverse","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
 	pub fn can_reverse(&self, _data: &util::Address) -> Result<bool, String>
@@ -45,7 +45,7 @@ impl Registry {
 			vec![ethabi::Token::Address(_new.clone().0)]
 		).map_err(Self::as_string)?;
 		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		
+
 		Ok(())
 	}
 
@@ -318,7 +318,7 @@ impl Registry {
 			vec![]
 		).map_err(Self::as_string)?;
 		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		
+
 		Ok(())
 	}
 

ethcore/src/client/test_client.rs

@@ -722,6 +722,10 @@ impl BlockChainClient for TestBlockChainClient {
 
 	fn set_mode(&self, _: Mode) { unimplemented!(); }
 
+	fn spec_name(&self) -> String { "foundation".into() }
+
+	fn set_spec_name(&self, _: String) { unimplemented!(); }
+
 	fn disable(&self) { unimplemented!(); }
 
 	fn pruning_info(&self) -> PruningInfo {

ethcore/src/client/traits.rs

@@ -242,6 +242,12 @@ pub trait BlockChainClient : Sync + Send {
 	/// Set the mode.
 	fn set_mode(&self, mode: Mode);
 
+	/// Get the chain spec name.
+	fn spec_name(&self) -> String;
+
+	/// Set the chain via a spec name.
+	fn set_spec_name(&self, spec_name: String);
+
 	/// Disable the client from importing blocks. This cannot be undone in this session and indicates
 	/// that a subsystem has reason to believe this executable incapable of syncing the chain.
 	fn disable(&self);