diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py index b0180ca5..247e07a3 100644 --- a/gui/qt/installwizard.py +++ b/gui/qt/installwizard.py @@ -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() @@ -347,6 +347,9 @@ class InstallWizard(QDialog): wallet.create_accounts(None) + else: + raise + diff --git a/lib/bitcoin.py b/lib/bitcoin.py index e3274cc6..e30c8381 100644 --- a/lib/bitcoin.py +++ b/lib/bitcoin.py @@ -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 diff --git a/lib/wallet.py b/lib/wallet.py index 9d7fff59..190b2d79 100644 --- a/lib/wallet.py +++ b/lib/wallet.py @@ -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):