AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge branch 'master' of github.com:spesmilo/electrum

Browse Source
This commit is contained in:
ThomasV
2017-10-27 16:28:55 +02:00
parent e607a499c1 98d5829805
commit f7b14cb27f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/storage.py
View File

@@ -258,6 +258,7 @@ class WalletStorage(PrintError):
self.convert_wallet_type()
self.convert_account()
self.convert_version_13_b()
self.convert_version_14()
self.convert_version_15()
self.put('seed_version', FINAL_SEED_VERSION) # just to be sure
@@ -373,7 +374,7 @@ class WalletStorage(PrintError):
self.put('seed_version', 13)
def convert_version_15(self):
def convert_version_14(self):
# convert imported wallets for 3.0
if not self._is_upgrade_method_needed(13, 13):
return
@@ -400,6 +401,12 @@ class WalletStorage(PrintError):
self.put('addresses', d)
self.put('pubkeys', None)
self.put('wallet_type', 'imported')
self.put('seed_version', 14)
def convert_version_15(self):
if not self._is_upgrade_method_needed(14, 14):
return
assert self.get('seed_type') != 'segwit' # unsupported derivation
self.put('seed_version', 15)
def convert_imported(self):