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

doesn’t have to create another Trade for SL. can be cumulated into the

Browse Source 
same.
This commit is contained in:
misagh 2018-11-22 16:53:50 +01:00
parent bb37b56dea
commit fad7593935
1 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
freqtrade/freqtradebot.py
View File

@ -479,6 +479,22 @@ class FreqtradeBot(object):
order_id = self.exchange.buy(pair=pair, ordertype=self.strategy.order_types['buy'], order_id = self.exchange.buy(pair=pair, ordertype=self.strategy.order_types['buy'],
amount=amount, rate=buy_limit)['id'] amount=amount, rate=buy_limit)['id']
stoploss_order_id: int = None
# Check if stoploss should be added on exchange
# If True then here immediately after buy we should
# Add the stoploss order
if self.strategy.stoploss_on_exchange:
stoploss = self.edge.stoploss if self.edge else self.strategy.stoploss
stop_price = buy_limit * (1 + stoploss)
# limit price should be less than stop price.
# 0.98 is arbitrary here.
limit_price = stop_price * 0.98
stoploss_order_id = self.exchange.stoploss_limit(pair=pair, amount=amount,
stop_price=stop_price, rate=limit_price)['id']
self.rpc.send_msg({ self.rpc.send_msg({
'type': RPCMessageType.BUY_NOTIFICATION, 'type': RPCMessageType.BUY_NOTIFICATION,
'exchange': self.exchange.name.capitalize(), 'exchange': self.exchange.name.capitalize(),
@ -502,43 +518,13 @@ class FreqtradeBot(object):
open_date=datetime.utcnow(), open_date=datetime.utcnow(),
exchange=self.exchange.id, exchange=self.exchange.id,
open_order_id=order_id, open_order_id=order_id,
stoploss_order_id=stoploss_order_id,
strategy=self.strategy.get_strategy_name(), strategy=self.strategy.get_strategy_name(),
ticker_interval=constants.TICKER_INTERVAL_MINUTES[self.config['ticker_interval']] ticker_interval=constants.TICKER_INTERVAL_MINUTES[self.config['ticker_interval']]
) )
Trade.session.add(trade) Trade.session.add(trade)
Trade.session.flush() Trade.session.flush()
# Check if stoploss should be added on exchange
# If True then here immediately after buy we should
# Add the stoploss order
if self.strategy.stoploss_on_exchange:
stoploss = self.edge.stoploss if self.edge else self.strategy.stoploss
stop_price = buy_limit * (1 + stoploss)
# limit price should be less than stop price.
# 0.98 is arbitrary here.
limit_price = stop_price * 0.98
order_id = self.exchange.stoploss_limit(pair=pair, amount=amount,
stop_price=stop_price, rate=limit_price)['id']
trade = Trade(
pair=pair,
stake_amount=stake_amount,
amount=amount,
fee_open=fee,
fee_close=fee,
stoploss=stop_price,
open_date=datetime.utcnow(),
exchange=self.exchange.id,
open_order_id=order_id,
strategy=self.strategy.get_strategy_name(),
ticker_interval=constants.TICKER_INTERVAL_MINUTES[self.config['ticker_interval']]
)
Trade.session.add(trade)
Trade.session.flush()
# Updating wallets # Updating wallets
self.wallets.update() self.wallets.update()