all quote changes

Author: hieblmi

client.go

@@ -692,7 +692,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
@@ -709,6 +709,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

interface.go

@@ -288,6 +288,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

@@ -749,7 +749,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
@@ -785,6 +785,7 @@ func (s *swapClientServer) GetLoopInQuote(ctx context.Context,
 		RouteHints:     routeHints,
 		Private:        req.Private,
 		Initiator:      defaultLoopdInitiator,
+		NumDeposits:    req.NumDeposits,
 	})
 	if err != nil {
 		return nil, err
@@ -881,7 +882,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
@@ -1674,7 +1675,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 {
@@ -1688,6 +1691,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)

looprpc/client.proto

@@ -760,6 +760,8 @@ message QuoteRequest {
     probing and payment.
     */
     bool private = 7;
+
+    uint32 num_deposits = 8;
 }
 
 message InQuoteResponse {

looprpc/client.swagger.json

@@ -254,6 +254,13 @@
             "in": "query",
             "required": false,
             "type": "boolean"
+          },
+          {
+            "name": "num_deposits",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "format": "int64"
           }
         ],
         "tags": [
@@ -404,6 +411,13 @@
             "in": "query",
             "required": false,
             "type": "boolean"
+          },
+          {
+            "name": "num_deposits",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "format": "int64"
           }
         ],
         "tags": [

server_mock_test.go

@@ -225,7 +225,8 @@ func (s *serverMock) GetLoopInTerms(ctx context.Context, initiator string) (
 }
 
 func (s *serverMock) GetLoopInQuote(context.Context, btcutil.Amount,
-	route.Vertex, *route.Vertex, [][]zpay32.HopHint, string) (*LoopInQuote, error) {
+	route.Vertex, *route.Vertex, [][]zpay32.HopHint, string,
+	uint32) (*LoopInQuote, error) {
 
 	return &LoopInQuote{
 		SwapFee:   testSwapFee,

swap_server_client.go

@@ -82,7 +82,7 @@ type swapServerClient interface {
 	GetLoopInQuote(ctx context.Context, amt btcutil.Amount,
 		pubKey route.Vertex, lastHop *route.Vertex,
 		routeHints [][]zpay32.HopHint,
-		initiator string) (*LoopInQuote, error)
+		initiator string, numDeposits uint32) (*LoopInQuote, error)
 
 	Probe(ctx context.Context, amt btcutil.Amount, target route.Vertex,
 		lastHop *route.Vertex, routeHints [][]zpay32.HopHint) error
@@ -268,7 +268,8 @@ func (s *grpcSwapServerClient) GetLoopInTerms(ctx context.Context,
 
 func (s *grpcSwapServerClient) GetLoopInQuote(ctx context.Context,
 	amt btcutil.Amount, pubKey route.Vertex, lastHop *route.Vertex,
-	routeHints [][]zpay32.HopHint, initiator string) (*LoopInQuote, error) {
+	routeHints [][]zpay32.HopHint, initiator string,
+	numDeposits uint32) (*LoopInQuote, error) {
 
 	err := s.Probe(ctx, amt, pubKey, lastHop, routeHints)
 	if err != nil && status.Code(err) != codes.Unavailable {
@@ -283,6 +284,7 @@ func (s *grpcSwapServerClient) GetLoopInQuote(ctx context.Context,
 		ProtocolVersion: loopdb.CurrentRPCProtocolVersion(),
 		Pubkey:          pubKey[:],
 		UserAgent:       UserAgent(initiator),
+		NumDeposits:     numDeposits,
 	}
 
 	if lastHop != nil {

swapserverrpc/server.proto

@@ -284,6 +284,8 @@ message ServerLoopInQuoteRequest {
     //    loopd/v0.10.0-beta/commit=3b635821
     //    litd/v0.2.0-alpha/commit=326d754
     string user_agent = 6;
+
+    uint32 num_deposits = 7;
 }
 
 message ServerLoopInQuoteResponse {