OctoBot-Trading 2.4.95__tar.gz → 2.4.97__tar.gz

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/CHANGELOG.md

@@ -4,6 +4,19 @@ 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.97] - 2024-08-14
+### Added
+- [Exchanges] cancel_all_orders
+- [Exchanges] forced ticker setting 
+- [API] get_daily_base_and_quote_volume
+### Fixed
+- [Exchanges] ticker volumes
+
+## [2.4.96] - 2024-08-13
+### Added
+- [Exchanges] BitMart tests
+- [API] get_usd_like_symbols_from_symbols
+
 ## [2.4.95] - 2024-08-03
 ### Fixed
 - [Exchanges] reduce market status cache time

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97/OctoBot_Trading.egg-info}/PKG-INFO

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

@@ -449,6 +449,7 @@ tests_additional/real_exchanges/test_bingx.py
 tests_additional/real_exchanges/test_bitfinex.py
 tests_additional/real_exchanges/test_bitget.py
 tests_additional/real_exchanges/test_bithumb.py
+tests_additional/real_exchanges/test_bitmart.py
 tests_additional/real_exchanges/test_bitso.py
 tests_additional/real_exchanges/test_bitstamp.py
 tests_additional/real_exchanges/test_bybit.py

{OctoBot-Trading-2.4.95/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.97}/PKG-INFO

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

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

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

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/api/__init__.py

@@ -42,6 +42,7 @@ from octobot_trading.api.symbol_data import (
     get_symbol_high_candles,
     get_symbol_low_candles,
     get_symbol_volume_candles,
+    get_daily_base_and_quote_volume,
     get_symbol_time_candles,
     create_new_candles_manager,
     force_set_mark_price,
@@ -163,6 +164,7 @@ from octobot_trading.api.portfolio import (
     get_draw_down,
     get_coefficient_of_determination,
     get_usd_like_symbol_from_symbols,
+    get_usd_like_symbols_from_symbols,
     can_convert_symbol_to_usd_like,
     is_usd_like_coin,
     get_global_portfolio_currencies_values,
@@ -231,6 +233,7 @@ __all__ = [
     "get_symbol_high_candles",
     "get_symbol_low_candles",
     "get_symbol_volume_candles",
+    "get_daily_base_and_quote_volume",
     "get_symbol_time_candles",
     "create_new_candles_manager",
     "force_set_mark_price",
@@ -338,6 +341,7 @@ __all__ = [
     "get_draw_down",
     "get_coefficient_of_determination",
     "get_usd_like_symbol_from_symbols",
+    "get_usd_like_symbols_from_symbols",
     "can_convert_symbol_to_usd_like",
     "is_usd_like_coin",
     "get_global_portfolio_currencies_values",

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/api/exchange.py

@@ -78,7 +78,7 @@ def get_exchange_configuration_from_exchange_id(exchange_id: str) -> exchanges.E
 
 
 # prefer get_exchange_manager_from_exchange_name_and_id when possible
-def get_exchange_manager_from_exchange_id(exchange_id: str) -> object:
+def get_exchange_manager_from_exchange_id(exchange_id: str) -> exchanges.ExchangeManager:
     try:
         return get_exchange_configuration_from_exchange_id(exchange_id).exchange_manager
     except KeyError:

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/api/portfolio.py

@@ -96,6 +96,10 @@ def get_usd_like_symbol_from_symbols(currency: str, symbols) -> str:
     return personal_data.ValueConverter.get_usd_like_symbol_from_symbols(currency, symbols)
 
 
+def get_usd_like_symbols_from_symbols(currency: str, symbols) -> list:
+    return personal_data.ValueConverter.get_usd_like_symbols_from_symbols(currency, symbols)
+
+
 def can_convert_symbol_to_usd_like(symbol: str) -> bool:
     return personal_data.ValueConverter.can_convert_symbol_to_usd_like(symbol)
 

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/api/symbol_data.py

@@ -94,6 +94,32 @@ def get_symbol_volume_candles(symbol_data, time_frame, limit=-1, include_in_cons
     return exchange_data.get_symbol_volume_candles(symbol_data, time_frame, limit, include_in_construction)
 
 
+def get_daily_base_and_quote_volume(symbol_data, reference_price: decimal.Decimal) -> (decimal.Decimal, decimal.Decimal):
+    base_volume = symbol_data.ticker_manager.ticker.get(
+        octobot_trading.enums.ExchangeConstantsTickersColumns.BASE_VOLUME.value,
+        "nan"
+    )
+    quote_volume = symbol_data.ticker_manager.ticker.get(
+        octobot_trading.enums.ExchangeConstantsTickersColumns.QUOTE_VOLUME.value,
+        "nan"
+    )
+    if base_volume:
+        base_volume = decimal.Decimal(str(base_volume))
+        if not quote_volume or decimal.Decimal(str(quote_volume)).is_nan():
+            # compute from the other if missing
+            quote_volume = base_volume * reference_price
+    if quote_volume:
+        quote_volume = decimal.Decimal(str(quote_volume))
+        if not base_volume or decimal.Decimal(str(base_volume)).is_nan():
+            # compute from the other if missing
+            base_volume = quote_volume / reference_price
+    if not (base_volume and quote_volume):
+        raise ValueError(
+            f"Missing volume {base_volume=} {quote_volume=}"
+        )
+    return base_volume, quote_volume
+
+
 def get_symbol_time_candles(symbol_data, time_frame, limit=-1, include_in_construction=False):
     return exchange_data.get_symbol_time_candles(symbol_data, time_frame, limit, include_in_construction)
 

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/constants.py

@@ -99,6 +99,7 @@ FULL_CANDLE_HISTORY_EXCHANGES = [
     "mexc",
     "coinbase",
     "binanceus",
+    "bitmart",
 ]
 
 DEFAULT_FUTURE_EXCHANGES = ["binanceusdm", "bybit"]
@@ -124,7 +125,7 @@ TESTED_EXCHANGES = [
 DEFAULT_FUTURE_EXCHANGES = sorted(["bybit"])
 SIMULATOR_TESTED_EXCHANGES = sorted(["bitfinex2", "bithumb", "bitstamp", "bittrex",
                               "hitbtc", "kraken", "poloniex", "bitso", "ndax", "upbit",
-                              "wavesexchange"])
+                              "wavesexchange", "bitmart",])
 
 # text content of errors due to exchange compliancy rules
 # Warning: should never be a false positive

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/exchange_data/exchange_symbols_data.py

@@ -33,7 +33,7 @@ class ExchangeSymbolsData:
             exchange_symbol_data.stop()
         self.exchange_symbol_data = {}
 
-    def get_exchange_symbol_data(self, symbol, allow_creation=True):
+    def get_exchange_symbol_data(self, symbol, allow_creation=True) -> ExchangeSymbolData:
         try:
             return self.exchange_symbol_data[symbol]
         except KeyError as e:

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/exchange_data/prices/prices_manager.py

@@ -89,7 +89,13 @@ class PricesManager(util.Initializable):
                 (mark_price, self.exchange_manager.exchange.get_exchange_current_time())
         return is_mark_price_updated
 
-    async def get_mark_price(self, timeout=MARK_PRICE_FETCH_TIMEOUT):
+    def get_mark_price_no_wait(self) -> decimal.Decimal:
+        self._ensure_price_validity()
+        if not self.valid_price_received_event.is_set():
+            raise ValueError(f"No up to date mark price for {self.exchange_manager.exchange_name}")
+        return self.mark_price
+
+    async def get_mark_price(self, timeout=MARK_PRICE_FETCH_TIMEOUT) -> decimal.Decimal:
         """
         Return mark price if valid
         :param timeout: event wait timeout

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/exchange_data/ticker/channel/ticker_updater.py

@@ -95,11 +95,12 @@ class TickerUpdater(ticker_channel.TickerProducer):
     """
 
     def _should_use_future(self):
-        return self.channel.exchange_manager.is_future and \
-               (
-                       self.channel.exchange_manager.exchange.FUNDING_IN_TICKER
-                       or self.channel.exchange_manager.exchange.MARK_PRICE_IN_TICKER
-               )
+        return (
+            self.channel.exchange_manager.is_future and (
+                self.channel.exchange_manager.exchange.FUNDING_IN_TICKER
+                or self.channel.exchange_manager.exchange.MARK_PRICE_IN_TICKER
+            )
+        )
 
     async def modify(self, added_pairs=None, removed_pairs=None):
         if added_pairs:

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/exchange_data/ticker/ticker_manager.py

@@ -62,7 +62,12 @@ class TickerManager(util.Initializable):
         }
 
     def ticker_update(self, ticker):
-        self.ticker.update(ticker)
+        ticker_update = {
+            key: val
+            for key, val in ticker.items()
+            if val
+        }
+        self.ticker.update(ticker_update)
 
     def mini_ticker_update(self, mini_ticker):
         self.mini_ticker.update(mini_ticker)

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/exchanges/abstract_exchange.py

@@ -95,7 +95,7 @@ class AbstractExchange(tentacles_management.AbstractTentacle):
 
         self.is_unreachable = False
 
-        self._creating_exchange_order_ids = set()
+        self._creating_exchange_order_descriptions = set()
 
         if self.exchange_manager.tentacles_setup_config is not None:
             self.load_user_inputs_from_class(self.exchange_manager.tentacles_setup_config, self.tentacle_config)
@@ -327,6 +327,13 @@ class AbstractExchange(tentacles_management.AbstractTentacle):
         """
         raise NotImplementedError("get_leverage_tiers is not implemented")
 
+    async def cancel_all_orders(self, symbol: str = None, **kwargs: dict) -> None:
+        """
+        Cancel all orders on the exchange
+        :param symbol: the orders symbol
+        """
+        raise NotImplementedError("cancel_all_orders is not implemented")
+
     async def cancel_order(
             self, exchange_order_id: str, symbol: str, order_type: enums.TraderOrderType, **kwargs: dict
     ) -> enums.OrderStatus:
@@ -720,17 +727,25 @@ class AbstractExchange(tentacles_management.AbstractTentacle):
                           f"({error.__class__.__name__}: {error})")
 
     @contextlib.contextmanager
-    def creating_order(self, creating_order: dict):
-        exchange_order_id = creating_order.get(
-            enums.ExchangeConstantsOrderColumns.EXCHANGE_ID.value
-        ) if creating_order else None
+    def creating_order(
+        self, side: enums.TradeOrderSide, symbol: str, quantity: decimal.Decimal, price: decimal.Decimal
+    ):
+        desc = self._get_order_description(side, symbol, quantity, price)
         try:
-            self._creating_exchange_order_ids.add(exchange_order_id)
+            self._creating_exchange_order_descriptions.add(desc)
             yield
         finally:
-            self._creating_exchange_order_ids.remove(exchange_order_id)
-
-    def is_creating_order(self, exchange_order_id):
-        if exchange_order_id is None:
-            return False
-        return exchange_order_id in self._creating_exchange_order_ids
+            self._creating_exchange_order_descriptions.remove(desc)
+
+    def is_creating_order(
+        self, order: dict, symbol: str
+    ) -> bool:
+        quantity = decimal.Decimal(str(order[enums.ExchangeConstantsOrderColumns.AMOUNT.value]))
+        price = decimal.Decimal(str(order[enums.ExchangeConstantsOrderColumns.PRICE.value]))
+        side = enums.TradeOrderSide(str(order[enums.ExchangeConstantsOrderColumns.SIDE.value]))
+        return self._get_order_description(side, symbol, quantity, price) in self._creating_exchange_order_descriptions
+
+    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)}"

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/exchanges/config/exchange_config_data.py

@@ -65,6 +65,9 @@ class ExchangeConfig(util.Initializable):
         # number of required historical candles
         self.required_historical_candles_count = constants.DEFAULT_IGNORED_VALUE
 
+        # periodic updaters that should always be started for this configuration
+        self.forced_updater_channels = set()
+
         self.backtesting_exchange_config = None
 
     async def initialize_impl(self):
@@ -141,6 +144,12 @@ class ExchangeConfig(util.Initializable):
         # If required timeframes: use those. Use traded timeframes otherwise
         return self.available_required_time_frames or self.traded_time_frames
 
+    def has_forced_updater(self, channel: str) -> bool:
+        return channel in self.forced_updater_channels
+
+    def add_forced_updater_channels(self, channel: set[str]):
+        self.forced_updater_channels.update(channel)
+
     async def add_watched_symbols(self, symbols):
         new_valid_symbols = [
             symbol

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/exchanges/connectors/ccxt/ccxt_connector.py

@@ -571,6 +571,19 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
             symbol=symbol, quantity=quantity
         )
 
+    @ccxt_client_util.converted_ccxt_common_errors
+    async def cancel_all_orders(self, symbol: str = None, **kwargs: dict) -> None:
+        try:
+            with self.error_describer():
+                await self.client.cancel_all_orders(symbol=symbol, params=kwargs)
+        except (ccxt.NotSupported, octobot_trading.errors.NotSupported) as e:
+            raise octobot_trading.errors.NotSupported(e) from e
+        except Exception as e:
+            self.logger.exception(
+                e, True, f"Unexpected error when cancelling all {symbol} orders | {e} ({e.__class__.__name__})"
+            )
+            raise e
+
     @ccxt_client_util.converted_ccxt_common_errors
     async def cancel_order(
         self, exchange_order_id: str, symbol: str, order_type: enums.TraderOrderType, **kwargs: dict

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/exchanges/connectors/ccxt/ccxt_websocket_connector.py

@@ -926,7 +926,8 @@ class CCXTWebsocketConnector(abstract_websocket_exchange.AbstractWebsocketExchan
                 Ectc.CLOSE.value: kline[commons_enums.PriceIndexes.IND_PRICE_CLOSE.value],
                 Ectc.LAST.value: kline[commons_enums.PriceIndexes.IND_PRICE_CLOSE.value],
                 Ectc.PREVIOUS_CLOSE.value: None,
-                Ectc.BASE_VOLUME.value: kline[commons_enums.PriceIndexes.IND_PRICE_VOL.value],
+                # do not include volume as this is not the ticker volume but the current candle volume
+                Ectc.BASE_VOLUME.value: None,
                 Ectc.TIMESTAMP.value: self.exchange.get_exchange_current_time(),
             }
             await self.push_to_channel(

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/exchanges/exchange_builder.py

@@ -106,6 +106,10 @@ class ExchangeBuilder:
             self.config[commons_constants.CONFIG_TENTACLES_REQUIRED_CANDLES_COUNT],
             modes.get_required_candles_count(trading_mode_class, tentacles_setup_config)
         )
+        # register forced updaters if any
+        self.exchange_manager.exchange_config.add_forced_updater_channels(
+            trading_mode_class.get_forced_updater_channels()
+        )
 
     async def _build_trading_modes_if_required(self, trading_mode_class):
         if self._is_using_trading_modes:

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/exchanges/exchange_websocket_factory.py

@@ -34,14 +34,16 @@ def is_channel_managed_by_websocket(exchange_manager, channel):
 def is_channel_fully_managed_by_websocket(exchange_manager, channel):
     return (
         not any([
+            # no associated feed is related to a time frame
             exchange_manager.exchange_web_socket.is_time_frame_related_feed(feed)
             for feed in octobot_trading.constants.WEBSOCKET_FEEDS_TO_TRADING_CHANNELS[channel]
         ])
         or all([
+            # all required time frames are supported
             exchange_manager.exchange_web_socket.is_time_frame_supported(time_frame)
             for time_frame in exchange_manager.exchange_config.available_time_frames
         ])
-    )
+    ) and not exchange_manager.exchange_config.has_forced_updater(channel)
 
 
 def is_websocket_feed_requiring_init(exchange_manager, channel):

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/exchanges/traders/trader.py

@@ -459,6 +459,58 @@ class Trader(util.Initializable):
                 f"Can't cancel order and unknown post sync order state for order: {order}."
             ) from err
 
+    async def cancel_all_orders(
+        self,
+        symbol: str,
+        allow_single_order_cancel_fallback: bool,
+        wait_for_cancelling: bool = True,
+        cancelling_timeout: float = octobot_trading.constants.INDIVIDUAL_ORDER_SYNC_TIMEOUT
+    ) -> bool:
+        orders_to_cancel = self.exchange_manager.exchange_personal_data.orders_manager.get_all_orders(symbol)
+        success = True
+        if orders_to_cancel:
+            self.logger.info(f"Cancelling all {len(orders_to_cancel)} {symbol} orders")
+        else:
+            return success
+        try:
+            cancel_on_exchange = False
+            for order in orders_to_cancel:
+                await order.lock.acquire()
+                if self.simulate or order.is_self_managed():
+                    order.status = octobot_trading.enums.OrderStatus.CANCELED
+                else:
+                    cancel_on_exchange = True
+            if cancel_on_exchange:
+                try:
+                    success = False
+                    await self.exchange_manager.exchange.cancel_all_orders(symbol)
+                    success = True
+                except errors.NotSupported:
+                    if allow_single_order_cancel_fallback:
+                        self.logger.debug(
+                            f"cancel_all_orders is not supported on {self.exchange_manager.exchange_name}. Falling "
+                            f"back to one by one cancel"
+                        )
+                        for order in orders_to_cancel:
+                            if not await self.cancel_order(
+                                order.symbol,
+                                wait_for_cancelling=wait_for_cancelling,
+                                cancelling_timeout=cancelling_timeout
+                            ):
+                                success = False
+                    else:
+                        # not supported and no fallback allowed: re-raise errors.NotSupported
+                        raise
+            for order in orders_to_cancel:
+                await order.on_cancel(force_cancel=True, is_from_exchange_data=False)
+                if wait_for_cancelling and order.state is not None and order.state.is_pending():
+                    await self._wait_for_order_cancel(order, cancelling_timeout)
+        finally:
+            for order in orders_to_cancel:
+                order.lock.release()
+        self.logger.info(f"Cancelling of all {len(orders_to_cancel)} {symbol} orders complete")
+        return success
+
     async def _wait_for_order_cancel(self, order, cancelling_timeout):
         self.logger.debug(f"Waiting for order cancelling, order: {order}")
         await order.state.wait_for_terminate(cancelling_timeout)

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/exchanges/types/rest_exchange.py

@@ -164,12 +164,12 @@ class RestExchange(abstract_exchange.AbstractExchange):
                            side: enums.TradeOrderSide = None, current_price: decimal.Decimal = None,
                            reduce_only: bool = False, params: dict = None) -> typing.Optional[dict]:
         async with self._order_operation(order_type, symbol, quantity, price, stop_price):
-            created_order = await self._create_order_with_retry(
-                order_type=order_type, symbol=symbol, quantity=quantity, price=price,
-                stop_price=stop_price, side=side, current_price=current_price,
-                reduce_only=reduce_only, params=params)
-            self.logger.debug(f"Created order: {created_order}")
-            with self.creating_order(created_order):
+            with self.creating_order(side, symbol, quantity, price):
+                created_order = await self._create_order_with_retry(
+                    order_type=order_type, symbol=symbol, quantity=quantity, price=price,
+                    stop_price=stop_price, side=side, current_price=current_price,
+                    reduce_only=reduce_only, params=params)
+                self.logger.debug(f"Created order: {created_order}")
                 return await self._verify_order(created_order, order_type, symbol, price, side)
         return None
 
@@ -620,8 +620,11 @@ class RestExchange(abstract_exchange.AbstractExchange):
     async def get_my_recent_trades(self, symbol: str = None, since: int = None, limit: int = None, **kwargs: dict) -> list:
         return await self.connector.get_my_recent_trades(symbol=symbol, since=since, limit=limit, **kwargs)
 
+    async def cancel_all_orders(self, symbol: str = None, **kwargs: dict) -> None:
+        return await self.connector.cancel_all_orders(symbol=symbol, **kwargs)
+
     async def cancel_order(
-            self, exchange_order_id: str, symbol: str, order_type: enums.TraderOrderType, **kwargs: dict
+        self, exchange_order_id: str, symbol: str, order_type: enums.TraderOrderType, **kwargs: dict
     ) -> enums.OrderStatus:
         return await self.connector.cancel_order(exchange_order_id, symbol, order_type, **kwargs)
 

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/modes/abstract_trading_mode.py

@@ -306,6 +306,10 @@ class AbstractTradingMode(abstract_tentacle.AbstractTentacle):
             # when self.trading_config is None, should not happen
             return False
 
+    @classmethod
+    def get_forced_updater_channels(cls) -> set[str]:
+        return set()
+
     def _health_check_interval_expired(self) -> bool:
         return self.exchange_manager.exchange.get_exchange_current_time() - self._last_health_check_time \
             > self.HEALTH_CHECK_INTERVAL
@@ -490,6 +494,21 @@ class AbstractTradingMode(abstract_tentacle.AbstractTentacle):
             ignored_order=ignored_order
         )
 
+    async def cancel_all_orders(
+        self,
+        symbol: str,
+        allow_single_order_cancel_fallback: bool,
+        wait_for_cancelling: bool = True,
+        cancelling_timeout: float = constants.INDIVIDUAL_ORDER_SYNC_TIMEOUT
+    ) -> bool:
+        # todo send signals when implementation will be necessary
+        return await self.exchange_manager.trader.cancel_all_orders(
+            symbol,
+            allow_single_order_cancel_fallback,
+            wait_for_cancelling=wait_for_cancelling,
+            cancelling_timeout=cancelling_timeout
+        )
+
     async def edit_order(self, order,
                          edited_quantity: decimal.Decimal = None,
                          edited_price: decimal.Decimal = None,

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/personal_data/orders/channel/orders.py

@@ -29,7 +29,7 @@ class OrdersProducer(exchanges_channel.ExchangeChannelProducer):
 
     async def perform(self, orders, is_from_bot=False, are_closed=False):
         try:
-            self.logger.debug(f"Received order update for {len(orders)} {'closed' if are_closed else ''} orders.")
+            self.logger.debug(f"Received order update for {len(orders)} {'closed' if are_closed else ''}orders.")
             has_new_order = False
             waiting_complete_init_orders = []
             symbols = set()
@@ -40,7 +40,7 @@ class OrdersProducer(exchanges_channel.ExchangeChannelProducer):
                 symbol = self.channel.exchange_manager.get_exchange_symbol(
                     self.channel.exchange_manager.exchange.parse_order_symbol(order)
                 )
-                if self.channel.exchange_manager.exchange.is_creating_order(exchange_order_id):
+                if self.channel.exchange_manager.exchange.is_creating_order(order, symbol):
                     # ignore orders that are being created
                     self.logger.debug(
                         f"Ignored update from order channel for {symbol} order with exchange order id "

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.97}/octobot_trading/personal_data/portfolios/value_converter.py

@@ -92,13 +92,21 @@ class ValueConverter:
 
     @staticmethod
     def get_usd_like_symbol_from_symbols(currency: str, symbols) -> str:
+        try:
+            return ValueConverter.get_usd_like_symbols_from_symbols(currency, symbols)[0]
+        except IndexError:
+            return None
+
+    @staticmethod
+    def get_usd_like_symbols_from_symbols(currency: str, symbols) -> list:
         # look for symbols using USD_LIKE_COINS priorities
+        usd_like_symbols = []
         for usd_like_coin in commons_constants.USD_LIKE_COINS:
             for symbol in symbols:
                 base_and_quote = symbol_util.parse_symbol(symbol).base_and_quote()
                 if currency in base_and_quote and usd_like_coin in base_and_quote:
-                    return symbol
-        return None
+                    usd_like_symbols.append(symbol)
+        return usd_like_symbols
 
     @staticmethod
     def can_convert_symbol_to_usd_like(symbol: str) -> bool: