Merge pull request #44 from Impa10r/v1.4.4

v1.4.4

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Versions
 
+## 1.4.4
+
+- Fix panic in v1.4.3
+
 ## 1.4.3
 
 - Add http retry middleware

cmd/psweb/main.go

@@ -33,7 +33,7 @@ import (
 
 const (
 	// App version tag
-	version = "v1.4.3"
+	version = "v1.4.4"
 
 	// Liquid balance to reserve in auto swaps
 	// Min is 1000, but the swap will spend it all on fee
@@ -432,19 +432,6 @@ func peerHandler(w http.ResponseWriter, r *http.Request) {
 	receiverOutFeePPM := int64(0)
 	senderOutFeePPM := int64(0)
 
-	if peer.AsSender.SatsOut > 0 {
-		senderOutFeePPM = int64(peer.PaidFee) * 1_000_000 / int64(peer.AsSender.SatsOut)
-	}
-	if peer.AsSender.SatsIn > 0 {
-		senderInFeePPM = senderInFee * 1_000_000 / int64(peer.AsSender.SatsIn)
-	}
-	if peer.AsReceiver.SatsOut > 0 {
-		receiverOutFeePPM = receiverOutFee * 1_000_000 / int64(peer.AsReceiver.SatsOut)
-	}
-	if peer.AsReceiver.SatsIn > 0 {
-		receiverInFeePPM = receiverInFee * 1_000_000 / int64(peer.AsReceiver.SatsIn)
-	}
-
 	// Get Lightning client
 	cl, clean, er := ln.GetClient()
 	if er != nil {
@@ -465,6 +452,19 @@ func peerHandler(w http.ResponseWriter, r *http.Request) {
 		}
 		peer = res.GetPeers()[0]
 		psPeer = false
+	} else {
+		if peer.AsSender.SatsOut > 0 {
+			senderOutFeePPM = int64(peer.PaidFee) * 1_000_000 / int64(peer.AsSender.SatsOut)
+		}
+		if peer.AsSender.SatsIn > 0 {
+			senderInFeePPM = senderInFee * 1_000_000 / int64(peer.AsSender.SatsIn)
+		}
+		if peer.AsReceiver.SatsOut > 0 {
+			receiverOutFeePPM = receiverOutFee * 1_000_000 / int64(peer.AsReceiver.SatsOut)
+		}
+		if peer.AsReceiver.SatsIn > 0 {
+			receiverInFeePPM = receiverInFee * 1_000_000 / int64(peer.AsReceiver.SatsIn)
+		}
 	}
 
 	var sumLocal uint64

cmd/psweb/templates/peer.gohtml

@@ -199,16 +199,16 @@ Sincerely,
                 <tr style="border: 1px dotted">
                   <td style="text-align: center">Sent
                   <td title="Initiated {{fmt .Peer.AsSender.SwapsIn}} swap-ins for {{fmt .Peer.AsSender.SatsIn}} sats total" style="text-align: center">{{m .Peer.AsSender.SatsIn}}</td>
-                  <td title="Chain fees paid, Sats (PPM)" style="text-align: center">{{fs .SenderInFee}} ({{fs .SenderInFeePPM}})</td>
+                  <td title="Chain fees paid, Sats (PPM)" style="text-align: center">{{fs .SenderInFee}}{{if .SenderInFee}} ({{fs .SenderInFeePPM}}){{end}}</td>
                   <td title="Initiated {{fmt .Peer.AsSender.SwapsOut}} swap-outs for {{fmt .Peer.AsSender.SatsOut}} sats total" style="text-align: center">{{m .Peer.AsSender.SatsOut}}</td>
-                  <td title="Fees rebated to peer, Sats (PPM)" style="text-align: center">{{fmt .Peer.PaidFee}} ({{fs .SenderOutFeePPM}})</td>
+                  <td title="Fees rebated to peer, Sats (PPM)" style="text-align: center">{{fmt .Peer.PaidFee}}{{if .Peer.PaidFee}} ({{fs .SenderOutFeePPM}}){{end}}</td>
                 </tr>
                 <tr style="border: 1px dotted">
                   <td style="text-align: center">Rcvd
                   <td title="Received {{fmt .Peer.AsReceiver.SwapsOut}} swap-outs for {{fmt .Peer.AsReceiver.SatsOut}} sats total" style="text-align: center">{{m .Peer.AsReceiver.SatsOut}}</td>
-                  <td title="Chain fees paid less rebates, Sats (PPM)" style="text-align: center">{{fs .ReceiverOutFee}} ({{fs .ReceiverOutFeePPM}})</td>
+                  <td title="Chain fees paid less rebates, Sats (PPM)" style="text-align: center">{{fs .ReceiverOutFee}}{{if .ReceiverOutFee}} ({{fs .ReceiverOutFeePPM}}){{end}}</td>
                   <td title="Received {{fmt .Peer.AsReceiver.SwapsIn}} swap-ins for {{fmt .Peer.AsReceiver.SatsIn}} sats total" style="text-align: center">{{m .Peer.AsReceiver.SatsIn}}</td>
-                  <td title="Chain fees paid, Sats (PPM)" style="text-align: center">{{fs .ReceiverInFee}} ({{fs .ReceiverInFeePPM}})</td>
+                  <td title="Chain fees paid, Sats (PPM)" style="text-align: center">{{fs .ReceiverInFee}}{{if .ReceiverInFee}} ({{fs .ReceiverInFeePPM}}){{end}}</td>
                 </tr>
               </table>  
             {{end}}