GlcoinCore/joinmarket
1
0
Fork 0
mirror of https://github.com/JoinMarket-Org/joinmarket-clientserver.git synced 2026-08-13 12:33:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Abort wallet generation if mnemonic extension choosen but not provided

Browse source
This commit is contained in:
Kristaps Kaupe 2019-11-06 22:08:49 +02:00
parent e730a67c47
commit e6c0575659
No known key found for this signature in database
GPG key ID: D47B1B4232B55437
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
jmclient/jmclient/wallet_utils.py
View file

@ -489,12 +489,16 @@ def cli_user_mnemonic_entry():
mnemonic_extension = None
return (mnemonic_phrase, mnemonic_extension)
def cli_get_mnemonic_extension():
def cli_do_use_mnemonic_extension():
uin = input("Would you like to use a two-factor mnemonic recovery "
"phrase? write 'n' if you don't know what this is (y/n): ")
if len(uin) == 0 or uin[0] != 'y':
jmprint("Not using mnemonic extension", "info")
return None #no mnemonic extension
return False #no mnemonic extension
else:
return True
def cli_get_mnemonic_extension():
jmprint("Note: This will be stored in a reversible way. Do not reuse!",
"info")
return input("Enter mnemonic extension: ")
@ -506,6 +510,7 @@ def wallet_generate_recover_bip39(method, walletspath, default_wallet_name,
cli_user_mnemonic_entry,
cli_get_wallet_passphrase_check,
cli_get_wallet_file_name,
cli_do_use_mnemonic_extension,
cli_get_mnemonic_extension)):
"""Optionally provide callbacks:
0 - display seed
@ -518,7 +523,10 @@ def wallet_generate_recover_bip39(method, walletspath, default_wallet_name,
entropy = None
mnemonic_extension = None
if method == "generate":
mnemonic_extension = callbacks[4]()
if callbacks[4]():
mnemonic_extension = callbacks[5]()
if not mnemonic_extension:
return False
elif method == 'recover':
words, mnemonic_extension = callbacks[1]()
mnemonic_extension = mnemonic_extension and mnemonic_extension.strip()

10
scripts/joinmarket-qt.py
View file

@ -1678,12 +1678,13 @@ class JMMainWindow(QMainWindow):
mb.setStandardButtons(QMessageBox.Ok)
ret = mb.exec_()
def promptMnemonicExtension(self):
def promptUseMnemonicExtension(self):
msg = "Would you like to use a two-factor mnemonic recovery phrase?\nIf you don\'t know what this is press No."
reply = QMessageBox.question(self, 'Use mnemonic extension?',
msg, QMessageBox.Yes, QMessageBox.No)
if reply == QMessageBox.No:
return None
return reply == QMessageBox.Yes
def promptInputMnemonicExtension(self):
mnemonic_extension, ok = QInputDialog.getText(self,
'Input Mnemonic Extension',
'Enter mnemonic Extension:',
@ -1705,7 +1706,8 @@ class JMMainWindow(QMainWindow):
None,
self.getPassword,
self.getWalletFileName,
self.promptMnemonicExtension))
self.promptUseMnemonicExtension,
self.promptInputMnemonicExtension))
if not success:
JMQtMessageBox(self, "Failed to create new wallet file.",
title="Error", mbtype="warn")