Merge branch 'night_fixes' into dev

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

diff --git a/portfolio.py b/portfolio.py
index 554b34f090b8d179fead2742c8280f2100ded3bd..69e37557fd9cd355fbdccabcd1fb993fbf9adef1 100644 (file)
--- a/portfolio.py
+++ b/portfolio.py
@@ -214,6 +214,7 @@ class Trade:
         self.orders = []
         self.market = market
         self.closed = False
+        self.inverted = None
         assert self.value_from.value * self.value_to.value >= 0
         assert self.value_from.currency == self.value_to.currency
         if self.value_from != 0:
@@ -238,8 +239,8 @@ class Trade:
         else:
             return "dispose"
 
-    def order_action(self, inverted):
-        if (self.value_from < self.value_to) != inverted:
+    def order_action(self):
+        if (self.value_from < self.value_to) != self.inverted:
             return "buy"
         else:
             return "sell"
@@ -262,7 +263,7 @@ class Trade:
 
     @property
     def is_fullfiled(self):
-        return abs(self.filled_amount(in_base_currency=True)) >= abs(self.delta)
+        return abs(self.filled_amount(in_base_currency=(not self.inverted))) >= abs(self.delta)
 
     def filled_amount(self, in_base_currency=False):
         filled_amount = 0
@@ -308,17 +309,17 @@ class Trade:
         if self.action is None:
             return None
         ticker = self.market.get_ticker(self.currency, self.base_currency)
-        inverted = ticker["inverted"]
-        if inverted:
+        self.inverted = ticker["inverted"]
+        if self.inverted:
             ticker = ticker["original"]
-        rate = Computation.compute_value(ticker, self.order_action(inverted), compute_value=compute_value)
+        rate = Computation.compute_value(ticker, self.order_action(), compute_value=compute_value)
 
         # FIXME: Dust amount should be removed from there if they werent
         # honored in other sales
         delta_in_base = abs(self.delta)
         # 9 BTC's worth of move (10 - 1 or 1 - 10 depending on case)
 
-        if not inverted:
+        if not self.inverted:
             base_currency = self.base_currency
             # BTC
             if self.action == "dispose":
@@ -376,7 +377,7 @@ class Trade:
             self.market.report.log_error("prepare_order", message="Less to do than already filled: {}".format(delta))
             return None
 
-        order = Order(self.order_action(inverted),
+        order = Order(self.order_action(),
             delta, rate, base_currency, self.trade_type,
             self.market, self, close_if_possible=close_if_possible)
         self.orders.append(order)
@@ -472,7 +473,7 @@ class Order:
 
     @property
     def finished(self):
-        return self.status == "closed" or self.status == "canceled" or self.status == "error"
+        return self.status.startswith("closed") or self.status == "canceled" or self.status == "error"
 
     @retry(InsufficientFunds)
     def run(self):
@@ -516,15 +517,13 @@ class Order:
         # other states are "closed" and "canceled"
         if not self.finished:
             self.fetch()
-            if self.finished:
-                self.mark_finished_order()
         return self.status
 
     def mark_finished_order(self):
-        if self.market.debug:
+        if self.status.startswith("closed") and self.market.debug:
             self.market.report.log_debug_action("Mark {} as finished".format(self))
             return
-        if self.status == "closed":
+        if self.status.startswith("closed"):
             if self.trade_type == "short" and self.action == "buy" and self.close_if_possible:
                 self.market.ccxt.close_margin_position(self.amount.currency, self.base_currency)
 
@@ -543,6 +542,7 @@ class Order:
 
         self.fetch_mouvements()
 
+        self.mark_finished_order()
         # FIXME: consider open order with dust remaining as closed
 
     def dust_amount_remaining(self):