OctoBot-Trading 2.4.136__tar.gz → 2.4.138__tar.gz

{OctoBot-Trading-2.4.136 → OctoBot-Trading-2.4.138}/CHANGELOG.md

@@ -4,13 +4,20 @@ 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.138] - 2023-12-28
+### Updated
+[TradingModes] ignore fees in futures chained orders
+
+## [2.4.137] - 2023-12-27
+### Updated
+[Orders] handle reduce only in test tools and in register_chained_order
+
 ## [2.4.136] - 2023-12-25
 ### Updated
 [Positions] dont update entry price on empty positions
 ### Fixed
 [Orders] fix reduce only
 
-
 ## [2.4.134] - 2023-12-21
 ### Added
 [Orders] add is_stop_trade_order_type

{OctoBot-Trading-2.4.136 → OctoBot-Trading-2.4.138/OctoBot_Trading.egg-info}/PKG-INFO

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

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

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

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

{OctoBot-Trading-2.4.136 → OctoBot-Trading-2.4.138}/octobot_trading/constants.py

@@ -54,6 +54,7 @@ CONFIG_CANDLES_HISTORY_SIZE_TITLE = "Candles history size"
 CONFIG_CANDLES_HISTORY_SIZE_KEY = CONFIG_CANDLES_HISTORY_SIZE_TITLE.replace(" ", "_")
 CONFIG_BUY_ORDER_AMOUNT = "buy_order_amount"
 CONFIG_SELL_ORDER_AMOUNT = "sell_order_amount"
+CONFIG_LEVERAGE = "leverage"
 TRADING_MODE_ACTIVITY_REASON = "reason"
 
 # Exchange

{OctoBot-Trading-2.4.136 → OctoBot-Trading-2.4.138}/octobot_trading/modes/channel/abstract_mode_consumer.py

@@ -251,7 +251,7 @@ class AbstractTradingModeConsumer(modes_channel.ModeChannelConsumer):
         return position.state.is_active()
 
     async def register_chained_order(
-        self, main_order, price, order_type, side, quantity=None, allow_bundling=True, tag=None
+        self, main_order, price, order_type, side, quantity=None, allow_bundling=True, tag=None, reduce_only=False
     ) -> tuple:
         chained_order = personal_data.create_order_instance(
             trader=self.exchange_manager.trader,
@@ -262,15 +262,20 @@ class AbstractTradingModeConsumer(modes_channel.ModeChannelConsumer):
             price=price,
             side=side,
             associated_entry_id=main_order.order_id,
+            reduce_only=reduce_only,
             tag=tag,
         )
         params = {}
+        # do not reduce chained order amounts to account for fees when trading futures
+        update_with_triggering_order_fees = not self.exchange_manager.is_future
         if allow_bundling:
             params = await self.exchange_manager.trader.bundle_chained_order_with_uncreated_order(
-                main_order, chained_order, True
+                main_order, chained_order, update_with_triggering_order_fees
             )
         else:
-            await self.exchange_manager.trader.chain_order(main_order, chained_order, True, False)
+            await self.exchange_manager.trader.chain_order(
+                main_order, chained_order, update_with_triggering_order_fees, False
+            )
         return params, chained_order
 
 

{OctoBot-Trading-2.4.136 → OctoBot-Trading-2.4.138}/octobot_trading/modes/script_keywords/basic_keywords/configuration.py

@@ -20,13 +20,15 @@ import octobot_commons.enums as commons_enums
 import octobot_trading.modes.script_keywords.basic_keywords.user_inputs as user_inputs
 import octobot_trading.enums as enums
 import octobot_trading.errors as errors
+import octobot_trading.constants as constants
 
 
 async def user_select_leverage(
-        ctx,
-        def_val=1,
-        order=None,
-        name="leverage"):
+    ctx,
+    def_val=1,
+    order=None,
+    name=constants.CONFIG_LEVERAGE
+):
     return await user_inputs.user_input(ctx, name, commons_enums.UserInputTypes.INT.value, def_val, order=order)
 
 

{OctoBot-Trading-2.4.136 → OctoBot-Trading-2.4.138}/octobot_trading/personal_data/orders/order.py

@@ -820,7 +820,7 @@ class Order(util.Initializable):
                 f"{chained_order}"
                 f"{self.order_type.name if self.order_type is not None else 'Unknown'} | "
                 f"Price : {str(self.origin_price)} | "
-                f"Quantity : {str(self.origin_quantity)} | "
+                f"Quantity : {str(self.origin_quantity)}{' (Reduce only)' if self.reduce_only else ''} | "
                 f"State : {self.state.state.value if self.state is not None else 'Unknown'} | "
                 f"id : {self.order_id}{tag} "
                 f"exchange id: {self.exchange_order_id}")

{OctoBot-Trading-2.4.136 → OctoBot-Trading-2.4.138}/octobot_trading/util/test_tools/exchanges_test_tools.py

@@ -230,6 +230,11 @@ async def _create_order(
 ) -> typing.Optional[personal_data.Order]:
     symbol = order_dict[enums.ExchangeConstantsOrderColumns.SYMBOL.value]
     side, order_type = personal_data.parse_order_type(order_dict)
+    order_params = exchange_manager.exchange.get_order_additional_params(
+        personal_data.create_order_instance_from_raw(
+            exchange_manager.trader, order_dict, force_open_or_pending_creation=True
+        )
+    )
     created_order = await exchange_manager.exchange.create_order(
         order_type,
         symbol,
@@ -238,6 +243,7 @@ async def _create_order(
         side=side,
         current_price=price_by_symbol[symbol],
         reduce_only=order_dict[enums.ExchangeConstantsOrderColumns.REDUCE_ONLY.value],
+        params=order_params
     )
     # is private, to use in tests context only
     order = personal_data.create_order_instance_from_raw(