mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 15:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix tracking of collected value across pathfinding iterations

Browse source 
If we end up "paying" for an `htlc_minimum_msat` with fees, we
increment `already_collected_value_msat` by more than the amount
of the path that we collected (who's `value_contribution_msat` is
higher than the total payment amount, despite having been reduced
down to the payment amount).

This throws off our total value collection target, though in the
coming commit(s) it would also throw off our path selection
calculations.
This commit is contained in:
Matt Corallo 2022-07-12 20:30:00 +00:00
parent f75b6cb9a8
commit 0c3a47c016
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lightning/src/routing/router.rs
View file

@ -1476,7 +1476,7 @@ where L::Target: Logger {
// Both these cases (and other cases except reaching recommended_value_msat) mean that // Both these cases (and other cases except reaching recommended_value_msat) mean that
// paths_collection will be stopped because found_new_path==false. // paths_collection will be stopped because found_new_path==false.
// This is not necessarily a routing failure. // This is not necessarily a routing failure.
'path_construction: while let Some(RouteGraphNode { node_id, lowest_fee_to_node, total_cltv_delta, value_contribution_msat, path_htlc_minimum_msat, path_penalty_msat, path_length_to_node, .. }) = targets.pop() { 'path_construction: while let Some(RouteGraphNode { node_id, lowest_fee_to_node, total_cltv_delta, mut value_contribution_msat, path_htlc_minimum_msat, path_penalty_msat, path_length_to_node, .. }) = targets.pop() {
// Since we're going payee-to-payer, hitting our node as a target means we should stop // Since we're going payee-to-payer, hitting our node as a target means we should stop
// traversing the graph and arrange the path out of what we found. // traversing the graph and arrange the path out of what we found.
@ -1542,7 +1542,9 @@ where L::Target: Logger {
// on some channels we already passed (assuming dest->source direction). Here, we // on some channels we already passed (assuming dest->source direction). Here, we
// recompute the fees again, so that if that's the case, we match the currently // recompute the fees again, so that if that's the case, we match the currently
// underpaid htlc_minimum_msat with fees. // underpaid htlc_minimum_msat with fees.
payment_path.update_value_and_recompute_fees(cmp::min(value_contribution_msat, final_value_msat)); debug_assert_eq!(payment_path.get_value_msat(), value_contribution_msat);
value_contribution_msat = cmp::min(value_contribution_msat, final_value_msat);
payment_path.update_value_and_recompute_fees(value_contribution_msat);
// Since a path allows to transfer as much value as // Since a path allows to transfer as much value as
// the smallest channel it has ("bottleneck"), we should recompute // the smallest channel it has ("bottleneck"), we should recompute