Merge pull request #103 from Impa10r/premium

v5 with premiums

Author: Impa10r

.github/workflows/docker-build.yml

@@ -34,6 +34,7 @@ jobs:
         run: |
           docker buildx build \
             --platform linux/arm64,linux/amd64 \
+            --build-arg COMMIT=8f670390ff9277f02bd6d422d518de757ce2faf8 \
             --tag ghcr.io/impa10r/peerswap-web:${GITHUB_REF#refs/tags/} \
             --tag ghcr.io/impa10r/peerswap-web:latest \
             --output "type=registry" \

.github/workflows/manual-docker-build.yml

@@ -36,6 +36,7 @@ jobs:
         run: |
           docker buildx build \
           --platform linux/arm64,linux/amd64 \
+          --build-arg COMMIT=8f670390ff9277f02bd6d422d518de757ce2faf8 \
           --tag ghcr.io/impa10r/peerswap-web:${{ github.event.inputs.version }} \
           --tag ghcr.io/impa10r/peerswap-web:latest \
           --output "type=registry" \

.vscode/launch.json

@@ -5,23 +5,23 @@
     "version": "0.2.0",
     "configurations": [
        {
-            "name": "Launch Package",
+            "name": "Launch LND version",
             "type": "go",
             "request": "launch",
             "mode": "auto",
             "buildFlags": "-tags lnd",
             "program": "${workspaceFolder}/cmd/psweb/",
             "showLog": false,
             //"envFile": "${workspaceFolder}/.env",
-            //"args": ["-datadir", "/home/vlad/.peerswap2_t4"]
-            "args": ["-datadir", "/home/vlad/.peerswap2"]
+            //"args": ["-datadir", "/home/vlad/.peerswap2"]
+            //"args": ["-datadir", "/home/vlad/.peerswap_mac"]
         }, 
         // sudo bash -c 'echo 0 > /proc/sys/kernel/yama/ptrace_scope'
         // go install -tags cln -gcflags 'all=-N -l' ./cmd/psweb
         // lcli -k plugin subcommand=stop plugin=/home/vlad/go/bin/psweb
         // lcli -k plugin subcommand=start plugin=/home/vlad/go/bin/psweb
         { 
-            "name": "Attach to Package",
+            "name": "Attach to CLN version",
             "type": "go",
             "request": "attach",
             "mode": "local",

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Versions
 
+## 1.8.0
+
+- Breaking: requires peerswap v5 with premium feature
+- Enable setting premium rates and display those of peers
+- Add premium PPM limit for new swaps, blank by default
+- Remove words "Liquid balance" from telegram backups for privacy
+- Reduce L-BTC dust reserve to 170 sats for Elements v23.2.7+
+- CLN: fetch peers' aliases from gossip
+
 ## 1.7.8
 
 - Respect spendable and receivable limits for max swap calculation 

Dockerfile

@@ -2,7 +2,7 @@
 ## Build PeerSwap and PeerSwap Web UI in a joint container 
 ###
 
-FROM golang:1.22.2-bookworm AS builder
+FROM golang:1.23.8-bookworm AS builder
 
 #ENV CGO_ENABLED=1
 

cmd/psweb/config/cln.go

@@ -10,20 +10,65 @@ import (
 	"strings"
 )
 
+var DatabaseFile string
+
 // Config defaults for CLN
-func loadDefaults(home, dataDir string) {
+func loadDefaults(home, dataDir, network string) {
 	if dataDir == "" {
 		Config.LightningDir = filepath.Join(home, ".lightning")
 	} else {
 		// Drop the last folder
 		Config.LightningDir = dataDir
 	}
 
-	Config.RpcHost = filepath.Join(Config.LightningDir, "bitcoin")
-	if Config.Chain == "testnet" {
-		Config.RpcHost = filepath.Join(Config.LightningDir, "testnet")
+	if network == "bitcoin" {
+		Config.Chain = "mainnet"
+	} else {
+		Config.Chain = network
 	}
+
+	Config.RpcHost = filepath.Join(Config.LightningDir, network)
 	Config.DataDir = filepath.Join(Config.RpcHost, "peerswap")
+
+	// only sqlite3 supported for now
+	DatabaseFile = filepath.Join(Config.RpcHost, "lightningd.sqlite3")
+
+	// check if the sqlite3 database is in a different location
+	filePath := filepath.Join(Config.LightningDir, "config")
+
+	// Read the entire content of the file
+	content, err := os.ReadFile(filePath)
+	if err != nil {
+		log.Println("Unable to read CLN config file")
+		return
+	}
+	// Convert the content to a string
+	fileContent := string(content)
+
+	// Search lines
+	lines := strings.Split(fileContent, "\n")
+	for _, line := range lines {
+		l := strings.TrimSpace(line)
+		if strings.HasPrefix(l, "#") {
+			// ignore commented out lines
+			continue
+		}
+		if parts := strings.Split(l, "="); len(parts) > 1 {
+			if parts[0] == "wallet" {
+				// ignore inline comments
+				value := strings.TrimSpace(strings.Split(parts[1], "#")[0])
+				// sqlite3:///home/user/.lightning/bitcoin/lightningd.sqlite3:/backup/lightningd.sqlite3
+				// identify scheme and location
+				p := strings.Split(value, ":")
+				if p[0] != "sqlite3" {
+					log.Fatalf("Only sqlite3 database is supported")
+				}
+
+				DatabaseFile = p[1][2:]
+				break
+			}
+		}
+	}
 }
 
 // CLN-specific load from Peerswap config

cmd/psweb/config/common.go

@@ -48,6 +48,7 @@ type Configuration struct {
 	AutoSwapMaxAmount       uint64
 	AutoSwapThresholdPPM    uint64
 	AutoSwapTargetPct       uint64
+	AutoSwapPremiumLimit    int64
 	SecureConnection        bool
 	ServerIPs               string
 	SecurePort              string
@@ -78,7 +79,7 @@ func Load(dataDir string, network string) {
 	Config.ElementsHost = "http://127.0.0.1"
 	Config.ElementsPort = "18884"
 
-	Config.Chain = "mainnet"
+	Config.Chain = network
 	Config.NodeApi = "https://amboss.space/node"
 	Config.BitcoinApi = "https://mempool.space"
 	Config.LiquidApi = "https://liquid.network"
@@ -89,10 +90,9 @@ func Load(dataDir string, network string) {
 	Config.SecureConnection = false
 	Config.SecurePort = "1985"
 
-	if network == "testnet" {
-		Config.Chain = "testnet"
-		Config.NodeApi = "https://mempool.space/testnet/lightning/node"
-		Config.BitcoinApi = "https://mempool.space/testnet"
+	if network != "mainnet" {
+		Config.NodeApi = "https://mempool.space/" + network + "/lightning/node"
+		Config.BitcoinApi = "https://mempool.space/" + network
 		Config.LiquidApi = "https://liquid.network/testnet"
 		Config.ElementsPort = "7039"
 	}
@@ -115,7 +115,7 @@ func Load(dataDir string, network string) {
 	}
 
 	// different defaults for LND and CLN
-	loadDefaults(currentUser.HomeDir, dataDir)
+	loadDefaults(currentUser.HomeDir, dataDir, network)
 
 	// load config from peerswap.conf
 	LoadPS()
@@ -176,10 +176,10 @@ func Save() error {
 
 // fallback for Bitcoin Core API if local is unreachable
 func GetBlockIoHost() string {
-	if Config.Chain == "testnet" {
-		return "https://go.getblock.io/77cfc97c83e0454fb35557331188e7d6"
+	if Config.Chain == "mainnet" {
+		return "https://go.getblock.io/6f4b1867b4324698936d8d18ea99a245"
 	} else {
-		return "https://go.getblock.io/62af44fe83f540539ed0a1b52a80d41e"
+		return "https://go.getblock.io/6bf5fea3b5344c43a061fd295f613be4"
 	}
 }
 
@@ -188,6 +188,7 @@ func GetHostname() string {
 	// Get the hostname of the machine
 	hostname, _ := os.Hostname()
 
+	// Env takes priority
 	if os.Getenv("HOSTNAME") != "" {
 		hostname = os.Getenv("HOSTNAME")
 	}

cmd/psweb/config/lnd.go

@@ -11,7 +11,7 @@ import (
 )
 
 // Config defaults for LND
-func loadDefaults(home, dataDir string) {
+func loadDefaults(home, dataDir, _ string) {
 	Config.LightningDir = filepath.Join(home, ".lnd")
 	Config.RpcHost = "localhost:42069"