X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=portfolio.py;h=fc468c28d5bfed892c9e48290d5fd4ec4ef64edb;hb=fd8afa518c0e22387d27e5a6008f6b4816cb7dbe;hp=20f83e444894320d30bcd97c41fabbd286abeca5;hpb=7ab23e291602b6ffd54622cffdc76ba0b4437a05;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git

diff --git a/portfolio.py b/portfolio.py
index 20f83e4..fc468c2 100644
--- a/portfolio.py
+++ b/portfolio.py
@@ -348,28 +348,37 @@ class Trade:
 
     def order_action(self, inverted):
         if self.value_from < self.value_to:
-            return "ask" if not inverted else "bid"
+            return "buy" if not inverted else "sell"
         else:
-            return "bid" if not inverted else "ask"
+            return "sell" if not inverted else "buy"
 
     def prepare_order(self, compute_value="default"):
         if self.action is None:
             return
         ticker = self.value_from.ticker
         inverted = ticker["inverted"]
+        if inverted:
+            ticker = ticker["original"]
+        rate = Trade.compute_value(ticker, self.order_action(inverted), compute_value=compute_value)
+
+        # We can use that amount of BTC:
+        delta_in_base = abs(self.value_from - self.value_to)
 
         if not inverted:
-            value_from = self.value_from.linked_to
-            value_to = self.value_to.in_currency(self.currency, self.market, rate=1/self.value_from.rate)
-            delta = abs(value_to - value_from)
+            if self.action == "sell":
+                value_from = self.value_from.linked_to
+                value_to = self.value_to.in_currency(self.currency, self.market, rate=1/self.value_from.rate)
+                delta = abs(value_to - value_from)
+            else:
+                delta = delta_in_base.in_currency(self.currency, self.market, rate=1/rate)
             currency = self.base_currency
         else:
-            ticker = ticker["original"]
-            delta = abs(self.value_to - self.value_from)
+            if self.action == "sell":
+                delta = delta_in_base.in_currency(self.base_currency, self.market, rate=rate)
+            else:
+                delta = delta_in_base
             currency = self.currency
 
-        rate = Trade.compute_value(ticker, self.order_action(inverted), compute_value=compute_value)
-
         self.orders.append(Order(self.order_action(inverted), delta, rate, currency, self.market))
 
     @classmethod
@@ -407,6 +416,11 @@ class Trade:
         if verbose:
             print("All orders finished")
 
+    @classmethod
+    def update_all_orders_status(cls):
+        for order in cls.all_orders(state="open"):
+            order.get_status()
+
     def __repr__(self):
         return "Trade({} -> {} in {}, {})".format(
                 self.value_from,
@@ -414,8 +428,17 @@ class Trade:
                 self.currency,
                 self.action)
 
-class Order:
+    @classmethod
+    def print_all_with_order(cls):
+        for trade in cls.trades.values():
+            trade.print_with_order()
+
+    def print_with_order(self):
+        print(self)
+        for order in self.orders:
+            print("\t", order, sep="")
 
+class Order:
     def __init__(self, action, amount, rate, base_currency, market):
         self.action = action
         self.amount = amount
@@ -440,7 +463,7 @@ class Order:
 
     @property
     def finished(self):
-        return self.status == "closed" or self.status == "canceled"
+        return self.status == "closed" or self.status == "canceled" or self.status == "error"
 
     def run(self, debug=False):
         symbol = "{}/{}".format(self.amount.currency, self.base_currency)
@@ -453,8 +476,12 @@ class Order:
             try:
                 self.result = self.market.create_order(symbol, 'limit', self.action, amount, price=self.rate)
                 self.status = "open"
-            except Exception:
-                pass
+            except Exception as e:
+                self.status = "error"
+                print("error when running market.create_order('{}', 'limit', '{}', {}, price={})".format(
+                    symbol, self.action, amount, self.rate))
+                self.error_message = str("{}: {}".format(e.__class__.__name__, e))
+                print(self.error_message)
 
     def get_status(self):
         # other states are "closed" and "canceled"
@@ -463,15 +490,15 @@ class Order:
             self.status = result["status"]
         return self.status
 
+    def cancel(self):
+        self.market.cancel_order(self.result['id'])
+
 def print_orders(market, base_currency="BTC"):
     Balance.prepare_trades(market, base_currency=base_currency, compute_value="average")
     Trade.prepare_orders(compute_value="average")
     for currency, balance in Balance.known_balances.items():
         print(balance)
-    for currency, trade in Trade.trades.items():
-        print(trade)
-        for order in trade.orders:
-            print("\t", order, sep="")
+    portfolio.Trade.print_all_with_order()
 
 def make_orders(market, base_currency="BTC"):
     Balance.prepare_trades(market, base_currency=base_currency)