From d2ec59ca208737ebcb50d7820d5f4df619a52ef9 Mon Sep 17 00:00:00 2001 From: fuwa Date: Fri, 1 Feb 2019 09:29:54 +0800 Subject: [PATCH] simplewallet: suppress warning when sweep_all to the primary address of the owner This fixes an edge case of the churn command, when confirm-missing-payment-id is 1. --- src/simplewallet/simplewallet.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index d65d555d3..ae43f08bd 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -5971,8 +5971,10 @@ bool simple_wallet::sweep_main(uint64_t below, bool locked, const std::vectorget_address() == info.address; + // prompt is there is no payment id and confirmation is required - if (!payment_id_seen && m_wallet->confirm_missing_payment_id() && !info.is_subaddress) + if (!payment_id_seen && m_wallet->confirm_missing_payment_id() && !info.is_subaddress && !is_wallet_address) { std::string accepted = input_line(tr("There is no easy way for exchanges and large merchants to identify that this transaction came from you. Request a subaddress in these cases. Continue anyway?"), true); if (std::cin.eof())