github-jwinterm/wownero
1
0
Fork 0
mirror of https://github.com/jwinterm/wownero.git synced 2026-11-15 09:13:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2633

Browse Source 
ad96c478 wallet-cli: added --generate-from-spend-key option (stoffu)
This commit is contained in:
Riccardo Spagni
2017-11-14 14:56:07 +02:00
parent 94b85b450b ad96c478b1
commit 395025bb23
3 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/wallet2.cpp
+11 -2
View File
@@ -305,9 +305,9 @@ std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file,
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, address, std::string, String, false, std::string());
// compatibility checks
if (!field_seed_found && !field_viewkey_found)
if (!field_seed_found && !field_viewkey_found && !field_spendkey_found)
{
tools::fail_msg_writer() << tools::wallet2::tr("At least one of Electrum-style word list and private view key must be specified");
tools::fail_msg_writer() << tools::wallet2::tr("At least one of Electrum-style word list and private view key and private spend key must be specified");
return false;
}
if (field_seed_found && (field_viewkey_found || field_spendkey_found))
@@ -368,6 +368,10 @@ std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file,
{
wallet->generate(field_filename, field_password, recovery_key, recover, false);
}
else if (field_viewkey.empty() && !field_spendkey.empty())
{
wallet->generate(field_filename, field_password, spendkey, recover, false);
}
else
{
cryptonote::account_public_address address;
@@ -390,6 +394,11 @@ std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file,
}
address.m_spend_public_key = info.address.m_spend_public_key;
}
else
{
tools::fail_msg_writer() << tools::wallet2::tr("Address must be specified in order to create watch-only wallet");
return false;
}
wallet->generate(field_filename, field_password, address, viewkey);
}
else