multi: add noop-htlcs daemon configuration

This commit adds a new daemon configuration option that controls whether
NoOp HTLCs are produced over the tap channels.

Author: GeorgeTsagk

rfq/manager.go

@@ -123,6 +123,10 @@ type ManagerCfg struct {
 	// messages (this means that the price oracle will not be queried).
 	SkipAcceptQuotePriceCheck bool
 
+	// NoOpHTLCs is a boolean indicating whether the daemon configuration
+	// wants us to produce NoOp HTLCs.
+	NoOpHTLCs bool
+
 	// ErrChan is the main error channel which will be used to report back
 	// critical errors to the main server.
 	ErrChan chan<- error
@@ -244,6 +248,7 @@ func (m *Manager) startSubsystems(ctx context.Context) error {
 		HtlcSubscriber:   m.cfg.HtlcSubscriber,
 		AcceptHtlcEvents: m.acceptHtlcEvents,
 		SpecifierChecker: m.AssetMatchesSpecifier,
+		NoOpHTLCs:        m.cfg.NoOpHTLCs,
 	})
 	if err != nil {
 		return fmt.Errorf("error initializing RFQ order handler: %w",

rfq/order.go

@@ -121,13 +121,17 @@ type AssetSalePolicy struct {
 	// that they carry.
 	htlcToAmt map[models.CircuitKey]lnwire.MilliSatoshi
 
+	// NoOpHTLCs is a boolean indicating whether the daemon configuration
+	// wants us to produce NoOp HTLCs.
+	NoOpHTLCs bool
+
 	// 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) *AssetSalePolicy {
+func NewAssetSalePolicy(quote rfqmsg.BuyAccept, noop bool) *AssetSalePolicy {
 	htlcToAmtMap := make(map[models.CircuitKey]lnwire.MilliSatoshi)
 
 	return &AssetSalePolicy{
@@ -137,6 +141,7 @@ func NewAssetSalePolicy(quote rfqmsg.BuyAccept) *AssetSalePolicy {
 		AskAssetRate:           quote.AssetRate.Rate,
 		expiry:                 uint64(quote.AssetRate.Expiry.Unix()),
 		htlcToAmt:              htlcToAmtMap,
+		NoOpHTLCs:              noop,
 	}
 }
 
@@ -288,7 +293,9 @@ func (c *AssetSalePolicy) GenerateInterceptorResponse(
 	// 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.
-	htlcRecord.SetNoopAdd(rfqmsg.UseNoOpHTLCs)
+	if c.NoOpHTLCs {
+		htlcRecord.SetNoopAdd(rfqmsg.UseNoOpHTLCs)
+	}
 
 	customRecords, err := lnwire.ParseCustomRecords(htlcRecord.Bytes())
 	if err != nil {
@@ -675,6 +682,10 @@ type OrderHandlerCfg struct {
 	// SpecifierChecker is an interface that contains methods for
 	// checking certain properties related to asset specifiers.
 	SpecifierChecker rfqmsg.SpecifierChecker
+
+	// NoOpHTLCs is a boolean indicating whether the daemon configuration
+	// wants us to produce NoOp HTLCs.
+	NoOpHTLCs bool
 }
 
 // OrderHandler orchestrates management of accepted quote bundles. It monitors
@@ -929,7 +940,7 @@ 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)
+	policy := NewAssetSalePolicy(buyAccept, h.cfg.NoOpHTLCs)
 	h.policies.Store(policy.AcceptedQuoteId.Scid(), policy)
 }
 

sample-tapd.conf

@@ -403,6 +403,12 @@
 ; creating an address
 ; address.disable-syncer=false
 
+[channel]
+
+; If set, all channels will default to using NoOp HTLCs. This type of HTLC will
+; only move assets over the channel, but not any satoshi balance
+; channel.noop-htlcs=false
+
 [prometheus]
 
 ; If true prometheus metrics will be exported

tapcfg/config.go

@@ -221,6 +221,10 @@ type ChainConfig struct {
 	SigNetChallenge string `long:"signetchallenge" description:"Connect to a custom signet network defined by this challenge instead of using the global default signet test network -- Can be specified multiple times"`
 }
 
+type ChannelConfig struct {
+	NoopHTLCs bool `long:"noop-htlcs" description:"toggles the use of noop HTLCs over tap channels"`
+}
+
 // RpcConfig houses the set of config options that affect how clients connect
 // to the main RPC server.
 type RpcConfig struct {
@@ -357,6 +361,8 @@ type Config struct {
 
 	AddrBook *AddrBookConfig `group:"address" namespace:"address"`
 
+	Channel *ChannelConfig `group:"channel" namespace:"channel"`
+
 	Prometheus monitoring.PrometheusConfig `group:"prometheus" namespace:"prometheus"`
 
 	Experimental *ExperimentalConfig `group:"experimental" namespace:"experimental"`
@@ -464,6 +470,9 @@ func DefaultConfig() Config {
 		AddrBook: &AddrBookConfig{
 			DisableSyncer: false,
 		},
+		Channel: &ChannelConfig{
+			NoopHTLCs: false,
+		},
 		Experimental: &ExperimentalConfig{
 			Rfq: rfq.CliConfig{
 				AcceptPriceDeviationPpm: rfq.DefaultAcceptPriceDeviationPpm,

tapcfg/server.go

@@ -469,6 +469,7 @@ func genServerConfig(cfg *Config, cfgLogger btclog.Logger,
 			AcceptPriceDeviationPpm: rfqCfg.AcceptPriceDeviationPpm,
 			// nolint: lll
 			SkipAcceptQuotePriceCheck: rfqCfg.SkipAcceptQuotePriceCheck,
+			NoOpHTLCs:                 cfg.Channel.NoopHTLCs,
 			ErrChan:                   mainErrChan,
 		},
 	)
@@ -539,6 +540,7 @@ func genServerConfig(cfg *Config, cfgLogger btclog.Logger,
 		&tapchannel.TrafficShaperConfig{
 			ChainParams: &tapChainParams,
 			RfqManager:  rfqManager,
+			NoopHTLCs:   cfg.Channel.NoopHTLCs,
 		},
 	)
 	auxInvoiceManager := tapchannel.NewAuxInvoiceManager(

tapchannel/aux_traffic_shaper.go

@@ -29,6 +29,10 @@ type TrafficShaperConfig struct {
 	ChainParams *address.ChainParams
 
 	RfqManager *rfq.Manager
+
+	// NoOpHTLCs is a boolean indicating whether the daemon configuration
+	// wants us to produce NoOp HTLCs.
+	NoopHTLCs bool
 }
 
 // AuxTrafficShaper is a Taproot Asset auxiliary traffic shaper that can be used
@@ -474,7 +478,10 @@ func (s *AuxTrafficShaper) ProduceHtlcExtraData(totalAmount lnwire.MilliSatoshi,
 		log.Tracef("Already have asset amount (sum %d) in HTLC, not "+
 			"producing extra data", htlc.Amounts.Val.Sum())
 
-		htlc.SetNoopAdd(rfqmsg.UseNoOpHTLCs)
+		if s.cfg.NoopHTLCs {
+			htlc.SetNoopAdd(rfqmsg.UseNoOpHTLCs)
+		}
+
 		updatedRecords, err := htlc.ToCustomRecords()
 		if err != nil {
 			return 0, nil, err
@@ -580,7 +587,9 @@ func (s *AuxTrafficShaper) ProduceHtlcExtraData(totalAmount lnwire.MilliSatoshi,
 	// Now we set the flag that marks this HTLC as a noop_add, which means
 	// that the above dust will eventually return to us. This means that
 	// only the assets will be sent and not any btc balance.
-	htlc.SetNoopAdd(rfqmsg.UseNoOpHTLCs)
+	if s.cfg.NoopHTLCs {
+		htlc.SetNoopAdd(rfqmsg.UseNoOpHTLCs)
+	}
 
 	updatedRecords, err := htlc.ToCustomRecords()
 	if err != nil {