fix: date issues and some new api fields (#40)

* fix: date issues and some new api fields

boltz_client/boltz.py

@@ -69,6 +69,7 @@ class BoltzSwapStatusResponse:
     failureReason: Optional[str] = None
     zeroConfRejected: Optional[str] = None
     transaction: Optional[dict] = None
+    failureDetails: Optional[str] = None
 
 
 @dataclass
@@ -81,6 +82,7 @@ class BoltzSwapResponse:
     expectedAmount: int
     timeoutBlockHeight: int
     blindingKey: Optional[str] = None
+    referralId: Optional[str] = None
 
 
 @dataclass
@@ -92,6 +94,7 @@ class BoltzReverseSwapResponse:
     timeoutBlockHeight: int
     onchainAmount: int
     blindingKey: Optional[str] = None
+    referralId: Optional[str] = None
 
 
 @dataclass

boltz_client/onchain_wally.py

@@ -158,7 +158,7 @@ def create_liquid_tx(
     blinding_key: Optional[str] = None,
 ) -> str:
     try:
-        import wallycore as wally
+        import wallycore as wally  # type: ignore
     except ImportError as exc:
         raise ImportError(
             "`wallycore` is not installed, but required for liquid support."

config.json

@@ -3,7 +3,7 @@
   "short_description": "Perform onchain/offchain swaps with Liquid support",
   "tile": "/boltz/static/image/boltz.png",
   "donate": "dni@600.wtf",
-  "min_lnbits_version": "0.12.5",
+  "min_lnbits_version": "0.12.11",
   "contributors": [
     {
       "name": "dni",

crud.py

@@ -1,4 +1,4 @@
-from time import time
+from datetime import datetime
 from typing import List, Optional, Union
 
 from lnbits.db import Database
@@ -56,7 +56,7 @@ async def create_submarine_swap(
 
     swap = SubmarineSwap(
         id=swap_id,
-        time=time(),
+        time=datetime.now(),
         refund_privkey=refund_privkey_wif,
         payment_hash=payment_hash,
         status="pending",
@@ -122,7 +122,7 @@ async def create_reverse_submarine_swap(
     swap_id = urlsafe_short_hash()
     reverse_swap = ReverseSubmarineSwap(
         id=swap_id,
-        time=time(),
+        time=datetime.now(),
         claim_privkey=claim_privkey_wif,
         preimage=preimage_hex,
         status="pending",
@@ -181,7 +181,7 @@ async def create_auto_reverse_submarine_swap(
 ) -> AutoReverseSubmarineSwap:
     swap_id = urlsafe_short_hash()
     swap = AutoReverseSubmarineSwap(
-        id=swap_id, time=time(), count=0, **create_swap.dict()
+        id=swap_id, time=datetime.now(), count=0, **create_swap.dict()
     )
     await db.execute(
         insert_query("boltz.auto_reverse_submarineswap", swap),

models.py

@@ -1,4 +1,5 @@
-from typing import Optional, Union
+from datetime import datetime
+from typing import Optional
 
 from fastapi import Query
 from pydantic import BaseModel
@@ -19,7 +20,7 @@ class SubmarineSwap(BaseModel):
     feerate: bool
     feerate_value: Optional[int]
     payment_hash: str
-    time: Union[str, float]
+    time: datetime
     status: str
     refund_privkey: str
     refund_address: str
@@ -52,7 +53,7 @@ class ReverseSubmarineSwap(BaseModel):
     feerate_value: Optional[int]
     onchain_address: str
     instant_settlement: bool
-    time: Union[str, float]
+    time: datetime
     status: str
     boltz_id: str
     preimage: str
@@ -85,7 +86,7 @@ class AutoReverseSubmarineSwap(BaseModel):
     balance: int
     onchain_address: str
     instant_settlement: bool
-    time: Union[str, float]
+    time: datetime
     count: int
 
 

tasks.py

@@ -39,14 +39,11 @@ async def on_invoice_paid(payment: Payment) -> None:
         # not a boltz invoice
         return
 
-    await payment.set_pending(False)
-
-    if payment.extra:
-        swap_id = payment.extra.get("swap_id")
-        if swap_id:
-            swap = await get_submarine_swap(swap_id)
-            if swap:
-                await update_swap_status(swap_id, "complete")
+    swap_id = payment.extra.get("swap_id")
+    if swap_id:
+        swap = await get_submarine_swap(swap_id)
+        if swap:
+            await update_swap_status(swap_id, "complete")
 
 
 async def check_for_auto_swap(payment: Payment) -> None:

templates/boltz/index.html

@@ -140,8 +140,7 @@
               field: 'time',
               sortable: true,
               format: function (val, row) {
-                const value = parseFloat(val) * 1000
-                return new Date(value).toUTCString()
+                return new Date(val).toLocaleString()
               }
             },
             {
@@ -195,8 +194,7 @@
               field: 'time',
               sortable: true,
               format: function (val, row) {
-                const value = parseFloat(val) * 1000
-                return new Date(value).toUTCString()
+                return new Date(val).toLocaleString()
               }
             },
             {
@@ -268,8 +266,7 @@
               field: 'time',
               sortable: true,
               format: function (val, row) {
-                const value = parseFloat(val) * 1000
-                return new Date(value).toUTCString()
+                return new Date(val).toLocaleString()
               }
             },
             {
@@ -487,7 +484,7 @@
               status: res.data.status,
               mempool: res.data.mempool,
               timeout_block_height: res.data.timeout_block_height,
-              date: new Date().toUTCString()
+              date: new Date().toLocaleString()
             }
             this.statusDialog.show = true
           })