neutrinokitserver: Added unban peer feature

cmd/lncli/neutrino_active.go

@@ -225,6 +225,50 @@ func getCFilter(ctx *cli.Context) error {
 	return nil
 }
 
+var unbanPeerCommand = cli.Command{
+	Name:        "unbanpeer",
+	Usage:       "Unbans a previously banned peer and connects to it.",
+	Category:    "Neutrino",
+	Description: "Unban and connects to a previously banned peer",
+	ArgsUsage:   "address",
+	Action:      actionDecorator(unbanNeutrinoPeer),
+	Flags: []cli.Flag{
+		cli.BoolFlag{
+			Name: "permconnect",
+			Usage: "indicates if the peer to be unbanned should " +
+				"be connected as a permanent peer.",
+		},
+	},
+}
+
+func unbanNeutrinoPeer(ctx *cli.Context) error {
+	ctxc := getContext()
+	args := ctx.Args()
+
+	// Display the command's help message if we do not have the expected
+	// number of arguments/flags.
+	if ctx.NArg() != 1 || ctx.NumFlags() > 1 {
+		return cli.ShowCommandHelp(ctx, "unbanpeer")
+	}
+
+	client, cleanUp := getNeutrinoKitClient(ctx)
+	defer cleanUp()
+
+	req := &neutrinorpc.UnbanPeerRequest{
+		PeerAddress: args.First(),
+		PermConnect: ctx.Bool("permconnect"),
+	}
+
+	resp, err := client.UnbanPeer(ctxc, req)
+	if err != nil {
+		return err
+	}
+
+	printRespJSON(resp)
+
+	return nil
+}
+
 // neutrinoCommands will return the set of commands to enable for neutrinorpc
 // builds.
 func neutrinoCommands() []cli.Command {
@@ -241,6 +285,7 @@ func neutrinoCommands() []cli.Command {
 				isBannedCommand,
 				getBlockHeaderNeutrinoCommand,
 				getCFilterCommand,
+				unbanPeerCommand,
 			},
 		},
 	}

docs/release-notes/release-notes-0.18.1.md

@@ -26,12 +26,20 @@
 # New Features
 ## Functional Enhancements
 ## RPC Additions
+
+* [Added unbanPeer RPC](https://github.com/lightningnetwork/lnd/pull/7606/).
+  This would enable unbanning and connecting to a previously banned peer.
+
 ## lncli Additions
 
 * [Added](https://github.com/lightningnetwork/lnd/pull/8491) the `cltv_expiry`
   argument to `addinvoice` and `addholdinvoice`, allowing users to set the
   `min_final_cltv_expiry_delta`
 
+* [Added unbanPeer command](https://github.com/lightningnetwork/lnd/pull/7606/). 
+  This would enable unbanning and connecting to a previously banned peer using 
+  the lncli command.
+
 # Improvements
 ## Functional Updates
 ## RPC Updates

go.mod

@@ -208,3 +208,5 @@ replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-d
 go 1.21.4
 
 retract v0.0.2
+
+replace github.com/lightninglabs/neutrino => github.com/lightninglabs/neutrino v0.16.1-0.20240523142153-1ea6f5238577

go.sum

@@ -436,8 +436,8 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf h1:HZKvJUHlcXI/f/O0Avg7t8sqkPo78HFzjmeYFl6DPnc=
 github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf/go.mod h1:vxmQPeIQxPf6Jf9rM8R+B4rKBqLA2AjttNxkFBL2Plk=
-github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd h1:D8aRocHpoCv43hL8egXEMYyPmyOiefFHZ66338KQB2s=
-github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd/go.mod h1:x3OmY2wsA18+Kc3TSV2QpSUewOCiscw2mKpXgZv2kZk=
+github.com/lightninglabs/neutrino v0.16.1-0.20240523142153-1ea6f5238577 h1:5snpM/xWzU9m6QS0WR2ijKlC0dcDVHn/aAE5ztwLE+Q=
+github.com/lightninglabs/neutrino v0.16.1-0.20240523142153-1ea6f5238577/go.mod h1:x3OmY2wsA18+Kc3TSV2QpSUewOCiscw2mKpXgZv2kZk=
 github.com/lightninglabs/neutrino/cache v1.1.2 h1:C9DY/DAPaPxbFC+xNNEI/z1SJY9GS3shmlu5hIQ798g=
 github.com/lightninglabs/neutrino/cache v1.1.2/go.mod h1:XJNcgdOw1LQnanGjw8Vj44CvguYA25IMKjWFZczwZuo=
 github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display h1:pRdza2wleRN1L2fJXd6ZoQ9ZegVFTAb2bOQfruJPKcY=

lnrpc/neutrinorpc/neutrino.proto

@@ -71,6 +71,11 @@ service NeutrinoKit {
     rpc GetBlockHash (GetBlockHashRequest) returns (GetBlockHashResponse) {
         option deprecated = true;
     }
+
+    /*
+    UnbanPeer unbans a previously banned peer and connects to it.
+     */
+    rpc UnbanPeer (UnbanPeerRequest) returns (UnbanPeerResponse);
 }
 
 message StatusRequest {
@@ -244,3 +249,17 @@ message GetBlockHashResponse {
     // The block hash.
     string hash = 1;
 }
+
+message UnbanPeerRequest {
+    // The address of the peer to be unbanned.
+    string peer_address = 1;
+
+    // Indicates if the peer to be unbanned should be connected as a
+    // permanent peer.
+    bool perm_connect = 2;
+}
+
+message UnbanPeerResponse {
+    // The status of the UnbanPeer operation.
+    string status = 1;
+}

lnrpc/neutrinorpc/neutrino.swagger.json

@@ -265,6 +265,39 @@
           "NeutrinoKit"
         ]
       }
+    },
+    "/v2/neutrino/unban": {
+      "post": {
+        "summary": "UnbanPeer unbans a previously banned peer and connects to it.",
+        "operationId": "NeutrinoKit_UnbanPeer",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/neutrinorpcUnbanPeerResponse"
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "$ref": "#/definitions/rpcStatus"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/neutrinorpcUnbanPeerRequest"
+            }
+          }
+        ],
+        "tags": [
+          "NeutrinoKit"
+        ]
+      }
     }
   },
   "definitions": {
@@ -505,6 +538,28 @@
         }
       }
     },
+    "neutrinorpcUnbanPeerRequest": {
+      "type": "object",
+      "properties": {
+        "peer_address": {
+          "type": "string",
+          "description": "The address of the peer to be unbanned."
+        },
+        "perm_connect": {
+          "type": "boolean",
+          "description": "Indicates if the peer to be unbanned should be connected as a\npermanent peer."
+        }
+      }
+    },
+    "neutrinorpcUnbanPeerResponse": {
+      "type": "object",
+      "properties": {
+        "status": {
+          "type": "string",
+          "description": "The status of the UnbanPeer operation."
+        }
+      }
+    },
     "protobufAny": {
       "type": "object",
       "properties": {

lnrpc/neutrinorpc/neutrino.yaml

@@ -22,3 +22,6 @@ http:
     # deprecated
     - selector: neutrinorpc.NeutrinoKit.GetBlockHash
       get: "/v2/neutrino/blockhash/{height}"
+    - selector: neutrinorpc.NeutrinoKit.UnbanPeer
+      post: "/v2/neutrino/unban"
+      body: "*"