all loopin quote changes

Author: hieblmi

client.go

@@ -684,7 +684,7 @@ func (s *Client) LoopInQuote(ctx context.Context,
 
 	quote, err := s.Server.GetLoopInQuote(
 		ctx, request.Amount, s.lndServices.NodePubkey, request.LastHop,
-		request.RouteHints, request.Initiator,
+		request.RouteHints, request.Initiator, request.NumDeposits,
 	)
 	if err != nil {
 		return nil, err
@@ -701,6 +701,15 @@ func (s *Client) LoopInQuote(ctx context.Context,
 		}, nil
 	}
 
+	// We don't calculate the on-chain fee if the loop in is funded by
+	// static address deposits.
+	if request.NumDeposits > 0 {
+		return &LoopInQuote{
+			SwapFee:  swapFee,
+			MinerFee: 0,
+		}, nil
+	}
+
 	// Get estimate for miner fee. If estimating the miner fee for the
 	// requested amount is not possible because lnd's wallet cannot
 	// construct a sample TX, we just return zero instead of failing the

cmd/loop/staticaddr.go

@@ -10,6 +10,8 @@ import (
 
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/lightninglabs/loop/looprpc"
+	"github.com/lightninglabs/loop/swapserverrpc"
+	"github.com/lightningnetwork/lnd/routing/route"
 	"github.com/urfave/cli"
 )
 
@@ -23,6 +25,7 @@ var staticAddressCommands = cli.Command{
 		listUnspentCommand,
 		withdrawalCommand,
 		summaryCommand,
+		staticQuoteCommand,
 	},
 }
 
@@ -297,3 +300,138 @@ func NewProtoOutPoint(op string) (*looprpc.OutPoint, error) {
 		OutputIndex: uint32(outputIndex),
 	}, nil
 }
+
+var staticQuoteCommand = cli.Command{
+	Name:      "quote",
+	ShortName: "q",
+	Usage:     "quote...",
+	Description: `
+	Allows to determine the cost of a swap up front.
+	`,
+	Flags: []cli.Flag{
+		cli.StringSliceFlag{
+			Name: "utxo",
+			Usage: "specify utxos as outpoints(tx:idx) which will" +
+				"be quoted for.",
+		},
+		cli.BoolFlag{
+			Name:  "all",
+			Usage: "quotes for all static address deposits.",
+		},
+		cli.StringFlag{
+			Name: lastHopFlag.Name,
+			Usage: "the pubkey of the last hop to use for the " +
+				"quote",
+		},
+		privateFlag,
+		routeHintsFlag,
+	},
+	Action: staticAddressQuote,
+}
+
+func staticAddressQuote(ctx *cli.Context) error {
+	if ctx.NArg() > 0 {
+		return cli.ShowCommandHelp(ctx, "new")
+	}
+
+	client, cleanup, err := getClient(ctx)
+	if err != nil {
+		return err
+	}
+	defer cleanup()
+
+	var (
+		ctxb           = context.Background()
+		isAllSelected  = ctx.IsSet("all")
+		isUtxoSelected = ctx.IsSet("utxo")
+		hints          []*swapserverrpc.RouteHint
+		lastHop        []byte
+	)
+
+	// Private and route hints are mutually exclusive as setting private
+	// means we retrieve our own route hints from the connected node.
+	hints, err = validateRouteHints(ctx)
+	if err != nil {
+		return err
+	}
+
+	if ctx.IsSet(lastHopFlag.Name) {
+		lastHopVertex, err := route.NewVertexFromStr(
+			ctx.String(lastHopFlag.Name),
+		)
+		if err != nil {
+			return err
+		}
+
+		lastHop = lastHopVertex[:]
+	}
+
+	summaryResp, err := client.GetStaticAddressSummary(
+		ctxb, &looprpc.StaticAddressSummaryRequest{},
+	)
+	if err != nil {
+		return err
+	}
+
+	var quoteAmount int64
+	var numDeposits uint32
+	switch {
+	case isAllSelected == isUtxoSelected:
+		return errors.New("must select either all or some utxos")
+
+	case isAllSelected:
+		numDeposits = summaryResp.TotalNumDeposits
+		quoteAmount = summaryResp.ValueDeposited
+
+	case isUtxoSelected:
+		utxos := ctx.StringSlice("utxo")
+		numDeposits = uint32(len(utxos))
+		quoteAmount, err = sumOutpointValues(
+			utxos, summaryResp.FilteredDeposits,
+		)
+		if err != nil {
+			return err
+		}
+
+	default:
+		return fmt.Errorf("unknown quote request")
+	}
+
+	resp, err := client.GetLoopInQuote(
+		ctxb, &looprpc.QuoteRequest{
+			Amt:              quoteAmount,
+			LoopInRouteHints: hints,
+			LoopInLastHop:    lastHop,
+			Private:          ctx.Bool(privateFlag.Name),
+			NumDeposits:      numDeposits,
+		},
+	)
+	if err != nil {
+		return err
+	}
+
+	printRespJSON(resp)
+
+	return nil
+}
+
+func sumOutpointValues(utxos []string, deposits []*looprpc.Deposit) (int64,
+	error) {
+
+	var sum int64
+	for _, utxo := range utxos {
+		found := false
+		for _, deposit := range deposits {
+			if deposit.Outpoint == utxo {
+				sum += deposit.Value
+				found = true
+			}
+		}
+		if !found {
+			return 0, fmt.Errorf("utxo %v not found in deposits",
+				utxo)
+		}
+	}
+
+	return sum, nil
+}

interface.go

@@ -282,6 +282,8 @@ type LoopInQuoteRequest struct {
 	// initiated the swap (loop CLI, autolooper, LiT UI and so on) and is
 	// appended to the user agent string.
 	Initiator string
+
+	NumDeposits uint32
 }
 
 // LoopInQuote contains estimates for the fees making up the total swap cost

loopd/swapclient_server.go

@@ -737,7 +737,7 @@ func (s *swapClientServer) GetLoopInQuote(ctx context.Context,
 	log.Infof("Loop in quote request received")
 
 	htlcConfTarget, err := validateLoopInRequest(
-		req.ConfTarget, req.ExternalHtlc,
+		req.ConfTarget, req.ExternalHtlc, req.NumDeposits,
 	)
 	if err != nil {
 		return nil, err
@@ -773,6 +773,7 @@ func (s *swapClientServer) GetLoopInQuote(ctx context.Context,
 		RouteHints:     routeHints,
 		Private:        req.Private,
 		Initiator:      defaultLoopdInitiator,
+		NumDeposits:    req.NumDeposits,
 	})
 	if err != nil {
 		return nil, err
@@ -869,7 +870,7 @@ func (s *swapClientServer) LoopIn(ctx context.Context,
 	log.Infof("Loop in request received")
 
 	htlcConfTarget, err := validateLoopInRequest(
-		in.HtlcConfTarget, in.ExternalHtlc,
+		in.HtlcConfTarget, in.ExternalHtlc, 0,
 	)
 	if err != nil {
 		return nil, err
@@ -1657,7 +1658,9 @@ func validateConfTarget(target, defaultTarget int32) (int32, error) {
 
 // validateLoopInRequest fails if the mutually exclusive conf target and
 // external parameters are both set.
-func validateLoopInRequest(htlcConfTarget int32, external bool) (int32, error) {
+func validateLoopInRequest(htlcConfTarget int32, external bool,
+	numDeposits uint32) (int32, error) {
+
 	// If the htlc is going to be externally set, the htlcConfTarget should
 	// not be set, because it has no relevance when the htlc is external.
 	if external && htlcConfTarget != 0 {
@@ -1671,6 +1674,12 @@ func validateLoopInRequest(htlcConfTarget int32, external bool) (int32, error) {
 		return 0, nil
 	}
 
+	// If the loop in uses static address deposits, we do not need to set a
+	// confirmation target since the HTLC won't be published by the client.
+	if numDeposits > 0 {
+		return 0, nil
+	}
+
 	return validateConfTarget(htlcConfTarget, loop.DefaultHtlcConfTarget)
 }
 

loopd/swapclient_server_test.go

@@ -193,7 +193,7 @@ func TestValidateLoopInRequest(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			external := test.external
 			conf, err := validateLoopInRequest(
-				test.confTarget, external,
+				test.confTarget, external, 0,
 			)
 
 			if test.expectErr {

loopin.go

@@ -128,7 +128,7 @@ func newLoopInSwap(globalCtx context.Context, cfg *swapConfig,
 	// hints.
 	quote, err := cfg.server.GetLoopInQuote(
 		globalCtx, request.Amount, cfg.lnd.NodePubkey, request.LastHop,
-		request.RouteHints, request.Initiator,
+		request.RouteHints, request.Initiator, 0,
 	)
 	if err != nil {
 		return nil, wrapGrpcError("loop in terms", err)