diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-02-27 00:58:52 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-02-27 00:58:52 +0100 |
commit | 2033e7fef780298be2ec15455a0ec1d26515de55 (patch) | |
tree | 7650db089756994dfbc0b77cad76fe662213e702 /portfolio.py | |
parent | f70bb858007cd3be6766ee0aa4a3d9133952eb98 (diff) | |
download | Trader-2033e7fef780298be2ec15455a0ec1d26515de55.tar.gz Trader-2033e7fef780298be2ec15455a0ec1d26515de55.tar.zst Trader-2033e7fef780298be2ec15455a0ec1d26515de55.zip |
Add make_order and get_user_market helpers
Fix cancel order not actually fetching the order
Fetch only necessary order to poloniex
Diffstat (limited to 'portfolio.py')
-rw-r--r-- | portfolio.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/portfolio.py b/portfolio.py index 6763fc6..eb3390e 100644 --- a/portfolio.py +++ b/portfolio.py | |||
@@ -360,7 +360,7 @@ class Trade: | |||
360 | new_order.run() | 360 | new_order.run() |
361 | self.market.report.log_order(order, tick, new_order=new_order) | 361 | self.market.report.log_order(order, tick, new_order=new_order) |
362 | 362 | ||
363 | def prepare_order(self, compute_value="default"): | 363 | def prepare_order(self, close_if_possible=None, compute_value="default"): |
364 | if self.action is None: | 364 | if self.action is None: |
365 | return None | 365 | return None |
366 | ticker = self.market.get_ticker(self.currency, self.base_currency) | 366 | ticker = self.market.get_ticker(self.currency, self.base_currency) |
@@ -426,7 +426,8 @@ class Trade: | |||
426 | delta = delta - filled | 426 | delta = delta - filled |
427 | # I already sold 4 BTC, only 5 left | 427 | # I already sold 4 BTC, only 5 left |
428 | 428 | ||
429 | close_if_possible = (self.value_to == 0) | 429 | if close_if_possible is None: |
430 | close_if_possible = (self.value_to == 0) | ||
430 | 431 | ||
431 | if delta <= 0: | 432 | if delta <= 0: |
432 | self.market.report.log_error("prepare_order", message="Less to do than already filled: {}".format(delta)) | 433 | self.market.report.log_error("prepare_order", message="Less to do than already filled: {}".format(delta)) |
@@ -586,7 +587,7 @@ class Order: | |||
586 | return | 587 | return |
587 | self.fetch_cache_timestamp = time.time() | 588 | self.fetch_cache_timestamp = time.time() |
588 | 589 | ||
589 | result = self.market.ccxt.fetch_order(self.id) | 590 | result = self.market.ccxt.fetch_order(self.id, symbol=self.amount.currency) |
590 | self.results.append(result) | 591 | self.results.append(result) |
591 | 592 | ||
592 | self.status = result["status"] | 593 | self.status = result["status"] |
@@ -632,7 +633,7 @@ class Order: | |||
632 | self.status = "canceled" | 633 | self.status = "canceled" |
633 | return | 634 | return |
634 | self.market.ccxt.cancel_order(self.id) | 635 | self.market.ccxt.cancel_order(self.id) |
635 | self.fetch() | 636 | self.fetch(force=True) |
636 | 637 | ||
637 | class Mouvement: | 638 | class Mouvement: |
638 | def __init__(self, currency, base_currency, hash_): | 639 | def __init__(self, currency, base_currency, hash_): |