AaronFiore/electrum
1
0
Fork 0
Code Activity

get_full_history: make sure 'ln_value' and 'bc_value' are in every item

Browse Source
This commit is contained in:
ThomasV
2025-03-03 10:37:44 +01:00
parent 0a093754d7
commit 77a00db52a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electrum/wallet.py
View File

@@ -1398,6 +1398,10 @@ class Abstract_Wallet(ABC, Logger, EventListener):
# create groups # create groups
transactions = OrderedDictWithIndex() transactions = OrderedDictWithIndex()
for k, tx_item in sorted(list(transactions_tmp.items()), key=sort_key): for k, tx_item in sorted(list(transactions_tmp.items()), key=sort_key):
if 'ln_value' not in tx_item:
tx_item['ln_value'] = Satoshis(0)
if 'bc_value' not in tx_item:
tx_item['bc_value'] = Satoshis(0)
group_id = tx_item.get('group_id') group_id = tx_item.get('group_id')
if not group_id: if not group_id:
transactions[k] = tx_item transactions[k] = tx_item
@@ -1422,10 +1426,8 @@ class Abstract_Wallet(ABC, Logger, EventListener):
'txid': '----', 'txid': '----',
} }
transactions[key] = parent transactions[key] = parent
if 'bc_value' in tx_item: parent['bc_value'] += tx_item['bc_value']
parent['bc_value'] += tx_item['bc_value'] parent['ln_value'] += tx_item['ln_value']
if 'ln_value' in tx_item:
parent['ln_value'] += tx_item['ln_value']
parent['value'] = parent['bc_value'] + parent['ln_value'] parent['value'] = parent['bc_value'] + parent['ln_value']
if 'fiat_value' in tx_item: if 'fiat_value' in tx_item:
parent['fiat_value'] += tx_item['fiat_value'] parent['fiat_value'] += tx_item['fiat_value']