From 43892dd61a0b7d3d1b14246275f845f65c02dda7 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Sun, 14 Jun 2020 03:39:35 +0200 Subject: [PATCH] invoices: fix #6233 --- electrum/wallet.py | 2 +- electrum/wallet_db.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/electrum/wallet.py b/electrum/wallet.py index b5c1708b1..a5d95b192 100644 --- 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 index 65ad7603f..90e79907d 100644 --- 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: