From 2033e7fef780298be2ec15455a0ec1d26515de55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Tue, 27 Feb 2018 00:58:52 +0100 Subject: Add make_order and get_user_market helpers Fix cancel order not actually fetching the order Fetch only necessary order to poloniex --- portfolio.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'portfolio.py') diff --git a/portfolio.py b/portfolio.py index 6763fc6..eb3390e 100644 --- a/portfolio.py +++ b/portfolio.py @@ -360,7 +360,7 @@ class Trade: new_order.run() self.market.report.log_order(order, tick, new_order=new_order) - def prepare_order(self, compute_value="default"): + def prepare_order(self, close_if_possible=None, compute_value="default"): if self.action is None: return None ticker = self.market.get_ticker(self.currency, self.base_currency) @@ -426,7 +426,8 @@ class Trade: delta = delta - filled # I already sold 4 BTC, only 5 left - close_if_possible = (self.value_to == 0) + if close_if_possible is None: + close_if_possible = (self.value_to == 0) if delta <= 0: self.market.report.log_error("prepare_order", message="Less to do than already filled: {}".format(delta)) @@ -586,7 +587,7 @@ class Order: return self.fetch_cache_timestamp = time.time() - result = self.market.ccxt.fetch_order(self.id) + result = self.market.ccxt.fetch_order(self.id, symbol=self.amount.currency) self.results.append(result) self.status = result["status"] @@ -632,7 +633,7 @@ class Order: self.status = "canceled" return self.market.ccxt.cancel_order(self.id) - self.fetch() + self.fetch(force=True) class Mouvement: def __init__(self, currency, base_currency, hash_): -- cgit v1.2.3