AaronFiore/electrum
1
0
Fork 0
Code Activity

kivy: fix watching-only issue

Browse Source
This commit is contained in:
ThomasV
2016-03-05 04:34:13 +01:00
parent 247722fdec
commit 94664566e7
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/kivy/uix/dialogs/installwizard.py
View File

@@ -106,13 +106,11 @@ class InstallWizard(Widget):
self.run('add_seed', (text, None)) self.run('add_seed', (text, None))
msg = _('To create a watching-only wallet, paste your master public key, or scan it using the camera button.') msg = _('To create a watching-only wallet, paste your master public key, or scan it using the camera button.')
RestoreXpubDialog(test=Wallet.is_xpub, message=msg, on_release=on_xpub).open() RestoreXpubDialog(test=Wallet.is_mpk, message=msg, on_release=on_xpub).open()
def add_seed(self, text, password): def add_seed(self, text, password):
def task(): def task():
if not Wallet.is_seed(text): self.wallet = Wallet.from_text(text, password, self.storage)
raise BaseException("invalid seed")
self.wallet = Wallet.from_seed(text, password, self.storage)
self.wallet.create_main_account() self.wallet.create_main_account()
self.wallet.synchronize() self.wallet.synchronize()
msg= _("Electrum is generating your addresses, please wait.") msg= _("Electrum is generating your addresses, please wait.")

4
lib/wallet.py
View File

@@ -1987,6 +1987,10 @@ class Wallet(object):
def is_seed(seed): def is_seed(seed):
return is_old_seed(seed) or is_new_seed(seed) return is_old_seed(seed) or is_new_seed(seed)
@staticmethod
def is_mpk(text):
return Wallet.is_old_mpk(text) or Wallet.is_xpub(text)
@staticmethod @staticmethod
def is_old_mpk(mpk): def is_old_mpk(mpk):
try: try: