X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=market.py;h=41c4c9c5652d6c24629aca26d21e58797a7eb6e5;hb=5f721612111af5c56b5757cb2f21da5f2fa388bf;hp=caa951330dac039fe4170d597394b50989eadb17;hpb=aa169ddfbcf0a5002d5da6d62a76477c3e33e72e;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git

diff --git a/market.py b/market.py
index caa9513..41c4c9c 100644
--- 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())
@@ -203,8 +206,9 @@ class Market:
                             message="{} disappeared, recreating it".format(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)
+                    if new_order is not None:
+                        new_order.run()
+                        self.report.log_order(order, tick, new_order=new_order)
 
         self.report.log_stage("follow_orders_end")
 
@@ -217,23 +221,20 @@ class Market:
                 compute_value=compute_value, only=only,
                 repartition=repartition, available_balance_only=available_balance_only)
 
-        values_in_base = self.balances.in_currency(base_currency,
-                compute_value=compute_value)
         if available_balance_only:
-            balance = self.balances.all.get(base_currency)
-            if balance is None:
-                total_base_value = portfolio.Amount(base_currency, 0)
-            else:
-                total_base_value = balance.exchange_free + balance.margin_available
+            repartition, total_base_value, values_in_base = self.balances.available_balances_for_repartition(
+                    base_currency=base_currency, liquidity=liquidity,
+                    repartition=repartition, compute_value=compute_value)
         else:
+            values_in_base = self.balances.in_currency(base_currency,
+                    compute_value=compute_value)
             total_base_value = sum(values_in_base.values())
         new_repartition = self.balances.dispatch_assets(total_base_value,
                 liquidity=liquidity, repartition=repartition)
         if available_balance_only:
             for currency, amount in values_in_base.items():
-                if currency != base_currency:
-                    new_repartition.setdefault(currency, portfolio.Amount(base_currency, 0))
-                    new_repartition[currency] += amount
+                if currency != base_currency and currency not in new_repartition:
+                    new_repartition[currency] = amount
 
         self.trades.compute_trades(values_in_base, new_repartition, only=only)