AaronFiore/electrum
1
0
Fork 0
Code Activity

new wizard: set keystore password. fixes #9147

Browse Source
This commit is contained in:
ThomasV
2024-07-22 10:53:39 +02:00
committed by SomberNight
parent d20e01b604
commit f7d0ac27a6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/wizard.py
View File

@@ -597,16 +597,18 @@ class NewWalletWizard(AbstractWizard):
else: else:
raise Exception('unsupported/unknown keystore_type %s' % data['keystore_type']) raise Exception('unsupported/unknown keystore_type %s' % data['keystore_type'])
if data['encrypt']: if data['password']:
if k and k.may_have_password(): if k and k.may_have_password():
k.update_password(None, data['password']) k.update_password(None, data['password'])
if data['encrypt']:
enc_version = StorageEncryptionVersion.USER_PASSWORD enc_version = StorageEncryptionVersion.USER_PASSWORD
if data.get('keystore_type') == 'hardware' and data['wallet_type'] == 'standard': if data.get('keystore_type') == 'hardware' and data['wallet_type'] == 'standard':
enc_version = StorageEncryptionVersion.XPUB_PASSWORD enc_version = StorageEncryptionVersion.XPUB_PASSWORD
storage.set_password(data['password'], enc_version=enc_version) storage.set_password(data['password'], enc_version=enc_version)
db = WalletDB('', storage=storage, upgrade=True) db = WalletDB('', storage=storage, upgrade=True)
db.set_keystore_encryption(bool(data['password']) and data['encrypt']) db.set_keystore_encryption(bool(data['password']))
db.put('wallet_type', data['wallet_type']) db.put('wallet_type', data['wallet_type'])
@@ -645,7 +647,7 @@ class NewWalletWizard(AbstractWizard):
db.put('addresses', addresses) db.put('addresses', addresses)
if k and k.can_have_deterministic_lightning_xprv(): if k and k.can_have_deterministic_lightning_xprv():
db.put('lightning_xprv', k.get_lightning_xprv(data['password'] if data['encrypt'] else None)) db.put('lightning_xprv', k.get_lightning_xprv(data['password']))
db.load_plugins() db.load_plugins()
db.write() db.write()