adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify cancel timedout

Browse Source
This commit is contained in:
Matthias 2019-10-18 07:01:05 +02:00
parent c181fac6c7
commit 271846dfb6
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
freqtrade/freqtradebot.py
View File

@ -772,21 +772,19 @@ class FreqtradeBot:
self.wallets.update() self.wallets.update()
continue continue
# Handle cancelled on exchange if (order['side'] == 'buy'
if order['status'] == 'canceled': and order['status'] == 'canceled'
if order['side'] == 'buy': or (order['status'] == 'open'
self.handle_buy_order_full_cancel(trade, "canceled on Exchange") and order['side'] == 'buy' and ordertime < buy_timeoutthreashold)):
elif order['side'] == 'sell':
self.handle_timedout_limit_sell(trade, order) self.handle_timedout_limit_buy(trade, order)
self.wallets.update() self.wallets.update()
# Check if order is still actually open
elif order['status'] == 'open': elif (order['side'] == 'sell' and order['status'] == 'canceled'
if order['side'] == 'buy' and ordertime < buy_timeoutthreashold: or (order['status'] == 'open'
self.handle_timedout_limit_buy(trade, order) and order['side'] == 'sell' and ordertime < sell_timeoutthreashold)):
self.wallets.update() self.handle_timedout_limit_sell(trade, order)
elif order['side'] == 'sell' and ordertime < sell_timeoutthreashold: self.wallets.update()
self.handle_timedout_limit_sell(trade, order)
self.wallets.update()
def handle_buy_order_full_cancel(self, trade: Trade, reason: str) -> None: def handle_buy_order_full_cancel(self, trade: Trade, reason: str) -> None:
"""Close trade in database and send message""" """Close trade in database and send message"""
@ -802,10 +800,17 @@ class FreqtradeBot:
"""Buy timeout - cancel order """Buy timeout - cancel order
:return: True if order was fully cancelled :return: True if order was fully cancelled
""" """
corder = self.exchange.cancel_order(trade.open_order_id, trade.pair) reason = "cancelled due to timeout"
if order['status'] != 'canceled':
corder = self.exchange.cancel_order(trade.open_order_id, trade.pair)
else:
# Order was cancelled already, so we can reuse the existing dict
corder = order
reason = "canceled on Exchange"
if corder['remaining'] == corder['amount']: if corder['remaining'] == corder['amount']:
# if trade is not partially completed, just delete the trade # if trade is not partially completed, just delete the trade
self.handle_buy_order_full_cancel(trade, "cancelled due to timeout") self.handle_buy_order_full_cancel(trade, reason)
return True return True
# if trade is partially complete, edit the stake details for the trade # if trade is partially complete, edit the stake details for the trade