OctoBot-Trading 2.4.16__tar.gz → 2.4.18__tar.gz

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.18] - 2023-08-17
+### Updated
+- [CCXT] to version 4.0.65
+### Fixed
+- [Storage] handle corrupted db files auto fix
+
+## [2.4.17] - 2023-08-16
+### Added
+- [Orders] %s and %t amounts
+### Fixed
+- [Backtesting] fees on small amounts
+
 ## [2.4.16] - 2023-08-14
 ### Fixed
 - [Exchanges] unwanted market status load

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18/OctoBot_Trading.egg-info}/PKG-INFO

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

@@ -435,6 +435,7 @@ tests_additional/real_exchanges/real_futures_exchange_tester.py
 tests_additional/real_exchanges/test_ascendex.py
 tests_additional/real_exchanges/test_binance.py
 tests_additional/real_exchanges/test_binance_futures.py
+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

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/OctoBot_Trading.egg-info/requires.txt

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

{OctoBot-Trading-2.4.16/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.18}/PKG-INFO

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

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

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

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/api/exchange.py

@@ -19,6 +19,8 @@ import contextlib
 
 import trading_backend
 
+import octobot_commons.symbols as commons_symbols
+
 import octobot_trading.constants
 import octobot_trading.enums
 import octobot_trading.exchanges.connectors.ccxt.enums
@@ -204,7 +206,7 @@ def supports_websockets(exchange_name: str, tentacles_setup_config) -> bool:
     return exchanges.supports_websocket(exchange_name, tentacles_setup_config)
 
 
-def get_trading_pairs(exchange_manager) -> list:
+def get_trading_pairs(exchange_manager) -> list[str]:
     return exchange_manager.exchange_config.traded_symbol_pairs
 
 
@@ -216,7 +218,7 @@ def get_all_exchange_time_frames(exchange_manager) -> list:
     return exchange_manager.client_time_frames
 
 
-def get_trading_symbols(exchange_manager) -> list:
+def get_trading_symbols(exchange_manager) -> list[commons_symbols.Symbol]:
     return exchange_manager.exchange_config.traded_symbols
 
 

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/constants.py

@@ -78,7 +78,7 @@ FULL_CANDLE_HISTORY_EXCHANGES = [
     "bitstamp",
     "bybit",
     "gateio",
-    "hitbtc",
+    "bingx",
     "hollaex",
     "huobi",
     "huobipro",
@@ -103,8 +103,8 @@ TESTED_EXCHANGES = [
     "hollaex",
     "mexc",
 ]
-DEFAULT_FUTURE_EXCHANGES = ["binanceusdm", "bybit"]
-SIMULATOR_TESTED_EXCHANGES = ["bitfinex2", "bithumb", "bitstamp", "bittrex", "coinex",
+DEFAULT_FUTURE_EXCHANGES = ["bybit"]
+SIMULATOR_TESTED_EXCHANGES = ["bingx", "bitfinex2", "bithumb", "bitstamp", "bittrex", "coinex",
                               "hitbtc", "kraken", "poloniex", "bitso", "ndax", "upbit",
                               "wavesexchange"]
 

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/exchanges/adapters/abstract_adapter.py

@@ -69,6 +69,11 @@ class AbstractAdapter:
         fixed = self.fix_ticker(raw, **kwargs)
         return self.parse_ticker(fixed, **kwargs)
 
+    @_adapter
+    def adapt_ticker_from_kline(self, raw, symbol, **kwargs):
+        fixed = self.create_ticker_from_kline(raw, symbol, **kwargs)
+        return self.parse_ticker(fixed, **kwargs)
+
     @_adapter
     def adapt_balance(self, raw, **kwargs):
         fixed = self.fix_balance(raw, **kwargs)
@@ -166,6 +171,9 @@ class AbstractAdapter:
     def parse_ticker(self, fixed, **kwargs):
         raise NotImplementedError("parse_ticker is not implemented")
 
+    def create_ticker_from_kline(self, kline, symbol, **kwargs):
+        raise NotImplementedError("create_ticker_from_kline is not implemented")
+
     def fix_balance(self, raw, **kwargs):
         # add generic logic if necessary
         return raw

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/exchanges/connectors/ccxt/ccxt_adapter.py

@@ -109,6 +109,23 @@ class CCXTAdapter(adapters.AbstractAdapter):
         # CCXT standard ticker parsing logic
         return fixed
 
+    def create_ticker_from_kline(self, kline, symbol, **kwargs):
+        return {
+            enums.ExchangeConstantsTickersColumns.SYMBOL.value: symbol,
+            enums.ExchangeConstantsTickersColumns.TIMESTAMP.value: kline[common_enums.PriceIndexes.IND_PRICE_TIME.value],
+            enums.ExchangeConstantsTickersColumns.OPEN.value: kline[common_enums.PriceIndexes.IND_PRICE_OPEN.value],
+            enums.ExchangeConstantsTickersColumns.HIGH.value: kline[common_enums.PriceIndexes.IND_PRICE_HIGH.value],
+            enums.ExchangeConstantsTickersColumns.LOW.value: kline[common_enums.PriceIndexes.IND_PRICE_LOW.value],
+            enums.ExchangeConstantsTickersColumns.CLOSE.value: kline[common_enums.PriceIndexes.IND_PRICE_CLOSE.value],
+            enums.ExchangeConstantsTickersColumns.BASE_VOLUME.value: kline[common_enums.PriceIndexes.IND_PRICE_VOL.value],
+            enums.ExchangeConstantsTickersColumns.LAST.value: kline[common_enums.PriceIndexes.IND_PRICE_CLOSE.value],
+            enums.ExchangeConstantsTickersColumns.BID.value: None,
+            enums.ExchangeConstantsTickersColumns.BID_VOLUME.value: None,
+            enums.ExchangeConstantsTickersColumns.ASK.value: None,
+            enums.ExchangeConstantsTickersColumns.ASK_VOLUME.value: None,
+            enums.ExchangeConstantsTickersColumns.PREVIOUS_CLOSE.value: None,
+        }
+
     def fix_balance(self, raw, **kwargs):
         fixed = super().fix_balance(raw, **kwargs)
         # remove not currency specific keys
@@ -237,7 +254,7 @@ class CCXTAdapter(adapters.AbstractAdapter):
                     f"{fixed.get(ccxt_enums.ExchangePositionCCXTColumns.UNREALISED_PNL.value, 0)}"),
                 enums.ExchangeConstantsPositionColumns.REALISED_PNL.value: constants.ZERO if is_empty else
                 decimal.Decimal(
-                    f"{fixed.get(ccxt_enums.ExchangePositionCCXTColumns.REALISED_PNL.value, 0)}"),
+                    f"{fixed.get(ccxt_enums.ExchangePositionCCXTColumns.REALISED_PNL.value, 0) or 0}"),
                 enums.ExchangeConstantsPositionColumns.LIQUIDATION_PRICE.value: liquidation_price,
                 enums.ExchangeConstantsPositionColumns.MARK_PRICE.value: constants.ZERO if is_empty else
                 decimal.Decimal(

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/exchanges/connectors/ccxt/ccxt_client_util.py

@@ -19,6 +19,7 @@ import ccxt.pro as ccxt_pro
 
 import octobot_commons.time_frame_manager as time_frame_manager
 import octobot_trading.constants as constants
+import octobot_trading.enums as enums
 import octobot_trading.exchanges.connectors.ccxt.enums as ccxt_enums
 import octobot_trading.exchanges.util.exchange_util as exchange_util
 
@@ -172,6 +173,20 @@ def get_contract_size(client, pair) -> float:
     return client.markets[pair][ccxt_enums.ExchangeConstantsMarketStatusCCXTColumns.CONTRACT_SIZE.value]
 
 
+def get_fees(market_status) -> dict:
+    return {
+        enums.ExchangeConstantsMarketPropertyColumns.TAKER.value:
+            market_status.get(enums.ExchangeConstantsMarketPropertyColumns.TAKER.value,
+                              constants.CONFIG_DEFAULT_FEES),
+        enums.ExchangeConstantsMarketPropertyColumns.MAKER.value:
+            market_status.get(enums.ExchangeConstantsMarketPropertyColumns.MAKER.value,
+                              constants.CONFIG_DEFAULT_FEES),
+        enums.ExchangeConstantsMarketPropertyColumns.FEE.value:
+            market_status.get(enums.ExchangeConstantsMarketPropertyColumns.FEE.value,
+                              constants.CONFIG_DEFAULT_FEES)
+    }
+
+
 def add_headers(client, headers_dict):
     """
     Add new headers to ccxt client

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/exchanges/connectors/ccxt/ccxt_connector.py

@@ -613,18 +613,7 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
 
     def get_fees(self, symbol):
         try:
-            market_status = self.client.market(symbol)
-            return {
-                enums.ExchangeConstantsMarketPropertyColumns.TAKER.value:
-                    market_status.get(enums.ExchangeConstantsMarketPropertyColumns.TAKER.value,
-                                      constants.CONFIG_DEFAULT_FEES),
-                enums.ExchangeConstantsMarketPropertyColumns.MAKER.value:
-                    market_status.get(enums.ExchangeConstantsMarketPropertyColumns.MAKER.value,
-                                      constants.CONFIG_DEFAULT_FEES),
-                enums.ExchangeConstantsMarketPropertyColumns.FEE.value:
-                    market_status.get(enums.ExchangeConstantsMarketPropertyColumns.FEE.value,
-                                      constants.CONFIG_DEFAULT_FEES)
-            }
+            return ccxt_client_util.get_fees(self.client.market(symbol))
         except ccxt.NotSupported:
             raise octobot_trading.errors.NotSupported
         except Exception as e:

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/exchanges/connectors/simulator/ccxt_client_simulation.py

@@ -21,3 +21,7 @@ def parse_markets(exchange_name, forced_markets: list) -> dict:
     client = getattr(ccxt.async_support, exchange_name)()
     ccxt_client_util.set_markets_from_forced_markets(client, forced_markets)
     return client.markets
+
+
+def get_fees(market_status) -> dict:
+    return ccxt_client_util.get_fees(market_status)

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/exchanges/connectors/simulator/exchange_simulator_connector.py

@@ -18,7 +18,6 @@ import decimal
 import octobot_backtesting.api as backtesting_api
 import octobot_backtesting.importers as importers
 
-import octobot_commons.number_util as number_util
 import octobot_commons.symbols as symbol_util
 import octobot_commons.time_frame_manager as time_frame_manager
 import octobot_commons.constants as commons_constants
@@ -180,6 +179,10 @@ class ExchangeSimulatorConnector(abstract_exchange.AbstractExchange):
         return timestamp / 1000
 
     def get_fees(self, symbol):
+        if self._forced_market_statuses and symbol in self._forced_market_statuses:
+            # use self._forced_market_statuses when possible
+            return ccxt_client_simulation.get_fees(self._forced_market_statuses[symbol])
+
         result_fees = {
             enums.ExchangeConstantsMarketPropertyColumns.TAKER.value: constants.CONFIG_DEFAULT_SIMULATOR_FEES,
             enums.ExchangeConstantsMarketPropertyColumns.MAKER.value: constants.CONFIG_DEFAULT_SIMULATOR_FEES,
@@ -226,23 +229,17 @@ class ExchangeSimulatorConnector(abstract_exchange.AbstractExchange):
         rate = symbol_fees[taker_or_maker]
         currency, market = symbol_util.parse_symbol(symbol).base_and_quote()
         fee_currency = currency
-
-        precision = self.get_market_status(
-            symbol, with_fixer=False
-        )[enums.ExchangeConstantsMarketStatusColumns.PRECISION.value][
-            enums.ExchangeConstantsMarketStatusColumns.PRECISION_PRICE.value
-        ]
-        cost = float(number_util.round_into_str_with_max_digits(float(quantity) * rate, precision))
+        cost = quantity * decimal.Decimal(str(rate))
 
         if util.get_order_side(order_type) == enums.TradeOrderSide.SELL.value:
-            cost = float(number_util.round_into_str_with_max_digits(cost * float(price), precision))
+            cost = cost * price
             fee_currency = market
 
         return {
             enums.FeePropertyColumns.TYPE.value: taker_or_maker,
             enums.FeePropertyColumns.CURRENCY.value: fee_currency,
             enums.FeePropertyColumns.RATE.value: rate,
-            enums.FeePropertyColumns.COST.value: decimal.Decimal(str(cost)),
+            enums.FeePropertyColumns.COST.value: cost,
             enums.FeePropertyColumns.IS_FROM_EXCHANGE.value: False,
         }
 

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/modes/mode_config.py

@@ -95,7 +95,11 @@ def get_order_amount_value_desc():
         f"0.1 to trade 0.1 BTC on BTC/USD (amount in base currency); " \
         f"25q to trade 25 USD worth of BTC on BTC/USD (amount in quote currency); " \
         f"2{dsl.QuantityType.PERCENT.value} to trade 2% of the total holdings of the asset; " \
-        f"12{dsl.QuantityType.AVAILABLE_PERCENT.value} to trade 12% of the available holdings. " \
+        f"12{dsl.QuantityType.AVAILABLE_PERCENT.value} to trade 12% of the available holdings; " \
+        f"5{dsl.QuantityType.CURRENT_SYMBOL_ASSETS_PERCENT.value} to trade 5% of the available " \
+           f"holdings associated to the current traded symbol; " \
+        f"5{dsl.QuantityType.TRADED_SYMBOLS_ASSETS_PERCENT.value} to trade 5% of the available " \
+           f"holdings associated to all configured trading pairs. " \
         f"Leave empty to auto-compute the amount."
 
 

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/modes/script_keywords/basic_keywords/account_balance.py

@@ -71,6 +71,22 @@ async def available_account_balance(context, side=trading_enums.TradeOrderSide.B
         - already_locked_amount
 
 
+def get_holdings_value(context, assets, target_unit):
+    total_value = trading_constants.ZERO
+    portfolio = context.exchange_manager.exchange_personal_data.portfolio_manager.portfolio.portfolio
+    converter = context.exchange_manager.exchange_personal_data.portfolio_manager.portfolio_value_holder.value_converter
+    for asset, asset_holdings in portfolio.items():
+        if asset not in assets:
+            continue
+        try:
+            total_value += converter.evaluate_value(
+                asset, asset_holdings.total, raise_error=True, target_currency=target_unit, init_price_fetchers=False
+            )
+        except trading_errors.MissingPriceDataError:
+            context.logger.info(f"Missing {asset} price conversion, ignoring {float(asset_holdings.total)} holdings.")
+    return total_value
+
+
 def _get_locked_amount_in_stop_orders(context, side):
     locked_amount = trading_constants.ZERO
     for order in context.exchange_manager.exchange_personal_data.orders_manager.get_open_orders(context.symbol):

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/modes/script_keywords/basic_keywords/amount.py

@@ -14,6 +14,7 @@
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library.
 
+import octobot_commons.symbols as commons_symbols
 import octobot_trading.modes.script_keywords.dsl as dsl
 import octobot_trading.modes.script_keywords.basic_keywords.account_balance as account_balance
 import octobot_trading.personal_data as trading_personal_data
@@ -48,11 +49,28 @@ async def get_amount_from_input_amount(
     elif amount_type is dsl.QuantityType.PERCENT:
         amount_value = await account_balance.available_account_balance(
             context, side, use_total_holding=True, reduce_only=reduce_only
-        ) * amount_value / 100
+        ) * amount_value / trading_constants.ONE_HUNDRED
     elif amount_type is dsl.QuantityType.AVAILABLE_PERCENT:
         amount_value = await account_balance.available_account_balance(
             context, side, use_total_holding=False, reduce_only=reduce_only
-        ) * amount_value / 100
+        ) * amount_value / trading_constants.ONE_HUNDRED
+    elif amount_type is dsl.QuantityType.CURRENT_SYMBOL_ASSETS_PERCENT:
+        if not context.symbol:
+            raise trading_errors.InvalidArgumentError(f"{amount_type} input types requires context.symbol to be set")
+        base, quote = commons_symbols.parse_symbol(context.symbol).base_and_quote()
+        total_symbol_assets_holdings_value = account_balance.get_holdings_value(context, (base, quote), base)
+        amount_value = total_symbol_assets_holdings_value * amount_value / trading_constants.ONE_HUNDRED
+    elif amount_type is dsl.QuantityType.TRADED_SYMBOLS_ASSETS_PERCENT:
+        if not context.symbol:
+            raise trading_errors.InvalidArgumentError(f"{amount_type} input types requires context.symbol to be set")
+        assets = set()
+        for symbol in context.exchange_manager.exchange_config.traded_symbols:
+            assets.add(symbol.base)
+            assets.add(symbol.quote)
+        total_symbol_assets_holdings_value = account_balance.get_holdings_value(
+            context, assets, commons_symbols.parse_symbol(context.symbol).base
+        )
+        amount_value = total_symbol_assets_holdings_value * amount_value / trading_constants.ONE_HUNDRED
     elif amount_type is dsl.QuantityType.POSITION_PERCENT:
         raise NotImplementedError(amount_type)
     else:

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/modes/script_keywords/dsl/values.py

@@ -27,6 +27,8 @@ class QuantityType(enum.Enum):
     AVAILABLE_PERCENT = "a%"
     POSITION_PERCENT = "p%"
     ENTRY_PERCENT = "e%"
+    CURRENT_SYMBOL_ASSETS_PERCENT = "s%"
+    TRADED_SYMBOLS_ASSETS_PERCENT = "t%"
     FLAT = "@"
     UNKNOWN = "?"
 

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/personal_data/portfolios/value_converter.py

@@ -55,18 +55,23 @@ class ValueConverter:
             self.logger.debug(f"Initialized last price for {symbol}")
         self.last_prices_by_trading_pair[symbol] = price
 
-    def evaluate_value(self, currency, quantity, raise_error=True):
+    def evaluate_value(self, currency, quantity, raise_error=True, target_currency=None, init_price_fetchers=True):
         """
         Evaluate value returns the currency quantity value in the reference (attribute) currency
         :param currency: the currency to evaluate
         :param quantity: the currency quantity
         :param raise_error: will catch exception if False
+        :param target_currency: asset to evaluate currency into, defaults to self.portfolio_manager.reference_market
+        :param init_price_fetchers: will ask for missing ticker if price can't be converted if False
         :return: the currency value
         """
+        target_currency = target_currency or self.portfolio_manager.reference_market
         # easy case --> the current currency is the reference currency or the quantity is 0
-        if currency == self.portfolio_manager.reference_market or quantity == constants.ZERO:
+        if currency == target_currency or quantity == constants.ZERO:
             return quantity
-        currency_value = self._try_get_value_of_currency(currency, quantity, raise_error)
+        currency_value = self._try_get_value_of_currency(
+            currency, quantity, target_currency, raise_error, init_price_fetchers
+        )
         return self._check_currency_initialization(currency, currency_value)
 
     def _check_currency_initialization(self, currency, currency_value):
@@ -80,7 +85,7 @@ class ValueConverter:
             self.initializing_symbol_prices.remove(currency)
         return currency_value
 
-    def _try_get_value_of_currency(self, currency, quantity, raise_error):
+    def _try_get_value_of_currency(self, currency, quantity, target_currency, raise_error, init_price_fetchers):
         """
         try_get_value_of_currency will try to get the value of the given currency quantity in reference market.
         It will try to get it from a trading pair that fit with the exchange availability.
@@ -92,7 +97,7 @@ class ValueConverter:
             # 1. try from existing pairs (as is and reversed)
             return self.convert_currency_value_using_last_prices(
                 quantity, currency,
-                self.portfolio_manager.reference_market,
+                target_currency,
                 settlement_asset=settlement_asset
             )
         except errors.MissingPriceDataError as missing_data_exception:
@@ -100,29 +105,30 @@ class ValueConverter:
                 try:
                     # 2. try from existing indirect pairs
                     value = self.try_convert_currency_value_using_multiple_pairs(
-                        currency, self.portfolio_manager.reference_market, quantity, []
+                        currency, target_currency, quantity, []
                     )
                     if value is not None:
                         return value
                 except (errors.MissingPriceDataError, errors.PendingPriceDataError):
                     pass
             symbol = symbol_util.merge_currencies(
-                currency, self.portfolio_manager.reference_market, settlement_asset=settlement_asset
+                currency, target_currency, settlement_asset=settlement_asset
             )
             reversed_symbol = symbol_util.merge_currencies(
-                self.portfolio_manager.reference_market, currency, settlement_asset=settlement_asset
+                target_currency, currency, settlement_asset=settlement_asset
             )
-            # 3. if the pair or reversed pair is traded on exchange, use it to price "currency"
-            if not any(
-                self.portfolio_manager.exchange_manager.symbol_exists(s)
-                for s in (symbol, reversed_symbol)
-            ) and currency not in self.missing_currency_data_in_exchange:
-                self._inform_no_matching_symbol(currency)
-                self.missing_currency_data_in_exchange.add(currency)
-            if not self.portfolio_manager.exchange_manager.is_backtesting:
-                self._try_to_ask_ticker_missing_symbol_data(currency, symbol, reversed_symbol)
-                if raise_error:
-                    raise missing_data_exception
+            if init_price_fetchers:
+                # 3. if the pair or reversed pair is traded on exchange, use it to price "currency"
+                if not any(
+                    self.portfolio_manager.exchange_manager.symbol_exists(s)
+                    for s in (symbol, reversed_symbol)
+                ) and currency not in self.missing_currency_data_in_exchange:
+                    self._inform_no_matching_symbol(currency, target_currency)
+                    self.missing_currency_data_in_exchange.add(currency)
+                if not self.portfolio_manager.exchange_manager.is_backtesting:
+                    self._try_to_ask_ticker_missing_symbol_data(currency, symbol, reversed_symbol)
+            if not self.portfolio_manager.exchange_manager.is_backtesting and raise_error:
+                raise missing_data_exception
         return constants.ZERO
 
     def _try_to_ask_ticker_missing_symbol_data(self, currency, symbol, reversed_symbol):
@@ -170,14 +176,14 @@ class ValueConverter:
                 self._bot_main_loop
             )
 
-    def _inform_no_matching_symbol(self, currency):
+    def _inform_no_matching_symbol(self, currency, target_currency):
         """
         Log a missing currency pair to calculate the portfolio profitability
         :param currency: the concerned currency
         """
         # do not log warning in backtesting or tests
         if not self.portfolio_manager.exchange_manager.is_backtesting:
-            self.logger.warning(f"No trading pair including {currency} and {self.portfolio_manager.reference_market} on"
+            self.logger.warning(f"No trading pair including {currency} and {target_currency} on"
                                 f" {self.portfolio_manager.exchange_manager.exchange_name}. {currency} "
                                 f"can't be valued for portfolio and profitability.")
 

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/storage/abstract_storage.py

@@ -169,3 +169,23 @@ class AbstractStorage:
             elif isinstance(val, types.FunctionType):
                 raise ValueError(f"{val.__name__} is a function, it can't be serialized")
         return sanitized
+
+    @staticmethod
+    def hard_reset_and_retry_if_necessary(fn):
+        """
+        Will retry the given function if a database hard reset error is raised
+        Warning: when it happens, will also completely reset the database
+        """
+        async def wrapper(*args, **kwargs):
+            try:
+                return await fn(*args, **kwargs)
+            except Exception as err:
+                database = args[0]._get_db()    # pylint: disable=protected-access
+                if database.is_hard_reset_error(err):
+                    logging.get_logger(args[0].__class__.__name__).warning(
+                        f"Resetting database due to [{err}] error"
+                    )
+                    await database.hard_reset()
+                    return await fn(*args, **kwargs)
+                raise
+        return wrapper

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/storage/candles_storage.py

@@ -51,6 +51,7 @@ class CandlesStorage(abstract_storage.AbstractStorage):
                                        commons_enums.InitializationEventExchangeTopics.CANDLES.value)
         await self.store_candles()
 
+    @abstract_storage.AbstractStorage.hard_reset_and_retry_if_necessary
     async def store_candles(self):
         if not self.enabled:
             return

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/storage/orders_storage.py

@@ -66,6 +66,7 @@ class OrdersStorage(abstract_storage.AbstractStorage):
             await self._add_historical_open_orders(order, update_type)
         await self.trigger_debounced_flush()
 
+    @abstract_storage.AbstractStorage.hard_reset_and_retry_if_necessary
     async def _update_history(self):
         await self._get_db().replace_all(
             self.HISTORY_TABLE,

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/storage/portfolio_storage.py

@@ -29,6 +29,7 @@ class PortfolioStorage(abstract_storage.AbstractStorage):
     PRICE_INIT_TIMEOUT = 30
     HISTORY_TABLE = commons_enums.RunDatabases.HISTORICAL_PORTFOLIO_VALUE.value
 
+    @abstract_storage.AbstractStorage.hard_reset_and_retry_if_necessary
     async def store_history(self, reset=False):
         if not self.enabled:
             return

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/storage/trades_storage.py

@@ -28,6 +28,7 @@ class TradesStorage(abstract_storage.AbstractStorage):
     LIVE_CHANNEL = channels_name.OctoBotTradingChannelsName.TRADES_CHANNEL.value
     HISTORY_TABLE = commons_enums.DBTables.TRADES.value
 
+    @abstract_storage.AbstractStorage.hard_reset_and_retry_if_necessary
     async def _live_callback(
         self,
         exchange: str,
@@ -65,6 +66,7 @@ class TradesStorage(abstract_storage.AbstractStorage):
             await authenticator.update_trades(history, self.exchange_manager.exchange_name, reset)
             self._to_update_auth_data_ids_buffer.clear()
 
+    @abstract_storage.AbstractStorage.hard_reset_and_retry_if_necessary
     async def _store_history(self):
         database = self._get_db()
         await database.replace_all(

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/storage/transactions_storage.py

@@ -24,6 +24,7 @@ class TransactionsStorage(abstract_storage.AbstractStorage):
     IS_LIVE_CONSUMER = False
     HISTORY_TABLE = commons_enums.DBTables.TRANSACTIONS.value
 
+    @abstract_storage.AbstractStorage.hard_reset_and_retry_if_necessary
     async def _store_history(self):
         transactions = [
             transaction

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/util/test_tools/exchange_data.py

@@ -48,6 +48,9 @@ class MarketDetails(updatable_dataclass.UpdatableDataclass):
     volume: list[float] = dataclasses.field(default_factory=list)
     time: list[float] = dataclasses.field(default_factory=list)
 
+    def has_full_candles(self):
+        return self.close and self.open and self.high and self.low and self.time
+
 
 @dataclasses.dataclass
 class OrdersDetails(updatable_dataclass.UpdatableDataclass):

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/octobot_trading/util/test_tools/exchanges_test_tools.py

@@ -83,7 +83,7 @@ def _update_symbol_market(exchange_manager, market_details: exchange_data_import
 
 async def add_symbols_details(
         exchange_manager, symbols: list, time_frame: str, exchange_data: exchange_data_import.ExchangeData,
-        history_size=1, forced_markets=None, start_time=0, end_time=0
+        history_size=1, forced_markets=None, start_time=0, end_time=0, close_price_only=False
 ) -> exchange_data_import.ExchangeData:
     parsed_tf = common_enums.TimeFrames(time_frame)
 
@@ -101,13 +101,14 @@ async def add_symbols_details(
             symbol=symbol,
             time_frame=time_frame,
             close=[ohlcv[common_enums.PriceIndexes.IND_PRICE_CLOSE.value] for ohlcv in ohlcvs],
-            open=[ohlcv[common_enums.PriceIndexes.IND_PRICE_OPEN.value] for ohlcv in ohlcvs],
-            high=[ohlcv[common_enums.PriceIndexes.IND_PRICE_HIGH.value] for ohlcv in ohlcvs],
-            low=[ohlcv[common_enums.PriceIndexes.IND_PRICE_LOW.value] for ohlcv in ohlcvs],
-            volume=[ohlcv[common_enums.PriceIndexes.IND_PRICE_VOL.value] for ohlcv in ohlcvs],
+            open=[ohlcv[common_enums.PriceIndexes.IND_PRICE_OPEN.value] for ohlcv in ohlcvs] if not close_price_only else [],
+            high=[ohlcv[common_enums.PriceIndexes.IND_PRICE_HIGH.value] for ohlcv in ohlcvs] if not close_price_only else [],
+            low=[ohlcv[common_enums.PriceIndexes.IND_PRICE_LOW.value] for ohlcv in ohlcvs] if not close_price_only else [],
+            volume=[ohlcv[common_enums.PriceIndexes.IND_PRICE_VOL.value] for ohlcv in ohlcvs] if not close_price_only else [],
             time=[ohlcv[common_enums.PriceIndexes.IND_PRICE_TIME.value] for ohlcv in ohlcvs],
         )
-        _update_symbol_market(exchange_manager, details)
+        if not close_price_only:
+            _update_symbol_market(exchange_manager, details)
         exchange_data.markets.append(details)
 
     await exchange_manager.exchange.connector.load_symbol_markets(forced_markets=forced_markets)

{OctoBot-Trading-2.4.16 → OctoBot-Trading-2.4.18}/requirements.txt

@@ -8,7 +8,7 @@ OctoBot-Tentacles-Manager>=2.9, <2.10
 trading-backend>=1.2.7
 
 # Exchange connection requirements
-ccxt==3.1.52 # always ensure real exchanges tests (in tests_additional and authenticated exchange tests) are passing before changing the ccxt version
+ccxt==4.0.65 # 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)