Merge pull request #369 from Impa10r/testnet4

Add testnet4 support

Author: YusukeShimizu

clightning/config.go

@@ -651,6 +651,8 @@ func defaultBitcoinRpcPort(network string) uint {
 		return 38332
 	case "testnet", "testnet3":
 		return 18332
+	case "testnet4":
+		return 48332
 	case "regtest":
 		return 18443
 	default:
@@ -678,6 +680,8 @@ func bitcoinNetDir(network string) (string, error) {
 		return "signet", nil
 	case "testnet3", "testnet":
 		return "testnet3", nil
+	case "testnet4":
+		return "testnet4", nil
 	case "regtest":
 		return "regtest", nil
 	default:
@@ -689,7 +693,7 @@ func liquidNetDir(network string) (string, error) {
 	switch network {
 	case "mainnet", "bitcoin":
 		return "liquidv1", nil
-	case "testnet3", "simnet", "signet", "testnet":
+	case "testnet4", "testnet3", "simnet", "signet", "testnet":
 		return "liquidtestnet", nil
 	case "regtest":
 		return "liquidregtest", nil

cmd/peerswap-plugin/main.go

@@ -442,6 +442,8 @@ func getBitcoinChain(li *glightning.Lightning) (*chaincfg.Params, error) {
 		return &chaincfg.RegressionNetParams, nil
 	case "testnet":
 		return &chaincfg.TestNet3Params, nil
+	case "testnet4":
+		return &chaincfg.TestNet4Params, nil
 	case "signet":
 		return &chaincfg.SigNetParams, nil
 	case "bitcoin":

cmd/peerswaplnd/peerswapd/main.go

@@ -457,6 +457,8 @@ func getBitcoinChain(ctx context.Context, li lnrpc.LightningClient) (*chaincfg.P
 		return &chaincfg.RegressionNetParams, nil
 	case "testnet":
 		return &chaincfg.TestNet3Params, nil
+	case "testnet4":
+		return &chaincfg.TestNet4Params, nil
 	case "signet":
 		return &chaincfg.SigNetParams, nil
 	case "bitcoin":

go.mod

@@ -8,7 +8,7 @@ toolchain go1.23.4
 
 require (
 	github.com/benbjohnson/clock v1.3.0 // indirect
-	github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53
+	github.com/btcsuite/btcd v0.24.3-0.20250318170759-4f4ea81776d6
 	github.com/btcsuite/btcd/btcec/v2 v2.3.4
 	github.com/btcsuite/btcd/btcutil v1.1.5
 	github.com/btcsuite/btcd/btcutil/psbt v1.1.8

go.sum

@@ -68,8 +68,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
 github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A=
-github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53 h1:XOZ/wRGHkKv0AqxfDks5IkzaQ1Ge6fq322ZOOG5VIkU=
-github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53/go.mod h1:zHK7t7sw8XbsCkD64WePHE3r3k9/XoGAcf6mXV14c64=
+github.com/btcsuite/btcd v0.24.3-0.20250318170759-4f4ea81776d6 h1:8n9k3I7e8DkpdQ5YAP4j8ly/LSsbe6qX9vmVbrUGvVw=
+github.com/btcsuite/btcd v0.24.3-0.20250318170759-4f4ea81776d6/go.mod h1:OmM4kFtB0klaG/ZqT86rQiyw/1iyXlJgc3UHClPhhbs=
 github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
 github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
 github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ=
@@ -1109,8 +1109,8 @@ modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
 modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
 modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
-pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
+pgregory.net/rapid v1.2.0 h1:keKAYRcjm+e1F0oAuU5F5+YPAWcyxNNRK2wud503Gnk=
+pgregory.net/rapid v1.2.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

lnd/chain.go

@@ -18,6 +18,8 @@ func GetBitcoinChain(ctx context.Context, li lnrpc.LightningClient) (*chaincfg.P
 		return &chaincfg.RegressionNetParams, nil
 	case "testnet":
 		return &chaincfg.TestNet3Params, nil
+	case "testnet4":
+		return &chaincfg.TestNet4Params, nil
 	case "signet":
 		return &chaincfg.SigNetParams, nil
 	case "bitcoin":

swap/messages.go

@@ -128,6 +128,8 @@ func validateNetwork(network string) error {
 		fallthrough
 	case "testnet3":
 		fallthrough
+	case "testnet4":
+		fallthrough
 	case "signet":
 		fallthrough
 	case "regtest":