From 749a1f20061e65f9e89b9901e82a641bae8bc270 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Wed, 28 Sep 2016 09:53:17 +0200 Subject: [PATCH] restore bip39 option for multisig, add a warning when option is clicked. --- gui/qt/installwizard.py | 13 +++++++++++++ lib/base_wizard.py | 8 ++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py index 3ea024ed..2f822351 100644 --- a/gui/qt/installwizard.py +++ b/gui/qt/installwizard.py @@ -256,6 +256,19 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard): vbox.addStretch(1) vbox.addWidget(QLabel(_('Options') + ':')) def f(b): + if b: + msg = ' '.join([ + '' + _('Warning') + '' + ': ', + _('BIP39 seeds may not be supported in the future.'), + '

', + _('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.'), + '

', + _('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.on_edit() cb_bip39 = QCheckBox(_('BIP39 seed')) diff --git a/lib/base_wizard.py b/lib/base_wizard.py index 441bc127..a2bba602 100644 --- a/lib/base_wizard.py +++ b/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) def restore_from_seed(self): - if self.wallet_type == 'standard': - self.opt_bip39 = True - test = bitcoin.is_seed - else: - self.opt_bip39 = False - test = bitcoin.is_new_seed + self.opt_bip39 = True + test = bitcoin.is_seed self.restore_seed_dialog(run_next=self.on_restore_seed, test=test) def on_restore_seed(self, seed, is_bip39):