X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=portfolio.py;h=1041df13a76ebad551646fa8e8209b822b89b26d;hb=272b3cfb11aea4160f0e40588e18dea44c6b028a;hp=576a2286847abacabe7525161bf9e11be4170e91;hpb=cfab619d9223fc824649a6fe16863931f5e43891;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git diff --git a/portfolio.py b/portfolio.py index 576a228..1041df1 100644 --- a/portfolio.py +++ b/portfolio.py @@ -1,18 +1,9 @@ import ccxt import time +from decimal import Decimal as D # Put your poloniex api key in market.py from market import market -# FIXME: Améliorer le bid/ask -# FIXME: J'essayais d'utiliser plus de bitcoins que j'en avais à disposition -# FIXME: better compute moves to avoid rounding errors - -def static_var(varname, value): - def decorate(func): - setattr(func, varname, value) - return func - return decorate - class Portfolio: URL = "https://cryptoportfolio.io/wp-content/uploads/portfolio/json/cryptoportfolio.json" liquidities = {} @@ -37,7 +28,9 @@ class Portfolio: except Exception: return try: - cls.data = json.loads(r.data) + cls.data = json.loads(r.data, + parse_int=D, + parse_float=D) except json.JSONDecodeError: cls.data = None @@ -81,45 +74,44 @@ class Portfolio: } class Amount: - MAX_DIGITS = 18 - - def __init__(self, currency, value, int_val=None, linked_to=None, ticker=None): + def __init__(self, currency, value, linked_to=None, ticker=None, rate=None): self.currency = currency - if int_val is None: - self._value = int(value * 10**self.MAX_DIGITS) - else: - self._value = int_val + self.value = D(value) self.linked_to = linked_to self.ticker = ticker + self.rate = rate self.ticker_cache = {} self.ticker_cache_timestamp = time.time() - @property - def value(self): - return self._value / 10 ** self.MAX_DIGITS - - def in_currency(self, other_currency, market, action="average"): + def in_currency(self, other_currency, market, rate=None, action=None, compute_value="average"): if other_currency == self.currency: return self + if rate is not None: + return Amount( + other_currency, + self.value * rate, + linked_to=self, + rate=rate) asset_ticker = Trade.get_ticker(self.currency, other_currency, market) if asset_ticker is not None: + rate = Trade.compute_value(asset_ticker, action, compute_value=compute_value) return Amount( other_currency, - 0, - int_val=int(self._value * asset_ticker[action]), + self.value * rate, linked_to=self, - ticker=asset_ticker) + ticker=asset_ticker, + rate=rate) else: raise Exception("This asset is not available in the chosen market") def __abs__(self): - return Amount(self.currency, 0, int_val=abs(self._value)) + return Amount(self.currency, abs(self.value)) def __add__(self, other): - if other.currency != self.currency and other._value * self._value != 0: + if other.currency != self.currency and other.value * self.value != 0: raise Exception("Summing amounts must be done with same currencies") - return Amount(self.currency, 0, int_val=self._value + other._value) + return Amount(self.currency, self.value + other.value) def __radd__(self, other): if other == 0: @@ -128,25 +120,22 @@ class Amount: return self.__add__(other) def __sub__(self, other): - if other.currency != self.currency and other._value * self._value != 0: + if other.currency != self.currency and other.value * self.value != 0: raise Exception("Summing amounts must be done with same currencies") - return Amount(self.currency, 0, int_val=self._value - other._value) - - def __int__(self): - return self._value + return Amount(self.currency, self.value - other.value) def __mul__(self, value): - if type(value) != int and type(value) != float: + if type(value) != int and type(value) != float and type(value) != D: raise TypeError("Amount may only be multiplied by numbers") - return Amount(self.currency, 0, int_val=(self._value * value)) + return Amount(self.currency, self.value * value) def __rmul__(self, value): return self.__mul__(value) def __floordiv__(self, value): - if type(value) != int: + if type(value) != int and type(value) != float and type(value) != D: raise TypeError("Amount may only be multiplied by integers") - return Amount(self.currency, 0, int_val=(self._value // value)) + return Amount(self.currency, self.value / value) def __truediv__(self, value): return self.__floordiv__(value) @@ -154,14 +143,14 @@ class Amount: def __lt__(self, other): if self.currency != other.currency: raise Exception("Comparing amounts must be done with same currencies") - return self._value < other._value + return self.value < other.value def __eq__(self, other): if other == 0: - return self._value == 0 + return self.value == 0 if self.currency != other.currency: raise Exception("Comparing amounts must be done with same currencies") - return self._value == other._value + return self.value == other.value def __str__(self): if self.linked_to is None: @@ -189,12 +178,12 @@ class Balance: return cls(currency, hash_["total"], hash_["free"], hash_["used"]) @classmethod - def in_currency(cls, other_currency, market, action="average", type="total"): + def in_currency(cls, other_currency, market, compute_value="average", type="total"): amounts = {} for currency in cls.known_balances: balance = cls.known_balances[currency] other_currency_amount = getattr(balance, type)\ - .in_currency(other_currency, market, action=action) + .in_currency(other_currency, market, compute_value=compute_value) amounts[currency] = other_currency_amount return amounts @@ -207,7 +196,7 @@ class Balance: for key in hash_: if key in ["info", "free", "used", "total"]: continue - if hash_[key]["total"] > 0: + if hash_[key]["total"] > 0 or key in cls.known_balances: cls.known_balances[key] = cls.from_hash(key, hash_[key]) @classmethod @@ -216,27 +205,55 @@ class Balance: return cls.known_balances @classmethod - def dispatch_assets(cls, amount): - repartition_pertenthousand = Portfolio.repartition_pertenthousand() - sum_pertenthousand = sum([v for k, v in repartition_pertenthousand.items()]) + def dispatch_assets(cls, amount, repartition=None): + if repartition is None: + repartition = Portfolio.repartition_pertenthousand() + sum_pertenthousand = sum([v for k, v in repartition.items()]) amounts = {} - for currency, ptt in repartition_pertenthousand.items(): + for currency, ptt in repartition.items(): amounts[currency] = ptt * amount / sum_pertenthousand if currency not in cls.known_balances: cls.known_balances[currency] = cls(currency, 0, 0, 0) return amounts @classmethod - def prepare_trades(cls, market, base_currency="BTC"): + def prepare_trades(cls, market, base_currency="BTC", compute_value="average"): + cls.fetch_balances(market) + values_in_base = cls.in_currency(base_currency, market, compute_value=compute_value) + total_base_value = sum(values_in_base.values()) + new_repartition = cls.dispatch_assets(total_base_value) + # Recompute it in case we have new currencies + values_in_base = cls.in_currency(base_currency, market, compute_value=compute_value) + Trade.compute_trades(values_in_base, new_repartition, market=market) + + @classmethod + def update_trades(cls, market, base_currency="BTC", compute_value="average", only=None): cls.fetch_balances(market) - values_in_base = cls.in_currency(base_currency, market) + values_in_base = cls.in_currency(base_currency, market, compute_value=compute_value) total_base_value = sum(values_in_base.values()) new_repartition = cls.dispatch_assets(total_base_value) + Trade.compute_trades(values_in_base, new_repartition, only=only, market=market) + + @classmethod + def prepare_trades_to_sell_all(cls, market, base_currency="BTC", compute_value="average"): + cls.fetch_balances(market) + values_in_base = cls.in_currency(base_currency, market, compute_value=compute_value) + total_base_value = sum(values_in_base.values()) + new_repartition = cls.dispatch_assets(total_base_value, repartition={ base_currency: 1 }) Trade.compute_trades(values_in_base, new_repartition, market=market) def __repr__(self): return "Balance({} [{}/{}/{}])".format(self.currency, str(self.free), str(self.used), str(self.total)) +class Computation: + computations = { + "default": lambda x, y: x[y], + "average": lambda x, y: x["average"], + "bid": lambda x, y: x["bid"], + "ask": lambda x, y: x["ask"], + } + + class Trade: trades = {} @@ -247,14 +264,11 @@ class Trade: self.value_from = value_from self.value_to = value_to self.orders = [] + self.market = market assert self.value_from.currency == self.value_to.currency assert self.value_from.linked_to is not None and self.value_from.linked_to.currency == self.currency self.base_currency = self.value_from.currency - if market is not None: - self.market = market - self.prepare_order(market) - fees_cache = {} @classmethod def fetch_fees(cls, market): @@ -269,7 +283,7 @@ class Trade: def invert(ticker): return { "inverted": True, - "average": (float(1/ticker["bid"]) + float(1/ticker["ask"]) ) / 2, + "average": (1/ticker["bid"] + 1/ticker["ask"]) / 2, "original": ticker, } def augment_ticker(ticker): @@ -299,19 +313,27 @@ class Trade: return cls.get_ticker(c1, c2, market) @classmethod - def compute_trades(cls, values_in_base, new_repartition, market=None): + def compute_trades(cls, values_in_base, new_repartition, only=None, market=None): base_currency = sum(values_in_base.values()).currency for currency in Balance.currencies(): if currency == base_currency: continue - cls.trades[currency] = cls( + trade = cls( values_in_base.get(currency, Amount(base_currency, 0)), new_repartition.get(currency, Amount(base_currency, 0)), currency, market=market ) + if only is None or trade.action == only: + cls.trades[currency] = trade return cls.trades + @classmethod + def prepare_orders(cls, only=None, compute_value="default"): + for currency, trade in cls.trades.items(): + if only is None or trade.action == only: + trade.prepare_order(compute_value=compute_value) + @property def action(self): if self.value_from == self.value_to: @@ -326,11 +348,11 @@ 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, market): + def prepare_order(self, compute_value="default"): if self.action is None: return ticker = self.value_from.ticker @@ -338,7 +360,7 @@ class Trade: if not inverted: value_from = self.value_from.linked_to - value_to = self.value_to.in_currency(self.currency, market) + value_to = self.value_to.in_currency(self.currency, self.market, rate=1/self.value_from.rate) delta = abs(value_to - value_from) currency = self.base_currency else: @@ -346,27 +368,49 @@ class Trade: delta = abs(self.value_to - self.value_from) currency = self.currency - rate = ticker[self.order_action(inverted)] + 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)) - self.orders.append(Order(self.order_action(inverted), delta, rate, currency)) + @classmethod + def compute_value(cls, ticker, action, compute_value="default"): + if type(compute_value) == str: + compute_value = Computation.computations[compute_value] + return compute_value(ticker, action) + + @classmethod + def all_orders(cls, state=None): + all_orders = sum(map(lambda v: v.orders, cls.trades.values()), []) + if state is None: + return all_orders + else: + return list(filter(lambda o: o.status == state, all_orders)) @classmethod - def all_orders(cls): - return sum(map(lambda v: v.orders, cls.trades.values()), []) + def run_orders(cls): + for order in cls.all_orders(state="pending"): + order.run() @classmethod - def follow_orders(cls, market): + def follow_orders(cls, verbose=True, sleep=30): orders = cls.all_orders() finished_orders = [] while len(orders) != len(finished_orders): - time.sleep(30) + time.sleep(sleep) for order in orders: if order in finished_orders: continue - if order.get_status(market) != "open": + if order.get_status() != "open": finished_orders.append(order) - print("finished {}".format(order)) - print("All orders finished") + if verbose: + print("finished {}".format(order)) + 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( @@ -375,16 +419,25 @@ class Trade: self.currency, self.action) -class Order: - DEBUG = True + @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="") - def __init__(self, action, amount, rate, base_currency): +class Order: + def __init__(self, action, amount, rate, base_currency, market): self.action = action self.amount = amount self.rate = rate self.base_currency = base_currency + self.market = market self.result = None - self.status = "not run" + self.status = "pending" def __repr__(self): return "Order({} {} at {} {} [{}])".format( @@ -395,33 +448,44 @@ class Order: self.status ) - def run(self, market): + @property + def pending(self): + return self.status == "pending" + + @property + def finished(self): + return self.status == "closed" or self.status == "canceled" + + def run(self, debug=False): symbol = "{}/{}".format(self.amount.currency, self.base_currency) amount = self.amount.value - if self.DEBUG: + if debug: print("market.create_order('{}', 'limit', '{}', {}, price={})".format( symbol, self.action, amount, self.rate)) else: try: - self.result = market.create_order(symbol, 'limit', self.action, amount, price=self.rate) + self.result = self.market.create_order(symbol, 'limit', self.action, amount, price=self.rate) self.status = "open" except Exception: pass - def get_status(self, market): + def get_status(self): # other states are "closed" and "canceled" if self.status == "open": - result = market.fetch_order(self.result['id']) + result = self.market.fetch_order(self.result['id']) 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) - for currency, trade in Trade.trades.items(): - print(trade) - for order in trade.orders: - print("\t", order, sep="") + 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) + portfolio.Trade.print_all_with_order() def make_orders(market, base_currency="BTC"): Balance.prepare_trades(market, base_currency=base_currency) @@ -429,7 +493,7 @@ def make_orders(market, base_currency="BTC"): print(trade) for order in trade.orders: print("\t", order, sep="") - order.run(market) + order.run() if __name__ == '__main__': print_orders(market)