Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-28 13:39:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7430

Browse Source 
064eeb2 wallet_rpc_server: set seed language in generate_from_keys (moneromooo-monero)
This commit is contained in:
luigi1111 2021-03-29 22:37:19 -04:00
commit e1d987aa66
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
4 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mnemonics/electrum-words.cpp
View File

@ -491,6 +491,14 @@ namespace crypto
return "<language not found>";
}
bool is_valid_language(const std::string &language)
{
const std::vector<const Language::Base*> language_instances = get_language_list();
for (std::vector<const Language::Base*>::const_iterator it = language_instances.begin(); it != language_instances.end(); it++)
if ((*it)->get_english_language_name() == language || (*it)->get_language_name() == language)
return true;
return false;
}
}
}

2
src/mnemonics/electrum-words.h
View File

@ -124,6 +124,8 @@ namespace crypto
* \return the name of the language in English
*/
std::string get_english_name_for(const std::string &name);
bool is_valid_language(const std::string &language);
}
}

30
src/wallet/wallet_rpc_server.cpp
View File

@ -3154,17 +3154,7 @@ namespace tools
}
std::string wallet_file = req.filename.empty() ? "" : (m_wallet_dir + "/" + req.filename);
{
std::vector<std::string> languages;
crypto::ElectrumWords::get_language_list(languages, false);
std::vector<std::string>::iterator it;
it = std::find(languages.begin(), languages.end(), req.language);
if (it == languages.end())
{
crypto::ElectrumWords::get_language_list(languages, true);
it = std::find(languages.begin(), languages.end(), req.language);
}
if (it == languages.end())
if (!crypto::ElectrumWords::is_valid_language(req.language))
{
er.code = WALLET_RPC_ERROR_CODE_UNKNOWN_ERROR;
er.message = "Unknown language: " + req.language;
@ -3582,6 +3572,17 @@ namespace tools
return false;
}
if (!req.language.empty())
{
if (!crypto::ElectrumWords::is_valid_language(req.language))
{
er.code = WALLET_RPC_ERROR_CODE_UNKNOWN_ERROR;
er.message = "The specified seed language is invalid.";
return false;
}
wal->set_seed_language(req.language);
}
// set blockheight if given
try
{
@ -3725,12 +3726,7 @@ namespace tools
er.message = "Wallet was using the old seed language. You need to specify a new seed language.";
return false;
}
std::vector<std::string> language_list;
std::vector<std::string> language_list_en;
crypto::ElectrumWords::get_language_list(language_list);
crypto::ElectrumWords::get_language_list(language_list_en, true);
if (std::find(language_list.begin(), language_list.end(), req.language) == language_list.end() &&
std::find(language_list_en.begin(), language_list_en.end(), req.language) == language_list_en.end())
if (!crypto::ElectrumWords::is_valid_language(req.language))
{
er.code = WALLET_RPC_ERROR_CODE_UNKNOWN_ERROR;
er.message = "Wallet was using the old seed language, and the specified new seed language is invalid.";

2
src/wallet/wallet_rpc_server_commands_defs.h
View File

@ -2214,6 +2214,7 @@ namespace wallet_rpc
std::string viewkey;
std::string password;
bool autosave_current;
std::string language;
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE_OPT(restore_height, (uint64_t)0)
@ -2223,6 +2224,7 @@ namespace wallet_rpc
KV_SERIALIZE(viewkey)
KV_SERIALIZE(password)
KV_SERIALIZE_OPT(autosave_current, true)
KV_SERIALIZE(language)
END_KV_SERIALIZE_MAP()
};