fixup! go.mod: bump tapd and loop

Author: guggero

itest/litd_node.go

@@ -215,6 +215,7 @@ func (cfg *LitNodeConfig) defaultLitdArgs() *litArgs {
 			"uipassword":             cfg.UIPassword,
 			"enablerest":             "",
 			"restcors":               "*",
+			"lnd.debuglevel":         "trace,GRPC=error,PEER=info",
 		}
 	)
 	for _, arg := range cfg.LitArgs {
@@ -263,6 +264,8 @@ func (cfg *LitNodeConfig) defaultLitdArgs() *litArgs {
 			args[option] = ""
 		case 2:
 			args[option] = parts[1]
+		default:
+			args[option] = strings.Join(parts[1:], "=")
 		}
 	}
 

subservers/taproot-assets.go

@@ -4,17 +4,20 @@ import (
 	"context"
 	"strings"
 
+	"github.com/btcsuite/btcd/chaincfg"
 	restProxy "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/lightninglabs/lndclient"
 	tap "github.com/lightninglabs/taproot-assets"
+	"github.com/lightninglabs/taproot-assets/address"
 	"github.com/lightninglabs/taproot-assets/perms"
 	"github.com/lightninglabs/taproot-assets/tapcfg"
 	"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"
-	"github.com/lightningnetwork/lnd/signal"
 	"google.golang.org/grpc"
 	"gopkg.in/macaroon-bakery.v2/bakery"
 )
@@ -24,12 +27,12 @@ type taprootAssetsSubServer struct {
 	*tap.Server
 
 	remote    bool
+	lndRemote bool
+
 	cfg       *tapcfg.Config
 	remoteCfg *RemoteDaemonConfig
 
 	errChan chan error
-
-	interceptor signal.Interceptor
 }
 
 // A compile-time check to ensure that taprootAssetsSubServer implements
@@ -38,20 +41,28 @@ var _ SubServer = (*taprootAssetsSubServer)(nil)
 
 // NewTaprootAssetsSubServer returns a new tap implementation of the SubServer
 // interface.
-func NewTaprootAssetsSubServer(cfg *tapcfg.Config,
-	remoteCfg *RemoteDaemonConfig, remote bool,
-	interceptor signal.Interceptor) SubServer {
+func NewTaprootAssetsSubServer(network string, cfg *tapcfg.Config,
+	remoteCfg *RemoteDaemonConfig, remote, lndRemote bool) SubServer {
 
 	// Overwrite the tap daemon's user agent name, so it sends "litd"
 	// instead of "tapd".
 	tap.SetAgentName("litd")
 
+	// A quirk of the address package is that it requires the exact testnet
+	// name, not the generic one...
+	if network == "testnet" {
+		network = chaincfg.TestNet3Params.Name
+	}
+
+	chainCfg := address.ParamsForChain(network)
+
 	return &taprootAssetsSubServer{
-		cfg:         cfg,
-		remoteCfg:   remoteCfg,
-		remote:      remote,
-		interceptor: interceptor,
-		errChan:     make(chan error, 1),
+		Server:    tap.NewServer(&chainCfg, nil),
+		cfg:       cfg,
+		remoteCfg: remoteCfg,
+		remote:    remote,
+		lndRemote: lndRemote,
+		errChan:   make(chan error, 1),
 	}
 }
 
@@ -92,15 +103,18 @@ func (t *taprootAssetsSubServer) Start(_ lnrpc.LightningClient,
 		return err
 	}
 
-	server, err := tapcfg.CreateServerFromConfig(
-		t.cfg, log, t.interceptor, false, t.errChan,
+	// The taproot asset channel feature is still experimental, so we
+	// disable it for now.
+	const enableChannelFeatures = false
+
+	err = tapcfg.ConfigureSubServer(
+		t.Server, t.cfg, log, &lndGrpc.LndServices,
+		enableChannelFeatures, t.errChan,
 	)
 	if err != nil {
 		return err
 	}
 
-	t.Server = server
-
 	return t.StartAsSubserver(lndGrpc)
 }
 
@@ -114,6 +128,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)
 }
 
@@ -146,6 +162,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,
 	)

terminal.go

@@ -236,7 +236,8 @@ func (g *LightningTerminal) Run() error {
 	// Construct a new Manager.
 	g.permsMgr, err = perms.NewManager(false)
 	if err != nil {
-		return fmt.Errorf("could not create permissions manager")
+		return fmt.Errorf("could not create permissions manager: %w",
+			err)
 	}
 
 	// The litcli status command will call the "/lnrpc.State/GetState" RPC.
@@ -1664,8 +1665,9 @@ func (g *LightningTerminal) initSubServers() {
 
 	g.subServerMgr.AddServer(
 		subservers.NewTaprootAssetsSubServer(
-			g.cfg.TaprootAssets, g.cfg.Remote.TaprootAssets,
-			g.cfg.tapRemote, interceptor,
+			g.cfg.Network, g.cfg.TaprootAssets,
+			g.cfg.Remote.TaprootAssets,
+			g.cfg.tapRemote, g.cfg.lndRemote,
 		), g.cfg.TaprootAssetsMode != ModeDisable,
 	)
 }