Merge branch 'dev'

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

diff --git a/market.py b/market.py
index 3b6543ad051411d6c97f879244127fd6c661198d..9550b7706aa7194a6e09ab174ea0420206fd7832 100644 (file)
--- a/market.py
+++ b/market.py
@@ -1,4 +1,4 @@
-from ccxt import ExchangeError, NotSupported, RequestTimeout, InvalidNonce
+from ccxt import AuthenticationError, ExchangeError, NotSupported, RequestTimeout, InvalidNonce
 import ccxt_wrapper as ccxt
 import time
 import dbs
@@ -88,6 +88,7 @@ class Market:
 
     def process(self, actions, before=False, after=False):
         try:
+            self.ccxt.check_required_credentials()
             for action in actions:
                 if bool(before) is bool(after):
                     self.processor.process(action, steps="all")
@@ -95,6 +96,8 @@ class Market:
                     self.processor.process(action, steps="before")
                 elif after:
                     self.processor.process(action, steps="after")
+        except AuthenticationError:
+            self.report.log_error("market_authentication", message="Impossible to authenticate to market")
         except Exception as e:
             import traceback
             self.report.log_error("market_process", exception=e, message=traceback.format_exc())
@@ -201,8 +204,10 @@ class Market:
                 if status == "error_disappeared":
                     self.report.log_error("follow_orders",
                             message="{} disappeared, recreating it".format(order))
-                    order.trade.prepare_order(
+                    new_order = order.trade.prepare_order(
                             compute_value=order.trade.tick_actions_recreate(tick))
+                    new_order.run()
+                    self.report.log_order(order, tick, new_order=new_order)
 
         self.report.log_stage("follow_orders_end")
 
@@ -255,7 +260,11 @@ class Processor:
                 {
                     "name": "print_balances",
                     "number": 1,
-                    "fetch_balances_begin": { "log_tickers": True, "add_portfolio": True },
+                    "fetch_balances_begin": {
+                        "log_tickers": True,
+                        "add_usdt": True,
+                        "add_portfolio": True
+                        },
                     "print_tickers": { "base_currency": "BTC" },
                     }
                 ],
@@ -286,6 +295,7 @@ class Processor:
                     "fetch_balances_begin": {
                         "checkpoint": "end",
                         "log_tickers": True,
+                        "add_usdt": True,
                         "add_portfolio": True
                         },
                     },
@@ -317,6 +327,7 @@ class Processor:
                     "fetch_balances_begin": {},
                     "fetch_balances_end": {
                         "checkpoint": "begin",
+                        "add_usdt": True,
                         "log_tickers": True
                         },
                     "prepare_trades": { "only": "acquire", "available_balance_only": True },
@@ -336,6 +347,7 @@ class Processor:
                     "fetch_balances_begin": {
                         "checkpoint": "end",
                         "log_tickers": True,
+                        "add_usdt": True,
                         "add_portfolio": True
                         },
                     "fetch_balances_end": {},
@@ -360,6 +372,7 @@ class Processor:
                     "fetch_balances_begin": {},
                     "fetch_balances_end": {
                         "checkpoint": "begin",
+                        "add_usdt": True,
                         "log_tickers": True
                         },
                     "prepare_trades": { "available_balance_only": True },