routing: don't set custom amount if manager isn't handling #9502

guggero · 2025-02-11T15:30:03Z

Avoids overwriting the HTLC amount if the aux bandwidth manager isn't handling the channel.

coderabbitai · 2025-02-11T15:30:16Z

Important

Review skipped

Auto reviews are limited to specific labels.

🏷️ Labels to auto review (1)

llm-review

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

ziggie1984 · 2025-02-11T15:33:46Z

routing/bandwidth.go

+			// traffic shaper is not handling the channel. In that
+			// case, we'll just return the original bandwidth and
+			// no custom amount.
+			if auxBandwidth.IsNone() {


I suggest removing the HTLC amount from the bandwidthResult, because if its not a custom payment we just check for the amount which was passed in I think that's what the channel needs to route at a bare minimum anyways, and if its a normal payment we use the real HTLC amount nevertheless.

No, unfortunately we can't do that. If we're trying to pay an invoice over let's say 500k sats, then that amount is passed in as amount. In a channel that only has the capacity of 100k sats, we clearly can't send 500k. And with an asset channel, we're not going to, as we're going to convert to assets and will only really send 354 sats. That's why the bandwidth result overwrites the htlcAmount with 0 (which just means "the minimum amount possible") in case of an asset channel.

What we need to fix here is the behavior for non-asset channels, which is what this commit/PR does.

ahh gottya, so when sending a custom payment the HTLC amount here is not already adjusted for, ok understand.

Correct. This is a first stage to find out what channel(s) are even eligible for carrying the payment. That initial selection, just based on available bandwidth/balance is then used to narrow down the search during the actual pathfinding (no use selecting paths through channels where we know we don't have the required balance).

So the actual conversion of the HTLC into an asset HTLC happens in a next step, after a route has been chosen.
The actual amount that goes on chain is determined here:

lnd/routing/payment_lifecycle.go

Line 773 in 4eea207

result, err := fn.MapOptionZ(

If there are no firstHopCustomRecords, then the initial rt.TotalAmount is returned from the traffic shaper.

GeorgeTsagk

LGTM

should test this against LitD

routing/bandwidth.go

ziggie1984

LGTM

yyforyongyu · 2025-02-11T19:23:07Z

htlcswitch/interfaces.go

+type OptionalBandwidth struct {
+	// IsHandled is true if the external traffic shaper handles the channel.
+	// If this is false, then the bandwidth value is not applicable.
+	IsHandled bool


when does this set to true?

Argh, good catch. Copy/paste mistake. Fixed!
We'll validate all of this with an integration test in litd. Unfortunately we aren't really set up to test these things properly in unit or integration tests with in lnd (but probably worth the investment very soon).

ziggie1984 · 2025-02-12T08:46:59Z

htlcswitch/link.go

-	auxBandwidth.WhenSome(func(bandwidth lnwire.MilliSatoshi) {
-		availableBandwidth = bandwidth
-	})
+	if auxBandwidth.IsHandled && auxBandwidth.Bandwidth.IsSome() {


Do we really need this second arg (auxBandwidth.Bandwidth.IsSome()), if the some is not set we just pass the check below ?

Yeah, this is super-defensive I guess. More for the reader of the code than the compiler. But can remove if you feel it has the opposite effect, reducing clarity.

ahh ok yeah let's keep it then.

lightninglabs-deploy · 2025-02-26T13:56:55Z

@guggero, remember to re-request review from reviewers when ready

guggero · 2025-02-26T14:03:50Z

!lightninglabs-deploy mute

To make it more clear whether the external traffic shaper is handling a channel or not, we return an explicit boolean.

guggero · 2025-03-13T19:42:45Z

Got a successful run of the litd itests with this commit on top of lightninglabs/lightning-terminal#998, so going to merge.

ziggie1984 self-requested a review February 11, 2025 15:30

ziggie1984 reviewed Feb 11, 2025

View reviewed changes

GeorgeTsagk approved these changes Feb 11, 2025

View reviewed changes

routing/bandwidth.go Outdated Show resolved Hide resolved

guggero force-pushed the bandwidth-manager-fix branch from bdb21bc to 78c8dae Compare February 11, 2025 16:39

ziggie1984 approved these changes Feb 11, 2025

View reviewed changes

yyforyongyu reviewed Feb 11, 2025

View reviewed changes

guggero force-pushed the bandwidth-manager-fix branch from 78c8dae to e490347 Compare February 11, 2025 19:31

ziggie1984 reviewed Feb 12, 2025

View reviewed changes

guggero added 2 commits March 13, 2025 12:26

htlcswitch+routing: return IsHandled from AuxBandwidth

dac5de5

To make it more clear whether the external traffic shaper is handling a channel or not, we return an explicit boolean.

docs: add release notes

0044975

guggero force-pushed the bandwidth-manager-fix branch from e490347 to 0044975 Compare March 13, 2025 17:27

guggero merged commit c4a77d1 into lightningnetwork:master Mar 13, 2025
33 of 36 checks passed

guggero deleted the bandwidth-manager-fix branch March 13, 2025 19:42

routing: don't set custom amount if manager isn't handling #9502

routing: don't set custom amount if manager isn't handling #9502

Uh oh!

Conversation

guggero commented Feb 11, 2025

Uh oh!

coderabbitai bot commented Feb 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

ziggie1984 Feb 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

guggero Feb 11, 2025

Choose a reason for hiding this comment

Uh oh!

ziggie1984 Feb 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

guggero Feb 11, 2025

Choose a reason for hiding this comment

Uh oh!

GeorgeTsagk left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ziggie1984 left a comment

Choose a reason for hiding this comment

Uh oh!

yyforyongyu Feb 11, 2025

Choose a reason for hiding this comment

Uh oh!

guggero Feb 11, 2025

Choose a reason for hiding this comment

Uh oh!

ziggie1984 Feb 12, 2025

Choose a reason for hiding this comment

Uh oh!

guggero Feb 12, 2025

Choose a reason for hiding this comment

Uh oh!

ziggie1984 Feb 12, 2025

Choose a reason for hiding this comment

Uh oh!

lightninglabs-deploy commented Feb 26, 2025

Uh oh!

guggero commented Feb 26, 2025

Uh oh!

guggero commented Mar 13, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

coderabbitai bot commented Feb 11, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)

ziggie1984 Feb 11, 2025 •

edited

Loading

ziggie1984 Feb 11, 2025 •

edited

Loading