AaronFiore/electrum
1
0
Fork 0
Code Activity

hooks and workflow for 2of3 wallets

Browse Source
This commit is contained in:
ThomasV
2014-04-06 21:38:53 +02:00
parent f4b1621910
commit 102bc204d5
6 changed files with 234 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/qt/__init__.py
View File

@@ -83,6 +83,14 @@ class ElectrumGui:
wallet = wizard.run()
if not wallet:
exit()
elif storage.get('wallet_type') in ['2of3'] and storage.get('seed') is None:
import installwizard
wizard = installwizard.InstallWizard(self.config, self.network, storage)
wallet = wizard.run(action= 'create2of3')
if not wallet:
exit()
else:
wallet = Wallet(storage)
wallet.start_threads(self.network)

110
gui/qt/installwizard.py
View File

@@ -3,7 +3,7 @@ from PyQt4.QtCore import *
import PyQt4.QtCore as QtCore
from electrum.i18n import _
from electrum import Wallet
from electrum import Wallet, Wallet_2of3
from seed_dialog import SeedDialog
from network_dialog import NetworkDialog
@@ -12,6 +12,7 @@ from amountedit import AmountEdit
import sys
import threading
from electrum.plugins import run_hook
class InstallWizard(QDialog):
@@ -81,12 +82,15 @@ class InstallWizard(QDialog):
return answer
def verify_seed(self, wallet):
def verify_seed(self, seed):
r = self.seed_dialog(False)
if not r:
return
if r != wallet.get_mnemonic(None):
if r != seed:
QMessageBox.warning(None, _('Error'), _('Incorrect seed'), _('OK'))
return False
else:
@@ -233,10 +237,29 @@ class InstallWizard(QDialog):
return
def show_message(self, msg):
vbox = QVBoxLayout()
vbox.addWidget(QLabel(msg))
vbox.addStretch(1)
vbox.addLayout(close_button(self, _('Next')))
self.set_layout(vbox)
if not self.exec_():
return None
def show_seed(self, wallet):
def question(self, msg):
vbox = QVBoxLayout()
vbox.addWidget(QLabel(msg))
vbox.addStretch(1)
vbox.addLayout(ok_cancel_buttons(self, _('OK')))
self.set_layout(vbox)
if not self.exec_():
return None
return True
def show_seed(self, seed, sid):
from seed_dialog import make_seed_dialog
vbox = make_seed_dialog(wallet.get_mnemonic(None), wallet.imported_keys)
vbox = make_seed_dialog(seed, sid)
vbox.addLayout(ok_cancel_buttons(self, _("Next")))
self.set_layout(vbox)
return self.exec_()
@@ -250,27 +273,76 @@ class InstallWizard(QDialog):
return run_password_dialog(self, wallet, self)
def run(self):
def choose_wallet_type(self):
grid = QGridLayout()
grid.setSpacing(5)
action = self.restore_or_create()
if not action:
msg = _("Choose your wallet.")
label = QLabel(msg)
label.setWordWrap(True)
grid.addWidget(label, 0, 0)
gb = QGroupBox()
b1 = QRadioButton(gb)
b1.setText(_("Standard wallet (protected by password)"))
b1.setChecked(True)
b2 = QRadioButton(gb)
b2.setText(_("Multi-signature wallet (two-factor authentication)"))
grid.addWidget(b1,1,0)
grid.addWidget(b2,2,0)
vbox = QVBoxLayout()
vbox.addLayout(grid)
vbox.addStretch(1)
vbox.addLayout(ok_cancel_buttons(self, _('Next')))
self.set_layout(vbox)
if not self.exec_():
return
if b1.isChecked():
return 'standard'
elif b2.isChecked():
return '2of3'
def run(self, action = None):
if action is None:
action = self.restore_or_create()
if action is None:
return
#gap = self.config.get('gap_limit', 5)
#if gap != 5:
# wallet.gap_limit = gap
# wallet.storage.put('gap_limit', gap, True)
if action == 'create':
wallet = Wallet(self.storage)
wallet.init_seed(None)
if not self.show_seed(wallet):
if action == 'create':
t = self.choose_wallet_type()
if t == '2of3':
run_hook('create_cold_seed', self.storage, self)
return
if not self.verify_seed(wallet):
if action in ['create', 'create2of3']:
wallet = Wallet(self.storage)
wallet.init_seed("note blind gun eye escape home surprise freedom bee carefully rant alter strength")
seed = wallet.get_mnemonic(None)
if not self.show_seed(seed, 'hot' if action == 'create2of3' else None):
return
if not self.verify_seed(seed):
return
ok, old_password, password = self.password_dialog(wallet)
wallet.save_seed(password)
if action == 'create2of3':
run_hook('create_hot_seed', wallet, self)
wallet.create_accounts(password)
def create():
wallet.save_seed(password)
wallet.synchronize() # generate first addresses offline
self.waiting_dialog(create)

95
gui/qt/seed_dialog.py
View File

@@ -29,68 +29,57 @@ class SeedDialog(QDialog):
QDialog.__init__(self, parent)
self.setModal(1)
self.setWindowTitle('Electrum' + ' - ' + _('Seed'))
self.parent = parent
vbox = make_seed_dialog(seed, imported_keys)
vbox = make_seed_dialog(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)
class PrivateKeysDialog(QDialog):
def __init__(self, parent, private_keys):
QDialog.__init__(self, parent)
self.setModal(1)
self.setWindowTitle('Electrum' + ' - ' + _('Master Private Keys'))
self.parent = parent
vbox = QVBoxLayout(self)
vbox.addWidget(QLabel(_("The seed has been removed from the wallet. It contains the following master private keys")+ ":"))
for k,v in sorted(private_keys.items()):
vbox.addWidget(QLabel(k))
vbox.addWidget(QLineEdit(v))
def make_seed_dialog(seed, sid=None):
vbox.addLayout(close_button(self))
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>"
warning_msg = "<b>"+_("WARNING")+":</b> " + _("Never disclose your seed. Never type it on a website.") + "</b><p>"
def make_seed_dialog(seed, imported_keys):
words = seed.split()
label1 = QLabel(_("Your wallet generation seed is")+ ":")
seed_text = QTextEdit(seed)
seed_text.setReadOnly(True)
seed_text.setMaximumHeight(130)
if sid is None:
msg = _("Your wallet generation seed is")
msg2 = save_msg + " " \
+ _("This seed will allow you to recover your wallet in case of computer failure.") + "<br/>" \
+ warning_msg
msg2 = _("Please write down or memorize these %d words (order is important).")%len(words) + " " \
+ _("This seed will allow you to recover your wallet in case of computer failure.") + " " \
+ _("Your seed is also displayed as QR code, in case you want to transfer it to a mobile phone.") + "<p>" \
+ "<b>"+_("WARNING")+":</b> " + _("Never disclose your seed. Never type it on a website.") + "</b><p>"
if imported_keys:
msg2 += "<b>"+_("WARNING")+":</b> " + _("Your wallet contains imported keys. These keys cannot be recovered from seed.") + "</b><p>"
label2 = QLabel(msg2)
label2.setWordWrap(True)
elif sid == 'cold':
msg = _("Your cold storage seed is")
msg2 = save_msg + " " \
+ _("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")
msg2 = save_msg + " " \
+ _("If you ever need to recover your wallet from seed, you will need both this seed and your cold seed.") + " " \
logo = QLabel()
logo.setPixmap(QPixmap(":icons/seed.png").scaledToWidth(56))
logo.setMaximumWidth(60)
label1 = QLabel(msg+ ":")
seed_text = QTextEdit(seed)
seed_text.setReadOnly(True)
seed_text.setMaximumHeight(130)
qrw = QRCodeWidget(seed)
label2 = QLabel(msg2)
label2.setWordWrap(True)
grid = QGridLayout()
logo = QLabel()
logo.setPixmap(QPixmap(":icons/seed.png").scaledToWidth(56))
logo.setMaximumWidth(60)
grid.addWidget(logo, 0, 0)
grid.addWidget(label1, 0, 1)
grid.addWidget(seed_text, 1, 0, 1, 2)
grid.addWidget(qrw, 0, 2, 2, 1)
vbox = QVBoxLayout()
vbox.addLayout(grid)
vbox.addWidget(label2)
return vbox
grid = QGridLayout()
grid.addWidget(logo, 0, 0)
grid.addWidget(label1, 0, 1)
grid.addWidget(seed_text, 1, 0, 1, 2)
#qrw = QRCodeWidget(seed)
#grid.addWidget(qrw, 0, 2, 2, 1)
vbox = QVBoxLayout()
vbox.addLayout(grid)
vbox.addWidget(label2)
vbox.addStretch(1)
return vbox