Fixed issues with Add/Remove trade.

Author: iilunin

Bot/Exchange/Binance/BinanceWebsocket.py

@@ -3,6 +3,7 @@
 import traceback
 from threading import Thread
 import time
+from time import sleep
 
 from binance.client import Client
 
@@ -63,8 +64,8 @@ def run(self):
             self.mngmt_future = asyncio.ensure_future(self.management_loop())
             self.mngmt_future.add_done_callback(self.feature_finished)
 
-            if not asyncio.get_event_loop().is_running():
-                asyncio.get_event_loop().run_forever()
+            # if not asyncio.get_event_loop().is_running():
+            asyncio.get_event_loop().run_forever()
         finally:
             # self.loop.close()
             pass
@@ -152,15 +153,15 @@ async def websocket_handler(self, url, callback):
     def stop_sockets(self):
         self.stop = True
 
-        if self.mngmt_future:
-            self.mngmt_future.cancel()
-            
         self.stop_ticker_future()
         self.stop_user_future()
 
+        if self.mngmt_future:
+            self.mngmt_future.cancel()
+
         self.loop.call_soon_threadsafe(self.loop.stop)
 
         if threading.current_thread().ident != self.ident:
-            self.join()
+            self.join(timeout=1)
 
         self.logInfo('Stopped')

Bot/TradeHandler.py

@@ -227,13 +227,23 @@ def updated_trade(self, trade: Trade):
                 # find by ID
                 # self.strategies_dict[trade.symbol].update_trade(trade)
                 self.tradeid_strategy_dict[trade.id].update_trade(trade)
+
+                if self.handle_completed_strategy(self.tradeid_strategy_dict[trade.id]):
+                    self.logInfo('Strategy is completed [{}]'.format(trade.symbol))
+                    return
+
                 self.balances.update_balances(self.fx.get_all_balances_dict())
                 self.logInfo('Updating trade [{}]'.format(trade.symbol))
             else:
                 self.logInfo('Adding trade [{}]'.format(trade.symbol))
 
                 new_strategy = TargetsAndStopLossStrategy(trade, self.fx, self.order_updated_handler,
                                                       self.balances.get_balance(trade.asset))
+
+                if self.handle_completed_strategy(new_strategy):
+                    self.logInfo('Strategy is completed [{}]'.format(new_strategy.symbol()))
+                    return
+
                 try:
                     self.stop_listening()
                     self.add_new_strategy(new_strategy)

Trades/TRADE_TEMPLATE.TPL

@@ -1,63 +1,43 @@
 {
   "trade": {
-    "id": "71717f7d-b848-4a35-9bea-33427e8e4110",
-    "asset": "ICN",
-    "symbol": "ICNBTC",
+    "asset": "ADA",
+    "symbol": "ADABTC",
     "side": "SELL",
-    "status": "COMPLETED",
+    "status": "NEW",
     "entry": {
-      "side": "BUY",
-      "smart": true,
-      "threshold": "0.00000020",
       "targets": [
         {
-          "status": "COMPLETED",
-          "price": "0.00014421",
-          "vol": "3800.00000000"
+          "price": "0.00002950",
+          "vol": "1300"
         }
       ]
     },
     "exit": {
-      "side": "SELL",
-      "smart": false,
-      "threshold": "0.30%",
+      "threshold": "0.50%",
       "targets": [
         {
-          "status": "COMPLETED",
-          "id": 9672903,
-          "date": "2018-04-20 02:21:48",
-          "price": "0.00015601",
-          "vol": "25%",
-          "smart": true,
-          "best_price": "0.00015529"
+          "price": "0.00003250",
+          "vol": "20%"
         },
         {
-          "status": "COMPLETED",
-          "id": 9871297,
-          "date": "2018-04-21 18:28:12",
-          "price": "0.00017600",
-          "vol": "33%",
-          "sl": "0.00015000"
+          "price": "0.00003400",
+          "vol": "33%"
         },
         {
-          "price": "0.00018700",
+          "price": "0.00003600",
           "vol": "50%"
         },
         {
-          "price": "0.00020800",
           "vol": "100%",
+          "price": "0.00004100",
           "smart": true
         }
       ]
     },
     "stoploss": {
       "type": "FIXED",
-      "last_stoploss": "0.00015000",
       "initial_target": {
-        "status": "COMPLETED",
-        "id": 10166677,
-        "date": "2018-04-25 13:25:20",
-        "price": "0.00013144",
+        "price": "0.00002500",
         "vol": "100%"
       }
     }