Merge pull request #918 from sputn1ck/reservations_quote

Use reservation ids in instant out quote

Author: sputn1ck

cmd/loop/instantout.go

@@ -157,8 +157,8 @@ func instantOut(ctx *cli.Context) error {
 	// fee-rates.
 	quote, err := client.InstantOutQuote(
 		context.Background(), &looprpc.InstantOutQuoteRequest{
-			Amt:             selectedAmt,
-			NumReservations: int32(len(selectedReservations)),
+			Amt:            selectedAmt,
+			ReservationIds: selectedReservations,
 		},
 	)
 	if err != nil {

instantout/manager.go

@@ -218,9 +218,9 @@ type Quote struct {
 
 // GetInstantOutQuote returns a quote for an instant out.
 func (m *Manager) GetInstantOutQuote(ctx context.Context,
-	amt btcutil.Amount, numReservations int) (Quote, error) {
+	amt btcutil.Amount, reservationIDs [][]byte) (Quote, error) {
 
-	if numReservations <= 0 {
+	if len(reservationIDs) == 0 {
 		return Quote{}, fmt.Errorf("no reservations selected")
 	}
 
@@ -231,7 +231,8 @@ func (m *Manager) GetInstantOutQuote(ctx context.Context,
 	// Get the service fee.
 	quoteRes, err := m.cfg.InstantOutClient.GetInstantOutQuote(
 		ctx, &swapserverrpc.GetInstantOutQuoteRequest{
-			Amount: uint64(amt),
+			Amount:         uint64(amt),
+			ReservationIds: reservationIDs,
 		},
 	)
 	if err != nil {
@@ -247,7 +248,7 @@ func (m *Manager) GetInstantOutQuote(ctx context.Context,
 
 	// The on chain chainFee is the chainFee rate times the estimated
 	// sweepless sweep transaction size.
-	chainFee := feeRate.FeeForWeight(sweeplessSweepWeight(numReservations))
+	chainFee := feeRate.FeeForWeight(sweeplessSweepWeight(len(reservationIDs)))
 
 	return Quote{
 		ServiceFee: btcutil.Amount(quoteRes.SwapFee),

loopd/swapclient_server.go

@@ -1446,7 +1446,7 @@ func (s *swapClientServer) InstantOutQuote(ctx context.Context,
 	*looprpc.InstantOutQuoteResponse, error) {
 
 	quote, err := s.instantOutManager.GetInstantOutQuote(
-		ctx, btcutil.Amount(req.Amt), int(req.NumReservations),
+		ctx, btcutil.Amount(req.Amt), req.ReservationIds,
 	)
 	if err != nil {
 		return nil, err

looprpc/client.pb.go

@@ -1532,9 +1532,15 @@ message InstantOutQuoteRequest {
     uint64 amt = 1;
 
     /*
+    Deprecated: use 'reservation_ids' instead.
     The amount of reservations to use for the swap.
     */
-    int32 num_reservations = 2;
+    int32 num_reservations = 2 [deprecated = true];
+
+    /*
+    The reservations to use for the swap.
+    */
+    repeated bytes reservation_ids = 3;
 }
 
 message InstantOutQuoteResponse {

looprpc/client.proto

@@ -141,6 +141,9 @@ message CancelInstantSwapResponse {
 message GetInstantOutQuoteRequest {
     // The amount to swap in satoshis.
     uint64 amount = 1;
+
+    // The reservation ids that will be used for the swap.
+    repeated bytes reservation_ids = 2;
 }
 
 message GetInstantOutQuoteResponse {