subservers: add Impl to subservers, GetServer to mgr

Author: guggero

subservers/faraday.go

@@ -126,3 +126,9 @@ func (f *faradaySubServer) Permissions() map[string][]bakery.Op {
 func (f *faradaySubServer) WhiteListedURLs() map[string]struct{} {
 	return nil
 }
+
+// Impl returns the actual implementation of the sub-server. This might not be
+// set if the sub-server is running in remote mode.
+func (f *faradaySubServer) Impl() any {
+	return f.RPCServer
+}

subservers/interface.go

@@ -62,4 +62,8 @@ type SubServer interface {
 	// WhiteListedURLs returns a map of all the sub-server's URLs that can
 	// be accessed without a macaroon.
 	WhiteListedURLs() map[string]struct{}
+
+	// Impl returns the actual implementation of the sub-server. This might
+	// not be set if the sub-server is running in remote mode.
+	Impl() any
 }

subservers/loop.go

@@ -136,3 +136,9 @@ func (l *loopSubServer) Permissions() map[string][]bakery.Op {
 func (l *loopSubServer) WhiteListedURLs() map[string]struct{} {
 	return nil
 }
+
+// Impl returns the actual implementation of the sub-server. This might not be
+// set if the sub-server is running in remote mode.
+func (l *loopSubServer) Impl() any {
+	return l.Daemon
+}

subservers/manager.go

@@ -78,6 +78,20 @@ func (s *Manager) AddServer(ss SubServer, enable bool) {
 	s.statusServer.SetEnabled(ss.Name())
 }
 
+// GetServer returns the sub-server with the given name if it exists.
+func (s *Manager) GetServer(name string) (SubServer, bool) {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+
+	for _, ss := range s.servers {
+		if ss.Name() == name {
+			return ss.SubServer, true
+		}
+	}
+
+	return nil, false
+}
+
 // StartIntegratedServers starts all the manager's sub-servers that should be
 // started in integrated mode.
 func (s *Manager) StartIntegratedServers(lndClient lnrpc.LightningClient,

subservers/pool.go

@@ -126,3 +126,9 @@ func (p *poolSubServer) Permissions() map[string][]bakery.Op {
 func (p *poolSubServer) WhiteListedURLs() map[string]struct{} {
 	return nil
 }
+
+// Impl returns the actual implementation of the sub-server. This might not be
+// set if the sub-server is running in remote mode.
+func (p *poolSubServer) Impl() any {
+	return p.Server
+}

subservers/taproot-assets.go

@@ -12,6 +12,8 @@ import (
 	"github.com/lightninglabs/taproot-assets/taprpc"
 	"github.com/lightninglabs/taproot-assets/taprpc/assetwalletrpc"
 	"github.com/lightninglabs/taproot-assets/taprpc/mintrpc"
+	"github.com/lightninglabs/taproot-assets/taprpc/rfqrpc"
+	tchrpc "github.com/lightninglabs/taproot-assets/taprpc/tapchannelrpc"
 	"github.com/lightninglabs/taproot-assets/taprpc/universerpc"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"google.golang.org/grpc"
@@ -45,6 +47,7 @@ func NewTaprootAssetsSubServer(cfg *tapcfg.Config,
 	tap.SetAgentName("litd")
 
 	return &taprootAssetsSubServer{
+		Server:    tap.NewServer(nil),
 		cfg:       cfg,
 		remoteCfg: remoteCfg,
 		remote:    remote,
@@ -116,6 +119,8 @@ func (t *taprootAssetsSubServer) RegisterGrpcService(
 	taprpc.RegisterTaprootAssetsServer(registrar, t)
 	mintrpc.RegisterMintServer(registrar, t)
 	assetwalletrpc.RegisterAssetWalletServer(registrar, t)
+	rfqrpc.RegisterRfqServer(registrar, t)
+	tchrpc.RegisterTaprootAssetChannelsServer(registrar, t)
 	universerpc.RegisterUniverseServer(registrar, t)
 }
 
@@ -148,6 +153,20 @@ func (t *taprootAssetsSubServer) RegisterRestService(ctx context.Context,
 		return err
 	}
 
+	err = rfqrpc.RegisterRfqHandlerFromEndpoint(
+		ctx, mux, endpoint, dialOpts,
+	)
+	if err != nil {
+		return err
+	}
+
+	err = tchrpc.RegisterTaprootAssetChannelsHandlerFromEndpoint(
+		ctx, mux, endpoint, dialOpts,
+	)
+	if err != nil {
+		return err
+	}
+
 	err = universerpc.RegisterUniverseHandlerFromEndpoint(
 		ctx, mux, endpoint, dialOpts,
 	)
@@ -209,3 +228,9 @@ func (t *taprootAssetsSubServer) WhiteListedURLs() map[string]struct{} {
 		t.cfg.RpcConf.AllowPublicStats || t.remote,
 	)
 }
+
+// Impl returns the actual implementation of the sub-server. This might not be
+// set if the sub-server is running in remote mode.
+func (t *taprootAssetsSubServer) Impl() any {
+	return t.Server
+}