tfix #655 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 41f9da1559f838fd191eb936359b911635010d2a
DIR parent 6c96b38abf34e5bf20f744dbad6bf9dcdde4e15b
HTML Author: ThomasV <thomasv@gitorious>
Date: Sun, 20 Apr 2014 10:42:13 +0200
fix #655
Diffstat:
M gui/qt/installwizard.py | 5 ++++-
M lib/bitcoin.py | 2 +-
M lib/wallet.py | 1 +
3 files changed, 6 insertions(+), 2 deletions(-)
---
DIR diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
t@@ -322,7 +322,7 @@ class InstallWizard(QDialog):
elif Wallet.is_mpk(text):
wallet = Wallet.from_mpk(text, self.storage)
else:
- return
+ raise
elif t in ['2of2', '2of3']:
r = self.double_seed_dialog()
t@@ -347,6 +347,9 @@ class InstallWizard(QDialog):
wallet.create_accounts(None)
+ else:
+ raise
+
DIR diff --git a/lib/bitcoin.py b/lib/bitcoin.py
t@@ -84,7 +84,7 @@ def is_old_seed(seed):
try:
seed.decode('hex')
- is_hex = True
+ is_hex = (len(seed) == 32)
except Exception:
is_hex = False
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -1751,6 +1751,7 @@ class OldWallet(NewWallet):
def create_watching_only_wallet(self, mpk):
self.seed_version = OLD_SEED_VERSION
self.storage.put('seed_version', self.seed_version, True)
+ self.storage.put('master_public_key', mpk, True)
self.create_account(mpk)
def get_seed(self, password):