RanchiMall/flo-electrum
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: check_password for imported wallets

Browse Source
This commit is contained in:
ThomasV 2015-01-23 00:18:58 +01:00
parent 84fc4574d6
commit 576954555c
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
electrum
View File

@ -349,23 +349,19 @@ if __name__ == '__main__':
# commands needing password # commands needing password
if cmd.requires_password: if cmd.requires_password:
if wallet.seed == '': if wallet.use_encryption:
seed = ''
password = None
elif wallet.use_encryption:
password = prompt_password('Password:', False) password = prompt_password('Password:', False)
if not password: if not password:
print_msg("Error: Password required") print_msg("Error: Password required")
sys.exit(1) sys.exit(1)
# check password # check password
try: try:
seed = wallet.get_seed(password) seed = wallet.check_password(password)
except InvalidPassword: except InvalidPassword:
print_msg("Error: This password does not decode this wallet.") print_msg("Error: This password does not decode this wallet.")
sys.exit(1) sys.exit(1)
else: else:
password = None password = None
seed = wallet.get_seed(None)
else: else:
password = None password = None

2
gui/qt/main_window.py
View File

@ -2320,7 +2320,7 @@ class ElectrumWindow(QMainWindow):
return return
try: try:
mnemonic = self.wallet.get_mnemonic(password) self.wallet.check_password(password)
except Exception as e: except Exception as e:
QMessageBox.warning(self, _('Error'), str(e), _('OK')) QMessageBox.warning(self, _('Error'), str(e), _('OK'))
return return