diff --git a/config.go b/config.go index ae3a5a15a..6b40d663e 100644 --- a/config.go +++ b/config.go @@ -178,9 +178,9 @@ type Config struct { // Network is the Bitcoin network we're running on. This will be parsed // before the configuration is loaded and will set the correct flag on - // `lnd.bitcoin.mainnet|testnet|regtest|signet` and also for the other - // daemons. That way only one global network flag is needed. - Network string `long:"network" description:"The network the UI and all its components run on" choice:"regtest" choice:"testnet" choice:"mainnet" choice:"simnet" choice:"signet"` + // `lnd.bitcoin.mainnet|testnet|testnet4|regtest|signet` and also for + // the other daemons. That way only one global network flag is needed. + Network string `long:"network" description:"The network the UI and all its components run on" choice:"regtest" choice:"testnet" choice:"testnet4" choice:"mainnet" choice:"simnet" choice:"signet"` Remote *subservers.RemoteConfig `group:"Remote mode options (use when lnd-mode=remote)" namespace:"remote"` @@ -810,6 +810,9 @@ func setNetwork(cfg *Config) error { case "testnet", "testnet3": cfg.Lnd.Bitcoin.TestNet3 = true + case "testnet4": + cfg.Lnd.Bitcoin.TestNet4 = true + case "regtest": cfg.Lnd.Bitcoin.RegTest = true diff --git a/docs/release-notes/release-notes-0.15.2.md b/docs/release-notes/release-notes-0.15.2.md new file mode 100644 index 000000000..5930fc892 --- /dev/null +++ b/docs/release-notes/release-notes-0.15.2.md @@ -0,0 +1,43 @@ +# Release Notes + +- [Lightning Terminal](#lightning-terminal) + - [Bug Fixes](#bug-fixes) + - [Functional Changes/Additions](#functional-changesadditions) + - [Technical and Architectural Updates](#technical-and-architectural-updates) +- [Integrated Binary Updates](#integrated-binary-updates) + - [LND](#lnd) + - [Loop](#loop) + - [Pool](#pool) + - [Faraday](#faraday) + - [Taproot Assets](#taproot-assets) +- [Contributors](#contributors-alphabetical-order) +## Lightning Terminal + +### Bug Fixes + +### Functional Changes/Additions + +* Add support for connecting LiT to the [testnet4 + network](https://github.com/lightninglabs/lightning-terminal/pull/1120). + This can be done using the `--network=testnet4` config option. + +### Technical and Architectural Updates + +## RPC Updates + +## Integrated Binary Updates + +### LND + +### Loop + +### Pool + +### Faraday + +### Taproot Assets + +# Contributors (Alphabetical Order) + +* bitcoin-coder-bob +* Jonathan Harvey-Buschel diff --git a/itest/litd_node.go b/itest/litd_node.go index a9ac0b22d..f07c505f0 100644 --- a/itest/litd_node.go +++ b/itest/litd_node.go @@ -289,6 +289,8 @@ func (cfg *LitNodeConfig) defaultLitdArgs() *litArgs { switch cfg.NetParams { case &chaincfg.TestNet3Params: args["network"] = "testnet" + case &chaincfg.TestNet4Params: + args["network"] = "testnet4" case &chaincfg.SimNetParams: args["network"] = "simnet" case &chaincfg.RegressionNetParams: