add all in one commit for the moment

Author: hieblmi

cmd/loop/staticaddr.go

@@ -2,8 +2,13 @@ package main
 
 import (
 	"context"
+	"encoding/hex"
+	"errors"
 	"fmt"
+	"strconv"
+	"strings"
 
+	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/lightninglabs/loop/looprpc"
 	"github.com/urfave/cli"
 )
@@ -16,6 +21,7 @@ var staticAddressCommands = cli.Command{
 	Subcommands: []cli.Command{
 		newStaticAddressCommand,
 		listUnspentCommand,
+		withdrawalCommand,
 	},
 }
 
@@ -104,3 +110,113 @@ func listUnspent(ctx *cli.Context) error {
 
 	return nil
 }
+
+var withdrawalCommand = cli.Command{
+	Name:      "withdraw",
+	ShortName: "w",
+	Usage:     "Withdraw from static address deposits.",
+	Description: `
+	Withdraws from all or selected static address deposits by sweeping them 
+	back to our lnd wallet.
+	`,
+	Flags: []cli.Flag{
+		cli.StringSliceFlag{
+			Name: "utxo",
+			Usage: "specify utxos as outpoints(tx:idx) which will" +
+				"be closed.",
+		},
+		cli.BoolFlag{
+			Name:  "all",
+			Usage: "withdraws all static address deposits.",
+		},
+	},
+	Action: withdraw,
+}
+
+func withdraw(ctx *cli.Context) error {
+	if ctx.NArg() > 0 {
+		return cli.ShowCommandHelp(ctx, "withdraw")
+	}
+
+	client, cleanup, err := getClient(ctx)
+	if err != nil {
+		return err
+	}
+	defer cleanup()
+
+	var (
+		req            = &looprpc.WithdrawDepositsRequest{}
+		isAllSelected  = ctx.IsSet("all")
+		isUtxoSelected = ctx.IsSet("utxo")
+		outpoints      []*looprpc.OutPoint
+		ctxb           = context.Background()
+	)
+
+	switch {
+	case isAllSelected == isUtxoSelected:
+		return errors.New("must select either all or some utxos")
+
+	case isAllSelected:
+	case isUtxoSelected:
+		utxos := ctx.StringSlice("utxo")
+		outpoints, err = utxosToOutpoints(utxos)
+		if err != nil {
+			return err
+		}
+
+		req.Outpoints = outpoints
+
+	default:
+		return fmt.Errorf("unknown withdrawal request")
+	}
+
+	resp, err := client.WithdrawDeposits(ctxb, &looprpc.WithdrawDepositsRequest{
+		Outpoints: outpoints,
+		All:       isAllSelected,
+	})
+	if err != nil {
+		return err
+	}
+
+	printRespJSON(resp)
+
+	return nil
+}
+
+func utxosToOutpoints(utxos []string) ([]*looprpc.OutPoint, error) {
+	var outpoints []*looprpc.OutPoint
+	if len(utxos) == 0 {
+		return nil, fmt.Errorf("no utxos specified")
+	}
+	for _, utxo := range utxos {
+		outpoint, err := NewProtoOutPoint(utxo)
+		if err != nil {
+			return nil, err
+		}
+		outpoints = append(outpoints, outpoint)
+	}
+
+	return outpoints, nil
+}
+
+// NewProtoOutPoint parses an OutPoint into its corresponding lnrpc.OutPoint
+// type.
+func NewProtoOutPoint(op string) (*looprpc.OutPoint, error) {
+	parts := strings.Split(op, ":")
+	if len(parts) != 2 {
+		return nil, errors.New("outpoint should be of the form " +
+			"txid:index")
+	}
+	txid := parts[0]
+	if hex.DecodedLen(len(txid)) != chainhash.HashSize {
+		return nil, fmt.Errorf("invalid hex-encoded txid %v", txid)
+	}
+	outputIndex, err := strconv.Atoi(parts[1])
+	if err != nil {
+		return nil, fmt.Errorf("invalid output index: %v", err)
+	}
+	return &looprpc.OutPoint{
+		TxidStr:     txid,
+		OutputIndex: uint32(outputIndex),
+	}, nil
+}

loopd/daemon.go

@@ -23,6 +23,7 @@ import (
 	loop_looprpc "github.com/lightninglabs/loop/looprpc"
 	"github.com/lightninglabs/loop/staticaddr/address"
 	"github.com/lightninglabs/loop/staticaddr/deposit"
+	"github.com/lightninglabs/loop/staticaddr/withdraw"
 	loop_swaprpc "github.com/lightninglabs/loop/swapserverrpc"
 	"github.com/lightninglabs/loop/sweepbatcher"
 	"github.com/lightningnetwork/lnd/clock"
@@ -437,6 +438,12 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 		swapClient.Conn,
 	)
 
+	// Create a static address client that cooperatively closes deposits
+	// with the server.
+	withdrawalClient := loop_swaprpc.NewWithdrawalServerClient(
+		swapClient.Conn,
+	)
+
 	// Both the client RPC server and the swap server client should stop
 	// on main context cancel. So we create it early and pass it down.
 	d.mainCtx, d.mainCtxCancel = context.WithCancel(context.Background())
@@ -500,6 +507,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 
 		staticAddressManager *address.Manager
 		depositManager       *deposit.Manager
+		withdrawalManager    *withdraw.Manager
 	)
 	// Create the reservation and instantout managers.
 	if d.cfg.EnableExperimental {
@@ -561,6 +569,18 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 			Signer:         d.lnd.Signer,
 		}
 		depositManager = deposit.NewManager(depoCfg)
+
+		// Static address deposit withdrawal manager setup.
+		closeCfg := &withdraw.ManagerConfig{
+			WithdrawalServerClient: withdrawalClient,
+			AddressManager:         staticAddressManager,
+			DepositManager:         depositManager,
+			WalletKit:              d.lnd.WalletKit,
+			ChainParams:            d.lnd.ChainParams,
+			ChainNotifier:          d.lnd.ChainNotifier,
+			Signer:                 d.lnd.Signer,
+		}
+		withdrawalManager = withdraw.NewManager(closeCfg)
 	}
 
 	// Now finally fully initialize the swap client RPC server instance.
@@ -578,6 +598,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 		instantOutManager:    instantOutManager,
 		staticAddressManager: staticAddressManager,
 		depositManager:       depositManager,
+		withdrawalManager:    withdrawalManager,
 	}
 
 	// Retrieve all currently existing swaps from the database.
@@ -709,6 +730,32 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 		depositManager.WaitInitComplete()
 	}
 
+	// Start the static address deposit withdrawal manager.
+	if withdrawalManager != nil {
+		d.wg.Add(1)
+		go func() {
+			defer d.wg.Done()
+
+			// Lnd's GetInfo call supplies us with the current block
+			// height.
+			info, err := d.lnd.Client.GetInfo(d.mainCtx)
+			if err != nil {
+				d.internalErrChan <- err
+				return
+			}
+
+			log.Info("Starting static address deposit withdrawal " +
+				"manager...")
+			err = withdrawalManager.Run(d.mainCtx, info.BlockHeight)
+			if err != nil && !errors.Is(context.Canceled, err) {
+				d.internalErrChan <- err
+			}
+			log.Info("Static address deposit withdrawal manager " +
+				"stopped")
+		}()
+		withdrawalManager.WaitInitComplete()
+	}
+
 	// Last, start our internal error handler. This will return exactly one
 	// error or nil on the main error channel to inform the caller that
 	// something went wrong or that shutdown is complete. We don't add to

loopd/perms/perms.go

@@ -83,6 +83,13 @@ var RequiredPermissions = map[string][]bakery.Op{
 		Entity: "loop",
 		Action: "in",
 	}},
+	"/looprpc.SwapClient/WithdrawDeposits": {{
+		Entity: "swap",
+		Action: "execute",
+	}, {
+		Entity: "loop",
+		Action: "in",
+	}},
 	"/looprpc.SwapClient/GetLsatTokens": {{
 		Entity: "auth",
 		Action: "read",

loopd/swapclient_server.go

@@ -15,6 +15,7 @@ import (
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg"
+	"github.com/btcsuite/btcd/wire"
 	"github.com/lightninglabs/aperture/lsat"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop"
@@ -26,6 +27,7 @@ import (
 	clientrpc "github.com/lightninglabs/loop/looprpc"
 	"github.com/lightninglabs/loop/staticaddr/address"
 	"github.com/lightninglabs/loop/staticaddr/deposit"
+	"github.com/lightninglabs/loop/staticaddr/withdraw"
 	"github.com/lightninglabs/loop/swap"
 	looprpc "github.com/lightninglabs/loop/swapserverrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
@@ -87,6 +89,7 @@ type swapClientServer struct {
 	instantOutManager    *instantout.Manager
 	staticAddressManager *address.Manager
 	depositManager       *deposit.Manager
+	withdrawalManager    *withdraw.Manager
 	swaps                map[lntypes.Hash]loop.SwapInfo
 	subscribers          map[int]chan<- interface{}
 	statusChan           chan loop.SwapInfo
@@ -1278,6 +1281,67 @@ func (s *swapClientServer) ListUnspent(ctx context.Context,
 	return &clientrpc.ListUnspentResponse{Utxos: respUtxos}, nil
 }
 
+// WithdrawDeposits tries to obtain a partial signature from the server to spend
+// the selected deposits to the client's wallet.
+func (s *swapClientServer) WithdrawDeposits(ctx context.Context,
+	req *clientrpc.WithdrawDepositsRequest) (
+	*clientrpc.WithdrawDepositsResponse, error) {
+
+	var (
+		isAllSelected  = req.All
+		isUtxoSelected = req.Outpoints != nil
+		outpoints      []wire.OutPoint
+		err            error
+	)
+
+	switch {
+	case isAllSelected == isUtxoSelected:
+		return nil, fmt.Errorf("must select either all or some utxos")
+
+	case isAllSelected:
+		deposits, err := s.depositManager.GetActiveDepositsInState(
+			deposit.Deposited,
+		)
+		if err != nil {
+			return nil, err
+		}
+
+		for _, d := range deposits {
+			outpoints = append(outpoints, d.OutPoint)
+		}
+
+	case isUtxoSelected:
+		outpoints, err = toServerOutpoints(req.Outpoints)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	err = s.withdrawalManager.WithdrawDeposits(ctx, outpoints)
+	if err != nil {
+		return nil, err
+	}
+
+	return &clientrpc.WithdrawDepositsResponse{}, err
+}
+
+func toServerOutpoints(outpoints []*clientrpc.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) (clientrpc.AutoReason, error) {
 	switch reason {
 	case liquidity.ReasonNone:

loopdb/sqlc/migrations/000008_static_address_deposits.up.sql

@@ -21,7 +21,11 @@ CREATE TABLE IF NOT EXISTS deposits (
 
     -- timeout_sweep_pk_script is the public key script that will be used to
     -- sweep the deposit after has expired.
-    timeout_sweep_pk_script BYTEA NOT NULL
+    timeout_sweep_pk_script BYTEA NOT NULL,
+
+    -- withdrawal_sweep_pk_script is the address that will be used to sweep the
+    -- deposit cooperatively with the server before it has expired.
+    withdrawal_sweep_address TEXT
 );
 
 -- deposit_updates contains all the updates to a deposit.

loopdb/sqlc/models.go

@@ -5,22 +5,25 @@ INSERT INTO deposits (
     out_index,
     amount,
     confirmation_height,
-    timeout_sweep_pk_script
+    timeout_sweep_pk_script,
+    withdrawal_sweep_address
 ) VALUES (
              $1,
              $2,
              $3,
              $4,
              $5,
-             $6
+             $6,
+             $7
          );
 
 -- name: UpdateDeposit :exec
 UPDATE deposits
 SET
     tx_hash = $2,
     out_index = $3,
-    confirmation_height = $4
+    confirmation_height = $4,
+    withdrawal_sweep_address = $5
 WHERE
     deposits.deposit_id = $1;