Merge 952be70 into c441a3b

Author: ffranr

docs/release-notes/release-notes-0.8.0.md

@@ -38,6 +38,12 @@
   Garbage collection will be executed on every burn, transfer or call to
   `AnchorVirtualPsbts`. A new configuration is available to control the sweeping 
   via the flag `wallet.sweep-orphan-utxos`.
+- [PR](https://github.com/lightninglabs/taproot-assets/pull/1899) tapd now
+  treats HTLC interceptor setup failures as fatal during RFQ subsystem startup.
+  If the RFQ subsystem cannot install its interceptor, tapd shuts down instead
+  of continuing in a degraded state. This ensures that any running tapd
+  instance has a fully functional RFQ pipeline and surfaces configuration or
+  lnd-level conflicts immediately.
 
 ## RPC Updates
 

itest/addrs_test.go

@@ -808,7 +808,8 @@ func testUnknownTlvType(t *harnessTest) {
 	require.NoError(t.t, err)
 
 	// We make a new node to import the modified proof.
-	charlie := setupTapdHarness(t.t, t, bobLnd, t.universeServer)
+	charlieLnd := t.lndHarness.NewNodeWithCoins("Charlie", nil)
+	charlie := setupTapdHarness(t.t, t, charlieLnd, t.universeServer)
 	defer func() {
 		require.NoError(t.t, charlie.stop(!*noDelete))
 	}()

itest/addrs_v2_test.go

@@ -665,12 +665,13 @@ func testAddressV2WithGroupKeyRestart(t *harnessTest) {
 
 	// Now we can create two more tapd nodes that we can start and stop
 	// independently. To save some time, we'll use the same lnd node.
-	bobCharlieLnd := t.lndHarness.NewNodeWithCoins("BobAndCharlie", nil)
-	bobTapd := setupTapdHarness(t.t, t, bobCharlieLnd, t.universeServer)
+	bobLnd := t.lndHarness.NewNodeWithCoins("Bob", nil)
+	bobTapd := setupTapdHarness(t.t, t, bobLnd, t.universeServer)
 	defer func() {
 		require.NoError(t.t, bobTapd.stop(!*noDelete))
 	}()
-	charlieTapd := setupTapdHarness(t.t, t, bobCharlieLnd, t.universeServer)
+	charlieLnd := t.lndHarness.NewNodeWithCoins("Charlie", nil)
+	charlieTapd := setupTapdHarness(t.t, t, charlieLnd, t.universeServer)
 	defer func() {
 		require.NoError(t.t, charlieTapd.stop(!*noDelete))
 	}()

rfq/manager.go

@@ -264,6 +264,7 @@ func (m *Manager) startSubsystems(ctx context.Context) error {
 		SpecifierChecker:  m.AssetMatchesSpecifier,
 		NoOpHTLCs:         m.cfg.NoOpHTLCs,
 		AuxChanNegotiator: m.cfg.AuxChanNegotiator,
+		ErrChan:           m.cfg.ErrChan,
 	})
 	if err != nil {
 		return fmt.Errorf("error initializing RFQ order handler: %w",

rfq/order.go

@@ -707,6 +707,10 @@ type OrderHandlerCfg struct {
 	// that is encapsulated in the init and reestablish peer messages. This
 	// helps us communicate custom feature bits with our peer.
 	AuxChanNegotiator *tapfeatures.AuxChannelNegotiator
+
+	// ErrChan is the main error channel that is used to propagate critical
+	// errors back to the parent manager/server.
+	ErrChan chan<- error
 }
 
 // OrderHandler orchestrates management of accepted quote bundles. It monitors
@@ -928,8 +932,16 @@ func (h *OrderHandler) Start() error {
 
 			startErr = h.setupHtlcIntercept(ctx)
 			if startErr != nil {
-				log.Errorf("Error setting up HTLC "+
-					"interception: %v", startErr)
+				startErr = fmt.Errorf("setting up HTLC "+
+					"interception: %w", startErr)
+
+				// Failing to start HTLC interception is a
+				// critical error for the order handler, so we
+				// propagate it upward.
+				h.ReportMainChanError(
+					fn.NewCriticalError(startErr),
+				)
+
 				return
 			}
 
@@ -954,6 +966,21 @@ func (h *OrderHandler) Start() error {
 	return startErr
 }
 
+// ReportMainChanError sends an error to the main error channel.
+func (h *OrderHandler) ReportMainChanError(err error) {
+	select {
+	// Send the error to the main error channel.
+	case h.cfg.ErrChan <- err:
+
+	// The service is shutting down, so we'll just return.
+	case <-h.Quit:
+
+	// Otherwise, if the error channel is full, we drop the error to avoid
+	// blocking.
+	default:
+	}
+}
+
 // RegisterAssetSalePolicy generates and registers an asset sale policy with the
 // order handler. This function takes an outgoing buy accept message as an
 // argument.