@@ -1127,7 +1127,12 @@ static util::Result<CreatedTransactionResult> CreateTransactionInternal(
1127
1127
return util::Error{err.empty () ?_ (" Insufficient funds" ) : err};
1128
1128
}
1129
1129
const SelectionResult& result = *select_coins_res;
1130
- TRACE5 (coin_selection, selected_coins, wallet.GetName ().c_str (), GetAlgorithmName (result.GetAlgo ()).c_str (), result.GetTarget (), result.GetWaste (), result.GetSelectedValue ());
1130
+ TRACE5 (coin_selection, selected_coins,
1131
+ wallet.GetName ().c_str (),
1132
+ GetAlgorithmName (result.GetAlgo ()).c_str (),
1133
+ result.GetTarget (),
1134
+ result.GetWaste (),
1135
+ result.GetSelectedValue ());
1131
1136
1132
1137
const CAmount change_amount = result.GetChange (coin_selection_params.min_viable_change , coin_selection_params.m_change_fee );
1133
1138
if (change_amount > 0 ) {
@@ -1336,8 +1341,11 @@ util::Result<CreatedTransactionResult> CreateTransaction(
1336
1341
LOCK (wallet.cs_wallet );
1337
1342
1338
1343
auto res = CreateTransactionInternal (wallet, vecSend, change_pos, coin_control, sign);
1339
- TRACE4 (coin_selection, normal_create_tx_internal, wallet.GetName ().c_str (), bool (res),
1340
- res ? res->fee : 0 , res && res->change_pos .has_value () ? int32_t (*res->change_pos ) : -1 );
1344
+ TRACE4 (coin_selection, normal_create_tx_internal,
1345
+ wallet.GetName ().c_str (),
1346
+ bool (res),
1347
+ res ? res->fee : 0 ,
1348
+ res && res->change_pos .has_value () ? int32_t (*res->change_pos ) : -1 );
1341
1349
if (!res) return res;
1342
1350
const auto & txr_ungrouped = *res;
1343
1351
// try with avoidpartialspends unless it's enabled already
@@ -1354,8 +1362,12 @@ util::Result<CreatedTransactionResult> CreateTransaction(
1354
1362
auto txr_grouped = CreateTransactionInternal (wallet, vecSend, change_pos, tmp_cc, sign);
1355
1363
// if fee of this alternative one is within the range of the max fee, we use this one
1356
1364
const bool use_aps{txr_grouped.has_value () ? (txr_grouped->fee <= txr_ungrouped.fee + wallet.m_max_aps_fee ) : false };
1357
- TRACE5 (coin_selection, aps_create_tx_internal, wallet.GetName ().c_str (), use_aps, txr_grouped.has_value (),
1358
- txr_grouped.has_value () ? txr_grouped->fee : 0 , txr_grouped.has_value () && txr_grouped->change_pos .has_value () ? int32_t (*txr_grouped->change_pos ) : -1 );
1365
+ TRACE5 (coin_selection, aps_create_tx_internal,
1366
+ wallet.GetName ().c_str (),
1367
+ use_aps,
1368
+ txr_grouped.has_value (),
1369
+ txr_grouped.has_value () ? txr_grouped->fee : 0 ,
1370
+ txr_grouped.has_value () && txr_grouped->change_pos .has_value () ? int32_t (*txr_grouped->change_pos ) : -1 );
1359
1371
if (txr_grouped) {
1360
1372
wallet.WalletLogPrintf (" Fee non-grouped = %lld, grouped = %lld, using %s\n " ,
1361
1373
txr_ungrouped.fee , txr_grouped->fee , use_aps ? " grouped" : " non-grouped" );
0 commit comments