Merge pull request #103 from dogecoinfoundation/rf-mark-events-sent

Fix MarkInvoiceEventSent SQL, and check for errors
dogecoinfoundation · Aug 31, 2023 · b80f406 · b80f406
2 parents 52ec3f0 + 00d8d86
commit b80f406
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/pkg/services/balancekeeper.go b/pkg/services/balancekeeper.go
@@ -214,7 +214,11 @@ func (b BalanceKeeper) sendInvoiceEvents(tx giga.StoreTransaction, acc *giga.Acc
 					b.bus.Send(giga.SYS_MSG, fmt.Sprintf("BalanceKeeper: %s: %s in %s\n", event, inv.ID, id))
 				}
 				// This updates LastIncomingAmount from IncomingAmount.
-				tx.MarkInvoiceEventSent(inv.ID, giga.INV_PART_PAYMENT_DETECTED)
+				err = tx.MarkInvoiceEventSent(inv.ID, giga.INV_PART_PAYMENT_DETECTED)
+				if err != nil {
+					log.Printf("BalanceKeeper: MarkInvoiceEventSent: '%s': %v\n", inv.ID, err)
+					return err
+				}
 			}
 			if inv.PaidHeight != 0 && inv.PaidEvent.IsZero() {
 				// invoice is fully paid and confirmed.
@@ -236,7 +240,7 @@ func (b BalanceKeeper) sendInvoiceEvents(tx giga.StoreTransaction, acc *giga.Acc
 				}
 				err = tx.MarkInvoiceEventSent(inv.ID, event)
 				if err != nil {
-					log.Printf("BalanceKeeper: MarkInvoiceEventSent '%s': %v\n", id, err)
+					log.Printf("BalanceKeeper: MarkInvoiceEventSent '%s': %v\n", inv.ID, err)
 					return err
 				}
 				b.bus.Send(giga.SYS_MSG, fmt.Sprintf("BalanceKeeper: %s: %s in %s\n", event, inv.ID, id))
@@ -259,7 +263,7 @@ func (b BalanceKeeper) sendInvoiceEvents(tx giga.StoreTransaction, acc *giga.Acc
 				}
 				err = tx.MarkInvoiceEventSent(inv.ID, event)
 				if err != nil {
-					log.Printf("BalanceKeeper: MarkInvoiceEventSent '%s': %v\n", id, err)
+					log.Printf("BalanceKeeper: MarkInvoiceEventSent '%s': %v\n", inv.ID, err)
 					return err
 				}
 				b.bus.Send(giga.SYS_MSG, fmt.Sprintf("BalanceKeeper: %s: %s in %s\n", event, inv.ID, id))
@@ -284,7 +288,11 @@ func (b BalanceKeeper) sendInvoiceEvents(tx giga.StoreTransaction, acc *giga.Acc
 					return err
 				}
 				// This updates LastPaidAmount from PaidAmount.
-				tx.MarkInvoiceEventSent(inv.ID, event)
+				err = tx.MarkInvoiceEventSent(inv.ID, event)
+				if err != nil {
+					log.Printf("BalanceKeeper: MarkInvoiceEventSent: '%s': %v\n", inv.ID, err)
+					return err
+				}
 				b.bus.Send(giga.SYS_MSG, fmt.Sprintf("BalanceKeeper: %s: %s in %s\n", event, inv.ID, id))
 			}
 		}

diff --git a/pkg/store/sqlite.go b/pkg/store/sqlite.go
@@ -835,15 +835,18 @@ func (t SQLiteStoreTransaction) ConfirmUTXOs(confirmations int, blockHeight int6
 	return
 }
 
+const incoming_amount_sql = "UPDATE invoice SET last_incoming=COALESCE((SELECT SUM(value) FROM utxo WHERE added_height IS NOT NULL AND script_address=invoice.invoice_address),0) WHERE invoice_address=$1"
+const paid_amount_sql = "UPDATE invoice SET last_paid=COALESCE((SELECT SUM(value) FROM utxo WHERE spendable_height IS NOT NULL AND script_address=invoice.invoice_address),0) WHERE invoice_address=$1"
+
 func (t SQLiteStoreTransaction) MarkInvoiceEventSent(invoiceID giga.Address, event giga.EVENT_INV) error {
 	sql := ""
 	switch event {
 	case giga.INV_PART_PAYMENT_DETECTED, giga.INV_TOTAL_PAYMENT_DETECTED, giga.INV_OVER_PAYMENT_DETECTED:
 		// set LastIncomingAmount = IncomingAmount
-		sql = "UPDATE invoice SET last_incoming_amount=incoming_amount WHERE invoice_address=$1"
+		sql = incoming_amount_sql // "UPDATE invoice SET last_incoming=incoming_amount WHERE invoice_address=$1"
 	case giga.INV_OVER_PAYMENT_CONFIRMED:
 		// set LastPaidAmount = PaidAmount
-		sql = "UPDATE invoice SET last_paid_amount=paid_amount WHERE invoice_address=$1"
+		sql = paid_amount_sql // "UPDATE invoice SET last_paid=paid_amount WHERE invoice_address=$1"
 	case giga.INV_TOTAL_PAYMENT_CONFIRMED:
 		// set paid_event = NOW
 		sql = "UPDATE invoice SET paid_event=CURRENT_TIMESTAMP WHERE invoice_address=$1"