|
|
|
@ -3118,17 +3118,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;
|
|
|
|
@ -3546,6 +3536,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
|
|
|
|
|
{
|
|
|
|
@ -3689,12 +3690,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.";
|
|
|
|
|