AaronFiore/electrum
1
0
Fork 0
Code Activity

restore from xprv

Browse Source
This commit is contained in:
ThomasV
2014-06-25 16:45:55 +02:00
parent ace101e4f5
commit 54973062bd
3 changed files with 88 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gui/qt/installwizard.py
View File

@@ -176,11 +176,11 @@ class InstallWizard(QDialog):
def is_any(self, seed_e):
text = self.get_seed_text(seed_e)
return Wallet.is_seed(text) or Wallet.is_mpk(text) or Wallet.is_address(text) or Wallet.is_private_key(text)
return Wallet.is_seed(text) or Wallet.is_old_mpk(text) or Wallet.is_xpub(text) or Wallet.is_xprv(text) or Wallet.is_address(text) or Wallet.is_private_key(text)
def is_mpk(self, seed_e):
text = self.get_seed_text(seed_e)
return Wallet.is_mpk(text)
return Wallet.is_xpub(text) or Wallet.is_old_mpk(text)
def enter_seed_dialog(self, msg, sid):
@@ -211,7 +211,7 @@ class InstallWizard(QDialog):
hbox, button = ok_cancel_buttons2(self, _('Next'))
vbox.addLayout(hbox)
button.setEnabled(False)
f = lambda: button.setEnabled( map(lambda e: self.is_mpk(e), entries) == [True]*len(entries))
f = lambda: button.setEnabled( map(lambda e: self.is_xpub(e), entries) == [True]*len(entries))
for e in entries:
e.textChanged.connect(f)
self.set_layout(vbox)
@@ -476,8 +476,13 @@ class InstallWizard(QDialog):
wallet = Wallet.from_seed(text, self.storage)
wallet.add_seed(text, password)
wallet.create_accounts(password)
elif Wallet.is_mpk(text):
wallet = Wallet.from_mpk(text, self.storage)
elif Wallet.is_xprv(text):
password = self.password_dialog()
wallet = Wallet.from_xprv(text, password, self.storage)
elif Wallet.is_old_mpk(text):
wallet = Wallet.from_old_mpk(text, self.storage)
elif Wallet.is_xpub(text):
wallet = Wallet.from_xpub(text, self.storage)
elif Wallet.is_address(text):
wallet = Wallet.from_address(text, self.storage)
elif Wallet.is_private_key(text):