rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-29 10:43:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3979

Browse source 
362f5e6 simplewallet: don't confirm missing payment ID when sending to only subaddresses (stoffu)
This commit is contained in:
luigi1111 2018-06-27 15:36:54 -05:00
commit 2d92fa5d69
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/simplewallet/simplewallet.cpp
View file

@ -4575,6 +4575,7 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
} }
vector<cryptonote::tx_destination_entry> dsts; vector<cryptonote::tx_destination_entry> dsts;
size_t num_subaddresses = 0;
for (size_t i = 0; i < local_args.size(); i += 2) for (size_t i = 0; i < local_args.size(); i += 2)
{ {
cryptonote::address_parse_info info; cryptonote::address_parse_info info;
@ -4586,6 +4587,7 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
} }
de.addr = info.address; de.addr = info.address;
de.is_subaddress = info.is_subaddress; de.is_subaddress = info.is_subaddress;
num_subaddresses += info.is_subaddress;
if (info.has_payment_id) if (info.has_payment_id)
{ {
@ -4618,7 +4620,7 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
} }
// prompt is there is no payment id and confirmation is required // prompt is there is no payment id and confirmation is required
if (!payment_id_seen && m_wallet->confirm_missing_payment_id()) if (!payment_id_seen && m_wallet->confirm_missing_payment_id() && dsts.size() > num_subaddresses)
{ {
std::string accepted = input_line(tr("No payment id is included with this transaction. Is this okay? (Y/Yes/N/No): ")); std::string accepted = input_line(tr("No payment id is included with this transaction. Is this okay? (Y/Yes/N/No): "));
if (std::cin.eof()) if (std::cin.eof())
@ -5071,7 +5073,7 @@ bool simple_wallet::sweep_main(uint64_t below, const std::vector<std::string> &a
} }
// prompt is there is no payment id and confirmation is required // prompt is there is no payment id and confirmation is required
if (!payment_id_seen && m_wallet->confirm_missing_payment_id()) if (!payment_id_seen && m_wallet->confirm_missing_payment_id() && !info.is_subaddress)
{ {
std::string accepted = input_line(tr("No payment id is included with this transaction. Is this okay? (Y/Yes/N/No): ")); std::string accepted = input_line(tr("No payment id is included with this transaction. Is this okay? (Y/Yes/N/No): "));
if (std::cin.eof()) if (std::cin.eof())
@ -5284,7 +5286,7 @@ bool simple_wallet::sweep_single(const std::vector<std::string> &args_)
} }
// prompt if there is no payment id and confirmation is required // prompt if there is no payment id and confirmation is required
if (!payment_id_seen && m_wallet->confirm_missing_payment_id()) if (!payment_id_seen && m_wallet->confirm_missing_payment_id() && !info.is_subaddress)
{ {
std::string accepted = input_line(tr("No payment id is included with this transaction. Is this okay? (Y/Yes/N/No): ")); std::string accepted = input_line(tr("No payment id is included with this transaction. Is this okay? (Y/Yes/N/No): "));
if (std::cin.eof()) if (std::cin.eof())