OctoBot-Trading 2.4.170__tar.gz → 2.4.172__tar.gz

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/CHANGELOG.md

@@ -4,13 +4,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.4.172] - 2025-04-22
+### Fixed
+[Exchanges] Stop crash after ccxt update
+
+## [2.4.171] - 2025-04-15
+### Added
+[Exchanges] DEXes support
+### Updated
+[CCXT] update ccxt to 4.4.72
+
 ## [2.4.170] - 2025-04-15
 ### Fixed
 [CCXT] fix cache issue on forced auth exchanges
 
 ## [2.4.169] - 2025-04-11
 ### Fixed
-[Subportfolio] handle fees hedge cases for filled oreders deltas 
+[Subportfolio] handle fees hedge cases for filled orders deltas
 
 ## [2.4.168] - 2025-04-01
 ### Updated

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172/OctoBot_Trading.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OctoBot-Trading
-Version: 2.4.170
+Version: 2.4.172
 Summary: OctoBot project trading package
 Home-page: https://github.com/Drakkar-Software/OctoBot-Trading
 Author: Drakkar-Software
@@ -16,7 +16,7 @@ Classifier: Operating System :: POSIX
 Requires-Python: >=3.8
 License-File: LICENSE
 
-# OctoBot-Trading [2.4.170](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.172](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/903b6b22bceb4661b608a86fea655f69)](https://app.codacy.com/gh/Drakkar-Software/OctoBot-Trading?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot-Trading&utm_campaign=Badge_Grade_Dashboard)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot-Trading.svg)](https://pypi.python.org/pypi/OctoBot-Trading/)
 [![Coverage Status](https://coveralls.io/repos/github/Drakkar-Software/OctoBot-Trading/badge.svg?branch=master)](https://coveralls.io/github/Drakkar-Software/OctoBot-Trading?branch=master)

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/OctoBot_Trading.egg-info/SOURCES.txt

@@ -96,6 +96,7 @@ octobot_trading/exchanges/adapters/abstract_adapter.py
 octobot_trading/exchanges/config/__init__.py
 octobot_trading/exchanges/config/backtesting_exchange_config.py
 octobot_trading/exchanges/config/exchange_config_data.py
+octobot_trading/exchanges/config/exchange_credentials_data.py
 octobot_trading/exchanges/config/proxy_config.py
 octobot_trading/exchanges/connectors/__init__.py
 octobot_trading/exchanges/connectors/ccxt/__init__.py
@@ -477,6 +478,7 @@ tests_additional/real_exchanges/test_gateio.py
 tests_additional/real_exchanges/test_hitbtc.py
 tests_additional/real_exchanges/test_hollaex.py
 tests_additional/real_exchanges/test_htx.py
+tests_additional/real_exchanges/test_hyperliquid.py
 tests_additional/real_exchanges/test_kraken.py
 tests_additional/real_exchanges/test_kucoin.py
 tests_additional/real_exchanges/test_kucoin_futures.py

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/OctoBot_Trading.egg-info/requires.txt

@@ -4,7 +4,7 @@ Async-Channel<2.3,>=2.2
 OctoBot-Commons<1.10,>=1.9.64
 OctoBot-Tentacles-Manager<2.10,>=2.9
 trading-backend>=1.2.35
-ccxt==4.3.85
+ccxt==4.4.72
 aiohttp_socks==0.10.1
 cryptography
 sortedcontainers==2.4.0

{OctoBot-Trading-2.4.170/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.172}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OctoBot-Trading
-Version: 2.4.170
+Version: 2.4.172
 Summary: OctoBot project trading package
 Home-page: https://github.com/Drakkar-Software/OctoBot-Trading
 Author: Drakkar-Software
@@ -16,7 +16,7 @@ Classifier: Operating System :: POSIX
 Requires-Python: >=3.8
 License-File: LICENSE
 
-# OctoBot-Trading [2.4.170](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.172](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/903b6b22bceb4661b608a86fea655f69)](https://app.codacy.com/gh/Drakkar-Software/OctoBot-Trading?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot-Trading&utm_campaign=Badge_Grade_Dashboard)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot-Trading.svg)](https://pypi.python.org/pypi/OctoBot-Trading/)
 [![Coverage Status](https://coveralls.io/repos/github/Drakkar-Software/OctoBot-Trading/badge.svg?branch=master)](https://coveralls.io/github/Drakkar-Software/OctoBot-Trading?branch=master)

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/README.md

@@ -1,4 +1,4 @@
-# OctoBot-Trading [2.4.170](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.172](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/903b6b22bceb4661b608a86fea655f69)](https://app.codacy.com/gh/Drakkar-Software/OctoBot-Trading?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot-Trading&utm_campaign=Badge_Grade_Dashboard)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot-Trading.svg)](https://pypi.python.org/pypi/OctoBot-Trading/)
 [![Coverage Status](https://coveralls.io/repos/github/Drakkar-Software/OctoBot-Trading/badge.svg?branch=master)](https://coveralls.io/github/Drakkar-Software/OctoBot-Trading?branch=master)

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/octobot_trading/__init__.py

@@ -15,4 +15,4 @@
 #  License along with this library.
 
 PROJECT_NAME = "OctoBot-Trading"
-VERSION = "2.4.170"  # major.minor.revision
+VERSION = "2.4.172"  # major.minor.revision

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/octobot_trading/constants.py

@@ -86,6 +86,7 @@ CCXT_TRADES_CACHE_LIMIT = int(os.getenv("CCXT_TRADES_CACHE_LIMIT", str(CCXT_DEFA
 CCXT_ORDERS_CACHE_LIMIT = int(os.getenv("CCXT_ORDERS_CACHE_LIMIT", str(CCXT_DEFAULT_CACHE_LIMIT)))
 CCXT_OHLCV_CACHE_LIMIT = int(os.getenv("CCXT_OHLCV_CACHE_LIMIT", str(CCXT_DEFAULT_CACHE_LIMIT)))
 CCXT_WATCH_ORDER_BOOK_LIMIT = int(os.getenv("CCXT_WATCH_ORDER_BOOK_LIMIT", str(CCXT_DEFAULT_CACHE_LIMIT)))
+CCXT_TIMEOUT_ON_EXIT_MS = 100
 THROTTLED_WS_UPDATES = float(os.getenv("THROTTLED_WS_UPDATES", "0.1"))  # avoid spamming CPU
 MAX_CANDLES_IN_RAM = int(os.getenv("MAX_CANDLES_IN_RAM", "3000"))    # max candles per CandlesManager
 STORAGE_ORIGIN_VALUE = "origin_value"
@@ -109,7 +110,7 @@ NaN = decimal.Decimal("nan")
 FULL_CANDLE_HISTORY_EXCHANGES = [
     "ascendex",
     "binance",
-    "bitfinex2",
+    "bitfinex",
     "bitstamp",
     "bybit",
     "bingx",
@@ -147,7 +148,7 @@ TESTED_EXCHANGES = [
     "bitmart",
 ])
 DEFAULT_FUTURE_EXCHANGES = sorted(["bybit"])
-SIMULATOR_TESTED_EXCHANGES = sorted(["bitfinex2", "bithumb", "bitstamp", "bitmex",
+SIMULATOR_TESTED_EXCHANGES = sorted(["bitfinex", "bithumb", "bitstamp", "bitmex",
                               "hitbtc", "kraken", "poloniex", "bitso", "ndax", "upbit",
                               "wavesexchange",])
 

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/octobot_trading/exchange_data/ticker/channel/ticker_updater.py

@@ -115,17 +115,18 @@ class TickerUpdater(ticker_channel.TickerProducer):
     def _is_valid(ticker):
         try:
             # at least require close, volume and timestamp
-            return (
-                ticker and all(
-                    ticker[field] is not None
-                    for field in (
-                        enums.ExchangeConstantsTickersColumns.CLOSE.value,
-                        enums.ExchangeConstantsTickersColumns.BASE_VOLUME.value,
-                        enums.ExchangeConstantsTickersColumns.TIMESTAMP.value
-                    )
-                )
-            )
-
+            if not (
+                ticker.get(enums.ExchangeConstantsTickersColumns.CLOSE.value)
+                and ticker.get(enums.ExchangeConstantsTickersColumns.TIMESTAMP.value)
+            ):
+                return False
+            if not (
+                ticker.get(enums.ExchangeConstantsTickersColumns.BASE_VOLUME.value)
+                or ticker.get(enums.ExchangeConstantsTickersColumns.QUOTE_VOLUME.value)
+            ):
+                # require either base or quote volume
+                return False
+            return True
         except KeyError:
             return False
 

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/octobot_trading/exchange_data/ticker/ticker_manager.py

@@ -56,6 +56,7 @@ class TickerManager(util.Initializable):
             enums.ExchangeConstantsTickersColumns.LAST.value: math.nan,
             enums.ExchangeConstantsTickersColumns.AVERAGE.value: math.nan,
             enums.ExchangeConstantsTickersColumns.SYMBOL.value: math.nan,
+            enums.ExchangeConstantsTickersColumns.BASE_VOLUME.value: math.nan,
             enums.ExchangeConstantsTickersColumns.QUOTE_VOLUME.value: math.nan,
             enums.ExchangeConstantsTickersColumns.TIMESTAMP.value: 0,
             enums.ExchangeConstantsTickersColumns.VWAP.value: math.nan

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/octobot_trading/exchanges/__init__.py

@@ -95,6 +95,7 @@ from octobot_trading.exchanges.config import (
     ExchangeConfig,
     BacktestingExchangeConfig,
     ProxyConfig,
+    ExchangeCredentialsData,
 )
 from octobot_trading.exchanges import traders
 from octobot_trading.exchanges.traders import (
@@ -135,6 +136,7 @@ __all__ = [
     "ExchangeConfig",
     "BacktestingExchangeConfig",
     "ProxyConfig",
+    "ExchangeCredentialsData",
     "ExchangeManager",
     "ExchangeBuilder",
     "create_exchange_builder_instance",

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/octobot_trading/exchanges/abstract_websocket_exchange.py

@@ -92,10 +92,6 @@ class AbstractWebsocketExchange:
         raise NotImplementedError("is_time_frame_supported is not implemented")
 
     def get_exchange_credentials(self):
-        """
-        Exchange credentials
-        :return: key, secret, password, uid
-        """
         return self.exchange_manager.get_exchange_credentials(self.exchange_manager.exchange_name)
 
     async def push_to_channel(self, channel_name, *args, **kwargs):

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/octobot_trading/exchanges/config/__init__.py

@@ -27,9 +27,14 @@ from octobot_trading.exchanges.config import proxy_config
 from octobot_trading.exchanges.config.proxy_config import (
     ProxyConfig,
 )
+from octobot_trading.exchanges.config import proxy_config
+from octobot_trading.exchanges.config.exchange_credentials_data import (
+    ExchangeCredentialsData,
+)
 
 __all__ = [
     "ExchangeConfig",
     "BacktestingExchangeConfig",
     "ProxyConfig",
+    "ExchangeCredentialsData",
 ]

OctoBot-Trading-2.4.172/octobot_trading/exchanges/config/exchange_credentials_data.py

@@ -0,0 +1,39 @@
+#  Drakkar-Software OctoBot-Trading
+#  Copyright (c) Drakkar-Software, All rights reserved.
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library.
+import dataclasses
+import typing
+
+
+@dataclasses.dataclass
+class ExchangeCredentialsData:
+    # CEXes
+    api_key: typing.Optional[str] = None
+    secret: typing.Optional[str] = None
+    password: typing.Optional[str] = None
+    uid: typing.Optional[str] = None
+    # Oauth
+    auth_token: typing.Optional[str] = None
+    auth_token_header_prefix: typing.Optional[str] = None
+    # DEXes
+    wallet_address: typing.Optional[str] = None
+    private_key: typing.Optional[str] = None
+
+    def has_credentials(self) -> bool:
+        return bool(
+            (self.api_key and self.secret)  # CEX
+            or (self.wallet_address and self.private_key)  # DEX
+        )
+

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/octobot_trading/exchanges/connectors/ccxt/ccxt_client_util.py

@@ -34,6 +34,7 @@ import octobot_trading.errors as errors
 import octobot_trading.exchanges.connectors.ccxt.enums as ccxt_enums
 import octobot_trading.exchanges.connectors.ccxt.ccxt_clients_cache as ccxt_clients_cache
 import octobot_trading.exchanges.config.proxy_config as proxy_config_import
+import octobot_trading.exchanges.config.exchange_credentials_data as exchange_credentials_data
 import octobot_trading.exchanges.util.exchange_util as exchange_util
 
 
@@ -57,24 +58,19 @@ def create_client(
         )
     if exchange_manager.ignore_config or exchange_manager.check_config(exchange_manager.exchange_name):
         try:
-            auth_token_header_prefix = None
-            key, secret, password, uid, auth_token = exchange_manager.get_exchange_credentials(
-                exchange_manager.exchange_name
+            creds: exchange_credentials_data.ExchangeCredentialsData = (
+                exchange_manager.get_exchange_credentials(exchange_manager.exchange_name)
             )
             if keys_adapter:
-                key, secret, password, uid, auth_token, auth_token_header_prefix = keys_adapter(
-                    key, secret, password, uid, auth_token
-                )
-            if not (key and secret) and not exchange_manager.is_simulated and not exchange_manager.ignore_config:
+                creds = keys_adapter(creds)
+            if not (creds.has_credentials()) and not exchange_manager.is_simulated and not exchange_manager.ignore_config:
                 logger.warning(f"No exchange API key set for {exchange_manager.exchange_name}. "
                                f"Enter your account details to enable real trading on this exchange.")
             if should_be_authenticated_exchange:
                 client = instantiate_exchange(
                     exchange_class,
                     _get_client_config(
-                        exchange_class, options, headers, additional_config,
-                        api_key=key, secret=secret, password=password, uid=uid,
-                        auth_token=auth_token, auth_token_header_prefix=auth_token_header_prefix
+                        exchange_class, options, headers, additional_config, creds,
                     ),
                     exchange_manager.exchange_name,
                     exchange_manager.proxy_config,
@@ -319,7 +315,8 @@ def _use_proxy_if_necessary(client, proxy_config: proxy_config_import.ProxyConfi
         if (client.socks_proxy_sessions is None):
             client.socks_proxy_sessions = {}
         if (proxy_url not in client.socks_proxy_sessions):
-            connector = aiohttp_socks.ProxyConnector.from_url(
+            previous_aiohttp_socks_connector = client.aiohttp_socks_connector
+            client.aiohttp_socks_connector = aiohttp_socks.ProxyConnector.from_url(
                 proxy_url,
                 # extra args copied from self.open()
                 ssl=client.ssl_context,
@@ -328,8 +325,10 @@ def _use_proxy_if_necessary(client, proxy_config: proxy_config_import.ProxyConfi
                 enable_cleanup_closed=True
             )
             client.socks_proxy_sessions[proxy_url] = aiohttp.ClientSession(
-                loop=client.asyncio_loop, connector=connector, trust_env=client.aiohttp_trust_env
+                loop=client.asyncio_loop, connector=client.aiohttp_socks_connector,
+                trust_env=client.aiohttp_trust_env
             )
+            asyncio.create_task(_close_previous_session_and_connector(None, previous_aiohttp_socks_connector))
     elif proxy_config.disable_dns_cache:
         # rewrite of async_ccxt.exchange.client.open()
         _init_ccxt_client_session_requirements(client)
@@ -351,7 +350,7 @@ def _init_ccxt_client_session_requirements(client):
     # from async_ccxt.exchange.client.open()
     if client.asyncio_loop is None:
         client.asyncio_loop = asyncio.get_running_loop()
-        client.throttle.loop = client.asyncio_loop
+        client.throttler.loop = client.asyncio_loop
 
     if client.ssl_context is None:
         # Create our SSL context object with our CA cert file
@@ -360,27 +359,31 @@ def _init_ccxt_client_session_requirements(client):
 
 
 def _get_client_config(
-    exchange_class, options, headers, additional_config,
-    api_key=None, secret=None, password=None, uid=None,
-    auth_token=None, auth_token_header_prefix=None
+    exchange_class, options, headers, additional_config, creds: exchange_credentials_data.ExchangeCredentialsData=None
 ):
-    if auth_token:
-        headers["Authorization"] = f"{auth_token_header_prefix or ''}{auth_token}"
+    if creds and creds.auth_token:
+        headers["Authorization"] = f"{creds.auth_token_header_prefix or ''}{creds.auth_token}"
     config = {
         'verbose': constants.ENABLE_CCXT_VERBOSE,
         'enableRateLimit': constants.ENABLE_CCXT_RATE_LIMIT,
         'timeout': constants.DEFAULT_REQUEST_TIMEOUT,
         'options': options,
-        'headers': headers
+        'headers': headers,
+        'timeout_on_exit': constants.CCXT_TIMEOUT_ON_EXIT_MS,
     }
-    if api_key is not None:
-        config['apiKey'] = api_key
-    if secret is not None:
-        config['secret'] = secret
-    if password is not None:
-        config['password'] = password
-    if uid is not None:
-        config['uid'] = uid
+    if creds:
+        if creds.api_key is not None:
+            config['apiKey'] = creds.api_key
+        if creds.secret is not None:
+            config['secret'] = creds.secret
+        if creds.password is not None:
+            config['password'] = creds.password
+        if creds.uid is not None:
+            config['uid'] = creds.uid
+        if creds.wallet_address is not None:
+            config['walletAddress'] = creds.wallet_address
+        if creds.private_key is not None:
+            config['privateKey'] = creds.private_key
     config.update({**_get_custom_domain_config(exchange_class), **(additional_config or {})})
     return config
 
@@ -425,6 +428,13 @@ def _get_patched_url_config(url_config: dict, old: str, new: str):
     return updated_config
 
 
+async def _close_previous_session_and_connector(session, connector):
+    if connector is not None:
+        await connector.close()
+    if session is not None:
+        await session.close()
+
+
 def _use_request_counter(
     identifier: str, ccxt_client: async_ccxt.Exchange, proxy_config: proxy_config_import.ProxyConfig
 ):
@@ -438,23 +448,24 @@ def _use_request_counter(
         # 1. create ssl context and other required elements if necessary
         ccxt_client.open()
         previous_session = ccxt_client.session
+        previous_connector = ccxt_client.tcp_connector
         # 2. create patched session using the same params as a normal one
         # same as in ccxt.async_support.exchange.py#open()
         # connector = aiohttp.TCPConnector(ssl=self.ssl_context, loop=self.asyncio_loop, enable_cleanup_closed=True)
-        new_connector = aiohttp.TCPConnector(
+        ccxt_client.tcp_connector = aiohttp.TCPConnector(
             ssl=ccxt_client.ssl_context, loop=ccxt_client.asyncio_loop,
             enable_cleanup_closed=True, use_dns_cache=not proxy_config.disable_dns_cache
         )
         counter_session = aiohttp_util.CounterClientSession(
             identifier,
             loop=ccxt_client.asyncio_loop,
-            connector=new_connector,
+            connector=ccxt_client.tcp_connector,
             trust_env=previous_session.trust_env,
         )
         # 3. replace session
         ccxt_client.session = counter_session
         # 4. close replaced session in task to avoid making this function a coroutine
-        asyncio.create_task(previous_session.close())
+        asyncio.create_task(_close_previous_session_and_connector(previous_session, previous_connector))
         commons_logging.get_logger(__name__).info(f"Request counter enabled for {identifier}")
     except Exception as err:
         commons_logging.get_logger(__name__).exception(

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/octobot_trading/exchanges/connectors/ccxt/ccxt_connector.py

@@ -34,6 +34,7 @@ import octobot_trading.enums as enums
 import octobot_trading.errors
 import octobot_trading.exchanges as exchanges
 import octobot_trading.exchanges.abstract_exchange as abstract_exchange
+import octobot_trading.exchanges.config.exchange_credentials_data as exchange_credentials_data
 import octobot_trading.exchanges.connectors.ccxt.ccxt_adapter as ccxt_adapter
 import octobot_trading.exchanges.connectors.ccxt.ccxt_client_util as ccxt_client_util
 import octobot_trading.exchanges.connectors.ccxt.enums as ccxt_enums
@@ -262,7 +263,11 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
     def _create_client(self, force_unauth=False):
         self.client, self.is_authenticated = self._client_factory(force_unauth)
 
-    def _client_factory(self, force_unauth, keys_adapter=None) -> tuple:
+    def _client_factory(
+        self,
+        force_unauth,
+        keys_adapter: typing.Callable[[exchange_credentials_data.ExchangeCredentialsData], exchange_credentials_data.ExchangeCredentialsData]=None
+    ) -> tuple:
         return ccxt_client_util.create_client(
             self.exchange_type, self.exchange_manager, self.logger,
             self.options, self.headers, self.additional_config,
@@ -397,8 +402,8 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
                 return self.adapter.adapt_public_recent_trades(
                     await self.client.fetch_trades(symbol, limit=limit, params=kwargs)
                 )
-        except ccxt.NotSupported:
-            raise octobot_trading.errors.NotSupported
+        except (ccxt.NotSupported, ccxt.ArgumentsRequired) as err:
+            raise octobot_trading.errors.NotSupported(err)
         except ccxt.BaseError as e:
             raise octobot_trading.errors.FailedRequest(
                 f"Failed to get_recent_trades {html_util.get_html_summary_if_relevant(e)}"
@@ -553,7 +558,6 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
             symbol=symbol, quantity=quantity
         )
 
-
     @ccxt_client_util.converted_ccxt_common_errors
     async def create_market_buy_order_with_cost(self, symbol, cost: float, quantity: float, params=None) -> dict:
         return self.adapter.adapt_order(
@@ -562,7 +566,6 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
             symbol=symbol, quantity=quantity
         )
 
-
     @ccxt_client_util.converted_ccxt_common_errors
     async def create_limit_buy_order(self, symbol, quantity, price=None, params=None) -> dict:
         return self.adapter.adapt_order(

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/octobot_trading/exchanges/exchange_manager.py

@@ -30,6 +30,7 @@ import octobot_trading.enums as enums
 import octobot_trading.util as util
 import octobot_trading.errors as errors
 import octobot_trading.storage as storage
+import octobot_trading.exchanges.config.exchange_credentials_data as exchange_credentials_data
 import trading_backend.exchanges
 
 
@@ -143,10 +144,13 @@ class ExchangeManager(util.Initializable):
                 await self.exchange.stop()
             except Exception as err:
                 self.logger.exception(err, True, f"Error when stopping exchange: {err}")
-            exchanges.Exchanges.instance().del_exchange(
-                self.exchange.name, self.id, should_warn=warning_on_missing_elements
-            )
-            self.exchange.exchange_manager = None
+            if self.exchange is not None:
+                # ensure self.exchange still exists as await self.exchange.stop()
+                # internally uses asyncio.sleep within ccxt
+                exchanges.Exchanges.instance().del_exchange(
+                    self.exchange.name, self.id, should_warn=warning_on_missing_elements
+                )
+                self.exchange.exchange_manager = None
             self.exchange = None
         if self.exchange_personal_data is not None:
             try:
@@ -313,9 +317,10 @@ class ExchangeManager(util.Initializable):
             return False
         return True
 
-    def get_exchange_credentials(self, exchange_name):
+    def get_exchange_credentials(self, exchange_name) -> exchange_credentials_data.ExchangeCredentialsData:
+        creds = exchange_credentials_data.ExchangeCredentialsData()
         if self.ignore_config or not self.should_decrypt_token() or self.without_auth:
-            return "", "", "", "", ""
+            return creds
         config_exchange = self.config[common_constants.CONFIG_EXCHANGES][exchange_name]
         key = configuration.decrypt_element_if_possible(
             common_constants.CONFIG_EXCHANGE_KEY, config_exchange, None
@@ -323,16 +328,15 @@ class ExchangeManager(util.Initializable):
         secret = configuration.decrypt_element_if_possible(
             common_constants.CONFIG_EXCHANGE_SECRET, config_exchange, None
         )
-        return (
-            # remove leading and trailing ", ', newlines and whitespaces if any
-            key.strip(' "').strip("'").strip("\n") if key else key,
-            secret.strip(' "').strip("'").strip("\n") if secret else secret,
-            configuration.decrypt_element_if_possible(
-                common_constants.CONFIG_EXCHANGE_PASSWORD, config_exchange, None
-            ),
-            config_exchange.get(common_constants.CONFIG_EXCHANGE_UID, ""),
-            config_exchange.get(common_constants.CONFIG_EXCHANGE_ACCESS_TOKEN, "")
+        # remove leading and trailing ", ', newlines and whitespaces if any
+        creds.api_key = key.strip(' "').strip("'").strip("\n") if key else key
+        creds.secret = secret.strip(' "').strip("'").strip("\n") if secret else secret
+        creds.password = configuration.decrypt_element_if_possible(
+            common_constants.CONFIG_EXCHANGE_PASSWORD, config_exchange, None
         )
+        creds.uid = config_exchange.get(common_constants.CONFIG_EXCHANGE_UID, "")
+        creds.auth_token = config_exchange.get(common_constants.CONFIG_EXCHANGE_ACCESS_TOKEN, "")
+        return creds
 
     def get_exchange_sub_account_id(self, exchange_name):
         config_exchange = self.config[common_constants.CONFIG_EXCHANGES][exchange_name]

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/octobot_trading/exchanges/types/rest_exchange.py

@@ -457,7 +457,7 @@ class RestExchange(abstract_exchange.AbstractExchange):
         ) -> dict:
         return await self.connector.create_limit_buy_order(
             symbol, quantity, price, params=params
-            )
+        )
 
     async def _create_market_sell_order(
         self, symbol, quantity, price=None, reduce_only: bool = False, params=None

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/requirements.txt

@@ -8,7 +8,7 @@ OctoBot-Tentacles-Manager>=2.9, <2.10
 trading-backend>=1.2.35
 
 # Exchange connection requirements
-ccxt==4.3.85 # always ensure real exchanges tests (in tests_additional and authenticated exchange tests) are passing before changing the ccxt version
+ccxt==4.4.72 # always ensure real exchanges tests (in tests_additional and authenticated exchange tests) are passing before changing the ccxt version
 aiohttp_socks==0.10.1   # used by ccxt socks proxy aiohttp connectors
 
 cryptography # Never specify a version (managed by https://github.com/Drakkar-Software/OctoBot-PyPi-Linux-Deployer)

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/tests/exchange_data/ticker/test_ticker_manager.py

@@ -66,6 +66,7 @@ async def test_update_and_reset_ticker(ticker_manager):
             ExchangeConstantsTickersColumns.AVERAGE.value: nan,
             ExchangeConstantsTickersColumns.SYMBOL.value: nan,
             ExchangeConstantsTickersColumns.QUOTE_VOLUME.value: nan,
+            ExchangeConstantsTickersColumns.BASE_VOLUME.value: nan,
             ExchangeConstantsTickersColumns.TIMESTAMP.value: 0,
             ExchangeConstantsTickersColumns.VWAP.value: nan
         }

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/tests/exchanges/util/test_exchange_util.py

@@ -226,7 +226,7 @@ async def test_get_exchange_details(tentacles_setup_config, supported_exchanges)
         assert details.name == "Binance"
         assert details.url == "https://www.binance.com"
         assert len(details.api) > 1
-        assert "https://user-images.githubusercontent.com/" in details.logo_url
+        assert "https://github.com/user-attachments/assets" in details.logo_url
         assert details.has_websocket is False   # default value
         get_tentacle_config_mock.assert_not_called()
 

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/tests_additional/real_exchanges/real_exchange_tester.py

@@ -412,8 +412,12 @@ class RealExchangeTester:
             # => set expect_invalid_price_limit_values to True in call and
             # remove price limit in exchange tentacle market status fixer if this is the case
             if has_price_limit_value:
-                assert (not has_price_limit_value) or low_price_max >= min_price >= low_price_min
-            assert (not has_cost_limit_value) or low_cost_max >= min_cost >= low_cost_min
+                assert (not has_price_limit_value) or low_price_max >= min_price >= low_price_min, (
+                    f"FALSE: {low_price_max} >= {min_price} >= {low_price_min}"
+                )
+            assert (not has_cost_limit_value) or low_cost_max >= min_cost >= low_cost_min, (
+                    f"FALSE: {low_cost_max} >= {min_cost} >= {min_cost}"
+                )
         else:
             if has_price_limit_value:
                 assert (not has_price_limit_value) or normal_price_max >= min_price >= normal_price_min

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/tests_additional/real_exchanges/test_ascendex.py

@@ -31,7 +31,7 @@ class TestAscendExRealExchangeTester(RealExchangeTester):
     EXCHANGE_NAME = "ascendex"
     SYMBOL = "BTC/USDT"
     SYMBOL_2 = "ETH/BTC"
-    SYMBOL_3 = "XRP/BTC"
+    SYMBOL_3 = "KAI/USDT"
 
     async def test_time_frames(self):
         time_frames = await self.time_frames()
@@ -51,7 +51,7 @@ class TestAscendExRealExchangeTester(RealExchangeTester):
         ))
 
     async def test_active_symbols(self):
-        await self.inner_test_active_symbols(500, 1000)
+        await self.inner_test_active_symbols(800, 1200)
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
@@ -65,7 +65,10 @@ class TestAscendExRealExchangeTester(RealExchangeTester):
                        for elem in (Ecmsc.LIMITS_AMOUNT.value,
                                     Ecmsc.LIMITS_PRICE.value,
                                     Ecmsc.LIMITS_COST.value))
-            self.check_market_status_limits(market_status, expect_invalid_price_limit_values=False)
+            self.check_market_status_limits(
+                market_status, expect_invalid_price_limit_values=False,
+                low_cost_max=5, low_price_min=1e-12
+            )
 
     async def test_get_symbol_prices(self):
         # without limit
@@ -101,9 +104,7 @@ class TestAscendExRealExchangeTester(RealExchangeTester):
                 assert self.CANDLE_SINCE_SEC <= candle[PriceIndexes.IND_PRICE_TIME.value] <= max_candle_time
 
     async def test_get_historical_ohlcv(self):
-        with pytest.raises(AssertionError):
-            # seems temporarily broken (exchange side)
-            await super().test_get_historical_ohlcv()
+        await super().test_get_historical_ohlcv()
 
     async def test_get_kline_price(self):
         kline_price = await self.get_kline_price()

{OctoBot-Trading-2.4.170 → OctoBot-Trading-2.4.172}/tests_additional/real_exchanges/test_binance.py

@@ -56,7 +56,7 @@ class TestBinanceRealExchangeTester(RealExchangeTester):
 
     async def test_active_symbols(self):
         # binanceus numbers
-        await self.inner_test_active_symbols(150, 500)
+        await self.inner_test_active_symbols(200, 500)
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():