Merge pull request #91 from Impa10r/v1.7.1

v1.7.1
Impa10r · Oct 7, 2024 · 580af58 · 580af58
2 parents 8e320b3 + 77c3c9c
commit 580af58
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Versions
 
+## 1.7.1
+
+- CLN: Fix compile bug
+
 ## 1.7.0
 
 - Enable CT discounted vsize with Elements v23.02.03+ on testnet

diff --git a/cmd/psweb/config/cln.go b/cmd/psweb/config/cln.go
@@ -205,3 +205,8 @@ func GetPeerswapCLNSetting(section, searchVariable string) string {
 	}
 	return ""
 }
+
+func getElementsCredentials() {
+	Config.ElementsPass = GetPeerswapCLNSetting("Liquid", "rpcpassword")
+	Config.ElementsUser = GetPeerswapCLNSetting("Liquid", "rpcuser")
+}
diff --git a/cmd/psweb/config/common.go b/cmd/psweb/config/common.go
@@ -141,8 +141,7 @@ func Load(dataDir string, network string) {
 	// on the first start without pswebconfig.json there will be no elements user and password
 	if Config.ElementsPass == "" || Config.ElementsUser == "" {
 		// check in peerswap.conf
-		Config.ElementsPass = GetPeerswapLNDSetting("elementsd.rpcpass")
-		Config.ElementsUser = GetPeerswapLNDSetting("elementsd.rpcuser")
+		getElementsCredentials()
 
 		// check if they were passed as env
 		if Config.ElementsUser == "" && os.Getenv("ELEMENTS_USER") != "" {

diff --git a/cmd/psweb/config/lnd.go b/cmd/psweb/config/lnd.go
@@ -220,3 +220,8 @@ func getConfSetting(searchVariable, filePath string) string {
 	// not found
 	return ""
 }
+
+func getElementsCredentials() {
+	Config.ElementsPass = GetPeerswapLNDSetting("elementsd.rpcpass")
+	Config.ElementsUser = GetPeerswapLNDSetting("elementsd.rpcuser")
+}
diff --git a/cmd/psweb/main.go b/cmd/psweb/main.go
@@ -33,7 +33,7 @@ import (
 
 const (
 	// App VERSION tag
-	VERSION = "v1.7.0"
+	VERSION = "v1.7.1"
 	// Swap Out reserves are hardcoded here:
 	// https://github.com/ElementsProject/peerswap/blob/c77a82913d7898d0d3b7c83e4a990abf54bd97e5/peerswaprpc/server.go#L105
 	SWAP_OUT_CHANNEL_RESERVE = 5000