Merge pull request #75 from Impa10r/v1.6.3

v1.6.3
Impa10r · Jul 8, 2024 · 9073ac7 · 9073ac7
2 parents 4040535 + 2fce338
commit 9073ac7
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Versions
 
+## 1.6.3
+
+- Fix bug in accounting for non-peerswap related invoices
+
 ## 1.6.2
 
 - Fix 'invalid asset' bug

diff --git a/cmd/psweb/handlers.go b/cmd/psweb/handlers.go
@@ -710,10 +710,10 @@ func peginHandler(w http.ResponseWriter, r *http.Request) {
 			log.Println("Peg-in TxId:", res.TxId, "RawHex:", res.RawHex, "Claim script:", claimScript)
 			duration := time.Duration(1020) * time.Minute
 			formattedDuration := time.Time{}.Add(duration).Format("15h 04m")
-			telegramSendMessage("⏰ Started peg-in " + formatWithThousandSeparators(uint64(res.AmountSat)) + " sats. Time left: " + formattedDuration)
+			telegramSendMessage("⏰ Started peg-in " + formatWithThousandSeparators(uint64(res.AmountSat)) + " sats. Time left: " + formattedDuration + ". TxId: `" + res.TxId + "`")
 		} else {
-			log.Println("BTC withdrawal TxId:", res.TxId, "RawHex:", res.RawHex)
-			telegramSendMessage("BTC withdrawal pending: " + formatWithThousandSeparators(uint64(res.AmountSat)) + " sats.")
+			log.Println("BTC withdrawal pending, TxId:", res.TxId, "RawHex:", res.RawHex)
+			telegramSendMessage("BTC withdrawal pending: " + formatWithThousandSeparators(uint64(res.AmountSat)) + " sats. TxId: `" + res.TxId + "`")
 		}
 
 		config.Config.PeginClaimScript = claimScript

diff --git a/cmd/psweb/ln/cln.go b/cmd/psweb/ln/cln.go
@@ -932,11 +932,12 @@ func fetchPaymentsStats(client *glightning.Lightning, timeStamp uint64, channelI
 							// save rebate payment
 							saveSwapRabate(parts[4], int64(htlc.AmountMsat)/1000)
 						}
-					} else {
-						// only account for non-peerswap related
-						invoicedMsat += htlc.AmountMsat
+						continue
 					}
 				}
+
+				// only account for non-peerswap related
+				invoicedMsat += htlc.AmountMsat
 			}
 
 		case "RCVD_REMOVE_ACK_REVOCATION":

diff --git a/cmd/psweb/ln/lnd.go b/cmd/psweb/ln/lnd.go
@@ -1120,13 +1120,13 @@ func appendInvoice(invoice *lnrpc.Invoice) {
 					// save rebate payment
 					saveSwapRabate(parts[4], invoice.AmtPaidMsat/1000)
 				}
-			} else {
 				// skip peerswap-related
-				for _, htlc := range invoice.Htlcs {
-					if htlc.State == lnrpc.InvoiceHTLCState_SETTLED {
-						invoiceHtlcs[htlc.ChanId] = append(invoiceHtlcs[htlc.ChanId], htlc)
-					}
-				}
+				return
+			}
+		}
+		for _, htlc := range invoice.Htlcs {
+			if htlc.State == lnrpc.InvoiceHTLCState_SETTLED {
+				invoiceHtlcs[htlc.ChanId] = append(invoiceHtlcs[htlc.ChanId], htlc)
 			}
 		}
 	}

diff --git a/cmd/psweb/main.go b/cmd/psweb/main.go
@@ -35,7 +35,7 @@ import (
 
 const (
 	// App version tag
-	version = "v1.6.2"
+	version = "v1.6.3"
 )
 
 type SwapParams struct {
@@ -1057,8 +1057,8 @@ func checkPegin() {
 
 	if confs > 0 {
 		if config.Config.PeginClaimScript == "" {
-			log.Println("BTC withdrawal complete")
-			telegramSendMessage("BTC withdrawal complete")
+			log.Println("BTC withdrawal complete, txId: " + config.Config.PeginTxId)
+			telegramSendMessage("BTC withdrawal complete. TxId: `" + config.Config.PeginTxId + "`")
 		} else if confs > 101 {
 			// claim pegin
 			failed := false
@@ -1089,7 +1089,7 @@ func checkPegin() {
 				telegramSendMessage("❗ Peg-in claim FAILED! See log for details.")
 			} else {
 				log.Println("Peg-in success! Liquid TxId:", txid)
-				telegramSendMessage("💸 Peg-in success!")
+				telegramSendMessage("💸 Peg-in success! Liquid TxId: `" + txid + "`")
 			}
 		} else {
 			return

diff --git a/cmd/psweb/telegram.go b/cmd/psweb/telegram.go
@@ -100,6 +100,7 @@ func telegramStart() {
 						if config.Config.PeginClaimScript != "" {
 							t += "/102, Time left: " + formattedDuration
 						}
+						t += ". TxId: `" + config.Config.PeginTxId + "`"
 						clean()
 					}
 				}
@@ -177,6 +178,8 @@ func telegramSendMessage(msgText string) bool {
 		return false
 	}
 	msg := tgbotapi.NewMessage(chatId, msgText)
+	msg.ParseMode = "MarkdownV2"
+
 	_, err := bot.Send(msg)
 	if err != nil {
 		log.Println(err)