From 77a00db52a752226540fed0d9cafffe5a2525a95 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Mon, 3 Mar 2025 10:37:44 +0100 Subject: [PATCH] get_full_history: make sure 'ln_value' and 'bc_value' are in every item --- electrum/wallet.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/electrum/wallet.py b/electrum/wallet.py index 87ff6efba..bbb5c83b6 100644 --- a/electrum/wallet.py +++ b/electrum/wallet.py @@ -1398,6 +1398,10 @@ class Abstract_Wallet(ABC, Logger, EventListener): # create groups transactions = OrderedDictWithIndex() 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') if not group_id: transactions[k] = tx_item @@ -1422,10 +1426,8 @@ class Abstract_Wallet(ABC, Logger, EventListener): 'txid': '----', } transactions[key] = parent - if 'bc_value' in tx_item: - parent['bc_value'] += tx_item['bc_value'] - if 'ln_value' in tx_item: - parent['ln_value'] += tx_item['ln_value'] + parent['bc_value'] += tx_item['bc_value'] + parent['ln_value'] += tx_item['ln_value'] parent['value'] = parent['bc_value'] + parent['ln_value'] if 'fiat_value' in tx_item: parent['fiat_value'] += tx_item['fiat_value']