do not propose passphrase option in 2fa wallets
This commit is contained in:
parent
6c1dae4b10
commit
f98d1f43b4
|
@ -260,24 +260,28 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
|
||||||
seed = slayout.sanitized_text()
|
seed = slayout.sanitized_text()
|
||||||
return seed
|
return seed
|
||||||
|
|
||||||
def seed_input(self, title, message, is_valid, bip39=False):
|
def seed_input(self, title, message, is_valid):
|
||||||
slayout = self.text_input_layout(title, message, is_valid)
|
slayout = self.text_input_layout(title, message, is_valid)
|
||||||
vbox = QVBoxLayout()
|
vbox = QVBoxLayout()
|
||||||
vbox.addLayout(slayout.layout())
|
vbox.addLayout(slayout.layout())
|
||||||
cb_passphrase = QCheckBox(_('Add a passphrase to this seed'))
|
if self.opt_ext or self.opt_bip39:
|
||||||
vbox.addWidget(cb_passphrase)
|
vbox.addStretch(1)
|
||||||
cb_bip39 = QCheckBox(_('BIP39/BIP44 seed'))
|
vbox.addWidget(QLabel(_('Options')+ ':'))
|
||||||
cb_bip39.setVisible(bip39)
|
if self.opt_ext:
|
||||||
vbox.addWidget(cb_bip39)
|
cb_ext = QCheckBox(_('Extend this seed with a passphrase'))
|
||||||
|
vbox.addWidget(cb_ext)
|
||||||
|
if self.opt_bip39:
|
||||||
def f(b):
|
def f(b):
|
||||||
slayout.is_valid = (lambda x: bool(x)) if b else is_valid
|
slayout.is_valid = (lambda x: bool(x)) if b else is_valid
|
||||||
slayout.set_enabled()
|
slayout.set_enabled()
|
||||||
|
cb_bip39 = QCheckBox(_('BIP39/BIP44 seed'))
|
||||||
cb_bip39.toggled.connect(f)
|
cb_bip39.toggled.connect(f)
|
||||||
|
vbox.addWidget(cb_bip39)
|
||||||
self.set_main_layout(vbox, title, next_enabled=False)
|
self.set_main_layout(vbox, title, next_enabled=False)
|
||||||
seed = slayout.sanitized_text()
|
seed = slayout.sanitized_text()
|
||||||
add_passphrase = cb_passphrase.isChecked()
|
is_ext = cb_ext.isChecked() if self.opt_ext else False
|
||||||
is_bip39 = cb_bip39.isChecked()
|
is_bip39 = cb_bip39.isChecked() if self.opt_bip39 else False
|
||||||
return seed, add_passphrase, is_bip39
|
return seed, is_ext, is_bip39
|
||||||
|
|
||||||
@wizard_dialog
|
@wizard_dialog
|
||||||
def restore_keys_dialog(self, title, message, is_valid, run_next):
|
def restore_keys_dialog(self, title, message, is_valid, run_next):
|
||||||
|
@ -296,14 +300,15 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
|
||||||
def restore_seed_dialog(self, run_next, is_valid):
|
def restore_seed_dialog(self, run_next, is_valid):
|
||||||
title = _('Enter Seed')
|
title = _('Enter Seed')
|
||||||
message = _('Please enter your seed phrase in order to restore your wallet.')
|
message = _('Please enter your seed phrase in order to restore your wallet.')
|
||||||
return self.seed_input(title, message, is_valid, bip39=True)
|
return self.seed_input(title, message, is_valid)
|
||||||
|
|
||||||
@wizard_dialog
|
@wizard_dialog
|
||||||
def confirm_seed_dialog(self, run_next, is_valid):
|
def confirm_seed_dialog(self, run_next, is_valid):
|
||||||
self.app.clipboard().clear()
|
self.app.clipboard().clear()
|
||||||
title = _('Confirm Seed')
|
title = _('Confirm Seed')
|
||||||
message = ' '.join([
|
message = ' '.join([
|
||||||
_('Your seed is important!'),
|
_('Your seed is your wallet!'),
|
||||||
|
_('If you lose your seed, your money will be permanently lost.'),
|
||||||
_('To make sure that you have properly saved your seed, please retype it here.')
|
_('To make sure that you have properly saved your seed, please retype it here.')
|
||||||
])
|
])
|
||||||
return self.seed_input(title, message, is_valid)
|
return self.seed_input(title, message, is_valid)
|
||||||
|
|
|
@ -224,6 +224,8 @@ class BaseWizard(object):
|
||||||
self.on_keystore(k)
|
self.on_keystore(k)
|
||||||
|
|
||||||
def restore_from_seed(self):
|
def restore_from_seed(self):
|
||||||
|
self.opt_bip39 = True
|
||||||
|
self.opt_ext = True
|
||||||
self.restore_seed_dialog(run_next=self.on_seed, is_valid=keystore.is_seed)
|
self.restore_seed_dialog(run_next=self.on_seed, is_valid=keystore.is_seed)
|
||||||
|
|
||||||
def on_seed(self, seed, add_passphrase, is_bip39):
|
def on_seed(self, seed, add_passphrase, is_bip39):
|
||||||
|
@ -302,6 +304,8 @@ class BaseWizard(object):
|
||||||
def create_seed(self):
|
def create_seed(self):
|
||||||
from electrum.mnemonic import Mnemonic
|
from electrum.mnemonic import Mnemonic
|
||||||
seed = Mnemonic('en').make_seed()
|
seed = Mnemonic('en').make_seed()
|
||||||
|
self.opt_bip39 = False
|
||||||
|
self.opt_ext = True
|
||||||
self.show_seed_dialog(run_next=self.confirm_seed, seed_text=seed)
|
self.show_seed_dialog(run_next=self.confirm_seed, seed_text=seed)
|
||||||
|
|
||||||
def confirm_seed(self, seed):
|
def confirm_seed(self, seed):
|
||||||
|
|
|
@ -346,6 +346,8 @@ class TrustedCoinPlugin(BasePlugin):
|
||||||
('create_seed', _('Create a new seed')),
|
('create_seed', _('Create a new seed')),
|
||||||
('restore_wallet', _('I already have a seed')),
|
('restore_wallet', _('I already have a seed')),
|
||||||
]
|
]
|
||||||
|
wizard.opt_bip39 = False
|
||||||
|
wizard.opt_ext = False
|
||||||
wizard.choice_dialog(title=title, message=message, choices=choices, run_next=wizard.run)
|
wizard.choice_dialog(title=title, message=message, choices=choices, run_next=wizard.run)
|
||||||
|
|
||||||
def create_seed(self, wizard):
|
def create_seed(self, wizard):
|
||||||
|
|
Loading…
Reference in New Issue