Browse Source

restore bip39 option for multisig, add a warning when option is clicked.

283
ThomasV 8 years ago
parent
commit
749a1f2006
  1. 13
      gui/qt/installwizard.py
  2. 8
      lib/base_wizard.py

13
gui/qt/installwizard.py

@ -256,6 +256,19 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
vbox.addStretch(1) vbox.addStretch(1)
vbox.addWidget(QLabel(_('Options') + ':')) vbox.addWidget(QLabel(_('Options') + ':'))
def f(b): def f(b):
if b:
msg = ' '.join([
'<b>' + _('Warning') + '</b>' + ': ',
_('BIP39 seeds may not be supported in the future.'),
'<br/><br/>',
_('As technology matures, Bitcoin address generation may change.'),
_('However, BIP39 seeds do not include a version number.'),
_('As a result, it is not possible to infer your wallet type from a BIP39 seed.'),
'<br/><br/>',
_('We do not guarantee that BIP39 seeds will be supported in future versions of Electrum.'),
_('We recommend to use seeds generated by Electrum or compatible wallets.'),
])
self.show_warning(msg)
slayout.is_seed = (lambda x: bool(x)) if b else is_seed slayout.is_seed = (lambda x: bool(x)) if b else is_seed
slayout.on_edit() slayout.on_edit()
cb_bip39 = QCheckBox(_('BIP39 seed')) cb_bip39 = QCheckBox(_('BIP39 seed'))

8
lib/base_wizard.py

@ -259,12 +259,8 @@ class BaseWizard(object):
self.line_dialog(title=_('Passphrase'), message=message, warning=warning, default='', test=lambda x:True, run_next=run_next) self.line_dialog(title=_('Passphrase'), message=message, warning=warning, default='', test=lambda x:True, run_next=run_next)
def restore_from_seed(self): def restore_from_seed(self):
if self.wallet_type == 'standard': self.opt_bip39 = True
self.opt_bip39 = True test = bitcoin.is_seed
test = bitcoin.is_seed
else:
self.opt_bip39 = False
test = bitcoin.is_new_seed
self.restore_seed_dialog(run_next=self.on_restore_seed, test=test) self.restore_seed_dialog(run_next=self.on_restore_seed, test=test)
def on_restore_seed(self, seed, is_bip39): def on_restore_seed(self, seed, is_bip39):

Loading…
Cancel
Save