@ -1967,7 +1967,7 @@ void wallet2::commit_tx(pending_tx& ptx)
it - > m_spent = true ;
LOG_PRINT_L0 ( " Transaction successfully sent. < " < < txid < < " > " < < ENDL
< < " Commission: " < < print_money ( ptx . fee + ptx . dust ) < < " (dust : " < < print_money ( ptx . dust ) < < " ) " < < 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
< < " Balance: " < < print_money ( balance ( ) ) < < ENDL
< < " Unlocked: " < < print_money ( unlocked_balance ( ) ) < < ENDL
< < " Please, wait for confirmation for your balance to be unlocked. " ) ;
@ -2225,10 +2225,17 @@ void wallet2::transfer_selected(const std::vector<cryptonote::tx_destination_ent
return true ;
} ) ;
THROW_WALLET_EXCEPTION_IF ( ! all_are_txin_to_key , error : : unexpected_txin_type , tx ) ;
bool dust_sent_elsewhere = ( dust_policy . addr_for_dust . m_view_public_key ! = change_dts . addr . m_view_public_key
| | dust_policy . addr_for_dust . m_spend_public_key ! = change_dts . addr . m_spend_public_key ) ;
if ( dust_policy . add_to_fee | | dust_sent_elsewhere ) change_dts . amount - = dust ; //AC
ptx . key_images = key_images ;
ptx . fee = fee ;
ptx . dust = dust ;
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 ;
ptx . tx = tx ;
ptx . change_dts = change_dts ;
ptx . selected_transfers = selected_transfers ;
@ -2393,7 +2400,7 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
detail : : digit_split_strategy , tx_dust_policy ( : : config : : DEFAULT_DUST_THRESHOLD ) , test_tx , test_ptx ) ;
auto txBlob = t_serializable_object_to_blob ( test_ptx . tx ) ;
needed_fee = calculate_fee ( txBlob ) ;
available_for_fee = test_ptx . fee + test_ptx . change_dts . amount ;
available_for_fee = test_ptx . fee + test_ptx . change_dts . amount + ( ! test_ptx . dust_added_to_fee ? test_ptx . dust : 0 ) ; //AC
LOG_PRINT_L2 ( " Made a " < < txBlob . size ( ) < < " kB tx, with " < < print_money ( available_for_fee ) < < " available for fee ( " < <
print_money ( needed_fee ) < < " needed) " ) ;