AaronFiore/electrum
1
0
Fork 0
Code Activity

trustedcoin: do not require wallet file upgrade

Browse Source
This commit is contained in:
ThomasV
2018-12-09 06:17:33 +01:00
parent 7b90d69443
commit 852f2a0d65
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electrum/storage.py
View File

@@ -44,7 +44,7 @@ from .keystore import bip44_derivation
OLD_SEED_VERSION = 4 # electrum versions < 2.0
NEW_SEED_VERSION = 11 # electrum versions >= 2.0
FINAL_SEED_VERSION = 19 # electrum >= 2.7 will set this to prevent
FINAL_SEED_VERSION = 18 # electrum >= 2.7 will set this to prevent
# old versions from overwriting new format
@@ -354,7 +354,6 @@ class WalletStorage(JsonDB):
self.convert_version_16()
self.convert_version_17()
self.convert_version_18()
self.convert_version_19()
self.put('seed_version', FINAL_SEED_VERSION) # just to be sure
self.write()
@@ -576,13 +575,6 @@ class WalletStorage(JsonDB):
self.put('verified_tx3', None)
self.put('seed_version', 18)
def convert_version_19(self):
# delete trustedcoin_billing_addresses
if not self._is_upgrade_method_needed(18, 18):
return
self.put('trustedcoin_billing_addresses', None)
self.put('seed_version', 19)
def convert_imported(self):
if not self._is_upgrade_method_needed(0, 13):
return