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

Update adjustment functionality and add cancelation option

Browse Source
This commit is contained in:
eSeR1805 2022-04-18 21:16:45 +03:00
parent 2cac1b7dcc
commit 95e009b9cb
No known key found for this signature in database
GPG Key ID: BA53686259B46936
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
freqtrade/freqtradebot.py
View File

@ -1147,13 +1147,13 @@ class FreqtradeBot(LoggingMixin):
if not_closed: if not_closed:
if fully_cancelled or (order_obj and self.strategy.ft_check_timed_out( if fully_cancelled or (order_obj and self.strategy.ft_check_timed_out(
trade, order_obj, datetime.now(timezone.utc))): trade, order_obj, datetime.now(timezone.utc))):
self.handle_timedout_orders(order, trade) self.handle_timedout_order(order, trade)
else: else:
self.replace_orders(order, order_obj, trade) self.replace_order(order, order_obj, trade)
def handle_timedout_orders(self, order: Dict, trade: Trade) -> None: def handle_timedout_order(self, order: Dict, trade: Trade) -> None:
""" """
Check if any orders are timed out and cancel if necessary. Check if current analyzed order timed out and cancel if necessary.
:param order: Order dict grabbed with exchange.fetch_order() :param order: Order dict grabbed with exchange.fetch_order()
:param trade: Trade object. :param trade: Trade object.
:return: None :return: None
@ -1176,9 +1176,11 @@ class FreqtradeBot(LoggingMixin):
logger.warning( logger.warning(
f'Unable to emergency sell trade {trade.pair}: {exception}') f'Unable to emergency sell trade {trade.pair}: {exception}')
def replace_orders(self, order: Dict, order_obj: Optional[Order], trade: Trade) -> None: def replace_order(self, order: Dict, order_obj: Optional[Order], trade: Trade) -> None:
""" """
Check if any orders should be replaced and do so Check if current analyzed entry order should be replaced. Analyzed order is canceled
if adjust_entry_price() returned price differs from proposed_rate.
New order is only placed if adjust_entry_price() returned price is not None.
:param order: Order dict grabbed with exchange.fetch_order() :param order: Order dict grabbed with exchange.fetch_order()
:param order_obj: Order object. :param order_obj: Order object.
:param trade: Trade object. :param trade: Trade object.
@ -1194,21 +1196,26 @@ class FreqtradeBot(LoggingMixin):
# New candle # New candle
proposed_rate = self.exchange.get_rate( proposed_rate = self.exchange.get_rate(
trade.pair, side='entry', is_short=trade.is_short, refresh=True) trade.pair, side='entry', is_short=trade.is_short, refresh=True)
adjusted_entry_price = strategy_safe_wrapper(self.strategy.readjust_entry_price, adjusted_entry_price = strategy_safe_wrapper(self.strategy.adjust_entry_price,
default_retval=proposed_rate)( default_retval=proposed_rate)(
pair=trade.pair, current_time=datetime.now(timezone.utc), trade=trade, order=order_obj, pair=trade.pair,
proposed_rate=proposed_rate, entry_tag=trade.enter_tag, current_time=datetime.now(timezone.utc), proposed_rate=proposed_rate,
side=trade.entry_side) entry_tag=trade.enter_tag, side=trade.entry_side)
# check if user has requested entry limit adjustment
full_cancel = False
cancel_reason = constants.CANCEL_REASON['REPLACE']
if not adjusted_entry_price:
full_cancel = True
cancel_reason = constants.CANCEL_REASON['USER_CANCEL']
if proposed_rate != adjusted_entry_price: if proposed_rate != adjusted_entry_price:
# cancel existing order # cancel existing order if new price is supplied or None
self.handle_cancel_enter(trade, order, constants.CANCEL_REASON['REPLACE'], self.handle_cancel_enter(trade, order, cancel_reason,
allow_full_cancel=False) allow_full_cancel=full_cancel)
stake = self.wallets.get_trade_stake_amount(trade.pair, self.edge) if adjusted_entry_price:
# place new order with requested price # place new order only if new price is supplied
self.execute_entry( self.execute_entry(
pair=trade.pair, pair=trade.pair,
stake_amount=stake, stake_amount=(order_obj.remaining * order_obj.price),
price=adjusted_entry_price, price=adjusted_entry_price,
trade=trade, trade=trade,
is_short=trade.is_short is_short=trade.is_short