rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 07:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wallet: fix memory only wallets

Browse source 
at least when using restore_deterministic_wallet
This commit is contained in:
moneromooo-monero 2019-03-15 12:50:05 +00:00
parent ea07a9bc61
commit a8b98a0bd7
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
2 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/wallet/wallet2.cpp
View file

@ -3460,7 +3460,8 @@ void wallet2::change_password(const std::string &filename, const epee::wipeable_
decrypt_keys(original_password); decrypt_keys(original_password);
setup_keys(new_password); setup_keys(new_password);
rewrite(filename, new_password); rewrite(filename, new_password);
store(); if (!filename.empty())
store();
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
/*! /*!
@ -5142,7 +5143,8 @@ std::string wallet2::path() const
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
void wallet2::store() void wallet2::store()
{ {
store_to("", epee::wipeable_string()); if (!m_wallet_file.empty())
store_to("", epee::wipeable_string());
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
void wallet2::store_to(const std::string &path, const epee::wipeable_string &password) void wallet2::store_to(const std::string &path, const epee::wipeable_string &password)

21
src/wallet/wallet_rpc_server.cpp
View file

@ -2902,7 +2902,7 @@ namespace tools
er.message = "Invalid filename"; er.message = "Invalid filename";
return false; return false;
} }
std::string wallet_file = m_wallet_dir + "/" + req.filename; std::string wallet_file = req.filename.empty() ? "" : (m_wallet_dir + "/" + req.filename);
{ {
std::vector<std::string> languages; std::vector<std::string> languages;
crypto::ElectrumWords::get_language_list(languages); crypto::ElectrumWords::get_language_list(languages);
@ -3187,12 +3187,6 @@ namespace tools
} }
// early check for mandatory fields // early check for mandatory fields
if (req.filename.empty())
{
er.code = WALLET_RPC_ERROR_CODE_UNKNOWN_ERROR;
er.message = "field 'filename' is mandatory. Please provide a filename to save the restored wallet to.";
return false;
}
if (req.viewkey.empty()) if (req.viewkey.empty())
{ {
er.code = WALLET_RPC_ERROR_CODE_UNKNOWN_ERROR; er.code = WALLET_RPC_ERROR_CODE_UNKNOWN_ERROR;
@ -3221,7 +3215,7 @@ namespace tools
er.message = "Invalid filename"; er.message = "Invalid filename";
return false; return false;
} }
std::string wallet_file = m_wallet_dir + "/" + req.filename; std::string wallet_file = req.filename.empty() ? "" : (m_wallet_dir + "/" + req.filename);
// check if wallet file already exists // check if wallet file already exists
if (!wallet_file.empty()) if (!wallet_file.empty())
{ {
@ -3331,7 +3325,8 @@ namespace tools
{ {
try try
{ {
m_wallet->store(); if (!wallet_file.empty())
m_wallet->store();
} }
catch (const std::exception &e) catch (const std::exception &e)
{ {
@ -3355,12 +3350,6 @@ namespace tools
} }
// early check for mandatory fields // early check for mandatory fields
if (req.filename.empty())
{
er.code = WALLET_RPC_ERROR_CODE_UNKNOWN_ERROR;
er.message = "field 'filename' is mandatory. Please provide a filename to save the restored wallet to.";
return false;
}
if (req.seed.empty()) if (req.seed.empty())
{ {
er.code = WALLET_RPC_ERROR_CODE_UNKNOWN_ERROR; er.code = WALLET_RPC_ERROR_CODE_UNKNOWN_ERROR;
@ -3383,7 +3372,7 @@ namespace tools
er.message = "Invalid filename"; er.message = "Invalid filename";
return false; return false;
} }
std::string wallet_file = m_wallet_dir + "/" + req.filename; std::string wallet_file = req.filename.empty() ? "" : (m_wallet_dir + "/" + req.filename);
// check if wallet file already exists // check if wallet file already exists
if (!wallet_file.empty()) if (!wallet_file.empty())
{ {