AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #6350 from SomberNight/202007_walletdb_convert_version_32

Browse Source 
invoices: rm old corrupted non-bip70 invoices
This commit is contained in:
ThomasV
2020-07-08 08:19:31 +02:00
committed by GitHub
parent c66c54a254 307403a02c
commit 3442dcc461
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
electrum/tests/test_storage_upgrade.py
View File

File diff suppressed because one or more lines are too long

14
electrum/wallet_db.py
View File

@@ -52,7 +52,7 @@ if TYPE_CHECKING:
OLD_SEED_VERSION = 4 # electrum versions < 2.0 OLD_SEED_VERSION = 4 # electrum versions < 2.0
NEW_SEED_VERSION = 11 # electrum versions >= 2.0 NEW_SEED_VERSION = 11 # electrum versions >= 2.0
FINAL_SEED_VERSION = 31 # electrum >= 2.7 will set this to prevent FINAL_SEED_VERSION = 32 # electrum >= 2.7 will set this to prevent
# old versions from overwriting new format # old versions from overwriting new format
@@ -179,6 +179,7 @@ class WalletDB(JsonDB):
self._convert_version_29() self._convert_version_29()
self._convert_version_30() self._convert_version_30()
self._convert_version_31() self._convert_version_31()
self._convert_version_32()
self.put('seed_version', FINAL_SEED_VERSION) # just to be sure self.put('seed_version', FINAL_SEED_VERSION) # just to be sure
self._after_upgrade_tasks() self._after_upgrade_tasks()
@@ -683,6 +684,17 @@ class WalletDB(JsonDB):
item['time'] = item['time'] or 0 item['time'] = item['time'] or 0
self.data['seed_version'] = 31 self.data['seed_version'] = 31
def _convert_version_32(self):
if not self._is_upgrade_method_needed(31, 31):
return
from .invoices import PR_TYPE_ONCHAIN
invoices_old = self.data.get('invoices', {})
invoices_new = {k: item for k, item in invoices_old.items()
if not (item['type'] == PR_TYPE_ONCHAIN and item['outputs'] is None)}
self.data['invoices'] = invoices_new
self.data['seed_version'] = 32
def _convert_imported(self): def _convert_imported(self):
if not self._is_upgrade_method_needed(0, 13): if not self._is_upgrade_method_needed(0, 13):
return return