AaronFiore/electrum
1
0
Fork 0
Code Activity

wizard: rename bip39_refine to script_and_derivation

Browse Source
This commit is contained in:
Sander van Grieken
2023-07-31 21:47:51 +02:00
parent 0222c93228
commit c485753ffd
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/gui/qml/qewizard.py
View File

@@ -58,13 +58,13 @@ class QENewWalletWizard(NewWalletWizard, QEAbstractWizard):
'create_seed': { 'gui': 'WCCreateSeed' }, 'create_seed': { 'gui': 'WCCreateSeed' },
'confirm_seed': { 'gui': 'WCConfirmSeed' }, 'confirm_seed': { 'gui': 'WCConfirmSeed' },
'have_seed': { 'gui': 'WCHaveSeed' }, 'have_seed': { 'gui': 'WCHaveSeed' },
'bip39_refine': { 'gui': 'WCBIP39Refine' }, 'script_and_derivation': { 'gui': 'WCBIP39Refine' },
'have_master_key': { 'gui': 'WCHaveMasterKey' }, 'have_master_key': { 'gui': 'WCHaveMasterKey' },
'multisig': { 'gui': 'WCMultisig' }, 'multisig': { 'gui': 'WCMultisig' },
'multisig_cosigner_keystore': { 'gui': 'WCCosignerKeystore' }, 'multisig_cosigner_keystore': { 'gui': 'WCCosignerKeystore' },
'multisig_cosigner_key': { 'gui': 'WCHaveMasterKey' }, 'multisig_cosigner_key': { 'gui': 'WCHaveMasterKey' },
'multisig_cosigner_seed': { 'gui': 'WCHaveSeed' }, 'multisig_cosigner_seed': { 'gui': 'WCHaveSeed' },
'multisig_cosigner_bip39_refine': { 'gui': 'WCBIP39Refine' }, 'multisig_cosigner_script_and_derivation': { 'gui': 'WCBIP39Refine' },
'imported': { 'gui': 'WCImport' }, 'imported': { 'gui': 'WCImport' },
'wallet_password': { 'gui': 'WCWalletPassword' } 'wallet_password': { 'gui': 'WCWalletPassword' }
}) })

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

@@ -48,13 +48,13 @@ class QENewWalletWizard(NewWalletWizard, QEAbstractWizard):
'confirm_ext': { 'gui': WCConfirmExt }, 'confirm_ext': { 'gui': WCConfirmExt },
'have_seed': { 'gui': WCHaveSeed }, 'have_seed': { 'gui': WCHaveSeed },
'have_ext': { 'gui': WCEnterExt }, 'have_ext': { 'gui': WCEnterExt },
'bip39_refine': { 'gui': WCBIP39Refine }, 'script_and_derivation': { 'gui': WCScriptAndDerivation},
'have_master_key': { 'gui': WCHaveMasterKey }, 'have_master_key': { 'gui': WCHaveMasterKey },
'multisig': { 'gui': WCMultisig }, 'multisig': { 'gui': WCMultisig },
'multisig_cosigner_keystore': { 'gui': WCCosignerKeystore }, 'multisig_cosigner_keystore': { 'gui': WCCosignerKeystore },
'multisig_cosigner_key': { 'gui': WCHaveMasterKey }, 'multisig_cosigner_key': { 'gui': WCHaveMasterKey },
'multisig_cosigner_seed': { 'gui': WCHaveSeed }, 'multisig_cosigner_seed': { 'gui': WCHaveSeed },
'multisig_cosigner_bip39_refine': { 'gui': WCBIP39Refine }, 'multisig_cosigner_script_and_derivation': { 'gui': WCScriptAndDerivation},
'imported': { 'gui': WCImport }, 'imported': { 'gui': WCImport },
'wallet_password': { 'gui': WCWalletPassword } 'wallet_password': { 'gui': WCWalletPassword }
}) })
@@ -461,7 +461,7 @@ class WCHaveSeed(WizardComponent):
wizard_data['seed_extra_words'] = '' # empty default wizard_data['seed_extra_words'] = '' # empty default
class WCBIP39Refine(WizardComponent): class WCScriptAndDerivation(WizardComponent):
_logger = get_logger(__name__) _logger = get_logger(__name__)
def __init__(self, parent, wizard): def __init__(self, parent, wizard):

10
electrum/wizard.py
View File

@@ -201,7 +201,7 @@ class NewWalletWizard(AbstractWizard):
'accept': self.maybe_master_pubkey, 'accept': self.maybe_master_pubkey,
'last': lambda d: self.is_single_password() and not self.is_bip39_seed(d) and not self.is_multisig(d) 'last': lambda d: self.is_single_password() and not self.is_bip39_seed(d) and not self.is_multisig(d)
}, },
'bip39_refine': { 'script_and_derivation': {
'next': lambda d: 'wallet_password' if not self.is_multisig(d) else 'multisig_cosigner_keystore', 'next': lambda d: 'wallet_password' if not self.is_multisig(d) else 'multisig_cosigner_keystore',
'accept': self.maybe_master_pubkey, 'accept': self.maybe_master_pubkey,
'last': lambda d: self.is_single_password() and not self.is_multisig(d) 'last': lambda d: self.is_single_password() and not self.is_multisig(d)
@@ -225,7 +225,7 @@ class NewWalletWizard(AbstractWizard):
'next': self.on_have_cosigner_seed, 'next': self.on_have_cosigner_seed,
'last': lambda d: self.is_single_password() and self.has_all_cosigner_data(d) 'last': lambda d: self.is_single_password() and self.has_all_cosigner_data(d)
}, },
'multisig_cosigner_bip39_refine': { 'multisig_cosigner_script_and_derivation': {
'next': lambda d: 'wallet_password' if self.has_all_cosigner_data(d) else 'multisig_cosigner_keystore', 'next': lambda d: 'wallet_password' if self.has_all_cosigner_data(d) else 'multisig_cosigner_keystore',
'last': lambda d: self.is_single_password() and self.has_all_cosigner_data(d) 'last': lambda d: self.is_single_password() and self.has_all_cosigner_data(d)
}, },
@@ -277,9 +277,9 @@ class NewWalletWizard(AbstractWizard):
def on_have_or_confirm_seed(self, wizard_data): def on_have_or_confirm_seed(self, wizard_data):
if self.is_bip39_seed(wizard_data): if self.is_bip39_seed(wizard_data):
return 'bip39_refine' return 'script_and_derivation'
elif self.is_slip39_seed(wizard_data): elif self.is_slip39_seed(wizard_data):
return 'bip39_refine' return 'script_and_derivation'
elif self.is_multisig(wizard_data): elif self.is_multisig(wizard_data):
return 'multisig_cosigner_keystore' return 'multisig_cosigner_keystore'
else: else:
@@ -305,7 +305,7 @@ class NewWalletWizard(AbstractWizard):
if self.has_all_cosigner_data(wizard_data): if self.has_all_cosigner_data(wizard_data):
return 'wallet_password' return 'wallet_password'
elif current_cosigner_data['seed_type'] == 'bip39' and 'derivation_path' not in current_cosigner_data: elif current_cosigner_data['seed_type'] == 'bip39' and 'derivation_path' not in current_cosigner_data:
return 'multisig_cosigner_bip39_refine' return 'multisig_cosigner_script_and_derivation'
else: else:
return 'multisig_cosigner_keystore' return 'multisig_cosigner_keystore'