Merge #601: New feature: change encryption passphrase

73a604f Add feature: change encryption passphrase, per #552 (jules23)

jmclient/jmclient/wallet.py

@@ -873,6 +873,9 @@ class BaseWallet(object):
         """
         raise NotImplementedError()
 
+    def change_wallet_passphrase(self, passphrase):
+        self._storage.change_password(passphrase)
+
     def yield_imported_paths(self, mixdepth):
         """
         Get an iterator for all imported keys in given mixdepth.

jmclient/jmclient/wallet_utils.py

@@ -36,6 +36,7 @@ def get_wallettool_parser():
         '(displayall) Shows ALL addresses and balances.\n'
         '(summary) Shows a summary of mixing depth balances.\n'
         '(generate) Generates a new wallet.\n'
+        '(changepass) Changes the encryption passphrase of the wallet.\n'
         '(history) Show all historical transaction details. Requires Bitcoin Core.'
         '(recover) Recovers a wallet from the 12 word recovery seed.\n'
         '(showutxos) Shows all utxos in the wallet.\n'
@@ -554,9 +555,10 @@ def wallet_display(wallet_service, showprivkey, displayall=False,
     else:
         return walletview
 
-def cli_get_wallet_passphrase_check():
-    password = get_password('Enter wallet file encryption passphrase: ')
-    password2 = get_password('Reenter wallet file encryption passphrase: ')
+def cli_get_wallet_passphrase_check(changing_passphrase=False):
+    new_string = "new " if changing_passphrase else ""
+    password = get_password("Enter " + new_string + "passphrase to encrypt wallet: ")
+    password2 = get_password("Reenter " + new_string + "passphrase to encrypt wallet: ")
     if password != password2:
         jmprint('ERROR. Passwords did not match', "error")
         return False
@@ -694,6 +696,13 @@ def wallet_generate_recover(method, walletspath,
     return True
 
 
+def wallet_change_passphrase(walletservice,
+                             enter_wallet_passphrase_callback=cli_get_wallet_passphrase_check):
+    passphrase = enter_wallet_passphrase_callback(changing_passphrase=True)
+    walletservice.change_wallet_passphrase(passphrase)
+    return True
+
+
 def dict_factory(cursor, row):
     d = {}
     for idx, col in enumerate(cursor.description):
@@ -1328,7 +1337,7 @@ def open_wallet(path, ask_for_password=True, password=None, read_only=False,
         while True:
             try:
                 # do not try empty password, assume unencrypted on empty password
-                pwd = get_password("Enter wallet decryption passphrase: ") or None
+                pwd = get_password("Enter passphrase to decrypt wallet: ") or None
                 storage = Storage(path, password=pwd, read_only=read_only)
             except StoragePasswordError:
                 jmprint("Wrong password, try again.", "warning")
@@ -1379,9 +1388,11 @@ def wallet_tool_main(wallet_root_path):
     wallet_root_path = os.path.join(jm_single().datadir, wallet_root_path)
     noseed_methods = ['generate', 'recover', 'createwatchonly']
     methods = ['display', 'displayall', 'summary', 'showseed', 'importprivkey',
-               'history', 'showutxos', 'freeze', 'gettimelockaddress', 'addtxoutproof']
+               'history', 'showutxos', 'freeze', 'gettimelockaddress',
+               'addtxoutproof', 'changepass']
     methods.extend(noseed_methods)
-    noscan_methods = ['showseed', 'importprivkey', 'dumpprivkey', 'signmessage']
+    noscan_methods = ['showseed', 'importprivkey', 'dumpprivkey', 'signmessage',
+                      'changepass']
     readonly_methods = ['display', 'displayall', 'summary', 'showseed',
                         'history', 'showutxos', 'dumpprivkey', 'signmessage',
                         'gettimelockaddress']
@@ -1449,6 +1460,9 @@ def wallet_tool_main(wallet_root_path):
         retval = wallet_generate_recover("recover", wallet_root_path,
                                          mixdepth=options.mixdepth)
         return "Recovered wallet OK" if retval else "Failed"
+    elif method == "changepass":
+        retval = wallet_change_passphrase(wallet_service)
+        return "Changed encryption passphrase OK" if retval else "Failed"
     elif method == "showutxos":
         return wallet_showutxos(wallet_service, options.showprivkey)
     elif method == "showseed":