server+tapchannel: always handle traffic for asset HTLCs

This fixes the first part of the issue: We didn't tell lnd that we
wanted to handle traffic for non-asset channels. But that's wrong,
because then lnd will pick non-asset channels for HTLCs in some
situations.
So we explicitly need to tell lnd there is no bandwidth in non-asset
channels if an asset HTLC should be forwarded (or sent).

Author: guggero

server.go

@@ -1007,7 +1007,9 @@ func (s *Server) ShouldHandleTraffic(cid lnwire.ShortChannelID,
 		return false, err
 	}
 
-	return s.cfg.AuxTrafficShaper.ShouldHandleTraffic(cid, fundingBlob)
+	return s.cfg.AuxTrafficShaper.ShouldHandleTraffic(
+		cid, fundingBlob, htlcBlob,
+	)
 }
 
 // PaymentBandwidth returns the available bandwidth for a custom channel decided

tapchannel/aux_traffic_shaper.go

@@ -80,27 +80,30 @@ func (s *AuxTrafficShaper) Stop() error {
 // it is handled by the traffic shaper, then the normal bandwidth calculation
 // can be skipped and the bandwidth returned by PaymentBandwidth should be used
 // instead.
-func (s *AuxTrafficShaper) ShouldHandleTraffic(_ lnwire.ShortChannelID,
-	fundingBlob lfn.Option[tlv.Blob]) (bool, error) {
-
-	// If there is no auxiliary blob in the channel, it's not a custom
-	// channel, and we don't need to handle it.
-	if fundingBlob.IsNone() {
-		log.Tracef("No aux funding blob set, not handling traffic")
+func (s *AuxTrafficShaper) ShouldHandleTraffic(cid lnwire.ShortChannelID,
+	_, htlcBlob lfn.Option[tlv.Blob]) (bool, error) {
+
+	// The rule here is simple: If the HTLC is an asset HTLC, we _need_ to
+	// handle the bandwidth. Because of non-strict forwarding in lnd, it
+	// could otherwise be the case that we forward an asset HTLC on a
+	// non-asset channel, which would be a problem.
+	htlcBytes := htlcBlob.UnwrapOr(nil)
+	if len(htlcBytes) == 0 {
+		log.Tracef("Empty HTLC blob, not handling traffic for %v", cid)
 		return false, nil
 	}
 
-	// If we can successfully decode the channel blob as a channel capacity
-	// information, we know that this is a custom channel.
-	err := lfn.MapOptionZ(fundingBlob, func(blob tlv.Blob) error {
-		_, err := cmsg.DecodeOpenChannel(blob)
-		return err
-	})
-	if err != nil {
-		return false, err
+	// If there are no asset HTLC custom records, we don't need to do
+	// anything as this is a regular payment.
+	if !rfqmsg.HasAssetHTLCEntries(htlcBytes) {
+		log.Tracef("No asset HTLC custom records, not handling "+
+			"traffic for %v", cid)
+		return false, nil
 	}
 
-	// No error, so this is a custom channel, we'll want to decide.
+	// If this _is_ an asset HTLC, we definitely want to handle the
+	// bandwidth for this channel, so we can deny forwarding asset HTLCs
+	// over non-asset channels.
 	return true, nil
 }
 
@@ -114,33 +117,25 @@ func (s *AuxTrafficShaper) PaymentBandwidth(htlcBlob,
 	htlcAmt lnwire.MilliSatoshi,
 	htlcView lnwallet.AuxHtlcView) (lnwire.MilliSatoshi, error) {
 
-	// If the commitment or HTLC blob is not set, we don't have any
-	// information about the channel and cannot determine the available
-	// bandwidth from a taproot asset perspective. We return the link
-	// bandwidth as a fallback.
-	if commitmentBlob.IsNone() || htlcBlob.IsNone() {
-		log.Tracef("No commitment or HTLC blob set, returning link "+
-			"bandwidth %v", linkBandwidth)
-		return linkBandwidth, nil
-	}
-
-	commitmentBytes := commitmentBlob.UnsafeFromSome()
-	htlcBytes := htlcBlob.UnsafeFromSome()
+	htlcBytes := htlcBlob.UnwrapOr(nil)
+	commitmentBytes := commitmentBlob.UnwrapOr(nil)
 
-	// Sometimes the blob is set but actually empty, in which case we also
-	// don't have any information about the channel.
-	if len(commitmentBytes) == 0 || len(htlcBytes) == 0 {
-		log.Tracef("Empty commitment or HTLC blob, returning link "+
-			"bandwidth %v", linkBandwidth)
+	// If the HTLC is not an asset HTLC, we can just return the normal link
+	// bandwidth, as we don't need to do any special math. We shouldn't even
+	// get here in the first place, since the ShouldHandleTraffic function
+	// should return false in this case.
+	if len(htlcBytes) == 0 || !rfqmsg.HasAssetHTLCEntries(htlcBytes) {
+		log.Tracef("Empty HTLC blob or no asset HTLC custom records, "+
+			"returning link bandwidth %v", linkBandwidth)
 		return linkBandwidth, nil
 	}
 
-	// If there are no asset HTLC custom records, we don't need to do
-	// anything as this is a regular payment.
-	if !rfqmsg.HasAssetHTLCEntries(htlcBytes) {
-		log.Tracef("No asset HTLC custom records, returning link "+
-			"bandwidth %v", linkBandwidth)
-		return linkBandwidth, nil
+	// If this is an asset HTLC but the channel is not an asset channel, we
+	// MUST deny forwarding the HTLC.
+	if len(commitmentBytes) == 0 {
+		log.Tracef("Empty commitment blob, cannot forward asset HTLC " +
+			"over non-asset channel, returning 0 bandwidth")
+		return 0, nil
 	}
 
 	commitment, err := cmsg.DecodeCommitment(commitmentBytes)