From 46ae86f6002489c501416b82146a25fc80397943 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Fri, 10 May 2019 19:22:13 +0200 Subject: [PATCH] wallet: fix balance_at_timestamp closes #5326 --- electrum/wallet.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/electrum/wallet.py b/electrum/wallet.py index bfad9adea..f8ac16759 100644 --- a/electrum/wallet.py +++ b/electrum/wallet.py @@ -438,10 +438,12 @@ class Abstract_Wallet(AddressSynchronizer): return c1-c2, u1-u2, x1-x2 def balance_at_timestamp(self, domain, target_timestamp): + # we assume that get_history returns items ordered by block height + # we also assume that block timestamps are monotonic (which is false...!) h = self.get_history(domain) balance = 0 for tx_hash, tx_mined_status, value, balance in h: - if tx_mined_status.timestamp > target_timestamp: + if tx_mined_status.timestamp is None or tx_mined_status.timestamp > target_timestamp: return balance - value # return last balance return balance