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

Use cancel_order_with_result when cancelling orders after timeout

Browse Source
This commit is contained in:
Matthias
2020-04-17 17:53:56 +02:00
parent 5e3e0e819f
commit 1069cb3616
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
freqtrade/freqtradebot.py
View File

@@ -891,11 +891,8 @@ class FreqtradeBot:
if order['status'] != 'canceled':
reason = "cancelled due to timeout"
try:
corder = self.exchange.cancel_order(trade.open_order_id, trade.pair)
# Some exchanges don't return a dict here.
if not isinstance(corder, dict):
corder = {}
logger.info('Buy order %s for %s.', reason, trade)
corder = self.exchange.cancel_order_with_result(trade.open_order_id, trade.pair,
trade.amount)
except InvalidOrderException:
corder = {}
logger.exception(
@@ -904,7 +901,8 @@ class FreqtradeBot:
# Order was cancelled already, so we can reuse the existing dict
corder = order
reason = "cancelled on exchange"
logger.info('Buy order %s for %s.', reason, trade)
logger.info('Buy order %s for %s.', reason, trade)
if safe_value_fallback(corder, order, 'remaining', 'remaining') == order['amount']:
logger.info('Buy order fully cancelled. Removing %s from database.', trade)
@@ -921,7 +919,7 @@ class FreqtradeBot:
trade.amount = order['amount'] - safe_value_fallback(corder, order,
'remaining', 'remaining')
trade.stake_amount = trade.amount * trade.open_rate
self.update_trade_state(trade, corder if 'fee' in corder else order, trade.amount)
self.update_trade_state(trade, corder, trade.amount)
trade.open_order_id = None
logger.info('Partial buy order timeout for %s.', trade)