Browse Source

Merge #325: Bugfix crash on unexpected error from gettransaction call.

3045370 Bugfix crash on unexpected error from gettransaction call. (AdamISZ)
master
AdamISZ 7 years ago
parent
commit
e3a11c0fad
No known key found for this signature in database
GPG Key ID: 141001A1AF77F20B
  1. 8
      jmclient/jmclient/blockchaininterface.py

8
jmclient/jmclient/blockchaininterface.py

@ -306,7 +306,7 @@ class ElectrumWalletInterface(BlockchainInterface): #pragma: no cover
def estimate_fee_per_kb(self, N):
if super(ElectrumWalletInterface, self).fee_per_kb_has_been_manually_set(N):
# use a floor of 1000 to not run into node relay problems
# use a floor of 1000 to not run into node relay problems
return int(max(1000, random.uniform(N * float(0.8), N * float(1.2))))
fee = self.wallet.network.synchronous_get(('blockchain.estimatefee', [N]
))
@ -688,10 +688,12 @@ class BitcoinCoreInterface(BlockchainInterface):
res = self.rpc("gettransaction", [tx["txid"], 1])
except JsonRpcError as e:
#This should never happen (gettransaction is a wallet rpc).
log.info("Failed any gettransaction call")
log.warn("Failed gettransaction call; JsonRpcError")
res = None
except Exception as e:
log.info(str(e))
log.warn("Failed gettransaction call; unexpected error:")
log.warn(str(e))
res = None
if not res:
continue
if "confirmations" not in res:

Loading…
Cancel
Save