make it configureable

Uvicorn's default ws_ping_interval=20 / ws_ping_timeout=20 can
non-deterministically close local WebSocket connections (e.g. NWC provider
↔ nostrclient relay) under event-loop load. The client side already sends
its own pings, so server-side pings are redundant here.

See discussion:
https://github.com/lnbits/nostrclient/pull/71#issuecomment-4803033307

docs/guide/installation.md

@@ -51,7 +51,7 @@ nav_order: 1
 sudo apt-get install jq libfuse2
 wget $(curl -s https://api.github.com/repos/lnbits/lnbits/releases/latest | jq -r '.assets[] | select(.name | endswith(".AppImage")) | .browser_download_url') -O LNbits-latest.AppImage
 chmod +x LNbits-latest.AppImage
-LNBITS_ADMIN_UI=true HOST=0.0.0.0 PORT=5000 ./LNbits-latest.AppImage # most system settings are now in the admin UI, but pass additional .env variables here
+LNBITS_ADMIN_UI=true HOST=0.0.0.0 PORT=5000 AUTH_HTTPS_ONLY=false ./LNbits-latest.AppImage # most system settings are now in the admin UI, but pass additional .env variables here
 ```
 
 - LNbits will create a folder for DB and extension files **in the same directory** as the AppImage.
@@ -285,10 +285,7 @@ but you can also set the env variables or pass command line arguments:
 
 ```sh
 # .env variables are currently passed when running, but LNbits can be managed with the admin UI.
-LNBITS_ADMIN_UI=true ./result/bin/lnbits --port 9000 --host 0.0.0.0
-
-# Once you have created a user, you can set as the super_user
-SUPER_USER=be54db7f245346c8833eaa430e1e0405 LNBITS_ADMIN_UI=true ./result/bin/lnbits --port 9000
+LNBITS_ADMIN_UI=true AUTH_HTTPS_ONLY=false ./result/bin/lnbits --port 9000 --host 0.0.0.0
 ```
 
 > ![NOTE](https://img.shields.io/badge/NOTE-3b82f6?labelColor=494949)

lnbits/core/crud/payments.py

@@ -16,7 +16,6 @@ from ..models import (
     PaymentFilters,
     PaymentHistoryPoint,
     PaymentsStatusCount,
-    PaymentTotalBreakdown,
     PaymentWalletStats,
 )
 
@@ -291,6 +290,7 @@ async def create_payment(
         webhook=data.webhook,
         fee=-abs(data.fee),
         tag=extra.get("tag", None),
+        extension=data.extension,
         extra=extra,
         labels=data.labels or [],
         external_id=data.external_id,
@@ -429,44 +429,6 @@ async def get_payment_count_stats(
     return data
 
 
-async def get_wallet_payment_total_breakdown(
-    wallet_id: str,
-    conn: Connection | None = None,
-) -> list[PaymentTotalBreakdown]:
-    wallet = await get_wallet(wallet_id, conn=conn)
-    if not wallet or not wallet.can_view_payments:
-        return []
-
-    values = {"wallet_id": wallet.source_wallet_id}
-    data = await (conn or db).fetchall(
-        query=f"""
-            SELECT tag,
-                CASE
-                    WHEN fiat_provider IS NOT NULL
-                    OR checking_id LIKE 'fiat_%'
-                    OR extra LIKE '%"fiat_payment_request"%'
-                    OR extra LIKE '%"fiat_amount"%'
-                    THEN true
-                    ELSE false
-                END AS is_fiat,
-                COUNT(*) AS payments_count,
-                SUM(amount - ABS(fee)) AS total
-            FROM apipayments
-            WHERE wallet_id = :wallet_id
-            AND (
-                status = '{PaymentState.SUCCESS}'
-                OR (amount < 0 AND status = '{PaymentState.PENDING}')
-            )
-            GROUP BY tag, is_fiat
-            ORDER BY tag
-        """,  # noqa: S608
-        values=values,
-        model=PaymentTotalBreakdown,
-    )
-
-    return data
-
-
 async def get_daily_stats(
     filters: Filters[PaymentFilters] | None = None,
     user_id: str | None = None,

lnbits/core/models/__init__.py

@@ -23,7 +23,6 @@ from .payments import (
     PaymentHistoryPoint,
     PaymentsStatusCount,
     PaymentState,
-    PaymentTotalBreakdown,
     PaymentWalletStats,
     SettleInvoice,
     UpdatePaymentExtra,
@@ -84,7 +83,6 @@ __all__ = [
     "PaymentFilters",
     "PaymentHistoryPoint",
     "PaymentState",
-    "PaymentTotalBreakdown",
     "PaymentWalletStats",
     "PaymentsStatusCount",
     "RegisterUser",

lnbits/core/models/payments.py

@@ -54,6 +54,7 @@ class CreatePayment(BaseModel):
     amount_msat: int
     memo: str
     extra: dict | None = {}
+    extension: str | None = None
     preimage: str | None = None
     expiry: datetime | None = None
     webhook: str | None = None
@@ -220,13 +221,6 @@ class PaymentWalletStats(BaseModel):
     balance: float = 0
 
 
-class PaymentTotalBreakdown(BaseModel):
-    tag: str | None = None
-    is_fiat: bool = False
-    payments_count: int = 0
-    total: int = 0
-
-
 class PaymentDailyStats(BaseModel):
     date: datetime
     balance: float = 0
@@ -266,6 +260,7 @@ class CreateInvoice(BaseModel):
     )
     expiry: int | None = None
     extra: dict | None = None
+    extension: str | None = None
     webhook: str | None = None
     bolt11: str | None = None
     lnurl_withdraw: LnurlWithdrawResponse | None = None

lnbits/core/services/payments.py

@@ -214,6 +214,7 @@ async def create_wallet_invoice(wallet_id: str, data: CreateInvoice) -> Payment:
             unhashed_description=unhashed_description,
             expiry=data.expiry,
             extra=data.extra,
+            extension=data.extension,
             webhook=data.webhook,
             internal=data.internal,
             payment_hash=data.payment_hash,
@@ -259,6 +260,7 @@ async def create_invoice(
     webhook: str | None = None,
     internal: bool | None = False,
     payment_hash: str | None = None,
+    extension: str | None = None,
     labels: list[str] | None = None,
     external_id: str | None = None,
     conn: Connection | None = None,
@@ -342,6 +344,7 @@ async def create_invoice(
         expiry=invoice.expiry_date,
         memo=memo,
         extra=extra,
+        extension=extension,
         webhook=webhook,
         fee=invoice_response.fee_msat or 0,
         labels=labels,

lnbits/core/views/payment_api.py

@@ -14,7 +14,6 @@ from lnurl import url_decode
 from lnbits import bolt11
 from lnbits.core.crud.payments import (
     get_payment_count_stats,
-    get_wallet_payment_total_breakdown,
     get_wallets_stats,
     update_payment,
 )
@@ -32,7 +31,6 @@ from lnbits.core.models import (
     PaymentDailyStats,
     PaymentFilters,
     PaymentHistoryPoint,
-    PaymentTotalBreakdown,
     PaymentWalletStats,
     SettleInvoice,
     SimpleStatus,
@@ -133,17 +131,6 @@ async def api_payments_counting_stats(
     return await get_payment_count_stats(count_by, filters=filters, user_id=for_user_id)
 
 
-@payment_router.get(
-    "/stats/breakdown",
-    name="Get wallet payment total breakdown",
-    response_model=list[PaymentTotalBreakdown],
-)
-async def api_payments_total_breakdown(
-    key_info: BaseWalletTypeInfo = Depends(require_base_invoice_key),
-):
-    return await get_wallet_payment_total_breakdown(key_info.wallet.id)
-
-
 @payment_router.get(
     "/stats/wallets",
     name="Get payments history for all users",

lnbits/server.py

@@ -27,6 +27,8 @@ from lnbits.settings import set_cli_settings, settings
 @click.option(
     "--reload", is_flag=True, default=False, help="Enable auto-reload for development"
 )
+@click.option("--ws-max-queue", default=128, help="Websocket max queue size")
+@click.option("--ws-ping-timeout", default=900.0, help="Websocket ping timeout")
 def main(
     port: int,
     host: str,
@@ -34,6 +36,8 @@ def main(
     ssl_keyfile: str,
     ssl_certfile: str,
     reload: bool,
+    ws_max_queue: int,
+    ws_ping_timeout: float
 ):
     """Launched with `uv run lnbits` at root level"""
 
@@ -58,6 +62,8 @@ def main(
             ssl_keyfile=ssl_keyfile,
             ssl_certfile=ssl_certfile,
             reload=reload or False,
+            ws_ping_timeout=ws_ping_timeout,
+            ws_max_queue=ws_max_queue,
         )
 
         server = uvicorn.Server(config=config)

lnbits/static/js/api.js

@@ -175,9 +175,6 @@ window._lnbitsApi = {
       wallet.inkey
     )
   },
-  getPaymentTotalBreakdown(wallet) {
-    return this.request('get', '/api/v1/payments/stats/breakdown', wallet.inkey)
-  },
   getPayment(wallet, paymentHash) {
     return this.request('get', '/api/v1/payments/' + paymentHash, wallet.inkey)
   },

lnbits/static/js/pages/wallet.js

@@ -48,13 +48,6 @@ window.PageWallet = {
       hasNfc: false,
       nfcReaderAbortController: null,
       formattedFiatAmount: 0,
-      totalBreakdown: {
-        show: false,
-        loading: false,
-        rows: [],
-        selectedTypes: ['bitcoin', 'fiat'],
-        selectedTags: []
-      },
       paymentFilter: {
         'status[ne]': 'failed'
       },
@@ -91,116 +84,9 @@ window.PageWallet = {
     },
     formattedSatAmount() {
       return LNbits.utils.formatMsat(this.receive.amountMsat) + ' sat'
-    },
-    totalBreakdownTags() {
-      const tags = this.totalBreakdown.rows.map(row => row.tag || null)
-      return [...new Set(tags)].sort((a, b) =>
-        this.totalBreakdownTagLabel(a).localeCompare(
-          this.totalBreakdownTagLabel(b)
-        )
-      )
-    },
-    hasFiatTotalBreakdown() {
-      return this.totalBreakdown.rows.some(row => row.is_fiat)
-    },
-    selectedTotalBreakdownRows() {
-      return this.totalBreakdown.rows.filter(row => {
-        const type = row.is_fiat ? 'fiat' : 'bitcoin'
-        return (
-          this.totalBreakdown.selectedTypes.includes(type) &&
-          this.totalBreakdown.selectedTags.includes(
-            this.totalBreakdownTagKey(row.tag)
-          )
-        )
-      })
-    },
-    selectedTotalBreakdownMsat() {
-      return this.selectedTotalBreakdownRows.reduce(
-        (total, row) => total + row.total,
-        0
-      )
-    },
-    selectedTotalBreakdownSat() {
-      return Math.round(this.selectedTotalBreakdownMsat / 1000)
-    },
-    selectedTotalBreakdownCount() {
-      return this.selectedTotalBreakdownRows.reduce(
-        (total, row) => total + row.payments_count,
-        0
-      )
-    },
-    formattedTotalBreakdown() {
-      return this.utils.formatBalance(
-        this.selectedTotalBreakdownSat,
-        this.g.denomination
-      )
-    },
-    formattedTotalBreakdownFiat() {
-      if (!this.g.fiatTracking) return null
-      const amount =
-        (this.selectedTotalBreakdownSat / 100000000) * this.g.exchangeRate
-      return LNbits.utils.formatCurrency(amount, this.g.wallet.currency)
-    },
-    primaryTotalBreakdownValue() {
-      if (this.g.isFiatPriority && this.g.fiatTracking) {
-        return this.formattedTotalBreakdownFiat || this.formattedTotalBreakdown
-      }
-      return this.formattedTotalBreakdown
-    },
-    secondaryTotalBreakdownValue() {
-      if (!this.g.fiatTracking) return null
-      if (this.g.isFiatPriority) {
-        return this.formattedTotalBreakdown
-      }
-      return this.formattedTotalBreakdownFiat
     }
   },
   methods: {
-    showWalletTotalBreakdown() {
-      this.totalBreakdown.show = true
-      if (!this.totalBreakdown.rows.length) {
-        this.fetchTotalBreakdown()
-      }
-    },
-    fetchTotalBreakdown() {
-      this.totalBreakdown.loading = true
-      LNbits.api
-        .getPaymentTotalBreakdown(this.g.wallet)
-        .then(response => {
-          this.totalBreakdown.rows = response.data
-          this.totalBreakdown.selectedTypes = ['bitcoin', 'fiat']
-          this.totalBreakdown.selectedTags = this.totalBreakdownTags.map(
-            this.totalBreakdownTagKey
-          )
-          this.totalBreakdown.loading = false
-        })
-        .catch(err => {
-          this.totalBreakdown.loading = false
-          LNbits.utils.notifyApiError(err)
-        })
-    },
-    totalBreakdownTagLabel(tag) {
-      return tag || 'No tag'
-    },
-    totalBreakdownTagKey(tag) {
-      return tag || '__untagged__'
-    },
-    totalBreakdownTagCount(tag) {
-      return this.totalBreakdown.rows
-        .filter(row => (row.tag || null) === tag)
-        .reduce((total, row) => total + row.payments_count, 0)
-    },
-    totalBreakdownTagMsat(tag) {
-      return this.totalBreakdown.rows
-        .filter(row => (row.tag || null) === tag)
-        .reduce((total, row) => total + row.total, 0)
-    },
-    formatTotalBreakdownMsat(msat) {
-      return this.utils.formatBalance(
-        Math.round(msat / 1000),
-        this.g.denomination
-      )
-    },
     handleSendLnurl(lnurl) {
       this.parse.data.request = lnurl
       this.parse.show = true

lnbits/templates/pages/wallet.vue

@@ -28,13 +28,7 @@
                 <div class="col-7">
                   <div class="row">
                     <div class="col-auto">
-                      <div
-                        class="text-h3 q-my-none full-width cursor-pointer"
-                        role="button"
-                        tabindex="0"
-                        @click="showWalletTotalBreakdown"
-                        @keyup.enter="showWalletTotalBreakdown"
-                      >
+                      <div class="text-h3 q-my-none full-width">
                         <strong
                           v-text="
                             utils.formatBalance(g.wallet.sat, g.denomination)
@@ -83,11 +77,7 @@
                     <div class="col-auto">
                       <div
                         v-if="g.fiatTracking"
-                        class="text-h3 q-my-none text-no-wrap cursor-pointer"
-                        role="button"
-                        tabindex="0"
-                        @click="showWalletTotalBreakdown"
-                        @keyup.enter="showWalletTotalBreakdown"
+                        class="text-h3 q-my-none text-no-wrap"
                       >
                         <strong v-text="formattedFiatAmount"></strong>
                       </div>
@@ -238,113 +228,6 @@
     </div>
   </div>
 
-  <q-dialog v-model="totalBreakdown.show" position="top">
-    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <q-card-section>
-        <div class="row items-start q-mb-md">
-          <div class="col">
-            <div
-              class="text-h4 text-bold"
-              v-text="primaryTotalBreakdownValue"
-            ></div>
-            <div
-              v-if="secondaryTotalBreakdownValue"
-              class="text-h6 text-italic"
-              style="opacity: 0.75"
-              v-text="secondaryTotalBreakdownValue"
-            ></div>
-            <div
-              class="text-caption text-grey-5"
-              v-text="selectedTotalBreakdownCount + ' payments'"
-            ></div>
-          </div>
-          <q-btn
-            flat
-            dense
-            round
-            color="grey"
-            icon="refresh"
-            :loading="totalBreakdown.loading"
-            @click="fetchTotalBreakdown"
-          >
-            <q-tooltip>Refresh</q-tooltip>
-          </q-btn>
-        </div>
-
-        <q-inner-loading :showing="totalBreakdown.loading"></q-inner-loading>
-
-        <div v-if="hasFiatTotalBreakdown" class="q-mb-md">
-          <q-checkbox
-            v-model="totalBreakdown.selectedTypes"
-            val="bitcoin"
-            label="Bitcoin"
-          ></q-checkbox>
-          <q-checkbox
-            v-model="totalBreakdown.selectedTypes"
-            val="fiat"
-            label="Fiat"
-          ></q-checkbox>
-        </div>
-
-        <q-separator v-if="hasFiatTotalBreakdown" class="q-mb-md"></q-separator>
-
-        <div style="max-height: min(52vh, 420px); overflow-y: auto">
-          <q-list dense>
-            <q-item
-              v-for="tag in totalBreakdownTags"
-              :key="totalBreakdownTagKey(tag)"
-              tag="label"
-              v-ripple
-            >
-              <q-item-section side>
-                <q-checkbox
-                  v-model="totalBreakdown.selectedTags"
-                  :val="totalBreakdownTagKey(tag)"
-                ></q-checkbox>
-              </q-item-section>
-              <q-item-section>
-                <q-item-label>
-                  <q-badge
-                    v-if="tag"
-                    color="yellow"
-                    text-color="black"
-                    v-text="'#' + tag"
-                  ></q-badge>
-                  <span v-else v-text="totalBreakdownTagLabel(tag)"></span>
-                </q-item-label>
-                <q-item-label
-                  caption
-                  v-text="totalBreakdownTagCount(tag) + ' payments'"
-                ></q-item-label>
-              </q-item-section>
-              <q-item-section side>
-                <span
-                  v-text="formatTotalBreakdownMsat(totalBreakdownTagMsat(tag))"
-                ></span>
-              </q-item-section>
-            </q-item>
-          </q-list>
-        </div>
-
-        <div v-if="!totalBreakdown.loading && !totalBreakdown.rows.length">
-          <q-banner class="bg-transparent text-grey-5">
-            No completed payments.
-          </q-banner>
-        </div>
-
-        <div class="row q-mt-md">
-          <q-btn
-            v-close-popup
-            flat
-            color="grey"
-            class="q-ml-auto"
-            :label="$t('close')"
-          ></q-btn>
-        </div>
-      </q-card-section>
-    </q-card>
-  </q-dialog>
-
   <q-dialog v-model="receive.show" position="top" @hide="onReceiveDialogHide">
     <q-card
       v-if="!receive.paymentReq"

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lnbits"
-version = "1.5.5-rc3"
+version = "1.5.5"
 requires-python = ">=3.10,<3.13"
 description = "LNbits, free and open-source Lightning wallet and accounts system."
 authors = [{ name = "Alan Bits", email = "alan@lnbits.com" }]

tests/api/test_payment_api.py

@@ -6,16 +6,11 @@ import pytest
 from fastapi import HTTPException
 from pydantic import ValidationError
 
-from lnbits.core.crud.payments import (
-    create_payment,
-    get_payment,
-    get_payments,
-    update_payment,
-)
+from lnbits.core.crud.payments import create_payment, get_payment, get_payments
 from lnbits.core.models import Account, CreateInvoice, PaymentFilters, PaymentState
 from lnbits.core.models.payments import CancelInvoice, CreatePayment, SettleInvoice
 from lnbits.core.models.users import AccountId
-from lnbits.core.models.wallets import BaseWalletTypeInfo, KeyType, WalletTypeInfo
+from lnbits.core.models.wallets import KeyType, WalletTypeInfo
 from lnbits.core.services.payments import create_wallet_invoice
 from lnbits.core.services.users import create_user_account
 from lnbits.core.views.payment_api import (
@@ -25,7 +20,6 @@ from lnbits.core.views.payment_api import (
     api_payments_daily_stats,
     api_payments_fee_reserve,
     api_payments_settle,
-    api_payments_total_breakdown,
     api_payments_wallets_stats,
 )
 from lnbits.db import Filter, Filters
@@ -152,61 +146,6 @@ async def test_payment_external_id_is_stored_and_validated():
         CreateInvoice(out=False, amount=21, external_id="provider payment 123")
 
 
-@pytest.mark.anyio
-async def test_payment_api_total_breakdown_groups_wallet_tags_and_fiat():
-    first_user = await create_user_account(
-        Account(
-            id=uuid4().hex,
-            username=f"user_{uuid4().hex[:8]}",
-            email=f"user_{uuid4().hex[:8]}@lnbits.com",
-        )
-    )
-    second_user = await create_user_account(
-        Account(
-            id=uuid4().hex,
-            username=f"user_{uuid4().hex[:8]}",
-            email=f"user_{uuid4().hex[:8]}@lnbits.com",
-        )
-    )
-    first_wallet = first_user.wallets[0]
-    second_wallet = second_user.wallets[0]
-
-    await _create_payment(first_wallet.id, amount_msat=2_000, tag="coffee")
-    await _create_payment(
-        first_wallet.id,
-        amount_msat=4_000,
-        tag="coffee",
-        fiat_provider="stripe",
-        extra={"fiat_payment_request": "https://stripe.test/session"},
-    )
-    await _create_payment(first_wallet.id, amount_msat=-1_000)
-    await _create_payment(second_wallet.id, amount_msat=8_000, tag="books")
-
-    breakdown = await api_payments_total_breakdown(
-        BaseWalletTypeInfo(key_type=KeyType.invoice, wallet=first_wallet)
-    )
-
-    assert any(
-        item.tag == "coffee"
-        and item.is_fiat is False
-        and item.total == 2_000
-        and item.payments_count == 1
-        for item in breakdown
-    )
-    assert any(
-        item.tag == "coffee"
-        and item.is_fiat is True
-        and item.total == 4_000
-        and item.payments_count == 1
-        for item in breakdown
-    )
-    assert any(
-        item.tag is None and item.is_fiat is False and item.total == -1_000
-        for item in breakdown
-    )
-    assert all(item.tag != "books" for item in breakdown)
-
-
 @pytest.mark.anyio
 async def test_payment_api_fee_reserve_and_hold_invoice_actions(mocker):
     user = await create_user_account(
@@ -444,13 +383,8 @@ async def _create_payment(
     status: PaymentState = PaymentState.SUCCESS,
     payment_hash: str | None = None,
     tag: str | None = None,
-    fiat_provider: str | None = None,
-    extra: dict | None = None,
 ) -> str:
     checking_id = f"checking_{uuid4().hex[:8]}"
-    payment_extra = extra or {}
-    if tag:
-        payment_extra["tag"] = tag
     await create_payment(
         checking_id=checking_id,
         data=CreatePayment(
@@ -459,12 +393,8 @@ async def _create_payment(
             bolt11=f"bolt11_{checking_id}",
             amount_msat=amount_msat,
             memo=f"payment_{checking_id}",
-            extra=payment_extra,
+            extra={"tag": tag} if tag else {},
         ),
         status=status,
     )
-    if fiat_provider:
-        payment = await get_payment(checking_id)
-        payment.fiat_provider = fiat_provider
-        await update_payment(payment)
     return checking_id

tests/wallets/test_nwc_wallets.py

@@ -1,3 +1,4 @@
+import asyncio
 import base64
 import hashlib
 import json
@@ -12,7 +13,7 @@ from Cryptodome.Util.Padding import pad, unpad
 from websockets import ServerConnection
 from websockets import serve as ws_serve
 
-from lnbits.wallets.nwc import NWCWallet
+from lnbits.wallets.nwc import NWCConnection, NWCWallet
 from tests.wallets.helpers import (
     WalletTest,
     build_test_id,
@@ -99,6 +100,8 @@ async def handle(  # noqa: C901
                     event,
                 )
                 await websocket.send(json.dumps(["EVENT", sub_id, event]))
+            elif 23195 in kinds:
+                assert sub_filter["authors"] == [mock_settings["service_public_key"]]
         elif msg[0] == "EVENT":
             event = msg[1]
             decrypted_content = decrypt_content(
@@ -177,6 +180,129 @@ async def run(data: WalletTest):
             await nwcwallet.cleanup()
 
 
+@pytest.mark.anyio
+async def test_nwc_rejects_event_from_unexpected_pubkey(mocker):
+    async def _noop(*args, **kwargs):
+        return None
+
+    mocker.patch("lnbits.wallets.nwc.NWCConnection._connect_to_relay", new=_noop)
+    mocker.patch("lnbits.wallets.nwc.NWCConnection._handle_timeouts", new=_noop)
+
+    service_private_key = PrivateKey()
+    service_public_key = service_private_key.public_key.format().hex()[2:]
+    attacker_private_key = PrivateKey()
+    attacker_public_key = attacker_private_key.public_key.format().hex()[2:]
+    account_private_key = PrivateKey()
+
+    conn = NWCConnection(
+        service_public_key,
+        account_private_key.secret.hex(),
+        "ws://127.0.0.1:8555",
+    )
+    try:
+        event = {
+            "kind": 23195,
+            "content": "{}",
+            "created_at": int(time.time()),
+            "tags": [["e", "request-event-id"]],
+        }
+        sign_event(attacker_public_key, attacker_private_key.secret.hex(), event)
+
+        with pytest.raises(Exception, match="Invalid event signature"):
+            await conn._on_event_message(["EVENT", "subid", event])
+    finally:
+        await conn.close()
+
+
+@pytest.mark.anyio
+async def test_nwc_marks_pending_invoice_settled_only_once():
+    wallet = NWCWallet.__new__(NWCWallet)
+    wallet.pending_invoice_details = {"checking-id": {"checking_id": "checking-id"}}
+    wallet.pending_invoices = ["checking-id"]
+    wallet.paid_invoices_queue = asyncio.Queue(0)
+
+    wallet._mark_invoice_settled("checking-id", source="notification")
+    wallet._mark_invoice_settled("checking-id", source="notification")
+
+    assert wallet.paid_invoices_queue.qsize() == 1
+    assert await wallet.paid_invoices_queue.get() == "checking-id"
+
+
+@pytest.mark.anyio
+async def test_nwc_registers_notification_subscriptions(mocker):
+    async def _noop(*args, **kwargs):
+        return None
+
+    mocker.patch("lnbits.wallets.nwc.NWCConnection._connect_to_relay", new=_noop)
+    mocker.patch("lnbits.wallets.nwc.NWCConnection._handle_timeouts", new=_noop)
+
+    service_private_key = PrivateKey()
+    service_public_key = service_private_key.public_key.format().hex()[2:]
+    account_private_key = PrivateKey()
+
+    conn = NWCConnection(
+        service_public_key,
+        account_private_key.secret.hex(),
+        "ws://127.0.0.1:8555",
+    )
+    send_mock = mocker.patch.object(conn, "_send", mocker.AsyncMock())
+
+    try:
+        await conn._subscribe_to_notifications()
+
+        assert len(conn.notification_subscription_ids) == 2
+        assert len(conn.subscriptions) == 2
+        assert set(conn.subscriptions.keys()) == conn.notification_subscription_ids
+        assert all(
+            subscription["method"] == "notification_sub"
+            and subscription["event_id"] == subscription["sub_id"]
+            for subscription in conn.subscriptions.values()
+        )
+        assert send_mock.await_count == 2
+    finally:
+        await conn.close()
+
+
+@pytest.mark.anyio
+async def test_nwc_spreads_fallback_lookups_with_cooldown(mocker):
+    def _schedule_next_lookup(
+        invoice: dict[str, object], now: float | None = None
+    ) -> None:
+        assert now is not None
+        invoice["next_lookup_at"] = now + 1
+
+    wallet = NWCWallet.__new__(NWCWallet)
+    wallet.shutdown = False
+    wallet.pending_invoices = ["checking-1", "checking-2"]
+    wallet.pending_invoice_details = {
+        "checking-1": {
+            "checking_id": "checking-1",
+            "next_lookup_at": 0.0,
+            "lookup_attempts": 0,
+        },
+        "checking-2": {
+            "checking_id": "checking-2",
+            "next_lookup_at": 0.0,
+            "lookup_attempts": 0,
+        },
+    }
+    wallet.pending_invoices_lookup_cooldown = 1.0
+    wallet._is_shutting_down = lambda: False
+    wallet._payment_data_is_settled = lambda payment_data: False
+    wallet._cache_payment_data = lambda *args, **kwargs: None
+    wallet._schedule_next_lookup = _schedule_next_lookup
+    wallet.conn = mocker.Mock()
+    wallet.conn.get_info = mocker.AsyncMock()
+    wallet.conn.supports_method = mocker.Mock(return_value=True)
+    wallet.conn.call = mocker.AsyncMock(return_value={"settled_at": None})
+    sleep_mock = mocker.patch("lnbits.wallets.nwc.asyncio.sleep", mocker.AsyncMock())
+
+    await wallet._run_fallback_lookups(100.0)
+
+    assert wallet.conn.call.await_count == 2
+    sleep_mock.assert_awaited_once_with(1.0)
+
+
 @pytest.mark.anyio
 @pytest.mark.parametrize(
     "test_data",

uv.lock

@@ -1288,7 +1288,7 @@ wheels = [
 
 [[package]]
 name = "lnbits"
-version = "1.5.5rc3"
+version = "1.5.5"
 source = { editable = "." }
 dependencies = [
     { name = "aiosqlite" },