Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-27 04:49:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1698

Browse Source 
9459f331 simplewallet: print error when address is wrong (kenshi84)
This commit is contained in:
Riccardo Spagni 2017-02-11 00:54:30 +02:00
commit cb54eeaa31
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/simplewallet/simplewallet.cpp
View File

@ -2175,7 +2175,10 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
bool has_payment_id; bool has_payment_id;
crypto::hash8 new_payment_id; crypto::hash8 new_payment_id;
if (!cryptonote::get_account_address_from_str_or_url(de.addr, has_payment_id, new_payment_id, m_wallet->testnet(), local_args[i])) if (!cryptonote::get_account_address_from_str_or_url(de.addr, has_payment_id, new_payment_id, m_wallet->testnet(), local_args[i]))
{
fail_msg_writer() << tr("failed to parse address");
return true; return true;
}
if (has_payment_id) if (has_payment_id)
{ {
@ -2670,7 +2673,10 @@ bool simple_wallet::sweep_all(const std::vector<std::string> &args_)
crypto::hash8 new_payment_id; crypto::hash8 new_payment_id;
cryptonote::account_public_address address; cryptonote::account_public_address address;
if (!cryptonote::get_account_address_from_str_or_url(address, has_payment_id, new_payment_id, m_wallet->testnet(), local_args[0])) if (!cryptonote::get_account_address_from_str_or_url(address, has_payment_id, new_payment_id, m_wallet->testnet(), local_args[0]))
{
fail_msg_writer() << tr("failed to parse address");
return true; return true;
}
if (has_payment_id) if (has_payment_id)
{ {