From 285bf497b632d416fd7d31923903fbbbd2b2f0f6 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Mon, 12 Dec 2022 23:16:31 +0100
Subject: [PATCH 01/12] fix: log status check

---
 lnbits/extensions/cashu/views_api.py | 29 +++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/lnbits/extensions/cashu/views_api.py b/lnbits/extensions/cashu/views_api.py
index ad253abf..bf01dbff 100644
--- a/lnbits/extensions/cashu/views_api.py
+++ b/lnbits/extensions/cashu/views_api.py
@@ -280,22 +280,33 @@ async def melt_coins(
         fees_msat = fee_reserve(invoice_obj.amount_msat)
     else:
         fees_msat = 0
-    assert total_provided >= amount + fees_msat / 1000, Exception(
+    assert total_provided >= amount + math.ceil(fees_msat / 1000), Exception(
         f"Provided proofs ({total_provided} sats) not enough for Lightning payment ({amount + fees_msat} sats)."
     )
-
+    logger.debug(f"Cashu: Initiating payment of {total_provided} sats")
     await pay_invoice(
         wallet_id=cashu.wallet,
         payment_request=invoice,
-        description=f"pay cashu invoice",
-        extra={"tag": "cashu", "cahsu_name": cashu.name},
+        description=f"Pay cashu invoice",
+        extra={"tag": "cashu", "cashu_name": cashu.name},
     )
 
-    status: PaymentStatus = await check_transaction_status(
-        cashu.wallet, invoice_obj.payment_hash
-    )
-    if status.paid == True:
+    try:
+        logger.debug(
+            f"Cashu: Wallet {cashu.wallet} fetting PaymentStatus of {invoice_obj.payment_hash}"
+        )
+        status: PaymentStatus = await check_transaction_status(
+            cashu.wallet, invoice_obj.payment_hash
+        )
+        logger.debug(f"Cashu: Got status.paid: {status.paid}")
+        if status.paid == True:
+            logger.debug("Cashu: Payment successful, invalidating proofs")
+            await ledger._invalidate_proofs(proofs)
+    except Exception as e:
+        logger.error(e)
+        logger.error("Cashu: Error in payment status check, invalidating proofs")
         await ledger._invalidate_proofs(proofs)
+
     return GetMeltResponse(paid=status.paid, preimage=status.preimage)
 
 
@@ -333,7 +344,7 @@ async def check_fees(
         fees_msat = fee_reserve(invoice_obj.amount_msat)
     else:
         fees_msat = 0
-    return CheckFeesResponse(fee=fees_msat / 1000)
+    return CheckFeesResponse(fee=math.ceil(fees_msat / 1000))
 
 
 @cashu_ext.post("/api/v1/{cashu_id}/split")

From 6ccc7833777a8af4902a3b194a38042fb415283d Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Tue, 13 Dec 2022 13:36:21 +0200
Subject: [PATCH 02/12] feat: store & show `webhook` response body

---
 lnbits/extensions/satspay/helpers.py          |  6 +++-
 lnbits/extensions/satspay/static/js/utils.js  |  1 +
 .../satspay/templates/satspay/index.html      | 36 +++++++++++++++----
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/lnbits/extensions/satspay/helpers.py b/lnbits/extensions/satspay/helpers.py
index 60c5ba4a..b21a3ae2 100644
--- a/lnbits/extensions/satspay/helpers.py
+++ b/lnbits/extensions/satspay/helpers.py
@@ -37,7 +37,11 @@ async def call_webhook(charge: Charges):
                 json=public_charge(charge),
                 timeout=40,
             )
-            return {"webhook_success": r.is_success, "webhook_message": r.reason_phrase}
+            return {
+                "webhook_success": r.is_success,
+                "webhook_message": r.reason_phrase,
+                "webhook_response": r.text,
+            }
         except Exception as e:
             logger.warning(f"Failed to call webhook for charge {charge.id}")
             logger.warning(e)
diff --git a/lnbits/extensions/satspay/static/js/utils.js b/lnbits/extensions/satspay/static/js/utils.js
index 2b1be8bd..5317673f 100644
--- a/lnbits/extensions/satspay/static/js/utils.js
+++ b/lnbits/extensions/satspay/static/js/utils.js
@@ -23,6 +23,7 @@ const mapCharge = (obj, oldObj = {}) => {
   charge.displayUrl = ['/satspay/', obj.id].join('')
   charge.expanded = oldObj.expanded || false
   charge.pendingBalance = oldObj.pendingBalance || 0
+  charge.extra = charge.extra ? JSON.parse(charge.extra) : charge.extra
   return charge
 }
 
diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index 602b1a28..2dda8792 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -227,7 +227,12 @@
                     >
                   </div>
                   <div class="col-4 q-pr-lg">
-                    <q-badge v-if="props.row.webhook_message" color="blue">
+                    <q-badge
+                      v-if="props.row.webhook_message"
+                      @click="showWebhookResponseDialog(props.row.extra.webhook_response)"
+                      color="blue"
+                      class="cursor-pointer"
+                    >
                       {{props.row.webhook_message }}
                     </q-badge>
                   </div>
@@ -528,6 +533,23 @@
       </q-form>
     </q-card>
   </q-dialog>
+
+  <q-dialog v-model="showWebhookResponse" position="top">
+    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+      <q-input
+        filled
+        dense
+        readonly
+        v-model.trim="webhookResponse"
+        type="textarea"
+        label="Response"
+      ></q-input>
+
+      <div class="row q-mt-lg">
+        <q-btn flat v-close-popup color="grey" class="q-ml-auto">Close</q-btn>
+      </div>
+    </q-card>
+  </q-dialog>
 </div>
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
 <!-- lnbits/static/vendor
@@ -669,7 +691,9 @@
           data: {
             custom_css: ''
           }
-        }
+        },
+        showWebhookResponse: false,
+        webhookResponse: ''
       }
     },
     methods: {
@@ -757,7 +781,6 @@
             '/satspay/api/v1/themes',
             this.g.user.wallets[0].inkey
           )
-          console.log(data)
           this.themeLinks = data.map(c =>
             mapCSS(
               c,
@@ -852,14 +875,12 @@
       },
       updateformDialog: function (themeId) {
         const theme = _.findWhere(this.themeLinks, {css_id: themeId})
-        console.log(theme.css_id)
         this.formDialogThemes.data.css_id = theme.css_id
         this.formDialogThemes.data.title = theme.title
         this.formDialogThemes.data.custom_css = theme.custom_css
         this.formDialogThemes.show = true
       },
       createTheme: async function (wallet, data) {
-        console.log(data.css_id)
         try {
           if (data.css_id) {
             const resp = await LNbits.api.request(
@@ -887,7 +908,6 @@
             custom_css: ''
           }
         } catch (error) {
-          console.log('cun')
           LNbits.utils.notifyApiError(error)
         }
       },
@@ -955,6 +975,10 @@
             }
           })
       },
+      showWebhookResponseDialog(webhookResponse) {
+        this.webhookResponse = webhookResponse
+        this.showWebhookResponse = true
+      },
       exportchargeCSV: function () {
         LNbits.utils.exportCSV(
           this.chargesTable.columns,

From a7f572f455d0bdee62a7a0167afb0ef375d42120 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Tue, 13 Dec 2022 17:15:44 +0100
Subject: [PATCH 03/12] typo

---
 lnbits/extensions/cashu/views_api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/cashu/views_api.py b/lnbits/extensions/cashu/views_api.py
index bf01dbff..38cb0bba 100644
--- a/lnbits/extensions/cashu/views_api.py
+++ b/lnbits/extensions/cashu/views_api.py
@@ -293,7 +293,7 @@ async def melt_coins(
 
     try:
         logger.debug(
-            f"Cashu: Wallet {cashu.wallet} fetting PaymentStatus of {invoice_obj.payment_hash}"
+            f"Cashu: Wallet {cashu.wallet} checking PaymentStatus of {invoice_obj.payment_hash}"
         )
         status: PaymentStatus = await check_transaction_status(
             cashu.wallet, invoice_obj.payment_hash

From f47772d528d9b2a02a81d5e2064459f5ba2964ff Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Wed, 14 Dec 2022 14:18:42 +0100
Subject: [PATCH 04/12] fix: fastapi exception handling and printing

---
 lnbits/app.py | 37 ++++++-------------------------------
 1 file changed, 6 insertions(+), 31 deletions(-)

diff --git a/lnbits/app.py b/lnbits/app.py
index 075828ef..c293a445 100644
--- a/lnbits/app.py
+++ b/lnbits/app.py
@@ -68,28 +68,6 @@ def create_app(config_object="lnbits.settings") -> FastAPI:
     g().config = lnbits.settings
     g().base_url = f"http://{lnbits.settings.HOST}:{lnbits.settings.PORT}"
 
-    @app.exception_handler(RequestValidationError)
-    async def validation_exception_handler(
-        request: Request, exc: RequestValidationError
-    ):
-        # Only the browser sends "text/html" request
-        # not fail proof, but everything else get's a JSON response
-
-        if (
-            request.headers
-            and "accept" in request.headers
-            and "text/html" in request.headers["accept"]
-        ):
-            return template_renderer().TemplateResponse(
-                "error.html",
-                {"request": request, "err": f"{exc.errors()} is not a valid UUID."},
-            )
-
-        return JSONResponse(
-            status_code=HTTPStatus.NO_CONTENT,
-            content={"detail": exc.errors()},
-        )
-
     app.add_middleware(GZipMiddleware, minimum_size=1000)
 
     check_funding_source(app)
@@ -192,25 +170,22 @@ def register_async_tasks(app):
 
 def register_exception_handlers(app: FastAPI):
     @app.exception_handler(Exception)
-    async def basic_error(request: Request, err):
-        logger.error("handled error", traceback.format_exc())
-        logger.error("ERROR:", err)
+    async def exception_handler(request: Request, exc: Exception):
         etype, _, tb = sys.exc_info()
-        traceback.print_exception(etype, err, tb)
-        exc = traceback.format_exc()
-
+        traceback.print_exception(etype, exc, tb)
+        exc_str = str(exc)
         if (
             request.headers
             and "accept" in request.headers
             and "text/html" in request.headers["accept"]
         ):
             return template_renderer().TemplateResponse(
-                "error.html", {"request": request, "err": err}
+                "error.html", {"request": request, "err": exc_str}
             )
 
         return JSONResponse(
-            status_code=HTTPStatus.NO_CONTENT,
-            content={"detail": err},
+            status_code=HTTPStatus.BAD_REQUEST,
+            content={"detail": exc_str},
         )
 
 

From b5eb8b7ee8c1c995faedc05b688edd6ce10d0b84 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Wed, 14 Dec 2022 14:33:13 +0100
Subject: [PATCH 05/12] add handler for RequestValidationError

---
 lnbits/app.py | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/lnbits/app.py b/lnbits/app.py
index c293a445..b688ec8d 100644
--- a/lnbits/app.py
+++ b/lnbits/app.py
@@ -184,10 +184,32 @@ def register_exception_handlers(app: FastAPI):
             )
 
         return JSONResponse(
-            status_code=HTTPStatus.BAD_REQUEST,
+            status_code=HTTPStatus.NO_CONTENT,
             content={"detail": exc_str},
         )
 
+    @app.exception_handler(RequestValidationError)
+    async def validation_exception_handler(
+        request: Request, exc: RequestValidationError
+    ):
+        # Only the browser sends "text/html" request
+        # not fail proof, but everything else get's a JSON response
+
+        if (
+            request.headers
+            and "accept" in request.headers
+            and "text/html" in request.headers["accept"]
+        ):
+            return template_renderer().TemplateResponse(
+                "error.html",
+                {"request": request, "err": f"{exc.errors()} is not a valid UUID."},
+            )
+
+        return JSONResponse(
+            status_code=HTTPStatus.NO_CONTENT,
+            content={"detail": exc.errors()},
+        )
+
 
 def configure_logger() -> None:
     logger.remove()

From fa7bbb62e2f7c1b656aea84a6b7bfd636fca27dd Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Wed, 14 Dec 2022 14:59:11 +0100
Subject: [PATCH 06/12] correct error codes in tests

---
 lnbits/app.py                    |  5 +++--
 tests/core/views/test_generic.py | 16 ++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lnbits/app.py b/lnbits/app.py
index b688ec8d..6efd82fe 100644
--- a/lnbits/app.py
+++ b/lnbits/app.py
@@ -184,7 +184,7 @@ def register_exception_handlers(app: FastAPI):
             )
 
         return JSONResponse(
-            status_code=HTTPStatus.NO_CONTENT,
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
             content={"detail": exc_str},
         )
 
@@ -192,6 +192,7 @@ def register_exception_handlers(app: FastAPI):
     async def validation_exception_handler(
         request: Request, exc: RequestValidationError
     ):
+        logger.error(str(exc))
         # Only the browser sends "text/html" request
         # not fail proof, but everything else get's a JSON response
 
@@ -206,7 +207,7 @@ def register_exception_handlers(app: FastAPI):
             )
 
         return JSONResponse(
-            status_code=HTTPStatus.NO_CONTENT,
+            status_code=HTTPStatus.BAD_REQUEST,
             content={"detail": exc.errors()},
         )
 
diff --git a/tests/core/views/test_generic.py b/tests/core/views/test_generic.py
index 4300b78b..e8fc6fcc 100644
--- a/tests/core/views/test_generic.py
+++ b/tests/core/views/test_generic.py
@@ -46,11 +46,11 @@ async def test_get_wallet_no_redirect(client):
         i += 1
 
 
-# check GET /wallet: wrong user, expect 204
+# check GET /wallet: wrong user, expect 400
 @pytest.mark.asyncio
 async def test_get_wallet_with_nonexistent_user(client):
     response = await client.get("wallet", params={"usr": "1"})
-    assert response.status_code == 204, (
+    assert response.status_code == 400, (
         str(response.url) + " " + str(response.status_code)
     )
 
@@ -91,11 +91,11 @@ async def test_get_wallet_with_user_and_wallet(client, to_user, to_wallet):
     )
 
 
-# check GET /wallet: wrong wallet and user, expect 204
+# check GET /wallet: wrong wallet and user, expect 400
 @pytest.mark.asyncio
 async def test_get_wallet_with_user_and_wrong_wallet(client, to_user):
     response = await client.get("wallet", params={"usr": to_user.id, "wal": "1"})
-    assert response.status_code == 204, (
+    assert response.status_code == 400, (
         str(response.url) + " " + str(response.status_code)
     )
 
@@ -109,20 +109,20 @@ async def test_get_extensions(client, to_user):
     )
 
 
-# check GET /extensions: extensions list wrong user, expect 204
+# check GET /extensions: extensions list wrong user, expect 400
 @pytest.mark.asyncio
 async def test_get_extensions_wrong_user(client, to_user):
     response = await client.get("extensions", params={"usr": "1"})
-    assert response.status_code == 204, (
+    assert response.status_code == 400, (
         str(response.url) + " " + str(response.status_code)
     )
 
 
-# check GET /extensions: no user given, expect code 204 no content
+# check GET /extensions: no user given, expect code 400 bad request
 @pytest.mark.asyncio
 async def test_get_extensions_no_user(client):
     response = await client.get("extensions")
-    assert response.status_code == 204, (  # no content
+    assert response.status_code == 400, (  # bad request
         str(response.url) + " " + str(response.status_code)
     )
 

From 4a060baa752d6a3e0ffcb4ca72ac002b0efa63a2 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Wed, 14 Dec 2022 18:40:07 +0100
Subject: [PATCH 07/12] feat: error responses work

---
 lnbits/app.py | 42 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/lnbits/app.py b/lnbits/app.py
index 6efd82fe..9ed24654 100644
--- a/lnbits/app.py
+++ b/lnbits/app.py
@@ -8,7 +8,7 @@ import warnings
 from http import HTTPStatus
 
 from fastapi import FastAPI, Request
-from fastapi.exceptions import RequestValidationError
+from fastapi.exceptions import RequestValidationError, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.middleware.gzip import GZipMiddleware
 from fastapi.responses import JSONResponse
@@ -173,26 +173,28 @@ def register_exception_handlers(app: FastAPI):
     async def exception_handler(request: Request, exc: Exception):
         etype, _, tb = sys.exc_info()
         traceback.print_exception(etype, exc, tb)
-        exc_str = str(exc)
+        logger.error(f"Exception: {str(exc)}")
         if (
             request.headers
             and "accept" in request.headers
             and "text/html" in request.headers["accept"]
         ):
             return template_renderer().TemplateResponse(
-                "error.html", {"request": request, "err": exc_str}
+                "error.html", {"request": request, "err": f"Error: {str(exc)}"}
             )
 
         return JSONResponse(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            content={"detail": exc_str},
+            content={"detail": str(exc)},
         )
 
     @app.exception_handler(RequestValidationError)
     async def validation_exception_handler(
         request: Request, exc: RequestValidationError
     ):
-        logger.error(str(exc))
+        etype, _, tb = sys.exc_info()
+        traceback.print_exception(etype, exc, tb)
+        logger.error(f"RequestValidationError: {str(exc)}")
         # Only the browser sends "text/html" request
         # not fail proof, but everything else get's a JSON response
 
@@ -203,12 +205,38 @@ def register_exception_handlers(app: FastAPI):
         ):
             return template_renderer().TemplateResponse(
                 "error.html",
-                {"request": request, "err": f"{exc.errors()} is not a valid UUID."},
+                {"request": request, "err": f"Error: {str(exc)}"},
             )
 
         return JSONResponse(
             status_code=HTTPStatus.BAD_REQUEST,
-            content={"detail": exc.errors()},
+            content={"detail": str(exc)},
+        )
+
+    @app.exception_handler(HTTPException)
+    async def http_exception_handler(request: Request, exc: HTTPException):
+        etype, _, tb = sys.exc_info()
+        traceback.print_exception(etype, exc, tb)
+        logger.error(f"HTTPException {exc.status_code}: {exc.detail}")
+        # Only the browser sends "text/html" request
+        # not fail proof, but everything else get's a JSON response
+
+        if (
+            request.headers
+            and "accept" in request.headers
+            and "text/html" in request.headers["accept"]
+        ):
+            return template_renderer().TemplateResponse(
+                "error.html",
+                {
+                    "request": request,
+                    "err": f"HTTP Error {exc.status_code}: {exc.detail}",
+                },
+            )
+
+        return JSONResponse(
+            status_code=exc.status_code,
+            content={"detail": exc.detail},
         )
 
 

From a7fe203abd6d238ec88d9c76a17928d3869c86fc Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Wed, 14 Dec 2022 18:40:23 +0100
Subject: [PATCH 08/12] fix: regtest error expectations fixed

---
 tests/extensions/boltz/test_api.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/extensions/boltz/test_api.py b/tests/extensions/boltz/test_api.py
index 90ce6ec1..0266f940 100644
--- a/tests/extensions/boltz/test_api.py
+++ b/tests/extensions/boltz/test_api.py
@@ -61,21 +61,21 @@ async def test_endpoints_inkey(client, inkey_headers_to):
 
 @pytest.mark.asyncio
 @pytest.mark.skipif(is_fake, reason="this test is only passes with regtest")
-async def test_endpoints_adminkey_nocontent(client, adminkey_headers_to):
+async def test_endpoints_adminkey_badrequest(client, adminkey_headers_to):
     response = await client.post("/boltz/api/v1/swap", headers=adminkey_headers_to)
-    assert response.status_code == 204
+    assert response.status_code == 400
     response = await client.post(
         "/boltz/api/v1/swap/reverse", headers=adminkey_headers_to
     )
-    assert response.status_code == 204
+    assert response.status_code == 400
     response = await client.post(
         "/boltz/api/v1/swap/refund", headers=adminkey_headers_to
     )
-    assert response.status_code == 204
+    assert response.status_code == 400
     response = await client.post(
         "/boltz/api/v1/swap/status", headers=adminkey_headers_to
     )
-    assert response.status_code == 204
+    assert response.status_code == 400
 
 
 @pytest.mark.asyncio

From 317c17c1b3b00921fde74e1eebe2bbee47743a97 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Wed, 14 Dec 2022 18:42:45 +0100
Subject: [PATCH 09/12] make format

---
 lnbits/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/app.py b/lnbits/app.py
index 9ed24654..060e07e3 100644
--- a/lnbits/app.py
+++ b/lnbits/app.py
@@ -8,7 +8,7 @@ import warnings
 from http import HTTPStatus
 
 from fastapi import FastAPI, Request
-from fastapi.exceptions import RequestValidationError, HTTPException
+from fastapi.exceptions import HTTPException, RequestValidationError
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.middleware.gzip import GZipMiddleware
 from fastapi.responses import JSONResponse

From 5b8c5d52dac47d2aea6219a17faba3f39df67403 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Wed, 14 Dec 2022 19:09:01 +0100
Subject: [PATCH 10/12] fix: no stack trace for http errors

---
 lnbits/app.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lnbits/app.py b/lnbits/app.py
index 060e07e3..3ee3da34 100644
--- a/lnbits/app.py
+++ b/lnbits/app.py
@@ -174,6 +174,8 @@ def register_exception_handlers(app: FastAPI):
         etype, _, tb = sys.exc_info()
         traceback.print_exception(etype, exc, tb)
         logger.error(f"Exception: {str(exc)}")
+        # Only the browser sends "text/html" request
+        # not fail proof, but everything else get's a JSON response
         if (
             request.headers
             and "accept" in request.headers
@@ -215,8 +217,6 @@ def register_exception_handlers(app: FastAPI):
 
     @app.exception_handler(HTTPException)
     async def http_exception_handler(request: Request, exc: HTTPException):
-        etype, _, tb = sys.exc_info()
-        traceback.print_exception(etype, exc, tb)
         logger.error(f"HTTPException {exc.status_code}: {exc.detail}")
         # Only the browser sends "text/html" request
         # not fail proof, but everything else get's a JSON response

From 78f94483d05d2d72e9eb32aaa5500e6c504499fc Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Wed, 14 Dec 2022 19:10:26 +0100
Subject: [PATCH 11/12] fix: no stacktrace for validartion errors

---
 lnbits/app.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lnbits/app.py b/lnbits/app.py
index 3ee3da34..fccfffd1 100644
--- a/lnbits/app.py
+++ b/lnbits/app.py
@@ -194,8 +194,6 @@ def register_exception_handlers(app: FastAPI):
     async def validation_exception_handler(
         request: Request, exc: RequestValidationError
     ):
-        etype, _, tb = sys.exc_info()
-        traceback.print_exception(etype, exc, tb)
         logger.error(f"RequestValidationError: {str(exc)}")
         # Only the browser sends "text/html" request
         # not fail proof, but everything else get's a JSON response

From cef4244bfc8ab437d4ffbc06cc33e428c6dc0bf1 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Thu, 15 Dec 2022 00:33:24 +0100
Subject: [PATCH 12/12] update to cashu 0.6.0

---
 lnbits/extensions/cashu/views_api.py | 63 +++++++++++++++-------------
 poetry.lock                          |  8 ++--
 pyproject.toml                       |  2 +-
 requirements.txt                     |  2 +-
 4 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/lnbits/extensions/cashu/views_api.py b/lnbits/extensions/cashu/views_api.py
index 38cb0bba..2d10f3f0 100644
--- a/lnbits/extensions/cashu/views_api.py
+++ b/lnbits/extensions/cashu/views_api.py
@@ -221,7 +221,7 @@ async def mint_coins(
 
     status: PaymentStatus = await check_transaction_status(cashu.wallet, payment_hash)
 
-    if status.paid != True:
+    if LIGHTNING and status.paid != True:
         raise HTTPException(
             status_code=HTTPStatus.PAYMENT_REQUIRED, detail="Invoice not paid."
         )
@@ -265,47 +265,50 @@ async def melt_coins(
         detail="Error: Tokens are from another mint.",
     )
 
-    assert all([ledger._verify_proof(p) for p in proofs]), HTTPException(
-        status_code=HTTPStatus.BAD_REQUEST,
-        detail="Could not verify proofs.",
-    )
-
-    total_provided = sum([p["amount"] for p in proofs])
-    invoice_obj = bolt11.decode(invoice)
-    amount = math.ceil(invoice_obj.amount_msat / 1000)
-
-    internal_checking_id = await check_internal(invoice_obj.payment_hash)
-
-    if not internal_checking_id:
-        fees_msat = fee_reserve(invoice_obj.amount_msat)
-    else:
-        fees_msat = 0
-    assert total_provided >= amount + math.ceil(fees_msat / 1000), Exception(
-        f"Provided proofs ({total_provided} sats) not enough for Lightning payment ({amount + fees_msat} sats)."
-    )
-    logger.debug(f"Cashu: Initiating payment of {total_provided} sats")
-    await pay_invoice(
-        wallet_id=cashu.wallet,
-        payment_request=invoice,
-        description=f"Pay cashu invoice",
-        extra={"tag": "cashu", "cashu_name": cashu.name},
-    )
+    # set proofs as pending
+    await ledger._set_proofs_pending(proofs)
 
     try:
+        ledger._verify_proofs(proofs)
+
+        total_provided = sum([p["amount"] for p in proofs])
+        invoice_obj = bolt11.decode(invoice)
+        amount = math.ceil(invoice_obj.amount_msat / 1000)
+
+        internal_checking_id = await check_internal(invoice_obj.payment_hash)
+
+        if not internal_checking_id:
+            fees_msat = fee_reserve(invoice_obj.amount_msat)
+        else:
+            fees_msat = 0
+        assert total_provided >= amount + math.ceil(fees_msat / 1000), Exception(
+            f"Provided proofs ({total_provided} sats) not enough for Lightning payment ({amount + fees_msat} sats)."
+        )
+        logger.debug(f"Cashu: Initiating payment of {total_provided} sats")
+        await pay_invoice(
+            wallet_id=cashu.wallet,
+            payment_request=invoice,
+            description=f"Pay cashu invoice",
+            extra={"tag": "cashu", "cashu_name": cashu.name},
+        )
+
         logger.debug(
             f"Cashu: Wallet {cashu.wallet} checking PaymentStatus of {invoice_obj.payment_hash}"
         )
         status: PaymentStatus = await check_transaction_status(
             cashu.wallet, invoice_obj.payment_hash
         )
-        logger.debug(f"Cashu: Got status.paid: {status.paid}")
         if status.paid == True:
             logger.debug("Cashu: Payment successful, invalidating proofs")
             await ledger._invalidate_proofs(proofs)
     except Exception as e:
-        logger.error(e)
-        logger.error("Cashu: Error in payment status check, invalidating proofs")
-        await ledger._invalidate_proofs(proofs)
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail=f"Cashu: {str(e)}",
+        )
+    finally:
+        # delete proofs from pending list
+        await ledger._unset_proofs_pending(proofs)
 
     return GetMeltResponse(paid=status.paid, preimage=status.preimage)
 
diff --git a/poetry.lock b/poetry.lock
index 5c546ff1..8fe8329e 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -123,7 +123,7 @@ uvloop = ["uvloop (>=0.15.2)"]
 
 [[package]]
 name = "cashu"
-version = "0.5.5"
+version = "0.6.0"
 description = "Ecash wallet and mint with Bitcoin Lightning support"
 category = "main"
 optional = false
@@ -1144,7 +1144,7 @@ testing = ["flake8 (<5)", "func-timeout", "jaraco.functools", "jaraco.itertools"
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10 | ^3.9 | ^3.8 | ^3.7"
-content-hash = "53a18d7695f02e9ad24dc7d0863b5ae815c18f2f390ef20d7166a54b202642ff"
+content-hash = "7f75ca0b067a11f19520dc2121f0789e16738b573a8da84ba3838ed8a466a6e1"
 
 [metadata.files]
 aiofiles = [
@@ -1208,8 +1208,8 @@ black = [
     {file = "black-22.10.0.tar.gz", hash = "sha256:f513588da599943e0cde4e32cc9879e825d58720d6557062d1098c5ad80080e1"},
 ]
 cashu = [
-    {file = "cashu-0.5.5-py3-none-any.whl", hash = "sha256:c1d707479b852e503acca5ed53aa341b1880cd6bd70369488ec002d647970c9b"},
-    {file = "cashu-0.5.5.tar.gz", hash = "sha256:cc0349d3b6d9a2428cb575fee6280b20074ca9c20a1e2e9c68729a73c01f5f9d"},
+    {file = "cashu-0.6.0-py3-none-any.whl", hash = "sha256:54096af145643aab45943b235f95a3357b0ec697835c1411e66523049ffb81f6"},
+    {file = "cashu-0.6.0.tar.gz", hash = "sha256:503a90c4ca8d25d0b2c3f78a11b163c32902a726ea5b58e5337dc00eca8e96ad"},
 ]
 Cerberus = [
     {file = "Cerberus-1.3.4.tar.gz", hash = "sha256:d1b21b3954b2498d9a79edf16b3170a3ac1021df88d197dc2ce5928ba519237c"},
diff --git a/pyproject.toml b/pyproject.toml
index 350bc292..3e45400d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -64,7 +64,7 @@ protobuf = "^4.21.6"
 Cerberus = "^1.3.4"
 async-timeout = "^4.0.2"
 pyln-client = "0.11.1"
-cashu = "0.5.5"
+cashu = "^0.6.0"
 
 
 [tool.poetry.dev-dependencies]
diff --git a/requirements.txt b/requirements.txt
index d5471455..da2044d7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ attrs==22.1.0 ; python_version >= "3.7" and python_version < "4.0"
 base58==2.1.1 ; python_version >= "3.7" and python_version < "4.0"
 bech32==1.2.0 ; python_version >= "3.7" and python_version < "4.0"
 bitstring==3.1.9 ; python_version >= "3.7" and python_version < "4.0"
-cashu==0.5.5 ; python_version >= "3.7" and python_version < "4.0"
+cashu==0.6.0 ; python_version >= "3.7" and python_version < "4.0"
 cerberus==1.3.4 ; python_version >= "3.7" and python_version < "4.0"
 certifi==2022.9.24 ; python_version >= "3.7" and python_version < "4.0"
 cffi==1.15.1 ; python_version >= "3.7" and python_version < "4.0"