mohammadian7/freqtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix logic lapsus in check_exit_amount

Browse Source
This commit is contained in:
Matthias
2023-04-26 06:45:09 +02:00
parent d0b5c7d216
commit b0b036c457
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/freqtradebot.py
+3
View File
@@ -463,6 +463,7 @@ class FreqtradeBot(LoggingMixin):
if trade_order: if trade_order:
continue continue
logger.info(f"Found previously unknown order {order['id']} for {trade.pair}.") logger.info(f"Found previously unknown order {order['id']} for {trade.pair}.")
order_obj = Order.parse_from_ccxt_object(order, trade.pair, order['side']) order_obj = Order.parse_from_ccxt_object(order, trade.pair, order['side'])
order_obj.order_filled_date = datetime.fromtimestamp( order_obj.order_filled_date = datetime.fromtimestamp(
safe_value_fallback(order, 'lastTradeTimestamp', 'timestamp') // 1000, safe_value_fallback(order, 'lastTradeTimestamp', 'timestamp') // 1000,
@@ -473,6 +474,7 @@ class FreqtradeBot(LoggingMixin):
prev_exit_reason = trade.exit_reason prev_exit_reason = trade.exit_reason
trade.exit_reason = ExitType.SOLD_ON_EXCHANGE.value trade.exit_reason = ExitType.SOLD_ON_EXCHANGE.value
self.update_trade_state(trade, order['id'], order) self.update_trade_state(trade, order['id'], order)
logger.info(f"handled order {order['id']}") logger.info(f"handled order {order['id']}")
if not trade.is_open: if not trade.is_open:
# Trade was just closed # Trade was just closed
@@ -481,6 +483,7 @@ class FreqtradeBot(LoggingMixin):
break break
else: else:
trade.exit_reason = prev_exit_reason trade.exit_reason = prev_exit_reason
Trade.commit()
except ExchangeError: except ExchangeError:
logger.warning("Error finding onexchange order") logger.warning("Error finding onexchange order")
freqtrade/wallets.py
+1 -1
View File
@@ -184,7 +184,7 @@ class Wallets:
def _check_exit_amount(self, trade: Trade) -> bool: def _check_exit_amount(self, trade: Trade) -> bool:
if trade.trading_mode != TradingMode.FUTURES: if trade.trading_mode != TradingMode.FUTURES:
# Slightly higher offset than in safe_exit_amount. # Slightly higher offset than in safe_exit_amount.
wallet_amount: float = self.get_total(trade.safe_base_currency) * 0.981 wallet_amount: float = self.get_total(trade.safe_base_currency) * (2 - 0.981)
else: else:
# wallet_amount: float = self.wallets.get_free(trade.safe_base_currency) # wallet_amount: float = self.wallets.get_free(trade.safe_base_currency)
position = self._positions.get(trade.pair) position = self._positions.get(trade.pair)