11package tapchannel
22
33import (
4+ "bytes"
45 "context"
56 "fmt"
67 "sync"
@@ -19,6 +20,7 @@ import (
1920 "github.com/lightningnetwork/lnd/lnutils"
2021 "github.com/lightningnetwork/lnd/lnwallet"
2122 "github.com/lightningnetwork/lnd/lnwire"
23+ "github.com/lightningnetwork/lnd/routing/route"
2224 "github.com/lightningnetwork/lnd/tlv"
2325)
2426
@@ -116,8 +118,8 @@ func (s *AuxTrafficShaper) ShouldHandleTraffic(cid lnwire.ShortChannelID,
116118// called first.
117119func (s * AuxTrafficShaper ) PaymentBandwidth (fundingBlob , htlcBlob ,
118120 commitmentBlob lfn.Option [tlv.Blob ], linkBandwidth ,
119- htlcAmt lnwire.MilliSatoshi ,
120- htlcView lnwallet. AuxHtlcView ) (lnwire.MilliSatoshi , error ) {
121+ htlcAmt lnwire.MilliSatoshi , htlcView lnwallet. AuxHtlcView ,
122+ peer * route. Vertex ) (lnwire.MilliSatoshi , error ) {
121123
122124 fundingBlobBytes := fundingBlob .UnwrapOr (nil )
123125 htlcBytes := htlcBlob .UnwrapOr (nil )
@@ -230,6 +232,7 @@ func (s *AuxTrafficShaper) PaymentBandwidth(fundingBlob, htlcBlob,
230232 // the asset units in our local balance.
231233 return s .paymentBandwidth (
232234 htlc , computedLocal , linkBandwidth , minHtlcAmt , fundingChan ,
235+ peer ,
233236 )
234237}
235238
@@ -277,11 +280,12 @@ func paymentBandwidthAssetUnits(htlcAssetAmount, computedLocal uint64,
277280}
278281
279282// paymentBandwidth returns the available payment bandwidth of the channel based
280- // on the list of availalbe RFQ IDs. If any of those IDs matches the channel, we
283+ // on the list of available RFQ IDs. If any of those IDs matches the channel, we
281284// calculate the bandwidth based on its asset rate.
282285func (s * AuxTrafficShaper ) paymentBandwidth (htlc * rfqmsg.Htlc ,
283286 localBalance uint64 , linkBandwidth , minHtlcAmt lnwire.MilliSatoshi ,
284- fundingChan * cmsg.OpenChannel ) (lnwire.MilliSatoshi , error ) {
287+ fundingChan * cmsg.OpenChannel ,
288+ peer * route.Vertex ) (lnwire.MilliSatoshi , error ) {
285289
286290 // If the HTLC doesn't have any available RFQ IDs, it's incomplete, and
287291 // we cannot determine the bandwidth.
@@ -292,26 +296,29 @@ func (s *AuxTrafficShaper) paymentBandwidth(htlc *rfqmsg.Htlc,
292296 }
293297
294298 // Retrieve the available RFQ IDs.
295- avaliableIDs := htlc .AvailableRfqIDs .UnsafeFromSome ().Val .IDs
299+ availableIDs := htlc .AvailableRfqIDs .UnsafeFromSome ().Val .IDs
296300
297301 // For this rfqID we'll fetch the corresponding quote and rate.
298302 acceptedSellQuotes := s .cfg .RfqManager .PeerAcceptedSellQuotes ()
299303 acceptedBuyQuotes := s .cfg .RfqManager .LocalAcceptedBuyQuotes ()
300304
301- for _ , rfqID := range avaliableIDs {
305+ for _ , rfqID := range availableIDs {
302306 sellQuote , isSellQuote := acceptedSellQuotes [rfqID .Scid ()]
303307 buyQuote , isBuyQuote := acceptedBuyQuotes [rfqID .Scid ()]
304308
305309 var (
306310 rate rfqmsg.AssetRate
307311 specifier asset.Specifier
312+ quotePeer * route.Vertex
308313 )
309314 switch {
310315 case isSellQuote :
316+ quotePeer = & sellQuote .Peer
311317 rate = sellQuote .AssetRate
312318 specifier = sellQuote .Request .AssetSpecifier
313319
314320 case isBuyQuote :
321+ quotePeer = & buyQuote .Peer
315322 rate = buyQuote .AssetRate
316323 specifier = buyQuote .Request .AssetSpecifier
317324
@@ -320,6 +327,12 @@ func (s *AuxTrafficShaper) paymentBandwidth(htlc *rfqmsg.Htlc,
320327 "ID %x (SCID %d)" , rfqID [:], rfqID .Scid ())
321328 }
322329
330+ // If the channel peer does not match the quote peer, continue
331+ // to the next available quote.
332+ if ! bytes .Equal (quotePeer [:], peer [:]) {
333+ continue
334+ }
335+
323336 bandwidth , err := s .paymentBandwidthRFQ (
324337 rfqID , rate , specifier , localBalance , linkBandwidth ,
325338 minHtlcAmt , fundingChan ,
@@ -431,8 +444,8 @@ func ComputeLocalBalance(commitment cmsg.Commitment,
431444// blob of an HTLC, may produce a different blob or modify the amount of bitcoin
432445// this HTLC should carry.
433446func (s * AuxTrafficShaper ) ProduceHtlcExtraData (totalAmount lnwire.MilliSatoshi ,
434- htlcCustomRecords lnwire.CustomRecords ) (lnwire. MilliSatoshi ,
435- lnwire.CustomRecords , error ) {
447+ htlcCustomRecords lnwire.CustomRecords ,
448+ peer * route. Vertex ) (lnwire. MilliSatoshi , lnwire.CustomRecords , error ) {
436449
437450 if ! rfqmsg .HasAssetHTLCCustomRecords (htlcCustomRecords ) {
438451 log .Tracef ("No asset HTLC custom records, not producing " +
@@ -456,16 +469,43 @@ func (s *AuxTrafficShaper) ProduceHtlcExtraData(totalAmount lnwire.MilliSatoshi,
456469 return totalAmount , htlcCustomRecords , nil
457470 }
458471
459- if htlc .RfqID .ValOpt ().IsNone () {
460- return 0 , nil , fmt .Errorf ("no RFQ ID present in HTLC blob" )
472+ if htlc .AvailableRfqIDs .IsNone () {
473+ return 0 , nil , fmt .Errorf ("no available RFQ IDs present in " +
474+ "HTLC blob" )
461475 }
462476
463- rfqID := htlc .RfqID .ValOpt ().UnsafeFromSome ()
464477 acceptedQuotes := s .cfg .RfqManager .PeerAcceptedSellQuotes ()
465- quote , ok := acceptedQuotes [rfqID .Scid ()]
466- if ! ok {
467- return 0 , nil , fmt .Errorf ("no accepted quote found for RFQ ID " +
468- "%x (SCID %d)" , rfqID [:], rfqID .Scid ())
478+ availableIDs := htlc .AvailableRfqIDs .UnsafeFromSome ().Val .IDs
479+
480+ var (
481+ rfqID rfqmsg.ID
482+ quote rfqmsg.SellAccept
483+ )
484+
485+ // Let's find the quote that matches this peer. This will be the quote
486+ // that we'll use to calculate the asset units. Given that we may only
487+ // establish a maximum of 1 quote per peer per payment, this check is
488+ // safe to perform as there are no competing quotes for a certain peer.
489+ for _ , id := range availableIDs {
490+ q , ok := acceptedQuotes [id .Scid ()]
491+ if ! ok {
492+ continue
493+ }
494+
495+ // We found the quote to use, now let's set the related fields.
496+ if q .Peer .String () == peer .String () {
497+ // This is the actual RFQ ID that our peer will use to
498+ // perform checks on their end.
499+ rfqID = id
500+ htlc .RfqID = rfqmsg .SomeRfqIDRecord (rfqID )
501+ quote = q
502+ break
503+ }
504+ }
505+
506+ if htlc .RfqID .IsNone () {
507+ return 0 , nil , fmt .Errorf ("none of the available RFQ IDs " +
508+ "match our peer=%s" , peer )
469509 }
470510
471511 // Now that we've queried the accepted quote, we know how many asset
0 commit comments