From: Jeffrey Czyz Date: Sun, 23 Jan 2022 23:25:38 +0000 (-0600) Subject: Distinguish maximum HTLC from effective capacity X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=201afa3a237177d44a2daf0bdadcf1b6cdaca29c;p=rust-lightning Distinguish maximum HTLC from effective capacity When determining a route, find_route used the smaller of a channel's maximum HTLC and capacity for capping how much could be sent through a channel across all paths. However, the maximum HTLC limit should be applied per path and be limited by the effective capacity across all paths. Define an AvailableLiquidity abstraction for handling this behavior correctly. Change EffectiveCapacity to prefer the channel's capacity over its maximum HTLC limit. For both cases, the previous behavior has not changed when the channel's capacity is unknown. --- diff --git a/lightning/src/routing/network_graph.rs b/lightning/src/routing/network_graph.rs index e3ce80138..2bfe5deb6 100644 --- a/lightning/src/routing/network_graph.rs +++ b/lightning/src/routing/network_graph.rs @@ -718,25 +718,28 @@ impl<'a: 'b, 'b> DirectedChannelInfo<'a, 'b> { /// Returns the node id for the target. pub fn target(&self) -> &'b NodeId { self.target } + /// Returns the maximum HTLC amount allowed over the channel in a specific direction. + pub fn htlc_maximum_msat(&self) -> u64 { + let htlc_maximum_msat = self.direction.and_then(|direction| direction.htlc_maximum_msat); + let capacity_msat = self.channel.capacity_sats.map(|capacity_sats| capacity_sats * 1000); + htlc_maximum_msat + .zip(capacity_msat) + .map(|(htlc_maximum_msat, capacity_msat)| cmp::min(htlc_maximum_msat, capacity_msat)) + .or_else(|| htlc_maximum_msat) + .or_else(|| capacity_msat) + .unwrap_or(EffectiveCapacity::Unknown.as_msat()) + } + /// Returns the [`EffectiveCapacity`] of the channel in a specific direction. /// /// This is either the total capacity from the funding transaction, if known, or the /// `htlc_maximum_msat` for the direction as advertised by the gossip network, if known, - /// whichever is smaller. + /// whichever is larger. pub fn effective_capacity(&self) -> EffectiveCapacity { - let capacity_msat = self.channel.capacity_sats.map(|capacity_sats| capacity_sats * 1000); - self.direction - .and_then(|direction| direction.htlc_maximum_msat) - .map(|max_htlc_msat| { - let capacity_msat = capacity_msat.unwrap_or(u64::max_value()); - if max_htlc_msat < capacity_msat { - EffectiveCapacity::MaximumHTLC { amount_msat: max_htlc_msat } - } else { - EffectiveCapacity::Total { capacity_msat } - } - }) - .or_else(|| capacity_msat.map(|capacity_msat| - EffectiveCapacity::Total { capacity_msat })) + self.channel.capacity_sats.map(|capacity_sats| capacity_sats * 1000) + .map(|capacity_msat| EffectiveCapacity::Total { capacity_msat }) + .or_else(|| self.direction.and_then(|direction| direction.htlc_maximum_msat) + .map(|amount_msat| EffectiveCapacity::MaximumHTLC { amount_msat })) .unwrap_or(EffectiveCapacity::Unknown) } } diff --git a/lightning/src/routing/router.rs b/lightning/src/routing/router.rs index 1b54e3a68..87071218d 100644 --- a/lightning/src/routing/router.rs +++ b/lightning/src/routing/router.rs @@ -402,6 +402,16 @@ impl<'a> CandidateRouteHop<'a> { } } + fn htlc_maximum_msat(&self) -> u64 { + match self { + CandidateRouteHop::FirstHop { details } => details.outbound_capacity_msat, + CandidateRouteHop::PublicHop { info, .. } => info.htlc_maximum_msat(), + CandidateRouteHop::PrivateHop { hint } => { + hint.htlc_maximum_msat.unwrap_or(u64::max_value()) + }, + } + } + fn fees(&self) -> RoutingFees { match self { CandidateRouteHop::FirstHop { .. } => RoutingFees { @@ -421,6 +431,42 @@ impl<'a> CandidateRouteHop<'a> { CandidateRouteHop::PrivateHop { .. } => EffectiveCapacity::Infinite, } } + + fn available_liquidity(&self) -> AvailableLiquidity { + AvailableLiquidity { + htlc_maximum_msat: self.htlc_maximum_msat(), + remaining_capacity_msat: self.effective_capacity().as_msat(), + } + } +} + +/// The liquidity available in a channel when making routing decisions for a payment. +/// +/// Used by `find_route` to determine if an HTLC can be routed through the channel. This is bounded +/// by the channel's `htlc_maximum_msat`, if known, or the channel's capacity, if known, whichever +/// is smaller. Use of the channel may reduce the available liquidity for subsequent MPP paths +/// within the same payment. +/// +/// This information is ephemeral in that it does not carry across calls to `find_route`. Rather it +/// is used simply to inform whether a channel can be used in multiple paths. +struct AvailableLiquidity { + htlc_maximum_msat: u64, + remaining_capacity_msat: u64, +} + +impl AvailableLiquidity { + fn as_msat(&self) -> u64 { + core::cmp::min(self.htlc_maximum_msat, self.remaining_capacity_msat) + } + + fn reduce_by(&mut self, amount_msat: u64) -> &mut Self { + self.remaining_capacity_msat -= amount_msat; + self + } + + fn exhaust(&mut self) { + self.remaining_capacity_msat = 0; + } } /// It's useful to keep track of the hops associated with the fees required to use them, @@ -772,11 +818,10 @@ where L::Target: Logger { let recommended_value_msat = final_value_msat * ROUTE_CAPACITY_PROVISION_FACTOR as u64; let mut path_value_msat = final_value_msat; - // We don't want multiple paths (as per MPP) share liquidity of the same channels. - // This map allows paths to be aware of the channel use by other paths in the same call. - // This would help to make a better path finding decisions and not "overbook" channels. - // It is unaware of the directions (except for `outbound_capacity_msat` in `first_hops`). - let mut bookkept_channels_liquidity_available_msat = HashMap::with_capacity(network_nodes.len()); + // Keep track of how much liquidity is still available in selected channels. Used to determine + // if the channel can be used by additional MPP paths or to inform path finding decisions. It is + // unaware of the direction. + let mut available_channel_liquidities = HashMap::with_capacity(network_nodes.len()); // Keeping track of how much value we already collected across other paths. Helps to decide: // - how much a new path should be transferring (upper bound); @@ -803,9 +848,10 @@ where L::Target: Logger { // - for first and last hops early in get_route if $src_node_id != $dest_node_id { let short_channel_id = $candidate.short_channel_id(); - let available_liquidity_msat = bookkept_channels_liquidity_available_msat + let available_liquidity_msat = available_channel_liquidities .entry(short_channel_id) - .or_insert_with(|| $candidate.effective_capacity().as_msat()); + .or_insert_with(|| $candidate.available_liquidity()) + .as_msat(); // It is tricky to substract $next_hops_fee_msat from available liquidity here. // It may be misleading because we might later choose to reduce the value transferred @@ -951,7 +997,7 @@ where L::Target: Logger { } let path_penalty_msat = $next_hops_path_penalty_msat.checked_add( - scorer.channel_penalty_msat(short_channel_id, amount_to_transfer_over_msat, *available_liquidity_msat, + scorer.channel_penalty_msat(short_channel_id, amount_to_transfer_over_msat, available_liquidity_msat, &$src_node_id, &$dest_node_id)).unwrap_or_else(|| u64::max_value()); let new_graph_node = RouteGraphNode { node_id: $src_node_id, @@ -1102,9 +1148,8 @@ where L::Target: Logger { // TODO: diversify by nodes (so that all paths aren't doomed if one node is offline). 'paths_collection: loop { - // For every new path, start from scratch, except - // bookkept_channels_liquidity_available_msat, which will improve - // the further iterations of path finding. Also don't erase first_hop_targets. + // For every new path, start from scratch, except for available_channel_liquidities, which + // will improve the further iterations of path finding, and first_hop_targets. targets.clear(); dist.clear(); hit_minimum_limit = false; @@ -1328,16 +1373,17 @@ where L::Target: Logger { // on the same liquidity in future paths. let mut prevented_redundant_path_selection = false; for (payment_hop, _) in payment_path.hops.iter() { - let channel_liquidity_available_msat = bookkept_channels_liquidity_available_msat.get_mut(&payment_hop.candidate.short_channel_id()).unwrap(); - let mut spent_on_hop_msat = value_contribution_msat; - let next_hops_fee_msat = payment_hop.next_hops_fee_msat; - spent_on_hop_msat += next_hops_fee_msat; - if spent_on_hop_msat == *channel_liquidity_available_msat { + let spent_on_hop_msat = value_contribution_msat + payment_hop.next_hops_fee_msat; + let available_liquidity_msat = available_channel_liquidities + .get_mut(&payment_hop.candidate.short_channel_id()) + .unwrap() + .reduce_by(spent_on_hop_msat) + .as_msat(); + if available_liquidity_msat == 0 { // If this path used all of this channel's available liquidity, we know // this path will not be selected again in the next loop iteration. prevented_redundant_path_selection = true; } - *channel_liquidity_available_msat -= spent_on_hop_msat; } if !prevented_redundant_path_selection { // If we weren't capped by hitting a liquidity limit on a channel in the path, @@ -1345,8 +1391,7 @@ where L::Target: Logger { // Decrease the available liquidity of a hop in the middle of the path. let victim_scid = payment_path.hops[(payment_path.hops.len() - 1) / 2].0.candidate.short_channel_id(); log_trace!(logger, "Disabling channel {} for future path building iterations to avoid duplicates.", victim_scid); - let victim_liquidity = bookkept_channels_liquidity_available_msat.get_mut(&victim_scid).unwrap(); - *victim_liquidity = 0; + available_channel_liquidities.get_mut(&victim_scid).unwrap().exhaust(); } // Track the total amount all our collected paths allow to send so that we: