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

modify some codes on exit

Browse Source
This commit is contained in:
Stefano Ariestasia 2022-03-17 12:11:44 +00:00
parent 847e3318cf
commit 824ffea301
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
freqtrade/freqtradebot.py
View File

@ -479,8 +479,10 @@ class FreqtradeBot(LoggingMixin):
if stake_amount is not None and stake_amount < 0.0: if stake_amount is not None and stake_amount < 0.0:
# We should decrease our position # We should decrease our position
# TODO: Selling part of the trade not implemented yet. # TODO: Selling part of the trade not implemented yet.
logger.error(f"Unable to decrease trade position / sell partially" sell_reason = SellCheckTuple(sell_type=SellType.CUSTOM_SELL)
f" for pair {trade.pair}, feature not implemented.") sell_amount = -1 * stake_amount / current_rate
self.execute_trade_exit(trade=trade, limit=current_rate, sell_reason=sell_reason,
exit_tag='Partial sell', amount=sell_amount)
def _check_depth_of_market_buy(self, pair: str, conf: Dict) -> bool: def _check_depth_of_market_buy(self, pair: str, conf: Dict) -> bool:
""" """
@ -1162,12 +1164,14 @@ class FreqtradeBot(LoggingMixin):
*, *,
exit_tag: Optional[str] = None, exit_tag: Optional[str] = None,
ordertype: Optional[str] = None, ordertype: Optional[str] = None,
amount: Optional[float] = 0.0,
) -> bool: ) -> bool:
""" """
Executes a trade exit for the given trade and limit Executes a trade exit for the given trade and limit
:param trade: Trade instance :param trade: Trade instance
:param limit: limit rate for the sell order :param limit: limit rate for the sell order
:param sell_reason: Reason the sell was triggered :param sell_reason: Reason the sell was triggered
:param amount: amount to be sold
:return: True if it succeeds (supported) False (not supported) :return: True if it succeeds (supported) False (not supported)
""" """
sell_type = 'sell' sell_type = 'sell'
@ -1199,7 +1203,18 @@ class FreqtradeBot(LoggingMixin):
# Emergency sells (default to market!) # Emergency sells (default to market!)
order_type = self.strategy.order_types.get("emergencysell", "market") order_type = self.strategy.order_types.get("emergencysell", "market")
amount = self._safe_exit_amount(trade.pair, trade.amount) if amount <= 0: # type: ignore
# Calculate unsold coin amount
amount = trade.amount
filled_exit_orders = trade.select_filled_orders('sell')
filled_amount = 0.0
for o in filled_exit_orders:
filled_amount += o.safe_filled
amount -= filled_amount # type: ignore
amount = self._safe_exit_amount(trade.pair, amount) # type: ignore
time_in_force = self.strategy.order_time_in_force['sell'] time_in_force = self.strategy.order_time_in_force['sell']
if not strategy_safe_wrapper(self.strategy.confirm_trade_exit, default_retval=True)( if not strategy_safe_wrapper(self.strategy.confirm_trade_exit, default_retval=True)(
@ -1234,7 +1249,7 @@ class FreqtradeBot(LoggingMixin):
self.strategy.lock_pair(trade.pair, datetime.now(timezone.utc), self.strategy.lock_pair(trade.pair, datetime.now(timezone.utc),
reason='Auto lock') reason='Auto lock')
self._notify_exit(trade, order_type) self._notify_exit(trade, order_type, amount=amount)
# In case of market sell orders the order can be closed immediately # In case of market sell orders the order can be closed immediately
if order.get('status', 'unknown') in ('closed', 'expired'): if order.get('status', 'unknown') in ('closed', 'expired'):
self.update_trade_state(trade, trade.open_order_id, order) self.update_trade_state(trade, trade.open_order_id, order)
@ -1242,7 +1257,8 @@ class FreqtradeBot(LoggingMixin):
return True return True
def _notify_exit(self, trade: Trade, order_type: str, fill: bool = False) -> None: def _notify_exit(self, trade: Trade, order_type: str, fill: bool = False,
amount: float = 0) -> None:
""" """
Sends rpc notification when a sell occurred. Sends rpc notification when a sell occurred.
""" """
@ -1263,7 +1279,7 @@ class FreqtradeBot(LoggingMixin):
'gain': gain, 'gain': gain,
'limit': profit_rate, 'limit': profit_rate,
'order_type': order_type, 'order_type': order_type,
'amount': trade.amount, 'amount': amount if amount > 0 else trade.amount,
'open_rate': trade.open_rate, 'open_rate': trade.open_rate,
'close_rate': trade.close_rate, 'close_rate': trade.close_rate,
'current_rate': current_rate, 'current_rate': current_rate,

4
freqtrade/persistence/models.py
View File

@ -591,8 +591,8 @@ class LocalTrade():
return 0.0 return 0.0
filled_exit_orders = self.select_filled_orders('sell') filled_exit_orders = self.select_filled_orders('sell')
filled_amount = 0 filled_amount = 0.0
filled_exit_trade = 0 filled_exit_trade = 0.0
for order in filled_exit_orders: for order in filled_exit_orders:
filled_amount += order.safe_filled filled_amount += order.safe_filled
filled_exit_trade += (order.safe_price * order.safe_filled) filled_exit_trade += (order.safe_price * order.safe_filled)