AaronFiore/electrum
1
0
Fork 0
Code Activity

fix get_tx_info

Browse Source
This commit is contained in:
ThomasV
2016-06-08 14:14:50 +02:00
parent 5af7139598
commit 8886e5098a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/wallet.py
View File

@@ -605,7 +605,9 @@ class Abstract_Wallet(PrintError):
is_relevant, is_mine, v, fee = self.get_wallet_delta(tx) is_relevant, is_mine, v, fee = self.get_wallet_delta(tx)
exp_n = None exp_n = None
can_broadcast = False can_broadcast = False
can_bump = False
label = None label = None
height = conf = timestamp = None
if tx.is_complete(): if tx.is_complete():
tx_hash = tx.hash() tx_hash = tx.hash()
if tx_hash in self.transactions.keys(): if tx_hash in self.transactions.keys():
@@ -624,6 +626,7 @@ class Abstract_Wallet(PrintError):
size = tx.estimated_size() size = tx.estimated_size()
fee_per_kb = fee * 1000 / size fee_per_kb = fee * 1000 / size
exp_n = self.network.reverse_dynfee(fee_per_kb) exp_n = self.network.reverse_dynfee(fee_per_kb)
can_bump = is_mine and not tx.is_final()
else: else:
status = _("Signed") status = _("Signed")
can_broadcast = self.network is not None can_broadcast = self.network is not None
@@ -643,9 +646,7 @@ class Abstract_Wallet(PrintError):
else: else:
amount = None amount = None
can_rbf = is_mine and height <=0 and not tx.is_final() return tx_hash, status, label, can_broadcast, can_bump, amount, fee, height, conf, timestamp, exp_n
return tx_hash, status, label, can_broadcast, can_rbf, amount, fee, height, conf, timestamp, exp_n
def get_addr_io(self, address): def get_addr_io(self, address):