tMerge pull request #5604 from MrNaif2018/master - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit d5691129bb184a0d2497ce2e32313b672209bb06
DIR parent 74366f5cce2b1b35acff11cb8df7100083d7bbcc
HTML Author: ThomasV <thomasv@electrum.org>
Date: Mon, 2 Sep 2019 18:35:23 +0200
Merge pull request #5604 from MrNaif2018/master
Fix for onchain_history summary building
Diffstat:
M .gitignore | 2 ++
M electrum/wallet.py | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
---
DIR diff --git a/.gitignore b/.gitignore
t@@ -14,6 +14,8 @@ env/
bin/
/app.fil
.idea
+.mypy_cache
+.vscode
# icons
electrum/gui/kivy/theming/light-0.png
DIR diff --git a/electrum/wallet.py b/electrum/wallet.py
t@@ -633,9 +633,9 @@ class Abstract_Wallet(AddressSynchronizer):
out.append(item)
# add summary
if out:
- b, v = out[0]['balance'].value, out[0]['bc_value'].value
+ b, v = out[0]['bc_balance'].value, out[0]['bc_value'].value
start_balance = None if b is None or v is None else b - v
- end_balance = out[-1]['balance'].value
+ end_balance = out[-1]['bc_balance'].value
if from_timestamp is not None and to_timestamp is not None:
start_date = timestamp_to_datetime(from_timestamp)
end_date = timestamp_to_datetime(to_timestamp)