tfix get_tx_info - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 8886e5098aba01e4b53b047419d1048cf6634714
DIR parent 5af71395988bdda1d063559c7b961631218534f9
HTML Author: ThomasV <thomasv@electrum.org>
Date: Wed, 8 Jun 2016 14:14:50 +0200
fix get_tx_info
Diffstat:
M lib/wallet.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -605,7 +605,9 @@ class Abstract_Wallet(PrintError):
is_relevant, is_mine, v, fee = self.get_wallet_delta(tx)
exp_n = None
can_broadcast = False
+ can_bump = False
label = None
+ height = conf = timestamp = None
if tx.is_complete():
tx_hash = tx.hash()
if tx_hash in self.transactions.keys():
t@@ -624,6 +626,7 @@ class Abstract_Wallet(PrintError):
size = tx.estimated_size()
fee_per_kb = fee * 1000 / size
exp_n = self.network.reverse_dynfee(fee_per_kb)
+ can_bump = is_mine and not tx.is_final()
else:
status = _("Signed")
can_broadcast = self.network is not None
t@@ -643,9 +646,7 @@ class Abstract_Wallet(PrintError):
else:
amount = None
- can_rbf = is_mine and height <=0 and not tx.is_final()
-
- return tx_hash, status, label, can_broadcast, can_rbf, amount, fee, height, conf, timestamp, exp_n
+ return tx_hash, status, label, can_broadcast, can_bump, amount, fee, height, conf, timestamp, exp_n
def get_addr_io(self, address):