Merge pull request #8239 from ellemouton/loadSessionByActiveTower

wtclient: add DeactivateTower and TerminateSession commands

Author: ellemouton

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{
 		{
@@ -20,10 +21,12 @@ func wtclientCommands() []cli.Command {
 			Subcommands: []cli.Command{
 				addTowerCommand,
 				removeTowerCommand,
+				deactivateTowerCommand,
 				listTowersCommand,
 				getTowerCommand,
 				statsCommand,
 				policyCommand,
+				sessionCommands,
 			},
 		},
 	}
@@ -84,6 +87,44 @@ func addTower(ctx *cli.Context) error {
 	return nil
 }
 
+var deactivateTowerCommand = cli.Command{
+	Name: "deactivate",
+	Usage: "Deactivate a watchtower to temporarily prevent its use for " +
+		"sessions/backups.",
+	ArgsUsage: "pubkey",
+	Action:    actionDecorator(deactivateTower),
+}
+
+func deactivateTower(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, "deactivate")
+	}
+
+	pubKey, err := hex.DecodeString(ctx.Args().First())
+	if err != nil {
+		return fmt.Errorf("invalid public key: %w", err)
+	}
+
+	client, cleanUp := getWtclient(ctx)
+	defer cleanUp()
+
+	req := &wtclientrpc.DeactivateTowerRequest{
+		Pubkey: pubKey,
+	}
+	resp, err := client.DeactivateTower(ctxc, req)
+	if err != nil {
+		return err
+	}
+
+	printRespJSON(resp)
+
+	return nil
+}
+
 var removeTowerCommand = cli.Command{
 	Name: "remove",
 	Usage: "Remove a watchtower to prevent its use for future " +
@@ -333,3 +374,47 @@ func policy(ctx *cli.Context) error {
 	printRespJSON(resp)
 	return nil
 }
+
+var sessionCommands = cli.Command{
+	Name: "session",
+	Subcommands: []cli.Command{
+		terminateSessionCommand,
+	},
+}
+
+var terminateSessionCommand = cli.Command{
+	Name:      "terminate",
+	ArgsUsage: "id",
+	Action:    actionDecorator(terminateSession),
+}
+
+func terminateSession(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, "terminate")
+	}
+
+	client, cleanUp := getWtclient(ctx)
+	defer cleanUp()
+
+	sessionID, err := hex.DecodeString(ctx.Args().First())
+	if err != nil {
+		return fmt.Errorf("invalid session ID: %w", err)
+	}
+
+	resp, err := client.TerminateSession(
+		ctxc, &wtclientrpc.TerminateSessionRequest{
+			SessionId: sessionID,
+		},
+	)
+	if err != nil {
+		return err
+	}
+
+	printRespJSON(resp)
+
+	return nil
+}

docs/release-notes/release-notes-0.18.0.md

@@ -155,6 +155,13 @@
   about the txid and don't want the calling code to block while the channel
   drains the active HTLCs.
 
+* [New watchtower client DeactivateTower and 
+  TerminateSession](https://github.com/lightningnetwork/lnd/pull/8239) commands 
+  have been added. The DeactivateTower command can be used to mark a tower as 
+  inactive so that its sessions are not loaded on startup and so that the tower 
+  is not considered for session negotiation. TerminateSession can be used to 
+  mark a specific session as terminal so that that specific is never used again.
+
 ## lncli Additions
 
 * Deprecate `bumpclosefee` for `bumpforceclosefee` to accommodate for the fact 

itest/list_on_test.go

@@ -519,16 +519,8 @@ var allTestCases = []*lntest.TestCase{
 		TestFunc: testLookupHtlcResolution,
 	},
 	{
-		Name:     "watchtower session management",
-		TestFunc: testWatchtowerSessionManagement,
-	},
-	{
-		// NOTE: this test must be put in the same tranche as
-		// `testWatchtowerSessionManagement` to avoid parallel use of
-		// the default watchtower port.
-		Name: "revoked uncooperative close retribution altruist " +
-			"watchtower",
-		TestFunc: testRevokedCloseRetributionAltruistWatchtower,
+		Name:     "watchtower",
+		TestFunc: testWatchtower,
 	},
 	{
 		Name:     "channel fundmax",