Merge branch 'retry_vanished' into dev

[perso/Immae/Projets/Cryptomonnaies/Cryptoportfolio/Trader.git] / market.py

diff --git a/market.py b/market.py
index ca65bca7a0196211caedfa515e55b169ee71231d..ac3aa14a9213ba817db4a431cbc3ddd0649e460e 100644 (file)
--- a/market.py
+++ b/market.py
@@ -1,4 +1,4 @@
-from ccxt import ExchangeError, NotSupported, RequestTimeout
+from ccxt import ExchangeError, NotSupported, RequestTimeout, InvalidNonce
 import ccxt_wrapper as ccxt
 import time
 import psycopg2
@@ -89,7 +89,7 @@ class Market:
         finally:
             self.store_report()
 
-    @retry(RequestTimeout, tries=5)
+    @retry((RequestTimeout, InvalidNonce), tries=5)
     def move_balances(self):
         needed_in_margin = {} 
         moving_to_margin = {}
@@ -114,7 +114,7 @@ class Market:
                     self.ccxt.transfer_balance(currency, delta, "exchange", "margin")
                 elif delta < 0:
                     self.ccxt.transfer_balance(currency, -delta, "margin", "exchange")
-            except RequestTimeout as e:
+            except (RequestTimeout, InvalidNonce) as e:
                 self.report.log_error(action, message="Retrying", exception=e)
                 self.report.log_move_balances(needed_in_margin, moving_to_margin)
                 self.balances.fetch_balances()
@@ -181,10 +181,17 @@ class Market:
             self.report.log_stage("follow_orders_tick_{}".format(tick))
             self.report.log_orders(open_orders, tick=tick)
             for order in open_orders:
-                if order.get_status() != "open":
+                status = order.get_status()
+                if status != "open":
                     self.report.log_order(order, tick, finished=True)
                 else:
                     order.trade.update_order(order, tick)
+                if status == "error_disappeared":
+                    self.report.log_error("follow_orders",
+                            message="{} disappeared, recreating it".format(order))
+                    order.trade.prepare_order(
+                            compute_value=order.trade.tick_actions_recreate(tick))
+
         self.report.log_stage("follow_orders_end")
 
     def prepare_trades(self, base_currency="BTC", liquidity="medium",