Merge branch 'master' into auth-bft

2016-12-10 11:01:23 +01:00
parent b15edd095e b9c04fcd00
commit e5f8044cad
160 changed files with 3773 additions and 1341 deletions
--- a/ethcore/src/client/traits.rs
+++ b/ethcore/src/client/traits.rs
@@ -129,6 +129,9 @@ pub trait BlockChainClient : Sync + Send {
 	/// Get transaction with given hash.
 	fn transaction(&self, id: TransactionID) -> Option<LocalizedTransaction>;

+	/// Get the hash of block that contains the transaction, if any.
+	fn transaction_block(&self, id: TransactionID) -> Option<H256>;
+
 	/// Get uncle with given id.
 	fn uncle(&self, id: UncleID) -> Option<Bytes>;