aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

fix: backwards compatible (#2853)

Browse source
This commit is contained in:
Vlad Stan 2024-12-19 09:50:52 +02:00 • committed by GitHub
parent d234ab12d8
commit 32c042741d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lnbits/core/views/api.py
View file

@ -35,7 +35,7 @@ from lnbits.settings import settings
from lnbits.utils.exchange_rates import ( from lnbits.utils.exchange_rates import (
allowed_currencies, allowed_currencies,
fiat_amount_as_satoshis, fiat_amount_as_satoshis,
get_fiat_rate_satoshis, get_fiat_rate_and_price_satoshis,
satoshis_amount_as_fiat, satoshis_amount_as_fiat,
) )
from lnbits.wallets import get_funding_source 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}") @api_router.get("/api/v1/rate/{currency}")
async def api_check_fiat_rate(currency: str) -> dict[str, float]: 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} return {"rate": rate, "price": price}

11
lnbits/utils/exchange_rates.py
View file

@ -247,7 +247,7 @@ async def btc_price(currency: str) -> float:
return sum(rates_values) / len(rates_values) 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( price = await cache.save_result(
lambda: btc_price(currency), lambda: btc_price(currency),
f"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 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: 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)) return int(amount * (rate))
async def satoshis_amount_as_fiat(amount: float, currency: str) -> float: 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) return float(amount / rate)