Merge pull request #3556 from joostjager/query-mc-prob

routerrpc: add queryprob rpc

cmd/lncli/cmd_query_mission_control.go

@@ -48,9 +48,9 @@ func queryMissionControl(ctx *cli.Context) error {
 			displayPairHistory{
 				NodeFrom:              hex.EncodeToString(n.NodeFrom),
 				NodeTo:                hex.EncodeToString(n.NodeTo),
-				LastAttemptSuccessful: n.LastAttemptSuccessful,
-				Timestamp:             n.Timestamp,
-				MinPenalizeAmtSat:     n.MinPenalizeAmtSat,
+				LastAttemptSuccessful: n.History.LastAttemptSuccessful,
+				Timestamp:             n.History.Timestamp,
+				MinPenalizeAmtSat:     n.History.MinPenalizeAmtSat,
 			},
 		)
 	}

cmd/lncli/cmd_query_probability.go

@@ -0,0 +1,70 @@
+// +build routerrpc
+
+package main
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+
+	"github.com/btcsuite/btcutil"
+	"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
+	"github.com/lightningnetwork/lnd/lnwire"
+	"github.com/lightningnetwork/lnd/routing/route"
+	"github.com/urfave/cli"
+)
+
+var queryProbCommand = cli.Command{
+	Name:      "queryprob",
+	Category:  "Payments",
+	Usage:     "Estimate a success probability.",
+	ArgsUsage: "from-node to-node amt",
+	Action:    actionDecorator(queryProb),
+}
+
+func queryProb(ctx *cli.Context) error {
+	args := ctx.Args()
+
+	if len(args) != 3 {
+		return cli.ShowCommandHelp(ctx, "queryprob")
+	}
+
+	fromNode, err := route.NewVertexFromStr(args.Get(0))
+	if err != nil {
+		return fmt.Errorf("invalid from node key: %v", err)
+	}
+
+	toNode, err := route.NewVertexFromStr(args.Get(1))
+	if err != nil {
+		return fmt.Errorf("invalid to node key: %v", err)
+	}
+
+	amtSat, err := strconv.ParseUint(args.Get(2), 10, 64)
+	if err != nil {
+		return fmt.Errorf("invalid amt: %v", err)
+	}
+
+	amtMsat := lnwire.NewMSatFromSatoshis(
+		btcutil.Amount(amtSat),
+	)
+
+	conn := getClientConn(ctx, false)
+	defer conn.Close()
+
+	client := routerrpc.NewRouterClient(conn)
+
+	req := &routerrpc.QueryProbabilityRequest{
+		FromNode: fromNode[:],
+		ToNode:   toNode[:],
+		AmtMsat:  int64(amtMsat),
+	}
+	rpcCtx := context.Background()
+	response, err := client.QueryProbability(rpcCtx, req)
+	if err != nil {
+		return err
+	}
+
+	printJSON(response)
+
+	return nil
+}

cmd/lncli/routerrpc_active.go

@@ -8,6 +8,7 @@ import "github.com/urfave/cli"
 func routerCommands() []cli.Command {
 	return []cli.Command{
 		queryMissionControlCommand,
+		queryProbCommand,
 		resetMissionControlCommand,
 		buildRouteCommand,
 	}