mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-15 12:51:00 +02:00
Merge 701b0cf2f3 into merged_master (Bitcoin PR bitcoin/bitcoin#28366)
This commit is contained in:
commit
bb3cf8515d
6 changed files with 93 additions and 125 deletions
|
|
@ -72,9 +72,9 @@ static void CoinSelection(benchmark::Bench& bench)
|
|||
/*change_output_size=*/ 34,
|
||||
/*change_spend_size=*/ 148,
|
||||
/*min_change_target=*/ CHANGE_LOWER,
|
||||
/*effective_feerate=*/ CFeeRate(0),
|
||||
/*long_term_feerate=*/ CFeeRate(0),
|
||||
/*discard_feerate=*/ CFeeRate(0),
|
||||
/*effective_feerate=*/ CFeeRate(20'000),
|
||||
/*long_term_feerate=*/ CFeeRate(10'000),
|
||||
/*discard_feerate=*/ CFeeRate(3000),
|
||||
/*tx_noinputs_size=*/ 0,
|
||||
/*avoid_partial=*/ false,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -301,7 +301,7 @@ util::Result<SelectionResult> SelectCoinsBnB(std::vector<OutputGroup>& utxo_pool
|
|||
for (const size_t& i : best_selection) {
|
||||
result.AddInput(utxo_pool.at(i));
|
||||
}
|
||||
result.ComputeAndSetWaste(cost_of_change, cost_of_change, CAmount{0});
|
||||
result.RecalculateWaste(cost_of_change, cost_of_change, CAmount{0});
|
||||
assert(best_waste == result.GetWaste());
|
||||
|
||||
return result;
|
||||
|
|
@ -1020,60 +1020,6 @@ void OutputGroupTypeMap::Push(const OutputGroup& group, OutputType type, bool in
|
|||
}
|
||||
}
|
||||
|
||||
CAmount SelectionResult::GetSelectionWaste(CAmount change_cost, CAmountMap target_map, bool use_effective_value)
|
||||
{
|
||||
// This function should not be called with empty inputs as that would mean the selection failed
|
||||
assert(!m_selected_inputs.empty());
|
||||
|
||||
// create a map of asset -> coins from the inputs set
|
||||
std::map<CAsset, std::set<COutput>> coinset_map;
|
||||
for(const auto& coin_ptr : m_selected_inputs) {
|
||||
auto asset = coin_ptr->asset;
|
||||
auto search = coinset_map.find(asset);
|
||||
if (search != coinset_map.end()) {
|
||||
search->second.insert(*coin_ptr);
|
||||
} else {
|
||||
std::set<COutput> coinset;
|
||||
coinset.insert(*coin_ptr);
|
||||
coinset_map.insert({asset, coinset});
|
||||
}
|
||||
}
|
||||
|
||||
// Calculate and sum the waste for each asset in the map
|
||||
|
||||
// Always consider the cost of spending an input now vs in the future.
|
||||
CAmount waste = 0;
|
||||
|
||||
for (auto it = coinset_map.begin(); it != coinset_map.end(); ++it) {
|
||||
CAmount selected_effective_value = 0;
|
||||
auto asset = it->first;
|
||||
auto coinset = it->second;
|
||||
auto target = target_map.at(asset);
|
||||
|
||||
for (const COutput& coin : coinset) {
|
||||
waste += coin.GetFee() - coin.long_term_fee;
|
||||
selected_effective_value += use_effective_value ? coin.GetEffectiveValue() : coin.value;
|
||||
}
|
||||
|
||||
if (change_cost) {
|
||||
// Consider the cost of making change and spending it in the future
|
||||
// If we aren't making change, the caller should've set change_cost to 0
|
||||
assert(change_cost > 0);
|
||||
waste += change_cost;
|
||||
} else {
|
||||
// When we are not making change (change_cost == 0), consider the excess we are throwing away to fees
|
||||
// ELEMENTS: changed from assert, the selected effective value may not have reached the target yet
|
||||
// since inputs in coinset may not be policy asset (they have 0 effective value)
|
||||
if (selected_effective_value >= target) {
|
||||
waste += selected_effective_value - target;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
waste -= bump_fee_group_discount;
|
||||
|
||||
return waste;
|
||||
}
|
||||
|
||||
CAmount GenerateChangeTarget(const CAmount payment_value, const CAmount change_fee, FastRandomContext& rng)
|
||||
{
|
||||
|
|
@ -1093,16 +1039,37 @@ void SelectionResult::SetBumpFeeDiscount(const CAmount discount)
|
|||
bump_fee_group_discount = discount;
|
||||
}
|
||||
|
||||
|
||||
void SelectionResult::ComputeAndSetWaste(const CAmount min_viable_change, const CAmount change_cost, const CAmount change_fee)
|
||||
void SelectionResult::RecalculateWaste(const CAmount min_viable_change, const CAmount change_cost, const CAmount change_fee)
|
||||
{
|
||||
const CAmountMap change = GetChange(min_viable_change, change_fee);
|
||||
// This function should not be called with empty inputs as that would mean the selection failed
|
||||
assert(!m_selected_inputs.empty());
|
||||
|
||||
if (change > CAmountMap{}) {
|
||||
m_waste = GetSelectionWaste(change_cost, m_target, m_use_effective);
|
||||
} else {
|
||||
m_waste = GetSelectionWaste(0, m_target, m_use_effective);
|
||||
// Always consider the cost of spending an input now vs in the future.
|
||||
CAmount waste = 0;
|
||||
for (const auto& coin_ptr : m_selected_inputs) {
|
||||
const COutput& coin = *coin_ptr;
|
||||
waste += coin.GetFee() - coin.long_term_fee;
|
||||
}
|
||||
// Bump fee of whole selection may diverge from sum of individual bump fees
|
||||
waste -= bump_fee_group_discount;
|
||||
|
||||
if (GetChange(min_viable_change, change_fee) > CAmountMap{}) {
|
||||
// if we have a minimum viable amount after deducting fees, account for
|
||||
// cost of creating and spending change
|
||||
waste += change_cost;
|
||||
} else {
|
||||
// When we are not making change (GetChange(…) == 0), consider the excess we are throwing away to fees
|
||||
CAmountMap selected_effective_value = m_use_effective ? GetSelectedEffectiveValue() : GetSelectedValue();
|
||||
// ELEMENTS
|
||||
if (selected_effective_value >= m_target) {
|
||||
CAmountMap excess = selected_effective_value - m_target;
|
||||
for (const auto& [asset, amount] : excess) {
|
||||
waste += amount;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
m_waste = waste;
|
||||
}
|
||||
|
||||
void SelectionResult::SetAlgoCompleted(bool algo_completed)
|
||||
|
|
|
|||
|
|
@ -347,21 +347,6 @@ private:
|
|||
}
|
||||
}
|
||||
|
||||
/** Compute the waste for this result given the cost of change
|
||||
* and the opportunity cost of spending these inputs now vs in the future.
|
||||
* If change exists, waste = change_cost + inputs * (effective_feerate - long_term_feerate)
|
||||
* If no change, waste = excess + inputs * (effective_feerate - long_term_feerate)
|
||||
* where excess = selected_effective_value - target
|
||||
* change_cost = effective_feerate * change_output_size + long_term_feerate * change_spend_size
|
||||
*
|
||||
* @param[in] change_cost The cost of creating change and spending it in the future.
|
||||
* Only used if there is change, in which case it must be positive.
|
||||
* Must be 0 if there is no change.
|
||||
* @param[in] target The amount targeted by the coin selection algorithm.
|
||||
* @param[in] use_effective_value Whether to use the input's effective value (when true) or the real value (when false).
|
||||
* @return The waste
|
||||
*/
|
||||
[[nodiscard]] CAmount GetSelectionWaste(CAmount change_cost, CAmountMap target, bool use_effective_value = true);
|
||||
|
||||
public:
|
||||
explicit SelectionResult(const CAmountMap target, SelectionAlgorithm algo)
|
||||
|
|
@ -386,8 +371,19 @@ public:
|
|||
/** How much individual inputs overestimated the bump fees for shared ancestries */
|
||||
void SetBumpFeeDiscount(const CAmount discount);
|
||||
|
||||
/** Calculates and stores the waste for this selection via GetSelectionWaste */
|
||||
void ComputeAndSetWaste(const CAmount min_viable_change, const CAmount change_cost, const CAmount change_fee);
|
||||
/** Calculates and stores the waste for this result given the cost of change
|
||||
* and the opportunity cost of spending these inputs now vs in the future.
|
||||
* If change exists, waste = change_cost + inputs * (effective_feerate - long_term_feerate) - bump_fee_group_discount
|
||||
* If no change, waste = excess + inputs * (effective_feerate - long_term_feerate) - bump_fee_group_discount
|
||||
* where excess = selected_effective_value - target
|
||||
* change_cost = effective_feerate * change_output_size + long_term_feerate * change_spend_size
|
||||
*
|
||||
* @param[in] min_viable_change The minimum amount necessary to make a change output economic
|
||||
* @param[in] change_cost The cost of creating a change output and spending it in the future. Only
|
||||
* used if there is change, in which case it must be non-negative.
|
||||
* @param[in] change_fee The fee for creating a change output
|
||||
*/
|
||||
void RecalculateWaste(const CAmount min_viable_change, const CAmount change_cost, const CAmount change_fee);
|
||||
[[nodiscard]] CAmount GetWaste() const;
|
||||
|
||||
/** Tracks that algorithm was able to exhaustively search the entire combination space before hitting limit of tries */
|
||||
|
|
|
|||
|
|
@ -796,7 +796,7 @@ util::Result<SelectionResult> ChooseSelectionResult(interfaces::Chain& chain, co
|
|||
|
||||
if (coin_selection_params.m_effective_feerate > CFeeRate{3 * coin_selection_params.m_long_term_feerate}) { // Minimize input set for feerates of at least 3×LTFRE (default: 30 ṩ/vB+)
|
||||
if (auto cg_result{CoinGrinder(asset_groups, mapTargetValue, coin_selection_params.m_min_change_target, max_inputs_weight)}) {
|
||||
cg_result->ComputeAndSetWaste(coin_selection_params.min_viable_change, coin_selection_params.m_cost_of_change, coin_selection_params.m_change_fee);
|
||||
cg_result->RecalculateWaste(coin_selection_params.min_viable_change, coin_selection_params.m_cost_of_change, coin_selection_params.m_change_fee);
|
||||
results.push_back(*cg_result);
|
||||
} else {
|
||||
append_error(std::move(cg_result));
|
||||
|
|
@ -850,7 +850,7 @@ util::Result<SelectionResult> ChooseSelectionResult(interfaces::Chain& chain, co
|
|||
if (bump_fee_overestimate) {
|
||||
result.SetBumpFeeDiscount(bump_fee_overestimate);
|
||||
}
|
||||
result.ComputeAndSetWaste(coin_selection_params.min_viable_change, coin_selection_params.m_cost_of_change, coin_selection_params.m_change_fee);
|
||||
result.RecalculateWaste(coin_selection_params.min_viable_change, coin_selection_params.m_cost_of_change, coin_selection_params.m_change_fee);
|
||||
}
|
||||
|
||||
// Choose the result with the least waste
|
||||
|
|
@ -876,7 +876,7 @@ util::Result<SelectionResult> SelectCoins(const CWallet& wallet, CoinsResult& av
|
|||
if (selection_target <= CAmountMap{}) {
|
||||
SelectionResult result(mapTargetValue, SelectionAlgorithm::MANUAL);
|
||||
result.AddInputs(pre_set_inputs.coins, coin_selection_params.m_subtract_fee_outputs);
|
||||
result.ComputeAndSetWaste(coin_selection_params.min_viable_change, coin_selection_params.m_cost_of_change, coin_selection_params.m_change_fee);
|
||||
result.RecalculateWaste(coin_selection_params.min_viable_change, coin_selection_params.m_cost_of_change, coin_selection_params.m_change_fee);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -894,7 +894,7 @@ util::Result<SelectionResult> SelectCoins(const CWallet& wallet, CoinsResult& av
|
|||
SelectionResult preselected(pre_set_inputs.total_amount, SelectionAlgorithm::MANUAL);
|
||||
preselected.AddInputs(pre_set_inputs.coins, coin_selection_params.m_subtract_fee_outputs);
|
||||
op_selection_result->Merge(preselected);
|
||||
op_selection_result->ComputeAndSetWaste(coin_selection_params.min_viable_change,
|
||||
op_selection_result->RecalculateWaste(coin_selection_params.min_viable_change,
|
||||
coin_selection_params.m_cost_of_change,
|
||||
coin_selection_params.m_change_fee);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -885,29 +885,32 @@ BOOST_AUTO_TEST_CASE(SelectCoins_test)
|
|||
BOOST_AUTO_TEST_CASE(waste_test)
|
||||
{
|
||||
const CAmount fee{100};
|
||||
const CAmount min_viable_change{300};
|
||||
const CAmount change_cost{125};
|
||||
const CAmount change_fee{30};
|
||||
const CAmount fee_diff{40};
|
||||
const CAmount in_amt{3 * COIN};
|
||||
const CAmountMap target{{CAsset(), 2 * COIN}};
|
||||
const CAmount excess{in_amt - fee * 2 - target.at(CAsset())};
|
||||
const CAmount excess{80};
|
||||
const CAmountMap exact_target{{CAsset(), in_amt - fee * 2}}; // Maximum spendable amount after fees: no change, no excess
|
||||
|
||||
// The following tests that the waste is calculated correctly in various scenarios.
|
||||
// ComputeAndSetWaste will first determine the size of the change output. We don't really
|
||||
// care about the change and just want to use the variant that always includes the change_cost,
|
||||
// so min_viable_change and change_fee are set to 0 to ensure that.
|
||||
// In the following, we test that the waste is calculated correctly in various scenarios.
|
||||
// Usually, RecalculateWaste would compute change_fee and change_cost on basis of the
|
||||
// change output type, current feerate, and discard_feerate, but we use fixed values
|
||||
// across this test to make the test easier to understand.
|
||||
{
|
||||
// Waste with change is the change cost and difference between fee and long term fee
|
||||
SelectionResult selection1{target, SelectionAlgorithm::MANUAL};
|
||||
add_coin(1 * COIN, 1, selection1, fee, fee - fee_diff);
|
||||
add_coin(1 * COIN, 1, selection1, /*fee=*/fee, /*long_term_fee=*/fee - fee_diff);
|
||||
add_coin(2 * COIN, 2, selection1, fee, fee - fee_diff);
|
||||
selection1.ComputeAndSetWaste(/*min_viable_change=*/0, change_cost, /*change_fee=*/0);
|
||||
selection1.RecalculateWaste(min_viable_change, change_cost, change_fee);
|
||||
BOOST_CHECK_EQUAL(fee_diff * 2 + change_cost, selection1.GetWaste());
|
||||
|
||||
// Waste will be greater when fee is greater, but long term fee is the same
|
||||
SelectionResult selection2{target, SelectionAlgorithm::MANUAL};
|
||||
add_coin(1 * COIN, 1, selection2, fee * 2, fee - fee_diff);
|
||||
add_coin(2 * COIN, 2, selection2, fee * 2, fee - fee_diff);
|
||||
selection2.ComputeAndSetWaste(/*min_viable_change=*/0, change_cost, /*change_fee=*/0);
|
||||
selection2.RecalculateWaste(min_viable_change, change_cost, change_fee);
|
||||
BOOST_CHECK_GT(selection2.GetWaste(), selection1.GetWaste());
|
||||
|
||||
// Waste with change is the change cost and difference between fee and long term fee
|
||||
|
|
@ -915,25 +918,25 @@ BOOST_AUTO_TEST_CASE(waste_test)
|
|||
SelectionResult selection3{target, SelectionAlgorithm::MANUAL};
|
||||
add_coin(1 * COIN, 1, selection3, fee, fee + fee_diff);
|
||||
add_coin(2 * COIN, 2, selection3, fee, fee + fee_diff);
|
||||
selection3.ComputeAndSetWaste(/*min_viable_change=*/0, change_cost, /*change_fee=*/0);
|
||||
selection3.RecalculateWaste(min_viable_change, change_cost, change_fee);
|
||||
BOOST_CHECK_EQUAL(fee_diff * -2 + change_cost, selection3.GetWaste());
|
||||
BOOST_CHECK_LT(selection3.GetWaste(), selection1.GetWaste());
|
||||
}
|
||||
|
||||
{
|
||||
// Waste without change is the excess and difference between fee and long term fee
|
||||
SelectionResult selection_nochange1{target, SelectionAlgorithm::MANUAL};
|
||||
SelectionResult selection_nochange1{exact_target - CAmountMap{{CAsset(), excess}}, SelectionAlgorithm::MANUAL};
|
||||
add_coin(1 * COIN, 1, selection_nochange1, fee, fee - fee_diff);
|
||||
add_coin(2 * COIN, 2, selection_nochange1, fee, fee - fee_diff);
|
||||
selection_nochange1.ComputeAndSetWaste(/*min_viable_change=*/0, /*change_cost=*/0, /*change_fee=*/0);
|
||||
selection_nochange1.RecalculateWaste(min_viable_change, change_cost, change_fee);
|
||||
BOOST_CHECK_EQUAL(fee_diff * 2 + excess, selection_nochange1.GetWaste());
|
||||
|
||||
// Waste without change is the excess and difference between fee and long term fee
|
||||
// With long term fee greater than fee, waste should be less than when long term fee is less than fee
|
||||
SelectionResult selection_nochange2{target, SelectionAlgorithm::MANUAL};
|
||||
SelectionResult selection_nochange2{exact_target - CAmountMap{{CAsset(), excess}}, SelectionAlgorithm::MANUAL};
|
||||
add_coin(1 * COIN, 1, selection_nochange2, fee, fee + fee_diff);
|
||||
add_coin(2 * COIN, 2, selection_nochange2, fee, fee + fee_diff);
|
||||
selection_nochange2.ComputeAndSetWaste(/*min_viable_change=*/0, /*change_cost=*/0, /*change_fee=*/0);
|
||||
selection_nochange2.RecalculateWaste(min_viable_change, change_cost, change_fee);
|
||||
BOOST_CHECK_EQUAL(fee_diff * -2 + excess, selection_nochange2.GetWaste());
|
||||
BOOST_CHECK_LT(selection_nochange2.GetWaste(), selection_nochange1.GetWaste());
|
||||
}
|
||||
|
|
@ -943,57 +946,54 @@ BOOST_AUTO_TEST_CASE(waste_test)
|
|||
SelectionResult selection{target, SelectionAlgorithm::MANUAL};
|
||||
add_coin(1 * COIN, 1, selection, fee, fee);
|
||||
add_coin(2 * COIN, 2, selection, fee, fee);
|
||||
selection.ComputeAndSetWaste(/*min_viable_change=*/0, change_cost, /*change_fee=*/0);
|
||||
selection.RecalculateWaste(min_viable_change, change_cost, change_fee);
|
||||
BOOST_CHECK_EQUAL(change_cost, selection.GetWaste());
|
||||
}
|
||||
|
||||
{
|
||||
// Waste without change and fee == long term fee is just the excess
|
||||
SelectionResult selection{target, SelectionAlgorithm::MANUAL};
|
||||
SelectionResult selection{exact_target - CAmountMap{{CAsset(), excess}}, SelectionAlgorithm::MANUAL};
|
||||
add_coin(1 * COIN, 1, selection, fee, fee);
|
||||
add_coin(2 * COIN, 2, selection, fee, fee);
|
||||
selection.ComputeAndSetWaste(/*min_viable_change=*/0, /*change_cost=*/0, /*change_fee=*/0);
|
||||
selection.RecalculateWaste(min_viable_change, change_cost, change_fee);
|
||||
BOOST_CHECK_EQUAL(excess, selection.GetWaste());
|
||||
}
|
||||
|
||||
{
|
||||
// No Waste when fee == long_term_fee, no change, and no excess
|
||||
const CAmountMap exact_target{{CAsset(), in_amt - fee * 2}};
|
||||
// Waste is 0 when fee == long_term_fee, no change, and no excess
|
||||
SelectionResult selection{exact_target, SelectionAlgorithm::MANUAL};
|
||||
add_coin(1 * COIN, 1, selection, fee, fee);
|
||||
add_coin(2 * COIN, 2, selection, fee, fee);
|
||||
selection.ComputeAndSetWaste(/*min_viable_change=*/0, /*change_cost=*/0, /*change_fee=*/0);
|
||||
selection.RecalculateWaste(min_viable_change, change_cost , change_fee);
|
||||
BOOST_CHECK_EQUAL(0, selection.GetWaste());
|
||||
}
|
||||
|
||||
{
|
||||
// No Waste when (fee - long_term_fee) == (-cost_of_change), and no excess
|
||||
// Waste is 0 when (fee - long_term_fee) == (-cost_of_change), and no excess
|
||||
SelectionResult selection{target, SelectionAlgorithm::MANUAL};
|
||||
const CAmount new_change_cost{fee_diff * 2};
|
||||
add_coin(1 * COIN, 1, selection, fee, fee + fee_diff);
|
||||
add_coin(2 * COIN, 2, selection, fee, fee + fee_diff);
|
||||
selection.ComputeAndSetWaste(/*min_viable_change=*/0, new_change_cost, /*change_fee=*/0);
|
||||
selection.RecalculateWaste(min_viable_change, /*change_cost=*/fee_diff * 2, change_fee);
|
||||
BOOST_CHECK_EQUAL(0, selection.GetWaste());
|
||||
}
|
||||
|
||||
{
|
||||
// No Waste when (fee - long_term_fee) == (-excess), no change cost
|
||||
const CAmountMap new_target{{CAsset(), in_amt - fee * 2 - fee_diff * 2}};
|
||||
// Waste is 0 when (fee - long_term_fee) == (-excess), no change cost
|
||||
const CAmountMap new_target{{CAsset(), exact_target.at(CAsset()) - /*excess=*/fee_diff * 2}};
|
||||
SelectionResult selection{new_target, SelectionAlgorithm::MANUAL};
|
||||
add_coin(1 * COIN, 1, selection, fee, fee + fee_diff);
|
||||
add_coin(2 * COIN, 2, selection, fee, fee + fee_diff);
|
||||
selection.ComputeAndSetWaste(/*min_viable_change=*/0, /*change_cost=*/0, /*change_fee=*/0);
|
||||
selection.RecalculateWaste(min_viable_change, change_cost, change_fee);
|
||||
BOOST_CHECK_EQUAL(0, selection.GetWaste());
|
||||
}
|
||||
|
||||
{
|
||||
// Negative waste when the long term fee is greater than the current fee and the selected value == target
|
||||
const CAmountMap exact_target{{CAsset(), 3 * COIN - 2 * fee}};
|
||||
SelectionResult selection{exact_target, SelectionAlgorithm::MANUAL};
|
||||
const CAmount target_waste1{-2 * fee_diff}; // = (2 * fee) - (2 * (fee + fee_diff))
|
||||
add_coin(1 * COIN, 1, selection, fee, fee + fee_diff);
|
||||
add_coin(2 * COIN, 2, selection, fee, fee + fee_diff);
|
||||
selection.ComputeAndSetWaste(/*min_viable_change=*/0, /*change_cost=*/0, /*change_fee=*/0);
|
||||
selection.RecalculateWaste(min_viable_change, change_cost, change_fee);
|
||||
BOOST_CHECK_EQUAL(target_waste1, selection.GetWaste());
|
||||
}
|
||||
|
||||
|
|
@ -1001,10 +1001,14 @@ BOOST_AUTO_TEST_CASE(waste_test)
|
|||
// Negative waste when the long term fee is greater than the current fee and change_cost < - (inputs * (fee - long_term_fee))
|
||||
SelectionResult selection{target, SelectionAlgorithm::MANUAL};
|
||||
const CAmount large_fee_diff{90};
|
||||
const CAmount target_waste2{-2 * large_fee_diff + change_cost}; // = (2 * fee) - (2 * (fee + large_fee_diff)) + change_cost
|
||||
const CAmount target_waste2{-2 * large_fee_diff + change_cost};
|
||||
// = (2 * fee) - (2 * (fee + large_fee_diff)) + change_cost
|
||||
// = (2 * 100) - (2 * (100 + 90)) + 125
|
||||
// = 200 - 380 + 125 = -55
|
||||
assert(target_waste2 == -55);
|
||||
add_coin(1 * COIN, 1, selection, fee, fee + large_fee_diff);
|
||||
add_coin(2 * COIN, 2, selection, fee, fee + large_fee_diff);
|
||||
selection.ComputeAndSetWaste(/*min_viable_change=*/0, change_cost, /*change_fee=*/0);
|
||||
selection.RecalculateWaste(min_viable_change, change_cost, change_fee);
|
||||
BOOST_CHECK_EQUAL(target_waste2, selection.GetWaste());
|
||||
}
|
||||
}
|
||||
|
|
@ -1029,12 +1033,12 @@ BOOST_AUTO_TEST_CASE(bump_fee_test)
|
|||
inputs[i]->ApplyBumpFee(20*(i+1));
|
||||
}
|
||||
|
||||
selection.ComputeAndSetWaste(min_viable_change, change_cost, change_fee);
|
||||
selection.RecalculateWaste(min_viable_change, change_cost, change_fee);
|
||||
CAmount expected_waste = fee_diff * -2 + change_cost + /*bump_fees=*/60;
|
||||
BOOST_CHECK_EQUAL(expected_waste, selection.GetWaste());
|
||||
|
||||
selection.SetBumpFeeDiscount(30);
|
||||
selection.ComputeAndSetWaste(min_viable_change, change_cost, change_fee);
|
||||
selection.RecalculateWaste(min_viable_change, change_cost, change_fee);
|
||||
expected_waste = fee_diff * -2 + change_cost + /*bump_fees=*/60 - /*group_discount=*/30;
|
||||
BOOST_CHECK_EQUAL(expected_waste, selection.GetWaste());
|
||||
}
|
||||
|
|
@ -1055,12 +1059,12 @@ BOOST_AUTO_TEST_CASE(bump_fee_test)
|
|||
inputs[i]->ApplyBumpFee(20*(i+1));
|
||||
}
|
||||
|
||||
selection.ComputeAndSetWaste(min_viable_change, change_cost, change_fee);
|
||||
selection.RecalculateWaste(min_viable_change, change_cost, change_fee);
|
||||
CAmount expected_waste = fee_diff * -2 + /*bump_fees=*/60 + /*excess = 100 - bump_fees*/40;
|
||||
BOOST_CHECK_EQUAL(expected_waste, selection.GetWaste());
|
||||
|
||||
selection.SetBumpFeeDiscount(30);
|
||||
selection.ComputeAndSetWaste(min_viable_change, change_cost, change_fee);
|
||||
selection.RecalculateWaste(min_viable_change, change_cost, change_fee);
|
||||
expected_waste = fee_diff * -2 + /*bump_fees=*/60 - /*group_discount=*/30 + /*excess = 100 - bump_fees + group_discount*/70;
|
||||
// BOOST_CHECK_EQUAL(expected_waste, selection.GetWaste()); // ELEMENTS FIXME
|
||||
}
|
||||
|
|
@ -1441,6 +1445,7 @@ BOOST_AUTO_TEST_CASE(check_max_weight)
|
|||
/*avoid_partial=*/false,
|
||||
};
|
||||
|
||||
int max_weight = MAX_STANDARD_TX_WEIGHT - WITNESS_SCALE_FACTOR * (cs_params.tx_noinputs_size + cs_params.change_output_size);
|
||||
{
|
||||
// Scenario 1:
|
||||
// The actor starts with 1x 50.0 BTC and 1515x 0.033 BTC (~100.0 BTC total) unspent outputs
|
||||
|
|
@ -1462,10 +1467,9 @@ BOOST_AUTO_TEST_CASE(check_max_weight)
|
|||
m_node);
|
||||
|
||||
BOOST_CHECK(result);
|
||||
// Verify that only the 50 BTC UTXO was selected
|
||||
const auto& selection_res = result->GetInputSet();
|
||||
BOOST_CHECK(selection_res.size() == 1);
|
||||
BOOST_CHECK((*selection_res.begin())->GetEffectiveValue() == 50 * COIN);
|
||||
// Verify that the 50 BTC UTXO was selected, and result is below max_weight
|
||||
BOOST_CHECK(has_coin(result->GetInputSet(), CAmount(50 * COIN)));
|
||||
BOOST_CHECK_LE(result->GetWeight(), max_weight);
|
||||
}
|
||||
|
||||
{
|
||||
|
|
@ -1491,6 +1495,7 @@ BOOST_AUTO_TEST_CASE(check_max_weight)
|
|||
|
||||
BOOST_CHECK(has_coin(result->GetInputSet(), CAmount(0.0625 * COIN)));
|
||||
BOOST_CHECK(has_coin(result->GetInputSet(), CAmount(0.025 * COIN)));
|
||||
BOOST_CHECK_LE(result->GetWeight(), max_weight);
|
||||
}
|
||||
|
||||
{
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@ FUZZ_TARGET(coinselection)
|
|||
CAmountMap map_target{{CAsset(), target}};
|
||||
assert(result_srd->GetSelectedValue() >= map_target);
|
||||
assert(result_srd->GetChange(CHANGE_LOWER, coin_params.m_change_fee) > CAmountMap{}); // Demonstrate that SRD creates change of at least CHANGE_LOWER
|
||||
result_srd->ComputeAndSetWaste(coin_params.min_viable_change, coin_params.m_cost_of_change, coin_params.m_change_fee);
|
||||
result_srd->RecalculateWaste(coin_params.min_viable_change, coin_params.m_cost_of_change, coin_params.m_change_fee);
|
||||
(void)result_srd->GetShuffledInputVector();
|
||||
(void)result_srd->GetInputSet();
|
||||
}
|
||||
|
|
@ -283,7 +283,7 @@ FUZZ_TARGET(coinselection)
|
|||
if (result_knapsack) {
|
||||
CAmountMap map_target{{CAsset(), target}};
|
||||
assert(result_knapsack->GetSelectedValue() >= map_target);
|
||||
result_knapsack->ComputeAndSetWaste(coin_params.min_viable_change, coin_params.m_cost_of_change, coin_params.m_change_fee);
|
||||
result_knapsack->RecalculateWaste(coin_params.min_viable_change, coin_params.m_cost_of_change, coin_params.m_change_fee);
|
||||
(void)result_knapsack->GetShuffledInputVector();
|
||||
(void)result_knapsack->GetInputSet();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue