Fix topup

Author: arcbtc

models.py

@@ -101,6 +101,10 @@ class PaymentsPaymentRequest(BaseModel):
     payment_request: str | None = None
 
 
+class PublicTopupRequest(BaseModel):
+    days: int = Field(gt=0)
+
+
 
 
 class PaymentsFilters(FilterModel):

services.py

@@ -34,6 +34,7 @@
     CreateTunnelRequest,
     CreateTunnelResponse,
     ExtensionSettings,
+    PublicTopupRequest,
 )
 
 async def get_settings(user_id: str) -> ExtensionSettings:
@@ -559,18 +560,31 @@ def _remove_authorized_key(settings: ExtensionSettings, proxy: Proxies) -> None:
 
 async def payment_request_for_payments(
     proxies_id: str,
-    data: CreatePayments,
+    data: CreatePayments | PublicTopupRequest,
 ) -> PaymentsPaymentRequest:
     proxies = await get_proxies_by_id(proxies_id)
     if not proxies:
         raise ValueError("Invalid proxies ID.")
 
-    payments = await create_payments(proxies_id, data)
+    settings = await get_settings(proxies.user_id)
 
-    amount = getattr(payments, "amount", 0)
+    # derive amount from days when provided
+    amount = getattr(data, "amount", 0)
+    if hasattr(data, "days"):
+        amount = getattr(data, "days", 0) * settings.price_per_day_sats
     if not amount or amount <= 0:
         raise ValueError("The amount must be greater than zero to create a payment request.")
 
+    payments = await create_payments(
+        proxies_id,
+        CreatePayments(
+            tunnel_id=proxies_id,
+            invoice_id="",
+            amount=amount,
+            paid=False,
+        ),
+    )
+
     proxies_name = getattr(proxies, "", "Unknown")
     payment: Payment = await create_invoice(
         wallet_id=getattr(proxies, "wallet", "no_wallet_id"),

views_api.py

@@ -29,6 +29,7 @@
     Payments,
     PaymentsFilters,
     PaymentsPaymentRequest,
+    PublicTopupRequest,
     CreatePayments,
     CreateProxies,
     Proxies,
@@ -200,11 +201,11 @@ async def api_create_payments(
 )
 async def api_submit_public_payments(
     proxies_id: str,
-    data: CreatePayments,
+    data: PublicTopupRequest,
 ) -> PaymentsPaymentRequest | None:
     """
     PUBLIC: clients can use this to top up / extend an existing proxy.
-    `data.amount` is in sats and is converted to an invoice.
+    Uses days to compute the amount server-side.
     """
     return await payment_request_for_payments(proxies_id, data)