OctoBot-Trading 2.4.179__tar.gz → 2.4.181__tar.gz

{OctoBot-Trading-2.4.179 → OctoBot-Trading-2.4.181}/CHANGELOG.md

@@ -4,6 +4,16 @@ 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.181] - 2025-05-28
+### Fixed
+[Orders] fix adapt_order_quantity_because_fees order side issue
+
+## [2.4.180] - 2025-05-28
+### Fixed
+[Orders] fix adapt_order_quantity_because_fees to count all orders
+[Exchanges] fix cache when using custom domains
+[OHLCV] fix error on stopped exchange
+
 ## [2.4.179] - 2025-05-24
 ### Added 
 [Amounts] "p" as position percent alias

{OctoBot-Trading-2.4.179 → OctoBot-Trading-2.4.181/OctoBot_Trading.egg-info}/PKG-INFO

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

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

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

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

{OctoBot-Trading-2.4.179 → OctoBot-Trading-2.4.181}/octobot_trading/constants.py

@@ -169,6 +169,7 @@ EXCHANGE_ACCOUNT_TRADED_SYMBOL_PERMISSION_ERRORS: typing.List[typing.Iterable[st
 
 CONFIG_DEFAULT_FEES = 0.001
 CONFIG_DEFAULT_SIMULATOR_FEES = 0
+FEES_SAFETY_MARGIN = decimal.Decimal("1.25")    # allow 25% error margin when simulating fees
 
 DEFAULT_SYMBOL_LEVERAGE = ONE
 DEFAULT_SYMBOL_MAX_LEVERAGE = ONE_HUNDRED

{OctoBot-Trading-2.4.179 → OctoBot-Trading-2.4.181}/octobot_trading/exchange_data/ohlcv/channel/ohlcv_updater.py

@@ -150,6 +150,9 @@ class OHLCVUpdater(ohlcv_channel.OHLCVProducer):
             candles: list = await self._get_init_candles(time_frame, pair)
         except errors.FailedRequest as e:
             self.logger.warning(str(e))
+        if self.channel.exchange_manager.exchange_symbols_data is None:
+            # exchange stopped
+            return None
         if candles and len(candles) > 1:
             self._set_initialized(pair, time_frame, True)
             await self.channel.exchange_manager.get_symbol_data(pair) \

{OctoBot-Trading-2.4.179 → OctoBot-Trading-2.4.181}/octobot_trading/exchanges/connectors/ccxt/ccxt_client_util.py

@@ -384,11 +384,11 @@ def _get_client_config(
             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 {})})
+    config.update({**get_custom_domain_config(exchange_class), **(additional_config or {})})
     return config
 
 
-def _get_custom_domain_config(exchange_class):
+def get_custom_domain_config(exchange_class):
     old, new = _get_replaced_custom_domains(exchange_class)
     if not (old and new):
         return {}

{OctoBot-Trading-2.4.179 → OctoBot-Trading-2.4.181}/octobot_trading/exchanges/connectors/simulator/ccxt_client_simulation.py

@@ -19,7 +19,9 @@ import octobot_trading.exchanges.connectors.ccxt.ccxt_client_util as ccxt_client
 
 
 def parse_markets(exchange_name, market_filter) -> dict:
-    client = ccxt_client_util.ccxt_exchange_class_factory(exchange_name)()
+    exchange_class = ccxt_client_util.ccxt_exchange_class_factory(exchange_name)
+    config = ccxt_client_util.get_custom_domain_config(exchange_class)
+    client = exchange_class(config)
     ccxt_client_util.load_markets_from_cache(client, market_filter)
     return client.markets
 

{OctoBot-Trading-2.4.179 → OctoBot-Trading-2.4.181}/octobot_trading/modes/modes_util.py

@@ -216,7 +216,7 @@ def _get_available_or_target_quantity(trading_mode, symbol, order_type, price, a
         else trading_enums.TradeOrderSide.BUY
     )
 
-    currency_available, market_available, market_quantity = trading_personal_data.get_portfolio_amounts(
+    currency_available, _, market_quantity = trading_personal_data.get_portfolio_amounts(
         trading_mode.exchange_manager, symbol, price, portfolio_type=common_constants.PORTFOLIO_AVAILABLE
     )
     if asset_amount is None:
@@ -228,9 +228,7 @@ def _get_available_or_target_quantity(trading_mode, symbol, order_type, price, a
             quantity = constants.ZERO
 
     adapted_quantity = trading_personal_data.decimal_adapt_order_quantity_because_fees(
-        trading_mode.exchange_manager, symbol, order_type, quantity, price,
-        trading_enums.ExchangeConstantsMarketPropertyColumns.TAKER, side,
-        currency_available if side is trading_enums.TradeOrderSide.SELL else market_available
+        trading_mode.exchange_manager, symbol, order_type, quantity, price, side
     )
     return adapted_quantity
 

{OctoBot-Trading-2.4.179 → OctoBot-Trading-2.4.181}/octobot_trading/personal_data/orders/decimal_order_adapter.py

@@ -130,24 +130,46 @@ def decimal_adapt_order_quantity_because_price(limiting_value, max_value, price,
 
 def decimal_adapt_order_quantity_because_fees(
     exchange_manager, symbol: str, order_type: enums.TraderOrderType, quantity: decimal.Decimal, price: decimal.Decimal,
-    taker_or_maker: enums.ExchangeConstantsMarketPropertyColumns, side: enums.TradeOrderSide,
-    quote_available_funds: decimal.Decimal
+    side: enums.TradeOrderSide
 ) -> decimal.Decimal:
     if not exchange_manager.is_future and side == enums.TradeOrderSide.BUY:
         # only buy orders are affected
-        computed_fee = exchange_manager.exchange.get_trade_fee(
-            symbol, order_type, quantity, price, taker_or_maker.value
-        )
+        # consider worse case: simulate all total buying funds with taker fees locked into buy orders
         quote = commons_symbols.parse_symbol(symbol).quote
+        total_quote_amount = exchange_manager.exchange_personal_data.portfolio_manager.portfolio.get_currency_portfolio(
+            quote
+        ).total
+        max_base_quantity_ignoring_fees = (total_quote_amount / price) if price else constants.ZERO
+        max_possible_computed_fee = exchange_manager.exchange.get_trade_fee(
+            symbol, order_type, max_base_quantity_ignoring_fees, price,
+            enums.ExchangeConstantsMarketPropertyColumns.TAKER.value
+        )
+        total_quote_amount_locked_in_orders_ignoring_fees = sum(
+            order.origin_quantity * order.origin_price
+            for order in exchange_manager.exchange_personal_data.orders_manager.get_open_orders(active=True)
+            if (
+                order.side == side
+                and commons_symbols.parse_symbol(order.symbol).quote == quote
+                and order.is_counted_in_available_funds()
+            )
+        )
         # if fee paid in quote, ensure enough remaining quote asset in available portfolio
-        if currency_fee := personal_data.get_fees_for_currency(computed_fee, quote):
-            fees_in_base = (currency_fee / price) if price else constants.ZERO
-            base_quantity_from_quote = quote_available_funds / price
-            required_base_fees = fees_in_base * 2  # use 2x the fees to be sure exchanges won't refuse it
-            total_required_quote_quantity = (required_base_fees + quantity) * price
-            if quote_available_funds < total_required_quote_quantity:
-                # use maximum quantity considering fees
-                quantity = max(base_quantity_from_quote - required_base_fees, constants.ZERO)
+        if max_order_quote_fee := personal_data.get_fees_for_currency(max_possible_computed_fee, quote):
+            # add a safety margin to the max fees to be sure exchanges won't round it differently
+            adapted_max_order_quote_fee = max_order_quote_fee * constants.FEES_SAFETY_MARGIN
+            max_usable_quote_funds = (
+                total_quote_amount - total_quote_amount_locked_in_orders_ignoring_fees - adapted_max_order_quote_fee
+            )
+            local_order_computed_fee = exchange_manager.exchange.get_trade_fee(
+                symbol, order_type, quantity, price, enums.ExchangeConstantsMarketPropertyColumns.TAKER.value
+            )
+            local_order_required_quote_fees = personal_data.get_fees_for_currency(local_order_computed_fee, quote)
+            total_required_quote_quantity = (quantity * price) + local_order_required_quote_fees
+            if max_usable_quote_funds < total_required_quote_quantity:
+                # can't create this order: not enough remaining funds in portfolio after considering all orders fees
+                # => use maximum usable quantity considering fees
+                max_usable_base_funds_considering_fees = (max_usable_quote_funds / price) if price else constants.ZERO
+                quantity = max(max_usable_base_funds_considering_fees, constants.ZERO)
     return quantity
 
 

{OctoBot-Trading-2.4.179 → OctoBot-Trading-2.4.181}/tests/modes/test_modes_util.py

@@ -261,7 +261,7 @@ async def test_convert_asset_to_target_asset(backtesting_trader):
         assert order.origin_quantity == decimal.Decimal("0.3")
         assert order.created_last_price == decimal.Decimal(1500)
         assert order.is_filled()
-        assert get_trade_fee_mock.call_count == 4
+        assert get_trade_fee_mock.call_count == 5
         get_trade_fee_mock.reset_mock()
         trading_mode.create_order.assert_called_once()
         trading_mode.create_order.reset_mock()
@@ -275,10 +275,10 @@ async def test_convert_asset_to_target_asset(backtesting_trader):
         order = orders[0]
         assert order.order_type == trading_enums.TraderOrderType.BUY_MARKET
         assert order.symbol == "ETH/USDT"
-        assert order.origin_quantity == decimal.Decimal("0.66400000")   # lower than 0.66666666 when fees is 0 USDT
+        assert order.origin_quantity == decimal.Decimal("0.665")   # lower than 0.66666666 when fees is 0 USDT
         assert order.created_last_price == decimal.Decimal(1500)
         assert order.is_filled()
-        assert get_trade_fee_mock.call_count == 4
+        assert get_trade_fee_mock.call_count == 5
         trading_mode.create_order.assert_called_once()
         trading_mode.create_order.reset_mock()
 

{OctoBot-Trading-2.4.179 → OctoBot-Trading-2.4.181}/tests/personal_data/orders/test_decimal_order_adapter.py

@@ -522,92 +522,274 @@ async def test_decimal_trunc_with_n_decimal_digits():
     assert math.isnan(personal_data.decimal_trunc_with_n_decimal_digits(decimal.Decimal(math.nan), 12))
 
 
-async def test_decimal_adapt_order_quantity_because_fees():
-    fees = {
-        enums.FeePropertyColumns.TYPE.value: enums.ExchangeConstantsMarketPropertyColumns.TAKER.value,
-        enums.FeePropertyColumns.CURRENCY.value: "BTC",
-        enums.FeePropertyColumns.RATE.value: 0.001,
-        enums.FeePropertyColumns.COST.value: decimal.Decimal("0.000001"),
-        enums.FeePropertyColumns.IS_FROM_EXCHANGE.value: False,
+def test_decimal_adapt_order_quantity_because_fees_futures():
+    """Test that futures orders are not modified by fees"""
+    exchange_manager = mock.Mock()
+    exchange_manager.is_future = True
+
+    quantity = decimal.Decimal("100")
+    result = personal_data.decimal_adapt_order_quantity_because_fees(
+        exchange_manager=exchange_manager,
+        symbol="BTC/USDT",
+        order_type=enums.TraderOrderType.BUY_LIMIT,
+        quantity=quantity,
+        price=decimal.Decimal("50000"),
+        side=enums.TradeOrderSide.BUY
+    )
+
+    assert result == quantity
+
+
+def test_decimal_adapt_order_quantity_because_fees_spot_sell():
+    """Test that spot sell orders are not modified by fees"""
+    exchange_manager = mock.Mock()
+    exchange_manager.is_future = False
+
+    quantity = decimal.Decimal("100")
+    result = personal_data.decimal_adapt_order_quantity_because_fees(
+        exchange_manager=exchange_manager,
+        symbol="BTC/USDT",
+        order_type=enums.TraderOrderType.SELL_LIMIT,
+        quantity=quantity,
+        price=decimal.Decimal("50000"),
+        side=enums.TradeOrderSide.SELL
+    )
+
+    assert result == quantity
+
+
+def test_decimal_adapt_order_quantity_because_fees_spot_buy():
+    """Test spot buy order quantity adaptation with fees"""
+    exchange_manager = mock.Mock()
+    exchange_manager.is_future = False
+
+    # Setup portfolio
+    portfolio_manager = mock.Mock()
+    portfolio = mock.Mock()
+    portfolio.get_currency_portfolio.return_value.total = decimal.Decimal("10000")  # 10000 USDT
+    exchange_manager.exchange_personal_data.portfolio_manager = portfolio_manager
+    exchange_manager.exchange_personal_data.portfolio_manager.portfolio = portfolio
+
+    # Setup orders manager with no existing orders
+    orders_manager = mock.Mock()
+    orders_manager.get_open_orders.return_value = []
+    exchange_manager.exchange_personal_data.orders_manager = orders_manager
+
+    # Setup exchange fees (0.1%)
+    fees_cost = decimal.Decimal('5') # 5 USDT fee
+    exchange = mock.Mock()
+    exchange.get_trade_fee.return_value = {
+        enums.FeePropertyColumns.RATE.value: decimal.Decimal('0.001'),
+        enums.FeePropertyColumns.COST.value: fees_cost,
+        enums.FeePropertyColumns.CURRENCY.value: 'USDT'
     }
-    def _get_trade_fee(symbol: str, order_type, quantity, price, taker_or_maker):
-        return fees
-
-    exchange_manager = mock.Mock(
-        is_future=False,
-        exchange=mock.Mock(
-            get_trade_fee=mock.Mock(side_effect=_get_trade_fee)
-        )
+    exchange_manager.exchange = exchange
+
+    quantity = decimal.Decimal("100")
+    price = decimal.Decimal("50")
+
+    result = personal_data.decimal_adapt_order_quantity_because_fees(
+        exchange_manager=exchange_manager,
+        symbol="BTC/USDT",
+        order_type=enums.TraderOrderType.BUY_LIMIT,
+        quantity=quantity,
+        price=price,
+        side=enums.TradeOrderSide.BUY
     )
-    symbol = "BTC/USDT"
 
-    origin_quantity = decimal.Decimal("1")
-    price = decimal.Decimal("30000")
-    taker_or_maker = enums.ExchangeConstantsMarketPropertyColumns.TAKER
-    quote_available_funds = decimal.Decimal("40000")
+    # Expected quantity should be == to quantity as no adaptation is required
+    # (10k is enough to cover the 5K + 5 USDT required amount)
+    assert result == quantity
 
-    adapted = personal_data.decimal_adapt_order_quantity_because_fees(
-        exchange_manager, symbol, enums.TraderOrderType.BUY_LIMIT, origin_quantity,
-        price, taker_or_maker, enums.TradeOrderSide.SELL, quote_available_funds
+    quantity = decimal.Decimal("100")
+    price = decimal.Decimal("100")
+
+    result = personal_data.decimal_adapt_order_quantity_because_fees(
+        exchange_manager=exchange_manager,
+        symbol="BTC/USDT",
+        order_type=enums.TraderOrderType.BUY_LIMIT,
+        quantity=quantity,
+        price=price,
+        side=enums.TradeOrderSide.BUY
     )
-    # sell: no effect
-    assert adapted is origin_quantity
 
-    adapted = personal_data.decimal_adapt_order_quantity_because_fees(
-        exchange_manager, symbol, enums.TraderOrderType.BUY_LIMIT, origin_quantity,
-        price, taker_or_maker, enums.TradeOrderSide.BUY, quote_available_funds
+    # Expected quantity should be < to quantity to account for fees
+    assert result == quantity - (fees_cost * constants.FEES_SAFETY_MARGIN) / price
+
+    # fee is now in other currency
+    exchange.get_trade_fee.return_value = {
+        enums.FeePropertyColumns.RATE.value: decimal.Decimal('0.001'),
+        enums.FeePropertyColumns.COST.value: fees_cost,
+        enums.FeePropertyColumns.CURRENCY.value: 'BNB'
+    }
+
+    result = personal_data.decimal_adapt_order_quantity_because_fees(
+        exchange_manager=exchange_manager,
+        symbol="BTC/USDT",
+        order_type=enums.TraderOrderType.BUY_LIMIT,
+        quantity=quantity,
+        price=price,
+        side=enums.TradeOrderSide.BUY
     )
-    # buy but fees in BTC, quantity unchanged
-    assert adapted is origin_quantity
 
-    fees[enums.FeePropertyColumns.CURRENCY.value] = "USDT"
-    fees[enums.FeePropertyColumns.COST.value] = 40
+    # Expected quantity should be == to quantity as fees are not taken in this currency
+    assert result == quantity
+
+
+def test_decimal_adapt_order_quantity_because_fees_insufficient_funds():
+    """Test spot buy order with insufficient funds after fees"""
+    exchange_manager = mock.Mock()
+    exchange_manager.is_future = False
 
-    adapted = personal_data.decimal_adapt_order_quantity_because_fees(
-        exchange_manager, symbol, enums.TraderOrderType.BUY_LIMIT, origin_quantity,
-        price, taker_or_maker, enums.TradeOrderSide.BUY, quote_available_funds
+    # Setup portfolio with very low balance
+    portfolio_manager = mock.Mock()
+    portfolio = mock.Mock()
+    portfolio.get_currency_portfolio.return_value.total = decimal.Decimal("100")  # 100 USDT
+    exchange_manager.exchange_personal_data.portfolio_manager = portfolio_manager
+    exchange_manager.exchange_personal_data.portfolio_manager.portfolio = portfolio
+
+    # Setup orders manager with no existing orders
+    orders_manager = mock.Mock()
+    orders_manager.get_open_orders.return_value = []
+    exchange_manager.exchange_personal_data.orders_manager = orders_manager
+
+    # Setup exchange fees (0.1%)
+    exchange = mock.Mock()
+    fees_cost = decimal.Decimal('1')   # 1 USDT fee
+    exchange.get_trade_fee.return_value = {
+        'rate': decimal.Decimal('0.001'),
+        'cost': fees_cost,
+        'currency': 'USDT'
+    }
+    exchange_manager.exchange = exchange
+
+    quantity = decimal.Decimal("1000")  # Try to buy more than possible
+    price = decimal.Decimal("1")
+
+    result = personal_data.decimal_adapt_order_quantity_because_fees(
+        exchange_manager=exchange_manager,
+        symbol="BTC/USDT",
+        order_type=enums.TraderOrderType.BUY_LIMIT,
+        quantity=quantity,
+        price=price,
+        side=enums.TradeOrderSide.BUY
     )
-    # sell: no still effect
-    assert adapted is origin_quantity
 
-    adapted = personal_data.decimal_adapt_order_quantity_because_fees(
-        exchange_manager, symbol, enums.TraderOrderType.BUY_LIMIT, origin_quantity,
-        price, taker_or_maker, enums.TradeOrderSide.BUY, quote_available_funds
+    # Result should be less than original quantity due to insufficient funds
+    assert result < quantity
+    assert result > decimal.Decimal("0")
+    assert result == decimal.Decimal("100") - (fees_cost * constants.FEES_SAFETY_MARGIN) / price
+
+
+def test_decimal_adapt_order_quantity_because_fees_with_existing_orders():
+    """Test spot buy order adaptation with existing orders"""
+    exchange_manager = mock.Mock()
+    exchange_manager.is_future = False
+
+    # Setup portfolio
+    portfolio_manager = mock.Mock()
+    portfolio = mock.Mock()
+    portfolio.get_currency_portfolio.return_value.total = decimal.Decimal("10000")  # 10000 USDT
+    exchange_manager.exchange_personal_data.portfolio_manager = portfolio_manager
+    exchange_manager.exchange_personal_data.portfolio_manager.portfolio = portfolio
+
+    # Setup orders manager with existing orders
+    existing_order_1 = mock.Mock()
+    existing_order_1.symbol = "BTC/USDT"
+    existing_order_1.origin_quantity = decimal.Decimal("0.4")
+    existing_order_1.origin_price = decimal.Decimal("5000")
+    existing_order_1.side = enums.TradeOrderSide.BUY
+    existing_order_2 = mock.Mock()
+    existing_order_2.symbol = "BTC/USDT"
+    existing_order_2.origin_quantity = decimal.Decimal("0.6")
+    existing_order_2.origin_price = decimal.Decimal("5000")
+    existing_order_2.side = enums.TradeOrderSide.BUY
+
+    orders_manager = mock.Mock()
+    orders_manager.get_open_orders.return_value = [existing_order_1, existing_order_2]
+    exchange_manager.exchange_personal_data.orders_manager = orders_manager
+
+    # Setup exchange fees (0.1%)
+    exchange = mock.Mock()
+    fees_cost = decimal.Decimal('5')   # 5 USDT fee
+    exchange.get_trade_fee.return_value = {
+        'rate': decimal.Decimal('0.001'),
+        'cost': fees_cost,
+        'currency': 'USDT'
+    }
+    exchange_manager.exchange = exchange
+
+    quantity = decimal.Decimal("100")
+    price = decimal.Decimal("50")
+
+    result = personal_data.decimal_adapt_order_quantity_because_fees(
+        exchange_manager=exchange_manager,
+        symbol="BTC/USDT",
+        order_type=enums.TraderOrderType.BUY_LIMIT,
+        quantity=quantity,
+        price=price,
+        side=enums.TradeOrderSide.BUY
     )
-    # buy and fees in USDT but enough in quote_available_funds, quantity kept
-    assert adapted is origin_quantity
 
-    quote_available_funds = origin_quantity * price
-    adapted = personal_data.decimal_adapt_order_quantity_because_fees(
-        exchange_manager, symbol, enums.TraderOrderType.BUY_LIMIT, origin_quantity,
-        price, taker_or_maker, enums.TradeOrderSide.BUY, quote_available_funds
+    # Result should be less than original quantity due to existing orders
+    assert result < quantity
+    assert result == quantity - (fees_cost * constants.FEES_SAFETY_MARGIN) / price
+
+    # all orders are not on this side
+    # open orders are taking all funds (available funds are negative)
+    existing_order_3 = mock.Mock()
+    existing_order_3.symbol = "BTC/USDT"
+    existing_order_3.origin_quantity = decimal.Decimal("0.6")
+    existing_order_3.origin_price = decimal.Decimal("5000")
+    existing_order_3.side = enums.TradeOrderSide.SELL
+    existing_order_4 = mock.Mock()
+    existing_order_4.symbol = "BTC/USDT"
+    existing_order_4.origin_quantity = decimal.Decimal("0.6")
+    existing_order_4.origin_price = decimal.Decimal("5000")
+    existing_order_4.side = enums.TradeOrderSide.SELL
+    orders_manager.get_open_orders.return_value = [existing_order_1, existing_order_2, existing_order_3, existing_order_4]
+
+    result = personal_data.decimal_adapt_order_quantity_because_fees(
+        exchange_manager=exchange_manager,
+        symbol="BTC/USDT",
+        order_type=enums.TraderOrderType.BUY_LIMIT,
+        quantity=quantity,
+        price=price,
+        side=enums.TradeOrderSide.BUY
     )
-    # buy and fees in USDT and not enough in quote_available_funds, quantity updated
-    assert adapted == origin_quantity - 2 * fees[enums.FeePropertyColumns.COST.value] / price
 
-    quote_available_funds = decimal.Decimal(100)
-    adapted = personal_data.decimal_adapt_order_quantity_because_fees(
-        exchange_manager, symbol, enums.TraderOrderType.BUY_LIMIT, origin_quantity,
-        price, taker_or_maker, enums.TradeOrderSide.BUY, quote_available_funds
+    # Result should be less than original quantity due to existing orders but same as previous step (new orders are sell)
+    assert result < quantity
+    assert result == quantity - (fees_cost * constants.FEES_SAFETY_MARGIN) / price
+
+    # open orders are taking all funds (available funds are negative)
+    orders_manager.get_open_orders.return_value = [existing_order_1, existing_order_2, existing_order_1, existing_order_2]
+
+    result = personal_data.decimal_adapt_order_quantity_because_fees(
+        exchange_manager=exchange_manager,
+        symbol="BTC/USDT",
+        order_type=enums.TraderOrderType.BUY_LIMIT,
+        quantity=quantity,
+        price=price,
+        side=enums.TradeOrderSide.BUY
     )
-    # buy and fees in USDT and not enough in quote_available_funds, quantity greatly reduced
-    assert adapted == decimal.Decimal(100) / price - 2 * (fees[enums.FeePropertyColumns.COST.value] / price)
 
-    quote_available_funds = decimal.Decimal(10)
-    adapted = personal_data.decimal_adapt_order_quantity_because_fees(
-        exchange_manager, symbol, enums.TraderOrderType.BUY_LIMIT, origin_quantity,
-        price, taker_or_maker, enums.TradeOrderSide.BUY, quote_available_funds
+    # can't create order
+    assert result == constants.ZERO
+
+    # open orders are taking all funds (available funds are 0)
+    portfolio.get_currency_portfolio.return_value.total = (
+        decimal.Decimal("10000") + fees_cost * constants.FEES_SAFETY_MARGIN  # 10006.25 USDT
     )
-    # buy and fees in USDT and not enough in quote_available_funds to pay fees, quantity set to 0
-    assert adapted == constants.ZERO
 
-    exchange_manager.is_future = True
-    quote_available_funds = decimal.Decimal(10)
-    adapted = personal_data.decimal_adapt_order_quantity_because_fees(
-        exchange_manager, symbol, enums.TraderOrderType.BUY_LIMIT, origin_quantity,
-        price, taker_or_maker, enums.TradeOrderSide.BUY, quote_available_funds
+    result = personal_data.decimal_adapt_order_quantity_because_fees(
+        exchange_manager=exchange_manager,
+        symbol="BTC/USDT",
+        order_type=enums.TraderOrderType.BUY_LIMIT,
+        quantity=quantity,
+        price=price,
+        side=enums.TradeOrderSide.BUY
     )
-    # futures trading: no effect
-    assert adapted is origin_quantity
 
-    exchange_manager.is_future = False
+    # can't create order
+    assert result == constants.ZERO