Supports wallet restoration

This commit is contained in:
Oran Juice 2014-09-26 23:34:35 +05:30
parent a1ac92e185
commit 3c0e87e1b6
No known key found for this signature in database
GPG key ID: 71C5AF46CCB28124
2 changed files with 46 additions and 20 deletions

View file

@ -54,13 +54,15 @@ namespace
const std::string LANGUAGES_DIRECTORY = "languages"; const std::string LANGUAGES_DIRECTORY = "languages";
const std::string OLD_WORD_FILE = "old-word-list"; const std::string OLD_WORD_FILE = "old-word-list";
bool is_first_use() bool is_uninitialized()
{ {
return num_words == 0 ? true : false; return num_words == 0 ? true : false;
} }
void create_data_structures(const std::string &word_file) void create_data_structures(const std::string &word_file)
{ {
words_array.clear();
words_map.clear();
std::ifstream input_stream; std::ifstream input_stream;
input_stream.open(word_file.c_str(), std::ifstream::in); input_stream.open(word_file.c_str(), std::ifstream::in);
@ -76,6 +78,18 @@ namespace
} }
input_stream.close(); input_stream.close();
} }
bool word_list_file_match(const std::vector<std::string> &wlist)
{
for (std::vector<std::string>::const_iterator it = wlist.begin(); it != wlist.end(); it++)
{
if (words_map.count(*it) == 0)
{
return false;
}
}
return true;
}
} }
namespace crypto namespace crypto
@ -93,6 +107,11 @@ namespace crypto
{ {
create_data_structures(WORD_LISTS_DIRECTORY + '/' + LANGUAGES_DIRECTORY + '/' + language); create_data_structures(WORD_LISTS_DIRECTORY + '/' + LANGUAGES_DIRECTORY + '/' + language);
} }
if (num_words == 0)
{
throw std::runtime_error(std::string("Word list file is corrupt: ") +
old_word_list ? OLD_WORD_FILE : (LANGUAGES_DIRECTORY + '/' + language));
}
} }
/* convert words to bytes, 3 words -> 4 bytes /* convert words to bytes, 3 words -> 4 bytes
@ -104,16 +123,29 @@ namespace crypto
*/ */
bool words_to_bytes(const std::string& words, crypto::secret_key& dst) bool words_to_bytes(const std::string& words, crypto::secret_key& dst)
{ {
if (is_first_use())
{
init("", true);
}
int n = num_words;
std::vector<std::string> wlist; std::vector<std::string> wlist;
boost::split(wlist, words, boost::is_any_of(" ")); boost::split(wlist, words, boost::is_any_of(" "));
std::vector<std::string> languages;
std::vector<std::string>::iterator it;
get_language_list(languages);
for (it = languages.begin(); it != languages.end() &&
!word_list_file_match(wlist); it++)
{
init(*it);
}
if (it == languages.end())
{
init("", true);
if (!word_list_file_match(wlist))
{
return false;
}
}
int n = num_words;
// error on non-compliant word list // error on non-compliant word list
if (wlist.size() != 12 && wlist.size() != 24) return false; if (wlist.size() != 12 && wlist.size() != 24) return false;
@ -122,14 +154,6 @@ namespace crypto
uint32_t val; uint32_t val;
uint32_t w1, w2, w3; uint32_t w1, w2, w3;
// verify all three words exist in the word list
if (words_map.count(wlist[i*3]) == 0 ||
words_map.count(wlist[i*3 + 1]) == 0 ||
words_map.count(wlist[i*3 + 2]) == 0)
{
return false;
}
w1 = words_map.at(wlist[i*3]); w1 = words_map.at(wlist[i*3]);
w2 = words_map.at(wlist[i*3 + 1]); w2 = words_map.at(wlist[i*3 + 1]);
w3 = words_map.at(wlist[i*3 + 2]); w3 = words_map.at(wlist[i*3 + 2]);
@ -159,7 +183,7 @@ namespace crypto
*/ */
bool bytes_to_words(const crypto::secret_key& src, std::string& words) bool bytes_to_words(const crypto::secret_key& src, std::string& words)
{ {
if (is_first_use()) if (is_uninitialized())
{ {
init("", true); init("", true);
} }

View file

@ -489,11 +489,13 @@ bool simple_wallet::new_wallet(const string &wallet_file, const std::string& pas
// convert rng value to electrum-style word list // convert rng value to electrum-style word list
std::string electrum_words; std::string electrum_words;
std::string mnemonic_language = get_mnemonic_language();
std::cout << "(" << (mnemonic_language) << ")" << std::endl; if (m_restore_deterministic_wallet)
{
crypto::ElectrumWords::init(mnemonic_language); // Ask for language only if it not a wallet restore.
std::string mnemonic_language = get_mnemonic_language();
crypto::ElectrumWords::init(mnemonic_language);
}
crypto::ElectrumWords::bytes_to_words(recovery_val, electrum_words); crypto::ElectrumWords::bytes_to_words(recovery_val, electrum_words);
std::string print_electrum = ""; std::string print_electrum = "";