Merge branch 'main' of github.com:lnbits/lnbits-legend

.gitignore

@@ -31,6 +31,7 @@ venv
 
 __bundle__
 
+coverage.xml
 node_modules
 lnbits/static/bundle.*
 docker

Makefile

@@ -17,7 +17,7 @@ mypy: $(shell find lnbits -name "*.py")
 	./venv/bin/mypy lnbits/core
 	./venv/bin/mypy lnbits/extensions/*
 
-isort: $(shell find lnbits -name "*.py") 
+isort: $(shell find lnbits -name "*.py")
 	./venv/bin/isort --profile black lnbits
 
 checkprettier: $(shell find lnbits -name "*.js" -name ".html")
@@ -36,7 +36,6 @@ requirements.txt: Pipfile.lock
 	cat Pipfile.lock | jq -r '.default | map_values(.version) | to_entries | map("\(.key)\(.value)") | join("\n")' > requirements.txt
 
 test:
-	rm -rf ./tests/data
 	mkdir -p ./tests/data
 	LNBITS_BACKEND_WALLET_CLASS="FakeWallet" \
 	FAKE_WALLET_SECRET="ToTheMoon1" \
@@ -45,14 +44,12 @@ test:
 	./venv/bin/pytest --durations=1 -s --cov=lnbits --cov-report=xml tests
 
 test-real-wallet:
-	rm -rf ./tests/data
 	mkdir -p ./tests/data
 	LNBITS_DATA_FOLDER="./tests/data" \
 	PYTHONUNBUFFERED=1 \
-	./venv/bin/pytest --durations=1 -s --cov=lnbits --cov-report=xml tests	
+	./venv/bin/pytest --durations=1 -s --cov=lnbits --cov-report=xml tests
 
 test-pipenv:
-	rm -rf ./tests/data
 	mkdir -p ./tests/data
 	LNBITS_BACKEND_WALLET_CLASS="FakeWallet" \
 	FAKE_WALLET_SECRET="ToTheMoon1" \

lnbits/core/views/api.py

@@ -279,7 +279,7 @@ class CreateLNURLData(BaseModel):
 
 @core_app.post("/api/v1/payments/lnurl")
 async def api_payments_pay_lnurl(
-    data: CreateLNURLData, wallet: WalletTypeInfo = Depends(get_key_type)
+    data: CreateLNURLData, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
     domain = urlparse(data.callback).netloc
 
@@ -305,6 +305,12 @@ async def api_payments_pay_lnurl(
             detail=f"{domain} said: '{params.get('reason', '')}'",
         )
 
+    if not params.get("pr"):
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail=f"{domain} did not return a payment request.",
+        )
+
     invoice = bolt11.decode(params["pr"])
     if invoice.amount_msat != data.amount:
         raise HTTPException(
@@ -312,11 +318,11 @@ async def api_payments_pay_lnurl(
             detail=f"{domain} returned an invalid invoice. Expected {data.amount} msat, got {invoice.amount_msat}.",
         )
 
-    #  if invoice.description_hash != data.description_hash:
+    if invoice.description_hash != data.description_hash:
-    #      raise HTTPException(
+        raise HTTPException(
-    #          status_code=HTTPStatus.BAD_REQUEST,
+            status_code=HTTPStatus.BAD_REQUEST,
-    #          detail=f"{domain} returned an invalid invoice. Expected description_hash == {data.description_hash}, got {invoice.description_hash}.",
+            detail=f"{domain} returned an invalid invoice. Expected description_hash == {data.description_hash}, got {invoice.description_hash}.",
-    #      )
+        )
 
     extra = {}
 

tools/conv.py

@@ -102,6 +102,8 @@ def insert_to_pg(query, data):
                 print(e)
                 print(f"Failed to insert {d}")
             else:
+                print("query:", query)
+                print("data:", d)
                 raise ValueError(f"Failed to insert {d}")
     connection.commit()
 
@@ -259,9 +261,10 @@ def migrate_ext(sqlite_db_file, schema, ignore_missing=True):
                 open_time,
                 used,
                 usescsv,
-                webhook_url
+                webhook_url,
+                custom_url
             )
-            VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s);
+            VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s);
         """
         insert_to_pg(q, res.fetchall())
         # WITHDRAW HASH CHECK