installwizard: multisig wallets
This commit is contained in:
ThomasV
parent
5b0d0f4d99
commit
6c96b38abf
|
|
@ -5,7 +5,7 @@ import PyQt4.QtCore as QtCore
|
|||
from electrum.i18n import _
|
||||
from electrum import Wallet, Wallet_2of3
|
||||
|
||||
from seed_dialog import SeedDialog
|
||||
import seed_dialog
|
||||
from network_dialog import NetworkDialog
|
||||
from util import *
|
||||
from amountedit import AmountEdit
|
||||
|
|
@ -53,14 +53,10 @@ class InstallWizard(QDialog):
|
|||
b1.setChecked(True)
|
||||
|
||||
b2 = QRadioButton(gb)
|
||||
b2.setText(_("Restore an existing wallet from its seed"))
|
||||
|
||||
b3 = QRadioButton(gb)
|
||||
b3.setText(_("Create a watching-only version of an existing wallet"))
|
||||
b2.setText(_("Restore an existing wallet"))
|
||||
|
||||
grid.addWidget(b1,1,0)
|
||||
grid.addWidget(b2,2,0)
|
||||
grid.addWidget(b3,3,0)
|
||||
|
||||
vbox = QVBoxLayout()
|
||||
self.set_layout(vbox)
|
||||
|
|
@ -72,21 +68,12 @@ class InstallWizard(QDialog):
|
|||
if not self.exec_():
|
||||
return
|
||||
|
||||
if b1.isChecked():
|
||||
answer = 'create'
|
||||
elif b2.isChecked():
|
||||
answer = 'restore'
|
||||
else:
|
||||
answer = 'watching'
|
||||
|
||||
return answer
|
||||
return 'create' if b1.isChecked() else 'restore'
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
def verify_seed(self, seed):
|
||||
r = self.seed_dialog(False)
|
||||
def verify_seed(self, seed, sid):
|
||||
r = self.enter_seed_dialog(False, sid)
|
||||
if not r:
|
||||
return
|
||||
|
||||
|
|
@ -97,52 +84,46 @@ class InstallWizard(QDialog):
|
|||
return True
|
||||
|
||||
|
||||
def seed_dialog(self, is_restore=True):
|
||||
def get_seed_text(self, seed_e):
|
||||
return unicode(seed_e.toPlainText())
|
||||
|
||||
vbox = QVBoxLayout()
|
||||
if is_restore:
|
||||
msg = _("Please enter your wallet seed.") + "\n"
|
||||
else:
|
||||
msg = _("Your seed is important!") \
|
||||
+ "\n" + _("To make sure that you have properly saved your seed, please retype it here.")
|
||||
|
||||
logo = QLabel()
|
||||
logo.setPixmap(QPixmap(":icons/seed.png").scaledToWidth(56))
|
||||
logo.setMaximumWidth(60)
|
||||
|
||||
label = QLabel(msg)
|
||||
label.setWordWrap(True)
|
||||
def is_seed(self, seed_e):
|
||||
text = self.get_seed_text(seed_e)
|
||||
return Wallet.is_seed(text) or Wallet.is_mpk(text)
|
||||
|
||||
seed_e = QTextEdit()
|
||||
seed_e.setMaximumHeight(100)
|
||||
|
||||
vbox.addWidget(label)
|
||||
|
||||
grid = QGridLayout()
|
||||
grid.addWidget(logo, 0, 0)
|
||||
grid.addWidget(seed_e, 0, 1)
|
||||
|
||||
vbox.addLayout(grid)
|
||||
|
||||
def enter_seed_dialog(self, is_restore, sid):
|
||||
vbox, seed_e = seed_dialog.enter_seed_box(is_restore, sid)
|
||||
vbox.addStretch(1)
|
||||
vbox.addLayout(ok_cancel_buttons(self, _('Next')))
|
||||
|
||||
hbox, button = ok_cancel_buttons2(self, _('Next'))
|
||||
vbox.addLayout(hbox)
|
||||
button.setEnabled(False)
|
||||
seed_e.textChanged.connect(lambda: button.setEnabled(self.is_seed(seed_e)))
|
||||
self.set_layout(vbox)
|
||||
if not self.exec_():
|
||||
return
|
||||
return self.get_seed_text(seed_e)
|
||||
|
||||
seed = seed_e.toPlainText()
|
||||
seed = unicode(seed.toLower())
|
||||
|
||||
if not seed:
|
||||
QMessageBox.warning(None, _('Error'), _('No seed'), _('OK'))
|
||||
return
|
||||
def double_seed_dialog(self):
|
||||
vbox = QVBoxLayout()
|
||||
vbox1, seed_e1 = seed_dialog.enter_seed_box(True, 'hot')
|
||||
vbox2, seed_e2 = seed_dialog.enter_seed_box(True, 'cold')
|
||||
vbox.addLayout(vbox1)
|
||||
vbox.addLayout(vbox2)
|
||||
vbox.addStretch(1)
|
||||
hbox, button = ok_cancel_buttons2(self, _('Next'))
|
||||
vbox.addLayout(hbox)
|
||||
button.setEnabled(False)
|
||||
f = lambda: button.setEnabled(self.is_seed(seed_e1) and self.is_seed(seed_e2))
|
||||
seed_e1.textChanged.connect(f)
|
||||
seed_e2.textChanged.connect(f)
|
||||
self.set_layout(vbox)
|
||||
if not self.exec_():
|
||||
return
|
||||
return self.get_seed_text(seed_e1), self.get_seed_text(seed_e2)
|
||||
|
||||
if not Wallet.is_seed(seed):
|
||||
QMessageBox.warning(None, _('Error'), _('Invalid seed'), _('OK'))
|
||||
return
|
||||
|
||||
return seed
|
||||
|
||||
|
||||
|
||||
|
|
@ -161,32 +142,6 @@ class InstallWizard(QDialog):
|
|||
|
||||
|
||||
|
||||
def mpk_dialog(self):
|
||||
|
||||
vbox = QVBoxLayout()
|
||||
vbox.addWidget(QLabel(_("Please enter your master public key.")))
|
||||
|
||||
grid = QGridLayout()
|
||||
grid.setSpacing(8)
|
||||
|
||||
label = QLabel(_("Key"))
|
||||
grid.addWidget(label, 0, 0)
|
||||
mpk_e = QTextEdit()
|
||||
mpk_e.setMaximumHeight(100)
|
||||
grid.addWidget(mpk_e, 0, 1)
|
||||
|
||||
vbox.addLayout(grid)
|
||||
|
||||
vbox.addStretch(1)
|
||||
vbox.addLayout(ok_cancel_buttons(self, _('Next')))
|
||||
|
||||
self.set_layout(vbox)
|
||||
if not self.exec_():
|
||||
return None
|
||||
|
||||
mpk = str(mpk_e.toPlainText()).strip()
|
||||
return mpk
|
||||
|
||||
|
||||
def network_dialog(self):
|
||||
|
||||
|
|
@ -258,8 +213,7 @@ class InstallWizard(QDialog):
|
|||
|
||||
|
||||
def show_seed(self, seed, sid):
|
||||
from seed_dialog import make_seed_dialog
|
||||
vbox = make_seed_dialog(seed, sid)
|
||||
vbox = seed_dialog.show_seed_box(seed, sid)
|
||||
vbox.addLayout(ok_cancel_buttons(self, _("Next")))
|
||||
self.set_layout(vbox)
|
||||
return self.exec_()
|
||||
|
|
@ -320,6 +274,9 @@ class InstallWizard(QDialog):
|
|||
|
||||
if action == 'create':
|
||||
t = self.choose_wallet_type()
|
||||
if not t:
|
||||
return
|
||||
|
||||
if t == '2of3':
|
||||
run_hook('create_cold_seed', self.storage, self)
|
||||
return
|
||||
|
|
@ -331,35 +288,67 @@ class InstallWizard(QDialog):
|
|||
|
||||
wallet.init_seed(None)
|
||||
seed = wallet.get_mnemonic(None)
|
||||
if not self.show_seed(seed, 'hot' if action == 'create2of3' else None):
|
||||
sid = 'hot' if action == 'create2of3' else None
|
||||
if not self.show_seed(seed, sid):
|
||||
return
|
||||
if not self.verify_seed(seed):
|
||||
if not self.verify_seed(seed, sid):
|
||||
return
|
||||
ok, old_password, password = self.password_dialog(wallet)
|
||||
wallet.save_seed(password)
|
||||
|
||||
if action == 'create2of3':
|
||||
run_hook('create_hot_seed', wallet, self)
|
||||
run_hook('create_third_key', wallet, self)
|
||||
if not wallet.master_public_keys.get("remote/"):
|
||||
return
|
||||
|
||||
wallet.create_accounts(password)
|
||||
def create():
|
||||
wallet.synchronize() # generate first addresses offline
|
||||
self.waiting_dialog(create)
|
||||
# generate first addresses offline
|
||||
self.waiting_dialog(wallet.synchronize)
|
||||
|
||||
elif action == 'restore':
|
||||
seed = self.seed_dialog()
|
||||
if not Wallet.is_seed(seed):
|
||||
# dialog box will accept either seed or xpub.
|
||||
# use two boxes for 2of3
|
||||
t = self.choose_wallet_type()
|
||||
if not t:
|
||||
return
|
||||
wallet = Wallet.from_seed(seed, self.storage)
|
||||
ok, old_password, password = self.password_dialog(wallet)
|
||||
wallet.save_seed(password)
|
||||
wallet.create_accounts(password)
|
||||
|
||||
elif action == 'watching':
|
||||
mpk = self.mpk_dialog()
|
||||
if not mpk:
|
||||
return
|
||||
wallet = Wallet.from_mpk(mpk, self.storage)
|
||||
if t == 'standard':
|
||||
text = self.enter_seed_dialog(True, None)
|
||||
if Wallet.is_seed(text):
|
||||
wallet = Wallet.from_seed(text, self.storage)
|
||||
ok, old_password, password = self.password_dialog(wallet)
|
||||
wallet.save_seed(password)
|
||||
wallet.create_accounts(password)
|
||||
elif Wallet.is_mpk(text):
|
||||
wallet = Wallet.from_mpk(text, self.storage)
|
||||
else:
|
||||
return
|
||||
|
||||
elif t in ['2of2', '2of3']:
|
||||
r = self.double_seed_dialog()
|
||||
if not r:
|
||||
return
|
||||
text1, text2 = r
|
||||
wallet = Wallet_2of3(self.storage)
|
||||
|
||||
if Wallet.is_seed(text1):
|
||||
xpriv, xpub = bip32_root(text1)
|
||||
elif Wallet.is_mpk(text1):
|
||||
xpub = text1
|
||||
wallet.add_master_public_key("m/", xpub)
|
||||
|
||||
if Wallet.is_seed(text2):
|
||||
xpriv2, xpub2 = bip32_root(text2)
|
||||
elif Wallet.is_mpk(text2):
|
||||
xpub2 = text2
|
||||
wallet.add_master_public_key("cold/", xpub2)
|
||||
|
||||
run_hook('restore_third_key', wallet, self)
|
||||
|
||||
wallet.create_accounts(None)
|
||||
|
||||
|
||||
|
||||
|
||||
else: raise
|
||||
|
||||
|
|
|
|||
|
|
@ -29,15 +29,25 @@ class SeedDialog(QDialog):
|
|||
QDialog.__init__(self, parent)
|
||||
self.setModal(1)
|
||||
self.setWindowTitle('Electrum' + ' - ' + _('Seed'))
|
||||
vbox = make_seed_dialog(seed)
|
||||
vbox = show_seed_box(seed)
|
||||
if imported_keys:
|
||||
vbox.addWidget(QLabel("<b>"+_("WARNING")+":</b> " + _("Your wallet contains imported keys. These keys cannot be recovered from seed.") + "</b><p>"))
|
||||
vbox.addLayout(close_button(self))
|
||||
self.setLayout(vbox)
|
||||
|
||||
|
||||
def icon_filename(sid):
|
||||
if sid == 'cold':
|
||||
return ":icons/cold_seed.png"
|
||||
elif sid == 'hot':
|
||||
return ":icons/hot_seed.png"
|
||||
else:
|
||||
return ":icons/seed.png"
|
||||
|
||||
|
||||
def make_seed_dialog(seed, sid=None):
|
||||
|
||||
|
||||
def show_seed_box(seed, sid=None):
|
||||
|
||||
save_msg = _("Please save these %d words on paper (order is important).")%len(seed.split()) + " "
|
||||
qr_msg = _("Your seed is also displayed as QR code, in case you want to transfer it to a mobile phone.") + "<p>"
|
||||
|
|
@ -55,7 +65,7 @@ def make_seed_dialog(seed, sid=None):
|
|||
+ _("This seed will be permanently deleted from your wallet file. Make sure you have saved it before you press 'next'") + " " \
|
||||
|
||||
elif sid == 'hot':
|
||||
msg = _("Your main seed is")
|
||||
msg = _("Your hot seed is")
|
||||
msg2 = save_msg + " " \
|
||||
+ _("If you ever need to recover your wallet from seed, you will need both this seed and your cold seed.") + " " \
|
||||
|
||||
|
|
@ -68,7 +78,8 @@ def make_seed_dialog(seed, sid=None):
|
|||
label2.setWordWrap(True)
|
||||
|
||||
logo = QLabel()
|
||||
logo.setPixmap(QPixmap(":icons/seed.png").scaledToWidth(56))
|
||||
|
||||
logo.setPixmap(QPixmap(icon_filename(sid)).scaledToWidth(56))
|
||||
logo.setMaximumWidth(60)
|
||||
|
||||
grid = QGridLayout()
|
||||
|
|
@ -83,3 +94,32 @@ def make_seed_dialog(seed, sid=None):
|
|||
vbox.addStretch(1)
|
||||
|
||||
return vbox
|
||||
|
||||
|
||||
def enter_seed_box(is_restore, sid=None):
|
||||
|
||||
vbox = QVBoxLayout()
|
||||
if is_restore:
|
||||
msg = _("Please enter your wallet seed, or master public key") + "\n"
|
||||
else:
|
||||
msg = _("Your seed is important!") \
|
||||
+ "\n" + _("To make sure that you have properly saved your seed, please retype it here.")
|
||||
|
||||
logo = QLabel()
|
||||
logo.setPixmap(QPixmap(icon_filename(sid)).scaledToWidth(56))
|
||||
logo.setMaximumWidth(60)
|
||||
|
||||
label = QLabel(msg)
|
||||
label.setWordWrap(True)
|
||||
|
||||
seed_e = QTextEdit()
|
||||
seed_e.setMaximumHeight(100)
|
||||
|
||||
vbox.addWidget(label)
|
||||
|
||||
grid = QGridLayout()
|
||||
grid.addWidget(logo, 0, 0)
|
||||
grid.addWidget(seed_e, 0, 1)
|
||||
|
||||
vbox.addLayout(grid)
|
||||
return vbox, seed_e
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ def close_button(dialog, label=_("Close") ):
|
|||
b.setDefault(True)
|
||||
return hbox
|
||||
|
||||
def ok_cancel_buttons(dialog, ok_label=_("OK") ):
|
||||
def ok_cancel_buttons2(dialog, ok_label=_("OK") ):
|
||||
hbox = QHBoxLayout()
|
||||
hbox.addStretch(1)
|
||||
b = QPushButton(_("Cancel"))
|
||||
|
|
@ -55,6 +55,10 @@ def ok_cancel_buttons(dialog, ok_label=_("OK") ):
|
|||
hbox.addWidget(b)
|
||||
b.clicked.connect(dialog.accept)
|
||||
b.setDefault(True)
|
||||
return hbox, b
|
||||
|
||||
def ok_cancel_buttons(dialog, ok_label=_("OK") ):
|
||||
hbox, b = ok_cancel_buttons2(dialog, ok_label)
|
||||
return hbox
|
||||
|
||||
def text_dialog(parent, title, label, ok_label, default=None):
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@
|
|||
<file>icons/unlock.png</file>
|
||||
<file>icons/preferences.png</file>
|
||||
<file>icons/seed.png</file>
|
||||
<file>icons/hot_seed.png</file>
|
||||
<file>icons/cold_seed.png</file>
|
||||
<file>icons/status_connected.png</file>
|
||||
<file>icons/status_disconnected.png</file>
|
||||
<file>icons/status_waiting.png</file>
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 9.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 9.8 KiB |
|
|
@ -1854,15 +1854,36 @@ class Wallet(object):
|
|||
if not seed:
|
||||
return False
|
||||
elif is_old_seed(seed):
|
||||
return OldWallet
|
||||
return True
|
||||
elif is_new_seed(seed):
|
||||
return NewWallet
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
@classmethod
|
||||
def is_mpk(self, mpk):
|
||||
try:
|
||||
int(mpk, 16)
|
||||
old = True
|
||||
except:
|
||||
old = False
|
||||
|
||||
if old:
|
||||
return len(mpk) == 128
|
||||
else:
|
||||
try:
|
||||
deserialize_xkey(mpk)
|
||||
return True
|
||||
except:
|
||||
return False
|
||||
|
||||
|
||||
@classmethod
|
||||
def from_seed(self, seed, storage):
|
||||
klass = self.is_seed(seed)
|
||||
if is_old_seed(seed):
|
||||
klass = OldWallet
|
||||
elif is_new_seed(seed):
|
||||
klass = NewWallet
|
||||
w = klass(storage)
|
||||
w.init_seed(seed)
|
||||
return w
|
||||
|
|
|
|||
Loading…
Reference in New Issue