AaronFiore/electrum
1
0
Fork 0
Code Activity

wizard: make wizard.keystore_from_data more robust;

Browse Source 
- always store 'keystore_type' in cosigner data and use same types as main
- dont share 'hardware_device' in root of dict, but store for each cosigner
- properly return hardware keystore for hardware cosigners
This commit is contained in:
Sander van Grieken
2023-09-18 23:56:17 +02:00
parent 81089a1ef9
commit 2caa8f13cf
3 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electrum/wizard.py
View File

@@ -338,8 +338,8 @@ class NewWalletWizard(AbstractWizard):
def on_cosigner_keystore_type(self, wizard_data: dict) -> str:
t = wizard_data['cosigner_keystore_type']
return {
'key': 'multisig_cosigner_key',
'seed': 'multisig_cosigner_seed',
'masterkey': 'multisig_cosigner_key',
'haveseed': 'multisig_cosigner_seed',
'hardware': 'multisig_cosigner_hardware'
}.get(t)
@@ -396,7 +396,7 @@ class NewWalletWizard(AbstractWizard):
return False
def keystore_from_data(self, wallet_type: str, data: dict):
if 'seed' in data:
if data['keystore_type'] in ['createseed', 'haveseed'] and 'seed' in data:
if data['seed_variant'] == 'electrum':
return keystore.from_seed(data['seed'], data['seed_extra_words'], True)
elif data['seed_variant'] == 'bip39':
@@ -417,8 +417,10 @@ class NewWalletWizard(AbstractWizard):
return keystore.from_bip43_rootseed(root_seed, derivation, xtype=script)
else:
raise Exception('Unsupported seed variant %s' % data['seed_variant'])
elif 'master_key' in data:
elif data['keystore_type'] == 'masterkey' and 'master_key' in data:
return keystore.from_master_key(data['master_key'])
elif data['keystore_type'] == 'hardware':
return self.hw_keystore(data)
else:
raise Exception('no seed or master_key in data')