diff --git a/contrib/msggen/msggen/schema.json b/contrib/msggen/msggen/schema.json index e81f2e369..01df18599 100644 --- a/contrib/msggen/msggen/schema.json +++ b/contrib/msggen/msggen/schema.json @@ -20838,6 +20838,10 @@ "set": false, "source": "default" }, + "testnet4": { + "set": false, + "source": "default" + }, "watchtime-blocks": { "value_int": 5, "source": "cmdline" diff --git a/doc/Makefile b/doc/Makefile index 19d25b76a..beeb6525e 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -260,7 +260,7 @@ check-manpages: all-programs check-config-docs default-targets # Makes sure that fields mentioned in schema are in man page, and vice versa. check-config-docs: @for c in `sed -n 's/^ "\(.*\)": {/\1/p' doc/schemas/lightning-listconfigs.json | grep -v '^# version$$' | grep -v '^plugins$$' | grep -v '^important-plugins$$'`; do if ! grep -q "^ \*\*$$c\*\*" doc/lightningd-config.5.md; then echo "$$c undocumented!"; exit 1; fi; done - @for c in `grep -v '\[plugin ' doc/lightningd-config.5.md | sed -n 's/^ \*\*\([^*]*\)\*\*.*/\1/p' | grep -v '^\(help\|version\|mainnet\|testnet\|signet\|plugin\|important-plugin\|plugin-dir\|clear-plugins\)$$'`; do if ! grep -q '"'"$$c"'"' doc/schemas/lightning-listconfigs.json; then echo "$$c documented but not in schema!"; exit 1; fi; done + @for c in `grep -v '\[plugin ' doc/lightningd-config.5.md | sed -n 's/^ \*\*\([^*]*\)\*\*.*/\1/p' | grep -v '^\(help\|version\|mainnet\|testnet\|testnet4\|signet\|plugin\|important-plugin\|plugin-dir\|clear-plugins\)$$'`; do if ! grep -q '"'"$$c"'"' doc/schemas/lightning-listconfigs.json; then echo "$$c documented but not in schema!"; exit 1; fi; done doc-clean: $(RM) $(MANPAGES) $(MARKDOWN_WITH_SCHEMA) doc/.doc_version diff --git a/doc/getting-started/getting-started/configuration.md b/doc/getting-started/getting-started/configuration.md index 5fc9ad6f3..9c1352286 100644 --- a/doc/getting-started/getting-started/configuration.md +++ b/doc/getting-started/getting-started/configuration.md @@ -63,7 +63,7 @@ The [`lightning-listconfigs`](ref:lightning-listconfigs) command will output a v **network**=_NETWORK_ -- Select the network parameters (_bitcoin_, _testnet_, _signet_, or _regtest_). +- Select the network parameters (_bitcoin_, _testnet_, _testnet4_, _signet_, or _regtest_). This is not valid within the per-network configuration file. - **mainnet** @@ -74,6 +74,10 @@ The [`lightning-listconfigs`](ref:lightning-listconfigs) command will output a v Alias for _network=testnet_. +- **testnet4** + + Alias for _network=testnet4_. + - **signet** Alias for _network=signet_. @@ -384,11 +388,11 @@ You can instead use _addr_ to override this (eg. to change the port), or precise Set an IP address (v4 or v6) or automatic Tor address to listen on and (maybe) announce as our node address. An empty 'IPADDRESS' is a special value meaning bind to IPv4 and/or IPv6 on all interfaces, '0.0.0.0' means bind to all IPv4 interfaces, '::' means 'bind to all IPv6 interfaces' (if you want to specify an IPv6 address _and_ a port, use `[]` around the IPv6 address, like `[::]:9750`). - If 'PORT' is not specified, the default port 9735 is used for mainnet (testnet: 19735, signet: 39735, regtest: 19846). If we can determine a public IP address from the resulting binding, + If 'PORT' is not specified, the default port 9735 is used for mainnet (testnet: 19735, signet: 39735, regtest: 19846, testnet4: 49735). If we can determine a public IP address from the resulting binding, the address is announced. If the argument begins with 'autotor:' then it is followed by the IPv4 or IPv6 address of the Tor control port (default port 9051), and this will be used to configure a Tor hidden service for port 9735 in case of mainnet (bitcoin) network whereas other networks (testnet, - signet, regtest) will set the same default ports they use for non-Tor addresses (see above). + signet, regtest, testnet4) will set the same default ports they use for non-Tor addresses (see above). The Tor hidden service will be configured to point to the first IPv4 or IPv6 address we bind to and is by default unique to your node's id. If the argument begins with 'statictor:' then it is followed by the IPv4 or IPv6 address of the Tor control port (default port 9051), and this will be used to configure a static Tor hidden service. diff --git a/doc/lightning-cli.1.md b/doc/lightning-cli.1.md index 84dd77f46..03f8afaa2 100644 --- a/doc/lightning-cli.1.md +++ b/doc/lightning-cli.1.md @@ -26,6 +26,7 @@ OPTIONS * **--network**=*network* * **--mainnet** * **--testnet** +* **--testnet4** * **--signet** * **--regtest** diff --git a/doc/lightningd-config.5.md b/doc/lightningd-config.5.md index 1e9d5d014..f69de5b1f 100644 --- a/doc/lightningd-config.5.md +++ b/doc/lightningd-config.5.md @@ -97,7 +97,7 @@ Bitcoin control options: * **network**=*NETWORK* - Select the network parameters (*bitcoin*, *testnet*, *signet*, or *regtest*). + Select the network parameters (*bitcoin*, *testnet*, *testnet4*, *signet*, or *regtest*). This is not valid within the per-network configuration file. * **mainnet** @@ -112,6 +112,10 @@ This is not valid within the per-network configuration file. Alias for *network=testnet*. +* **testnet4** + + Alias for *network=testnet4*. + * **signet** Alias for *network=signet*. @@ -571,7 +575,7 @@ interfaces, '::' means 'bind to all IPv6 interfaces' (if you want to specify an IPv6 address *and* a port, use `[]` around the IPv6 address, like `[::]:9750`). If 'PORT' is not specified, the default port 9735 is used for mainnet -(testnet: 19735, signet: 39735, regtest: 19846). +(testnet: 19735, signet: 39735, regtest: 19846, testnet4: 49735). If we can determine a public IP address from the resulting binding, the address is announced. @@ -579,8 +583,8 @@ the address is announced. IPv4 or IPv6 address of the Tor control port (default port 9051), and this will be used to configure a Tor hidden service for port 9735 in case of mainnet (bitcoin) network whereas other networks (testnet, -signet, regtest) will set the same default ports they use for non-Tor -addresses (see above). +testnet4, signet, regtest) will set the same default ports they use for +non-Tor addresses (see above). The Tor hidden service will be configured to point to the first IPv4 or IPv6 address we bind to and is by default unique to your node's id. diff --git a/doc/schemas/lightning-listconfigs.json b/doc/schemas/lightning-listconfigs.json index 90803157e..260dea4c9 100644 --- a/doc/schemas/lightning-listconfigs.json +++ b/doc/schemas/lightning-listconfigs.json @@ -2972,6 +2972,10 @@ "set": false, "source": "default" }, + "testnet4": { + "set": false, + "source": "default" + }, "watchtime-blocks": { "value_int": 5, "source": "cmdline"