AaronFiore/electrum
1
0
Fork 0
Code Activity

return fees in history, show them in kivy GUI

Browse Source
This commit is contained in:
ThomasV
2019-09-11 17:02:03 +02:00
parent a47a2c1b72
commit 65b88dca86
6 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/address_synchronizer.py
View File

@@ -439,14 +439,16 @@ class AddressSynchronizer(Logger):
for tx_hash in tx_deltas:
delta = tx_deltas[tx_hash]
tx_mined_status = self.get_tx_height(tx_hash)
history.append((tx_hash, tx_mined_status, delta))
# FIXME: db should only store fees computed by us...
fee = self.db.get_tx_fee(tx_hash)
history.append((tx_hash, tx_mined_status, delta, fee))
history.sort(key = lambda x: self.get_txpos(x[0]), reverse=True)
# 3. add balance
c, u, x = self.get_balance(domain)
balance = c + u + x
h2 = []
for tx_hash, tx_mined_status, delta in history:
h2.append((tx_hash, tx_mined_status, delta, balance))
for tx_hash, tx_mined_status, delta, fee in history:
h2.append((tx_hash, tx_mined_status, delta, fee, balance))
if balance is None or delta is None:
balance = None
else: