From 32c042741d1a4c8ae9a9c9f3c3e431666d973dc1 Mon Sep 17 00:00:00 2001 From: Vlad Stan Date: Thu, 19 Dec 2024 09:50:52 +0200 Subject: [PATCH] fix: backwards compatible (#2853) --- lnbits/core/views/api.py | 4 ++-- lnbits/utils/exchange_rates.py | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lnbits/core/views/api.py b/lnbits/core/views/api.py index 78d093dc..2ae63906 100644 --- a/lnbits/core/views/api.py +++ b/lnbits/core/views/api.py @@ -35,7 +35,7 @@ from lnbits.settings import settings from lnbits.utils.exchange_rates import ( allowed_currencies, fiat_amount_as_satoshis, - get_fiat_rate_satoshis, + get_fiat_rate_and_price_satoshis, satoshis_amount_as_fiat, ) from lnbits.wallets import get_funding_source @@ -235,7 +235,7 @@ async def api_exchange_rate_history() -> list[dict]: @api_router.get("/api/v1/rate/{currency}") async def api_check_fiat_rate(currency: str) -> dict[str, float]: - rate, price = await get_fiat_rate_satoshis(currency) + rate, price = await get_fiat_rate_and_price_satoshis(currency) return {"rate": rate, "price": price} diff --git a/lnbits/utils/exchange_rates.py b/lnbits/utils/exchange_rates.py index cc8d46d4..a71ebbd4 100644 --- a/lnbits/utils/exchange_rates.py +++ b/lnbits/utils/exchange_rates.py @@ -247,7 +247,7 @@ async def btc_price(currency: str) -> float: return sum(rates_values) / len(rates_values) -async def get_fiat_rate_satoshis(currency: str) -> tuple[float, float]: +async def get_fiat_rate_and_price_satoshis(currency: str) -> tuple[float, float]: price = await cache.save_result( lambda: btc_price(currency), f"btc-price-{currency}", @@ -256,11 +256,16 @@ async def get_fiat_rate_satoshis(currency: str) -> tuple[float, float]: return float(100_000_000 / price), price +async def get_fiat_rate_satoshis(currency: str) -> float: + rate, _ = await get_fiat_rate_and_price_satoshis(currency) + return rate + + async def fiat_amount_as_satoshis(amount: float, currency: str) -> int: - rate, _ = await get_fiat_rate_satoshis(currency) + rate = await get_fiat_rate_satoshis(currency) return int(amount * (rate)) async def satoshis_amount_as_fiat(amount: float, currency: str) -> float: - rate, _ = await get_fiat_rate_satoshis(currency) + rate = await get_fiat_rate_satoshis(currency) return float(amount / rate)