From: Ismaƫl Bouya Date: Mon, 22 Jan 2018 00:07:06 +0000 (+0100) Subject: Fix selling price for inverted markets X-Git-Tag: v0.1~29 X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git;a=commitdiff_plain;h=f2097d713e2e9419850ca5b758c76b79485d7502 Fix selling price for inverted markets --- diff --git a/portfolio.py b/portfolio.py index 1041df1..60b57ca 100644 --- a/portfolio.py +++ b/portfolio.py @@ -357,19 +357,28 @@ class Trade: 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