AaronFiore/electrum
1
0
Fork 0
Code Activity

invoices: make sure that OnchainInvoice .exp and .time are not None

Browse Source 
related: #6284
This commit is contained in:
SomberNight
2020-06-27 02:23:46 +02:00
parent 2db0ad10db
commit dee5d52948
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
electrum/wallet_db.py
View File

@@ -52,7 +52,7 @@ if TYPE_CHECKING:
OLD_SEED_VERSION = 4 # electrum versions < 2.0
NEW_SEED_VERSION = 11 # electrum versions >= 2.0
FINAL_SEED_VERSION = 30 # electrum >= 2.7 will set this to prevent
FINAL_SEED_VERSION = 31 # electrum >= 2.7 will set this to prevent
# old versions from overwriting new format
@@ -178,6 +178,7 @@ class WalletDB(JsonDB):
self._convert_version_28()
self._convert_version_29()
self._convert_version_30()
self._convert_version_31()
self.put('seed_version', FINAL_SEED_VERSION) # just to be sure
self._after_upgrade_tasks()
@@ -667,6 +668,21 @@ class WalletDB(JsonDB):
raise Exception(f"unknown invoice type: {_type}")
self.data['seed_version'] = 30
def _convert_version_31(self):
if not self._is_upgrade_method_needed(30, 30):
return
from .invoices import PR_TYPE_ONCHAIN
requests = self.data.get('payment_requests', {})
invoices = self.data.get('invoices', {})
for d in [invoices, requests]:
for key, item in list(d.items()):
if item['type'] == PR_TYPE_ONCHAIN:
item['amount_sat'] = item['amount_sat'] or 0
item['exp'] = item['exp'] or 0
item['time'] = item['time'] or 0
self.data['seed_version'] = 31
def _convert_imported(self):
if not self._is_upgrade_method_needed(0, 13):
return