rfq: use aux chan negotiator

Author: GeorgeTsagk

rfq/manager.go

@@ -19,6 +19,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/rfqmath"
 	"github.com/lightninglabs/taproot-assets/rfqmsg"
+	"github.com/lightninglabs/taproot-assets/tapfeatures"
 	"github.com/lightninglabs/taproot-assets/taprpc/rfqrpc"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnutils"
@@ -112,6 +113,8 @@ type ManagerCfg struct {
 	// into the manager once lnd and tapd are hooked together.
 	AliasManager ScidAliasManager
 
+	AuxChanNegotiator *tapfeatures.AuxChannelNegotiator
+
 	// AcceptPriceDeviationPpm is the price deviation in
 	// parts per million that is accepted by the RFQ negotiator.
 	//
@@ -251,12 +254,13 @@ func (m *Manager) startSubsystems(ctx context.Context) error {
 
 	// Initialise and start the order handler.
 	m.orderHandler, err = NewOrderHandler(OrderHandlerCfg{
-		CleanupInterval:  CacheCleanupInterval,
-		HtlcInterceptor:  m.cfg.HtlcInterceptor,
-		HtlcSubscriber:   m.cfg.HtlcSubscriber,
-		AcceptHtlcEvents: m.acceptHtlcEvents,
-		SpecifierChecker: m.AssetMatchesSpecifier,
-		NoOpHTLCs:        m.cfg.NoOpHTLCs,
+		CleanupInterval:   CacheCleanupInterval,
+		HtlcInterceptor:   m.cfg.HtlcInterceptor,
+		HtlcSubscriber:    m.cfg.HtlcSubscriber,
+		AcceptHtlcEvents:  m.acceptHtlcEvents,
+		SpecifierChecker:  m.AssetMatchesSpecifier,
+		NoOpHTLCs:         m.cfg.NoOpHTLCs,
+		AuxChanNegotiator: m.cfg.AuxChanNegotiator,
 	})
 	if err != nil {
 		return fmt.Errorf("error initializing RFQ order handler: %w",

rfq/order.go

@@ -14,11 +14,13 @@ import (
 	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/rfqmath"
 	"github.com/lightninglabs/taproot-assets/rfqmsg"
+	"github.com/lightninglabs/taproot-assets/tapfeatures"
 	"github.com/lightningnetwork/lnd/graph/db/models"
 	"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
 	"github.com/lightningnetwork/lnd/lnutils"
 	"github.com/lightningnetwork/lnd/lnwallet"
 	"github.com/lightningnetwork/lnd/lnwire"
+	"github.com/lightningnetwork/lnd/routing/route"
 	"github.com/lightningnetwork/lnd/tlv"
 )
 
@@ -125,13 +127,20 @@ type AssetSalePolicy struct {
 	// wants us to produce NoOp HTLCs.
 	NoOpHTLCs bool
 
+	auxChanNegotiator *tapfeatures.AuxChannelNegotiator
+
+	peer route.Vertex
+
 	// expiry is the policy's expiry unix timestamp after which the policy
 	// is no longer valid.
 	expiry uint64
 }
 
 // NewAssetSalePolicy creates a new asset sale policy.
-func NewAssetSalePolicy(quote rfqmsg.BuyAccept, noop bool) *AssetSalePolicy {
+func NewAssetSalePolicy(quote rfqmsg.BuyAccept, noop bool,
+	chanNegotiator *tapfeatures.AuxChannelNegotiator,
+	peer route.Vertex) *AssetSalePolicy {
+
 	htlcToAmtMap := make(map[models.CircuitKey]lnwire.MilliSatoshi)
 
 	return &AssetSalePolicy{
@@ -142,6 +151,8 @@ func NewAssetSalePolicy(quote rfqmsg.BuyAccept, noop bool) *AssetSalePolicy {
 		expiry:                 uint64(quote.AssetRate.Expiry.Unix()),
 		htlcToAmt:              htlcToAmtMap,
 		NoOpHTLCs:              noop,
+		auxChanNegotiator:      chanNegotiator,
+		peer:                   peer,
 	}
 }
 
@@ -290,10 +301,13 @@ func (c *AssetSalePolicy) GenerateInterceptorResponse(
 		fn.None[[]rfqmsg.ID](),
 	)
 
+	peerFeatures := c.auxChanNegotiator.GetPeerFeatures(c.peer)
+	supportNoOp := peerFeatures.HasFeature(tapfeatures.NoOpHTLCsOptional)
+
 	// We are about to create an outgoing HTLC that carries assets. Let's
 	// set the noop flag in order to eventually only settle the assets but
 	// never settle the sats anchor amount that will carry them.
-	if c.NoOpHTLCs {
+	if c.NoOpHTLCs && supportNoOp {
 		htlcRecord.SetNoopAdd(rfqmsg.UseNoOpHTLCs)
 	}
 
@@ -686,6 +700,11 @@ type OrderHandlerCfg struct {
 	// NoOpHTLCs is a boolean indicating whether the daemon configuration
 	// wants us to produce NoOp HTLCs.
 	NoOpHTLCs bool
+
+	// AuxChannelNegotiator is responsible for producing the extra tlv blob
+	// that is encapsulated in the init and reestablish peer messages. This
+	// helps us communicate custom feature bits with our peer.
+	AuxChanNegotiator *tapfeatures.AuxChannelNegotiator
 }
 
 // OrderHandler orchestrates management of accepted quote bundles. It monitors
@@ -940,7 +959,11 @@ func (h *OrderHandler) RegisterAssetSalePolicy(buyAccept rfqmsg.BuyAccept) {
 	log.Debugf("Order handler is registering an asset sale policy given a "+
 		"buy accept message: %s", buyAccept.String())
 
-	policy := NewAssetSalePolicy(buyAccept, h.cfg.NoOpHTLCs)
+	policy := NewAssetSalePolicy(
+		buyAccept, h.cfg.NoOpHTLCs, h.cfg.AuxChanNegotiator,
+		buyAccept.Peer,
+	)
+
 	h.policies.Store(policy.AcceptedQuoteId.Scid(), policy)
 }