wip

Author: GuillaumeDSM

octobot_trading/personal_data/orders/active_order_swap_strategies/active_order_swap_strategy.py

@@ -48,6 +48,13 @@ async def apply_inactive_orders(self, orders: list):
                     order_util.create_order_price_trigger(order, trigger_price, order.trigger_above)
                 )
 
+    def on_order_update(self, order, update_time):
+        if order.active_trigger:
+            order.active_trigger.update(
+                trigger_price=self._get_trigger_price(order), min_trigger_time=update_time,
+                update_event=order.is_synchronization_enabled()
+            )
+
     def _get_trigger_price(self, order) -> decimal.Decimal:
         if self.trigger_price_configuration == enums.ActiveOrderSwapTriggerPriceConfiguration.FILLING_PRICE.value:
             return order.get_filling_price()

octobot_trading/personal_data/orders/order.py

@@ -202,8 +202,9 @@ def update(
         if price and self.origin_price != price:
             previous_price = self.origin_price
             self.origin_price = price
-            self._on_origin_price_change(previous_price,
-                                         self.exchange_manager.exchange.get_exchange_current_time())
+            self._on_origin_price_change(
+                previous_price, self.exchange_manager.exchange.get_exchange_current_time()
+            )
             changed = True
             should_update_total_cost = True
 
@@ -342,6 +343,8 @@ def _on_origin_price_change(self, previous_price, price_time):
         :param previous_price: the previous origin_price
         :param price_time: time starting from when the price should be considered
         """
+        if self.order_group and self.order_group.active_order_swap_strategy:
+            self.order_group.active_order_swap_strategy.on_order_update(self, price_time)
 
     def add_chained_order(self, chained_order):
         """

octobot_trading/personal_data/orders/triggers/base_trigger.py

@@ -25,6 +25,9 @@ def __init__(self, on_trigger_callback: typing.Callable, on_trigger_callback_arg
         self._trigger_event: asyncio.Event = None    # will be set when the trigger is hit
         self._trigger_task: asyncio.Task = None
 
+    def triggers(self, *args) -> bool:
+        raise NotImplementedError("triggers is not implemented")
+
     def triggered(self) -> bool:
         return self._trigger_event is not None and self._trigger_event.is_set()
 
@@ -34,6 +37,9 @@ def is_pending(self) -> bool:
     def update_from_other_trigger(self, other_trigger):
         raise NotImplementedError("update_from_other_trigger is not implemented")
 
+    def update(self, **kwargs):
+        raise NotImplementedError("update is not implemented")
+
     def __str__(self):
         return f"{self.__class__.__name__}({self.on_trigger_callback.__name__ if self.on_trigger_callback else None})"
 

octobot_trading/personal_data/orders/triggers/price_trigger.py

@@ -43,19 +43,33 @@ def update_from_other_trigger(self, other_trigger):
         self.trigger_price = other_trigger.trigger_price
         self.trigger_above = other_trigger.trigger_above
 
+    def update(self, trigger_price=None, min_trigger_time=None, update_event=True, **kwargs):
+        if self.trigger_price != trigger_price:
+            self.trigger_price = trigger_price
+            if update_event:
+                # replace event
+                self._clear_event()
+                self._create_event(min_trigger_time)
+
     def clear(self):
         super().clear()
+        self._clear_event()
+        self._exchange_manager = None
+
+    def _create_event(self, min_trigger_time: float):
+        self._trigger_event = self._exchange_manager.exchange_symbols_data.\
+            get_exchange_symbol_data(self._symbol).price_events_manager.\
+            new_event(self.trigger_price, min_trigger_time, self.trigger_above, False)
+
+    def _clear_event(self):
         if self._trigger_event is not None and self._exchange_manager is not None:
             self._exchange_manager.exchange_symbols_data. \
                 get_exchange_symbol_data(self._symbol).price_events_manager.remove_event(self._trigger_event)
-        self._exchange_manager = None
 
     def __str__(self):
         return f"{super().__str__()}: trigger_price={self.trigger_price}, trigger_above={self.trigger_above}"
 
     def _create_trigger_event(self, exchange_manager, symbol: str, min_trigger_time: float):
         self._exchange_manager = exchange_manager
         self._symbol = symbol
-        self._trigger_event = self._exchange_manager.exchange_symbols_data.\
-            get_exchange_symbol_data(self._symbol).price_events_manager.\
-            new_event(self.trigger_price, min_trigger_time, self.trigger_above, False)
+        self._create_event(min_trigger_time)

octobot_trading/personal_data/orders/types/limit/limit_order.py

@@ -75,6 +75,7 @@ async def update_order_status(self, force_refresh=False):
                     self._create_hit_task()
 
     def _on_origin_price_change(self, previous_price, price_time):
+        super()._on_origin_price_change(previous_price, price_time)
         if previous_price is not constants.ZERO:
             # no need to reset events if previous price was 0 (unset)
             self._reset_events(price_time)