staticutil: channel open functions

Author: hieblmi

staticaddr/loopin/loopin.go

@@ -20,6 +20,7 @@ import (
 	"github.com/lightninglabs/loop/staticaddr/address"
 	"github.com/lightninglabs/loop/staticaddr/deposit"
 	"github.com/lightninglabs/loop/staticaddr/script"
+	"github.com/lightninglabs/loop/staticaddr/staticutil"
 	"github.com/lightninglabs/loop/staticaddr/version"
 	"github.com/lightninglabs/loop/swap"
 	"github.com/lightningnetwork/lnd/input"
@@ -205,7 +206,9 @@ func (l *StaticAddressLoopIn) signMusig2Tx(ctx context.Context,
 	musig2sessions []*input.MuSig2SessionInfo,
 	counterPartyNonces [][musig2.PubNonceSize]byte) ([][]byte, error) {
 
-	prevOuts, err := l.toPrevOuts(l.Deposits, l.AddressParams.PkScript)
+	prevOuts, err := staticutil.ToPrevOuts(
+		l.Deposits, l.AddressParams.PkScript,
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -474,29 +477,6 @@ func (l *StaticAddressLoopIn) Outpoints() []wire.OutPoint {
 	return outpoints
 }
 
-func (l *StaticAddressLoopIn) toPrevOuts(deposits []*deposit.Deposit,
-	pkScript []byte) (map[wire.OutPoint]*wire.TxOut, error) {
-
-	prevOuts := make(map[wire.OutPoint]*wire.TxOut, len(deposits))
-	for _, d := range deposits {
-		outpoint := wire.OutPoint{
-			Hash:  d.Hash,
-			Index: d.Index,
-		}
-		txOut := &wire.TxOut{
-			Value:    int64(d.Value),
-			PkScript: pkScript,
-		}
-		if _, ok := prevOuts[outpoint]; ok {
-			return nil, fmt.Errorf("duplicate outpoint %v",
-				outpoint)
-		}
-		prevOuts[outpoint] = txOut
-	}
-
-	return prevOuts, nil
-}
-
 // GetState returns the current state of the loop-in swap.
 func (l *StaticAddressLoopIn) GetState() fsm.StateType {
 	l.mu.Lock()

staticaddr/staticutil/utils.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"sort"
 
+	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightninglabs/lndclient"
@@ -14,6 +15,7 @@ import (
 	"github.com/lightninglabs/loop/staticaddr/script"
 	"github.com/lightninglabs/loop/swapserverrpc"
 	"github.com/lightningnetwork/lnd/input"
+	"github.com/lightningnetwork/lnd/lnwallet"
 )
 
 func ToPrevOuts(deposits []*deposit.Deposit,
@@ -65,6 +67,36 @@ func CreateMusig2Sessions(ctx context.Context,
 	return musig2Sessions, clientNonces, nil
 }
 
+// CreateMusig2SessionsPerDeposit creates a musig2 session for a number of
+// deposits.
+func CreateMusig2SessionsPerDeposit(ctx context.Context,
+	signer lndclient.SignerClient, deposits []*deposit.Deposit,
+	addrParams *address.Parameters,
+	staticAddress *script.StaticAddress) (
+	map[string]*input.MuSig2SessionInfo, map[string][]byte, map[string]int,
+	error) {
+
+	sessions := make(map[string]*input.MuSig2SessionInfo)
+	nonces := make(map[string][]byte)
+	depositToIdx := make(map[string]int)
+
+	// Create the musig2 sessions for the sweepless sweep tx.
+	for i, deposit := range deposits {
+		session, err := createMusig2Session(
+			ctx, signer, addrParams, staticAddress,
+		)
+		if err != nil {
+			return nil, nil, nil, err
+		}
+
+		sessions[deposit.String()] = session
+		nonces[deposit.String()] = session.PublicNonce[:]
+		depositToIdx[deposit.String()] = i
+	}
+
+	return sessions, nonces, depositToIdx, nil
+}
+
 // createMusig2Session creates a musig2 session for the deposit.
 func createMusig2Session(ctx context.Context,
 	signer lndclient.SignerClient, addrParams *address.Parameters,
@@ -131,3 +163,42 @@ func bip69inputLess(input1, input2 *swapserverrpc.PrevoutInfo) bool {
 	}
 	return bytes.Compare(ihash[:], jhash[:]) == -1
 }
+
+// SelectDeposits sorts the deposits by amount in descending order. It then
+// selects the deposits that are needed to cover the amount requested without
+// leaving a dust change. It returns an error if the sum of deposits minus dust
+// is less than the requested amount.
+func SelectDeposits(deposits []*deposit.Deposit, amount int64) (
+	[]*deposit.Deposit, error) {
+
+	// Check that sum of deposits covers the swap amount while leaving no
+	// dust change.
+	dustLimit := lnwallet.DustLimitForSize(input.P2TRSize)
+	var depositSum btcutil.Amount
+	for _, deposit := range deposits {
+		depositSum += deposit.Value
+	}
+	if depositSum-dustLimit < btcutil.Amount(amount) {
+		return nil, fmt.Errorf("insufficient funds to cover swap " +
+			"amount, try manually selecting deposits")
+	}
+
+	// Sort the deposits by amount in descending order.
+	sort.Slice(deposits, func(i, j int) bool {
+		return deposits[i].Value > deposits[j].Value
+	})
+
+	// Select the deposits that are needed to cover the swap amount without
+	// leaving a dust change.
+	var selectedDeposits []*deposit.Deposit
+	var selectedAmount btcutil.Amount
+	for _, deposit := range deposits {
+		if selectedAmount >= btcutil.Amount(amount)+dustLimit {
+			break
+		}
+		selectedDeposits = append(selectedDeposits, deposit)
+		selectedAmount += deposit.Value
+	}
+
+	return selectedDeposits, nil
+}

staticaddr/withdraw/manager.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/lightninglabs/loop/staticaddr/staticutil"
 	"reflect"
 	"strings"
 	"sync"
@@ -20,6 +19,7 @@ import (
 	"github.com/btcsuite/btcwallet/chain"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop/staticaddr/deposit"
+	"github.com/lightninglabs/loop/staticaddr/staticutil"
 	staticaddressrpc "github.com/lightninglabs/loop/swapserverrpc"
 	"github.com/lightningnetwork/lnd/chainntnfs"
 	"github.com/lightningnetwork/lnd/input"