AaronFiore/electrum
1
0
Fork 0
Code Activity

fix multisig update_password

Browse Source
This commit is contained in:
ThomasV
2017-03-04 10:30:05 +01:00
parent 98353c286a
commit 9cb576a88c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/storage.py
View File

@@ -84,7 +84,7 @@ class WalletStorage(PrintError):
def set_password(self, pw, encrypt):
"""Set self.pubkey"""
self.put('use_encryption', (pw is not None))
self.put('use_encryption', bool(pw))
self.decrypt(None, pw if encrypt else None)
def is_encrypted(self):

4
lib/wallet.py
View File

@@ -1682,12 +1682,12 @@ class Multisig_Wallet(Deterministic_Wallet, P2SH):
def get_keystores(self):
return [self.keystores[i] for i in sorted(self.keystores.keys())]
def update_password(self, old_pw, new_pw):
def update_password(self, old_pw, new_pw, encrypt=False):
for name, keystore in self.keystores.items():
if keystore.can_change_password():
keystore.update_password(old_pw, new_pw)
self.storage.put(name, keystore.dump())
self.storage.set_password(new_pw)
self.storage.set_password(new_pw, encrypt)
def check_password(self, password):
self.keystore.check_password(password)