electrum

commit 43892dd61a0b7d3d1b14246275f845f65c02dda7
parent eb39aa143b8112549a5f8156d8e3ee41034eac6a
Author: SomberNight <somber.night@protonmail.com>
Date:   Sun, 14 Jun 2020 03:39:35 +0200

invoices: fix #6233

Diffstat:
M
electrum/wallet.py
 | 
2
+-
M
electrum/wallet_db.py
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/electrum/wallet.py b/electrum/wallet.py
@@ -1641,7 +1641,7 @@ class Abstract_Wallet(AddressSynchronizer, ABC):
         uri = create_bip21_uri(addr, amount, message, extra_query_params=extra_query_params)
         return str(uri)
 
-    def check_expired_status(self, r, status):
+    def check_expired_status(self, r: Invoice, status):
         if r.is_lightning() and r.exp == 0:
             status = PR_EXPIRED  # for BOLT-11 invoices, exp==0 means 0 seconds
         if status == PR_UNPAID and r.exp > 0 and r.time + r.exp < time.time():
diff --git a/electrum/wallet_db.py b/electrum/wallet_db.py
@@ -619,7 +619,7 @@ class WalletDB(JsonDB):
                     'type': _type,
                     'message': r.get('message') or r.get('memo', ''),
                     'amount': r.get('amount'),
-                    'exp': r.get('exp', 0),
+                    'exp': r.get('exp') or 0,
                     'time': r.get('time', 0),
                 }
                 if _type == PR_TYPE_ONCHAIN: