looprpc+cmd: deprecate dynamic terms

We move destination and cltv to QuoteResponse, and deprecate the
non-static fields.

Terms will now only show max/min swap sizes.

Author: halseth

cmd/loop/terms.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/btcsuite/btcutil"
 	"github.com/lightninglabs/loop/looprpc"
-	"github.com/lightninglabs/loop/swap"
 )
 
 var termsCommand = cli.Command{
@@ -29,13 +28,6 @@ func terms(ctx *cli.Context) error {
 			btcutil.Amount(terms.MinSwapAmount),
 			btcutil.Amount(terms.MaxSwapAmount),
 		)
-		fmt.Printf("Fee:    %d + %.4f %% (%d prepaid)\n",
-			btcutil.Amount(terms.SwapFeeBase),
-			swap.FeeRateAsPercentage(terms.SwapFeeRate),
-			btcutil.Amount(terms.PrepayAmt),
-		)
-
-		fmt.Printf("Cltv delta:   %v blocks\n", terms.CltvDelta)
 	}
 
 	fmt.Println("Loop Out")

cmd/loopd/swapclient_server.go

@@ -244,10 +244,6 @@ func (s *swapClientServer) LoopOutTerms(ctx context.Context,
 	return &looprpc.TermsResponse{
 		MinSwapAmount: int64(terms.MinSwapAmount),
 		MaxSwapAmount: int64(terms.MaxSwapAmount),
-		PrepayAmt:     int64(terms.PrepayAmt),
-		SwapFeeBase:   int64(terms.SwapFeeBase),
-		SwapFeeRate:   int64(terms.SwapFeeRate),
-		CltvDelta:     int32(terms.CltvDelta),
 	}, nil
 }
 
@@ -269,6 +265,7 @@ func (s *swapClientServer) LoopOutQuote(ctx context.Context,
 	if err != nil {
 		return nil, err
 	}
+
 	return &looprpc.QuoteResponse{
 		MinerFee:  int64(quote.MinerFee),
 		PrepayAmt: int64(quote.PrepayAmount),
@@ -291,9 +288,6 @@ func (s *swapClientServer) GetLoopInTerms(ctx context.Context, req *looprpc.Term
 	return &looprpc.TermsResponse{
 		MinSwapAmount: int64(terms.MinSwapAmount),
 		MaxSwapAmount: int64(terms.MaxSwapAmount),
-		SwapFeeBase:   int64(terms.SwapFeeBase),
-		SwapFeeRate:   int64(terms.SwapFeeRate),
-		CltvDelta:     int32(terms.CltvDelta),
 	}, nil
 }
 

looprpc/client.pb.go

@@ -305,26 +305,8 @@ message TermsRequest {
 }
 
 message TermsResponse {
-    /**
-    The node pubkey where the swap payment needs to be paid
-    to. This can be used to test connectivity before initiating the swap.
-    */
-    string swap_payment_dest = 1;
 
-    /**
-    The base fee for a swap (sat)
-    */
-    int64 swap_fee_base = 2;
-
-    /**
-    The fee rate for a swap (parts per million)
-    */
-    int64 swap_fee_rate = 3;
-
-    /**
-    Required prepay amount
-    */
-    int64 prepay_amt = 4;
+    reserved 1,2,3,4,7;
 
     /**
     Minimum swap amount (sat)
@@ -335,11 +317,6 @@ message TermsResponse {
     Maximum swap amount (sat)
     */
     int64 max_swap_amount = 6;
-
-    /**
-    On-chain cltv expiry delta
-    */
-    int32 cltv_delta = 7;
 }
 
 message QuoteRequest {
@@ -378,4 +355,15 @@ message QuoteResponse {
     An estimate of the on-chain fee that needs to be paid to sweep the HTLC.
     */
     int64 miner_fee = 3;
+
+    /**
+    The node pubkey where the swap payment needs to be paid
+    to. This can be used to test connectivity before initiating the swap.
+    */
+    bytes swap_payment_dest = 4;
+
+    /**
+    On-chain cltv expiry delta
+    */
+    int32 cltv_delta = 5;
 }