CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2025-11-29 08:33:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Balance ratio calculation should ignore non-relevant assets

Browse Source 
closes #8532
This commit is contained in:
Matthias
2023-04-22 10:58:49 +02:00
parent 5dccfab89c
commit ce75a032d0
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
freqtrade/rpc/rpc.py
View File

@@ -585,11 +585,13 @@ class RPC:
""" Returns current account balance per crypto """ """ Returns current account balance per crypto """
currencies: List[Dict] = [] currencies: List[Dict] = []
total = 0.0 total = 0.0
total_bot = 0.0
try: try:
tickers = self._freqtrade.exchange.get_tickers(cached=True) tickers = self._freqtrade.exchange.get_tickers(cached=True)
except (ExchangeError): except (ExchangeError):
raise RPCException('Error getting current tickers.') raise RPCException('Error getting current tickers.')
open_trades: List[Trade] = Trade.get_open_trades()
open_assets = [t.base_currency for t in open_trades]
self._freqtrade.wallets.update(require_update=False) self._freqtrade.wallets.update(require_update=False)
starting_capital = self._freqtrade.wallets.get_starting_balance() starting_capital = self._freqtrade.wallets.get_starting_balance()
starting_cap_fiat = self._fiat_converter.convert_amount( starting_cap_fiat = self._fiat_converter.convert_amount(
@@ -618,7 +620,9 @@ class RPC:
except (ExchangeError): except (ExchangeError):
logger.warning(f" Could not get rate for pair {coin}.") logger.warning(f" Could not get rate for pair {coin}.")
continue continue
total = total + est_stake total += est_stake
if coin == stake_currency or coin in open_assets:
total_bot += est_stake
currencies.append({ currencies.append({
'currency': coin, 'currency': coin,
'free': balance.free, 'free': balance.free,
@@ -651,10 +655,12 @@ class RPC:
value = self._fiat_converter.convert_amount( value = self._fiat_converter.convert_amount(
total, stake_currency, fiat_display_currency) if self._fiat_converter else 0 total, stake_currency, fiat_display_currency) if self._fiat_converter else 0
value_bot = self._fiat_converter.convert_amount(
total_bot, stake_currency, fiat_display_currency) if self._fiat_converter else 0
trade_count = len(Trade.get_trades_proxy()) trade_count = len(Trade.get_trades_proxy())
starting_capital_ratio = (total / starting_capital) - 1 if starting_capital else 0.0 starting_capital_ratio = (total_bot / starting_capital) - 1 if starting_capital else 0.0
starting_cap_fiat_ratio = (value / starting_cap_fiat) - 1 if starting_cap_fiat else 0.0 starting_cap_fiat_ratio = (value_bot / starting_cap_fiat) - 1 if starting_cap_fiat else 0.0
return { return {
'currencies': currencies, 'currencies': currencies,