From 46b1ecc77d53054aed6835d69f9989316422aa78 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 11 May 2019 15:27:09 +0200 Subject: [PATCH] Fix #1840 - Support balances other than USDT --- freqtrade/rpc/rpc.py | 5 +++-- freqtrade/tests/rpc/test_rpc_telegram.py | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index 37312318a..2189a0d17 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -276,11 +276,12 @@ class RPC(object): rate = 1.0 else: try: - if coin == 'USDT': - rate = 1.0 / self._freqtrade.get_sell_rate('BTC/USDT', False) + if coin in('USDT', 'USD', 'EUR'): + rate = 1.0 / self._freqtrade.get_sell_rate('BTC/' + coin, False) else: rate = self._freqtrade.get_sell_rate(coin + '/BTC', False) except (TemporaryError, DependencyException): + logger.warning(f" Could not get rate for pair {coin}.") continue est_btc: float = rate * balance['total'] total = total + est_btc diff --git a/freqtrade/tests/rpc/test_rpc_telegram.py b/freqtrade/tests/rpc/test_rpc_telegram.py index 86d728290..69e3006cd 100644 --- a/freqtrade/tests/rpc/test_rpc_telegram.py +++ b/freqtrade/tests/rpc/test_rpc_telegram.py @@ -522,6 +522,11 @@ def test_telegram_balance_handle(default_conf, update, mocker) -> None: 'total': 1.0, 'free': 1.0, 'used': 0.0 + }, + 'EUR': { + 'total': 10.0, + 'free': 10.0, + 'used': 0.0 } } @@ -565,6 +570,7 @@ def test_telegram_balance_handle(default_conf, update, mocker) -> None: assert '*BTC:*' in result assert '*ETH:*' not in result assert '*USDT:*' in result + assert '*EUR:*' in result assert 'Balance:' in result assert 'Est. BTC:' in result assert 'BTC: 12.00000000' in result