-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use all valid routes during blinded path construction #9334
base: master
Are you sure you want to change the base?
Conversation
Important Review skippedAuto reviews are limited to specific labels. 🏷️ Labels to auto review (1)
Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
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)
Other keywords and placeholders
CodeRabbit Configuration File (
|
This seems like the simpler solution to implement. Since we’re already querying all routes in FindBlindedPaths, it makes sense to just return them. However, it might be worthwhile to introduce a hard constant cap during the pathfinding process to prevent the array size from growing exponentially. Currently, the algorithm explores all possible paths within the given constraints. Instead, we could stop after finding, say, 100 routes in total, and then apply filtering to select the MaxNumPaths in BuildBlindedPaymentPaths, as proposed in this PR. Probably the constraints of the Min/Max Hop number prevents these high numbers for routes but I think having a cap is kind of a sanity check. |
Before the proposed changes we are querying all routes, sorting the routes based on probability and them capping them based on |
I think we need to do way more when creating the path rather than creating the path and later checking the probability this does not seem efficient. I think we should build the path in the first place based on probability not just running a depth first search on all available paths. But I am not sure how difficult that might be because we went with the recusrive approach. |
I think we might compute the total probability and sort the path list during the creation of it (into |
yes let's keep it as is and focus only on the underlying issue. |
Hello @ziggie1984 gently reminder of review 😉 |
unit-test fail ! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking good I am missing 2 things here:
- Can you add some logging stats how many routes are find in total, then how many are filtered out because of the probability as for example debug information. I am very curious whether routes will fail often at the level where the final route and relay information is accumulated.
- I tend to introduce a max route variable for the blinded path finding in general, maybe a default of 50 routes, otherwise we look for everything which with a big number of blinded hops might be wasteful.
41573d0
to
c1251d7
Compare
Hello Ziggie, I had addressed your comments, thank you! Ready for your next review! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the PR. I looked through the changes and left some comments/questions.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you @Abdulkbk for your review!
@ziggie1984 and @Abdulkbk , it is ready for your review. 🤝 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking good, I want to get @ellemouton opinion on the recursive abort criteria in case we have a maximum number of paths.
Missing release notes for LND 20.
routing/router.go
Outdated
for _, route := range routes { | ||
if len(bestRoutes) >= int(restrictions.MaxNumPaths) { | ||
if len(allRoutes) >= maxRoutes { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that is not what I meant, my idea was to exit the recursion early when enough paths are found,
I was more thinking of restricting the recursion in processNodeForBlindedPath
but I would like to get @ellemouton opinion on this and also this can probably done in another PR.
Currently our DFS exhausts all Paths which exist in the graph, so I was thinking we could abort the DFS after we already have a hopSet
of let's say 100 ?
Imagine we have a minRouteLen of 2 and a maxRouteLen of 6, each node has more than 100 channels, when reaching the depth of 6, we could easily accumulate > 1000 routes which seems unreasonable.
But the above restrictions we do not need, because really makes not difference we already have all the paths in memory.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You right, thanks for the explanation.
The point is that, in the current implementation, we first retrieve all the routes and then sort them to prioritize those with the highest success probability.
Instead, we should modify the process to evaluate the probability of each route during the iteration, keeping only the best ones.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
seems like this is removed but not in this commit, can you make sure this is removed also in this commit
Yeah feel free to open a PR! |
please make sure the check commits passes, you can run this script locally as well:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's close let's bring it over the finish line 💪
@@ -100,6 +100,9 @@ type BuildBlindedPathCfg struct { | |||
// route. | |||
MinNumHops uint8 | |||
|
|||
// MaxNumPaths is the maximum number of blinded paths to select. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The MaxNumPath
can now be removed from BlindedPathRestrictions
we are not using it anymore there. Super confusing to have all this MaxPaths variables.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You right, thanks!
routing/router.go
Outdated
for _, route := range routes { | ||
if len(bestRoutes) >= int(restrictions.MaxNumPaths) { | ||
if len(allRoutes) >= maxRoutes { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
seems like this is removed but not in this commit, can you make sure this is removed also in this commit
routing/router.go
Outdated
@@ -640,6 +640,8 @@ func (r *ChannelRouter) FindBlindedPaths(destination route.Vertex, | |||
probability float64 | |||
} | |||
|
|||
totalRoutesFound := 0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't need this counters, we just get the information by comparing the different lengths of the arrays.
routes and paths
routing/router.go
Outdated
@@ -640,6 +640,8 @@ func (r *ChannelRouter) FindBlindedPaths(destination route.Vertex, | |||
probability float64 | |||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you be more verbose in the commit msg: Something like:
We now return all possible paths found by the pathfinder and only remove those which do have a low probability.
routing/router.go
Outdated
@@ -708,9 +708,6 @@ func (r *ChannelRouter) FindBlindedPaths(destination route.Vertex, | |||
// Return all routes, capped by the maxNumberOfRoutes. | |||
allRoutes := make([]*route.Route, 0, len(routes)) | |||
for _, route := range routes { | |||
if len(allRoutes) >= maxRoutes { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this change should be in the previous commit
@@ -3249,27 +3245,12 @@ func TestFindBlindedPathsWithMC(t *testing.T) { | |||
"alice,charlie,dave", | |||
}) | |||
|
|||
// Change the MaxNumPaths to 1 to assert that only the best route is |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in this file there is a typo: fluke => flake
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is not a typo ... "fluke" and "flake" have different meanings, though they sound similar. Fluke is a lucky or random event that happens by chance.
rpcserver.go
Outdated
@@ -6168,6 +6168,7 @@ func (r *rpcServer) AddInvoice(ctx context.Context, | |||
MaxHTLCMsat: 0, | |||
}, | |||
MinNumPathHops: blindingRestrictions.NumHops, | |||
MaxNumPaths: blindingRestrictions.MaxNumPaths, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Given my understanding we can use the config values here directly without adding a middle step assigning it to the restrictions struct.
@@ -547,35 +547,58 @@ func genBlindedRouteData(rand *rand.Rand) *record.BlindedRouteData { | |||
// an example mentioned in this spec document: | |||
// https://github.com/lightning/bolts/blob/master/proposals/route-blinding.md |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Try keeping the commit msg below 50 chars, so its not overflowing like you see here.
@@ -547,35 +547,58 @@ func genBlindedRouteData(rand *rand.Rand) *record.BlindedRouteData { | |||
// an example mentioned in this spec document: | |||
// https://github.com/lightning/bolts/blob/master/proposals/route-blinding.md | |||
// This example does not use any dummy hops. | |||
// Added Dave to test MaxNumPaths restriction. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we add a isolated test which does nothing more than testing the maxPaths. Now the test feels a bit confusing, we can just add a new test, make sure the paths are returned but not check all the values which we expect.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can make it clear with better comments.
* [Fixed a bug](https://github.com/lightningnetwork/lnd/pull/9334) when | ||
constructing blinded payment paths for an invoice, we select up to MaxNumPaths | ||
candidate routes and pass them forward. This process may result in running out | ||
of paths if some of them are discarded for any reason later. This PR return all | ||
possible routes and then do the MaxPath cap later on. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
* [Fixed a bug](https://github.com/lightningnetwork/lnd/pull/9334) when | |
constructing blinded payment paths for an invoice, we select up to MaxNumPaths | |
candidate routes and pass them forward. This process may result in running out | |
of paths if some of them are discarded for any reason later. This PR return all | |
possible routes and then do the MaxPath cap later on. | |
[Fixed a bug](https://github.com/lightningnetwork/lnd/pull/9334) in constructing blinded payment paths for invoices. The restriction on the maximum number of paths is now applied later during pathfinding, ensuring that all potential paths are considered before filtering out ineligible ones. This allows for better utilization of the available paths for payments. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Much better thanks 👍
Thanks ... now it is fixed. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, everything addressed!
* [Fixed a bug](https://github.com/lightningnetwork/lnd/pull/9334) when | ||
constructing blinded payment paths for an invoice, we select up to MaxNumPaths | ||
candidate routes and pass them forward. This process may result in running out | ||
of paths if some of them are discarded for any reason later. This PR return all | ||
possible routes and then do the MaxPath cap later on. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Much better thanks 👍
@@ -100,6 +100,9 @@ type BuildBlindedPathCfg struct { | |||
// route. | |||
MinNumHops uint8 | |||
|
|||
// MaxNumPaths is the maximum number of blinded paths to select. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You right, thanks!
@@ -547,35 +547,58 @@ func genBlindedRouteData(rand *rand.Rand) *record.BlindedRouteData { | |||
// an example mentioned in this spec document: | |||
// https://github.com/lightning/bolts/blob/master/proposals/route-blinding.md | |||
// This example does not use any dummy hops. | |||
// Added Dave to test MaxNumPaths restriction. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can make it clear with better comments.
routes, err := ctx.router.FindBlindedPaths( | ||
dave, 1000, probabilitySrc, &BlindedPathRestrictions{ | ||
MinDistanceFromIntroNode: 2, | ||
NumHops: 2, | ||
MaxNumPaths: 3, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't modify the test logic, but as I understand it, there's no probability difference affecting the expected order. So there is no reason to assert it.
@@ -3249,27 +3245,12 @@ func TestFindBlindedPathsWithMC(t *testing.T) { | |||
"alice,charlie,dave", | |||
}) | |||
|
|||
// Change the MaxNumPaths to 1 to assert that only the best route is |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is not a typo ... "fluke" and "flake" have different meanings, though they sound similar. Fluke is a lucky or random event that happens by chance.
@ziggie1984 notice that the last changes broke some tests ... I'll be fixing today! And let you know. |
a92cc61
to
1d6fc66
Compare
We now return all possible paths found by the pathfinder and only remove those which do have a low probability.
MaxNumPaths restriction moved from FindBlindedPaths to BuildBlindedPaymentPaths this way we can interact through all possibly routes when creating a new blinded path.
MaxNumPaths restriction moved from FindBlindedPaths to BuildBlindedPaymentPaths this way we have to fill the MaxNumPaths parameter when calling this function.
Fixes #9076
MaxNumPaths restriction moved from
FindBlindedPaths
toBuildBlindedPaymentPaths
this way we can interact through all possibly routes.If the reviewers agreed to this approach we will have to modify the
TestFindBlindedPathsWithMC
because it is considering that MaxNumPaths retriction is applied onFindBlindedPaths
function.