From a598b8554ddf6669f03214941e8240c5fd288397 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jul 2023 13:48:14 +0200 Subject: [PATCH 1/2] Bump ccxt and ccxt min requirement --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index c741a2295..cf92f5bdc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ numpy==1.24.3; python_version <= '3.8' pandas==2.0.3 pandas-ta==0.3.14b -ccxt==4.0.12 +ccxt==4.0.14 cryptography==41.0.1; platform_machine != 'armv7l' cryptography==40.0.1; platform_machine == 'armv7l' aiohttp==3.8.4 diff --git a/setup.py b/setup.py index 4b73ae653..1d35957e0 100644 --- a/setup.py +++ b/setup.py @@ -70,7 +70,7 @@ setup( ], install_requires=[ # from requirements.txt - 'ccxt>=3.0.0', + 'ccxt>=4.0.0', 'SQLAlchemy>=2.0.6', 'python-telegram-bot>=20.1', 'arrow>=1.0.0', From 4c6eee8dfe0c978d8debda441c63bf5e37651024 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jul 2023 13:52:46 +0200 Subject: [PATCH 2/2] Update proxy documentation to correspond to new ccxt mode --- docs/configuration.md | 8 +++----- tests/exchange/test_ccxt_compat.py | 6 +----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index cf3872f1c..6eb245706 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -682,16 +682,14 @@ To use a proxy for exchange connections - you will have to define the proxies as { "exchange": { "ccxt_config": { - "aiohttp_proxy": "http://addr:port", - "proxies": { - "http": "http://addr:port", - "https": "http://addr:port" - }, + "httpsProxy": "http://addr:port", } } } ``` +For more information on available proxy types, please consult the [ccxt proxy documentation](https://docs.ccxt.com/#/README?id=proxy). + ## Next step Now you have configured your config.json, the next step is to [start your bot](bot-usage.md). diff --git a/tests/exchange/test_ccxt_compat.py b/tests/exchange/test_ccxt_compat.py index 51f373108..51d016d11 100644 --- a/tests/exchange/test_ccxt_compat.py +++ b/tests/exchange/test_ccxt_compat.py @@ -293,11 +293,7 @@ def set_test_proxy(config: Config, use_proxy: bool) -> Config: if use_proxy and (proxy := os.environ.get('CI_WEB_PROXY')): config1 = deepcopy(config) config1['exchange']['ccxt_config'] = { - "aiohttp_proxy": proxy, - 'proxies': { - 'https': proxy, - 'http': proxy, - } + "httpsProxy": proxy, } return config1