From 68cbe1579ee16b578d0dcc76cd1ff539616e3709 Mon Sep 17 00:00:00 2001 From: awfulcrawler Date: Mon, 18 Apr 2016 20:20:31 +1200 Subject: [PATCH] modified: src/wallet/wallet2.cpp modified: src/wallet/wallet2.h Removed working comments --- src/wallet/wallet2.cpp | 7 ++++--- src/wallet/wallet2.h | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index dc7a093a..6d8b1d80 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -1966,8 +1966,9 @@ void wallet2::commit_tx(pending_tx& ptx) BOOST_FOREACH(transfer_container::iterator it, ptx.selected_transfers) it->m_spent = true; + //fee includes dust if dust policy specified it. LOG_PRINT_L0("Transaction successfully sent. <" << txid << ">" << ENDL - << "Commission: " << print_money(ptx.fee) << " (dust sent to dust addr: " << print_money((ptx.dust_added_to_fee ? 0 : ptx.dust)) << ")" << ENDL //AC: fee includes dust; dust lists dust sent elsewhere + << "Commission: " << print_money(ptx.fee) << " (dust sent to dust addr: " << print_money((ptx.dust_added_to_fee ? 0 : ptx.dust)) << ")" << ENDL << "Balance: " << print_money(balance()) << ENDL << "Unlocked: " << print_money(unlocked_balance()) << ENDL << "Please, wait for confirmation for your balance to be unlocked."); @@ -2230,7 +2231,7 @@ void wallet2::transfer_selected(const std::vector wallet2::create_transactions_2(std::vector selected_transfers; std::string key_images; @@ -721,7 +721,7 @@ namespace tools ptx.key_images = key_images; ptx.fee = (dust_policy.add_to_fee ? fee+dust : fee); ptx.dust = ((dust_policy.add_to_fee || dust_sent_elsewhere) ? dust : 0); - ptx.dust_added_to_fee = dust_policy.add_to_fee; //AC + ptx.dust_added_to_fee = dust_policy.add_to_fee; ptx.tx = tx; ptx.change_dts = change_dts; ptx.selected_transfers = selected_transfers;