AaronFiore/electrum
1
0
Fork 0
Code Activity

password unification: bugfix, now passes test cases

Browse Source 
fixes https://github.com/spesmilo/electrum/issues/8259

note that technically this is an API change for
- wallet.check_password
- wallet.update_password
- storage.check_password
This commit is contained in:
SomberNight
2023-03-20 20:00:28 +00:00
parent 11f06d860e
commit 9df5f55a1f
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum/daemon.py
View File

@@ -623,13 +623,18 @@ class Daemon(Logger):
if not wallet.storage.is_encrypted():
is_unified = False
try:
wallet.check_password(old_password)
try:
wallet.check_password(old_password)
old_password_real = old_password
except util.InvalidPassword:
wallet.check_password(None)
old_password_real = None
except Exception:
failed.append(path)
continue
if new_password:
self.logger.info(f'updating password for wallet: {path!r}')
wallet.update_password(old_password, new_password, encrypt_storage=True)
wallet.update_password(old_password_real, new_password, encrypt_storage=True)
can_be_unified = failed == []
is_unified = can_be_unified and is_unified
return can_be_unified, is_unified