Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3829 

4764929 use deterministic viewkey if not supplied (cryptochangements34)
This commit is contained in:
luigi1111 2018-06-19 12:43:10 -05:00
parent 50bc95519e 4764929ecb
commit d841339b09
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/wallet/api/wallet.cpp
View File

@ -554,18 +554,26 @@ bool WalletImpl::recoverFromKeysWithPassword(const std::string &path,
}
// parse view secret key
bool has_viewkey = true;
crypto::secret_key viewkey;
if (viewkey_string.empty()) {
setStatusError(tr("No view key supplied, cancelled"));
if(has_spendkey) {
has_viewkey = false;
}
else {
setStatusError(tr("Neither view key nor spend key supplied, cancelled"));
return false;
}
}
if(has_viewkey) {
cryptonote::blobdata viewkey_data;
if(!epee::string_tools::parse_hexstr_to_binbuff(viewkey_string, viewkey_data) || viewkey_data.size() != sizeof(crypto::secret_key))
{
setStatusError(tr("failed to parse secret view key"));
return false;
}
crypto::secret_key viewkey = *reinterpret_cast<const crypto::secret_key*>(viewkey_data.data());
viewkey = *reinterpret_cast<const crypto::secret_key*>(viewkey_data.data());
}
// check the spend and view keys match the given address
crypto::public_key pkey;
if(has_spendkey) {
@ -578,6 +586,7 @@ bool WalletImpl::recoverFromKeysWithPassword(const std::string &path,
return false;
}
}
if(has_viewkey) {
if (!crypto::secret_key_to_public_key(viewkey, pkey)) {
setStatusError(tr("failed to verify secret view key"));
return false;
@ -586,18 +595,23 @@ bool WalletImpl::recoverFromKeysWithPassword(const std::string &path,
setStatusError(tr("view key does not match address"));
return false;
}
}
try
{
if (has_spendkey) {
if (has_spendkey && has_viewkey) {
m_wallet->generate(path, password, info.address, spendkey, viewkey);
setSeedLanguage(language);
LOG_PRINT_L1("Generated new wallet from keys with seed language: " + language);
LOG_PRINT_L1("Generated new wallet from spend key and view key");
}
else {
if(!has_spendkey && has_viewkey) {
m_wallet->generate(path, password, info.address, viewkey);
LOG_PRINT_L1("Generated new view only wallet from keys");
}
if(has_spendkey && !has_viewkey) {
m_wallet->generate(path, password, spendkey, true, false, false);
setSeedLanguage(language);
LOG_PRINT_L1("Generated deterministic wallet from spend key with seed language: " + language);
}
}
catch (const std::exception& e) {