Merge pull request #109 from Impa10r/v5.0.2

v5.0.2

Author: Impa10r

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Versions
 
+## 5.0.2
+
+- Count only unlocked outputs as available Liquid balance 
+
 ## 5.0.1
 
 - Show correct fee rate in Telegram notifications

cmd/psweb/handlers.go

@@ -51,13 +51,7 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	swaps := res.GetSwaps()
 
-	res2, err := ps.LiquidGetBalance(client)
-	if err != nil {
-		redirectWithError(w, r, "/config?", err)
-		return
-	}
-
-	satAmount := res2.GetSatAmount()
+	satAmount := getUnlockedLbtcBalance()
 
 	// Lightning RPC client
 	cl, clean, er := ln.GetClient()
@@ -254,14 +248,7 @@ func peerHandler(w http.ResponseWriter, r *http.Request) {
 	allowlistedPeers := res2.GetAllowlistedPeers()
 	suspiciousPeers := res2.GetSuspiciousPeerList()
 
-	res3, err := ps.LiquidGetBalance(client)
-	if err != nil {
-		log.Printf("unable to connect to RPC server: %v", err)
-		redirectWithError(w, r, "/config?", err)
-		return
-	}
-
-	satAmount := res3.GetSatAmount()
+	satAmount := getUnlockedLbtcBalance()
 
 	res4, err := ps.ListActiveSwaps(client)
 	if err != nil {
@@ -1931,21 +1918,7 @@ func liquidHandler(w http.ResponseWriter, r *http.Request) {
 		addr = keys[0]
 	}
 
-	client, cleanup, err := ps.GetClient(config.Config.RpcHost)
-	if err != nil {
-		redirectWithError(w, r, "/config?", err)
-		return
-	}
-	defer cleanup()
-
-	res2, err := ps.LiquidGetBalance(client)
-	if err != nil {
-		log.Printf("unable to connect to RPC server: %v", err)
-		redirectWithError(w, r, "/?", err)
-		return
-	}
-
-	satAmount := res2.GetSatAmount()
+	satAmount := getUnlockedLbtcBalance()
 
 	var candidate AutoSwapParams
 

cmd/psweb/main.go

@@ -34,7 +34,7 @@ import (
 
 const (
 	// App VERSION tag
-	VERSION = "v5.0.1"
+	VERSION = "v5.0.2"
 	// Unusable BTC balance
 	ANCHOR_RESERVE = 25_000
 	// assume creatediscountct=1 for mainnet in elements.conf
@@ -406,6 +406,7 @@ func liquidBackup(force bool) {
 		return
 	}
 
+	// we don't care if some UTXOs may be locked
 	satAmount := res2.GetSatAmount()
 
 	// do not backup if the sat amount did not change
@@ -1507,12 +1508,7 @@ func executeAutoSwap() {
 		return
 	}
 
-	res, err := ps.LiquidGetBalance(client)
-	if err != nil {
-		return
-	}
-
-	satAmount := res.GetSatAmount()
+	satAmount := getUnlockedLbtcBalance()
 
 	if satAmount < config.Config.AutoSwapThresholdAmount {
 		return
@@ -1815,11 +1811,6 @@ func advertiseBalances() {
 	}
 	defer cleanup()
 
-	res2, err := ps.LiquidGetBalance(client)
-	if err != nil {
-		return
-	}
-
 	res3, err := ps.ListPeers(client)
 	if err != nil {
 		return
@@ -1837,7 +1828,8 @@ func advertiseBalances() {
 		bitcoinBalance -= ANCHOR_RESERVE
 	}
 
-	liquidBalance := res2.GetSatAmount()
+	liquidBalance := getUnlockedLbtcBalance()
+
 	// Elements does not permit sending the whole balance, haircut it
 	if liquidBalance >= uint64(SwapLbtcDustReserve) {
 		liquidBalance -= uint64(SwapLbtcDustReserve)
@@ -1972,3 +1964,14 @@ func pollBalances() {
 		log.Println("Polled peers for balances")
 	}
 }
+
+// returns spendable Liquid BTC balance
+func getUnlockedLbtcBalance() (liquidBalance uint64) {
+	var utxosLBTC []liquid.UTXO
+	// this list excludes locked outputs
+	liquid.ListUnspent(&utxosLBTC, elementsBitcoinId)
+	for _, utxo := range utxosLBTC {
+		liquidBalance += toSats(utxo.Amount)
+	}
+	return
+}