wallet: add password command

Also tweak wallet2 password code to verify password without
saying it's a new wallet, because it's assuming things.

3 files changed, 7 insertions, 6 deletions

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 4b5a36c83..727103fa8 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -380,9 +380,9 @@ bool simple_wallet::change_password(const std::vector<std::string> &args)
     return false;
   }
 
-  // prompts for a new password, this is not a new wallet so pass in false.
-  const auto pwd_container = tools::wallet2::password_prompt(false);
-  
+  // prompts for a new password, pass true to verify the password
+  const auto pwd_container = tools::wallet2::password_prompt(true);
+
   try
   {
     m_wallet->rewrite(m_wallet_file, pwd_container->password());
@@ -676,6 +676,7 @@ simple_wallet::simple_wallet()
   m_cmd_binder.set_handler("export_outputs", boost::bind(&simple_wallet::export_outputs, this, _1), tr("Export a set of outputs owned by this wallet"));
   m_cmd_binder.set_handler("import_outputs", boost::bind(&simple_wallet::import_outputs, this, _1), tr("Import set of outputs owned by this wallet"));
   m_cmd_binder.set_handler("show_transfer", boost::bind(&simple_wallet::show_transfer, this, _1), tr("Show information about a transfer to/from this address"));
+  m_cmd_binder.set_handler("password", boost::bind(&simple_wallet::change_password, this, _1), tr("Change wallet password"));
   m_cmd_binder.set_handler("help", boost::bind(&simple_wallet::help, this, _1), tr("Show this help"));
 }
 //----------------------------------------------------------------------------------------------------
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 888c158c5..523c07696 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -452,10 +452,10 @@ void wallet2::init_options(boost::program_options::options_description& desc_par
   command_line::add_arg(desc_params, opts.restricted);
 }
 
-boost::optional<password_container> wallet2::password_prompt(const bool is_new_wallet)
+boost::optional<password_container> wallet2::password_prompt(const bool new_password)
 {
   auto pwd_container = tools::password_container::prompt(
-    is_new_wallet, (is_new_wallet ? tr("Enter a password for your new wallet") : tr("Wallet password"))
+    new_password, (new_password ? tr("Enter new wallet password") : tr("Wallet password"))
   );
   if (!pwd_container)
   {
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 416b7ea69..982c19fe7 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -114,7 +114,7 @@ namespace tools
     static void init_options(boost::program_options::options_description& desc_params);
 
     //! \return Password retrieved from prompt. Logs error on failure.
-    static boost::optional<password_container> password_prompt(const bool is_new_wallet);
+    static boost::optional<password_container> password_prompt(const bool new_password);
 
     //! Uses stdin and stdout. Returns a wallet2 if no errors.
     static std::unique_ptr<wallet2> make_from_json(const boost::program_options::variables_map& vm, const std::string& json_file);