grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prioritizing re-imported transactions (#2372)

Browse Source 
* Prioritizing re-imported transactions

* Fixing compilation on beta
This commit is contained in:
Tomasz Drwięga
2016-09-28 23:32:32 +02:00
committed by Gav Wood
parent bb96849620
commit 424b46b428
5 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ethcore/src/client/client.rs
View File

@@ -853,9 +853,12 @@ impl BlockChainClient for Client {
fn transaction_receipt(&self, id: TransactionID) -> Option<LocalizedReceipt> {
let chain = self.chain.read();
self.transaction_address(id).and_then(|address| chain.block_number(&address.block_hash).and_then(|block_number| {
self.transaction_address(id)
.and_then(|address| chain.block_number(&address.block_hash).and_then(|block_number| {
let t = chain.block_body(&address.block_hash)
.and_then(|block| BodyView::new(&block).localized_transaction_at(&address.block_hash, block_number, address.index));
.and_then(|block| {
BodyView::new(&block).localized_transaction_at(&address.block_hash, block_number, address.index)
});
match (t, chain.transaction_receipt(&address)) {
(Some(tx), Some(receipt)) => {