staticaddr: cmd listdeposits and listswaps

Author: hieblmi

cmd/loop/quote.go

@@ -139,8 +139,8 @@ func quoteIn(ctx *cli.Context) error {
 func depositAmount(ctx context.Context, client looprpc.SwapClientClient,
 	depositOutpoints []string) (btcutil.Amount, error) {
 
-	addressSummary, err := client.GetStaticAddressSummary(
-		ctx, &looprpc.StaticAddressSummaryRequest{
+	addressSummary, err := client.ListStaticAddressDeposits(
+		ctx, &looprpc.ListStaticAddressDepositsRequest{
 			Outpoints: depositOutpoints,
 		},
 	)

cmd/loop/staticaddr.go

@@ -11,6 +11,7 @@ import (
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/lightninglabs/loop/labels"
 	"github.com/lightninglabs/loop/looprpc"
+	"github.com/lightninglabs/loop/staticaddr/deposit"
 	"github.com/lightninglabs/loop/swapserverrpc"
 	"github.com/lightningnetwork/lnd/routing/route"
 	"github.com/urfave/cli"
@@ -23,6 +24,8 @@ var staticAddressCommands = cli.Command{
 	Subcommands: []cli.Command{
 		newStaticAddressCommand,
 		listUnspentCommand,
+		listDepositsCommand,
+		listStaticAddressSwapsCommand,
 		withdrawalCommand,
 		summaryCommand,
 	},
@@ -208,6 +211,36 @@ func withdraw(ctx *cli.Context) error {
 	return nil
 }
 
+var listDepositsCommand = cli.Command{
+	Name:  "listdeposits",
+	Usage: "Display a summary of static address related information.",
+	Description: `
+	`,
+	Flags: []cli.Flag{
+		cli.StringFlag{
+			Name: "filter",
+			Usage: "specify a filter to only display deposits in " +
+				"the specified state. Leaving out the filter " +
+				"returns all deposits.\nThe state can be one " +
+				"of the following: \n" +
+				"deposited\nwithdrawing\nwithdrawn\n" +
+				"looping_in\nlooped_in\n" +
+				"publish_expired_deposit\n" +
+				"sweep_htlc_timeout\nhtlc_timeout_swept\n" +
+				"wait_for_expiry_sweep\nexpired\nfailed\n.",
+		},
+	},
+	Action: listDeposits,
+}
+
+var listStaticAddressSwapsCommand = cli.Command{
+	Name:  "listswaps",
+	Usage: "Display a summary of static address related information.",
+	Description: `
+	`,
+	Action: listStaticAddressSwaps,
+}
+
 var summaryCommand = cli.Command{
 	Name:      "summary",
 	ShortName: "s",
@@ -233,10 +266,10 @@ var summaryCommand = cli.Command{
 	Action: summary,
 }
 
-func summary(ctx *cli.Context) error {
+func listDeposits(ctx *cli.Context) error {
 	ctxb := context.Background()
 	if ctx.NArg() > 0 {
-		return cli.ShowCommandHelp(ctx, "summary")
+		return cli.ShowCommandHelp(ctx, "listdeposits")
 	}
 
 	client, cleanup, err := getClient(ctx)
@@ -287,8 +320,8 @@ func summary(ctx *cli.Context) error {
 		filterState = looprpc.DepositState_UNKNOWN_STATE
 	}
 
-	resp, err := client.GetStaticAddressSummary(
-		ctxb, &looprpc.StaticAddressSummaryRequest{
+	resp, err := client.ListStaticAddressDeposits(
+		ctxb, &looprpc.ListStaticAddressDepositsRequest{
 			StateFilter: filterState,
 		},
 	)
@@ -301,6 +334,54 @@ func summary(ctx *cli.Context) error {
 	return nil
 }
 
+func listStaticAddressSwaps(ctx *cli.Context) error {
+	ctxb := context.Background()
+	if ctx.NArg() > 0 {
+		return cli.ShowCommandHelp(ctx, "listswaps")
+	}
+
+	client, cleanup, err := getClient(ctx)
+	if err != nil {
+		return err
+	}
+	defer cleanup()
+
+	resp, err := client.ListStaticAddressSwaps(
+		ctxb, &looprpc.ListStaticAddressSwapsRequest{},
+	)
+	if err != nil {
+		return err
+	}
+
+	printRespJSON(resp)
+
+	return nil
+}
+
+func summary(ctx *cli.Context) error {
+	ctxb := context.Background()
+	if ctx.NArg() > 0 {
+		return cli.ShowCommandHelp(ctx, "summary")
+	}
+
+	client, cleanup, err := getClient(ctx)
+	if err != nil {
+		return err
+	}
+	defer cleanup()
+
+	resp, err := client.GetStaticAddressSummary(
+		ctxb, &looprpc.StaticAddressSummaryRequest{},
+	)
+	if err != nil {
+		return err
+	}
+
+	printRespJSON(resp)
+
+	return nil
+}
+
 func utxosToOutpoints(utxos []string) ([]*looprpc.OutPoint, error) {
 	outpoints := make([]*looprpc.OutPoint, 0, len(utxos))
 	if len(utxos) == 0 {
@@ -384,23 +465,31 @@ func staticAddressLoopIn(ctx *cli.Context) error {
 	}
 
 	// Get the amount we need to quote for.
-	summaryResp, err := client.GetStaticAddressSummary(
-		ctxb, &looprpc.StaticAddressSummaryRequest{
+	depositList, err := client.ListStaticAddressDeposits(
+		ctxb, &looprpc.ListStaticAddressDepositsRequest{
 			StateFilter: looprpc.DepositState_DEPOSITED,
 		},
 	)
 	if err != nil {
 		return err
 	}
 
+	if len(depositList.FilteredDeposits) == 0 {
+		errString := fmt.Sprintf("no confirmed deposits available, "+
+			"deposits need at least %v confirmations",
+			deposit.DefaultConfTarget)
+
+		return errors.New(errString)
+	}
+
 	var depositOutpoints []string
 	switch {
 	case isAllSelected == isUtxoSelected:
 		return errors.New("must select either all or some utxos")
 
 	case isAllSelected:
 		depositOutpoints = depositsToOutpoints(
-			summaryResp.FilteredDeposits,
+			depositList.FilteredDeposits,
 		)
 
 	case isUtxoSelected:
@@ -430,7 +519,7 @@ func staticAddressLoopIn(ctx *cli.Context) error {
 	// populate the quote request with the sum of selected deposits and
 	// prompt the user for acceptance.
 	quoteReq.Amt, err = sumDeposits(
-		depositOutpoints, summaryResp.FilteredDeposits,
+		depositOutpoints, depositList.FilteredDeposits,
 	)
 	if err != nil {
 		return err

loopd/perms/perms.go

@@ -94,6 +94,20 @@ var RequiredPermissions = map[string][]bakery.Op{
 		Entity: "loop",
 		Action: "in",
 	}},
+	"/looprpc.SwapClient/ListStaticAddressDeposits": {{
+		Entity: "swap",
+		Action: "read",
+	}, {
+		Entity: "loop",
+		Action: "in",
+	}},
+	"/looprpc.SwapClient/ListStaticAddressSwaps": {{
+		Entity: "swap",
+		Action: "read",
+	}, {
+		Entity: "loop",
+		Action: "in",
+	}},
 	"/looprpc.SwapClient/GetStaticAddressSummary": {{
 		Entity: "swap",
 		Action: "read",