From dc6ade4ae33b2a06dfd452e6a707d7e4ef396a26 Mon Sep 17 00:00:00 2001 From: debris Date: Mon, 11 Apr 2016 12:44:57 +0200 Subject: [PATCH] fixed transaction deadlock --- rpc/src/v1/impls/eth.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/rpc/src/v1/impls/eth.rs b/rpc/src/v1/impls/eth.rs index 1d973f933..f8d591756 100644 --- a/rpc/src/v1/impls/eth.rs +++ b/rpc/src/v1/impls/eth.rs @@ -190,13 +190,9 @@ impl EthClient 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), }) };