electrum

Electrum Bitcoin wallet
git clone https://git.parazyd.org/electrum
Log | Files | Refs | Submodules

commit 35c270e075ef2762c94fc589b9b9c45bb4b1f7e2
parent 217ba7c80cf98afe0f30b41ce73c240a10a4a54b
Author: ThomasV <thomasv@gitorious>
Date:   Wed, 21 May 2014 16:04:58 +0200

explicit type for imported wallets. fixes #698

Diffstat:
Mlib/wallet.py | 4++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/wallet.py b/lib/wallet.py @@ -1086,6 +1086,7 @@ class Imported_Wallet(Abstract_Wallet): a = self.accounts.get(IMPORTED_ACCOUNT) if not a: self.accounts[IMPORTED_ACCOUNT] = ImportedAccount({'imported':{}}) + self.storage.put('wallet_type', 'imported', True) def is_watching_only(self): @@ -1634,8 +1635,7 @@ class Wallet(object): if storage.get('wallet_type') == '2of3': return Wallet_2of3(storage) - if storage.file_exists and not storage.get('seed'): - # wallet made of imported keys + if storage.get('wallet_type') == 'imported': return Imported_Wallet(storage)