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

1) comments added to handle_sl 2) dry-run force price removed

Browse Source
This commit is contained in:
misagh 2018-11-24 17:32:25 +01:00
parent 531d9ecd0c
commit 870631f324
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
freqtrade/freqtradebot.py
View File

@ -673,6 +673,9 @@ class FreqtradeBot(object):
""" """
result = False result = False
# If trade is open and the buy order is fulfilled but there is no stoploss,
# then we add a stoploss on exchange
if trade.is_open and not trade.open_order_id and not trade.stoploss_order_id: if trade.is_open and not trade.open_order_id and not trade.stoploss_order_id:
if self.edge: if self.edge:
stoploss = self.edge.stoploss(pair=trade.pair) stoploss = self.edge.stoploss(pair=trade.pair)
@ -690,7 +693,8 @@ class FreqtradeBot(object):
)['id'] )['id']
trade.stoploss_order_id = str(stoploss_order_id) trade.stoploss_order_id = str(stoploss_order_id)
# Or Check if there is a stoploss on exchnage and it is hit # Or there is already a stoploss on exchnage.
# so we check if it is hit ...
elif trade.stoploss_order_id: elif trade.stoploss_order_id:
logger.debug('Handling stoploss on exchange %s ...', trade) logger.debug('Handling stoploss on exchange %s ...', trade)
order = self.exchange.get_order(trade.stoploss_order_id, trade.pair) order = self.exchange.get_order(trade.stoploss_order_id, trade.pair)
@ -831,11 +835,6 @@ class FreqtradeBot(object):
if self.strategy.stoploss_on_exchange and trade.stoploss_order_id: if self.strategy.stoploss_on_exchange and trade.stoploss_order_id:
self.exchange.cancel_order(trade.stoploss_order_id, trade.pair) self.exchange.cancel_order(trade.stoploss_order_id, trade.pair)
# Dry-run should consider stoploss is executed at the limit price
# So overriding limit in case of dry-run
if self.config['dry_run']:
limit = trade.stop_loss
# Execute sell and update trade record # Execute sell and update trade record
order_id = self.exchange.sell(pair=str(trade.pair), order_id = self.exchange.sell(pair=str(trade.pair),
ordertype=self.strategy.order_types[sell_type], ordertype=self.strategy.order_types[sell_type],