diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index c609bccb8..37a8d8a52 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -716,6 +716,8 @@ class RPC: 'length': len(self._freqtrade.active_pair_whitelist), 'whitelist': self._freqtrade.active_pair_whitelist } + if self._freqtrade.pairlists.whitelist: + res['pairlistsWhitelist'] = self._freqtrade.pairlists.whitelist return res def _rpc_blacklist(self, add: List[str] = None) -> Dict: diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index d1e337401..91a6129fd 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -853,6 +853,8 @@ class Telegram(RPCHandler): message = f"Using whitelist `{whitelist['method']}` with {whitelist['length']} pairs\n" message += f"`{', '.join(whitelist['whitelist'])}`" + if whitelist['pairlistsWhitelist']: + message += f"`from current pairlists whitelist {', '.join(whitelist['pairlistsWhitelist'])}`" logger.debug(message) self._send_msg(message) diff --git a/tests/rpc/test_rpc.py b/tests/rpc/test_rpc.py index e7a968e37..8dc9e409f 100644 --- a/tests/rpc/test_rpc.py +++ b/tests/rpc/test_rpc.py @@ -959,6 +959,9 @@ def test_rpc_whitelist_dynamic(mocker, default_conf) -> None: assert ret['length'] == 4 assert ret['whitelist'] == default_conf['exchange']['pair_whitelist'] + api_whitelist = ['ETH/BTC', 'LTC/BTC', 'XRP/BTC', 'NEO/BTC'] + assert api_whitelist == ret['pairlistsWhitelist'] + def test_rpc_blacklist(mocker, default_conf) -> None: mocker.patch('freqtrade.rpc.telegram.Telegram', MagicMock())