checking pending invoices and payments from lndhub interface.

lnbits/core/crud.py

@@ -145,7 +145,13 @@ def get_wallet_payment(wallet_id: str, payment_hash: str) -> Optional[Payment]:
 
 
 def get_wallet_payments(
-    wallet_id: str, *, complete: bool = False, pending: bool = False, outgoing: bool = False, incoming: bool = False
+    wallet_id: str,
+    *,
+    complete: bool = False,
+    pending: bool = False,
+    outgoing: bool = False,
+    incoming: bool = False,
+    exclude_uncheckable: bool = False,
 ) -> List[Payment]:
     """
     Filters payments to be returned by complete | pending | outgoing | incoming.
@@ -161,6 +167,8 @@ def get_wallet_payments(
     else:
         raise TypeError("at least one of [complete, pending] must be True.")
 
+    clause += " "
+
     if outgoing and incoming:
         clause += ""
     elif outgoing:
@@ -170,6 +178,12 @@ def get_wallet_payments(
     else:
         raise TypeError("at least one of [outgoing, incoming] must be True.")
 
+    clause += " "
+
+    if exclude_uncheckable:  # checkable means it has a checking_id that isn't internal
+        clause += "AND checking_id NOT LIKE 'temp_%' "
+        clause += "AND checking_id NOT LIKE 'internal_%' "
+
     rows = g.db.fetchall(
         f"""
         SELECT *

lnbits/core/models.py

@@ -37,11 +37,24 @@ class Wallet(NamedTuple):
         return get_wallet_payment(self.id, payment_hash)
 
     def get_payments(
-        self, *, complete: bool = True, pending: bool = False, outgoing: bool = True, incoming: bool = True
+        self,
+        *,
+        complete: bool = True,
+        pending: bool = False,
+        outgoing: bool = True,
+        incoming: bool = True,
+        exclude_uncheckable: bool = False
     ) -> List["Payment"]:
         from .crud import get_wallet_payments
 
-        return get_wallet_payments(self.id, complete=complete, pending=pending, outgoing=outgoing, incoming=incoming)
+        return get_wallet_payments(
+            self.id,
+            complete=complete,
+            pending=pending,
+            outgoing=outgoing,
+            incoming=incoming,
+            exclude_uncheckable=exclude_uncheckable,
+        )
 
 
 class Payment(NamedTuple):
@@ -60,9 +73,9 @@ class Payment(NamedTuple):
     def from_row(cls, row: Row):
         return cls(
             checking_id=row["checking_id"],
-            payment_hash=row["hash"],
-            bolt11=row["bolt11"],
-            preimage=row["preimage"],
+            payment_hash=row["hash"] or "0" * 64,
+            bolt11=row["bolt11"] or "",
+            preimage=row["preimage"] or "0" * 64,
             extra=json.loads(row["extra"] or "{}"),
             pending=row["pending"],
             amount=row["amount"],

lnbits/core/views/api.py

@@ -16,10 +16,8 @@ def api_payments():
     if "check_pending" in request.args:
         delete_expired_invoices()
 
-        for payment in g.wallet.get_payments(complete=False, pending=True):
-            if payment.is_uncheckable:
-                pass
-            elif payment.is_out:
+        for payment in g.wallet.get_payments(complete=False, pending=True, exclude_uncheckable=True):
+            if payment.is_out:
                 payment.set_pending(WALLET.get_payment_status(payment.checking_id).pending)
             else:
                 payment.set_pending(WALLET.get_invoice_status(payment.checking_id).pending)