Mirrors
/
wownero
mirror of https://git.wownero.com/wownero/wownero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplewallet: don't confirm missing payment ID when sending to only subaddresses

This commit is contained in:
stoffu 2018-06-10 20:00:59 +09:00 committed by moneromooo-monero
parent 9c2f09df51
commit 04abe99f81
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
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

@ -4453,6 +4453,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;
@ -4464,6 +4465,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)
{ {
@ -4496,7 +4498,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())
@ -4949,7 +4951,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())
@ -5162,7 +5164,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())