AaronFiore/electrum
1
0
Fork 0
Code Activity

Group swap transactions in Qt history (fixes #6237)

Browse Source 
- use tree structure of QTreeView
 - grouped items have a 'group_id' field
 - rename 'Normal' swap as 'Forward'
This commit is contained in:
ThomasV
2020-06-16 19:30:41 +02:00
parent f3c4b8698d
commit 4bda882695
6 changed files with 237 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
electrum/lnworker.py
View File

@@ -633,15 +633,15 @@ class LNWallet(LNWorker):
'payment_hash': key,
'preimage': preimage,
}
# add txid to merge item with onchain item
# add group_id to swap transactions
swap = self.swap_manager.get_swap(payment_hash)
if swap:
if swap.is_reverse:
#item['txid'] = swap.spending_txid
item['label'] = 'Reverse swap' + ' ' + self.config.format_amount_and_units(swap.lightning_amount)
item['group_id'] = swap.spending_txid
item['group_label'] = 'Reverse swap' + ' ' + self.config.format_amount_and_units(swap.lightning_amount)
else:
#item['txid'] = swap.funding_txid
item['label'] = 'Normal swap' + ' ' + self.config.format_amount_and_units(swap.onchain_amount)
item['group_id'] = swap.funding_txid
item['group_label'] = 'Forward swap' + ' ' + self.config.format_amount_and_units(swap.onchain_amount)
# done
out[payment_hash] = item
return out
@@ -680,6 +680,31 @@ class LNWallet(LNWorker):
'fee_msat': None,
}
out[closing_txid] = item
# add info about submarine swaps
settled_payments = self.get_settled_payments()
current_height = self.network.get_local_height()
for payment_hash_hex, swap in self.swap_manager.swaps.items():
txid = swap.spending_txid if swap.is_reverse else swap.funding_txid
if txid is None:
continue
if payment_hash_hex in settled_payments:
plist = settled_payments[payment_hash_hex]
info = self.get_payment_info(bytes.fromhex(payment_hash_hex))
amount_msat, fee_msat, timestamp = self.get_payment_value(info, plist)
else:
amount_msat = 0
label = 'Reverse swap' if swap.is_reverse else 'Forward swap'
delta = current_height - swap.locktime
if not swap.is_redeemed and swap.spending_txid is None and delta < 0:
label += f' (refundable in {-delta} blocks)' # fixme: only if unspent
out[txid] = {
'txid': txid,
'group_id': txid,
'amount_msat': 0,
#'amount_msat': amount_msat, # must not be added
'type': 'swap',
'label': label
}
return out
def get_history(self):