lightningd: remove --bind-addr and --addr munging on onions and local sockets.

Changelog-Removed: --bind-addr and --addr on onion addresses and local sockets (deprecated v23.08, disabled by default in v24.11).
Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

doc/developers-guide/deprecations.md

@@ -7,9 +7,6 @@ hidden: false
 
 | Name                                 | Type               | First Deprecated | Last Supported | Description                                                                                                                                                                     |
 |--------------------------------------|--------------------|------------------|----------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| bind-addr.torv3                      | Config             | v23.08           | v24.08         | `announce-addr` makes more sense for Tor addresses                                                                                                                              |
-| addr.torv3                           | Config             | v23.08           | v24.08         | `announce-addr` makes more sense for Tor addresses                                                                                                                              |
-| addr.socket                          | Config             | v23.08           | v24.08         | `bind-addr` makes more sense for local sockets since we cannot announce them                                                                                                    |
 | announce-addr-dns                    | Config             | v23.08           | v24.08         | Use `bind-addr=dns:` to specify DNS announcements on a per-address basis                                                                                                        |
 | rest-port.clnrest-prefix             | Config             | v23.11           | v24.11         | Autodetect where we need to rename `rest-port` to `clnrest-port` (added in v23.11)                                                                                              |
 | rest-protocol.clnrest-prefix         | Config             | v23.11           | v24.11         | Autodetect where we need to rename `rest-protocol` to `clnrest-protocol` (added in v23.11)                                                                                      |

lightningd/options.c

@@ -267,31 +267,13 @@ static char *opt_add_addr_withtype(const char *arg,
 		case ADDR_TYPE_TOR_V3:
 			switch (ala) {
 			case ADDR_LISTEN:
-				if (!opt_deprecated_ok(ld, "bind-addr", "torv3",
-						       "v23.08", "v24.08"))
-					return tal_fmt(tmpctx,
-						       "Don't use --bind-addr=%s, use --announce-addr=%s",
-						       arg, arg);
-				log_unusual(ld->log,
-					    "You used `--bind-addr=%s` option with an .onion address,"
-					    " You are lucky in this node live some wizards and"
-					    " fairies, we have done this for you and don't announce, Be as hidden as wished",
-					    arg);
-				/* And we ignore it */
-				return NULL;
+				return tal_fmt(tmpctx,
+					       "Don't use --bind-addr=%s, use --announce-addr=%s",
+					       arg, arg);
 			case ADDR_LISTEN_AND_ANNOUNCE:
-				if (!opt_deprecated_ok(ld, "addr", "torv3",
-						       "v23.08", "v24.08"))
-					return tal_fmt(tmpctx,
-						       "Don't use --addr=%s, use --announce-addr=%s",
-						       arg, arg);
-				log_unusual(ld->log,
-					    "You used `--addr=%s` option with an .onion address,"
-					    " You are lucky in this node live some wizards and"
-					    " fairies, we have done this for you and don't announce, Be as hidden as wished",
-					    arg);
-				ala = ADDR_LISTEN;
-				break;
+				return tal_fmt(tmpctx,
+					       "Don't use --addr=%s, use --announce-addr=%s",
+					       arg, arg);
 			case ADDR_ANNOUNCE:
 				break;
 			}
@@ -326,12 +308,8 @@ static char *opt_add_addr_withtype(const char *arg,
 				return tal_fmt(tmpctx,
 					       "Cannot announce sockets, try --bind-addr=%s", arg);
 			case ADDR_LISTEN_AND_ANNOUNCE:
-				if (!opt_deprecated_ok(ld, "addr", "socket",
-						       "v23.08", "v24.08"))
-					return tal_fmt(tmpctx, "Don't use --addr=%s, use --bind-addr=%s",
-						       arg, arg);
-				ala = ADDR_LISTEN;
-				/* Fall thru */
+				return tal_fmt(tmpctx, "Don't use --addr=%s, use --bind-addr=%s",
+					       arg, arg);
 			case ADDR_LISTEN:
 				break;
 			}