looprpc: update to new server protos

We update to new set of server protos where new Terms calls are added.
Here static information will be returned from the server.

We no longer have a feebase+feerate, but get a final fee directly
returned by the server.

Author: halseth

client.go

@@ -353,11 +353,14 @@ func (s *Client) LoopOutQuote(ctx context.Context,
 		return nil, ErrSwapAmountTooHigh
 	}
 
-	logger.Infof("Offchain swap destination: %x", terms.SwapPaymentDest)
+	quote, err := s.Server.GetLoopOutQuote(ctx, request.Amount)
+	if err != nil {
+		return nil, err
+	}
 
-	swapFee := swap.CalcFee(
-		request.Amount, terms.SwapFeeBase, terms.SwapFeeRate,
-	)
+	logger.Infof("Offchain swap destination: %x", quote.SwapPaymentDest)
+
+	swapFee := quote.SwapFee
 
 	// Generate dummy p2wsh address for fee estimation. The p2wsh address
 	// type is chosen because it adds the most weight of all output types
@@ -379,9 +382,11 @@ func (s *Client) LoopOutQuote(ctx context.Context,
 	}
 
 	return &LoopOutQuote{
-		SwapFee:      swapFee,
-		MinerFee:     minerFee,
-		PrepayAmount: btcutil.Amount(terms.PrepayAmt),
+		SwapFee:         swapFee,
+		MinerFee:        minerFee,
+		PrepayAmount:    btcutil.Amount(quote.PrepayAmount),
+		SwapPaymentDest: quote.SwapPaymentDest,
+		CltvDelta:       quote.CltvDelta,
 	}, nil
 }
 
@@ -465,10 +470,12 @@ func (s *Client) LoopInQuote(ctx context.Context,
 		return nil, ErrSwapAmountTooHigh
 	}
 
-	// Calculate swap fee.
-	swapFee := terms.SwapFeeBase +
-		request.Amount*btcutil.Amount(terms.SwapFeeRate)/
-			btcutil.Amount(swap.FeeRateTotalParts)
+	quote, err := s.Server.GetLoopInQuote(ctx, request.Amount)
+	if err != nil {
+		return nil, err
+	}
+
+	swapFee := quote.SwapFee
 
 	// We don't calculate the on-chain fee if the HTLC is going to be
 	// published externally.
@@ -478,7 +485,7 @@ func (s *Client) LoopInQuote(ctx context.Context,
 			MinerFee: 0,
 		}, nil
 	}
-	
+
 	// Get estimate for miner fee.
 	minerFee, err := s.lndServices.Client.EstimateFeeToP2WSH(
 		ctx, request.Amount, request.HtlcConfTarget,
@@ -488,8 +495,9 @@ func (s *Client) LoopInQuote(ctx context.Context,
 	}
 
 	return &LoopInQuote{
-		SwapFee:  swapFee,
-		MinerFee: minerFee,
+		SwapFee:   swapFee,
+		MinerFee:  minerFee,
+		CltvDelta: quote.CltvDelta,
 	}, nil
 }
 

cmd/loopd/swapclient_server.go

@@ -267,9 +267,11 @@ func (s *swapClientServer) LoopOutQuote(ctx context.Context,
 	}
 
 	return &looprpc.QuoteResponse{
-		MinerFee:  int64(quote.MinerFee),
-		PrepayAmt: int64(quote.PrepayAmount),
-		SwapFee:   int64(quote.SwapFee),
+		MinerFee:        int64(quote.MinerFee),
+		PrepayAmt:       int64(quote.PrepayAmount),
+		SwapFee:         int64(quote.SwapFee),
+		SwapPaymentDest: quote.SwapPaymentDest[:],
+		CltvDelta:       quote.CltvDelta,
 	}, nil
 }
 

interface.go

@@ -105,6 +105,17 @@ type LoopOutQuoteRequest struct {
 	// final cltv delta values for the off-chain payments.
 }
 
+// LoopOutTerms are the server terms on which it executes swaps.
+type LoopOutTerms struct {
+	// MinSwapAmount is the minimum amount that the server requires for a
+	// swap.
+	MinSwapAmount btcutil.Amount
+
+	// MaxSwapAmount is the maximum amount that the server accepts for a
+	// swap.
+	MaxSwapAmount btcutil.Amount
+}
+
 // LoopOutQuote contains estimates for the fees making up the total swap cost
 // for the client.
 type LoopOutQuote struct {
@@ -118,27 +129,6 @@ type LoopOutQuote struct {
 	// MinerFee is an estimate of the on-chain fee that needs to be paid to
 	// sweep the htlc.
 	MinerFee btcutil.Amount
-}
-
-// LoopOutTerms are the server terms on which it executes swaps.
-type LoopOutTerms struct {
-	// SwapFeeBase is the fixed per-swap base fee.
-	SwapFeeBase btcutil.Amount
-
-	// SwapFeeRate is the variable fee in parts per million.
-	SwapFeeRate int64
-
-	// PrepayAmt is the fixed part of the swap fee that needs to be
-	// prepaid.
-	PrepayAmt btcutil.Amount
-
-	// MinSwapAmount is the minimum amount that the server requires for a
-	// swap.
-	MinSwapAmount btcutil.Amount
-
-	// MaxSwapAmount is the maximum amount that the server accepts for a
-	// swap.
-	MaxSwapAmount btcutil.Amount
 
 	// Time lock delta relative to current block height that swap server
 	// will accept on the swap initiation call.
@@ -185,23 +175,13 @@ type LoopInRequest struct {
 
 // LoopInTerms are the server terms on which it executes charge swaps.
 type LoopInTerms struct {
-	// SwapFeeBase is the fixed per-swap base fee.
-	SwapFeeBase btcutil.Amount
-
-	// SwapFeeRate is the variable fee in parts per million.
-	SwapFeeRate int64
-
 	// MinSwapAmount is the minimum amount that the server requires for a
 	// swap.
 	MinSwapAmount btcutil.Amount
 
 	// MaxSwapAmount is the maximum amount that the server accepts for a
 	// swap.
 	MaxSwapAmount btcutil.Amount
-
-	// Time lock delta relative to current block height that swap server
-	// will accept on the swap initiation call.
-	CltvDelta int32
 }
 
 // In contains status information for a loop in swap.
@@ -239,6 +219,10 @@ type LoopInQuote struct {
 	// MinerFee is an estimate of the on-chain fee that needs to be paid to
 	// sweep the htlc.
 	MinerFee btcutil.Amount
+
+	// Time lock delta relative to current block height that swap server
+	// will accept on the swap initiation call.
+	CltvDelta int32
 }
 
 // SwapInfoKit contains common swap info fields.

loopin.go

@@ -60,14 +60,12 @@ func newLoopInSwap(globalCtx context.Context, cfg *swapConfig,
 	// Request current server loop in terms and use these to calculate the
 	// swap fee that we should subtract from the swap amount in the payment
 	// request that we send to the server.
-	quote, err := cfg.server.GetLoopInTerms(globalCtx)
+	quote, err := cfg.server.GetLoopInQuote(globalCtx, request.Amount)
 	if err != nil {
 		return nil, fmt.Errorf("loop in terms: %v", err)
 	}
 
-	swapFee := swap.CalcFee(
-		request.Amount, quote.SwapFeeBase, quote.SwapFeeRate,
-	)
+	swapFee := quote.SwapFee
 
 	if swapFee > request.MaxSwapFee {
 		logger.Warnf("Swap fee %v exceeding maximum of %v",