loopd: instantiate static address open channel manager

Author: hieblmi

loopd/daemon.go

@@ -24,6 +24,7 @@ import (
 	"github.com/lightninglabs/loop/staticaddr/address"
 	"github.com/lightninglabs/loop/staticaddr/deposit"
 	"github.com/lightninglabs/loop/staticaddr/loopin"
+	"github.com/lightninglabs/loop/staticaddr/openchannel"
 	"github.com/lightninglabs/loop/staticaddr/withdraw"
 	loop_swaprpc "github.com/lightninglabs/loop/swapserverrpc"
 	"github.com/lightninglabs/loop/sweepbatcher"
@@ -577,6 +578,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 		staticAddressManager *address.Manager
 		depositManager       *deposit.Manager
 		withdrawalManager    *withdraw.Manager
+		openChannelManager   *openchannel.Manager
 		staticLoopInManager  *loopin.Manager
 	)
 
@@ -635,6 +637,20 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 			err)
 	}
 
+	// Static address deposit open channel manager setup.
+	openChannelCfg := &openchannel.Config{
+		Server:            staticAddressClient,
+		AddressManager:    staticAddressManager,
+		DepositManager:    depositManager,
+		WithdrawalManager: withdrawalManager,
+		WalletKit:         d.lnd.WalletKit,
+		ChainParams:       d.lnd.ChainParams,
+		ChainNotifier:     d.lnd.ChainNotifier,
+		Signer:            d.lnd.Signer,
+		LightningClient:   d.lnd.Client,
+	}
+	openChannelManager = openchannel.NewManager(openChannelCfg)
+
 	// Static address loop-in manager setup.
 	staticAddressLoopInStore := loopin.NewSqlStore(
 		loopdb.NewTypedStore[loopin.Querier](baseDb),
@@ -745,6 +761,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 		depositManager:       depositManager,
 		withdrawalManager:    withdrawalManager,
 		staticLoopInManager:  staticLoopInManager,
+		openChannelManager:   openChannelManager,
 		assetClient:          d.assetClient,
 		stopDaemon:           d.Stop,
 	}
@@ -981,6 +998,20 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 			cancel()
 		}
 	}
+	// Start the static address open channel manager.
+	if openChannelManager != nil {
+		d.wg.Add(1)
+		go func() {
+			defer d.wg.Done()
+
+			infof("Starting static address open channel manager")
+			err := openChannelManager.Run(d.mainCtx)
+			if err != nil && !errors.Is(context.Canceled, err) {
+				d.internalErrChan <- err
+			}
+			infof("Static address open channel manager stopped")
+		}()
+	}
 
 	// Start the static address loop-in manager.
 	if staticLoopInManager != nil {

loopd/swapclient_server.go

@@ -32,11 +32,12 @@ import (
 	"github.com/lightninglabs/loop/staticaddr/address"
 	"github.com/lightninglabs/loop/staticaddr/deposit"
 	"github.com/lightninglabs/loop/staticaddr/loopin"
+	"github.com/lightninglabs/loop/staticaddr/openchannel"
+	"github.com/lightninglabs/loop/staticaddr/staticutil"
 	"github.com/lightninglabs/loop/staticaddr/withdraw"
 	"github.com/lightninglabs/loop/swap"
 	"github.com/lightninglabs/loop/swapserverrpc"
 	"github.com/lightninglabs/taproot-assets/rfqmath"
-	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/lightningnetwork/lnd/queue"
@@ -98,6 +99,7 @@ type swapClientServer struct {
 	depositManager       *deposit.Manager
 	withdrawalManager    *withdraw.Manager
 	staticLoopInManager  *loopin.Manager
+	openChannelManager   *openchannel.Manager
 	assetClient          *assets.TapdClient
 	swaps                map[lntypes.Hash]loop.SwapInfo
 	subscribers          map[int]chan<- interface{}
@@ -1753,7 +1755,7 @@ func (s *swapClientServer) WithdrawDeposits(ctx context.Context,
 		}
 
 	case isUtxoSelected:
-		outpoints, err = toServerOutpoints(req.Outpoints)
+		outpoints, err = staticutil.ToWireOutpoints(req.Outpoints)
 		if err != nil {
 			return nil, err
 		}
@@ -1998,13 +2000,14 @@ func (s *swapClientServer) GetStaticAddressSummary(ctx context.Context,
 	}
 
 	var (
-		totalNumDeposits = len(allDeposits)
-		valueUnconfirmed int64
-		valueDeposited   int64
-		valueExpired     int64
-		valueWithdrawn   int64
-		valueLoopedIn    int64
-		htlcTimeoutSwept int64
+		totalNumDeposits    = len(allDeposits)
+		valueUnconfirmed    int64
+		valueDeposited      int64
+		valueExpired        int64
+		valueWithdrawn      int64
+		valueLoopedIn       int64
+		valueChannelsOpened int64
+		htlcTimeoutSwept    int64
 	)
 
 	// Value unconfirmed.
@@ -2036,6 +2039,9 @@ func (s *swapClientServer) GetStaticAddressSummary(ctx context.Context,
 
 		case deposit.HtlcTimeoutSwept:
 			htlcTimeoutSwept += value
+
+		case deposit.ChannelPublished:
+			valueChannelsOpened += value
 		}
 	}
 
@@ -2060,6 +2066,7 @@ func (s *swapClientServer) GetStaticAddressSummary(ctx context.Context,
 		ValueExpiredSatoshis:           valueExpired,
 		ValueWithdrawnSatoshis:         valueWithdrawn,
 		ValueLoopedInSatoshis:          valueLoopedIn,
+		ValueChannelsOpened:            valueChannelsOpened,
 		ValueHtlcTimeoutSweepsSatoshis: htlcTimeoutSwept,
 	}, nil
 }
@@ -2169,6 +2176,35 @@ func (s *swapClientServer) populateBlocksUntilExpiry(ctx context.Context,
 	return nil
 }
 
+// StaticOpenChannel initiates an open channel request using static address
+// deposits.
+func (s *swapClientServer) StaticOpenChannel(ctx context.Context,
+	req *looprpc.StaticOpenChannelRequest) (*looprpc.StaticOpenChannelResponse,
+	error) {
+
+	infof("Static open channel request received")
+
+	if req == nil || req.OpenChannelRequest == nil {
+		return &looprpc.StaticOpenChannelResponse{},
+			fmt.Errorf("missing open channel request")
+	}
+
+	chanOpenTxHash, err := s.openChannelManager.DeliverOpenChannelRequest(
+		ctx, req.OpenChannelRequest,
+	)
+
+	var (
+		txHash string
+	)
+	if chanOpenTxHash != nil {
+		txHash = chanOpenTxHash.String()
+	}
+
+	return &looprpc.StaticOpenChannelResponse{
+		ChannelOpenTxHash: txHash,
+	}, err
+}
+
 type filterFunc func(deposits *deposit.Deposit) bool
 
 func filter(deposits []*deposit.Deposit, f filterFunc) []*looprpc.Deposit {
@@ -2222,6 +2258,12 @@ func toClientDepositState(state fsm.StateType) looprpc.DepositState {
 	case deposit.LoopedIn:
 		return looprpc.DepositState_LOOPED_IN
 
+	case deposit.OpeningChannel:
+		return looprpc.DepositState_OPENING_CHANNEL
+
+	case deposit.ChannelPublished:
+		return looprpc.DepositState_CHANNEL_PUBLISHED
+
 	case deposit.SweepHtlcTimeout:
 		return looprpc.DepositState_SWEEP_HTLC_TIMEOUT
 
@@ -2301,6 +2343,12 @@ func toServerState(state looprpc.DepositState) fsm.StateType {
 	case looprpc.DepositState_LOOPED_IN:
 		return deposit.LoopedIn
 
+	case looprpc.DepositState_OPENING_CHANNEL:
+		return deposit.OpeningChannel
+
+	case looprpc.DepositState_CHANNEL_PUBLISHED:
+		return deposit.ChannelPublished
+
 	case looprpc.DepositState_SWEEP_HTLC_TIMEOUT:
 		return deposit.SweepHtlcTimeout
 
@@ -2318,23 +2366,6 @@ func toServerState(state looprpc.DepositState) fsm.StateType {
 	}
 }
 
-func toServerOutpoints(outpoints []*lnrpc.OutPoint) ([]wire.OutPoint,
-	error) {
-
-	var serverOutpoints []wire.OutPoint
-	for _, o := range outpoints {
-		outpointStr := fmt.Sprintf("%s:%d", o.TxidStr, o.OutputIndex)
-		newOutpoint, err := wire.NewOutPointFromString(outpointStr)
-		if err != nil {
-			return nil, err
-		}
-
-		serverOutpoints = append(serverOutpoints, *newOutpoint)
-	}
-
-	return serverOutpoints, nil
-}
-
 func rpcAutoloopReason(reason liquidity.Reason) (looprpc.AutoReason, error) {
 	switch reason {
 	case liquidity.ReasonNone: