mirrors/lnbits-legend
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits-legend.git synced 2024-11-20 02:28:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lnbits/main' into fix/tpos_dismiss_btn

Browse Source
This commit is contained in:
Tiago vasconcelos 2022-09-12 08:52:25 +01:00
commit 15e9eeb682
8 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/guide/installation.md
View File

@ -10,7 +10,7 @@ You can choose between four package managers, `poetry`, `nix` and `venv`.
By default, LNbits will use SQLite as its database. You can also use PostgreSQL which is recommended for applications with a high load (see guide below).
## Option 1: poetry
## Option 1 (recommended): poetry
```sh
git clone https://github.com/lnbits/lnbits-legend.git

5
lnbits/core/crud.py
View File

@ -327,6 +327,7 @@ async def delete_expired_invoices(
AND amount > 0 AND time < {db.timestamp_now} - {db.interval_seconds(86400)}
"""
)
logger.debug(f"Checking expiry of {len(rows)} invoices")
for (payment_request,) in rows:
try:
invoice = bolt11.decode(payment_request)
@ -336,7 +337,9 @@ async def delete_expired_invoices(
expiration_date = datetime.datetime.fromtimestamp(invoice.date + invoice.expiry)
if expiration_date > datetime.datetime.utcnow():
continue
logger.debug(f"Deleting expired invoice: {invoice.payment_hash}")
logger.debug(
f"Deleting expired invoice: {invoice.payment_hash} (expired: {expiration_date})"
)
await (conn or db).execute(
"""
DELETE FROM apipayments

5
lnbits/extensions/boltcards/crud.py
View File

@ -1,4 +1,5 @@
import secrets
from datetime import date, datetime
from typing import List, Optional, Union
from lnbits.helpers import urlsafe_short_hash
@ -6,7 +7,6 @@ from lnbits.helpers import urlsafe_short_hash
from . import db
from .models import Card, CreateCardData, Hit, Refund
from datetime import date, datetime
async def create_card(data: CreateCardData, wallet_id: str) -> Card:
card_id = urlsafe_short_hash().upper()
@ -181,7 +181,8 @@ async def get_hits(cards_ids: Union[str, List[str]]) -> List[Hit]:
async def get_hits_today(card_id: str) -> Optional[Hit]:
rows = await db.fetchall(
f"SELECT * FROM boltcards.hits WHERE card_id = ?", (card_id,),
f"SELECT * FROM boltcards.hits WHERE card_id = ?",
(card_id,),
)
updatedrow = []
for row in rows:

8
lnbits/extensions/boltcards/lnurl.py
View File

@ -21,7 +21,6 @@ from starlette.requests import Request
from starlette.responses import HTMLResponse
from lnbits import bolt11
from lnbits.core.services import create_invoice
from lnbits.core.views.api import pay_invoice
@ -98,6 +97,7 @@ async def api_scan(p, c, request: Request, external_id: str = None):
"defaultDescription": f"Boltcard (refund address lnurl://{lnurlpay})",
}
@boltcards_ext.get(
"/api/v1/lnurl/cb/{hitid}",
status_code=HTTPStatus.OK,
@ -129,6 +129,7 @@ async def lnurl_callback(
except:
return {"status": "ERROR", "reason": f"Payment failed"}
# /boltcards/api/v1/auth?a=00000000000000000000000000000000
@boltcards_ext.get("/api/v1/auth")
async def api_auth(a, request: Request):
@ -159,11 +160,12 @@ async def api_auth(a, request: Request):
"k4": card.k2,
"lnurlw_base": "lnurlw://" + lnurlw_base,
"protocol_name": "new_bolt_card_response",
"protocol_version": 1
"protocol_version": 1,
}
return response
###############LNURLPAY REFUNDS#################

2
lnbits/extensions/copilot/views.py
View File

@ -63,7 +63,7 @@ class ConnectionManager:
manager = ConnectionManager()
@copilot_ext.websocket("/copilot/ws/{copilot_id}", name="copilot.websocket_by_id")
@copilot_ext.websocket("/ws/{copilot_id}", name="copilot.websocket_by_id")
async def websocket_endpoint(websocket: WebSocket, copilot_id: str):
await manager.connect(websocket, copilot_id)
try:

3
lnbits/extensions/lndhub/views_api.py
View File

@ -132,8 +132,6 @@ async def lndhub_gettxs(
):
await payment.check_status()
await asyncio.sleep(0.1)
return [
{
"payment_preimage": payment.preimage,
@ -180,7 +178,6 @@ async def lndhub_getuserinvoices(
await invoice.set_pending(
(await WALLET.get_invoice_status(invoice.checking_id)).pending
)
await asyncio.sleep(0.1)
return [
{

2
lnbits/extensions/watchonly/models.py
View File

@ -19,7 +19,7 @@ class WalletAccount(BaseModel):
title: str
address_no: int
balance: int
type: str = ""
type: Optional[str] = ""
network: str = "Mainnet"
@classmethod

48
lnbits/tasks.py
View File

@ -16,6 +16,8 @@ from lnbits.core.crud import (
from lnbits.core.services import redeem_lnurl_withdraw
from lnbits.settings import WALLET
from .core import db
deferred_async: List[Callable] = []
@ -86,24 +88,34 @@ async def check_pending_payments():
incoming = True
while True:
logger.debug(
f"Task: checking all pending payments (incoming={incoming}, outgoing={outgoing}) of last 15 days"
)
for payment in await get_payments(
since=(int(time.time()) - 60 * 60 * 24 * 15), # 15 days ago
complete=False,
pending=True,
outgoing=outgoing,
incoming=incoming,
exclude_uncheckable=True,
):
await payment.check_status()
logger.debug("Task: pending payments check finished")
# we delete expired invoices once upon the first pending check
if incoming:
logger.debug("Task: deleting all expired invoices")
await delete_expired_invoices()
logger.debug("Task: expired invoice deletion finished")
async with db.connect() as conn:
logger.debug(
f"Task: checking all pending payments (incoming={incoming}, outgoing={outgoing}) of last 15 days"
)
start_time: float = time.time()
pending_payments = await get_payments(
since=(int(time.time()) - 60 * 60 * 24 * 15), # 15 days ago
complete=False,
pending=True,
outgoing=outgoing,
incoming=incoming,
exclude_uncheckable=True,
conn=conn,
)
for payment in pending_payments:
await payment.check_status()
logger.debug(
f"Task: pending check finished for {len(pending_payments)} payments (took {time.time() - start_time:0.3f} s)"
)
# we delete expired invoices once upon the first pending check
if incoming:
logger.debug("Task: deleting all expired invoices")
start_time: float = time.time()
await delete_expired_invoices(conn=conn)
logger.debug(
f"Task: expired invoice deletion finished (took {time.time() - start_time:0.3f} s)"
)
# after the first check we will only check outgoing, not incoming
# that will be handled by the global invoice listeners, hopefully