LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-31 09:21:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

check seed_version before wallet_type

Browse source
This commit is contained in:
ThomasV 2014-09-11 15:04:42 +02:00
parent 5a3756b879
commit e22dfc443c
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/wallet.py
View file

@ -1604,8 +1604,25 @@ class Wallet(object):
type when passed a WalletStorage instance.""" type when passed a WalletStorage instance."""
def __new__(self, storage): def __new__(self, storage):
config = storage.config
if not storage.file_exists:
return NewWallet(storage)
seed_version = storage.get('seed_version')
if not seed_version:
seed_version = OLD_SEED_VERSION if len(storage.get('master_public_key')) == 128 else NEW_SEED_VERSION
if seed_version not in [OLD_SEED_VERSION, NEW_SEED_VERSION]:
msg = "This wallet seed is not supported anymore."
if seed_version in [5, 7]:
msg += "\nTo open this wallet, try 'git checkout seed_v%d'"%seed_version
print msg
sys.exit(1)
if seed_version == OLD_SEED_VERSION:
return OldWallet(storage)
config = storage.config
run_hook('add_wallet_types', wallet_types) run_hook('add_wallet_types', wallet_types)
wallet_type = storage.get('wallet_type') wallet_type = storage.get('wallet_type')
if wallet_type: if wallet_type:
@ -1614,24 +1631,8 @@ class Wallet(object):
return WalletClass(storage) return WalletClass(storage)
else: else:
raise BaseException('unknown wallet type', wallet_type) raise BaseException('unknown wallet type', wallet_type)
if not storage.file_exists:
seed_version = NEW_SEED_VERSION
else: else:
seed_version = storage.get('seed_version')
if not seed_version:
seed_version = OLD_SEED_VERSION if len(storage.get('master_public_key')) == 128 else NEW_SEED_VERSION
if seed_version == OLD_SEED_VERSION:
return OldWallet(storage)
elif seed_version == NEW_SEED_VERSION:
return NewWallet(storage) return NewWallet(storage)
else:
msg = "This wallet seed is not supported."
if seed_version in [5, 7]:
msg += "\nTo open this wallet, try 'git checkout seed_v%d'"%seed_version
print msg
sys.exit(1)
@classmethod @classmethod
def is_seed(self, seed): def is_seed(self, seed):