Merge pull request #105 from Impa10r/v5.0.1

v5.0.1

Author: Impa10r

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Versions
 
+## 5.0.1
+
+- Show correct fee rate in Telegram notifications
+- Show all times in the local time zone
+- Fix default user folder on MacOS
+- Add a dedicated Global Premiums page
+
 ## 5.0.0
 
 - Change versioning to match PeerSwap protocol version

cmd/psweb/config/common.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"log"
 	"os"
-	"os/user"
 	"path/filepath"
 )
 
@@ -59,12 +58,14 @@ var Config Configuration
 
 func Load(dataDir string, network string) {
 
-	// Get the current user's information
-	currentUser, err := user.Current()
-	if err != nil {
-		log.Fatalln(err)
+	// env gets priority
+	if os.Getenv("NETWORK") != "" {
+		network = os.Getenv("NETWORK")
 	}
 
+	// Get the current user's information
+	currentUser := os.Getenv("USER")
+
 	// load defaults first
 	Config.AllowSwapRequests = true
 	Config.ColorScheme = "dark" // dark or light
@@ -73,8 +74,8 @@ func Load(dataDir string, network string) {
 	Config.BitcoinSwaps = true
 	Config.LocalMempool = ""
 	Config.ListenPort = "1984"
-	Config.ElementsDir = filepath.Join(currentUser.HomeDir, ".elements")
-	Config.ElementsDirMapped = filepath.Join(currentUser.HomeDir, ".elements")
+	Config.ElementsDir = filepath.Join("home", currentUser, ".elements")
+	Config.ElementsDirMapped = filepath.Join("home", currentUser, ".elements")
 	Config.ElementsWallet = "peerswap"
 	Config.ElementsHost = "http://127.0.0.1"
 	Config.ElementsPort = "18884"
@@ -90,7 +91,7 @@ func Load(dataDir string, network string) {
 	Config.SecureConnection = false
 	Config.SecurePort = "1985"
 
-	if network != "mainnet" {
+	if network != "mainnet" && network != "bitcoin" {
 		Config.NodeApi = "https://mempool.space/" + network + "/lightning/node"
 		Config.BitcoinApi = "https://mempool.space/" + network
 		Config.LiquidApi = "https://liquid.network/testnet"
@@ -114,8 +115,13 @@ func Load(dataDir string, network string) {
 		Config.ElementsHost = os.Getenv("ELEMENTS_HOST")
 	}
 
+	homeFolder := filepath.Join("/home", currentUser)
+	if currentUser == "root" {
+		homeFolder = "/root"
+	}
+
 	// different defaults for LND and CLN
-	loadDefaults(currentUser.HomeDir, dataDir, network)
+	loadDefaults(homeFolder, dataDir, network)
 
 	// load config from peerswap.conf
 	LoadPS()

cmd/psweb/handlers.go

@@ -924,6 +924,21 @@ func bitcoinHandler(w http.ResponseWriter, r *http.Request) {
 		eta = "Past due"
 	}
 
+	client, cleanup, err := ps.GetClient(config.Config.RpcHost)
+	if err != nil {
+		redirectWithError(w, r, "/config?", err)
+		return
+	}
+	defer cleanup()
+
+	res, err := ps.ListPeers(client)
+	if err != nil {
+		log.Printf("unable to connect to RPC server: %v", err)
+		redirectWithError(w, r, "/config?", err)
+		return
+	}
+	peers := res.GetPeers()
+
 	data := Page{
 		Authenticated:       config.Config.SecureConnection && config.Config.Password != "",
 		ErrorMessage:        errorMessage,
@@ -952,7 +967,7 @@ func bitcoinHandler(w http.ResponseWriter, r *http.Request) {
 		BitcoinAddress:      addr,
 		AdvertiseEnabled:    ln.AdvertiseBitcoinBalance,
 		BitcoinSwaps:        config.Config.BitcoinSwaps,
-		CanClaimJoin:        hasDiscountedvSize,
+		CanClaimJoin:        hasDiscountedvSize && len(peers) > 0,
 		IsClaimJoin:         config.Config.PeginClaimJoin,
 		ClaimJoinStatus:     ln.ClaimStatus,
 		HasClaimJoinPending: ln.ClaimJoinHandler != "",
@@ -1174,12 +1189,10 @@ func peginHandler(w http.ResponseWriter, r *http.Request) {
 
 			if isPegin {
 				log.Println("New Peg-in TxId:", res.TxId, "RawHex:", res.RawHex, "Claim script:", claimScript)
-				duration := time.Duration(10*peginBlocks) * time.Minute
-				eta := time.Now().Add(duration).Format("3:04 PM")
-				telegramSendMessage(fmt.Sprintf("⏰ Started peg in %s sats, fee rate: %0.2f s/vb, ETA: %s, TxId: `%s`", formatWithThousandSeparators(uint64(res.AmountSat)), config.Config.PeginFeeRate, eta, res.TxId))
+				telegramSendMessage(fmt.Sprintf("⏰ Started peg in %s sats, fee rate: %0.2f s/vb, TxId: `%s`", formatWithThousandSeparators(uint64(res.AmountSat)), res.ExactSatVb, res.TxId))
 			} else {
 				log.Println("BTC withdrawal pending, TxId:", res.TxId, "RawHex:", res.RawHex)
-				telegramSendMessage(fmt.Sprintf("⛓️ BTC withdrawal pending: %s sats, fee rate: %0.2f s/vb, TxId: `%s`", formatWithThousandSeparators(uint64(res.AmountSat)), config.Config.PeginFeeRate, res.TxId))
+				telegramSendMessage(fmt.Sprintf("⛓️ BTC withdrawal pending: %s sats, fee rate: %0.2f s/vb, TxId: `%s`", formatWithThousandSeparators(uint64(res.AmountSat)), res.ExactSatVb, res.TxId))
 			}
 			config.Config.PeginAmount = res.AmountSat
 			config.Config.PeginTxId = res.TxId
@@ -1630,7 +1643,7 @@ func updateHandler(w http.ResponseWriter, r *http.Request) {
 	swapData += swap.Id
 	swapData += `</td></tr>
 			<tr><td style="text-align: right">Created At:</td><td >`
-	swapData += time.Unix(swap.CreatedAt, 0).UTC().Format("2006-01-02 15:04:05")
+	swapData += time.Unix(swap.CreatedAt, 0).Format("2006-01-02 15:04:05")
 	swapData += `</td></tr>
 			<tr><td style="text-align: right">Asset:</td><td>`
 	swapData += swap.Asset
@@ -2112,9 +2125,7 @@ func submitHandler(w http.ResponseWriter, r *http.Request) {
 				ln.ClaimStatus = "Awaiting funding tx to confirm"
 
 				log.Println("External Funding TxId:", txid)
-				duration := time.Duration(10*(int32(peginBlocks)-tx.Confirmations)) * time.Minute
-				eta := time.Now().Add(duration).Format("3:04 PM")
-				telegramSendMessage("⏰ Started peg in " + formatWithThousandSeparators(uint64(config.Config.PeginAmount)) + " sats. ETA: " + eta + ". TxId: `" + txid + "`")
+				telegramSendMessage("⏰ Started peg in " + formatWithThousandSeparators(uint64(config.Config.PeginAmount)) + " sats. External funding TxId: `" + txid + "`")
 			}
 
 			config.Save()

cmd/psweb/main-lnd.go

@@ -35,13 +35,8 @@ func main() {
 		os.Exit(0)
 	}
 
-	network := "mainnet"
-	if os.Getenv("NETWORK") != "" {
-		network = os.Getenv("NETWORK")
-	}
-
 	// loading from config file or creating default one
-	config.Load(*dataDir, network)
+	config.Load(*dataDir, "mainnet")
 
 	if *password != "" {
 		// enable HTTPS

cmd/psweb/main.go

@@ -34,7 +34,7 @@ import (
 
 const (
 	// App VERSION tag
-	VERSION = "v5.0.0"
+	VERSION = "v5.0.1"
 	// Unusable BTC balance
 	ANCHOR_RESERVE = 25_000
 	// assume creatediscountct=1 for mainnet in elements.conf
@@ -1210,10 +1210,11 @@ func checkPegin() {
 
 	if confs > 0 {
 		if config.Config.PeginClaimScript == "" {
+			// regular BTC withdrawal
 			log.Println("BTC withdrawal complete, txId: " + config.Config.PeginTxId)
 			telegramSendMessage("💸 BTC withdrawal complete. TxId: `" + config.Config.PeginTxId + "`")
 		} else if confs >= int32(peginBlocks) && ln.MyRole == "none" {
-			// claim individual peg-in
+			// pegin matured, claim individual peg-in
 			failed := false
 			proof := ""
 			txid := ""
@@ -1247,6 +1248,13 @@ func checkPegin() {
 				telegramSendMessage("💸 Peg-in complete! Liquid TxId: `" + txid + "`")
 			}
 		} else {
+			if ln.ClaimStatus == "Awaiting funding tx to confirm" {
+				// funding tx confirmed
+				ln.ClaimStatus = "Funding tx confirmed, awaiting maturity"
+				db.Save("ClaimJoin", "ClaimStatus", ln.ClaimStatus)
+				telegramSendMessage(ln.ClaimStatus + ", ETA: " + time.Now().Add(time.Hour*17).Format("3:04 PM"))
+			}
+
 			if config.Config.PeginClaimJoin {
 				if ln.MyRole == "none" {
 					claimHeight := currentBlockHeight + peginBlocks - uint32(confs)
@@ -1274,7 +1282,7 @@ func checkPegin() {
 			return
 		}
 
-		// stop trying after one attempt
+		// stop trying after one attempt to claim
 		config.Config.PeginTxId = ""
 		config.Save()
 	}

cmd/psweb/telegram.go

@@ -96,7 +96,7 @@ func telegramStart() {
 				} else {
 					if config.Config.PeginTxId != "external" {
 						confs, _ := peginConfirmations(config.Config.PeginTxId)
-						if config.Config.PeginClaimJoin {
+						if config.Config.PeginClaimJoin && ln.ClaimBlockHeight > 0 {
 							bh := ln.GetBlockHeight()
 							duration := time.Duration(10*(ln.ClaimBlockHeight-bh)) * time.Minute
 							if ln.ClaimBlockHeight == 0 {
@@ -121,11 +121,14 @@ func telegramStart() {
 								t = "⛓️ BTC withdrawal pending: "
 							}
 							t += formatWithThousandSeparators(uint64(config.Config.PeginAmount)) + " sats, Confs: " + strconv.Itoa(int(confs))
-							t += fmt.Sprintf(", sat/vb: %0.2f", config.Config.PeginFeeRate)
 							if config.Config.PeginClaimScript != "" {
 								t += "/102, ETA: " + eta
 							}
 							t += ". TxId: `" + config.Config.PeginTxId + "`"
+							if confs == 0 {
+								t += fmt.Sprintf(", sat/vb: %0.2f", config.Config.PeginFeeRate)
+							}
+
 						}
 					} else {
 						t = "Awaiting external funding to a peg-in address"