highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-06-29 02:00:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0-18-3-branch-9026' into 0-18-3-branch

Browse Source
This commit is contained in:
Olaoluwa Osuntokun
2024-08-26 20:19:31 -05:00
parent dbe4ca3efe 72929079c9
commit e431e5b71f
2 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/release-notes/release-notes-0.18.3.md
View File

@ -72,6 +72,11 @@ commitment when the channel was force closed.
in the `ReplyChannelRange` msg and introduced a check that ChanUpdates with a in the `ReplyChannelRange` msg and introduced a check that ChanUpdates with a
timestamp too far into the future will be discarded. timestamp too far into the future will be discarded.
* [Fixed](https://github.com/lightningnetwork/lnd/pull/9026) a bug where we
would create a blinded route with a minHTLC greater than the actual payment
amount. Moreover remove strict correlation between min_cltv_delta and the
blinded path expiry.
# New Features # New Features
## Functional Enhancements ## Functional Enhancements
## RPC Additions ## RPC Additions

38
routing/blindedpath/blinded_path.go
View File

@ -82,7 +82,16 @@ type BuildBlindedPathCfg struct {
MinFinalCLTVExpiryDelta uint32 MinFinalCLTVExpiryDelta uint32
// BlocksUntilExpiry is the number of blocks that this blinded path // BlocksUntilExpiry is the number of blocks that this blinded path
// should remain valid for. // should remain valid for. This is a relative number of blocks. This
// number in addition with a potential minimum cltv delta for the last
// hop and some block padding will be the payment constraint which is
// part of the blinded hop info. Every htlc using the provided blinded
// hops cannot have a higher cltv delta otherwise it will get rejected
// by the forwarding nodes or the final node.
//
// This number should at least be greater than the invoice expiry time
// so that the blinded route is always valid as long as the invoice is
// valid.
BlocksUntilExpiry uint32 BlocksUntilExpiry uint32
// MinNumHops is the minimum number of hops that each blinded path // MinNumHops is the minimum number of hops that each blinded path
@ -105,13 +114,6 @@ type BuildBlindedPathCfg struct {
func BuildBlindedPaymentPaths(cfg *BuildBlindedPathCfg) ( func BuildBlindedPaymentPaths(cfg *BuildBlindedPathCfg) (
[]*zpay32.BlindedPaymentPath, error) { []*zpay32.BlindedPaymentPath, error) {
if cfg.MinFinalCLTVExpiryDelta >= cfg.BlocksUntilExpiry {
return nil, fmt.Errorf("blinded path CLTV expiry delta (%d) "+
"must be greater than the minimum final CLTV expiry "+
"delta (%d)", cfg.BlocksUntilExpiry,
cfg.MinFinalCLTVExpiryDelta)
}
// Find some appropriate routes for the value to be routed. This will // Find some appropriate routes for the value to be routed. This will
// return a set of routes made up of real nodes. // return a set of routes made up of real nodes.
routes, err := cfg.FindRoutes(cfg.ValueMsat) routes, err := cfg.FindRoutes(cfg.ValueMsat)
@ -148,7 +150,7 @@ func BuildBlindedPaymentPaths(cfg *BuildBlindedPathCfg) (
continue continue
} else if err != nil { } else if err != nil {
log.Errorf("Not using route (%s) as a blinded path: %v", log.Errorf("Not using route (%s) as a blinded path: %v",
err) route, err)
continue continue
} }
@ -435,11 +437,27 @@ func collectRelayInfo(cfg *BuildBlindedPathCfg, path *candidatePath) (
} }
} }
policy, err = cfg.AddPolicyBuffer(policy) if policy.MinHTLCMsat > cfg.ValueMsat {
return nil, 0, 0, fmt.Errorf("%w: minHTLC of hop "+
"policy larger than payment amt: sentAmt(%v), "+
"minHTLC(%v)", errInvalidBlindedPath,
cfg.ValueMsat, policy.MinHTLCMsat)
}
bufferPolicy, err := cfg.AddPolicyBuffer(policy)
if err != nil { if err != nil {
return nil, 0, 0, err return nil, 0, 0, err
} }
// We only use the new buffered policy if the new minHTLC value
// does not violate the sender amount.
//
// NOTE: We don't check this for maxHTLC, because the payment
// amount can always be splitted using MPP.
if bufferPolicy.MinHTLCMsat <= cfg.ValueMsat {
policy = bufferPolicy
}
// If this is the first policy we are collecting, then use this // If this is the first policy we are collecting, then use this
// policy to set the base values for min/max htlc. // policy to set the base values for min/max htlc.
if len(hops) == 0 { if len(hops) == 0 {