loopout: show expiry range in terms

Author: joostjager

cmd/loop/terms.go

@@ -39,6 +39,9 @@ func terms(ctx *cli.Context) error {
 			loopOutTerms.MinSwapAmount,
 			loopOutTerms.MaxSwapAmount,
 		)
+		fmt.Printf("Cltv delta: %d - %d\n",
+			loopOutTerms.MinCltvDelta, loopOutTerms.MaxCltvDelta,
+		)
 	}
 
 	fmt.Println()

interface.go

@@ -124,6 +124,12 @@ type LoopOutTerms struct {
 	// MaxSwapAmount is the maximum amount that the server accepts for a
 	// swap.
 	MaxSwapAmount btcutil.Amount
+
+	// MinCltvDelta is the minimum expiry delta for loop out swaps.
+	MinCltvDelta int32
+
+	// MaxCltvDelta is the maximum expiry delta for loop out swaps.
+	MaxCltvDelta int32
 }
 
 // LoopOutQuote contains estimates for the fees making up the total swap cost

loopd/swapclient_server.go

@@ -341,6 +341,8 @@ func (s *swapClientServer) LoopOutTerms(ctx context.Context,
 	return &looprpc.OutTermsResponse{
 		MinSwapAmount: int64(terms.MinSwapAmount),
 		MaxSwapAmount: int64(terms.MaxSwapAmount),
+		MinCltvDelta:  terms.MinCltvDelta,
+		MaxCltvDelta:  terms.MaxCltvDelta,
 	}, nil
 }
 

looprpc/client.pb.go

@@ -447,6 +447,12 @@ message OutTermsResponse {
     Maximum swap amount (sat)
     */
     int64 max_swap_amount = 6;
+
+    // The minimally accepted cltv delta of the on-chain htlc.
+    int32 min_cltv_delta = 8;
+
+    // The maximally accepted cltv delta of the on-chain htlc.
+    int32 max_cltv_delta = 9;
 }
 
 message QuoteRequest {

looprpc/client.proto

@@ -548,6 +548,16 @@
           "type": "string",
           "format": "int64",
           "title": "*\nMaximum swap amount (sat)"
+        },
+        "min_cltv_delta": {
+          "type": "integer",
+          "format": "int32",
+          "description": "The minimally accepted cltv delta of the on-chain htlc."
+        },
+        "max_cltv_delta": {
+          "type": "integer",
+          "format": "int32",
+          "description": "The maximally accepted cltv delta of the on-chain htlc."
         }
       }
     },

looprpc/client.swagger.json

@@ -140,6 +140,8 @@ func (s *grpcSwapServerClient) GetLoopOutTerms(ctx context.Context) (
 	return &LoopOutTerms{
 		MinSwapAmount: btcutil.Amount(terms.MinSwapAmount),
 		MaxSwapAmount: btcutil.Amount(terms.MaxSwapAmount),
+		MinCltvDelta:  terms.MinCltvDelta,
+		MaxCltvDelta:  terms.MaxCltvDelta,
 	}, nil
 }