CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2025-12-17 13:21:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: simplify rpc_balance method by relying on exchange cache

Browse Source
This commit is contained in:
Matthias
2024-12-08 15:22:40 +01:00
parent 58357a0746
commit 4cd8e6b444
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
freqtrade/rpc/rpc.py
View File

@@ -675,7 +675,7 @@ class RPC:
} }
def __balance_get_est_stake( def __balance_get_est_stake(
self, coin: str, stake_currency: str, amount: float, balance: Wallet, tickers: Tickers self, coin: str, stake_currency: str, amount: float, balance: Wallet
) -> tuple[float, float]: ) -> tuple[float, float]:
est_stake = 0.0 est_stake = 0.0
est_bot_stake = 0.0 est_bot_stake = 0.0
@@ -686,25 +686,31 @@ class RPC:
est_stake = balance.free est_stake = balance.free
est_bot_stake = amount est_bot_stake = amount
else: else:
pair = self._freqtrade.exchange.get_valid_pair_combination(coin, stake_currency) try:
ticker: Ticker | None = tickers.get(pair, None) tickers: Tickers = self._freqtrade.exchange.get_tickers(cached=True)
if not ticker: pair = self._freqtrade.exchange.get_valid_pair_combination(coin, stake_currency)
tickers_spot: Tickers = self._freqtrade.exchange.get_tickers( ticker: Ticker | None = tickers.get(pair, None)
cached=True, if not ticker:
market_type=TradingMode.SPOT tickers_spot: Tickers = self._freqtrade.exchange.get_tickers(
if self._config.get("trading_mode", TradingMode.SPOT) != TradingMode.SPOT cached=True,
else TradingMode.FUTURES, market_type=TradingMode.SPOT
) if self._config.get("trading_mode", TradingMode.SPOT) != TradingMode.SPOT
ticker = tickers_spot.get(pair, None) else TradingMode.FUTURES,
)
ticker = tickers_spot.get(pair, None)
if ticker: if ticker:
rate: float | None = ticker.get("last", None) rate: float | None = ticker.get("last", None)
if rate: if rate:
if pair.startswith(stake_currency) and not pair.endswith(stake_currency): if pair.startswith(stake_currency) and not pair.endswith(stake_currency):
rate = 1.0 / rate rate = 1.0 / rate
est_stake = rate * balance.total est_stake = rate * balance.total
est_bot_stake = rate * amount est_bot_stake = rate * amount
return est_stake, est_bot_stake
except (ExchangeError, PricingError) as e:
logger.warning(f"Error {e} getting rate for {coin}")
pass
return est_stake, est_bot_stake return est_stake, est_bot_stake
def _rpc_balance(self, stake_currency: str, fiat_display_currency: str) -> dict: def _rpc_balance(self, stake_currency: str, fiat_display_currency: str) -> dict:
@@ -712,10 +718,6 @@ class RPC:
currencies: list[dict] = [] currencies: list[dict] = []
total = 0.0 total = 0.0
total_bot = 0.0 total_bot = 0.0
try:
tickers: Tickers = self._freqtrade.exchange.get_tickers(cached=True)
except ExchangeError:
raise RPCException("Error getting current tickers.")
open_trades: list[Trade] = Trade.get_open_trades() open_trades: list[Trade] = Trade.get_open_trades()
open_assets: dict[str, Trade] = {t.safe_base_currency: t for t in open_trades} open_assets: dict[str, Trade] = {t.safe_base_currency: t for t in open_trades}
@@ -742,7 +744,7 @@ class RPC:
try: try:
est_stake, est_stake_bot = self.__balance_get_est_stake( est_stake, est_stake_bot = self.__balance_get_est_stake(
coin, stake_currency, trade_amount, balance, tickers coin, stake_currency, trade_amount, balance
) )
except ValueError: except ValueError:
continue continue