AaronFiore/electrum
1
0
Fork 0
Code Activity

wizard: add script and derivation to keystorewizard flow. fixes #10063

Browse Source
This commit is contained in:
Sander van Grieken
2025-08-12 12:02:30 +02:00
parent 48aa454786
commit 4eccfdaa99
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
electrum/gui/qt/wizard/wallet.py
View File

@@ -48,7 +48,6 @@ MSG_HW_STORAGE_ENCRYPTION = _("Set wallet file encryption.") + '\n'\
+ _("It also contains your master public key that allows watching your addresses.") + _("It also contains your master public key that allows watching your addresses.")
class QEKeystoreWizard(KeystoreWizard, QEAbstractWizard, MessageBoxMixin): class QEKeystoreWizard(KeystoreWizard, QEAbstractWizard, MessageBoxMixin):
_logger = get_logger(__name__) _logger = get_logger(__name__)

11
electrum/wizard.py
View File

@@ -210,11 +210,16 @@ class KeystoreWizard(AbstractWizard):
'next': self.on_keystore_type 'next': self.on_keystore_type
}, },
'enter_seed': { 'enter_seed': {
'next': 'enter_ext', 'next': lambda d: 'enter_ext' if self.wants_ext(d) else 'script_and_derivation',
'accept': lambda d: None if self.wants_ext(d) else self.update_keystore(d), 'accept': lambda d: None if (self.wants_ext(d) or self.needs_derivation_path(d)) else self.update_keystore(d),
'last': lambda d: not self.wants_ext(d), 'last': lambda d: not self.wants_ext(d) and not self.needs_derivation_path(d),
}, },
'enter_ext': { 'enter_ext': {
'next': 'script_and_derivation',
'accept': lambda d: None if self.needs_derivation_path(d) else self.update_keystore(d),
'last': lambda d: not self.needs_derivation_path(d)
},
'script_and_derivation': {
'accept': self.update_keystore, 'accept': self.update_keystore,
'last': True 'last': True
}, },