Merge remote-tracking branch 'remotes/upstream/master' into transactions-permission-contract-fix

2017-12-28 12:56:21 +02:00
parent 31ffb467f5 26e4fc680c
commit 45116099c5
100 changed files with 385 additions and 441 deletions
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -1857,7 +1857,7 @@ impl MiningBlockChainClient for Client {
 		let mut open_block = OpenBlock::new(
 			engine,
 			self.factories.clone(),
-			false,	// TODO: this will need to be parameterised once we want to do immediate mining insertion.
+			self.tracedb.read().tracing_enabled(),
 			self.state_db.lock().boxed_clone_canon(&h),
 			best_header,
 			self.build_last_hashes(h.clone()),