Merge remote-tracking branch 'origin/main' into extension_install_02

2023-01-26 12:39:11 +00:00
parent 7366200571 f6e0301209
commit 39f0000fa5
23 changed files with 371 additions and 170 deletions
@@ -144,6 +144,7 @@ class CreateInvoiceData(BaseModel):
    unit: Optional[str] = "sat"
    description_hash: Optional[str] = None
    unhashed_description: Optional[str] = None
+    expiry: Optional[int] = None
    lnurl_callback: Optional[str] = None
    lnurl_balance_check: Optional[str] = None
    extra: Optional[dict] = None
@@ -189,6 +190,7 @@ async def api_payments_create_invoice(data: CreateInvoiceData, wallet: Wallet):
                memo=memo,
                description_hash=description_hash,
                unhashed_description=unhashed_description,
+                expiry=data.expiry,
                extra=data.extra,
                webhook=data.webhook,
                internal=data.internal,