Add ability to buy reservations for instant outs from server

cmd/loop/instantout.go

@@ -190,6 +190,7 @@ func instantOut(ctx context.Context, cmd *cli.Command) error {
 			ReservationIds:  selectedReservations,
 			OutgoingChanSet: outgoingChanSet,
 			DestAddr:        cmd.String("addr"),
+			MaxSwapFeeSat:   quote.ServiceFeeSat,
 		},
 	)
 	if err != nil {

cmd/loop/main.go

@@ -41,6 +41,8 @@ var (
 
 	defaultSwapWaitTime = 30 * time.Minute
 
+	defaultRpcTimeout = 30 * time.Second
+
 	// maxMsgRecvSize is the largest message our client will receive. We
 	// set this to 200MiB atm.
 	maxMsgRecvSize = grpc.MaxCallRecvMsgSize(1 * 1024 * 1024 * 200)

cmd/loop/reservations.go

@@ -2,13 +2,27 @@ package main
 
 import (
 	"context"
+	"errors"
+	"fmt"
+	"strings"
 
 	"github.com/lightninglabs/loop/looprpc"
 	"github.com/urfave/cli/v3"
 )
 
-var reservationsCommands = &cli.Command{
+var (
+	reservationAmountFlag = &cli.Uint64Flag{
+		Name:  "amt",
+		Usage: "the amount in satoshis for the reservation",
+	}
+	reservationExpiryFlag = &cli.UintFlag{
+		Name: "expiry",
+		Usage: "the relative block height at which the reservation" +
+			" expires",
+	}
+)
 
+var reservationsCommands = &cli.Command{
 	Name:    "reservations",
 	Aliases: []string{"r"},
 	Usage:   "manage reservations",
@@ -20,6 +34,7 @@ var reservationsCommands = &cli.Command{
 	`,
 	Commands: []*cli.Command{
 		listReservationsCommand,
+		newReservationCommand,
 	},
 }
 
@@ -34,8 +49,76 @@ var (
 	`,
 		Action: listReservations,
 	}
+
+	newReservationCommand = &cli.Command{
+		Name:    "new",
+		Aliases: []string{"n"},
+		Usage:   "create a new reservation",
+		Description: `
+		Create a new reservation with the given value and expiry.
+	`,
+		Action: newReservation,
+		Flags: []cli.Flag{
+			reservationAmountFlag,
+			reservationExpiryFlag,
+		},
+	}
 )
 
+func newReservation(ctx context.Context, cmd *cli.Command) error {
+	client, cleanup, err := getClient(cmd)
+	if err != nil {
+		return err
+	}
+	defer cleanup()
+
+	rpcCtx, cancel := context.WithTimeout(ctx, defaultRpcTimeout)
+	defer cancel()
+
+	if !cmd.IsSet(reservationAmountFlag.Name) {
+		return errors.New("amt flag missing")
+	}
+
+	if !cmd.IsSet(reservationExpiryFlag.Name) {
+		return errors.New("expiry flag missing")
+	}
+
+	quoteReq, err := client.ReservationQuote(
+		rpcCtx, &looprpc.ReservationQuoteRequest{
+			Amt:    cmd.Uint64(reservationAmountFlag.Name),
+			Expiry: uint32(cmd.Uint(reservationExpiryFlag.Name)),
+		},
+	)
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf(satAmtFmt, "Reservation Cost: ", quoteReq.PrepayAmt)
+
+	fmt.Printf("CONTINUE RESERVATION? (y/n): ")
+
+	var answer string
+	if _, err := fmt.Scanln(&answer); err != nil ||
+		!strings.EqualFold(answer, "y") {
+
+		return nil
+	}
+
+	reservationRes, err := client.ReservationRequest(
+		rpcCtx, &looprpc.ReservationRequestRequest{
+			Amt:          cmd.Uint64(reservationAmountFlag.Name),
+			Expiry:       uint32(cmd.Uint(reservationExpiryFlag.Name)),
+			MaxPrepayAmt: quoteReq.PrepayAmt,
+		},
+	)
+	if err != nil {
+		return err
+	}
+
+	printRespJSON(reservationRes)
+	return nil
+}
+
 func listReservations(ctx context.Context, cmd *cli.Command) error {
 	client, cleanup, err := getClient(cmd)
 	if err != nil {

cmd/loop/testdata/sessions/instantout/02_loop-instantout.json

@@ -139,7 +139,8 @@
             "Mu65fbhayEtRzougKLBnoeRN8f+tEM1+O9QuNvUIfbI="
           ],
           "outgoing_chan_set": [],
-          "dest_addr": ""
+          "dest_addr": "",
+          "max_swap_fee_sat": "4800"
         }
       }
     },

cmd/loop/testdata/sessions/instantout/07_loop-instantout-channel.json

@@ -148,7 +148,8 @@
           "outgoing_chan_set": [
             "125344325763072"
           ],
-          "dest_addr": ""
+          "dest_addr": "",
+          "max_swap_fee_sat": "3200"
         }
       }
     },

cmd/loop/testdata/sessions/instantout/08_loop-instantout-select-index.json

@@ -162,7 +162,8 @@
             "cSfKVONNmsK9+p4Uc5nc3ZtE+37uOODHeq1vprhh/x4="
           ],
           "outgoing_chan_set": [],
-          "dest_addr": ""
+          "dest_addr": "",
+          "max_swap_fee_sat": "1600"
         }
       }
     },

docs/loop.1

@@ -388,6 +388,18 @@ list all reservations
 .PP
 \fB--help, -h\fP: show help
 
+.SS new, n
+create a new reservation
+
+.PP
+\fB--amt\fP="": the amount in satoshis for the reservation (default: 0)
+
+.PP
+\fB--expiry\fP="": the relative block height at which the reservation expires (default: 0)
+
+.PP
+\fB--help, -h\fP: show help
+
 .SH instantout
 perform an instant off-chain to on-chain swap (looping out)
 

docs/loop.md

@@ -455,6 +455,26 @@ The following flags are supported:
 |-----------------|-------------|------|:-------------:|
 | `--help` (`-h`) | show help   | bool |    `false`    |
 
+### `reservations new` subcommand (aliases: `n`)
+
+create a new reservation.
+
+Create a new reservation with the given value and expiry.
+
+Usage:
+
+```bash
+$ loop [GLOBAL FLAGS] reservations new [COMMAND FLAGS] [ARGUMENTS...]
+```
+
+The following flags are supported:
+
+| Name            | Description                                                | Type | Default value |
+|-----------------|------------------------------------------------------------|------|:-------------:|
+| `--amt="…"`     | the amount in satoshis for the reservation                 | uint |      `0`      |
+| `--expiry="…"`  | the relative block height at which the reservation expires | uint |      `0`      |
+| `--help` (`-h`) | show help                                                  | bool |    `false`    |
+
 ### `instantout` command
 
 perform an instant off-chain to on-chain swap (looping out).

docs/release-notes/release-notes-next.md

@@ -6,6 +6,10 @@
 
 #### Bug Fixes
 
+* Hardened Instant Out and reservation handling against malformed server
+  responses, invalid signatures and reservation outputs, resource exhaustion,
+  unsafe recovery, excessive swap fees, and under-scoped macaroon permissions.
+
 * Taproot Asset Loop Out handling now validates RFQ timeouts and asset rates,
   keeps cached asset-name lookups responsive during slow `tapd` queries, and
   closes `tapd` connections cleanly during shutdown and startup failures.