wtclient: ability to mark a session as borked

cmd/lncli/wtclient.go

@@ -10,7 +10,8 @@ import (
 	"github.com/urfave/cli"
 )
 
-// wtclientCommands will return nil for non-wtclientrpc builds.
+// wtclientCommands is a list of commands that can be used to interact with the
+// watchtower client.
 func wtclientCommands() []cli.Command {
 	return []cli.Command{
 		{
@@ -24,6 +25,7 @@ func wtclientCommands() []cli.Command {
 				getTowerCommand,
 				statsCommand,
 				policyCommand,
+				sessionCommand,
 			},
 		},
 	}
@@ -325,3 +327,47 @@ func policy(ctx *cli.Context) error {
 	printRespJSON(resp)
 	return nil
 }
+
+var sessionCommand = cli.Command{
+	Name: "session",
+	Subcommands: []cli.Command{
+		markSessionBorkedCommand,
+	},
+}
+
+var markSessionBorkedCommand = cli.Command{
+	Name:      "mark-borked",
+	ArgsUsage: "session-id",
+	Action:    actionDecorator(markSessionBorked),
+}
+
+func markSessionBorked(ctx *cli.Context) error {
+	ctxc := getContext()
+
+	// Display the command's help message if the number of arguments/flags
+	// is not what we expect.
+	if ctx.NArg() > 1 || ctx.NumFlags() != 0 {
+		return cli.ShowCommandHelp(ctx, "mark-borked")
+	}
+
+	client, cleanUp := getWtclient(ctx)
+	defer cleanUp()
+
+	sessionID, err := hex.DecodeString(ctx.Args().First())
+	if err != nil {
+		return fmt.Errorf("invalid session ID: %w", err)
+	}
+
+	req := &wtclientrpc.MarkSessionBorkedRequest{
+		SessionId: sessionID,
+	}
+
+	resp, err := client.MarkSessionBorked(ctxc, req)
+	if err != nil {
+		return err
+	}
+
+	printRespJSON(resp)
+
+	return nil
+}

docs/release-notes/release-notes-0.17.0.md

@@ -20,6 +20,8 @@
   queue](https://github.com/lightningnetwork/lnd/pull/7380)
 * [Replay pending and un-acked updates onto the main task pipeline if a tower
   is being removed](https://github.com/lightningnetwork/lnd/pull/6895)
+* Add the ability to [mark a session as
+  borked](https://github.com/lightningnetwork/lnd/pull/7545)
 
 * [Add defaults](https://github.com/lightningnetwork/lnd/pull/7771) to the 
   wtclient and watchtower config structs and use these to populate the defaults 

lnrpc/wtclientrpc/wtclient.go

@@ -60,6 +60,10 @@ var (
 			Entity: "offchain",
 			Action: "read",
 		}},
+		"/wtclientrpc.WatchtowerClient/MarkSessionBorked": {{
+			Entity: "offchain",
+			Action: "write",
+		}},
 	}
 
 	// ErrWtclientNotActive signals that RPC calls cannot be processed
@@ -483,6 +487,35 @@ func (c *WatchtowerClient) Policy(ctx context.Context,
 	}, nil
 }
 
+// MarkSessionBorked will set the status of the given session to Borked so that
+// the session is not used for any future updates.
+func (c *WatchtowerClient) MarkSessionBorked(_ context.Context,
+	req *MarkSessionBorkedRequest) (*MarkSessionBorkedResponse, error) {
+
+	if err := c.isActive(); err != nil {
+		return nil, err
+	}
+
+	pubKey, err := btcec.ParsePubKey(req.SessionId)
+	if err != nil {
+		return nil, err
+	}
+
+	sessionID := wtdb.NewSessionIDFromPubKey(pubKey)
+
+	err = c.cfg.Client.MarkSessionBorked(&sessionID)
+	if err != nil {
+		return nil, err
+	}
+
+	err = c.cfg.AnchorClient.MarkSessionBorked(&sessionID)
+	if err != nil {
+		return nil, err
+	}
+
+	return &MarkSessionBorkedResponse{}, nil
+}
+
 // marshallTower converts a client registered watchtower into its corresponding
 // RPC type.
 func marshallTower(tower *wtclient.RegisteredTower, policyType PolicyType,