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

Merge pull request #920 from ethcore/fixed_send_transaction_deadlock

Browse Source 
Fixed send transaction deadlock
This commit is contained in:
Marek Kotewicz 2016-04-11 13:20:59 +02:00
commit 2004f1b5e5
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpc/src/v1/impls/eth.rs
View File

@ -190,13 +190,9 @@ impl<C, S, A, M, EM> EthClient<C, S, A, M, EM>
let hash = signed_transaction.hash();
let import = {
let miner = take_weak!(self.miner);
let client = take_weak!(self.client);
take_weak!(self.miner).import_transactions(vec![signed_transaction], |a: &Address| AccountDetails {
nonce: miner
.last_nonce(a)
.map(|nonce| nonce + U256::one())
.unwrap_or_else(|| client.nonce(a)),
nonce: client.nonce(a),
balance: client.balance(a),
})
};