OctoBot-Trading 2.4.98__tar.gz → 2.4.99__tar.gz

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99}/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.99] - 2024-08-19
+### Updated
+- [CCXT] updated to ccxt 4.3.85
+
 ## [2.4.98] - 2024-08-16
 ### Added
 - [Exchanges] exchange_config_by_exchange in init

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99/OctoBot_Trading.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OctoBot-Trading
-Version: 2.4.98
+Version: 2.4.99
 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.98](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.99](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.98 → OctoBot-Trading-2.4.99}/OctoBot_Trading.egg-info/requires.txt

@@ -4,7 +4,7 @@ Async-Channel<2.3,>=2.2
 OctoBot-Commons<1.10,>=1.9.43
 OctoBot-Tentacles-Manager<2.10,>=2.9
 trading-backend>=1.2.7
-ccxt==4.3.56
+ccxt==4.3.85
 cryptography
 sortedcontainers==2.4.0
 tinydb==4.5.2

{OctoBot-Trading-2.4.98/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.99}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OctoBot-Trading
-Version: 2.4.98
+Version: 2.4.99
 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.98](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.99](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.98 → OctoBot-Trading-2.4.99}/README.md

@@ -1,4 +1,4 @@
-# OctoBot-Trading [2.4.98](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.99](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.98 → OctoBot-Trading-2.4.99}/octobot_trading/__init__.py

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

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99}/octobot_trading/api/portfolio.py

@@ -15,6 +15,7 @@
 #  License along with this library.
 import decimal
 
+import octobot_commons.symbols as commons_symbols
 import octobot_trading.exchange_channel as exchange_channel
 import octobot_trading.constants
 import octobot_trading.personal_data as personal_data
@@ -105,4 +106,4 @@ def can_convert_symbol_to_usd_like(symbol: str) -> bool:
 
 
 def is_usd_like_coin(coin) -> bool:
-    return personal_data.ValueConverter.is_usd_like_coin(coin)
+    return commons_symbols.is_usd_like_coin(coin)

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99}/octobot_trading/constants.py

@@ -121,11 +121,12 @@ TESTED_EXCHANGES = [
     "mexc",
     "bingx",
     "coinex",
+    "bitmart",
 ])
 DEFAULT_FUTURE_EXCHANGES = sorted(["bybit"])
 SIMULATOR_TESTED_EXCHANGES = sorted(["bitfinex2", "bithumb", "bitstamp", "bittrex",
                               "hitbtc", "kraken", "poloniex", "bitso", "ndax", "upbit",
-                              "wavesexchange", "bitmart",])
+                              "wavesexchange",])
 
 # text content of errors due to exchange compliancy rules
 # Warning: should never be a false positive

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99}/octobot_trading/exchanges/abstract_exchange.py

@@ -750,4 +750,7 @@ class AbstractExchange(tentacles_management.AbstractTentacle):
     def _get_order_description(
         self, side: enums.TradeOrderSide, symbol: str, quantity: decimal.Decimal, price: decimal.Decimal
     ) -> str:
-        return f"{side.value}-{symbol}-{float(quantity)}-{float(price)}"
+        return (
+            f"{side.value if side else None}-{symbol}-"
+            f"{float(quantity) if quantity else None}-{float(price) if price else None}"
+        )

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99}/octobot_trading/exchanges/abstract_websocket_exchange.py

@@ -94,7 +94,7 @@ class AbstractWebsocketExchange:
     def get_exchange_credentials(self):
         """
         Exchange credentials
-        :return: key, secret, password
+        :return: key, secret, password, uid
         """
         return self.exchange_manager.get_exchange_credentials(self.exchange_manager.exchange_name)
 
@@ -219,7 +219,7 @@ class AbstractWebsocketExchange:
         raise NotImplementedError(f"get_feeds_count is not implemented")
 
     def _should_authenticate(self):
-        api_key, api_secret, _ = self.get_exchange_credentials()
+        api_key, api_secret, _, _ = self.get_exchange_credentials()
         return not self.exchange_manager.without_auth \
             and not self.exchange_manager.is_trader_simulated \
             and api_key and api_secret

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99}/octobot_trading/exchanges/connectors/ccxt/ccxt_adapter.py

@@ -43,6 +43,30 @@ class CCXTAdapter(adapters.AbstractAdapter):
         # CCXT standard order parsing logic
         return fixed
 
+    def adapt_amount_from_filled_or_cost(self, fixed):
+        try:
+            if (
+                fixed[enums.ExchangeConstantsOrderColumns.TYPE.value] == enums.TradeOrderType.MARKET.value and
+                fixed[enums.ExchangeConstantsOrderColumns.SIDE.value] == enums.TradeOrderSide.BUY.value and
+                fixed[enums.ExchangeConstantsOrderColumns.FILLED.value]
+            ):
+                # convert amount to use the base unit: use FILLED for accuracy (when not None/0)
+                fixed[enums.ExchangeConstantsOrderColumns.AMOUNT.value] = (
+                    fixed[enums.ExchangeConstantsOrderColumns.FILLED.value]
+                )
+            if (
+                (not fixed[enums.ExchangeConstantsOrderColumns.AMOUNT.value]) and
+                fixed[enums.ExchangeConstantsOrderColumns.COST.value] and
+                fixed[enums.ExchangeConstantsOrderColumns.PRICE.value]
+            ):
+                # convert amount to use the base unit
+                fixed[enums.ExchangeConstantsOrderColumns.AMOUNT.value] = (
+                    fixed[enums.ExchangeConstantsOrderColumns.COST.value] /
+                    fixed[enums.ExchangeConstantsOrderColumns.PRICE.value]
+                )
+        except KeyError:
+            pass
+
     def adapt_quantities_with_contract_size(self, order_or_trade, symbol):
         if self.connector.exchange_manager.is_future:
             symbol = symbol or order_or_trade.get(ecoc.SYMBOL.value)

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99}/octobot_trading/exchanges/connectors/ccxt/ccxt_client_util.py

@@ -45,15 +45,15 @@ def create_client(
                     f"exchange with ccxt in version {ccxt.__version__}")
     if exchange_manager.ignore_config or exchange_manager.check_config(exchange_manager.exchange_name):
         try:
-            key, secret, password = exchange_manager.get_exchange_credentials(exchange_manager.exchange_name)
+            key, secret, password, uid = exchange_manager.get_exchange_credentials(exchange_manager.exchange_name)
             if keys_adapter:
-                key, secret, password = keys_adapter(key, secret, password)
+                key, secret, password, uid = keys_adapter(key, secret, password, uid)
             if not (key and secret) 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_authenticate and not exchange_manager.is_backtesting:
                 client = exchange_class(_get_client_config(options, headers, additional_config,
-                                                           key, secret, password))
+                                                           key, secret, password, uid))
                 is_authenticated = True
                 if exchange_manager.check_credentials:
                     client.checkRequiredCredentials()
@@ -244,7 +244,7 @@ def _use_http_proxy_if_necessary(client):
     client.aiohttp_trust_env = constants.ENABLE_EXCHANGE_HTTP_PROXY_FROM_ENV
 
 
-def _get_client_config(options, headers, additional_config, api_key=None, secret=None, password=None):
+def _get_client_config(options, headers, additional_config, api_key=None, secret=None, password=None, uid=None):
     config = {
         'verbose': constants.ENABLE_CCXT_VERBOSE,
         'enableRateLimit': constants.ENABLE_CCXT_RATE_LIMIT,
@@ -258,5 +258,7 @@ def _get_client_config(options, headers, additional_config, api_key=None, secret
         config['secret'] = secret
     if password is not None:
         config['password'] = password
+    if uid is not None:
+        config['uid'] = uid
     config.update(additional_config or {})
     return config

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99}/octobot_trading/exchanges/exchange_manager.py

@@ -306,7 +306,7 @@ class ExchangeManager(util.Initializable):
 
     def get_exchange_credentials(self, exchange_name):
         if self.ignore_config or not self.should_decrypt_token() or self.without_auth:
-            return "", "", ""
+            return "", "", "", ""
         config_exchange = self.config[common_constants.CONFIG_EXCHANGES][exchange_name]
         return (
             configuration.decrypt_element_if_possible(
@@ -317,7 +317,8 @@ class ExchangeManager(util.Initializable):
             ).strip(" "),   # remove leading and trailing whitespaces if any
             configuration.decrypt_element_if_possible(
                 common_constants.CONFIG_EXCHANGE_PASSWORD, config_exchange, None
-            )
+            ),
+            config_exchange.get(common_constants.CONFIG_EXCHANGE_UID, "")
         )
 
     def get_exchange_sub_account_id(self, exchange_name):

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99}/octobot_trading/personal_data/portfolios/value_converter.py

@@ -76,11 +76,11 @@ class ValueConverter:
         return self._check_currency_initialization(currency, currency_value)
 
     def get_usd_like_value(self, currency, quantity, raise_error=True, init_price_fetchers=True):
-        if self.is_usd_like_coin(currency):
+        if symbol_util.is_usd_like_coin(currency):
             return quantity
         if symbol := self.get_usd_like_symbol_from_symbols(currency, self.last_prices_by_trading_pair):
             base, quote = symbol_util.parse_symbol(symbol).base_and_quote()
-            usd_like_currency = base if self.is_usd_like_coin(base) else quote
+            usd_like_currency = base if symbol_util.is_usd_like_coin(base) else quote
             return self.evaluate_value(
                 currency, quantity, raise_error=raise_error,
                 target_currency=usd_like_currency, init_price_fetchers=init_price_fetchers
@@ -116,10 +116,6 @@ class ValueConverter:
                 return True
         return False
 
-    @staticmethod
-    def is_usd_like_coin(coin) -> bool:
-        return coin in commons_constants.USD_LIKE_COINS
-
     def _check_currency_initialization(self, currency, currency_value):
         """
         Check if the currency has to be removed from self.initializing_symbol_prices and return currency_value

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99}/requirements.txt

@@ -9,7 +9,7 @@ trading-backend>=1.2.7
 
 # Exchange connection requirements
 # issue from 96, need ccxt==4.2.99
-ccxt==4.3.56 # always ensure real exchanges tests (in tests_additional and authenticated exchange tests) are passing before changing the ccxt version
+ccxt==4.3.85 # always ensure real exchanges tests (in tests_additional and authenticated exchange tests) are passing before changing the ccxt version
 
 cryptography # Never specify a version (managed by https://github.com/Drakkar-Software/OctoBot-PyPi-Linux-Deployer)
 

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99}/tests_additional/real_exchanges/real_exchange_tester.py

@@ -203,6 +203,10 @@ class RealExchangeTester:
             return await exchange_manager.exchange.get_price_ticker(self.SYMBOL)
 
     async def get_all_currencies_price_ticker(self, market_filter=None, **kwargs):
+        if market_filter is not None:
+            async with self.get_exchange_manager(market_filter=market_filter) as exchange_manager:
+                # create 2 exchange manager to force applying market_filter (avoid single test call side effect)
+                await exchange_manager.exchange.connector.load_symbol_markets()
         async with self.get_exchange_manager(market_filter=market_filter) as exchange_manager:
             return await exchange_manager.exchange.get_all_currencies_price_ticker(**kwargs)
 

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99}/tests_additional/real_exchanges/test_bingx.py

@@ -32,7 +32,7 @@ class TestBingxRealExchangeTester(RealExchangeTester):
     SYMBOL = "BTC/USDT"
     SYMBOL_2 = "ETH/BTC"
     SYMBOL_3 = "SHIB/USDT"
-    CANDLE_SINCE = 1680215441000  # Friday, March 24, 2023 3:00:00 PM UTC (large differences not supported)
+    CANDLE_SINCE = 1703005232000  # Thursday, October 19, 2023 5:00:32 PM UTC (large differences not supported)
     CANDLE_SINCE_SEC = CANDLE_SINCE / 1000
 
     async def _test_time_frames(self):

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99}/tests_additional/real_exchanges/test_bitget.py

@@ -70,8 +70,8 @@ class TestBitgetRealExchangeTester(RealExchangeTester):
             for val in (Ecmsc.LIMITS_PRICE_MIN.value, Ecmsc.LIMITS_PRICE_MAX.value):
                 assert market_status[Ecmsc.LIMITS.value][Ecmsc.LIMITS_PRICE.value][val] is None
             # wtf value, to fix in tentacle
-            for val in (Ecmsc.LIMITS_COST_MIN.value, Ecmsc.LIMITS_COST_MAX.value):
-                assert market_status[Ecmsc.LIMITS.value][Ecmsc.LIMITS_COST.value][val] in (None, 0, 5)
+            assert market_status[Ecmsc.LIMITS.value][Ecmsc.LIMITS_COST.value][Ecmsc.LIMITS_COST_MIN.value] in (0, 1, 5)
+            assert market_status[Ecmsc.LIMITS.value][Ecmsc.LIMITS_COST.value][Ecmsc.LIMITS_COST_MAX.value] is None
             # can't use normal checker
             # self.check_market_status_limits(market_status, expect_invalid_price_limit_values=True)
 

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99}/tests_additional/real_exchanges/test_bitmart.py

@@ -138,7 +138,7 @@ class TestBitMartRealExchangeTester(RealExchangeTester):
         assert len(tickers) > 2    # all tickers
         assert self.SYMBOL in tickers
         assert self.SYMBOL_2 in tickers
-        assert self.SYMBOL_3 in tickers  # symbol not correctly parsed as not in available markets (but luckily bitmart also uses the same syntax)
+        assert self.SYMBOL_3 not in tickers
         tickers = await self.get_all_currencies_price_ticker(
             symbols=[self.SYMBOL, self.SYMBOL_2],
             market_filter=self.get_market_filter()

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99}/tests_additional/real_exchanges/test_cryptocom.py

@@ -96,7 +96,13 @@ class TestCryptoComRealExchangeTester(RealExchangeTester):
             # check that fetched candles are historical candles
             max_candle_time = self.get_time_after_time_frames(self.CANDLE_SINCE_SEC, len(symbol_prices))
             assert max_candle_time <= self.get_time()
-            with pytest.raises(AssertionError):  # not supported
+            if limit is None:
+                # not supported
+                with pytest.raises(AssertionError):
+                    for candle in symbol_prices:
+                        assert self.CANDLE_SINCE_SEC <= candle[PriceIndexes.IND_PRICE_TIME.value] <= max_candle_time
+            else:
+                # supported with a limit value
                 for candle in symbol_prices:
                     assert self.CANDLE_SINCE_SEC <= candle[PriceIndexes.IND_PRICE_TIME.value] <= max_candle_time
 

{OctoBot-Trading-2.4.98 → OctoBot-Trading-2.4.99}/tests_additional/real_exchanges/test_okx.py

@@ -31,7 +31,7 @@ class TestOkxRealExchangeTester(RealExchangeTester):
     EXCHANGE_NAME = "okx"
     SYMBOL = "BTC/USDT"
     SYMBOL_2 = "ETH/BTC"
-    SYMBOL_3 = "XRP/BTC"
+    SYMBOL_3 = "OKB/BTC"
 
     async def test_time_frames(self):
         time_frames = await self.time_frames()