lncli: Add --route_hints flag to sendpayment, queryroutes (fixes #6601)

Author: appilon

cmd/commands/cmd_payments.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"crypto/rand"
 	"encoding/hex"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -254,6 +255,11 @@ var SendPaymentCommand = cli.Command{
 			Name:  "keysend",
 			Usage: "will generate a pre-image and encode it in the sphinx packet, a dest must be set [experimental]",
 		},
+		cli.StringFlag{
+			Name: "route_hints",
+			Usage: "route hints to reach the destination, encoded as a JSON string. " +
+				"See the RouteHint struct in the RPC definition for the full format.",
+		},
 	),
 	Action: SendPayment,
 }
@@ -362,6 +368,22 @@ func SendPayment(ctx *cli.Context) error {
 
 		req.PaymentAddr = payAddr
 
+		// Parse --route_hints if provided.
+		if ctx.IsSet("route_hints") {
+			routeHintsJSON := ctx.String("route_hints")
+			var routeHints []*lnrpc.RouteHint
+
+			// Unmarshal the JSON string into the RouteHint slice.
+			err := json.Unmarshal([]byte(routeHintsJSON), &routeHints)
+			if err != nil {
+				return fmt.Errorf("error unmarshaling route_hints "+
+					"json: %w", err)
+			}
+
+			// Assign the parsed hints to the request.
+			req.RouteHints = routeHints
+		}
+
 		return SendPaymentRequest(
 			ctx, req, conn, conn, routerRPCSendPayment,
 		)
@@ -473,6 +495,22 @@ func SendPayment(ctx *cli.Context) error {
 
 	req.PaymentAddr = payAddr
 
+	// Parse --route_hints if provided.
+	if ctx.IsSet("route_hints") {
+		routeHintsJSON := ctx.String("route_hints")
+		var routeHints []*lnrpc.RouteHint
+
+		// Unmarshal the JSON string into the RouteHint slice.
+		err := json.Unmarshal([]byte(routeHintsJSON), &routeHints)
+		if err != nil {
+			return fmt.Errorf("error unmarshaling route_hints "+
+				"json: %w", err)
+		}
+
+		// Assign the parsed hints to the request.
+		req.RouteHints = routeHints
+	}
+
 	return SendPaymentRequest(ctx, req, conn, conn, routerRPCSendPayment)
 }
 
@@ -1154,6 +1192,11 @@ var queryRoutesCommand = cli.Command{
 		blindedBaseFlag,
 		blindedPPMFlag,
 		blindedCLTVFlag,
+		cli.StringFlag{
+			Name: "route_hints",
+			Usage: "route hints to reach the destination, encoded as a JSON string. " +
+				"See the RouteHint struct in the RPC definition for the full format.",
+		},
 	},
 	Action: actionDecorator(queryRoutes),
 }
@@ -1248,6 +1291,22 @@ func queryRoutes(ctx *cli.Context) error {
 		BlindedPaymentPaths: blindedRoutes,
 	}
 
+	// Parse --route_hints if provided.
+	if ctx.IsSet("route_hints") {
+		routeHintsJSON := ctx.String("route_hints")
+		var routeHints []*lnrpc.RouteHint
+
+		// Unmarshal the JSON string into the RouteHint slice.
+		err := json.Unmarshal([]byte(routeHintsJSON), &routeHints)
+		if err != nil {
+			return fmt.Errorf("error unmarshaling route_hints "+
+				"json: %w", err)
+		}
+
+		// Assign the parsed hints to the request.
+		req.RouteHints = routeHints
+	}
+
 	route, err := client.QueryRoutes(ctxc, req)
 	if err != nil {
 		return err